# https://invisible-island.net/archives/xterm/patches/xterm-373.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created  Sun Sep 25 23:08:22 UTC 2022
# ------------------------------------------------------------------------------
# INSTALL                  |    8 
# MANIFEST                 |    2 
# THANKS                   |    6 
# Tekproc.c                |    8 
# aclocal.m4               |  157 +
# button.c                 |    8 
# charclass.c              |   11 
# charproc.c               |   64 
# config.guess             |   50 
# config.sub               |   22 
# configure                | 4204 ++++++++++++++++++++++++---------------------
# configure.in             |   13 
# ctlseqs.ms               |   16 
# ctlseqs.txt              |    8 
# cursor.c                 |   25 
# doublechr.c              |   19 
# fontutils.c              |  987 ++++++----
# fontutils.h              |   13 
# graphics.c               |   10 
# graphics_regis.c         |   18 
# linedata.c               |    6 
# main.c                   |   50 
# main.h                   |    6 
# menu.c                   |   10 
# misc.c                   |   46 
# package/debian/changelog |    6 
# package/freebsd/Makefile |    4 
# package/pkgsrc/Makefile  |    2 
# package/xterm.spec       |    4 
# plink.sh                 |    6 
# print.c                  |   12 
# ptyx.h                   |   71 
# screen.c                 |   41 
# terminfo                 |    4 
# trace.c                  |    8 
# util.c                   |  253 +-
# uxterm.desktop           |    5 
# version.h                |    6 
# vttests/16colors.sh      |   15 
# vttests/8colors.sh       |   15 
# vttests/acolors.sh       |   17 
# vttests/ctlpix.sh        |   10 
# vttests/dl.sh            |    6 
# vttests/doublechars.sh   |   23 
# vttests/dynamic.sh       |   17 
# vttests/dynamic2.sh      |   17 
# vttests/fonts.sh         |   17 
# vttests/il.sh            |    6 
# vttests/other-sgr.sh     |   15 
# vttests/resize.sh        |   19 
# vttests/tab0.sh          |   44 
# vttests/title.sh         |   17 
# vttests/unascii.sh       |   33 
# vttests/utf8.pl          |  125 -
# vttests/version.sh       |   20 
# vttests/xorblink.pl      |   31 
# wcwidth.c                |   99 -
# xterm.appdata.xml        |    2 
# xterm.desktop            |    5 
# xterm.h                  |   14 
# xterm.log.html           |  122 +
# xterm.man                |   53 
# xtermcfg.hin             |    4 
# 63 files changed, 4126 insertions(+), 2809 deletions(-)
# ------------------------------------------------------------------------------
Index: INSTALL
--- xterm-372+/INSTALL	2022-01-30 22:46:59.000000000 +0000
+++ xterm-373/INSTALL	2022-09-11 19:44:11.000000000 +0000
@@ -1,4 +1,4 @@
--- $XTermId: INSTALL,v 1.189 2022/01/30 22:46:59 tom Exp $
+-- $XTermId: INSTALL,v 1.190 2022/09/11 19:44:11 tom Exp $
 -------------------------------------------------------------------------------
 -- Copyright 1997-2021,2022 by Thomas E. Dickey
 --
@@ -163,6 +163,12 @@
 	not shown.  This makes it simpler to read a build log and see the
 	actual warning messages.
 
+  --disable-exec-selection  disable "exec-formatted" and "exec-selection" actions
+
+	Do not compile-in code for the "exec-formatted" and "exec-selection"
+	actions, which allow the user to run programs to process the results
+	of selecting text.
+
   --disable-fifo-lines    enable FIFO-storage for saved-lines
 
 	(this option is deprecrated)
Index: MANIFEST
--- xterm-372+/MANIFEST	2022-03-04 21:39:26.000000000 +0000
+++ xterm-373/MANIFEST	2022-03-11 19:51:56.000000000 +0000
@@ -1,4 +1,4 @@
-MANIFEST for xterm, version xterm-372
+MANIFEST for xterm, version xterm-373
 --------------------------------------------------------------------------------
 MANIFEST                        this file
 256colres.h                     resource-definitions for 256-color mode
Index: THANKS
--- xterm-372+/THANKS	2022-02-22 21:42:29.000000000 +0000
+++ xterm-373/THANKS	2022-09-12 21:10:13.000000000 +0000
@@ -1,4 +1,4 @@
--- $XTermId: THANKS,v 1.33 2022/02/22 21:42:29 tom Exp $
+-- $XTermId: THANKS,v 1.35 2022/09/12 21:10:13 tom Exp $
 -- vile:txtmode fk=utf-8
 There's no AUTHORS file in this distribution; it would be redundant since
 I (Thomas E. Dickey) have done more than 80% of the work on xterm since 1996.
@@ -39,10 +39,12 @@
 Bill Nottingham
 Bjarni Ingi Gislason
 Bob Maynard
+Boian Bonev
 Brad Town
 Bradd W Szonye
 Bram Moolenaar
 Branden Robinson
+Brendan O' Dea
 Bruno Haible
 Cade Foster
 Caetano Jimenez Carezzato
@@ -200,6 +202,7 @@
 Richard Braakman
 Richard Griswold
 Richard Tollerton
+Richard de Boer
 Rob Braun
 Robert Brady
 Robert Earl
@@ -209,6 +212,7 @@
 Ross Combs
 Ross Paterson
 Ryan Johnson
+Ryan Schmidt
 Sam Stephenson
 Samuel Thibault
 Scott Sewall
Index: Tekproc.c
--- xterm-372+/Tekproc.c	2021-12-27 18:07:35.000000000 +0000
+++ xterm-373/Tekproc.c	2022-09-25 17:53:18.000000000 +0000
@@ -1,7 +1,7 @@
-/* $XTermId: Tekproc.c,v 1.246 2021/12/27 18:07:35 tom Exp $ */
+/* $XTermId: Tekproc.c,v 1.248 2022/09/25 17:53:18 tom Exp $ */
 
 /*
- * Copyright 2001-2020,2021 by Thomas E. Dickey
+ * Copyright 2001-2021,2022 by Thomas E. Dickey
  *
  *                         All Rights Reserved
  *
@@ -2013,6 +2013,7 @@
 void
 TekCopy(TekWidget tw)
 {
+#ifdef ALLOWLOGGING
     if (tw != 0) {
 	TekScreen *tekscr = TekScreenOf(tw);
 	TScreen *screen = TScreenOf(tw->vt);
@@ -2050,6 +2051,9 @@
 	    close(tekcopyfd);
 	}
     }
+#else
+    (void) tw;
+#endif /* ALLOWLOGGING */
 }
 
 /*ARGSUSED*/
Index: aclocal.m4
--- xterm-372+/aclocal.m4	2022-02-24 22:10:29.000000000 +0000
+++ xterm-373/aclocal.m4	2022-09-11 19:00:29.000000000 +0000
@@ -1,4 +1,4 @@
-dnl $XTermId: aclocal.m4,v 1.496 2022/02/24 22:10:29 tom Exp $
+dnl $XTermId: aclocal.m4,v 1.498 2022/09/11 19:00:29 tom Exp $
 dnl
 dnl ---------------------------------------------------------------------------
 dnl
@@ -1855,7 +1855,7 @@
 AC_SUBST(MAKE_LOWER_TAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_MATH_LIB version: 10 updated: 2020/12/31 18:40:20
+dnl CF_MATH_LIB version: 11 updated: 2022/07/27 19:01:48
 dnl -----------
 dnl Checks for libraries.  At least one UNIX system, Apple Macintosh
 dnl Rhapsody 5.5, does not have -lm.  We cannot use the simpler
@@ -1865,18 +1865,42 @@
 AC_CACHE_CHECK(if -lm needed for math functions,
 	cf_cv_need_libm,[
 	AC_TRY_LINK([
-	#include <stdio.h>
-	#include <stdlib.h>
-	#include <math.h>
+		#include <stdio.h>
+		#include <stdlib.h>
+		#include <math.h>
 	],
 	[double x = rand(); printf("result = %g\\n", ]ifelse([$2],,sin(x),$2)[)],
 	[cf_cv_need_libm=no],
 	[cf_cv_need_libm=yes])])
+
 if test "$cf_cv_need_libm" = yes
 then
-ifelse($1,,[
-	CF_ADD_LIB(m)
-],[$1=-lm])
+
+	cf_save_LIBS="$LIBS"
+	LIBS="$LIBS -lm"
+	AC_CACHE_CHECK(if -lm is available for math functions,
+	cf_cv_have_libm,[
+	AC_TRY_LINK([
+		#include <stdio.h>
+		#include <stdlib.h>
+		#include <math.h>
+	],
+	[double x = rand(); printf("result = %g\\n", ]ifelse([$2],,sin(x),$2)[)],
+	[cf_cv_have_libm=yes],
+	[cf_cv_have_libm=no])])
+	LIBS="$cf_save_LIBS"
+
+	if test "$cf_cv_have_libm" = yes
+	then
+		ifelse($1,,[CF_ADD_LIB(m)],[$1=-lm])
+	fi
+else
+	cf_cv_have_libm=yes
+fi
+
+if test "$cf_cv_have_libm" = yes
+then
+	AC_DEFINE(HAVE_MATH_FUNCS,1,[Define to 1 if math functions are available])
 fi
 ])
 dnl ---------------------------------------------------------------------------
@@ -1910,6 +1934,64 @@
 test "$cf_cv_mixedcase" = yes && AC_DEFINE(MIXEDCASE_FILENAMES,1,[Define to 1 if filesystem supports mixed-case filenames.])
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_MKSTEMP version: 11 updated: 2021/01/01 13:31:04
+dnl ----------
+dnl Check for a working mkstemp.  This creates two files, checks that they are
+dnl successfully created and distinct (AmigaOS apparently fails on the last).
+AC_DEFUN([CF_MKSTEMP],[
+AC_CHECK_HEADERS( \
+unistd.h \
+)
+AC_CACHE_CHECK(for working mkstemp, cf_cv_func_mkstemp,[
+rm -rf ./conftest*
+AC_TRY_RUN([
+#include <sys/types.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/stat.h>
+int main(void)
+{
+	char *tmpl = "conftestXXXXXX";
+	char name[2][80];
+	int n;
+	int result = 0;
+	int fd;
+	struct stat sb;
+
+	umask(077);
+	for (n = 0; n < 2; ++n) {
+		strcpy(name[n], tmpl);
+		if ((fd = mkstemp(name[n])) >= 0) {
+			if (!strcmp(name[n], tmpl)
+			 || stat(name[n], &sb) != 0
+			 || (sb.st_mode & S_IFMT) != S_IFREG
+			 || (sb.st_mode & 077) != 0) {
+				result = 1;
+			}
+			close(fd);
+		}
+	}
+	if (result == 0
+	 && !strcmp(name[0], name[1]))
+		result = 1;
+	${cf_cv_main_return:-return}(result);
+}
+],[cf_cv_func_mkstemp=yes
+],[cf_cv_func_mkstemp=no
+],[cf_cv_func_mkstemp=maybe])
+])
+if test "x$cf_cv_func_mkstemp" = xmaybe ; then
+	AC_CHECK_FUNC(mkstemp)
+fi
+if test "x$cf_cv_func_mkstemp" = xyes || test "x$ac_cv_func_mkstemp" = xyes ; then
+	AC_DEFINE(HAVE_MKSTEMP,1,[Define to 1 if mkstemp() is available and working.])
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_MSG_LOG version: 5 updated: 2010/10/23 15:52:32
 dnl ----------
 dnl Write a debug message to config.log, along with the line number in the
@@ -2337,7 +2419,7 @@
 AC_SUBST(NROFF_NOTE)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_PROG_LINT version: 4 updated: 2019/11/20 18:55:37
+dnl CF_PROG_LINT version: 5 updated: 2022/08/20 15:44:13
 dnl ------------
 AC_DEFUN([CF_PROG_LINT],
 [
@@ -2348,6 +2430,7 @@
 	;;
 esac
 AC_SUBST(LINT_OPTS)
+AC_SUBST(LINT_LIBS)
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_REGEX version: 18 updated: 2021/01/01 16:53:59
@@ -2983,34 +3066,20 @@
 fi
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_TRY_XOPEN_SOURCE version: 3 updated: 2021/08/28 15:20:37
+dnl CF_TRY_XOPEN_SOURCE version: 4 updated: 2022/09/10 15:16:16
 dnl -------------------
 dnl If _XOPEN_SOURCE is not defined in the compile environment, check if we
 dnl can define it successfully.
 AC_DEFUN([CF_TRY_XOPEN_SOURCE],[
 AC_CACHE_CHECK(if we should define _XOPEN_SOURCE,cf_cv_xopen_source,[
-	AC_TRY_COMPILE([
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-],[
-#ifndef _XOPEN_SOURCE
-make an error
-#endif],
+	AC_TRY_COMPILE(CF__XOPEN_SOURCE_HEAD,CF__XOPEN_SOURCE_BODY,
 	[cf_cv_xopen_source=no],
 	[cf_save="$CPPFLAGS"
 	 CF_APPEND_TEXT(CPPFLAGS,-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE)
-	 AC_TRY_COMPILE([
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-],[
-#ifdef _XOPEN_SOURCE
-make an error
-#endif],
-	[cf_cv_xopen_source=no],
-	[cf_cv_xopen_source=$cf_XOPEN_SOURCE])
-	CPPFLAGS="$cf_save"
+	 AC_TRY_COMPILE(CF__XOPEN_SOURCE_HEAD,CF__XOPEN_SOURCE_BODY,
+		[cf_cv_xopen_source=no],
+		[cf_cv_xopen_source=$cf_XOPEN_SOURCE])
+		CPPFLAGS="$cf_save"
 	])
 ])
 
@@ -4669,7 +4738,7 @@
 fi
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_XOPEN_SOURCE version: 59 updated: 2021/08/28 15:20:37
+dnl CF_XOPEN_SOURCE version: 60 updated: 2022/09/10 15:16:16
 dnl ---------------
 dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
 dnl or adapt to the vendor's definitions to get equivalent functionality,
@@ -4720,7 +4789,7 @@
 	cf_xopen_source="-D_SGI_SOURCE"
 	cf_XOPEN_SOURCE=
 	;;
-(linux*|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin)
+(linux*gnu|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin)
 	CF_GNU_SOURCE($cf_XOPEN_SOURCE)
 	;;
 (minix*)
@@ -4769,7 +4838,13 @@
 	;;
 (*)
 	CF_TRY_XOPEN_SOURCE
+	cf_save_xopen_cppflags="$CPPFLAGS"
 	CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE)
+	# Some of these niche implementations use copy/paste, double-check...
+	CF_VERBOSE(checking if _POSIX_C_SOURCE inteferes)
+	AC_TRY_COMPILE(CF__XOPEN_SOURCE_HEAD,CF__XOPEN_SOURCE_BODY,,[
+		AC_MSG_WARN(_POSIX_C_SOURCE definition is not usable)
+		CPPFLAGS="$cf_save_xopen_cppflags"])
 	;;
 esac
 
@@ -5436,3 +5511,23 @@
 	exit(99);
 }
 ])
+dnl ---------------------------------------------------------------------------
+dnl CF__XOPEN_SOURCE_BODY version: 1 updated: 2022/09/10 15:17:35
+dnl ---------------------
+dnl body of test when test-compiling for _XOPEN_SOURCE check
+define([CF__XOPEN_SOURCE_BODY],
+[
+#ifndef _XOPEN_SOURCE
+make an error
+#endif
+])
+dnl ---------------------------------------------------------------------------
+dnl CF__XOPEN_SOURCE_HEAD version: 1 updated: 2022/09/10 15:17:03
+dnl ---------------------
+dnl headers to include when test-compiling for _XOPEN_SOURCE check
+define([CF__XOPEN_SOURCE_HEAD],
+[
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+])
Index: button.c
--- xterm-372+/button.c	2021-11-26 01:27:25.000000000 +0000
+++ xterm-373/button.c	2022-09-11 22:41:48.000000000 +0000
@@ -1,7 +1,7 @@
-/* $XTermId: button.c,v 1.638 2021/11/26 01:27:25 tom Exp $ */
+/* $XTermId: button.c,v 1.641 2022/09/11 22:41:48 tom Exp $ */
 
 /*
- * Copyright 1999-2020,2021 by Thomas E. Dickey
+ * Copyright 1999-2021,2022 by Thomas E. Dickey
  *
  *                         All Rights Reserved
  *
@@ -5666,6 +5666,7 @@
     return result;
 }
 
+#if OPT_EXEC_SELECTION
 /*
  * Split-up the format before substituting data, to avoid quoting issues.
  * The resource mechanism has a limited ability to handle escapes.  We take
@@ -5753,6 +5754,7 @@
 
     return result;
 }
+#endif /* OPT_EXEC_SELECTION */
 
 static void
 formatVideoAttrs(XtermWidget xw, char *buffer, CELL *cell)
@@ -5935,6 +5937,7 @@
     return result;
 }
 
+#if OPT_EXEC_SELECTION
 /* execute the command after forking.  The main process frees its data */
 static void
 executeCommand(pid_t pid, char **argv)
@@ -6038,6 +6041,7 @@
 	}
     }
 }
+#endif /* OPT_EXEC_SELECTION */
 
 static void
 reallyInsertFormatted(Widget w, char *format, char *data, CELL *start, CELL *finish)
Index: charclass.c
--- xterm-372+/charclass.c	2021-02-02 00:19:32.000000000 +0000
+++ xterm-373/charclass.c	2022-09-23 23:28:44.000000000 +0000
@@ -1,7 +1,7 @@
-/* $XTermId: charclass.c,v 1.44 2021/02/02 00:19:32 tom Exp $ */
+/* $XTermId: charclass.c,v 1.45 2022/09/23 23:28:44 tom Exp $ */
 
 /*
- * Copyright 2002-2020,2021 by Thomas E. Dickey
+ * Copyright 2002-2021,2022 by Thomas E. Dickey
  *
  *                         All Rights Reserved
  *
@@ -141,7 +141,10 @@
     SetCharacterClassRange(0x17d4, 0x17dc, IDENT);	/* Khmer punctuation */
     SetCharacterClassRange(0x1800, 0x180a, IDENT);	/* Mongolian punctuation */
     SetCharacterClassRange(0x2000, 0x200a, BLANK);	/* spaces */
-    SetCharacterClassRange(0x200b, 0x27ff, IDENT);	/* punctuation and symbols */
+    SetCharacterClassRange(0x200b, 0x200f, CNTRL);	/* formatting */
+    SetCharacterClassRange(0x2010, 0x27ff, IDENT);	/* punctuation and symbols */
+    SetCharacterClassRange(0x202a, 0x202e, CNTRL);	/* formatting */
+    SetCharacterClassRange(0x2060, 0x206f, CNTRL);	/* formatting */
     SetCharacterClassRange(0x2070, 0x207f, U_SUP);	/* superscript */
     SetCharacterClassRange(0x2080, 0x208f, U_SUB);	/* subscript */
     SetCharacterClassRange(0x3000, 0x3000, BLANK);	/* ideographic space */
@@ -152,10 +155,12 @@
     SetCharacterClassRange(0xac00, 0xd7a3, U_HAN);	/* Hangul Syllables */
     SetCharacterClassRange(0xf900, 0xfaff, U_CJK);	/* CJK Ideographs */
     SetCharacterClassRange(0xfe30, 0xfe6b, IDENT);	/* punctuation forms */
+    SetCharacterClassRange(0xfeff, 0xfeff, CNTRL);	/* formatting */
     SetCharacterClassRange(0xff00, 0xff0f, IDENT);	/* half/fullwidth ASCII */
     SetCharacterClassRange(0xff1a, 0xff20, IDENT);	/* half/fullwidth ASCII */
     SetCharacterClassRange(0xff3b, 0xff40, IDENT);	/* half/fullwidth ASCII */
     SetCharacterClassRange(0xff5b, 0xff64, IDENT);	/* half/fullwidth ASCII */
+    SetCharacterClassRange(0xfff9, 0xfffb, CNTRL);	/* formatting */
 
     TRACE((TRACE_R " init_classtab\n"));
     return;
Index: charproc.c
--- xterm-372+/charproc.c	2022-02-22 09:00:26.000000000 +0000
+++ xterm-373/charproc.c	2022-09-25 17:45:08.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: charproc.c,v 1.1888 2022/02/22 09:00:26 Vladimir.A.Pavlov Exp $ */
+/* $XTermId: charproc.c,v 1.1900 2022/09/25 17:45:08 tom Exp $ */
 
 /*
  * Copyright 1999-2021,2022 by Thomas E. Dickey
@@ -363,7 +363,7 @@
     { "meta-sends-escape",	HandleMetaEsc },
     { "set-num-lock",		HandleNumLock },
 #endif
-#ifdef OPT_PRINT_ON_EXIT
+#if OPT_PRINT_ON_EXIT
     { "print-immediate",	HandlePrintImmediate },
     { "print-on-error",		HandlePrintOnError },
 #endif
@@ -384,8 +384,10 @@
     { "scroll-lock",		HandleScrollLock },
 #endif
 #if OPT_SELECTION_OPS
+#if OPT_EXEC_SELECTION
     { "exec-formatted",		HandleExecFormatted },
     { "exec-selectable",	HandleExecSelectable },
+#endif
     { "insert-formatted",	HandleInsertFormatted },
     { "insert-selectable",	HandleInsertSelectable },
 #endif
@@ -731,6 +733,10 @@
 	 "1000x1000"),
 #endif
 
+#if OPT_ISO_COLORS && OPT_WIDE_ATTRS && OPT_SGR2_HASH
+    Bres(XtNfaintIsRelative, XtCFaintIsRelative, screen.faint_relative, False),
+#endif
+
 #if OPT_SHIFT_FONTS
     Bres(XtNshiftFonts, XtCShiftFonts, misc.shift_fonts, True),
 #endif
@@ -814,6 +820,12 @@
 
 #if OPT_RENDERFONT
     Bres(XtNforceXftHeight, XtCForceXftHeight, screen.force_xft_height, False),
+    Ires(XtNxftMaxGlyphMemory, XtCXftMaxGlyphMemory,
+	 screen.xft_max_glyph_memory, 0),
+    Ires(XtNxftMaxUnrefFonts, XtCXftMaxUnrefFonts,
+	 screen.xft_max_unref_fonts, 0),
+    Bres(XtNxftTrackMemUsage, XtCXftTrackMemUsage,
+	 screen.xft_track_mem_usage, DEF_TRACK_USAGE),
 #define RES_FACESIZE(n) Dres(XtNfaceSize #n, XtCFaceSize #n, misc.face_size[n], "0.0")
     RES_FACESIZE(1),
     RES_FACESIZE(2),
@@ -4049,8 +4061,11 @@
 		}
 		reply.a_param[count++] = (ParmType) value;
 
-		if (sp->private_function
-		    && screen->vtXX_level >= 4) {	/* VT420 */
+		if (sp->private_function &&
+		    (screen->vtXX_level >= 4 ||
+		     (screen->terminal_id >= 330 &&
+		      screen->vtXX_level >= 3))) {
+		    /* VT330 (not VT320) and VT420 */
 		    reply.a_param[count++] = 1;
 		}
 		reply.a_final = 'R';
@@ -8650,7 +8665,13 @@
 	HideCursor(xw);
 
     rows = MaxRows(screen);
-    SwitchBufPtrs(screen, toBuf);
+#if OPT_STATUS_LINE
+    if (IsStatusShown(screen) && (rows > 0)) {
+	/* avoid clearing the status-line in this function */
+	--rows;
+    }
+#endif
+    SwitchBufPtrs(xw, toBuf);
 
     if ((top = INX2ROW(screen, 0)) < rows) {
 	if (screen->scroll_amt) {
@@ -8680,10 +8701,27 @@
  * Swap buffer line pointers between alternate and regular screens.
  */
 void
-SwitchBufPtrs(TScreen *screen, int toBuf)
+SwitchBufPtrs(XtermWidget xw, int toBuf)
 {
+    TScreen *screen = TScreenOf(xw);
+
     if (CheckBufPtrs(screen)) {
+#if OPT_STATUS_LINE
+	if (IsStatusShown(screen)
+	    && (screen->visbuf != screen->editBuf_index[toBuf])) {
+	    LineData *oldLD;
+	    LineData *newLD;
+	    int row = MaxRows(screen);
+
+	    oldLD = getLineData(screen, row);
+	    screen->visbuf = screen->editBuf_index[toBuf];
+	    newLD = getLineData(screen, row);
+
+	    copyLineData(newLD, oldLD);
+	}
+#else
 	screen->visbuf = screen->editBuf_index[toBuf];
+#endif
     }
 }
 
@@ -10187,6 +10225,9 @@
     for (i = 0; i <= fontMenu_lastBuiltin; ++i) {
 	init_Dres2(misc.face_size, i);
     }
+    init_Ires(screen.xft_max_glyph_memory);
+    init_Ires(screen.xft_max_unref_fonts);
+    init_Bres(screen.xft_track_mem_usage);
 
 #define ALLOC_FONTLIST(name,which,field) \
     init_Sres(misc.default_xft.field);\
@@ -10295,6 +10336,9 @@
 #if OPT_DIRECT_COLOR
     init_Bres(screen.direct_color);
 #endif
+#if OPT_WIDE_ATTRS && OPT_SGR2_HASH
+    init_Bres(screen.faint_relative);
+#endif
 
     TRACE(("...will fake resources for color%d to color%d\n",
 	   MIN_ANSI_COLORS,
@@ -10437,6 +10481,11 @@
 #if OPT_RENDERFONT
     init_Ires(misc.limit_fontsets);
     wnew->work.max_fontsets = (unsigned) wnew->misc.limit_fontsets;
+    if (wnew->work.max_fontsets > 255) {
+	xtermWarning("limiting number of fontsets to 255 (was %u)\n",
+		     wnew->work.max_fontsets);
+	wnew->work.max_fontsets = 255;
+    }
 
     init_Sres(misc.render_font_s);
     wnew->work.render_font =
@@ -11119,6 +11168,9 @@
     TRACE_FREE_LEAK(xw->misc.localefilter);
 #endif
 
+    TRACE_FREE_LEAK(xw->misc.cdXtraScroll_s);
+    TRACE_FREE_LEAK(xw->misc.tiXtraScroll_s);
+
 #if OPT_RENDERFONT
     TRACE_FREE_LEAK(xw->misc.default_xft.f_n);
 #if OPT_WIDE_CHARS
Index: config.guess
--- xterm-372+/config.guess	2021-06-04 04:01:25.000000000 +0000
+++ xterm-373/config.guess	2022-08-01 08:05:29.000000000 +0000
@@ -1,14 +1,14 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2021 Free Software Foundation, Inc.
+#   Copyright 1992-2022 Free Software Foundation, Inc.
 
 # shellcheck disable=SC2006,SC2268 # see below for rationale
 
-timestamp='2021-06-03'
+timestamp='2022-08-01'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -60,7 +60,7 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2021 Free Software Foundation, Inc.
+Copyright 1992-2022 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -437,7 +437,7 @@
 	# This test works for both compilers.
 	if test "$CC_FOR_BUILD" != no_compiler_found; then
 	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+		(CCOPTS="" $CC_FOR_BUILD -m64 -E - 2>/dev/null) | \
 		grep IS_64BIT_ARCH >/dev/null
 	    then
 		SUN_ARCH=x86_64
@@ -929,6 +929,9 @@
     i*:PW*:*)
 	GUESS=$UNAME_MACHINE-pc-pw32
 	;;
+    *:SerenityOS:*:*)
+        GUESS=$UNAME_MACHINE-pc-serenity
+        ;;
     *:Interix*:*)
 	case $UNAME_MACHINE in
 	    x86)
@@ -1033,7 +1036,7 @@
     k1om:Linux:*:*)
 	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
 	;;
-    loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*)
+    loongarch32:Linux:*:* | loongarch64:Linux:*:*)
 	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
 	;;
     m32r*:Linux:*:*)
@@ -1148,16 +1151,27 @@
 	;;
     x86_64:Linux:*:*)
 	set_cc_for_build
+	CPU=$UNAME_MACHINE
 	LIBCABI=$LIBC
 	if test "$CC_FOR_BUILD" != no_compiler_found; then
-	    if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \
-		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
-		grep IS_X32 >/dev/null
-	    then
-		LIBCABI=${LIBC}x32
-	    fi
+	    ABI=64
+	    sed 's/^	    //' << EOF > "$dummy.c"
+	    #ifdef __i386__
+	    ABI=x86
+	    #else
+	    #ifdef __ILP32__
+	    ABI=x32
+	    #endif
+	    #endif
+EOF
+	    cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' | sed 's, ,,g'`
+	    eval "$cc_set_abi"
+	    case $ABI in
+		x86) CPU=i686 ;;
+		x32) LIBCABI=${LIBC}x32 ;;
+	    esac
 	fi
-	GUESS=$UNAME_MACHINE-pc-linux-$LIBCABI
+	GUESS=$CPU-pc-linux-$LIBCABI
 	;;
     xtensa*:Linux:*:*)
 	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
@@ -1364,8 +1378,11 @@
     BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
 	GUESS=i586-pc-haiku
 	;;
-    x86_64:Haiku:*:*)
-	GUESS=x86_64-unknown-haiku
+    ppc:Haiku:*:*)	# Haiku running on Apple PowerPC
+	GUESS=powerpc-apple-haiku
+	;;
+    *:Haiku:*:*)	# Haiku modern gcc (not bound by BeOS compat)
+	GUESS=$UNAME_MACHINE-unknown-haiku
 	;;
     SX-4:SUPER-UX:*:*)
 	GUESS=sx4-nec-superux$UNAME_RELEASE
@@ -1522,6 +1539,9 @@
     i*86:rdos:*:*)
 	GUESS=$UNAME_MACHINE-pc-rdos
 	;;
+    i*86:Fiwix:*:*)
+	GUESS=$UNAME_MACHINE-pc-fiwix
+	;;
     *:AROS:*:*)
 	GUESS=$UNAME_MACHINE-unknown-aros
 	;;
Index: config.sub
--- xterm-372+/config.sub	2021-08-14 16:20:38.000000000 +0000
+++ xterm-373/config.sub	2022-08-01 08:05:29.000000000 +0000
@@ -1,14 +1,14 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2021 Free Software Foundation, Inc.
+#   Copyright 1992-2022 Free Software Foundation, Inc.
 
 # shellcheck disable=SC2006,SC2268 # see below for rationale
 
-timestamp='2021-08-14'
+timestamp='2022-08-01'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -76,7 +76,7 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2021 Free Software Foundation, Inc.
+Copyright 1992-2022 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -1020,6 +1020,11 @@
 		;;
 
 	# Here we normalize CPU types with a missing or matching vendor
+	armh-unknown | armh-alt)
+		cpu=armv7l
+		vendor=alt
+		basic_os=${basic_os:-linux-gnueabihf}
+		;;
 	dpx20-unknown | dpx20-bull)
 		cpu=rs6000
 		vendor=bull
@@ -1121,7 +1126,7 @@
 	xscale-* | xscalee[bl]-*)
 		cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
 		;;
-	arm64-*)
+	arm64-* | aarch64le-*)
 		cpu=aarch64
 		;;
 
@@ -1202,7 +1207,7 @@
 			| k1om \
 			| le32 | le64 \
 			| lm32 \
-			| loongarch32 | loongarch64 | loongarchx32 \
+			| loongarch32 | loongarch64 \
 			| m32c | m32r | m32rle \
 			| m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \
 			| m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \
@@ -1304,7 +1309,7 @@
 if test x$basic_os != x
 then
 
-# First recognize some ad-hoc caes, or perhaps split kernel-os, or else just
+# First recognize some ad-hoc cases, or perhaps split kernel-os, or else just
 # set os.
 case $basic_os in
 	gnu/linux*)
@@ -1748,7 +1753,8 @@
 	     | skyos* | haiku* | rdos* | toppers* | drops* | es* \
 	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
 	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
-	     | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr*)
+	     | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \
+	     | fiwix* )
 		;;
 	# This one is extra strict with allowed versions
 	sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
Index: configure
--- xterm-372+/configure	2022-02-24 20:56:16.000000000 +0000
+++ xterm-373/configure	2022-09-11 22:36:51.000000000 +0000
@@ -764,6 +764,7 @@
   --disable-highlighting  disable support for color highlighting
   --disable-doublechars   disable support for double-size chars
   --disable-boxchars      disable fallback-support for box chars
+  --disable-exec-selection disable "exec-formatted" and "exec-selection" actions
   --enable-exec-xterm     enable "spawn-new-terminal" action
   --enable-double-buffer  enable double-buffering in default resources
   --disable-freetype      disable freetype library-support
@@ -1016,7 +1017,7 @@
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
-    { echo "$as_me:1019: loading site script $ac_site_file" >&5
+    { echo "$as_me:1020: loading site script $ac_site_file" >&5
 echo "$as_me: loading site script $ac_site_file" >&6;}
     cat "$ac_site_file" >&5
     . "$ac_site_file"
@@ -1027,7 +1028,7 @@
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { echo "$as_me:1030: loading cache $cache_file" >&5
+    { echo "$as_me:1031: loading cache $cache_file" >&5
 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . $cache_file;;
@@ -1035,7 +1036,7 @@
     esac
   fi
 else
-  { echo "$as_me:1038: creating cache $cache_file" >&5
+  { echo "$as_me:1039: creating cache $cache_file" >&5
 echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -1051,21 +1052,21 @@
   eval ac_new_val="\$ac_env_${ac_var}_value"
   case "$ac_old_set,$ac_new_set" in
     set,)
-      { echo "$as_me:1054: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { echo "$as_me:1055: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { echo "$as_me:1058: error: \`$ac_var' was not set in the previous run" >&5
+      { echo "$as_me:1059: error: \`$ac_var' was not set in the previous run" >&5
 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-        { echo "$as_me:1064: error: \`$ac_var' has changed since the previous run:" >&5
+        { echo "$as_me:1065: error: \`$ac_var' has changed since the previous run:" >&5
 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-        { echo "$as_me:1066:   former value:  $ac_old_val" >&5
+        { echo "$as_me:1067:   former value:  $ac_old_val" >&5
 echo "$as_me:   former value:  $ac_old_val" >&2;}
-        { echo "$as_me:1068:   current value: $ac_new_val" >&5
+        { echo "$as_me:1069:   current value: $ac_new_val" >&5
 echo "$as_me:   current value: $ac_new_val" >&2;}
         ac_cache_corrupted=:
       fi;;
@@ -1084,9 +1085,9 @@
   fi
 done
 if "$ac_cache_corrupted"; then
-  { echo "$as_me:1087: error: changes in the environment can compromise the build" >&5
+  { echo "$as_me:1088: error: changes in the environment can compromise the build" >&5
 echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:1089: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+  { { echo "$as_me:1090: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1115,10 +1116,10 @@
 echo "#! $SHELL" >conftest.sh
 echo  "exit 0"   >>conftest.sh
 chmod +x conftest.sh
-if { (echo "$as_me:1118: PATH=\".;.\"; conftest.sh") >&5
+if { (echo "$as_me:1119: PATH=\".;.\"; conftest.sh") >&5
   (PATH=".;."; conftest.sh) 2>&5
   ac_status=$?
-  echo "$as_me:1121: \$? = $ac_status" >&5
+  echo "$as_me:1122: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
   ac_path_separator=';'
 else
@@ -1146,7 +1147,7 @@
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:1149: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+  { { echo "$as_me:1150: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1156,11 +1157,11 @@
 
 # Make sure we can run config.sub.
 $ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:1159: error: cannot run $ac_config_sub" >&5
+  { { echo "$as_me:1160: error: cannot run $ac_config_sub" >&5
 echo "$as_me: error: cannot run $ac_config_sub" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:1163: checking build system type" >&5
+echo "$as_me:1164: checking build system type" >&5
 echo $ECHO_N "checking build system type... $ECHO_C" >&6
 if test "${ac_cv_build+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1169,16 +1170,16 @@
 test -z "$ac_cv_build_alias" &&
   ac_cv_build_alias=`$ac_config_guess`
 test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:1172: error: cannot guess build type; you must specify one" >&5
+  { { echo "$as_me:1173: error: cannot guess build type; you must specify one" >&5
 echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    { (exit 1); exit 1; }; }
 ac_cv_build=`$ac_config_sub "$ac_cv_build_alias"` ||
-  { { echo "$as_me:1176: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+  { { echo "$as_me:1177: error: $ac_config_sub $ac_cv_build_alias failed." >&5
 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:1181: result: $ac_cv_build" >&5
+echo "$as_me:1182: result: $ac_cv_build" >&5
 echo "${ECHO_T}$ac_cv_build" >&6
 build=$ac_cv_build
 build_cpu=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
@@ -1186,7 +1187,7 @@
 build_os=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 
 if test -f "$srcdir/config.guess" || test -f "$ac_aux_dir/config.guess" ; then
-	echo "$as_me:1189: checking host system type" >&5
+	echo "$as_me:1190: checking host system type" >&5
 echo $ECHO_N "checking host system type... $ECHO_C" >&6
 if test "${ac_cv_host+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1195,12 +1196,12 @@
 test -z "$ac_cv_host_alias" &&
   ac_cv_host_alias=$ac_cv_build_alias
 ac_cv_host=`$ac_config_sub "$ac_cv_host_alias"` ||
-  { { echo "$as_me:1198: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+  { { echo "$as_me:1199: error: $ac_config_sub $ac_cv_host_alias failed" >&5
 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:1203: result: $ac_cv_host" >&5
+echo "$as_me:1204: result: $ac_cv_host" >&5
 echo "${ECHO_T}$ac_cv_host" >&6
 host=$ac_cv_host
 host_cpu=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
@@ -1226,13 +1227,13 @@
 fi
 
 test -z "$system_name" && system_name="$cf_cv_system_name"
-test -n "$cf_cv_system_name" && echo "$as_me:1229: result: Configuring for $cf_cv_system_name" >&5
+test -n "$cf_cv_system_name" && echo "$as_me:1230: result: Configuring for $cf_cv_system_name" >&5
 echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6
 
 if test ".$system_name" != ".$cf_cv_system_name" ; then
-	echo "$as_me:1233: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
+	echo "$as_me:1234: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
 echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6
-	{ { echo "$as_me:1235: error: \"Please remove config.cache and try again.\"" >&5
+	{ { echo "$as_me:1236: error: \"Please remove config.cache and try again.\"" >&5
 echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1257,7 +1258,7 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:1260: checking for $ac_word" >&5
+echo "$as_me:1261: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1272,7 +1273,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}gcc"
-echo "$as_me:1275: found $ac_dir/$ac_word" >&5
+echo "$as_me:1276: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1280,10 +1281,10 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1283: result: $CC" >&5
+  echo "$as_me:1284: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1286: result: no" >&5
+  echo "$as_me:1287: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1292,7 +1293,7 @@
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-echo "$as_me:1295: checking for $ac_word" >&5
+echo "$as_me:1296: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1307,7 +1308,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="gcc"
-echo "$as_me:1310: found $ac_dir/$ac_word" >&5
+echo "$as_me:1311: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1315,10 +1316,10 @@
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1318: result: $ac_ct_CC" >&5
+  echo "$as_me:1319: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1321: result: no" >&5
+  echo "$as_me:1322: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1331,7 +1332,7 @@
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:1334: checking for $ac_word" >&5
+echo "$as_me:1335: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1346,7 +1347,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}cc"
-echo "$as_me:1349: found $ac_dir/$ac_word" >&5
+echo "$as_me:1350: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1354,10 +1355,10 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1357: result: $CC" >&5
+  echo "$as_me:1358: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1360: result: no" >&5
+  echo "$as_me:1361: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1366,7 +1367,7 @@
   ac_ct_CC=$CC
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:1369: checking for $ac_word" >&5
+echo "$as_me:1370: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1381,7 +1382,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="cc"
-echo "$as_me:1384: found $ac_dir/$ac_word" >&5
+echo "$as_me:1385: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1389,10 +1390,10 @@
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1392: result: $ac_ct_CC" >&5
+  echo "$as_me:1393: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1395: result: no" >&5
+  echo "$as_me:1396: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1405,7 +1406,7 @@
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:1408: checking for $ac_word" >&5
+echo "$as_me:1409: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1425,7 +1426,7 @@
   continue
 fi
 ac_cv_prog_CC="cc"
-echo "$as_me:1428: found $ac_dir/$ac_word" >&5
+echo "$as_me:1429: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1447,10 +1448,10 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1450: result: $CC" >&5
+  echo "$as_me:1451: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1453: result: no" >&5
+  echo "$as_me:1454: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1461,7 +1462,7 @@
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:1464: checking for $ac_word" >&5
+echo "$as_me:1465: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1476,7 +1477,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-echo "$as_me:1479: found $ac_dir/$ac_word" >&5
+echo "$as_me:1480: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1484,10 +1485,10 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1487: result: $CC" >&5
+  echo "$as_me:1488: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1490: result: no" >&5
+  echo "$as_me:1491: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1500,7 +1501,7 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1503: checking for $ac_word" >&5
+echo "$as_me:1504: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1515,7 +1516,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="$ac_prog"
-echo "$as_me:1518: found $ac_dir/$ac_word" >&5
+echo "$as_me:1519: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1523,10 +1524,10 @@
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1526: result: $ac_ct_CC" >&5
+  echo "$as_me:1527: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1529: result: no" >&5
+  echo "$as_me:1530: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1538,32 +1539,32 @@
 
 fi
 
-test -z "$CC" && { { echo "$as_me:1541: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:1542: error: no acceptable cc found in \$PATH" >&5
 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:1546:" \
+echo "$as_me:1547:" \
      "checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo "$2"`
-{ (eval echo "$as_me:1549: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1550: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1552: \$? = $ac_status" >&5
+  echo "$as_me:1553: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:1554: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1555: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1557: \$? = $ac_status" >&5
+  echo "$as_me:1558: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:1559: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1560: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1562: \$? = $ac_status" >&5
+  echo "$as_me:1563: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 1566 "configure"
+#line 1567 "configure"
 #include "confdefs.h"
 
 int
@@ -1579,13 +1580,13 @@
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-echo "$as_me:1582: checking for C compiler default output" >&5
+echo "$as_me:1583: checking for C compiler default output" >&5
 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
 ac_link_default=`echo "$ac_link" | sed 's/ -o *"conftest[^"]*"//'`
-if { (eval echo "$as_me:1585: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:1586: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5
   ac_status=$?
-  echo "$as_me:1588: \$? = $ac_status" >&5
+  echo "$as_me:1589: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
   # Find the output, starting from the most likely.  This scheme is
 # not robust to junk in `.', hence go to wildcards (a.*) only as a last
@@ -1608,34 +1609,34 @@
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-{ { echo "$as_me:1611: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:1612: error: C compiler cannot create executables" >&5
 echo "$as_me: error: C compiler cannot create executables" >&2;}
    { (exit 77); exit 77; }; }
 fi
 
 ac_exeext=$ac_cv_exeext
-echo "$as_me:1617: result: $ac_file" >&5
+echo "$as_me:1618: result: $ac_file" >&5
 echo "${ECHO_T}$ac_file" >&6
 
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:1622: checking whether the C compiler works" >&5
+echo "$as_me:1623: checking whether the C compiler works" >&5
 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
   if { ac_try='./$ac_file'
-  { (eval echo "$as_me:1628: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1629: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1631: \$? = $ac_status" >&5
+  echo "$as_me:1632: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:1638: error: cannot run C compiled programs.
+	{ { echo "$as_me:1639: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'." >&5
 echo "$as_me: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'." >&2;}
@@ -1643,24 +1644,24 @@
     fi
   fi
 fi
-echo "$as_me:1646: result: yes" >&5
+echo "$as_me:1647: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 rm -f a.out a.exe "conftest$ac_cv_exeext"
 ac_clean_files=$ac_clean_files_save
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:1653: checking whether we are cross compiling" >&5
+echo "$as_me:1654: checking whether we are cross compiling" >&5
 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:1655: result: $cross_compiling" >&5
+echo "$as_me:1656: result: $cross_compiling" >&5
 echo "${ECHO_T}$cross_compiling" >&6
 
-echo "$as_me:1658: checking for executable suffix" >&5
+echo "$as_me:1659: checking for executable suffix" >&5
 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:1660: \"$ac_link\"") >&5
+if { (eval echo "$as_me:1661: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:1663: \$? = $ac_status" >&5
+  echo "$as_me:1664: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
@@ -1676,25 +1677,25 @@
   esac
 done
 else
-  { { echo "$as_me:1679: error: cannot compute EXEEXT: cannot compile and link" >&5
+  { { echo "$as_me:1680: error: cannot compute EXEEXT: cannot compile and link" >&5
 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f "conftest$ac_cv_exeext"
-echo "$as_me:1685: result: $ac_cv_exeext" >&5
+echo "$as_me:1686: result: $ac_cv_exeext" >&5
 echo "${ECHO_T}$ac_cv_exeext" >&6
 
 rm -f "conftest.$ac_ext"
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-echo "$as_me:1691: checking for object suffix" >&5
+echo "$as_me:1692: checking for object suffix" >&5
 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
 if test "${ac_cv_objext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 1697 "configure"
+#line 1698 "configure"
 #include "confdefs.h"
 
 int
@@ -1706,10 +1707,10 @@
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:1709: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1710: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1712: \$? = $ac_status" >&5
+  echo "$as_me:1713: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
   case $ac_file in
@@ -1721,24 +1722,24 @@
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-{ { echo "$as_me:1724: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:1725: error: cannot compute OBJEXT: cannot compile" >&5
 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f "conftest.$ac_cv_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:1731: result: $ac_cv_objext" >&5
+echo "$as_me:1732: result: $ac_cv_objext" >&5
 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:1735: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:1736: checking whether we are using the GNU C compiler" >&5
 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 1741 "configure"
+#line 1742 "configure"
 #include "confdefs.h"
 
 int
@@ -1753,16 +1754,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1756: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1757: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1759: \$? = $ac_status" >&5
+  echo "$as_me:1760: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1762: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1763: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1765: \$? = $ac_status" >&5
+  echo "$as_me:1766: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_compiler_gnu=yes
 else
@@ -1774,19 +1775,19 @@
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:1777: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:1778: result: $ac_cv_c_compiler_gnu" >&5
 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
 GCC=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 CFLAGS="-g"
-echo "$as_me:1783: checking whether $CC accepts -g" >&5
+echo "$as_me:1784: checking whether $CC accepts -g" >&5
 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 1789 "configure"
+#line 1790 "configure"
 #include "confdefs.h"
 
 int
@@ -1798,16 +1799,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1801: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1802: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1804: \$? = $ac_status" >&5
+  echo "$as_me:1805: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1807: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1808: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1810: \$? = $ac_status" >&5
+  echo "$as_me:1811: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_cc_g=yes
 else
@@ -1817,7 +1818,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:1820: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:1821: result: $ac_cv_prog_cc_g" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
@@ -1844,16 +1845,16 @@
 #endif
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1847: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1848: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1850: \$? = $ac_status" >&5
+  echo "$as_me:1851: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1853: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1854: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1856: \$? = $ac_status" >&5
+  echo "$as_me:1857: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   for ac_declaration in \
    ''\
@@ -1865,7 +1866,7 @@
    'void exit (int);'
 do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 1868 "configure"
+#line 1869 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -1878,16 +1879,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1881: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1882: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1884: \$? = $ac_status" >&5
+  echo "$as_me:1885: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1887: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1888: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1890: \$? = $ac_status" >&5
+  echo "$as_me:1891: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -1897,7 +1898,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 1900 "configure"
+#line 1901 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -1909,16 +1910,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1912: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1913: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1915: \$? = $ac_status" >&5
+  echo "$as_me:1916: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1918: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1919: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1921: \$? = $ac_status" >&5
+  echo "$as_me:1922: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -1948,11 +1949,11 @@
 
 GCC_VERSION=none
 if test "$GCC" = yes ; then
-	echo "$as_me:1951: checking version of $CC" >&5
+	echo "$as_me:1952: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
-	echo "$as_me:1955: result: $GCC_VERSION" >&5
+	echo "$as_me:1956: result: $GCC_VERSION" >&5
 echo "${ECHO_T}$GCC_VERSION" >&6
 fi
 
@@ -1961,12 +1962,12 @@
 if test "$GCC" = yes ; then
 	case "$host_os" in
 	(linux*|gnu*)
-		echo "$as_me:1964: checking if this is really Intel C compiler" >&5
+		echo "$as_me:1965: checking if this is really Intel C compiler" >&5
 echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS -no-gcc"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 1969 "configure"
+#line 1970 "configure"
 #include "confdefs.h"
 
 int
@@ -1983,16 +1984,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1986: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1987: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1989: \$? = $ac_status" >&5
+  echo "$as_me:1990: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1992: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1993: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1995: \$? = $ac_status" >&5
+  echo "$as_me:1996: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -2003,7 +2004,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:2006: result: $INTEL_COMPILER" >&5
+		echo "$as_me:2007: result: $INTEL_COMPILER" >&5
 echo "${ECHO_T}$INTEL_COMPILER" >&6
 		;;
 	esac
@@ -2012,11 +2013,11 @@
 CLANG_COMPILER=no
 
 if test "$GCC" = yes ; then
-	echo "$as_me:2015: checking if this is really Clang C compiler" >&5
+	echo "$as_me:2016: checking if this is really Clang C compiler" >&5
 echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6
 	cf_save_CFLAGS="$CFLAGS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 2019 "configure"
+#line 2020 "configure"
 #include "confdefs.h"
 
 int
@@ -2033,16 +2034,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2036: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2037: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2039: \$? = $ac_status" >&5
+  echo "$as_me:2040: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2042: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2043: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2045: \$? = $ac_status" >&5
+  echo "$as_me:2046: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   CLANG_COMPILER=yes
 
@@ -2052,7 +2053,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	CFLAGS="$cf_save_CFLAGS"
-	echo "$as_me:2055: result: $CLANG_COMPILER" >&5
+	echo "$as_me:2056: result: $CLANG_COMPILER" >&5
 echo "${ECHO_T}$CLANG_COMPILER" >&6
 fi
 
@@ -2061,30 +2062,30 @@
 if test "x$CLANG_COMPILER" = "xyes" ; then
 	case "$CC" in
 	(c[1-9][0-9]|*/c[1-9][0-9])
-		{ echo "$as_me:2064: WARNING: replacing broken compiler alias $CC" >&5
+		{ echo "$as_me:2065: WARNING: replacing broken compiler alias $CC" >&5
 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
 		CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
 		CC=clang
 		;;
 	esac
 
-	echo "$as_me:2071: checking version of $CC" >&5
+	echo "$as_me:2072: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
-	echo "$as_me:2075: result: $CLANG_VERSION" >&5
+	echo "$as_me:2076: result: $CLANG_VERSION" >&5
 echo "${ECHO_T}$CLANG_VERSION" >&6
 
 	for cf_clang_opt in \
 		-Qunused-arguments \
 		-Wno-error=implicit-function-declaration
 	do
-		echo "$as_me:2082: checking if option $cf_clang_opt works" >&5
+		echo "$as_me:2083: checking if option $cf_clang_opt works" >&5
 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $cf_clang_opt"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 2087 "configure"
+#line 2088 "configure"
 #include "confdefs.h"
 
 			#include <stdio.h>
@@ -2098,16 +2099,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:2101: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2102: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2104: \$? = $ac_status" >&5
+  echo "$as_me:2105: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:2107: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2108: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2110: \$? = $ac_status" >&5
+  echo "$as_me:2111: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_clang_optok=yes
@@ -2118,13 +2119,13 @@
 			cf_clang_optok=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:2121: result: $cf_clang_optok" >&5
+		echo "$as_me:2122: result: $cf_clang_optok" >&5
 echo "${ECHO_T}$cf_clang_optok" >&6
 		CFLAGS="$cf_save_CFLAGS"
 		if test "$cf_clang_optok" = yes; then
 			test -n "$verbose" && echo "	adding option $cf_clang_opt" 1>&6
 
-echo "${as_me:-configure}:2127: testing adding option $cf_clang_opt ..." 1>&5
+echo "${as_me:-configure}:2128: testing adding option $cf_clang_opt ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_clang_opt"
@@ -2133,7 +2134,7 @@
 	done
 fi
 
-echo "$as_me:2136: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:2137: checking for $CC option to accept ANSI C" >&5
 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2141,7 +2142,7 @@
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 2144 "configure"
+#line 2145 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -2190,16 +2191,16 @@
 do
   CC="$ac_save_CC $ac_arg"
   rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2193: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2194: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2196: \$? = $ac_status" >&5
+  echo "$as_me:2197: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2199: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2200: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2202: \$? = $ac_status" >&5
+  echo "$as_me:2203: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_cc_stdc=$ac_arg
 break
@@ -2216,10 +2217,10 @@
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)
-    echo "$as_me:2219: result: none needed" >&5
+    echo "$as_me:2220: result: none needed" >&5
 echo "${ECHO_T}none needed" >&6 ;;
   *)
-    echo "$as_me:2222: result: $ac_cv_prog_cc_stdc" >&5
+    echo "$as_me:2223: result: $ac_cv_prog_cc_stdc" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
     CC="$CC $ac_cv_prog_cc_stdc" ;;
 esac
@@ -2227,13 +2228,13 @@
 # This should have been defined by AC_PROG_CC
 : "${CC:=cc}"
 
-echo "$as_me:2230: checking \$CFLAGS variable" >&5
+echo "$as_me:2231: checking \$CFLAGS variable" >&5
 echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
 case "x$CFLAGS" in
 (*-[IUD]*)
-	echo "$as_me:2234: result: broken" >&5
+	echo "$as_me:2235: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:2236: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
+	{ echo "$as_me:2237: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
 echo "$as_me: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&2;}
 	cf_flags="$CFLAGS"
 	CFLAGS=
@@ -2341,18 +2342,18 @@
 	done
 	;;
 (*)
-	echo "$as_me:2344: result: ok" >&5
+	echo "$as_me:2345: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
 
-echo "$as_me:2349: checking \$CC variable" >&5
+echo "$as_me:2350: checking \$CC variable" >&5
 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
 case "$CC" in
 (*[\ \	]-*)
-	echo "$as_me:2353: result: broken" >&5
+	echo "$as_me:2354: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:2355: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
+	{ echo "$as_me:2356: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
 echo "$as_me: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;}
 	# humor him...
 	cf_prog=`echo "$CC" | sed -e 's/	/ /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'`
@@ -2469,19 +2470,19 @@
 	done
 	test -n "$verbose" && echo "	resulting CC: '$CC'" 1>&6
 
-echo "${as_me:-configure}:2472: testing resulting CC: '$CC' ..." 1>&5
+echo "${as_me:-configure}:2473: testing resulting CC: '$CC' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CFLAGS: '$CFLAGS'" 1>&6
 
-echo "${as_me:-configure}:2476: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+echo "${as_me:-configure}:2477: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
 
-echo "${as_me:-configure}:2480: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+echo "${as_me:-configure}:2481: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
 
 	;;
 (*)
-	echo "$as_me:2484: result: ok" >&5
+	echo "$as_me:2485: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
@@ -2490,7 +2491,7 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:2493: checking for $ac_word" >&5
+echo "$as_me:2494: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_GREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2505,7 +2506,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_GREP="$ac_prog"
-echo "$as_me:2508: found $ac_dir/$ac_word" >&5
+echo "$as_me:2509: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2513,10 +2514,10 @@
 fi
 GREP=$ac_cv_prog_GREP
 if test -n "$GREP"; then
-  echo "$as_me:2516: result: $GREP" >&5
+  echo "$as_me:2517: result: $GREP" >&5
 echo "${ECHO_T}$GREP" >&6
 else
-  echo "$as_me:2519: result: no" >&5
+  echo "$as_me:2520: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2524,7 +2525,7 @@
 done
 test -n "$GREP" || GREP=": "
 
-echo "$as_me:2527: checking for egrep" >&5
+echo "$as_me:2528: checking for egrep" >&5
 echo $ECHO_N "checking for egrep... $ECHO_C" >&6
 if test "${ac_cv_path_EGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2536,7 +2537,7 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:2539: checking for $ac_word" >&5
+echo "$as_me:2540: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_EGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2553,7 +2554,7 @@
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_EGREP="$ac_dir/$ac_word"
-   echo "$as_me:2556: found $ac_dir/$ac_word" >&5
+   echo "$as_me:2557: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -2564,10 +2565,10 @@
 EGREP=$ac_cv_path_EGREP
 
 if test -n "$EGREP"; then
-  echo "$as_me:2567: result: $EGREP" >&5
+  echo "$as_me:2568: result: $EGREP" >&5
 echo "${ECHO_T}$EGREP" >&6
 else
-  echo "$as_me:2570: result: no" >&5
+  echo "$as_me:2571: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2575,12 +2576,12 @@
 done
 test -n "$EGREP" || EGREP=": "
 
-     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2578: error: cannot find workable egrep" >&5
+     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2579: error: cannot find workable egrep" >&5
 echo "$as_me: error: cannot find workable egrep" >&2;}
    { (exit 1); exit 1; }; }
    fi
 fi
-echo "$as_me:2583: result: $ac_cv_path_EGREP" >&5
+echo "$as_me:2584: result: $ac_cv_path_EGREP" >&5
 echo "${ECHO_T}$ac_cv_path_EGREP" >&6
  EGREP="$ac_cv_path_EGREP"
 
@@ -2590,7 +2591,7 @@
 ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
-echo "$as_me:2593: checking how to run the C preprocessor" >&5
+echo "$as_me:2594: checking how to run the C preprocessor" >&5
 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
@@ -2611,18 +2612,18 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2614 "configure"
+#line 2615 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2619: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2620: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2625: \$? = $ac_status" >&5
+  echo "$as_me:2626: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2645,17 +2646,17 @@
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2648 "configure"
+#line 2649 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2652: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2653: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2658: \$? = $ac_status" >&5
+  echo "$as_me:2659: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2692,7 +2693,7 @@
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:2695: result: $CPP" >&5
+echo "$as_me:2696: result: $CPP" >&5
 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -2702,18 +2703,18 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2705 "configure"
+#line 2706 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2710: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2711: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2716: \$? = $ac_status" >&5
+  echo "$as_me:2717: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2736,17 +2737,17 @@
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2739 "configure"
+#line 2740 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2743: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2744: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2749: \$? = $ac_status" >&5
+  echo "$as_me:2750: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2774,7 +2775,7 @@
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:2777: error: C preprocessor \"$CPP\" fails sanity check" >&5
+  { { echo "$as_me:2778: error: C preprocessor \"$CPP\" fails sanity check" >&5
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -2790,7 +2791,7 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:2793: checking for $ac_word" >&5
+echo "$as_me:2794: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_AWK+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2805,7 +2806,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AWK="$ac_prog"
-echo "$as_me:2808: found $ac_dir/$ac_word" >&5
+echo "$as_me:2809: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2813,10 +2814,10 @@
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$as_me:2816: result: $AWK" >&5
+  echo "$as_me:2817: result: $AWK" >&5
 echo "${ECHO_T}$AWK" >&6
 else
-  echo "$as_me:2819: result: no" >&5
+  echo "$as_me:2820: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2835,7 +2836,7 @@
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:2838: checking for a BSD compatible install" >&5
+echo "$as_me:2839: checking for a BSD compatible install" >&5
 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
@@ -2884,7 +2885,7 @@
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:2887: result: $INSTALL" >&5
+echo "$as_me:2888: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -2895,14 +2896,14 @@
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-echo "$as_me:2898: checking whether ln -s works" >&5
+echo "$as_me:2899: checking whether ln -s works" >&5
 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  echo "$as_me:2902: result: yes" >&5
+  echo "$as_me:2903: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:2905: result: no, using $LN_S" >&5
+  echo "$as_me:2906: result: no, using $LN_S" >&5
 echo "${ECHO_T}no, using $LN_S" >&6
 fi
 
@@ -2923,7 +2924,7 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:2926: checking for $ac_word" >&5
+echo "$as_me:2927: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_LINT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2938,7 +2939,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LINT="$ac_prog"
-echo "$as_me:2941: found $ac_dir/$ac_word" >&5
+echo "$as_me:2942: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2946,10 +2947,10 @@
 fi
 LINT=$ac_cv_prog_LINT
 if test -n "$LINT"; then
-  echo "$as_me:2949: result: $LINT" >&5
+  echo "$as_me:2950: result: $LINT" >&5
 echo "${ECHO_T}$LINT" >&6
 else
-  echo "$as_me:2952: result: no" >&5
+  echo "$as_me:2953: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2964,14 +2965,14 @@
 
 ###	checks for compiler characteristics
 
-echo "$as_me:2967: checking if the POSIX test-macros are already defined" >&5
+echo "$as_me:2968: checking if the POSIX test-macros are already defined" >&5
 echo $ECHO_N "checking if the POSIX test-macros are already defined... $ECHO_C" >&6
 if test "${cf_cv_posix_visible+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 2974 "configure"
+#line 2975 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -2990,16 +2991,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2993: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2994: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2996: \$? = $ac_status" >&5
+  echo "$as_me:2997: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2999: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3000: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3002: \$? = $ac_status" >&5
+  echo "$as_me:3003: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_visible=no
 else
@@ -3010,7 +3011,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:3013: result: $cf_cv_posix_visible" >&5
+echo "$as_me:3014: result: $cf_cv_posix_visible" >&5
 echo "${ECHO_T}$cf_cv_posix_visible" >&6
 
 if test "$cf_cv_posix_visible" = no; then
@@ -3051,18 +3052,18 @@
 	cf_xopen_source="-D_SGI_SOURCE"
 	cf_XOPEN_SOURCE=
 	;;
-(linux*|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin)
+(linux*gnu|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin)
 
 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
 
-echo "$as_me:3058: checking if this is the GNU C library" >&5
+echo "$as_me:3059: checking if this is the GNU C library" >&5
 echo $ECHO_N "checking if this is the GNU C library... $ECHO_C" >&6
 if test "${cf_cv_gnu_library+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 3065 "configure"
+#line 3066 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -3081,16 +3082,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3084: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3085: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3087: \$? = $ac_status" >&5
+  echo "$as_me:3088: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3090: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3091: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3093: \$? = $ac_status" >&5
+  echo "$as_me:3094: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library=yes
 else
@@ -3101,7 +3102,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:3104: result: $cf_cv_gnu_library" >&5
+echo "$as_me:3105: result: $cf_cv_gnu_library" >&5
 echo "${ECHO_T}$cf_cv_gnu_library" >&6
 
 if test x$cf_cv_gnu_library = xyes; then
@@ -3109,7 +3110,7 @@
 	# With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE
 	# was changed to help a little.  newlib incorporated the change about 4
 	# years later.
-	echo "$as_me:3112: checking if _DEFAULT_SOURCE can be used as a basis" >&5
+	echo "$as_me:3113: checking if _DEFAULT_SOURCE can be used as a basis" >&5
 echo $ECHO_N "checking if _DEFAULT_SOURCE can be used as a basis... $ECHO_C" >&6
 if test "${cf_cv_gnu_library_219+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3121,7 +3122,7 @@
 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 3124 "configure"
+#line 3125 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -3140,16 +3141,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3143: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3144: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3146: \$? = $ac_status" >&5
+  echo "$as_me:3147: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3149: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3150: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3152: \$? = $ac_status" >&5
+  echo "$as_me:3153: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library_219=yes
 else
@@ -3161,12 +3162,12 @@
 		CPPFLAGS="$cf_save"
 
 fi
-echo "$as_me:3164: result: $cf_cv_gnu_library_219" >&5
+echo "$as_me:3165: result: $cf_cv_gnu_library_219" >&5
 echo "${ECHO_T}$cf_cv_gnu_library_219" >&6
 
 	if test "x$cf_cv_gnu_library_219" = xyes; then
 		cf_save="$CPPFLAGS"
-		echo "$as_me:3169: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
+		echo "$as_me:3170: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
 echo $ECHO_N "checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_gnu_dftsrc_219+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3271,7 +3272,7 @@
 fi
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 3274 "configure"
+#line 3275 "configure"
 #include "confdefs.h"
 
 				#include <limits.h>
@@ -3291,16 +3292,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3294: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3295: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3297: \$? = $ac_status" >&5
+  echo "$as_me:3298: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3300: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3301: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3303: \$? = $ac_status" >&5
+  echo "$as_me:3304: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_dftsrc_219=yes
 else
@@ -3311,7 +3312,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:3314: result: $cf_cv_gnu_dftsrc_219" >&5
+echo "$as_me:3315: result: $cf_cv_gnu_dftsrc_219" >&5
 echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
 		test "x$cf_cv_gnu_dftsrc_219" = "xyes" || CPPFLAGS="$cf_save"
 	else
@@ -3320,14 +3321,14 @@
 
 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
 
-		echo "$as_me:3323: checking if we must define _GNU_SOURCE" >&5
+		echo "$as_me:3324: checking if we must define _GNU_SOURCE" >&5
 echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_gnu_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 3330 "configure"
+#line 3331 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -3342,16 +3343,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3345: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3346: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3348: \$? = $ac_status" >&5
+  echo "$as_me:3349: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3351: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3352: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3354: \$? = $ac_status" >&5
+  echo "$as_me:3355: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -3458,7 +3459,7 @@
 fi
 
 			 cat >"conftest.$ac_ext" <<_ACEOF
-#line 3461 "configure"
+#line 3462 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -3473,16 +3474,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3476: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3477: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3479: \$? = $ac_status" >&5
+  echo "$as_me:3480: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3482: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3483: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3485: \$? = $ac_status" >&5
+  echo "$as_me:3486: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -3497,12 +3498,12 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:3500: result: $cf_cv_gnu_source" >&5
+echo "$as_me:3501: result: $cf_cv_gnu_source" >&5
 echo "${ECHO_T}$cf_cv_gnu_source" >&6
 
 		if test "$cf_cv_gnu_source" = yes
 		then
-		echo "$as_me:3505: checking if we should also define _DEFAULT_SOURCE" >&5
+		echo "$as_me:3506: checking if we should also define _DEFAULT_SOURCE" >&5
 echo $ECHO_N "checking if we should also define _DEFAULT_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_default_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3512,7 +3513,7 @@
 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 3515 "configure"
+#line 3516 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -3527,16 +3528,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3530: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3531: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3533: \$? = $ac_status" >&5
+  echo "$as_me:3534: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3536: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3537: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3539: \$? = $ac_status" >&5
+  echo "$as_me:3540: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_default_source=no
 else
@@ -3547,7 +3548,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:3550: result: $cf_cv_default_source" >&5
+echo "$as_me:3551: result: $cf_cv_default_source" >&5
 echo "${ECHO_T}$cf_cv_default_source" >&6
 			if test "$cf_cv_default_source" = yes
 			then
@@ -3584,16 +3585,16 @@
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:3587: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:3588: checking if we should define _POSIX_C_SOURCE" >&5
 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_posix_c_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-echo "${as_me:-configure}:3593: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:3594: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 3596 "configure"
+#line 3597 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -3608,16 +3609,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3611: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3612: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3614: \$? = $ac_status" >&5
+  echo "$as_me:3615: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3617: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3618: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3620: \$? = $ac_status" >&5
+  echo "$as_me:3621: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -3638,7 +3639,7 @@
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 3641 "configure"
+#line 3642 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -3653,16 +3654,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3656: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3657: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3659: \$? = $ac_status" >&5
+  echo "$as_me:3660: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3662: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3663: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3665: \$? = $ac_status" >&5
+  echo "$as_me:3666: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -3673,7 +3674,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:3676: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:3677: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -3681,10 +3682,10 @@
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:3684: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:3685: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 3687 "configure"
+#line 3688 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -3699,16 +3700,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3702: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3703: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3705: \$? = $ac_status" >&5
+  echo "$as_me:3706: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3708: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3709: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3711: \$? = $ac_status" >&5
+  echo "$as_me:3712: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -3724,7 +3725,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:3727: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:3728: result: $cf_cv_posix_c_source" >&5
 echo "${ECHO_T}$cf_cv_posix_c_source" >&6
 
 if test "$cf_cv_posix_c_source" != no ; then
@@ -3841,7 +3842,7 @@
 	# OpenBSD 6.x has broken locale support, both compile-time and runtime.
 	# see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html
 	# Abusing the conformance level is a workaround.
-	{ echo "$as_me:3844: WARNING: this system does not provide usable locale support" >&5
+	{ echo "$as_me:3845: WARNING: this system does not provide usable locale support" >&5
 echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	cf_xopen_source="-D_BSD_SOURCE"
 	cf_XOPEN_SOURCE=700
@@ -3873,14 +3874,14 @@
 	;;
 (*)
 
-echo "$as_me:3876: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:3877: checking if we should define _XOPEN_SOURCE" >&5
 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_xopen_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 3883 "configure"
+#line 3884 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -3894,21 +3895,22 @@
 #ifndef _XOPEN_SOURCE
 make an error
 #endif
+
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3902: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3904: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3905: \$? = $ac_status" >&5
+  echo "$as_me:3907: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3908: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3910: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3911: \$? = $ac_status" >&5
+  echo "$as_me:3913: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -3920,7 +3922,7 @@
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 3923 "configure"
+#line 3925 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -3931,24 +3933,25 @@
 main (void)
 {
 
-#ifdef _XOPEN_SOURCE
+#ifndef _XOPEN_SOURCE
 make an error
 #endif
+
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3942: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3945: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3945: \$? = $ac_status" >&5
+  echo "$as_me:3948: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3948: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3951: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3951: \$? = $ac_status" >&5
+  echo "$as_me:3954: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -3957,13 +3960,13 @@
 cf_cv_xopen_source=$cf_XOPEN_SOURCE
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	CPPFLAGS="$cf_save"
+		CPPFLAGS="$cf_save"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:3966: result: $cf_cv_xopen_source" >&5
+echo "$as_me:3969: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -4106,6 +4109,8 @@
 
 fi
 
+	cf_save_xopen_cppflags="$CPPFLAGS"
+
 if test "$cf_cv_posix_visible" = no; then
 
 cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE
@@ -4121,16 +4126,16 @@
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:4124: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:4129: checking if we should define _POSIX_C_SOURCE" >&5
 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_posix_c_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-echo "${as_me:-configure}:4130: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:4135: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 4133 "configure"
+#line 4138 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4145,16 +4150,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4148: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4153: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4151: \$? = $ac_status" >&5
+  echo "$as_me:4156: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4154: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4159: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4157: \$? = $ac_status" >&5
+  echo "$as_me:4162: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -4175,7 +4180,7 @@
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 4178 "configure"
+#line 4183 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4190,16 +4195,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4193: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4198: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4196: \$? = $ac_status" >&5
+  echo "$as_me:4201: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4199: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4204: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4202: \$? = $ac_status" >&5
+  echo "$as_me:4207: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -4210,7 +4215,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:4213: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:4218: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -4218,10 +4223,10 @@
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:4221: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:4226: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 4224 "configure"
+#line 4229 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4236,16 +4241,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4239: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4244: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4242: \$? = $ac_status" >&5
+  echo "$as_me:4247: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4245: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4250: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4248: \$? = $ac_status" >&5
+  echo "$as_me:4253: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -4261,7 +4266,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:4264: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:4269: result: $cf_cv_posix_c_source" >&5
 echo "${ECHO_T}$cf_cv_posix_c_source" >&6
 
 if test "$cf_cv_posix_c_source" != no ; then
@@ -4370,6 +4375,53 @@
 
 fi # cf_cv_posix_visible
 
+	# Some of these niche implementations use copy/paste, double-check...
+	test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE inteferes" 1>&6
+
+echo "${as_me:-configure}:4381: testing checking if _POSIX_C_SOURCE inteferes ..." 1>&5
+
+	cat >"conftest.$ac_ext" <<_ACEOF
+#line 4384 "configure"
+#include "confdefs.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+
+int
+main (void)
+{
+
+#ifndef _XOPEN_SOURCE
+make an error
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:4404: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:4407: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:4410: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4413: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+cat "conftest.$ac_ext" >&5
+
+		{ echo "$as_me:4420: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
+		CPPFLAGS="$cf_save_xopen_cppflags"
+fi
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	;;
 esac
 
@@ -4387,7 +4439,7 @@
 	test "$CFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CFLAGS" 1>&6
 
-echo "${as_me:-configure}:4390: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+echo "${as_me:-configure}:4442: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
 
 	CFLAGS="$cf_old_cflag"
 done
@@ -4399,7 +4451,7 @@
 	test "$CPPFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:4402: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:4454: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
 
 	CPPFLAGS="$cf_old_cflag"
 done
@@ -4487,7 +4539,7 @@
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:4490: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:4542: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -4497,7 +4549,7 @@
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:4500: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:4552: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -4507,7 +4559,7 @@
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:4510: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:4562: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
 
 	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
 	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
@@ -4519,10 +4571,10 @@
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-	echo "$as_me:4522: checking if _XOPEN_SOURCE really is set" >&5
+	echo "$as_me:4574: checking if _XOPEN_SOURCE really is set" >&5
 echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 4525 "configure"
+#line 4577 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -4537,16 +4589,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4540: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4592: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4543: \$? = $ac_status" >&5
+  echo "$as_me:4595: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4546: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4598: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4549: \$? = $ac_status" >&5
+  echo "$as_me:4601: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else
@@ -4555,12 +4607,12 @@
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:4558: result: $cf_XOPEN_SOURCE_set" >&5
+	echo "$as_me:4610: result: $cf_XOPEN_SOURCE_set" >&5
 echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6
 	if test "$cf_XOPEN_SOURCE_set" = yes
 	then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 4563 "configure"
+#line 4615 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -4575,16 +4627,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4578: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4630: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4581: \$? = $ac_status" >&5
+  echo "$as_me:4633: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4584: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4636: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4587: \$? = $ac_status" >&5
+  echo "$as_me:4639: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set_ok=yes
 else
@@ -4595,19 +4647,19 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_XOPEN_SOURCE_set_ok" = no
 		then
-			{ echo "$as_me:4598: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+			{ echo "$as_me:4650: WARNING: _XOPEN_SOURCE is lower than requested" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
 		fi
 	else
 
-echo "$as_me:4603: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:4655: checking if we should define _XOPEN_SOURCE" >&5
 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_xopen_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 4610 "configure"
+#line 4662 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -4621,21 +4673,22 @@
 #ifndef _XOPEN_SOURCE
 make an error
 #endif
+
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4629: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4682: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4632: \$? = $ac_status" >&5
+  echo "$as_me:4685: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4635: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4688: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4638: \$? = $ac_status" >&5
+  echo "$as_me:4691: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -4647,7 +4700,7 @@
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 4650 "configure"
+#line 4703 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -4658,24 +4711,25 @@
 main (void)
 {
 
-#ifdef _XOPEN_SOURCE
+#ifndef _XOPEN_SOURCE
 make an error
 #endif
+
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4669: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4723: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4672: \$? = $ac_status" >&5
+  echo "$as_me:4726: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4675: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4729: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4678: \$? = $ac_status" >&5
+  echo "$as_me:4732: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -4684,13 +4738,13 @@
 cf_cv_xopen_source=$cf_XOPEN_SOURCE
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	CPPFLAGS="$cf_save"
+		CPPFLAGS="$cf_save"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:4693: result: $cf_cv_xopen_source" >&5
+echo "$as_me:4747: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -4837,14 +4891,14 @@
 fi
 fi # cf_cv_posix_visible
 
-echo "$as_me:4840: checking if SIGWINCH is defined" >&5
+echo "$as_me:4894: checking if SIGWINCH is defined" >&5
 echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6
 if test "${cf_cv_define_sigwinch+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 4847 "configure"
+#line 4901 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -4859,23 +4913,23 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4862: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4916: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4865: \$? = $ac_status" >&5
+  echo "$as_me:4919: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4868: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4922: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4871: \$? = $ac_status" >&5
+  echo "$as_me:4925: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_define_sigwinch=yes
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 4878 "configure"
+#line 4932 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -4893,16 +4947,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4896: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4950: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4899: \$? = $ac_status" >&5
+  echo "$as_me:4953: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4902: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4956: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4905: \$? = $ac_status" >&5
+  echo "$as_me:4959: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_define_sigwinch=maybe
 else
@@ -4916,11 +4970,11 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:4919: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:4973: result: $cf_cv_define_sigwinch" >&5
 echo "${ECHO_T}$cf_cv_define_sigwinch" >&6
 
 if test "$cf_cv_define_sigwinch" = maybe ; then
-echo "$as_me:4923: checking for actual SIGWINCH definition" >&5
+echo "$as_me:4977: checking for actual SIGWINCH definition" >&5
 echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6
 if test "${cf_cv_fixup_sigwinch+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4931,7 +4985,7 @@
 while test "$cf_sigwinch" != 1
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 4934 "configure"
+#line 4988 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -4953,16 +5007,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4956: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5010: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4959: \$? = $ac_status" >&5
+  echo "$as_me:5013: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4962: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5016: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4965: \$? = $ac_status" >&5
+  echo "$as_me:5019: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fixup_sigwinch=$cf_sigwinch
 	 break
@@ -4976,7 +5030,7 @@
 done
 
 fi
-echo "$as_me:4979: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:5033: result: $cf_cv_fixup_sigwinch" >&5
 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
 
 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
@@ -4998,23 +5052,23 @@
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:5001: checking for $ac_header" >&5
+echo "$as_me:5055: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5007 "configure"
+#line 5061 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:5011: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:5065: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:5017: \$? = $ac_status" >&5
+  echo "$as_me:5071: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5033,7 +5087,7 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:5036: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:5090: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -5043,13 +5097,13 @@
 fi
 done
 
-echo "$as_me:5046: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:5100: checking whether time.h and sys/time.h may both be included" >&5
 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
 if test "${ac_cv_header_time+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5052 "configure"
+#line 5106 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -5065,16 +5119,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5068: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5122: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5071: \$? = $ac_status" >&5
+  echo "$as_me:5125: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5074: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5128: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5077: \$? = $ac_status" >&5
+  echo "$as_me:5131: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
@@ -5084,7 +5138,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:5087: result: $ac_cv_header_time" >&5
+echo "$as_me:5141: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -5094,13 +5148,13 @@
 
 fi
 
-echo "$as_me:5097: checking for nl_langinfo and CODESET" >&5
+echo "$as_me:5151: checking for nl_langinfo and CODESET" >&5
 echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
 if test "${am_cv_langinfo_codeset+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5103 "configure"
+#line 5157 "configure"
 #include "confdefs.h"
 #include <langinfo.h>
 int
@@ -5112,16 +5166,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:5115: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5169: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5118: \$? = $ac_status" >&5
+  echo "$as_me:5172: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:5121: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5175: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5124: \$? = $ac_status" >&5
+  echo "$as_me:5178: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   am_cv_langinfo_codeset=yes
 else
@@ -5132,7 +5186,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:5135: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:5189: result: $am_cv_langinfo_codeset" >&5
 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
 	if test "$am_cv_langinfo_codeset" = yes; then
 
@@ -5144,7 +5198,7 @@
 
 ###	checks for typedefs
 
-echo "$as_me:5147: checking for signal global datatype" >&5
+echo "$as_me:5201: checking for signal global datatype" >&5
 echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6
 if test "${cf_cv_sig_atomic_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5156,7 +5210,7 @@
 		"int"
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 5159 "configure"
+#line 5213 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -5180,16 +5234,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5183: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5237: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5186: \$? = $ac_status" >&5
+  echo "$as_me:5240: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5189: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5243: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5192: \$? = $ac_status" >&5
+  echo "$as_me:5246: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sig_atomic_t=$cf_type
 else
@@ -5203,20 +5257,20 @@
 
 fi
 
-echo "$as_me:5206: result: $cf_cv_sig_atomic_t" >&5
+echo "$as_me:5260: result: $cf_cv_sig_atomic_t" >&5
 echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6
 test "$cf_cv_sig_atomic_t" != no &&
 cat >>confdefs.h <<EOF
 #define SIG_ATOMIC_T $cf_cv_sig_atomic_t
 EOF
 
-echo "$as_me:5213: checking for ANSI C header files" >&5
+echo "$as_me:5267: checking for ANSI C header files" >&5
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5219 "configure"
+#line 5273 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -5224,13 +5278,13 @@
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:5227: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:5281: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:5233: \$? = $ac_status" >&5
+  echo "$as_me:5287: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5252,7 +5306,7 @@
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5255 "configure"
+#line 5309 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -5270,7 +5324,7 @@
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5273 "configure"
+#line 5327 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -5291,7 +5345,7 @@
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5294 "configure"
+#line 5348 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -5317,15 +5371,15 @@
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:5320: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5374: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5323: \$? = $ac_status" >&5
+  echo "$as_me:5377: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:5325: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5379: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5328: \$? = $ac_status" >&5
+  echo "$as_me:5382: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -5338,7 +5392,7 @@
 fi
 fi
 fi
-echo "$as_me:5341: result: $ac_cv_header_stdc" >&5
+echo "$as_me:5395: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -5354,28 +5408,28 @@
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:5357: checking for $ac_header" >&5
+echo "$as_me:5411: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5363 "configure"
+#line 5417 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5369: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5423: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5372: \$? = $ac_status" >&5
+  echo "$as_me:5426: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5375: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5429: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5378: \$? = $ac_status" >&5
+  echo "$as_me:5432: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -5385,7 +5439,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:5388: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:5442: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -5395,13 +5449,13 @@
 fi
 done
 
-echo "$as_me:5398: checking for time_t" >&5
+echo "$as_me:5452: checking for time_t" >&5
 echo $ECHO_N "checking for time_t... $ECHO_C" >&6
 if test "${ac_cv_type_time_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5404 "configure"
+#line 5458 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -5416,16 +5470,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5419: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5473: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5422: \$? = $ac_status" >&5
+  echo "$as_me:5476: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5425: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5479: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5428: \$? = $ac_status" >&5
+  echo "$as_me:5482: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_time_t=yes
 else
@@ -5435,7 +5489,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:5438: result: $ac_cv_type_time_t" >&5
+echo "$as_me:5492: result: $ac_cv_type_time_t" >&5
 echo "${ECHO_T}$ac_cv_type_time_t" >&6
 if test "$ac_cv_type_time_t" = yes; then
   :
@@ -5447,14 +5501,14 @@
 
 fi
 
-echo "$as_me:5450: checking for cc_t in <termios.h> or <termio.h>" >&5
+echo "$as_me:5504: checking for cc_t in <termios.h> or <termio.h>" >&5
 echo $ECHO_N "checking for cc_t in <termios.h> or <termio.h>... $ECHO_C" >&6
 if test "${cf_cv_type_cc_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 5457 "configure"
+#line 5511 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -5474,16 +5528,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5477: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5531: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5480: \$? = $ac_status" >&5
+  echo "$as_me:5534: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5483: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5537: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5486: \$? = $ac_status" >&5
+  echo "$as_me:5540: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_type_cc_t=yes
 else
@@ -5495,20 +5549,20 @@
 
 fi
 
-echo "$as_me:5498: result: $cf_cv_type_cc_t" >&5
+echo "$as_me:5552: result: $cf_cv_type_cc_t" >&5
 echo "${ECHO_T}$cf_cv_type_cc_t" >&6
 test $cf_cv_type_cc_t = no &&
 cat >>confdefs.h <<\EOF
 #define cc_t unsigned char
 EOF
 
-echo "$as_me:5505: checking for mode_t" >&5
+echo "$as_me:5559: checking for mode_t" >&5
 echo $ECHO_N "checking for mode_t... $ECHO_C" >&6
 if test "${ac_cv_type_mode_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5511 "configure"
+#line 5565 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -5523,16 +5577,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5526: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5580: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5529: \$? = $ac_status" >&5
+  echo "$as_me:5583: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5532: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5586: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5535: \$? = $ac_status" >&5
+  echo "$as_me:5589: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_mode_t=yes
 else
@@ -5542,7 +5596,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:5545: result: $ac_cv_type_mode_t" >&5
+echo "$as_me:5599: result: $ac_cv_type_mode_t" >&5
 echo "${ECHO_T}$ac_cv_type_mode_t" >&6
 if test "$ac_cv_type_mode_t" = yes; then
   :
@@ -5554,13 +5608,13 @@
 
 fi
 
-echo "$as_me:5557: checking for pid_t" >&5
+echo "$as_me:5611: checking for pid_t" >&5
 echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
 if test "${ac_cv_type_pid_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5563 "configure"
+#line 5617 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -5575,16 +5629,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5578: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5632: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5581: \$? = $ac_status" >&5
+  echo "$as_me:5635: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5584: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5638: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5587: \$? = $ac_status" >&5
+  echo "$as_me:5641: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -5594,7 +5648,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:5597: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:5651: result: $ac_cv_type_pid_t" >&5
 echo "${ECHO_T}$ac_cv_type_pid_t" >&6
 if test "$ac_cv_type_pid_t" = yes; then
   :
@@ -5606,13 +5660,13 @@
 
 fi
 
-echo "$as_me:5609: checking for uid_t in sys/types.h" >&5
+echo "$as_me:5663: checking for uid_t in sys/types.h" >&5
 echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6
 if test "${ac_cv_type_uid_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5615 "configure"
+#line 5669 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -5626,7 +5680,7 @@
 rm -rf conftest*
 
 fi
-echo "$as_me:5629: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:5683: result: $ac_cv_type_uid_t" >&5
 echo "${ECHO_T}$ac_cv_type_uid_t" >&6
 if test $ac_cv_type_uid_t = no; then
 
@@ -5640,13 +5694,13 @@
 
 fi
 
-echo "$as_me:5643: checking for off_t" >&5
+echo "$as_me:5697: checking for off_t" >&5
 echo $ECHO_N "checking for off_t... $ECHO_C" >&6
 if test "${ac_cv_type_off_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5649 "configure"
+#line 5703 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -5661,16 +5715,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5664: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5718: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5667: \$? = $ac_status" >&5
+  echo "$as_me:5721: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5670: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5724: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5673: \$? = $ac_status" >&5
+  echo "$as_me:5727: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -5680,7 +5734,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:5683: result: $ac_cv_type_off_t" >&5
+echo "$as_me:5737: result: $ac_cv_type_off_t" >&5
 echo "${ECHO_T}$ac_cv_type_off_t" >&6
 if test "$ac_cv_type_off_t" = yes; then
   :
@@ -5712,13 +5766,13 @@
 	wcwidth
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:5715: checking for $ac_func" >&5
+echo "$as_me:5769: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5721 "configure"
+#line 5775 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -5749,16 +5803,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:5752: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5806: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5755: \$? = $ac_status" >&5
+  echo "$as_me:5809: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:5758: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5812: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5761: \$? = $ac_status" >&5
+  echo "$as_me:5815: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -5768,7 +5822,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:5771: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:5825: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -5778,26 +5832,222 @@
 fi
 done
 
+for ac_header in \
+unistd.h \
+
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:5840: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 5846 "configure"
+#include "confdefs.h"
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:5850: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:5856: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
+  cat "conftest.$ac_ext" >&5
+  eval "$as_ac_Header=no"
+fi
+rm -f conftest.err "conftest.$ac_ext"
+fi
+echo "$as_me:5875: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
+if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
+  cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+EOF
+
+fi
+done
+
+echo "$as_me:5885: checking for working mkstemp" >&5
+echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6
+if test "${cf_cv_func_mkstemp+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+rm -rf ./conftest*
+if test "$cross_compiling" = yes; then
+  cf_cv_func_mkstemp=maybe
+else
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 5896 "configure"
+#include "confdefs.h"
+
+#include <sys/types.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/stat.h>
+int main(void)
+{
+	char *tmpl = "conftestXXXXXX";
+	char name[2][80];
+	int n;
+	int result = 0;
+	int fd;
+	struct stat sb;
+
+	umask(077);
+	for (n = 0; n < 2; ++n) {
+		strcpy(name[n], tmpl);
+		if ((fd = mkstemp(name[n])) >= 0) {
+			if (!strcmp(name[n], tmpl)
+			 || stat(name[n], &sb) != 0
+			 || (sb.st_mode & S_IFMT) != S_IFREG
+			 || (sb.st_mode & 077) != 0) {
+				result = 1;
+			}
+			close(fd);
+		}
+	}
+	if (result == 0
+	 && !strcmp(name[0], name[1]))
+		result = 1;
+	${cf_cv_main_return:-return}(result);
+}
+
+_ACEOF
+rm -f "conftest$ac_exeext"
+if { (eval echo "$as_me:5937: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:5940: \$? = $ac_status" >&5
+  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+  { (eval echo "$as_me:5942: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:5945: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  cf_cv_func_mkstemp=yes
+
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+cat "conftest.$ac_ext" >&5
+cf_cv_func_mkstemp=no
+
+fi
+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
+fi
+
+fi
+echo "$as_me:5960: result: $cf_cv_func_mkstemp" >&5
+echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
+if test "x$cf_cv_func_mkstemp" = xmaybe ; then
+	echo "$as_me:5963: checking for mkstemp" >&5
+echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
+if test "${ac_cv_func_mkstemp+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 5969 "configure"
+#include "confdefs.h"
+#define mkstemp autoconf_temporary
+#include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+#undef mkstemp
+
+#ifdef __cplusplus
+extern "C"
+#endif
+
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char mkstemp (void);
+
+int
+main (void)
+{
+
+/* The GNU C library defines stubs for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_mkstemp) || defined (__stub___mkstemp)
+#error found stub for mkstemp
+#endif
+
+	return mkstemp ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:6000: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:6003: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:6006: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6009: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  ac_cv_func_mkstemp=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat "conftest.$ac_ext" >&5
+ac_cv_func_mkstemp=no
+fi
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+fi
+echo "$as_me:6019: result: $ac_cv_func_mkstemp" >&5
+echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+
+fi
+if test "x$cf_cv_func_mkstemp" = xyes || test "x$ac_cv_func_mkstemp" = xyes ; then
+
+cat >>confdefs.h <<\EOF
+#define HAVE_MKSTEMP 1
+EOF
+
+fi
+
 for ac_header in lastlog.h paths.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:5784: checking for $ac_header" >&5
+echo "$as_me:6034: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5790 "configure"
+#line 6040 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:5794: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:6044: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:5800: \$? = $ac_status" >&5
+  echo "$as_me:6050: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5816,7 +6066,7 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:5819: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6069: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -5826,14 +6076,14 @@
 fi
 done
 
-echo "$as_me:5829: checking for lastlog path" >&5
+echo "$as_me:6079: checking for lastlog path" >&5
 echo $ECHO_N "checking for lastlog path... $ECHO_C" >&6
 if test "${cf_cv_path_lastlog+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 5836 "configure"
+#line 6086 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -5853,16 +6103,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5856: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6106: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5859: \$? = $ac_status" >&5
+  echo "$as_me:6109: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5862: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6112: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5865: \$? = $ac_status" >&5
+  echo "$as_me:6115: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_path_lastlog="_PATH_LASTLOG"
 else
@@ -5877,14 +6127,14 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:5880: result: $cf_cv_path_lastlog" >&5
+echo "$as_me:6130: result: $cf_cv_path_lastlog" >&5
 echo "${ECHO_T}$cf_cv_path_lastlog" >&6
 test "$cf_cv_path_lastlog" != no &&
 cat >>confdefs.h <<\EOF
 #define USE_LASTLOG 1
 EOF
 
-echo "$as_me:5887: checking for utmp implementation" >&5
+echo "$as_me:6137: checking for utmp implementation" >&5
 echo $ECHO_N "checking for utmp implementation... $ECHO_C" >&6
 if test "${cf_cv_have_utmp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5901,7 +6151,7 @@
 #endif
 "
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 5904 "configure"
+#line 6154 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -5917,16 +6167,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5920: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6170: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5923: \$? = $ac_status" >&5
+  echo "$as_me:6173: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5926: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6176: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5929: \$? = $ac_status" >&5
+  echo "$as_me:6179: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -5935,7 +6185,7 @@
 cat "conftest.$ac_ext" >&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 5938 "configure"
+#line 6188 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -5951,16 +6201,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5954: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6204: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5957: \$? = $ac_status" >&5
+  echo "$as_me:6207: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5960: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6210: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5963: \$? = $ac_status" >&5
+  echo "$as_me:6213: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -5975,7 +6225,7 @@
 done
 
 fi
-echo "$as_me:5978: result: $cf_cv_have_utmp" >&5
+echo "$as_me:6228: result: $cf_cv_have_utmp" >&5
 echo "${ECHO_T}$cf_cv_have_utmp" >&6
 
 if test "$cf_cv_have_utmp" != no ; then
@@ -5990,14 +6240,14 @@
 EOF
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:5993: checking if ${cf_cv_have_utmp}.ut_host is declared" >&5
+echo "$as_me:6243: checking if ${cf_cv_have_utmp}.ut_host is declared" >&5
 echo $ECHO_N "checking if ${cf_cv_have_utmp}.ut_host is declared... $ECHO_C" >&6
 if test "${cf_cv_have_utmp_ut_host+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 6000 "configure"
+#line 6250 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -6014,16 +6264,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6017: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6267: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6020: \$? = $ac_status" >&5
+  echo "$as_me:6270: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6023: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6273: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6026: \$? = $ac_status" >&5
+  echo "$as_me:6276: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_host=yes
 else
@@ -6035,7 +6285,7 @@
 
 fi
 
-echo "$as_me:6038: result: $cf_cv_have_utmp_ut_host" >&5
+echo "$as_me:6288: result: $cf_cv_have_utmp_ut_host" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_host" >&6
 test "$cf_cv_have_utmp_ut_host" != no &&
 cat >>confdefs.h <<\EOF
@@ -6045,14 +6295,14 @@
 fi
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:6048: checking if ${cf_cv_have_utmp}.ut_syslen is declared" >&5
+echo "$as_me:6298: checking if ${cf_cv_have_utmp}.ut_syslen is declared" >&5
 echo $ECHO_N "checking if ${cf_cv_have_utmp}.ut_syslen is declared... $ECHO_C" >&6
 if test "${cf_cv_have_utmp_ut_syslen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 6055 "configure"
+#line 6305 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -6069,16 +6319,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6072: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6322: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6075: \$? = $ac_status" >&5
+  echo "$as_me:6325: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6078: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6328: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6081: \$? = $ac_status" >&5
+  echo "$as_me:6331: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_syslen=yes
 else
@@ -6090,7 +6340,7 @@
 
 fi
 
-echo "$as_me:6093: result: $cf_cv_have_utmp_ut_syslen" >&5
+echo "$as_me:6343: result: $cf_cv_have_utmp_ut_syslen" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_syslen" >&6
 test "$cf_cv_have_utmp_ut_syslen" != no &&
 cat >>confdefs.h <<\EOF
@@ -6100,7 +6350,7 @@
 fi
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:6103: checking if ${cf_cv_have_utmp}.ut_name is declared" >&5
+echo "$as_me:6353: checking if ${cf_cv_have_utmp}.ut_name is declared" >&5
 echo $ECHO_N "checking if ${cf_cv_have_utmp}.ut_name is declared... $ECHO_C" >&6
 if test "${cf_cv_have_utmp_ut_name+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6117,7 +6367,7 @@
 "
 for cf_header in ut_name ut_user ; do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 6120 "configure"
+#line 6370 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -6133,16 +6383,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6136: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6386: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6139: \$? = $ac_status" >&5
+  echo "$as_me:6389: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6142: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6392: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6145: \$? = $ac_status" >&5
+  echo "$as_me:6395: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_name=$cf_header
 	 break
@@ -6154,12 +6404,12 @@
 done
 
 fi
-echo "$as_me:6157: result: $cf_cv_have_utmp_ut_name" >&5
+echo "$as_me:6407: result: $cf_cv_have_utmp_ut_name" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_name" >&6
 
 case "$cf_cv_have_utmp_ut_name" in
 (no)
-	{ { echo "$as_me:6162: error: Cannot find declaration for ut.ut_name" >&5
+	{ { echo "$as_me:6412: error: Cannot find declaration for ut.ut_name" >&5
 echo "$as_me: error: Cannot find declaration for ut.ut_name" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -6174,7 +6424,7 @@
 fi
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:6177: checking for exit-status in $cf_cv_have_utmp" >&5
+echo "$as_me:6427: checking for exit-status in $cf_cv_have_utmp" >&5
 echo $ECHO_N "checking for exit-status in $cf_cv_have_utmp... $ECHO_C" >&6
 if test "${cf_cv_have_utmp_ut_xstatus+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6187,7 +6437,7 @@
 	ut_exit.ut_exit
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6190 "configure"
+#line 6440 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -6204,16 +6454,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6207: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6457: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6210: \$? = $ac_status" >&5
+  echo "$as_me:6460: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6213: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6463: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6216: \$? = $ac_status" >&5
+  echo "$as_me:6466: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_xstatus=$cf_result
 	 break
@@ -6226,7 +6476,7 @@
 done
 
 fi
-echo "$as_me:6229: result: $cf_cv_have_utmp_ut_xstatus" >&5
+echo "$as_me:6479: result: $cf_cv_have_utmp_ut_xstatus" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_xstatus" >&6
 if test "$cf_cv_have_utmp_ut_xstatus" != no ; then
 
@@ -6242,14 +6492,14 @@
 fi
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:6245: checking if ${cf_cv_have_utmp}.ut_xtime is declared" >&5
+echo "$as_me:6495: checking if ${cf_cv_have_utmp}.ut_xtime is declared" >&5
 echo $ECHO_N "checking if ${cf_cv_have_utmp}.ut_xtime is declared... $ECHO_C" >&6
 if test "${cf_cv_have_utmp_ut_xtime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 6252 "configure"
+#line 6502 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -6266,23 +6516,23 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6269: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6519: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6272: \$? = $ac_status" >&5
+  echo "$as_me:6522: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6275: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6525: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6278: \$? = $ac_status" >&5
+  echo "$as_me:6528: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_xtime=yes
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6285 "configure"
+#line 6535 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -6299,16 +6549,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6302: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6552: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6305: \$? = $ac_status" >&5
+  echo "$as_me:6555: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6308: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6558: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6311: \$? = $ac_status" >&5
+  echo "$as_me:6561: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_xtime=define
 else
@@ -6322,7 +6572,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:6325: result: $cf_cv_have_utmp_ut_xtime" >&5
+echo "$as_me:6575: result: $cf_cv_have_utmp_ut_xtime" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_xtime" >&6
 if test "$cf_cv_have_utmp_ut_xtime" != no ; then
 
@@ -6341,14 +6591,14 @@
 fi
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:6344: checking if ${cf_cv_have_utmp}.ut_session is declared" >&5
+echo "$as_me:6594: checking if ${cf_cv_have_utmp}.ut_session is declared" >&5
 echo $ECHO_N "checking if ${cf_cv_have_utmp}.ut_session is declared... $ECHO_C" >&6
 if test "${cf_cv_have_utmp_ut_session+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 6351 "configure"
+#line 6601 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -6365,16 +6615,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6368: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6618: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6371: \$? = $ac_status" >&5
+  echo "$as_me:6621: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6374: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6624: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6377: \$? = $ac_status" >&5
+  echo "$as_me:6627: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_session=yes
 else
@@ -6385,7 +6635,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:6388: result: $cf_cv_have_utmp_ut_session" >&5
+echo "$as_me:6638: result: $cf_cv_have_utmp_ut_session" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_session" >&6
 if test "$cf_cv_have_utmp_ut_session" != no ; then
 
@@ -6396,7 +6646,7 @@
 fi
 fi
 
-echo "$as_me:6399: checking if $cf_cv_have_utmp is SYSV flavor" >&5
+echo "$as_me:6649: checking if $cf_cv_have_utmp is SYSV flavor" >&5
 echo $ECHO_N "checking if $cf_cv_have_utmp is SYSV flavor... $ECHO_C" >&6
 if test "${cf_cv_sysv_utmp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6404,7 +6654,7 @@
 
 test "$cf_cv_have_utmp" = "utmp" && cf_prefix="ut" || cf_prefix="utx"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6407 "configure"
+#line 6657 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -6423,16 +6673,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6426: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6676: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6429: \$? = $ac_status" >&5
+  echo "$as_me:6679: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6432: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6682: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6435: \$? = $ac_status" >&5
+  echo "$as_me:6685: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sysv_utmp=yes
 else
@@ -6443,7 +6693,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:6446: result: $cf_cv_sysv_utmp" >&5
+echo "$as_me:6696: result: $cf_cv_sysv_utmp" >&5
 echo "${ECHO_T}$cf_cv_sysv_utmp" >&6
 test "$cf_cv_sysv_utmp" = yes &&
 cat >>confdefs.h <<\EOF
@@ -6455,23 +6705,23 @@
 for ac_header in lastlog.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6458: checking for $ac_header" >&5
+echo "$as_me:6708: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6464 "configure"
+#line 6714 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:6468: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:6718: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:6474: \$? = $ac_status" >&5
+  echo "$as_me:6724: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6490,7 +6740,7 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:6493: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6743: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -6500,7 +6750,7 @@
 fi
 done
 
-echo "$as_me:6503: checking for struct lastlog" >&5
+echo "$as_me:6753: checking for struct lastlog" >&5
 echo $ECHO_N "checking for struct lastlog... $ECHO_C" >&6
 if test "${cf_cv_struct_lastlog+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6511,7 +6761,7 @@
 cf_cv_struct_lastlog=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6514 "configure"
+#line 6764 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -6525,15 +6775,15 @@
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:6528: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6778: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6531: \$? = $ac_status" >&5
+  echo "$as_me:6781: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:6533: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6783: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6536: \$? = $ac_status" >&5
+  echo "$as_me:6786: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 cf_cv_struct_lastlog=yes
@@ -6547,7 +6797,7 @@
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:6550: result: $cf_cv_struct_lastlog" >&5
+echo "$as_me:6800: result: $cf_cv_struct_lastlog" >&5
 echo "${ECHO_T}$cf_cv_struct_lastlog" >&6
 
 test $cf_cv_struct_lastlog != no &&
@@ -6560,23 +6810,23 @@
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6563: checking for $ac_header" >&5
+echo "$as_me:6813: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6569 "configure"
+#line 6819 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:6573: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:6823: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:6579: \$? = $ac_status" >&5
+  echo "$as_me:6829: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6595,7 +6845,7 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:6598: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6848: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -6605,14 +6855,14 @@
 fi
 done
 
-echo "$as_me:6608: checking if POSIX saved-ids are supported" >&5
+echo "$as_me:6858: checking if POSIX saved-ids are supported" >&5
 echo $ECHO_N "checking if POSIX saved-ids are supported... $ECHO_C" >&6
 if test "${cf_cv_posix_saved_ids+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6615 "configure"
+#line 6865 "configure"
 #include "confdefs.h"
 
 #include <unistd.h>
@@ -6642,16 +6892,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6645: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6895: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6648: \$? = $ac_status" >&5
+  echo "$as_me:6898: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6651: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6901: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6654: \$? = $ac_status" >&5
+  echo "$as_me:6904: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_saved_ids=yes
 
@@ -6663,7 +6913,7 @@
   cf_cv_posix_saved_ids=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6666 "configure"
+#line 6916 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -6679,15 +6929,15 @@
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:6682: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6932: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6685: \$? = $ac_status" >&5
+  echo "$as_me:6935: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:6687: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6937: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6690: \$? = $ac_status" >&5
+  echo "$as_me:6940: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_saved_ids=yes
 else
@@ -6703,7 +6953,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:6706: result: $cf_cv_posix_saved_ids" >&5
+echo "$as_me:6956: result: $cf_cv_posix_saved_ids" >&5
 echo "${ECHO_T}$cf_cv_posix_saved_ids" >&6
 
 test "$cf_cv_posix_saved_ids" = yes &&
@@ -6742,23 +6992,23 @@
 for ac_header in termcap.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6745: checking for $ac_header" >&5
+echo "$as_me:6995: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6751 "configure"
+#line 7001 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:6755: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:7005: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:6761: \$? = $ac_status" >&5
+  echo "$as_me:7011: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6777,7 +7027,7 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:6780: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:7030: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -6787,7 +7037,7 @@
 fi
 done
 
-echo "$as_me:6790: checking if we want full tgetent function" >&5
+echo "$as_me:7040: checking if we want full tgetent function" >&5
 echo $ECHO_N "checking if we want full tgetent function... $ECHO_C" >&6
 
 # Check whether --enable-full-tgetent or --disable-full-tgetent was given.
@@ -6804,7 +7054,7 @@
 	cf_full_tgetent=yes
 
 fi;
-echo "$as_me:6807: result: $cf_full_tgetent" >&5
+echo "$as_me:7057: result: $cf_full_tgetent" >&5
 echo "${ECHO_T}$cf_full_tgetent" >&6
 
 if test "$cf_full_tgetent" = yes ; then
@@ -6813,7 +7063,7 @@
 	cf_test_message="tgetent"
 fi
 
-echo "$as_me:6816: checking for $cf_test_message function" >&5
+echo "$as_me:7066: checking for $cf_test_message function" >&5
 echo $ECHO_N "checking for $cf_test_message function... $ECHO_C" >&6
 if test "${cf_cv_lib_tgetent+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6851,7 +7101,7 @@
   echo "cross-compiling, cannot verify if a termcap/tgetent is present in $cf_termlib" 1>&5
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6854 "configure"
+#line 7104 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_TERMCAP_H
@@ -6869,15 +7119,15 @@
 	${cf_cv_main_return:-return} ($cf_TERMTST); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:6872: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7122: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6875: \$? = $ac_status" >&5
+  echo "$as_me:7125: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:6877: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7127: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6880: \$? = $ac_status" >&5
+  echo "$as_me:7130: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   echo "yes, there is a termcap/tgetent in $cf_termlib" 1>&5
 	 if test -n "$cf_termlib" ; then
@@ -6898,7 +7148,7 @@
 LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:6901: result: $cf_cv_lib_tgetent" >&5
+echo "$as_me:7151: result: $cf_cv_lib_tgetent" >&5
 echo "${ECHO_T}$cf_cv_lib_tgetent" >&6
 
 # If we found a working tgetent(), set LIBS and check for termcap.h.
@@ -6930,7 +7180,7 @@
 
 	if test "$cf_full_tgetent" = no ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 6933 "configure"
+#line 7183 "configure"
 #include "confdefs.h"
 
 #include <termcap.h>
@@ -6946,16 +7196,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6949: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7199: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6952: \$? = $ac_status" >&5
+  echo "$as_me:7202: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6955: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7205: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6958: \$? = $ac_status" >&5
+  echo "$as_me:7208: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cat >>confdefs.h <<\EOF
 #define HAVE_TERMCAP_H 1
@@ -6971,23 +7221,23 @@
 for ac_header in termcap.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6974: checking for $ac_header" >&5
+echo "$as_me:7224: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6980 "configure"
+#line 7230 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:6984: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:7234: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:6990: \$? = $ac_status" >&5
+  echo "$as_me:7240: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7006,7 +7256,7 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:7009: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:7259: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -7023,7 +7273,7 @@
         # a crippled one.  A crippled tgetent() is still useful to
         # validate values for the TERM environment variable given to
         # child processes.
-	echo "$as_me:7026: checking for partial tgetent function" >&5
+	echo "$as_me:7276: checking for partial tgetent function" >&5
 echo $ECHO_N "checking for partial tgetent function... $ECHO_C" >&6
 if test "${cf_cv_lib_part_tgetent+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7033,7 +7283,7 @@
 	for cf_termlib in $cf_TERMLIB ; do
 		LIBS="$cf_save_LIBS -l$cf_termlib"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 7036 "configure"
+#line 7286 "configure"
 #include "confdefs.h"
 
 int
@@ -7045,16 +7295,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7048: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7298: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7051: \$? = $ac_status" >&5
+  echo "$as_me:7301: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7054: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7304: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7057: \$? = $ac_status" >&5
+  echo "$as_me:7307: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   echo "there is a terminfo/tgetent in $cf_termlib" 1>&5
 			 cf_cv_lib_part_tgetent="-l$cf_termlib"
@@ -7068,7 +7318,7 @@
 	LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:7071: result: $cf_cv_lib_part_tgetent" >&5
+echo "$as_me:7321: result: $cf_cv_lib_part_tgetent" >&5
 echo "${ECHO_T}$cf_cv_lib_part_tgetent" >&6
 
 	if test "$cf_cv_lib_part_tgetent" != no ; then
@@ -7092,23 +7342,23 @@
 for ac_header in termcap.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:7095: checking for $ac_header" >&5
+echo "$as_me:7345: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 7101 "configure"
+#line 7351 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:7105: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:7355: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:7111: \$? = $ac_status" >&5
+  echo "$as_me:7361: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7127,7 +7377,7 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:7130: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:7380: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -7147,7 +7397,7 @@
 	fi
 fi
 
-echo "$as_me:7150: checking for X applications class" >&5
+echo "$as_me:7400: checking for X applications class" >&5
 echo $ECHO_N "checking for X applications class... $ECHO_C" >&6
 
 # Check whether --with-app-class or --without-app-class was given.
@@ -7160,23 +7410,23 @@
 
 case x$APP_CLASS in
 (*[/@,%]*)
-	{ echo "$as_me:7163: WARNING: X applications class cannot contain punctuation" >&5
+	{ echo "$as_me:7413: WARNING: X applications class cannot contain punctuation" >&5
 echo "$as_me: WARNING: X applications class cannot contain punctuation" >&2;}
 	APP_CLASS=XTerm
 	;;
 (x[A-Z]*)
 	;;
 (*)
-	{ echo "$as_me:7170: WARNING: X applications class must start with capital, ignoring $APP_CLASS" >&5
+	{ echo "$as_me:7420: WARNING: X applications class must start with capital, ignoring $APP_CLASS" >&5
 echo "$as_me: WARNING: X applications class must start with capital, ignoring $APP_CLASS" >&2;}
 	APP_CLASS=XTerm
 	;;
 esac
 
-echo "$as_me:7176: result: $APP_CLASS" >&5
+echo "$as_me:7426: result: $APP_CLASS" >&5
 echo "${ECHO_T}$APP_CLASS" >&6
 
-echo "$as_me:7179: checking for directory to install resource files" >&5
+echo "$as_me:7429: checking for directory to install resource files" >&5
 echo $ECHO_N "checking for directory to install resource files... $ECHO_C" >&6
 
 # Check whether --with-app-defaults or --without-app-defaults was given.
@@ -7240,7 +7490,7 @@
 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:7243: error: expected a pathname, not \"$cf_path\"" >&5
+	{ { echo "$as_me:7493: error: expected a pathname, not \"$cf_path\"" >&5
 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -7248,7 +7498,7 @@
 
 fi
 
-echo "$as_me:7251: result: $APPSDIR" >&5
+echo "$as_me:7501: result: $APPSDIR" >&5
 echo "${ECHO_T}$APPSDIR" >&6
 
 no_appsdir=
@@ -7259,7 +7509,7 @@
 	EXTRA_INSTALL_DIRS="$EXTRA_INSTALL_DIRS \$(APPSDIR)"
 fi
 
-echo "$as_me:7262: checking for the icon name" >&5
+echo "$as_me:7512: checking for the icon name" >&5
 echo $ECHO_N "checking for the icon name... $ECHO_C" >&6
 
 # Check whether --with-icon-name or --without-icon-name was given.
@@ -7275,10 +7525,10 @@
 	;;
 esac
 
-echo "$as_me:7278: result: $ICON_NAME" >&5
+echo "$as_me:7528: result: $ICON_NAME" >&5
 echo "${ECHO_T}$ICON_NAME" >&6
 
-echo "$as_me:7281: checking for icon symlink to use" >&5
+echo "$as_me:7531: checking for icon symlink to use" >&5
 echo $ECHO_N "checking for icon symlink to use... $ECHO_C" >&6
 
 # Check whether --with-icon-symlink or --without-icon-symlink was given.
@@ -7297,7 +7547,7 @@
 	;;
 esac
 
-echo "$as_me:7300: result: $ICON_SYMLINK" >&5
+echo "$as_me:7550: result: $ICON_SYMLINK" >&5
 echo "${ECHO_T}$ICON_SYMLINK" >&6
 
 # Install all icons except for the overused "terminal".
@@ -7313,20 +7563,20 @@
 	esac
 	test -n "$verbose" && echo "	adding $cf_icon_name to icon-list" 1>&6
 
-echo "${as_me:-configure}:7316: testing adding $cf_icon_name to icon-list ..." 1>&5
+echo "${as_me:-configure}:7566: testing adding $cf_icon_name to icon-list ..." 1>&5
 
 	cf_cv_icon_list="$cf_cv_icon_list $cf_icon_name"
 	if test -f "${cf_icon_name}_48x48.png"
 	then
 		test -n "$verbose" && echo "	adding ${cf_icon_name}_48x48 to icon-list" 1>&6
 
-echo "${as_me:-configure}:7323: testing adding ${cf_icon_name}_48x48 to icon-list ..." 1>&5
+echo "${as_me:-configure}:7573: testing adding ${cf_icon_name}_48x48 to icon-list ..." 1>&5
 
 		cf_cv_icon_list="$cf_cv_icon_list ${cf_icon_name}_48x48"
 	fi
 done
 
-echo "$as_me:7329: checking for directory to install pixmaps" >&5
+echo "$as_me:7579: checking for directory to install pixmaps" >&5
 echo $ECHO_N "checking for directory to install pixmaps... $ECHO_C" >&6
 
 # Check whether --with-pixmapdir or --without-pixmapdir was given.
@@ -7377,14 +7627,14 @@
 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:7380: error: expected a pathname, not \"$cf_path\"" >&5
+	{ { echo "$as_me:7630: error: expected a pathname, not \"$cf_path\"" >&5
 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
 esac
 
 fi
-echo "$as_me:7387: result: $PIXMAPDIR" >&5
+echo "$as_me:7637: result: $PIXMAPDIR" >&5
 echo "${ECHO_T}$PIXMAPDIR" >&6
 
 no_pixmapdir=
@@ -7395,7 +7645,7 @@
 	EXTRA_INSTALL_DIRS="$EXTRA_INSTALL_DIRS \$(PIXMAPDIR)"
 fi
 
-echo "$as_me:7398: checking for directory to install icons" >&5
+echo "$as_me:7648: checking for directory to install icons" >&5
 echo $ECHO_N "checking for directory to install icons... $ECHO_C" >&6
 
 # Check whether --with-icondir or --without-icondir was given.
@@ -7446,14 +7696,14 @@
 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:7449: error: expected a pathname, not \"$cf_path\"" >&5
+	{ { echo "$as_me:7699: error: expected a pathname, not \"$cf_path\"" >&5
 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
 esac
 
 fi
-echo "$as_me:7456: result: $ICONDIR" >&5
+echo "$as_me:7706: result: $ICONDIR" >&5
 echo "${ECHO_T}$ICONDIR" >&6
 
 no_icondir=
@@ -7464,7 +7714,7 @@
 	EXTRA_INSTALL_DIRS="$EXTRA_INSTALL_DIRS \$(ICONDIR)"
 fi
 
-echo "$as_me:7467: checking if icon theme should be used" >&5
+echo "$as_me:7717: checking if icon theme should be used" >&5
 echo $ECHO_N "checking if icon theme should be used... $ECHO_C" >&6
 
 # Check whether --with-icon-theme or --without-icon-theme was given.
@@ -7482,7 +7732,7 @@
 	ICON_THEME=hicolor
 	;;
 esac
-echo "$as_me:7485: result: $ICON_THEME" >&5
+echo "$as_me:7735: result: $ICON_THEME" >&5
 echo "${ECHO_T}$ICON_THEME" >&6
 
 if test "x$ICON_THEME" = xno
@@ -7491,14 +7741,14 @@
 	then
 		test -n "$verbose" && echo "	ignoring icondir without theme" 1>&6
 
-echo "${as_me:-configure}:7494: testing ignoring icondir without theme ..." 1>&5
+echo "${as_me:-configure}:7744: testing ignoring icondir without theme ..." 1>&5
 
 		no_icondir="#"
 	fi
 else
 	if test "x$ICONDIR" = xno
 	then
-		{ { echo "$as_me:7501: error: icondir must be set for icon theme" >&5
+		{ { echo "$as_me:7751: error: icondir must be set for icon theme" >&5
 echo "$as_me: error: icondir must be set for icon theme" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -7515,13 +7765,13 @@
 	cf_icon_list="icons/${ICON_NAME}_48x48"
 fi
 
-echo "$as_me:7518: checking for icon(s) to install" >&5
+echo "$as_me:7768: checking for icon(s) to install" >&5
 echo $ECHO_N "checking for icon(s) to install... $ECHO_C" >&6
 for cf_name in $cf_icon_list
 do
 	test -n "$verbose" && echo "	using $ICON_FORMAT" 1>&6
 
-echo "${as_me:-configure}:7524: testing using $ICON_FORMAT ..." 1>&5
+echo "${as_me:-configure}:7774: testing using $ICON_FORMAT ..." 1>&5
 
 	for cf_suffix in $ICON_FORMAT
 	do
@@ -7554,7 +7804,7 @@
 				cf_size=`file "$cf_left"|sed -e 's/^[^:]*://' -e 's/^.*[^0-9]\([0-9][0-9]* x [0-9][0-9]*\)[^0-9].*$/\1/' -e 's/ //g'`
 				if test -z "$cf_size"
 				then
-					{ echo "$as_me:7557: WARNING: cannot determine size of $cf_left" >&5
+					{ echo "$as_me:7807: WARNING: cannot determine size of $cf_left" >&5
 echo "$as_me: WARNING: cannot determine size of $cf_left" >&2;}
 					continue
 				fi
@@ -7566,7 +7816,7 @@
 			(*.xpm)
 				test -n "$verbose" && echo "	ignored XPM file in icon theme" 1>&6
 
-echo "${as_me:-configure}:7569: testing ignored XPM file in icon theme ..." 1>&5
+echo "${as_me:-configure}:7819: testing ignored XPM file in icon theme ..." 1>&5
 
 				continue
 				;;
@@ -7578,7 +7828,7 @@
 			esac
 			test -n "$verbose" && echo "	adding $cf_next" 1>&6
 
-echo "${as_me:-configure}:7581: testing adding $cf_next ..." 1>&5
+echo "${as_me:-configure}:7831: testing adding $cf_next ..." 1>&5
 
 			cf_icon="${cf_icon}:${cf_next}"
 		fi
@@ -7593,26 +7843,26 @@
 
 if test -n "$verbose"
 then
-	echo "$as_me:7596: checking result" >&5
+	echo "$as_me:7846: checking result" >&5
 echo $ECHO_N "checking result... $ECHO_C" >&6
 fi
-echo "$as_me:7599: result: $ICON_LIST" >&5
+echo "$as_me:7849: result: $ICON_LIST" >&5
 echo "${ECHO_T}$ICON_LIST" >&6
 
 if test -z "$ICON_LIST"
 then
-	{ { echo "$as_me:7604: error: no icons found" >&5
+	{ { echo "$as_me:7854: error: no icons found" >&5
 echo "$as_me: error: no icons found" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-echo "$as_me:7609: checking for icon name" >&5
+echo "$as_me:7859: checking for icon name" >&5
 echo $ECHO_N "checking for icon name... $ECHO_C" >&6
-echo "$as_me:7611: result: $ICON_NAME" >&5
+echo "$as_me:7861: result: $ICON_NAME" >&5
 echo "${ECHO_T}$ICON_NAME" >&6
 
 # Comment-out the install-desktop rule if the desktop-utils are not found.
-echo "$as_me:7615: checking if you want to install desktop files" >&5
+echo "$as_me:7865: checking if you want to install desktop files" >&5
 echo $ECHO_N "checking if you want to install desktop files... $ECHO_C" >&6
 
 # Check whether --enable-desktop or --disable-desktop was given.
@@ -7629,14 +7879,14 @@
 	enable_desktop=$enableval
 
 fi;
-echo "$as_me:7632: result: $enable_desktop" >&5
+echo "$as_me:7882: result: $enable_desktop" >&5
 echo "${ECHO_T}$enable_desktop" >&6
 
 desktop_utils=
 if test "$enable_desktop" = yes ; then
 # Extract the first word of "desktop-file-install", so it can be a program name with args.
 set dummy desktop-file-install; ac_word=$2
-echo "$as_me:7639: checking for $ac_word" >&5
+echo "$as_me:7889: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_desktop_utils+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7651,7 +7901,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_desktop_utils="yes"
-echo "$as_me:7654: found $ac_dir/$ac_word" >&5
+echo "$as_me:7904: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -7660,10 +7910,10 @@
 fi
 desktop_utils=$ac_cv_prog_desktop_utils
 if test -n "$desktop_utils"; then
-  echo "$as_me:7663: result: $desktop_utils" >&5
+  echo "$as_me:7913: result: $desktop_utils" >&5
 echo "${ECHO_T}$desktop_utils" >&6
 else
-  echo "$as_me:7666: result: no" >&5
+  echo "$as_me:7916: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -7673,7 +7923,7 @@
 
 if test -z "$desktop_utils"
 then
-	echo "$as_me:7676: checking for requested desktop-category" >&5
+	echo "$as_me:7926: checking for requested desktop-category" >&5
 echo $ECHO_N "checking for requested desktop-category... $ECHO_C" >&6
 
 # Check whether --with-desktop-category or --without-desktop-category was given.
@@ -7683,7 +7933,7 @@
 else
   cf_desktop_want=auto
 fi;
-	echo "$as_me:7686: result: $cf_desktop_want" >&5
+	echo "$as_me:7936: result: $cf_desktop_want" >&5
 echo "${ECHO_T}$cf_desktop_want" >&6
 
 	if test "$cf_desktop_want" = auto
@@ -7706,7 +7956,7 @@
 					(xterm|*-xterm|*rxvt*|*konsole|*[Tt]erminal)
 						test -n "$verbose" && echo "	inspect $cf_desktop_path" 1>&6
 
-echo "${as_me:-configure}:7709: testing inspect $cf_desktop_path ..." 1>&5
+echo "${as_me:-configure}:7959: testing inspect $cf_desktop_path ..." 1>&5
 
 						${EGREP-egrep} '^Categories=' "$cf_desktop_path" | \
 							tr ';' '\n' | \
@@ -7737,14 +7987,14 @@
 				(Qt*|*Xfce*|*[ABCDEFGHIJKLMNOPQRSTUVWXYZ][ABCDEFGHIJKLMNOPQRSTUVWXYZ]*)
 					test -n "$verbose" && echo "	ignored $cf_desktop_this" 1>&6
 
-echo "${as_me:-configure}:7740: testing ignored $cf_desktop_this ..." 1>&5
+echo "${as_me:-configure}:7990: testing ignored $cf_desktop_this ..." 1>&5
 
 					echo "$cf_desktop_this" >> conftest.3
 					;;
 				(System|TerminalEmulator|*)
 					test -n "$verbose" && echo "	applied $cf_desktop_this" 1>&6
 
-echo "${as_me:-configure}:7747: testing applied $cf_desktop_this ..." 1>&5
+echo "${as_me:-configure}:7997: testing applied $cf_desktop_this ..." 1>&5
 
 					test "x$cf_desktop_last" != "x$cf_desktop_this" && echo "$cf_desktop_this" >>conftest.2
 					;;
@@ -7771,18 +8021,18 @@
 			cf_desktop_want="`echo "System|TerminalEmulator|*" | sed -e 's/\*//g' -e 's/|/;/g' -e 's/;*$/;/g'`"
 			test -n "$verbose" && echo "	no usable value found for desktop category" 1>&6
 
-echo "${as_me:-configure}:7774: testing no usable value found for desktop category ..." 1>&5
+echo "${as_me:-configure}:8024: testing no usable value found for desktop category ..." 1>&5
 
 		fi
 	fi
 	DESKTOP_CATEGORY=`echo "$cf_desktop_want" | sed -e 's/[ ,]/;/g'`
 	test -n "$verbose" && echo "	will use Categories=$DESKTOP_CATEGORY" 1>&6
 
-echo "${as_me:-configure}:7781: testing will use Categories=$DESKTOP_CATEGORY ..." 1>&5
+echo "${as_me:-configure}:8031: testing will use Categories=$DESKTOP_CATEGORY ..." 1>&5
 
 fi
 
-echo "$as_me:7785: checking for install-permissions reference" >&5
+echo "$as_me:8035: checking for install-permissions reference" >&5
 echo $ECHO_N "checking for install-permissions reference... $ECHO_C" >&6
 
 # Check whether --with-reference or --without-reference was given.
@@ -7792,19 +8042,19 @@
 else
   with_reference=xterm
 fi;
-echo "$as_me:7795: result: $with_reference" >&5
+echo "$as_me:8045: result: $with_reference" >&5
 echo "${ECHO_T}$with_reference" >&6
 
 with_full_paths=yes
 
-	echo "$as_me:7800: checking for PATH separator" >&5
+	echo "$as_me:8050: checking for PATH separator" >&5
 echo $ECHO_N "checking for PATH separator... $ECHO_C" >&6
 	case "$cf_cv_system_name" in
 	(os2*)	PATH_SEPARATOR=';'  ;;
 	(*)	${PATH_SEPARATOR:=':'}  ;;
 	esac
 
-	echo "$as_me:7807: result: $PATH_SEPARATOR" >&5
+	echo "$as_me:8057: result: $PATH_SEPARATOR" >&5
 echo "${ECHO_T}$PATH_SEPARATOR" >&6
 
 test -z "$XTERM_PATH" && XTERM_PATH="$with_reference"
@@ -7812,7 +8062,7 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:7815: checking for $ac_word" >&5
+echo "$as_me:8065: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_XTERM_PATH+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7829,7 +8079,7 @@
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_XTERM_PATH="$ac_dir/$ac_word"
-   echo "$as_me:7832: found $ac_dir/$ac_word" >&5
+   echo "$as_me:8082: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -7840,10 +8090,10 @@
 XTERM_PATH=$ac_cv_path_XTERM_PATH
 
 if test -n "$XTERM_PATH"; then
-  echo "$as_me:7843: result: $XTERM_PATH" >&5
+  echo "$as_me:8093: result: $XTERM_PATH" >&5
 echo "${ECHO_T}$XTERM_PATH" >&6
 else
-  echo "$as_me:7846: result: no" >&5
+  echo "$as_me:8096: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -7902,7 +8152,7 @@
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:7905: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:8155: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define XTERM_PATH_PATH "$cf_path_prog"
@@ -7923,7 +8173,7 @@
 if test "$program_transform_name" != "'s,,,'" ; then
 cf_name=`echo "$program_transform_name" | sed -e 's,\\$\\$,$,g'`
 cf_name=`echo xterm |sed -e "$cf_name"`
-echo "$as_me:7926: checking for symbolic link to create to $cf_name" >&5
+echo "$as_me:8176: checking for symbolic link to create to $cf_name" >&5
 echo $ECHO_N "checking for symbolic link to create to $cf_name... $ECHO_C" >&6
 
 # Check whether --with-xterm-symlink or --without-xterm-symlink was given.
@@ -7933,7 +8183,7 @@
 else
   with_symlink=xterm
 fi;
-echo "$as_me:7936: result: $with_symlink" >&5
+echo "$as_me:8186: result: $with_symlink" >&5
 echo "${ECHO_T}$with_symlink" >&6
 test "$with_symlink" = yes && with_symlink=xterm
 test -n "$with_symlink" && \
@@ -7942,7 +8192,7 @@
 	XTERM_SYMLINK="$with_symlink"
 fi
 
-echo "$as_me:7945: checking if you want to disable openpty" >&5
+echo "$as_me:8195: checking if you want to disable openpty" >&5
 echo $ECHO_N "checking if you want to disable openpty... $ECHO_C" >&6
 
 # Check whether --enable-openpty or --disable-openpty was given.
@@ -7959,10 +8209,10 @@
 	disable_openpty=no
 
 fi;
-echo "$as_me:7962: result: $disable_openpty" >&5
+echo "$as_me:8212: result: $disable_openpty" >&5
 echo "${ECHO_T}$disable_openpty" >&6
 
-echo "$as_me:7965: checking if you want to disable setuid" >&5
+echo "$as_me:8215: checking if you want to disable setuid" >&5
 echo $ECHO_N "checking if you want to disable setuid... $ECHO_C" >&6
 
 # Check whether --enable-setuid or --disable-setuid was given.
@@ -7979,10 +8229,10 @@
 	disable_setuid=no
 
 fi;
-echo "$as_me:7982: result: $disable_setuid" >&5
+echo "$as_me:8232: result: $disable_setuid" >&5
 echo "${ECHO_T}$disable_setuid" >&6
 
-echo "$as_me:7985: checking if you want to disable setgid" >&5
+echo "$as_me:8235: checking if you want to disable setgid" >&5
 echo $ECHO_N "checking if you want to disable setgid... $ECHO_C" >&6
 
 # Check whether --enable-setgid or --disable-setgid was given.
@@ -7999,10 +8249,10 @@
 	disable_setgid=no
 
 fi;
-echo "$as_me:8002: result: $disable_setgid" >&5
+echo "$as_me:8252: result: $disable_setgid" >&5
 echo "${ECHO_T}$disable_setgid" >&6
 
-echo "$as_me:8005: checking if you want to run xterm setuid to a given user" >&5
+echo "$as_me:8255: checking if you want to run xterm setuid to a given user" >&5
 echo $ECHO_N "checking if you want to run xterm setuid to a given user... $ECHO_C" >&6
 
 # Check whether --with-setuid or --without-setuid was given.
@@ -8012,7 +8262,7 @@
 else
   use_given_setuid=no
 fi;
-echo "$as_me:8015: result: $use_given_setuid" >&5
+echo "$as_me:8265: result: $use_given_setuid" >&5
 echo "${ECHO_T}$use_given_setuid" >&6
 
 if test "$use_given_setuid" != no ; then
@@ -8025,7 +8275,7 @@
 	SINSTALL_OPTS="$SINSTALL_OPTS u+s -u $cf_cv_given_setuid"
 fi
 
-echo "$as_me:8028: checking if you want to run xterm setgid to match utmp/utmpx file" >&5
+echo "$as_me:8278: checking if you want to run xterm setgid to match utmp/utmpx file" >&5
 echo $ECHO_N "checking if you want to run xterm setgid to match utmp/utmpx file... $ECHO_C" >&6
 
 # Check whether --with-utmp-setgid or --without-utmp-setgid was given.
@@ -8035,14 +8285,14 @@
 else
   use_utmp_setgid=no
 fi;
-echo "$as_me:8038: result: $use_utmp_setgid" >&5
+echo "$as_me:8288: result: $use_utmp_setgid" >&5
 echo "${ECHO_T}$use_utmp_setgid" >&6
 
 if test "$use_utmp_setgid" != no ; then
 	if test "$use_utmp_setgid" = yes ; then
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:8045: checking for utmp/utmpx group" >&5
+echo "$as_me:8295: checking for utmp/utmpx group" >&5
 echo $ECHO_N "checking for utmp/utmpx group... $ECHO_C" >&6
 if test "${cf_cv_utmp_group+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8084,10 +8334,10 @@
 done
 
 fi
-echo "$as_me:8087: result: $cf_cv_utmp_group" >&5
+echo "$as_me:8337: result: $cf_cv_utmp_group" >&5
 echo "${ECHO_T}$cf_cv_utmp_group" >&6
 else
-	{ { echo "$as_me:8090: error: cannot find utmp group" >&5
+	{ { echo "$as_me:8340: error: cannot find utmp group" >&5
 echo "$as_me: error: cannot find utmp group" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -8096,7 +8346,7 @@
 		cf_cv_utmp_group=$use_utmp_setgid
 	fi
 	if test "$cf_cv_posix_saved_ids" != yes ; then
-		{ { echo "$as_me:8099: error: Your system does not support POSIX saved-ids" >&5
+		{ { echo "$as_me:8349: error: Your system does not support POSIX saved-ids" >&5
 echo "$as_me: error: Your system does not support POSIX saved-ids" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -8108,7 +8358,7 @@
 	SINSTALL_OPTS="$SINSTALL_OPTS g+s -g $cf_cv_utmp_group"
 fi
 
-echo "$as_me:8111: checking if you want to link with utempter" >&5
+echo "$as_me:8361: checking if you want to link with utempter" >&5
 echo $ECHO_N "checking if you want to link with utempter... $ECHO_C" >&6
 
 # Check whether --with-utempter or --without-utempter was given.
@@ -8118,12 +8368,12 @@
 else
   use_utempter=no
 fi;
-echo "$as_me:8121: result: $use_utempter" >&5
+echo "$as_me:8371: result: $use_utempter" >&5
 echo "${ECHO_T}$use_utempter" >&6
 
 if test "$use_utempter" = yes ; then
 
-echo "$as_me:8126: checking if we can link with utempter library" >&5
+echo "$as_me:8376: checking if we can link with utempter library" >&5
 echo $ECHO_N "checking if we can link with utempter library... $ECHO_C" >&6
 if test "${cf_cv_have_utempter+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8148,7 +8398,7 @@
 LIBS="$cf_add_libs"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8151 "configure"
+#line 8401 "configure"
 #include "confdefs.h"
 
 #include <utempter.h>
@@ -8165,16 +8415,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8168: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8418: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8171: \$? = $ac_status" >&5
+  echo "$as_me:8421: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8174: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8424: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8177: \$? = $ac_status" >&5
+  echo "$as_me:8427: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_have_utempter=yes
@@ -8188,7 +8438,7 @@
 LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:8191: result: $cf_cv_have_utempter" >&5
+echo "$as_me:8441: result: $cf_cv_have_utempter" >&5
 echo "${ECHO_T}$cf_cv_have_utempter" >&6
 if test "$cf_cv_have_utempter" = yes ; then
 
@@ -8226,21 +8476,21 @@
 		disable_setuid=yes
 		test -n "$verbose" && echo "	No --disable-setuid option given, force to yes" 1>&6
 
-echo "${as_me:-configure}:8229: testing No --disable-setuid option given, force to yes ..." 1>&5
+echo "${as_me:-configure}:8479: testing No --disable-setuid option given, force to yes ..." 1>&5
 
 	fi
 fi
 
 ###	checks for external data
 
-echo "$as_me:8236: checking if external errno is declared" >&5
+echo "$as_me:8486: checking if external errno is declared" >&5
 echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6
 if test "${cf_cv_dcl_errno+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 8243 "configure"
+#line 8493 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -8258,16 +8508,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8261: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8511: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8264: \$? = $ac_status" >&5
+  echo "$as_me:8514: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8267: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8517: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8270: \$? = $ac_status" >&5
+  echo "$as_me:8520: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -8278,7 +8528,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:8281: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:8531: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -8293,14 +8543,14 @@
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:8296: checking if external errno exists" >&5
+echo "$as_me:8546: checking if external errno exists" >&5
 echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6
 if test "${cf_cv_have_errno+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 8303 "configure"
+#line 8553 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -8315,16 +8565,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8318: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8568: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8321: \$? = $ac_status" >&5
+  echo "$as_me:8571: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8324: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8574: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8327: \$? = $ac_status" >&5
+  echo "$as_me:8577: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_errno=yes
 else
@@ -8335,7 +8585,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:8338: result: $cf_cv_have_errno" >&5
+echo "$as_me:8588: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -8348,7 +8598,7 @@
 
 fi
 
-echo "$as_me:8351: checking for explicit tty group name" >&5
+echo "$as_me:8601: checking for explicit tty group name" >&5
 echo $ECHO_N "checking for explicit tty group name... $ECHO_C" >&6
 
 # Check whether --with-tty-group or --without-tty-group was given.
@@ -8360,11 +8610,11 @@
 fi;
 test -z "$cf_tty_group"    && cf_tty_group=auto...
 test "$cf_tty_group" = yes && cf_tty_group=auto...
-echo "$as_me:8363: result: $cf_tty_group" >&5
+echo "$as_me:8613: result: $cf_tty_group" >&5
 echo "${ECHO_T}$cf_tty_group" >&6
 
 if test "$cf_tty_group" = "auto..." ; then
-echo "$as_me:8367: checking for tty group name" >&5
+echo "$as_me:8617: checking for tty group name" >&5
 echo $ECHO_N "checking for tty group name... $ECHO_C" >&6
 if test "${cf_cv_tty_group_name+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8417,7 +8667,7 @@
 fi
 
 fi
-echo "$as_me:8420: result: $cf_cv_tty_group_name" >&5
+echo "$as_me:8670: result: $cf_cv_tty_group_name" >&5
 echo "${ECHO_T}$cf_cv_tty_group_name" >&6
 cf_tty_group="$cf_cv_tty_group_name"
 else
@@ -8437,7 +8687,7 @@
 # does apply to the device.  We cannot perform this test if we are in batch
 # mode, or if we are cross-compiling.
 
-echo "$as_me:8440: checking if we may use the $cf_tty_group group" >&5
+echo "$as_me:8690: checking if we may use the $cf_tty_group group" >&5
 echo $ECHO_N "checking if we may use the $cf_tty_group group... $ECHO_C" >&6
 if test "${cf_cv_tty_group+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8450,7 +8700,7 @@
   cf_cv_tty_group=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 8453 "configure"
+#line 8703 "configure"
 #include "confdefs.h"
 
 #include <unistd.h>
@@ -8486,15 +8736,15 @@
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:8489: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8739: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8492: \$? = $ac_status" >&5
+  echo "$as_me:8742: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:8494: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8744: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8497: \$? = $ac_status" >&5
+  echo "$as_me:8747: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_tty_group=yes
 else
@@ -8512,11 +8762,11 @@
 fi
 
 fi
-echo "$as_me:8515: result: $cf_cv_tty_group" >&5
+echo "$as_me:8765: result: $cf_cv_tty_group" >&5
 echo "${ECHO_T}$cf_cv_tty_group" >&6
 
 if test $cf_cv_tty_group = no ; then
-	{ echo "$as_me:8519: WARNING: Cannot use $cf_tty_group group" >&5
+	{ echo "$as_me:8769: WARNING: Cannot use $cf_tty_group group" >&5
 echo "$as_me: WARNING: Cannot use $cf_tty_group group" >&2;}
 else
 	cat >>confdefs.h <<\EOF
@@ -8527,7 +8777,7 @@
 
 ###	checks for system services and user specified options
 
-echo "$as_me:8530: checking for X" >&5
+echo "$as_me:8780: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -8631,17 +8881,17 @@
   # Guess where to find include files, by looking for Intrinsic.h.
   # First, try using that file with no special directory specified.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 8634 "configure"
+#line 8884 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:8638: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:8888: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:8644: \$? = $ac_status" >&5
+  echo "$as_me:8894: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8674,7 +8924,7 @@
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 8677 "configure"
+#line 8927 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -8686,16 +8936,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8689: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8939: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8692: \$? = $ac_status" >&5
+  echo "$as_me:8942: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8695: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8945: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8698: \$? = $ac_status" >&5
+  echo "$as_me:8948: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -8733,7 +8983,7 @@
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:8736: result: $have_x" >&5
+  echo "$as_me:8986: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -8743,7 +8993,7 @@
   # Update the cache value to reflect the command line values.
   ac_cv_have_x="have_x=yes \
 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  echo "$as_me:8746: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:8996: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -8770,11 +9020,11 @@
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:8773: checking whether -R must be followed by a space" >&5
+      echo "$as_me:9023: checking whether -R must be followed by a space" >&5
 echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
       ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
       cat >"conftest.$ac_ext" <<_ACEOF
-#line 8777 "configure"
+#line 9027 "configure"
 #include "confdefs.h"
 
 int
@@ -8786,16 +9036,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8789: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9039: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8792: \$? = $ac_status" >&5
+  echo "$as_me:9042: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8795: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9045: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8798: \$? = $ac_status" >&5
+  echo "$as_me:9048: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_nospace=yes
 else
@@ -8805,13 +9055,13 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
       if test $ac_R_nospace = yes; then
-	echo "$as_me:8808: result: no" >&5
+	echo "$as_me:9058: result: no" >&5
 echo "${ECHO_T}no" >&6
 	X_LIBS="$X_LIBS -R$x_libraries"
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 8814 "configure"
+#line 9064 "configure"
 #include "confdefs.h"
 
 int
@@ -8823,16 +9073,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8826: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9076: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8829: \$? = $ac_status" >&5
+  echo "$as_me:9079: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8832: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9082: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8835: \$? = $ac_status" >&5
+  echo "$as_me:9085: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_space=yes
 else
@@ -8842,11 +9092,11 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	if test $ac_R_space = yes; then
-	  echo "$as_me:8845: result: yes" >&5
+	  echo "$as_me:9095: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:8849: result: neither works" >&5
+	  echo "$as_me:9099: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -8866,7 +9116,7 @@
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 8869 "configure"
+#line 9119 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8885,22 +9135,22 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8888: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9138: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8891: \$? = $ac_status" >&5
+  echo "$as_me:9141: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8894: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9144: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8897: \$? = $ac_status" >&5
+  echo "$as_me:9147: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:8903: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:9153: checking for dnet_ntoa in -ldnet" >&5
 echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
 if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8908,7 +9158,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8911 "configure"
+#line 9161 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8927,16 +9177,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8930: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9180: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8933: \$? = $ac_status" >&5
+  echo "$as_me:9183: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8936: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9186: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8939: \$? = $ac_status" >&5
+  echo "$as_me:9189: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -8947,14 +9197,14 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8950: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:9200: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
 echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
 if test "$ac_cv_lib_dnet_dnet_ntoa" = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
 fi
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-      echo "$as_me:8957: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:9207: checking for dnet_ntoa in -ldnet_stub" >&5
 echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
 if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8962,7 +9212,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8965 "configure"
+#line 9215 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8981,16 +9231,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8984: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9234: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8987: \$? = $ac_status" >&5
+  echo "$as_me:9237: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8990: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9240: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8993: \$? = $ac_status" >&5
+  echo "$as_me:9243: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -9001,7 +9251,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9004: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:9254: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
 echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
 if test "$ac_cv_lib_dnet_stub_dnet_ntoa" = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
@@ -9020,13 +9270,13 @@
     # on Irix 5.2, according to T.E. Dickey.
     # The functions gethostbyname, getservbyname, and inet_addr are
     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-    echo "$as_me:9023: checking for gethostbyname" >&5
+    echo "$as_me:9273: checking for gethostbyname" >&5
 echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
 if test "${ac_cv_func_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 9029 "configure"
+#line 9279 "configure"
 #include "confdefs.h"
 #define gethostbyname autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -9057,16 +9307,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9060: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9310: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9063: \$? = $ac_status" >&5
+  echo "$as_me:9313: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9066: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9316: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9069: \$? = $ac_status" >&5
+  echo "$as_me:9319: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -9076,11 +9326,11 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:9079: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:9329: result: $ac_cv_func_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
 
     if test $ac_cv_func_gethostbyname = no; then
-      echo "$as_me:9083: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:9333: checking for gethostbyname in -lnsl" >&5
 echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9088,7 +9338,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9091 "configure"
+#line 9341 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9107,16 +9357,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9110: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9360: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9113: \$? = $ac_status" >&5
+  echo "$as_me:9363: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9116: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9366: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9119: \$? = $ac_status" >&5
+  echo "$as_me:9369: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -9127,14 +9377,14 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9130: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:9380: result: $ac_cv_lib_nsl_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
 if test "$ac_cv_lib_nsl_gethostbyname" = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
 fi
 
       if test $ac_cv_lib_nsl_gethostbyname = no; then
-        echo "$as_me:9137: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:9387: checking for gethostbyname in -lbsd" >&5
 echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
 if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9142,7 +9392,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9145 "configure"
+#line 9395 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9161,16 +9411,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9164: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9414: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9167: \$? = $ac_status" >&5
+  echo "$as_me:9417: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9170: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9420: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9173: \$? = $ac_status" >&5
+  echo "$as_me:9423: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -9181,7 +9431,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9184: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:9434: result: $ac_cv_lib_bsd_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
 if test "$ac_cv_lib_bsd_gethostbyname" = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
@@ -9197,13 +9447,13 @@
     # variants that don't use the nameserver (or something).  -lsocket
     # must be given before -lnsl if both are needed.  We assume that
     # if connect needs -lnsl, so does gethostbyname.
-    echo "$as_me:9200: checking for connect" >&5
+    echo "$as_me:9450: checking for connect" >&5
 echo $ECHO_N "checking for connect... $ECHO_C" >&6
 if test "${ac_cv_func_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 9206 "configure"
+#line 9456 "configure"
 #include "confdefs.h"
 #define connect autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -9234,16 +9484,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9237: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9487: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9240: \$? = $ac_status" >&5
+  echo "$as_me:9490: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9243: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9493: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9246: \$? = $ac_status" >&5
+  echo "$as_me:9496: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_connect=yes
 else
@@ -9253,11 +9503,11 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:9256: result: $ac_cv_func_connect" >&5
+echo "$as_me:9506: result: $ac_cv_func_connect" >&5
 echo "${ECHO_T}$ac_cv_func_connect" >&6
 
     if test $ac_cv_func_connect = no; then
-      echo "$as_me:9260: checking for connect in -lsocket" >&5
+      echo "$as_me:9510: checking for connect in -lsocket" >&5
 echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
 if test "${ac_cv_lib_socket_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9265,7 +9515,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9268 "configure"
+#line 9518 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9284,16 +9534,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9287: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9537: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9290: \$? = $ac_status" >&5
+  echo "$as_me:9540: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9293: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9543: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9296: \$? = $ac_status" >&5
+  echo "$as_me:9546: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -9304,7 +9554,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9307: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:9557: result: $ac_cv_lib_socket_connect" >&5
 echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
 if test "$ac_cv_lib_socket_connect" = yes; then
   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
@@ -9313,13 +9563,13 @@
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:9316: checking for remove" >&5
+    echo "$as_me:9566: checking for remove" >&5
 echo $ECHO_N "checking for remove... $ECHO_C" >&6
 if test "${ac_cv_func_remove+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 9322 "configure"
+#line 9572 "configure"
 #include "confdefs.h"
 #define remove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -9350,16 +9600,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9353: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9603: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9356: \$? = $ac_status" >&5
+  echo "$as_me:9606: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9359: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9609: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9362: \$? = $ac_status" >&5
+  echo "$as_me:9612: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_remove=yes
 else
@@ -9369,11 +9619,11 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:9372: result: $ac_cv_func_remove" >&5
+echo "$as_me:9622: result: $ac_cv_func_remove" >&5
 echo "${ECHO_T}$ac_cv_func_remove" >&6
 
     if test $ac_cv_func_remove = no; then
-      echo "$as_me:9376: checking for remove in -lposix" >&5
+      echo "$as_me:9626: checking for remove in -lposix" >&5
 echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
 if test "${ac_cv_lib_posix_remove+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9381,7 +9631,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9384 "configure"
+#line 9634 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9400,16 +9650,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9403: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9653: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9406: \$? = $ac_status" >&5
+  echo "$as_me:9656: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9409: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9659: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9412: \$? = $ac_status" >&5
+  echo "$as_me:9662: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -9420,7 +9670,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9423: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:9673: result: $ac_cv_lib_posix_remove" >&5
 echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
 if test "$ac_cv_lib_posix_remove" = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
@@ -9429,13 +9679,13 @@
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:9432: checking for shmat" >&5
+    echo "$as_me:9682: checking for shmat" >&5
 echo $ECHO_N "checking for shmat... $ECHO_C" >&6
 if test "${ac_cv_func_shmat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 9438 "configure"
+#line 9688 "configure"
 #include "confdefs.h"
 #define shmat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -9466,16 +9716,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9469: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9719: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9472: \$? = $ac_status" >&5
+  echo "$as_me:9722: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9475: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9725: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9478: \$? = $ac_status" >&5
+  echo "$as_me:9728: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -9485,11 +9735,11 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:9488: result: $ac_cv_func_shmat" >&5
+echo "$as_me:9738: result: $ac_cv_func_shmat" >&5
 echo "${ECHO_T}$ac_cv_func_shmat" >&6
 
     if test $ac_cv_func_shmat = no; then
-      echo "$as_me:9492: checking for shmat in -lipc" >&5
+      echo "$as_me:9742: checking for shmat in -lipc" >&5
 echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
 if test "${ac_cv_lib_ipc_shmat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9497,7 +9747,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9500 "configure"
+#line 9750 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9516,16 +9766,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9519: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9769: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9522: \$? = $ac_status" >&5
+  echo "$as_me:9772: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9525: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9775: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9528: \$? = $ac_status" >&5
+  echo "$as_me:9778: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -9536,7 +9786,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9539: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:9789: result: $ac_cv_lib_ipc_shmat" >&5
 echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
 if test "$ac_cv_lib_ipc_shmat" = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
@@ -9554,7 +9804,7 @@
   # These have to be linked with before -lX11, unlike the other
   # libraries we check for below, so use a different variable.
   # John Interrante, Karl Berry
-  echo "$as_me:9557: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:9807: checking for IceConnectionNumber in -lICE" >&5
 echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
 if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9562,7 +9812,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9565 "configure"
+#line 9815 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9581,16 +9831,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9584: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9834: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9587: \$? = $ac_status" >&5
+  echo "$as_me:9837: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9590: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9840: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9593: \$? = $ac_status" >&5
+  echo "$as_me:9843: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -9601,7 +9851,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9604: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:9854: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
 echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
 if test "$ac_cv_lib_ICE_IceConnectionNumber" = yes; then
   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
@@ -9611,13 +9861,13 @@
 
 fi
 
-echo "$as_me:9614: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "$as_me:9864: checking for sys/wait.h that is POSIX.1 compatible" >&5
 echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6
 if test "${ac_cv_header_sys_wait_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 9620 "configure"
+#line 9870 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -9639,16 +9889,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9642: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9892: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9645: \$? = $ac_status" >&5
+  echo "$as_me:9895: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9648: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9898: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9651: \$? = $ac_status" >&5
+  echo "$as_me:9901: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_sys_wait_h=yes
 else
@@ -9658,7 +9908,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:9661: result: $ac_cv_header_sys_wait_h" >&5
+echo "$as_me:9911: result: $ac_cv_header_sys_wait_h" >&5
 echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6
 if test $ac_cv_header_sys_wait_h = yes; then
 
@@ -9668,14 +9918,14 @@
 
 fi
 
-echo "$as_me:9671: checking for POSIX wait functions" >&5
+echo "$as_me:9921: checking for POSIX wait functions" >&5
 echo $ECHO_N "checking for POSIX wait functions... $ECHO_C" >&6
 if test "${cf_cv_posix_wait+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9678 "configure"
+#line 9928 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -9700,16 +9950,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9703: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9953: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9706: \$? = $ac_status" >&5
+  echo "$as_me:9956: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9709: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9959: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9712: \$? = $ac_status" >&5
+  echo "$as_me:9962: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_wait=yes
 else
@@ -9720,21 +9970,21 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:9723: result: $cf_cv_posix_wait" >&5
+echo "$as_me:9973: result: $cf_cv_posix_wait" >&5
 echo "${ECHO_T}$cf_cv_posix_wait" >&6
 test "$cf_cv_posix_wait" = yes &&
 cat >>confdefs.h <<\EOF
 #define USE_POSIX_WAIT 1
 EOF
 
-echo "$as_me:9730: checking if external sys_nerr is declared" >&5
+echo "$as_me:9980: checking if external sys_nerr is declared" >&5
 echo $ECHO_N "checking if external sys_nerr is declared... $ECHO_C" >&6
 if test "${cf_cv_dcl_sys_nerr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 9737 "configure"
+#line 9987 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -9752,16 +10002,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9755: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10005: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9758: \$? = $ac_status" >&5
+  echo "$as_me:10008: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9761: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10011: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9764: \$? = $ac_status" >&5
+  echo "$as_me:10014: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_sys_nerr=yes
 else
@@ -9772,7 +10022,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:9775: result: $cf_cv_dcl_sys_nerr" >&5
+echo "$as_me:10025: result: $cf_cv_dcl_sys_nerr" >&5
 echo "${ECHO_T}$cf_cv_dcl_sys_nerr" >&6
 
 if test "$cf_cv_dcl_sys_nerr" = no ; then
@@ -9787,14 +10037,14 @@
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:9790: checking if external sys_nerr exists" >&5
+echo "$as_me:10040: checking if external sys_nerr exists" >&5
 echo $ECHO_N "checking if external sys_nerr exists... $ECHO_C" >&6
 if test "${cf_cv_have_sys_nerr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 9797 "configure"
+#line 10047 "configure"
 #include "confdefs.h"
 
 #undef sys_nerr
@@ -9809,16 +10059,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9812: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10062: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9815: \$? = $ac_status" >&5
+  echo "$as_me:10065: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9818: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10068: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9821: \$? = $ac_status" >&5
+  echo "$as_me:10071: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_sys_nerr=yes
 else
@@ -9829,7 +10079,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:9832: result: $cf_cv_have_sys_nerr" >&5
+echo "$as_me:10082: result: $cf_cv_have_sys_nerr" >&5
 echo "${ECHO_T}$cf_cv_have_sys_nerr" >&6
 
 if test "$cf_cv_have_sys_nerr" = yes ; then
@@ -9842,14 +10092,14 @@
 
 fi
 
-echo "$as_me:9845: checking if external sys_errlist is declared" >&5
+echo "$as_me:10095: checking if external sys_errlist is declared" >&5
 echo $ECHO_N "checking if external sys_errlist is declared... $ECHO_C" >&6
 if test "${cf_cv_dcl_sys_errlist+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 9852 "configure"
+#line 10102 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -9867,16 +10117,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9870: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10120: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9873: \$? = $ac_status" >&5
+  echo "$as_me:10123: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9876: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10126: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9879: \$? = $ac_status" >&5
+  echo "$as_me:10129: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_sys_errlist=yes
 else
@@ -9887,7 +10137,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:9890: result: $cf_cv_dcl_sys_errlist" >&5
+echo "$as_me:10140: result: $cf_cv_dcl_sys_errlist" >&5
 echo "${ECHO_T}$cf_cv_dcl_sys_errlist" >&6
 
 if test "$cf_cv_dcl_sys_errlist" = no ; then
@@ -9902,14 +10152,14 @@
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:9905: checking if external sys_errlist exists" >&5
+echo "$as_me:10155: checking if external sys_errlist exists" >&5
 echo $ECHO_N "checking if external sys_errlist exists... $ECHO_C" >&6
 if test "${cf_cv_have_sys_errlist+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 9912 "configure"
+#line 10162 "configure"
 #include "confdefs.h"
 
 #undef sys_errlist
@@ -9924,16 +10174,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9927: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10177: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9930: \$? = $ac_status" >&5
+  echo "$as_me:10180: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9933: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10183: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9936: \$? = $ac_status" >&5
+  echo "$as_me:10186: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_sys_errlist=yes
 else
@@ -9944,7 +10194,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:9947: result: $cf_cv_have_sys_errlist" >&5
+echo "$as_me:10197: result: $cf_cv_have_sys_errlist" >&5
 echo "${ECHO_T}$cf_cv_have_sys_errlist" >&6
 
 if test "$cf_cv_have_sys_errlist" = yes ; then
@@ -9980,23 +10230,23 @@
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:9983: checking for $ac_header" >&5
+echo "$as_me:10233: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 9989 "configure"
+#line 10239 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:9993: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:10243: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:9999: \$? = $ac_status" >&5
+  echo "$as_me:10249: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -10015,7 +10265,7 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:10018: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:10268: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -10025,14 +10275,14 @@
 fi
 done
 
-echo "$as_me:10028: checking if we should define SYSV" >&5
+echo "$as_me:10278: checking if we should define SYSV" >&5
 echo $ECHO_N "checking if we should define SYSV... $ECHO_C" >&6
 if test "${cf_cv_sysv+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10035 "configure"
+#line 10285 "configure"
 #include "confdefs.h"
 
 #undef  SYSV
@@ -10076,16 +10326,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10079: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10329: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10082: \$? = $ac_status" >&5
+  echo "$as_me:10332: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10085: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10335: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10088: \$? = $ac_status" >&5
+  echo "$as_me:10338: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sysv=yes
 else
@@ -10096,7 +10346,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10099: result: $cf_cv_sysv" >&5
+echo "$as_me:10349: result: $cf_cv_sysv" >&5
 echo "${ECHO_T}$cf_cv_sysv" >&6
 test "$cf_cv_sysv" = yes &&
 cat >>confdefs.h <<\EOF
@@ -10107,7 +10357,7 @@
 CFLAGS="$cf_save_CFLAGS_CF_SYSV"
 CPPFLAGS="$cf_save_CPPFLAGS_CF_SYSV"
 
-echo "$as_me:10110: checking for elf_begin in -lelf" >&5
+echo "$as_me:10360: checking for elf_begin in -lelf" >&5
 echo $ECHO_N "checking for elf_begin in -lelf... $ECHO_C" >&6
 if test "${ac_cv_lib_elf_elf_begin+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10115,7 +10365,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lelf  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10118 "configure"
+#line 10368 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10134,16 +10384,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10137: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10387: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10140: \$? = $ac_status" >&5
+  echo "$as_me:10390: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10143: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10393: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10146: \$? = $ac_status" >&5
+  echo "$as_me:10396: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_elf_elf_begin=yes
 else
@@ -10154,18 +10404,18 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10157: result: $ac_cv_lib_elf_elf_begin" >&5
+echo "$as_me:10407: result: $ac_cv_lib_elf_elf_begin" >&5
 echo "${ECHO_T}$ac_cv_lib_elf_elf_begin" >&6
 if test "$ac_cv_lib_elf_elf_begin" = yes; then
 
-echo "$as_me:10161: checking if this is an SVR4 system" >&5
+echo "$as_me:10411: checking if this is an SVR4 system" >&5
 echo $ECHO_N "checking if this is an SVR4 system... $ECHO_C" >&6
 if test "${cf_cv_svr4+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10168 "configure"
+#line 10418 "configure"
 #include "confdefs.h"
 
 #if defined(__CYGWIN__)
@@ -10194,16 +10444,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10197: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10447: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10200: \$? = $ac_status" >&5
+  echo "$as_me:10450: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10203: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10453: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10206: \$? = $ac_status" >&5
+  echo "$as_me:10456: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_svr4=yes
 else
@@ -10214,7 +10464,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10217: result: $cf_cv_svr4" >&5
+echo "$as_me:10467: result: $cf_cv_svr4" >&5
 echo "${ECHO_T}$cf_cv_svr4" >&6
 
 fi
@@ -10224,7 +10474,7 @@
 #define SVR4 1
 EOF
 
-echo "$as_me:10227: checking if you want to use pkg-config" >&5
+echo "$as_me:10477: checking if you want to use pkg-config" >&5
 echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6
 
 # Check whether --with-pkg-config or --without-pkg-config was given.
@@ -10234,7 +10484,7 @@
 else
   cf_pkg_config=yes
 fi;
-echo "$as_me:10237: result: $cf_pkg_config" >&5
+echo "$as_me:10487: result: $cf_pkg_config" >&5
 echo "${ECHO_T}$cf_pkg_config" >&6
 
 case "$cf_pkg_config" in
@@ -10246,7 +10496,7 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-echo "$as_me:10249: checking for $ac_word" >&5
+echo "$as_me:10499: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10263,7 +10513,7 @@
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:10266: found $ac_dir/$ac_word" >&5
+   echo "$as_me:10516: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -10274,10 +10524,10 @@
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:10277: result: $PKG_CONFIG" >&5
+  echo "$as_me:10527: result: $PKG_CONFIG" >&5
 echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  echo "$as_me:10280: result: no" >&5
+  echo "$as_me:10530: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -10286,7 +10536,7 @@
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-echo "$as_me:10289: checking for $ac_word" >&5
+echo "$as_me:10539: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10303,7 +10553,7 @@
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:10306: found $ac_dir/$ac_word" >&5
+   echo "$as_me:10556: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -10315,10 +10565,10 @@
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 
 if test -n "$ac_pt_PKG_CONFIG"; then
-  echo "$as_me:10318: result: $ac_pt_PKG_CONFIG" >&5
+  echo "$as_me:10568: result: $ac_pt_PKG_CONFIG" >&5
 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
 else
-  echo "$as_me:10321: result: no" >&5
+  echo "$as_me:10571: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -10361,14 +10611,14 @@
 	PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:10364: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+	{ { echo "$as_me:10614: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
 echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
 esac
 
 elif test "x$cf_pkg_config" != xno ; then
-	{ echo "$as_me:10371: WARNING: pkg-config is not installed" >&5
+	{ echo "$as_me:10621: WARNING: pkg-config is not installed" >&5
 echo "$as_me: WARNING: pkg-config is not installed" >&2;}
 fi
 
@@ -10384,17 +10634,17 @@
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then
 	test -n "$verbose" && echo "	found package x11" 1>&6
 
-echo "${as_me:-configure}:10387: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:10637: testing found package x11 ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "x11" 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "x11" 2>/dev/null`"
 	test -n "$verbose" && echo "	package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:10393: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:10643: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package x11 LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:10397: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:10647: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -10514,24 +10764,24 @@
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:10517: WARNING: unable to find X11 library" >&5
+	{ echo "$as_me:10767: WARNING: unable to find X11 library" >&5
 echo "$as_me: WARNING: unable to find X11 library" >&2;}
 fi
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "ice"; then
 	test -n "$verbose" && echo "	found package ice" 1>&6
 
-echo "${as_me:-configure}:10524: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:10774: testing found package ice ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "ice" 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "ice" 2>/dev/null`"
 	test -n "$verbose" && echo "	package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:10530: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:10780: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package ice LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:10534: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:10784: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -10651,24 +10901,24 @@
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:10654: WARNING: unable to find ICE library" >&5
+	{ echo "$as_me:10904: WARNING: unable to find ICE library" >&5
 echo "$as_me: WARNING: unable to find ICE library" >&2;}
 fi
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then
 	test -n "$verbose" && echo "	found package sm" 1>&6
 
-echo "${as_me:-configure}:10661: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:10911: testing found package sm ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "sm" 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "sm" 2>/dev/null`"
 	test -n "$verbose" && echo "	package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:10667: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:10917: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package sm LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:10671: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:10921: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -10788,24 +11038,24 @@
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:10791: WARNING: unable to find SM library" >&5
+	{ echo "$as_me:11041: WARNING: unable to find SM library" >&5
 echo "$as_me: WARNING: unable to find SM library" >&2;}
 fi
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then
 	test -n "$verbose" && echo "	found package xt" 1>&6
 
-echo "${as_me:-configure}:10798: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:11048: testing found package xt ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "xt" 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "xt" 2>/dev/null`"
 	test -n "$verbose" && echo "	package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:10804: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:11054: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package xt LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:10808: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:11058: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -10925,7 +11175,7 @@
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:10928: WARNING: unable to find Xt library" >&5
+	{ echo "$as_me:11178: WARNING: unable to find Xt library" >&5
 echo "$as_me: WARNING: unable to find Xt library" >&2;}
 fi
 
@@ -10938,17 +11188,17 @@
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then
 	test -n "$verbose" && echo "	found package xt" 1>&6
 
-echo "${as_me:-configure}:10941: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:11191: testing found package xt ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "xt" 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "xt" 2>/dev/null`"
 	test -n "$verbose" && echo "	package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:10947: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:11197: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package xt LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:10951: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:11201: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -11069,14 +11319,14 @@
 		;;
 	(*)
 # we have an "xt" package, but it may omit Xt's dependency on X11
-echo "$as_me:11072: checking for usable X dependency" >&5
+echo "$as_me:11322: checking for usable X dependency" >&5
 echo $ECHO_N "checking for usable X dependency... $ECHO_C" >&6
 if test "${cf_cv_xt_x11_compat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11079 "configure"
+#line 11329 "configure"
 #include "confdefs.h"
 
 #include <X11/Xlib.h>
@@ -11095,16 +11345,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11098: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11348: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11101: \$? = $ac_status" >&5
+  echo "$as_me:11351: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11104: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11354: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11107: \$? = $ac_status" >&5
+  echo "$as_me:11357: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xt_x11_compat=yes
 else
@@ -11114,30 +11364,30 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:11117: result: $cf_cv_xt_x11_compat" >&5
+echo "$as_me:11367: result: $cf_cv_xt_x11_compat" >&5
 echo "${ECHO_T}$cf_cv_xt_x11_compat" >&6
 		if test "$cf_cv_xt_x11_compat" = no
 		then
 			test -n "$verbose" && echo "	work around broken X11 dependency" 1>&6
 
-echo "${as_me:-configure}:11123: testing work around broken X11 dependency ..." 1>&5
+echo "${as_me:-configure}:11373: testing work around broken X11 dependency ..." 1>&5
 
 			# 2010/11/19 - good enough until a working Xt on Xcb is delivered.
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then
 	test -n "$verbose" && echo "	found package x11" 1>&6
 
-echo "${as_me:-configure}:11130: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:11380: testing found package x11 ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "x11" 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "x11" 2>/dev/null`"
 	test -n "$verbose" && echo "	package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:11136: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:11386: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package x11 LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:11140: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:11390: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -11260,12 +11510,12 @@
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:11263: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:11513: testing ...before $LIBS ..." 1>&5
 
 LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%-lXt %-lXt -lX11 %" -e 's%  % %g'`
 test -n "$verbose" && echo "	...after  $LIBS" 1>&6
 
-echo "${as_me:-configure}:11268: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:11518: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -11273,14 +11523,14 @@
 		;;
 	esac
 
-echo "$as_me:11276: checking for usable X Toolkit package" >&5
+echo "$as_me:11526: checking for usable X Toolkit package" >&5
 echo $ECHO_N "checking for usable X Toolkit package... $ECHO_C" >&6
 if test "${cf_cv_xt_ice_compat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11283 "configure"
+#line 11533 "configure"
 #include "confdefs.h"
 
 #include <X11/Shell.h>
@@ -11295,16 +11545,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11298: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11548: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11301: \$? = $ac_status" >&5
+  echo "$as_me:11551: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11304: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11554: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11307: \$? = $ac_status" >&5
+  echo "$as_me:11557: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xt_ice_compat=yes
 else
@@ -11314,7 +11564,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:11317: result: $cf_cv_xt_ice_compat" >&5
+echo "$as_me:11567: result: $cf_cv_xt_ice_compat" >&5
 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
 
 	if test "$cf_cv_xt_ice_compat" = no
@@ -11328,22 +11578,22 @@
 			(*)
 				test -n "$verbose" && echo "	work around broken ICE dependency" 1>&6
 
-echo "${as_me:-configure}:11331: testing work around broken ICE dependency ..." 1>&5
+echo "${as_me:-configure}:11581: testing work around broken ICE dependency ..." 1>&5
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "ice"; then
 	test -n "$verbose" && echo "	found package ice" 1>&6
 
-echo "${as_me:-configure}:11336: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:11586: testing found package ice ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "ice" 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "ice" 2>/dev/null`"
 	test -n "$verbose" && echo "	package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:11342: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:11592: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package ice LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:11346: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:11596: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -11462,17 +11712,17 @@
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then
 	test -n "$verbose" && echo "	found package sm" 1>&6
 
-echo "${as_me:-configure}:11465: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:11715: testing found package sm ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "sm" 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "sm" 2>/dev/null`"
 	test -n "$verbose" && echo "	package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:11471: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:11721: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package sm LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:11475: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:11725: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -11601,12 +11851,12 @@
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:11604: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:11854: testing ...before $LIBS ..." 1>&5
 
 LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%-lXt %-lXt $X_PRE_LIBS %" -e 's%  % %g'`
 test -n "$verbose" && echo "	...after  $LIBS" 1>&6
 
-echo "${as_me:-configure}:11609: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:11859: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -11626,7 +11876,7 @@
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:11629: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:11879: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -11711,7 +11961,7 @@
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:11714: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:11964: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -11721,7 +11971,7 @@
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:11724: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:11974: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -11731,7 +11981,7 @@
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:11734: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:11984: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
 
 	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
 	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
@@ -11740,7 +11990,7 @@
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11743 "configure"
+#line 11993 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11752,16 +12002,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11755: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12005: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11758: \$? = $ac_status" >&5
+  echo "$as_me:12008: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11761: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12011: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11764: \$? = $ac_status" >&5
+  echo "$as_me:12014: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11769,12 +12019,12 @@
 cat "conftest.$ac_ext" >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:11772: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:12022: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
 
 	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:11777: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:12027: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_cflags"
@@ -11782,13 +12032,13 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
-	echo "$as_me:11785: checking for XOpenDisplay" >&5
+	echo "$as_me:12035: checking for XOpenDisplay" >&5
 echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6
 if test "${ac_cv_func_XOpenDisplay+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 11791 "configure"
+#line 12041 "configure"
 #include "confdefs.h"
 #define XOpenDisplay autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -11819,16 +12069,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11822: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12072: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11825: \$? = $ac_status" >&5
+  echo "$as_me:12075: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11828: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12078: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11831: \$? = $ac_status" >&5
+  echo "$as_me:12081: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_XOpenDisplay=yes
 else
@@ -11838,13 +12088,13 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:11841: result: $ac_cv_func_XOpenDisplay" >&5
+echo "$as_me:12091: result: $ac_cv_func_XOpenDisplay" >&5
 echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6
 if test "$ac_cv_func_XOpenDisplay" = yes; then
   :
 else
 
-	echo "$as_me:11847: checking for XOpenDisplay in -lX11" >&5
+	echo "$as_me:12097: checking for XOpenDisplay in -lX11" >&5
 echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
 if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11852,7 +12102,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11855 "configure"
+#line 12105 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11871,16 +12121,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11874: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12124: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11877: \$? = $ac_status" >&5
+  echo "$as_me:12127: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11880: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12130: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11883: \$? = $ac_status" >&5
+  echo "$as_me:12133: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -11891,7 +12141,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11894: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:12144: result: $ac_cv_lib_X11_XOpenDisplay" >&5
 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
 if test "$ac_cv_lib_X11_XOpenDisplay" = yes; then
 
@@ -11915,13 +12165,13 @@
 
 fi
 
-	echo "$as_me:11918: checking for XtAppInitialize" >&5
+	echo "$as_me:12168: checking for XtAppInitialize" >&5
 echo $ECHO_N "checking for XtAppInitialize... $ECHO_C" >&6
 if test "${ac_cv_func_XtAppInitialize+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 11924 "configure"
+#line 12174 "configure"
 #include "confdefs.h"
 #define XtAppInitialize autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -11952,16 +12202,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11955: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12205: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11958: \$? = $ac_status" >&5
+  echo "$as_me:12208: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11961: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12211: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11964: \$? = $ac_status" >&5
+  echo "$as_me:12214: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_XtAppInitialize=yes
 else
@@ -11971,13 +12221,13 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:11974: result: $ac_cv_func_XtAppInitialize" >&5
+echo "$as_me:12224: result: $ac_cv_func_XtAppInitialize" >&5
 echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6
 if test "$ac_cv_func_XtAppInitialize" = yes; then
   :
 else
 
-	echo "$as_me:11980: checking for XtAppInitialize in -lXt" >&5
+	echo "$as_me:12230: checking for XtAppInitialize in -lXt" >&5
 echo $ECHO_N "checking for XtAppInitialize in -lXt... $ECHO_C" >&6
 if test "${ac_cv_lib_Xt_XtAppInitialize+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11985,7 +12235,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11988 "configure"
+#line 12238 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12004,16 +12254,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12007: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12257: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12010: \$? = $ac_status" >&5
+  echo "$as_me:12260: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12013: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12263: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12016: \$? = $ac_status" >&5
+  echo "$as_me:12266: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xt_XtAppInitialize=yes
 else
@@ -12024,7 +12274,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12027: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:12277: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
 echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6
 if test "$ac_cv_lib_Xt_XtAppInitialize" = yes; then
 
@@ -12041,7 +12291,7 @@
 fi
 
 if test "$cf_have_X_LIBS" = no ; then
-	{ echo "$as_me:12044: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+	{ echo "$as_me:12294: WARNING: Unable to successfully link X Toolkit library (-lXt) with
 test program.  You will have to check and add the proper libraries by hand
 to makefile." >&5
 echo "$as_me: WARNING: Unable to successfully link X Toolkit library (-lXt) with
@@ -12060,23 +12310,23 @@
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:12063: checking for $ac_header" >&5
+echo "$as_me:12313: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 12069 "configure"
+#line 12319 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:12073: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:12323: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:12079: \$? = $ac_status" >&5
+  echo "$as_me:12329: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12095,7 +12345,7 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:12098: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:12348: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -12110,7 +12360,7 @@
 cf_save_cppflags="${CPPFLAGS}"
 cf_save_ldflags="${LDFLAGS}"
 
-echo "$as_me:12113: checking if you want to use the Xpm library for colored icon" >&5
+echo "$as_me:12363: checking if you want to use the Xpm library for colored icon" >&5
 echo $ECHO_N "checking if you want to use the Xpm library for colored icon... $ECHO_C" >&6
 
 # Check whether --with-xpm or --without-xpm was given.
@@ -12120,7 +12370,7 @@
 else
   cf_Xpm_library=yes
 fi;
-echo "$as_me:12123: result: $cf_Xpm_library" >&5
+echo "$as_me:12373: result: $cf_Xpm_library" >&5
 echo "${ECHO_T}$cf_Xpm_library" >&6
 
 if test "$cf_Xpm_library" != no ; then
@@ -12128,23 +12378,23 @@
 	CPPFLAGS="$CPPFLAGS -I$withval/include"
 	LDFLAGS="$LDFLAGS -L$withval/lib"
     fi
-    echo "$as_me:12131: checking for X11/xpm.h" >&5
+    echo "$as_me:12381: checking for X11/xpm.h" >&5
 echo $ECHO_N "checking for X11/xpm.h... $ECHO_C" >&6
 if test "${ac_cv_header_X11_xpm_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 12137 "configure"
+#line 12387 "configure"
 #include "confdefs.h"
 #include <X11/xpm.h>
 _ACEOF
-if { (eval echo "$as_me:12141: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:12391: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:12147: \$? = $ac_status" >&5
+  echo "$as_me:12397: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12163,11 +12413,11 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:12166: result: $ac_cv_header_X11_xpm_h" >&5
+echo "$as_me:12416: result: $ac_cv_header_X11_xpm_h" >&5
 echo "${ECHO_T}$ac_cv_header_X11_xpm_h" >&6
 if test "$ac_cv_header_X11_xpm_h" = yes; then
 
-	echo "$as_me:12170: checking for XpmCreatePixmapFromData in -lXpm" >&5
+	echo "$as_me:12420: checking for XpmCreatePixmapFromData in -lXpm" >&5
 echo $ECHO_N "checking for XpmCreatePixmapFromData in -lXpm... $ECHO_C" >&6
 if test "${ac_cv_lib_Xpm_XpmCreatePixmapFromData+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12175,7 +12425,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXpm -lX11 $X_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12178 "configure"
+#line 12428 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12194,16 +12444,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12197: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12447: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12200: \$? = $ac_status" >&5
+  echo "$as_me:12450: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12203: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12453: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12206: \$? = $ac_status" >&5
+  echo "$as_me:12456: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xpm_XpmCreatePixmapFromData=yes
 else
@@ -12214,7 +12464,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12217: result: $ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&5
+echo "$as_me:12467: result: $ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&5
 echo "${ECHO_T}$ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&6
 if test "$ac_cv_lib_Xpm_XpmCreatePixmapFromData" = yes; then
 
@@ -12234,7 +12484,7 @@
 
 fi
 
-echo "$as_me:12237: checking if you want to use the Xinerama extension" >&5
+echo "$as_me:12487: checking if you want to use the Xinerama extension" >&5
 echo $ECHO_N "checking if you want to use the Xinerama extension... $ECHO_C" >&6
 
 # Check whether --with-xinerama or --without-xinerama was given.
@@ -12244,24 +12494,24 @@
 else
   cf_with_xinerama=yes
 fi;
-echo "$as_me:12247: result: $cf_with_xinerama" >&5
+echo "$as_me:12497: result: $cf_with_xinerama" >&5
 echo "${ECHO_T}$cf_with_xinerama" >&6
 if test "$cf_with_xinerama" = yes; then
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xinerama"; then
 	test -n "$verbose" && echo "	found package xinerama" 1>&6
 
-echo "${as_me:-configure}:12254: testing found package xinerama ..." 1>&5
+echo "${as_me:-configure}:12504: testing found package xinerama ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "xinerama" 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "xinerama" 2>/dev/null`"
 	test -n "$verbose" && echo "	package xinerama CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:12260: testing package xinerama CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:12510: testing package xinerama CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package xinerama LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:12264: testing package xinerama LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:12514: testing package xinerama LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -12385,7 +12635,7 @@
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
 
-	echo "$as_me:12388: checking for XineramaQueryScreens in -lXinerama" >&5
+	echo "$as_me:12638: checking for XineramaQueryScreens in -lXinerama" >&5
 echo $ECHO_N "checking for XineramaQueryScreens in -lXinerama... $ECHO_C" >&6
 if test "${ac_cv_lib_Xinerama_XineramaQueryScreens+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12393,7 +12643,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXinerama  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12396 "configure"
+#line 12646 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12412,16 +12662,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12415: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12665: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12418: \$? = $ac_status" >&5
+  echo "$as_me:12668: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12421: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12671: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12424: \$? = $ac_status" >&5
+  echo "$as_me:12674: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xinerama_XineramaQueryScreens=yes
 else
@@ -12432,7 +12682,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12435: result: $ac_cv_lib_Xinerama_XineramaQueryScreens" >&5
+echo "$as_me:12685: result: $ac_cv_lib_Xinerama_XineramaQueryScreens" >&5
 echo "${ECHO_T}$ac_cv_lib_Xinerama_XineramaQueryScreens" >&6
 if test "$ac_cv_lib_Xinerama_XineramaQueryScreens" = yes; then
 
@@ -12457,23 +12707,23 @@
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:12460: checking for $ac_header" >&5
+echo "$as_me:12710: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 12466 "configure"
+#line 12716 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:12470: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:12720: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:12476: \$? = $ac_status" >&5
+  echo "$as_me:12726: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12492,7 +12742,7 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:12495: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:12745: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -12510,7 +12760,7 @@
 
 cf_x_athena=${cf_x_athena:-Xaw}
 
-echo "$as_me:12513: checking if you want to link with Xaw 3d library" >&5
+echo "$as_me:12763: checking if you want to link with Xaw 3d library" >&5
 echo $ECHO_N "checking if you want to link with Xaw 3d library... $ECHO_C" >&6
 withval=
 
@@ -12521,14 +12771,14 @@
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3d
-	echo "$as_me:12524: result: yes" >&5
+	echo "$as_me:12774: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:12527: result: no" >&5
+	echo "$as_me:12777: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:12531: checking if you want to link with Xaw 3d xft library" >&5
+echo "$as_me:12781: checking if you want to link with Xaw 3d xft library" >&5
 echo $ECHO_N "checking if you want to link with Xaw 3d xft library... $ECHO_C" >&6
 withval=
 
@@ -12539,14 +12789,14 @@
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3dxft
-	echo "$as_me:12542: result: yes" >&5
+	echo "$as_me:12792: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:12545: result: no" >&5
+	echo "$as_me:12795: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:12549: checking if you want to link with neXT Athena library" >&5
+echo "$as_me:12799: checking if you want to link with neXT Athena library" >&5
 echo $ECHO_N "checking if you want to link with neXT Athena library... $ECHO_C" >&6
 withval=
 
@@ -12557,14 +12807,14 @@
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=neXtaw
-	echo "$as_me:12560: result: yes" >&5
+	echo "$as_me:12810: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:12563: result: no" >&5
+	echo "$as_me:12813: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:12567: checking if you want to link with Athena-Plus library" >&5
+echo "$as_me:12817: checking if you want to link with Athena-Plus library" >&5
 echo $ECHO_N "checking if you want to link with Athena-Plus library... $ECHO_C" >&6
 withval=
 
@@ -12575,10 +12825,10 @@
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=XawPlus
-	echo "$as_me:12578: result: yes" >&5
+	echo "$as_me:12828: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:12581: result: no" >&5
+	echo "$as_me:12831: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -12598,17 +12848,17 @@
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_athena_pkg"; then
 	test -n "$verbose" && echo "	found package $cf_athena_pkg" 1>&6
 
-echo "${as_me:-configure}:12601: testing found package $cf_athena_pkg ..." 1>&5
+echo "${as_me:-configure}:12851: testing found package $cf_athena_pkg ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "$cf_athena_pkg" 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "$cf_athena_pkg" 2>/dev/null`"
 	test -n "$verbose" && echo "	package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:12607: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:12857: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package $cf_athena_pkg LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:12611: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:12861: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -12739,20 +12989,20 @@
 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
 
-echo "${as_me:-configure}:12742: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:12992: testing ..trimmed $LIBS ..." 1>&5
 
 			;;
 		esac
 	done
 
-echo "$as_me:12748: checking for usable $cf_x_athena/Xmu package" >&5
+echo "$as_me:12998: checking for usable $cf_x_athena/Xmu package" >&5
 echo $ECHO_N "checking for usable $cf_x_athena/Xmu package... $ECHO_C" >&6
 if test "${cf_cv_xaw_compat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12755 "configure"
+#line 13005 "configure"
 #include "confdefs.h"
 
 #include <X11/Xmu/CharSet.h>
@@ -12769,16 +13019,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12772: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13022: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12775: \$? = $ac_status" >&5
+  echo "$as_me:13025: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12778: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13028: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12781: \$? = $ac_status" >&5
+  echo "$as_me:13031: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xaw_compat=yes
 else
@@ -12788,7 +13038,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:12791: result: $cf_cv_xaw_compat" >&5
+echo "$as_me:13041: result: $cf_cv_xaw_compat" >&5
 echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 
 			if test "$cf_cv_xaw_compat" = no
@@ -12800,7 +13050,7 @@
 				(*)
 					test -n "$verbose" && echo "	work around broken package" 1>&6
 
-echo "${as_me:-configure}:12803: testing work around broken package ..." 1>&5
+echo "${as_me:-configure}:13053: testing work around broken package ..." 1>&5
 
 					cf_save_xmu="$LIBS"
 					cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^  *//' -e 's/ .*//'`
@@ -12808,17 +13058,17 @@
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xmu"; then
 	test -n "$verbose" && echo "	found package xmu" 1>&6
 
-echo "${as_me:-configure}:12811: testing found package xmu ..." 1>&5
+echo "${as_me:-configure}:13061: testing found package xmu ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "xmu" 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "xmu" 2>/dev/null`"
 	test -n "$verbose" && echo "	package xmu CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:12817: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:13067: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package xmu LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:12821: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:13071: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -12938,12 +13188,12 @@
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:12941: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:13191: testing ...before $LIBS ..." 1>&5
 
 LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%$cf_first_lib %$cf_first_lib $cf_pkgconfig_libs %" -e 's%  % %g'`
 test -n "$verbose" && echo "	...after  $LIBS" 1>&6
 
-echo "${as_me:-configure}:12946: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:13196: testing ...after  $LIBS ..." 1>&5
 
 else
 	cf_pkgconfig_incs=
@@ -12951,12 +13201,12 @@
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:12954: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:13204: testing ...before $LIBS ..." 1>&5
 
 LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%$cf_first_lib %$cf_first_lib -lXmu %" -e 's%  % %g'`
 test -n "$verbose" && echo "	...after  $LIBS" 1>&6
 
-echo "${as_me:-configure}:12959: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:13209: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -12967,7 +13217,7 @@
 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
 
-echo "${as_me:-configure}:12970: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:13220: testing ..trimmed $LIBS ..." 1>&5
 
 			;;
 		esac
@@ -12992,17 +13242,17 @@
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "Xext"; then
 	test -n "$verbose" && echo "	found package Xext" 1>&6
 
-echo "${as_me:-configure}:12995: testing found package Xext ..." 1>&5
+echo "${as_me:-configure}:13245: testing found package Xext ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "Xext" 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "Xext" 2>/dev/null`"
 	test -n "$verbose" && echo "	package Xext CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:13001: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:13251: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package Xext LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:13005: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:13255: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -13123,7 +13373,7 @@
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
 
-	echo "$as_me:13126: checking for XextCreateExtension in -lXext" >&5
+	echo "$as_me:13376: checking for XextCreateExtension in -lXext" >&5
 echo $ECHO_N "checking for XextCreateExtension in -lXext... $ECHO_C" >&6
 if test "${ac_cv_lib_Xext_XextCreateExtension+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13131,7 +13381,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13134 "configure"
+#line 13384 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13150,16 +13400,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13153: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13403: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13156: \$? = $ac_status" >&5
+  echo "$as_me:13406: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13159: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13409: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13162: \$? = $ac_status" >&5
+  echo "$as_me:13412: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
@@ -13170,7 +13420,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13173: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:13423: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
 echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6
 if test "$ac_cv_lib_Xext_XextCreateExtension" = yes; then
 
@@ -13206,17 +13456,17 @@
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then
 	test -n "$verbose" && echo "	found package x11" 1>&6
 
-echo "${as_me:-configure}:13209: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:13459: testing found package x11 ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "x11" 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "x11" 2>/dev/null`"
 	test -n "$verbose" && echo "	package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:13215: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:13465: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package x11 LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:13219: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:13469: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -13336,24 +13586,24 @@
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:13339: WARNING: unable to find X11 library" >&5
+	{ echo "$as_me:13589: WARNING: unable to find X11 library" >&5
 echo "$as_me: WARNING: unable to find X11 library" >&2;}
 fi
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "ice"; then
 	test -n "$verbose" && echo "	found package ice" 1>&6
 
-echo "${as_me:-configure}:13346: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:13596: testing found package ice ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "ice" 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "ice" 2>/dev/null`"
 	test -n "$verbose" && echo "	package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:13352: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:13602: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package ice LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:13356: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:13606: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -13473,24 +13723,24 @@
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:13476: WARNING: unable to find ICE library" >&5
+	{ echo "$as_me:13726: WARNING: unable to find ICE library" >&5
 echo "$as_me: WARNING: unable to find ICE library" >&2;}
 fi
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then
 	test -n "$verbose" && echo "	found package sm" 1>&6
 
-echo "${as_me:-configure}:13483: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:13733: testing found package sm ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "sm" 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "sm" 2>/dev/null`"
 	test -n "$verbose" && echo "	package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:13489: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:13739: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package sm LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:13493: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:13743: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -13610,24 +13860,24 @@
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:13613: WARNING: unable to find SM library" >&5
+	{ echo "$as_me:13863: WARNING: unable to find SM library" >&5
 echo "$as_me: WARNING: unable to find SM library" >&2;}
 fi
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then
 	test -n "$verbose" && echo "	found package xt" 1>&6
 
-echo "${as_me:-configure}:13620: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:13870: testing found package xt ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "xt" 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "xt" 2>/dev/null`"
 	test -n "$verbose" && echo "	package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:13626: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:13876: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package xt LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:13630: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:13880: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -13747,7 +13997,7 @@
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:13750: WARNING: unable to find Xt library" >&5
+	{ echo "$as_me:14000: WARNING: unable to find Xt library" >&5
 echo "$as_me: WARNING: unable to find Xt library" >&2;}
 fi
 
@@ -13760,17 +14010,17 @@
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then
 	test -n "$verbose" && echo "	found package xt" 1>&6
 
-echo "${as_me:-configure}:13763: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:14013: testing found package xt ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "xt" 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "xt" 2>/dev/null`"
 	test -n "$verbose" && echo "	package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:13769: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14019: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package xt LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:13773: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14023: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -13891,14 +14141,14 @@
 		;;
 	(*)
 # we have an "xt" package, but it may omit Xt's dependency on X11
-echo "$as_me:13894: checking for usable X dependency" >&5
+echo "$as_me:14144: checking for usable X dependency" >&5
 echo $ECHO_N "checking for usable X dependency... $ECHO_C" >&6
 if test "${cf_cv_xt_x11_compat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13901 "configure"
+#line 14151 "configure"
 #include "confdefs.h"
 
 #include <X11/Xlib.h>
@@ -13917,16 +14167,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13920: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14170: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13923: \$? = $ac_status" >&5
+  echo "$as_me:14173: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13926: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14176: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13929: \$? = $ac_status" >&5
+  echo "$as_me:14179: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xt_x11_compat=yes
 else
@@ -13936,30 +14186,30 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13939: result: $cf_cv_xt_x11_compat" >&5
+echo "$as_me:14189: result: $cf_cv_xt_x11_compat" >&5
 echo "${ECHO_T}$cf_cv_xt_x11_compat" >&6
 		if test "$cf_cv_xt_x11_compat" = no
 		then
 			test -n "$verbose" && echo "	work around broken X11 dependency" 1>&6
 
-echo "${as_me:-configure}:13945: testing work around broken X11 dependency ..." 1>&5
+echo "${as_me:-configure}:14195: testing work around broken X11 dependency ..." 1>&5
 
 			# 2010/11/19 - good enough until a working Xt on Xcb is delivered.
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then
 	test -n "$verbose" && echo "	found package x11" 1>&6
 
-echo "${as_me:-configure}:13952: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:14202: testing found package x11 ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "x11" 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "x11" 2>/dev/null`"
 	test -n "$verbose" && echo "	package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:13958: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14208: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package x11 LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:13962: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14212: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -14082,12 +14332,12 @@
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:14085: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:14335: testing ...before $LIBS ..." 1>&5
 
 LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%-lXt %-lXt -lX11 %" -e 's%  % %g'`
 test -n "$verbose" && echo "	...after  $LIBS" 1>&6
 
-echo "${as_me:-configure}:14090: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:14340: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -14095,14 +14345,14 @@
 		;;
 	esac
 
-echo "$as_me:14098: checking for usable X Toolkit package" >&5
+echo "$as_me:14348: checking for usable X Toolkit package" >&5
 echo $ECHO_N "checking for usable X Toolkit package... $ECHO_C" >&6
 if test "${cf_cv_xt_ice_compat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14105 "configure"
+#line 14355 "configure"
 #include "confdefs.h"
 
 #include <X11/Shell.h>
@@ -14117,16 +14367,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14120: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14370: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14123: \$? = $ac_status" >&5
+  echo "$as_me:14373: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14126: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14376: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14129: \$? = $ac_status" >&5
+  echo "$as_me:14379: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xt_ice_compat=yes
 else
@@ -14136,7 +14386,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:14139: result: $cf_cv_xt_ice_compat" >&5
+echo "$as_me:14389: result: $cf_cv_xt_ice_compat" >&5
 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
 
 	if test "$cf_cv_xt_ice_compat" = no
@@ -14150,22 +14400,22 @@
 			(*)
 				test -n "$verbose" && echo "	work around broken ICE dependency" 1>&6
 
-echo "${as_me:-configure}:14153: testing work around broken ICE dependency ..." 1>&5
+echo "${as_me:-configure}:14403: testing work around broken ICE dependency ..." 1>&5
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "ice"; then
 	test -n "$verbose" && echo "	found package ice" 1>&6
 
-echo "${as_me:-configure}:14158: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:14408: testing found package ice ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "ice" 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "ice" 2>/dev/null`"
 	test -n "$verbose" && echo "	package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:14164: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14414: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package ice LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:14168: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14418: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -14284,17 +14534,17 @@
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then
 	test -n "$verbose" && echo "	found package sm" 1>&6
 
-echo "${as_me:-configure}:14287: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:14537: testing found package sm ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "sm" 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "sm" 2>/dev/null`"
 	test -n "$verbose" && echo "	package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:14293: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14543: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package sm LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:14297: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14547: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -14423,12 +14673,12 @@
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:14426: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:14676: testing ...before $LIBS ..." 1>&5
 
 LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%-lXt %-lXt $X_PRE_LIBS %" -e 's%  % %g'`
 test -n "$verbose" && echo "	...after  $LIBS" 1>&6
 
-echo "${as_me:-configure}:14431: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:14681: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -14448,7 +14698,7 @@
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:14451: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:14701: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -14533,7 +14783,7 @@
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:14536: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:14786: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -14543,7 +14793,7 @@
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:14546: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:14796: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -14553,7 +14803,7 @@
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:14556: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:14806: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
 
 	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
 	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
@@ -14562,7 +14812,7 @@
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14565 "configure"
+#line 14815 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14574,16 +14824,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14577: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14827: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14580: \$? = $ac_status" >&5
+  echo "$as_me:14830: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14583: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14833: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14586: \$? = $ac_status" >&5
+  echo "$as_me:14836: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -14591,12 +14841,12 @@
 cat "conftest.$ac_ext" >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:14594: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:14844: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
 
 	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:14599: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:14849: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_cflags"
@@ -14604,13 +14854,13 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
-	echo "$as_me:14607: checking for XOpenDisplay" >&5
+	echo "$as_me:14857: checking for XOpenDisplay" >&5
 echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6
 if test "${ac_cv_func_XOpenDisplay+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14613 "configure"
+#line 14863 "configure"
 #include "confdefs.h"
 #define XOpenDisplay autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -14641,16 +14891,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14644: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14894: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14647: \$? = $ac_status" >&5
+  echo "$as_me:14897: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14650: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14900: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14653: \$? = $ac_status" >&5
+  echo "$as_me:14903: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_XOpenDisplay=yes
 else
@@ -14660,13 +14910,13 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:14663: result: $ac_cv_func_XOpenDisplay" >&5
+echo "$as_me:14913: result: $ac_cv_func_XOpenDisplay" >&5
 echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6
 if test "$ac_cv_func_XOpenDisplay" = yes; then
   :
 else
 
-	echo "$as_me:14669: checking for XOpenDisplay in -lX11" >&5
+	echo "$as_me:14919: checking for XOpenDisplay in -lX11" >&5
 echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
 if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14674,7 +14924,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14677 "configure"
+#line 14927 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14693,16 +14943,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14696: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14946: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14699: \$? = $ac_status" >&5
+  echo "$as_me:14949: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14702: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14952: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14705: \$? = $ac_status" >&5
+  echo "$as_me:14955: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -14713,7 +14963,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14716: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:14966: result: $ac_cv_lib_X11_XOpenDisplay" >&5
 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
 if test "$ac_cv_lib_X11_XOpenDisplay" = yes; then
 
@@ -14737,13 +14987,13 @@
 
 fi
 
-	echo "$as_me:14740: checking for XtAppInitialize" >&5
+	echo "$as_me:14990: checking for XtAppInitialize" >&5
 echo $ECHO_N "checking for XtAppInitialize... $ECHO_C" >&6
 if test "${ac_cv_func_XtAppInitialize+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 14746 "configure"
+#line 14996 "configure"
 #include "confdefs.h"
 #define XtAppInitialize autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -14774,16 +15024,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14777: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15027: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14780: \$? = $ac_status" >&5
+  echo "$as_me:15030: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14783: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15033: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14786: \$? = $ac_status" >&5
+  echo "$as_me:15036: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_XtAppInitialize=yes
 else
@@ -14793,13 +15043,13 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:14796: result: $ac_cv_func_XtAppInitialize" >&5
+echo "$as_me:15046: result: $ac_cv_func_XtAppInitialize" >&5
 echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6
 if test "$ac_cv_func_XtAppInitialize" = yes; then
   :
 else
 
-	echo "$as_me:14802: checking for XtAppInitialize in -lXt" >&5
+	echo "$as_me:15052: checking for XtAppInitialize in -lXt" >&5
 echo $ECHO_N "checking for XtAppInitialize in -lXt... $ECHO_C" >&6
 if test "${ac_cv_lib_Xt_XtAppInitialize+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14807,7 +15057,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14810 "configure"
+#line 15060 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14826,16 +15076,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14829: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15079: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14832: \$? = $ac_status" >&5
+  echo "$as_me:15082: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14835: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15085: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14838: \$? = $ac_status" >&5
+  echo "$as_me:15088: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xt_XtAppInitialize=yes
 else
@@ -14846,7 +15096,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14849: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:15099: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
 echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6
 if test "$ac_cv_lib_Xt_XtAppInitialize" = yes; then
 
@@ -14863,7 +15113,7 @@
 fi
 
 if test "$cf_have_X_LIBS" = no ; then
-	{ echo "$as_me:14866: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+	{ echo "$as_me:15116: WARNING: Unable to successfully link X Toolkit library (-lXt) with
 test program.  You will have to check and add the proper libraries by hand
 to makefile." >&5
 echo "$as_me: WARNING: Unable to successfully link X Toolkit library (-lXt) with
@@ -14904,14 +15154,14 @@
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}-I$cf_path/include"
 
-			echo "$as_me:14907: checking for $cf_test in $cf_path" >&5
+			echo "$as_me:15157: checking for $cf_test in $cf_path" >&5
 echo $ECHO_N "checking for $cf_test in $cf_path... $ECHO_C" >&6
 		else
-			echo "$as_me:14910: checking for $cf_test" >&5
+			echo "$as_me:15160: checking for $cf_test" >&5
 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
 		fi
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 14914 "configure"
+#line 15164 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -14925,16 +15175,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14928: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15178: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14931: \$? = $ac_status" >&5
+  echo "$as_me:15181: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14934: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15184: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14937: \$? = $ac_status" >&5
+  echo "$as_me:15187: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -14943,7 +15193,7 @@
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-		echo "$as_me:14946: result: $cf_result" >&5
+		echo "$as_me:15196: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 LIBS="$cf_save_LIBS_CF_X_ATHENA_CPPFLAGS"
@@ -14959,7 +15209,7 @@
 done
 
 if test -z "$cf_x_athena_inc" ; then
-	{ echo "$as_me:14962: WARNING: Unable to find Athena header files" >&5
+	{ echo "$as_me:15212: WARNING: Unable to find Athena header files" >&5
 echo "$as_me: WARNING: Unable to find Athena header files" >&2;}
 elif test "$cf_x_athena_inc" != default ; then
 
@@ -15024,10 +15274,10 @@
 done
 LIBS="$cf_add_libs"
 
-		echo "$as_me:15027: checking for $cf_test in $cf_libs" >&5
+		echo "$as_me:15277: checking for $cf_test in $cf_libs" >&5
 echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 15030 "configure"
+#line 15280 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -15043,16 +15293,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15046: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15296: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15049: \$? = $ac_status" >&5
+  echo "$as_me:15299: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15052: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15302: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15055: \$? = $ac_status" >&5
+  echo "$as_me:15305: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -15061,7 +15311,7 @@
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:15064: result: $cf_result" >&5
+		echo "$as_me:15314: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 LIBS="$cf_save_LIBS_CF_X_ATHENA_LIBS"
@@ -15078,7 +15328,7 @@
 done
 
 if test -z "$cf_x_athena_lib" ; then
-	{ { echo "$as_me:15081: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+	{ { echo "$as_me:15331: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
 echo "$as_me: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -15110,23 +15360,23 @@
 for ac_header in X11/Xpoll.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:15113: checking for $ac_header" >&5
+echo "$as_me:15363: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 15119 "configure"
+#line 15369 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:15123: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:15373: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:15129: \$? = $ac_status" >&5
+  echo "$as_me:15379: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15145,7 +15395,7 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:15148: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:15398: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -15155,16 +15405,16 @@
 fi
 done
 
-echo "$as_me:15158: checking for declaration of fd_set" >&5
+echo "$as_me:15408: checking for declaration of fd_set" >&5
 echo $ECHO_N "checking for declaration of fd_set... $ECHO_C" >&6
 if test "${cf_cv_type_fd_set+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-echo "${as_me:-configure}:15164: testing sys/types alone ..." 1>&5
+echo "${as_me:-configure}:15414: testing sys/types alone ..." 1>&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15167 "configure"
+#line 15417 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -15177,26 +15427,26 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15180: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15430: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15183: \$? = $ac_status" >&5
+  echo "$as_me:15433: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15186: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15436: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15189: \$? = $ac_status" >&5
+  echo "$as_me:15439: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_type_fd_set=sys/types.h
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-echo "${as_me:-configure}:15196: testing X11/Xpoll.h ..." 1>&5
+echo "${as_me:-configure}:15446: testing X11/Xpoll.h ..." 1>&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15199 "configure"
+#line 15449 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_X11_XPOLL_H
@@ -15211,26 +15461,26 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15214: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15464: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15217: \$? = $ac_status" >&5
+  echo "$as_me:15467: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15220: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15470: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15223: \$? = $ac_status" >&5
+  echo "$as_me:15473: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_type_fd_set=X11/Xpoll.h
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-echo "${as_me:-configure}:15230: testing sys/select.h ..." 1>&5
+echo "${as_me:-configure}:15480: testing sys/select.h ..." 1>&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15233 "configure"
+#line 15483 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -15244,16 +15494,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15247: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15497: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15250: \$? = $ac_status" >&5
+  echo "$as_me:15500: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15253: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15503: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15256: \$? = $ac_status" >&5
+  echo "$as_me:15506: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_type_fd_set=sys/select.h
 else
@@ -15267,7 +15517,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:15270: result: $cf_cv_type_fd_set" >&5
+echo "$as_me:15520: result: $cf_cv_type_fd_set" >&5
 echo "${ECHO_T}$cf_cv_type_fd_set" >&6
 if test $cf_cv_type_fd_set = sys/select.h ; then
 
@@ -15277,7 +15527,7 @@
 
 fi
 
-echo "$as_me:15280: checking for declaration of fd_mask" >&5
+echo "$as_me:15530: checking for declaration of fd_mask" >&5
 echo $ECHO_N "checking for declaration of fd_mask... $ECHO_C" >&6
 if test "${cf_cv_type_fd_mask+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15285,7 +15535,7 @@
 
     if test x$cf_cv_type_fd_set = xX11/Xpoll.h ; then
         cat >"conftest.$ac_ext" <<_ACEOF
-#line 15288 "configure"
+#line 15538 "configure"
 #include "confdefs.h"
 
 #include <X11/Xpoll.h>
@@ -15298,27 +15548,27 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15301: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15551: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15304: \$? = $ac_status" >&5
+  echo "$as_me:15554: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15307: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15557: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15310: \$? = $ac_status" >&5
+  echo "$as_me:15560: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-echo "${as_me:-configure}:15317: testing if we must define CSRG_BASED ..." 1>&5
+echo "${as_me:-configure}:15567: testing if we must define CSRG_BASED ..." 1>&5
 
 # Xosdefs.h on Mac OS X may not define this (but it should).
             cat >"conftest.$ac_ext" <<_ACEOF
-#line 15321 "configure"
+#line 15571 "configure"
 #include "confdefs.h"
 
 #define CSRG_BASED
@@ -15332,16 +15582,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15335: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15585: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15338: \$? = $ac_status" >&5
+  echo "$as_me:15588: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15341: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15591: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15344: \$? = $ac_status" >&5
+  echo "$as_me:15594: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_type_fd_mask=CSRG_BASED
 else
@@ -15356,7 +15606,7 @@
     fi
 
 fi
-echo "$as_me:15359: result: $cf_cv_type_fd_mask" >&5
+echo "$as_me:15609: result: $cf_cv_type_fd_mask" >&5
 echo "${ECHO_T}$cf_cv_type_fd_mask" >&6
 if test x$cf_cv_type_fd_mask = xCSRG_BASED ; then
 
@@ -15366,14 +15616,14 @@
 
 fi
 
-echo "$as_me:15369: checking for IRIX 6.5 baud-rate redefinitions" >&5
+echo "$as_me:15619: checking for IRIX 6.5 baud-rate redefinitions" >&5
 echo $ECHO_N "checking for IRIX 6.5 baud-rate redefinitions... $ECHO_C" >&6
 if test "${cf_cv_termio_c_ispeed+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15376 "configure"
+#line 15626 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -15392,16 +15642,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15395: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15645: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15398: \$? = $ac_status" >&5
+  echo "$as_me:15648: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15401: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15651: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15404: \$? = $ac_status" >&5
+  echo "$as_me:15654: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_termio_c_ispeed=yes
 
@@ -15413,21 +15663,21 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:15416: result: $cf_cv_termio_c_ispeed" >&5
+echo "$as_me:15666: result: $cf_cv_termio_c_ispeed" >&5
 echo "${ECHO_T}$cf_cv_termio_c_ispeed" >&6
 test "$cf_cv_termio_c_ispeed" = yes &&
 cat >>confdefs.h <<\EOF
 #define HAVE_TERMIO_C_ISPEED 1
 EOF
 
-echo "$as_me:15423: checking for termios type tcflag_t" >&5
+echo "$as_me:15673: checking for termios type tcflag_t" >&5
 echo $ECHO_N "checking for termios type tcflag_t... $ECHO_C" >&6
 if test "${cf_cv_havetype_tcflag_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 15430 "configure"
+#line 15680 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -15440,16 +15690,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15443: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15693: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15446: \$? = $ac_status" >&5
+  echo "$as_me:15696: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15449: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15699: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15452: \$? = $ac_status" >&5
+  echo "$as_me:15702: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_havetype_tcflag_t=yes
 else
@@ -15460,21 +15710,21 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:15463: result: $cf_cv_havetype_tcflag_t" >&5
+echo "$as_me:15713: result: $cf_cv_havetype_tcflag_t" >&5
 echo "${ECHO_T}$cf_cv_havetype_tcflag_t" >&6
 test "$cf_cv_havetype_tcflag_t" = no &&
 cat >>confdefs.h <<\EOF
 #define tcflag_t unsigned long
 EOF
 
-echo "$as_me:15470: checking for termios type speed_t" >&5
+echo "$as_me:15720: checking for termios type speed_t" >&5
 echo $ECHO_N "checking for termios type speed_t... $ECHO_C" >&6
 if test "${cf_cv_havetype_speed_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 15477 "configure"
+#line 15727 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -15487,16 +15737,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15490: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15740: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15493: \$? = $ac_status" >&5
+  echo "$as_me:15743: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15496: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15746: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15499: \$? = $ac_status" >&5
+  echo "$as_me:15749: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_havetype_speed_t=yes
 else
@@ -15507,21 +15757,21 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:15510: result: $cf_cv_havetype_speed_t" >&5
+echo "$as_me:15760: result: $cf_cv_havetype_speed_t" >&5
 echo "${ECHO_T}$cf_cv_havetype_speed_t" >&6
 test "$cf_cv_havetype_speed_t" = no &&
 cat >>confdefs.h <<\EOF
 #define speed_t unsigned short
 EOF
 
-echo "$as_me:15517: checking for termios type cc_t" >&5
+echo "$as_me:15767: checking for termios type cc_t" >&5
 echo $ECHO_N "checking for termios type cc_t... $ECHO_C" >&6
 if test "${cf_cv_havetype_cc_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 15524 "configure"
+#line 15774 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -15534,16 +15784,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15537: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15787: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15540: \$? = $ac_status" >&5
+  echo "$as_me:15790: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15543: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15793: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15546: \$? = $ac_status" >&5
+  echo "$as_me:15796: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_havetype_cc_t=yes
 else
@@ -15554,7 +15804,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:15557: result: $cf_cv_havetype_cc_t" >&5
+echo "$as_me:15807: result: $cf_cv_havetype_cc_t" >&5
 echo "${ECHO_T}$cf_cv_havetype_cc_t" >&6
 test "$cf_cv_havetype_cc_t" = no &&
 cat >>confdefs.h <<\EOF
@@ -15566,7 +15816,7 @@
 # also use environment variables to select cursor size.  We would only notice
 # the library if there are development files for it.  Provide a way to disable
 # the feature if it is unwanted.
-echo "$as_me:15569: checking if we expect to use the Xcursor library" >&5
+echo "$as_me:15819: checking if we expect to use the Xcursor library" >&5
 echo $ECHO_N "checking if we expect to use the Xcursor library... $ECHO_C" >&6
 
 # Check whether --enable-xcursor or --disable-xcursor was given.
@@ -15583,7 +15833,7 @@
 	enable_xcursor=yes
 
 fi;
-echo "$as_me:15586: result: $enable_xcursor" >&5
+echo "$as_me:15836: result: $enable_xcursor" >&5
 echo "${ECHO_T}$enable_xcursor" >&6
 if test "$enable_xcursor" = yes; then
 
@@ -15600,23 +15850,23 @@
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:15603: checking for $ac_header" >&5
+echo "$as_me:15853: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 15609 "configure"
+#line 15859 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:15613: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:15863: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:15619: \$? = $ac_status" >&5
+  echo "$as_me:15869: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15635,7 +15885,7 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:15638: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:15888: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -15665,13 +15915,13 @@
 for ac_func in $cf_func_grantpt
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:15668: checking for $ac_func" >&5
+echo "$as_me:15918: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 15674 "configure"
+#line 15924 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15702,16 +15952,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15705: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15955: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15708: \$? = $ac_status" >&5
+  echo "$as_me:15958: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15711: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15961: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15714: \$? = $ac_status" >&5
+  echo "$as_me:15964: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -15721,7 +15971,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15724: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:15974: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -15733,10 +15983,10 @@
 
 cf_grantpt_opts=
 if test "x$ac_cv_func_grantpt" = "xyes" ; then
-	echo "$as_me:15736: checking if grantpt really works" >&5
+	echo "$as_me:15986: checking if grantpt really works" >&5
 echo $ECHO_N "checking if grantpt really works... $ECHO_C" >&6
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 15739 "configure"
+#line 15989 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -15836,23 +16086,23 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15839: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16089: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15842: \$? = $ac_status" >&5
+  echo "$as_me:16092: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15845: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16095: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15848: \$? = $ac_status" >&5
+  echo "$as_me:16098: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	if test "$cross_compiling" = yes; then
   ac_cv_func_grantpt=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 15855 "configure"
+#line 16105 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -15950,15 +16200,15 @@
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:15953: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16203: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15956: \$? = $ac_status" >&5
+  echo "$as_me:16206: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:15958: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16208: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15961: \$? = $ac_status" >&5
+  echo "$as_me:16211: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -15977,13 +16227,13 @@
 ac_cv_func_grantpt=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-	echo "$as_me:15980: result: $ac_cv_func_grantpt" >&5
+	echo "$as_me:16230: result: $ac_cv_func_grantpt" >&5
 echo "${ECHO_T}$ac_cv_func_grantpt" >&6
 
 	if test "x$ac_cv_func_grantpt" != "xno" ; then
 
 		if test "x$ac_cv_func_grantpt" = "xyes" ; then
-			echo "$as_me:15986: checking for pty features" >&5
+			echo "$as_me:16236: checking for pty features" >&5
 echo $ECHO_N "checking for pty features... $ECHO_C" >&6
 			if test "x$ac_cv_header_stropts_h" = xyes
 			then
@@ -15999,15 +16249,15 @@
 				cf_pty_feature=
 				cf_pty_next="`expr $cf_pty_this + 1`"
 
-echo "${as_me:-configure}:16002: testing pty feature test $cf_pty_next:5 ..." 1>&5
+echo "${as_me:-configure}:16252: testing pty feature test $cf_pty_next:5 ..." 1>&5
 
 				if test "$cross_compiling" = yes; then
-  { { echo "$as_me:16005: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:16255: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 16010 "configure"
+#line 16260 "configure"
 #include "confdefs.h"
 #define CONFTEST $cf_pty_this
 $cf_pty_defines
@@ -16107,15 +16357,15 @@
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:16110: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16360: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16113: \$? = $ac_status" >&5
+  echo "$as_me:16363: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:16115: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16365: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16118: \$? = $ac_status" >&5
+  echo "$as_me:16368: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 				case $cf_pty_next in
@@ -16147,7 +16397,7 @@
 				case $cf_pty_next in
 				(1|2|3)
 
-echo "${as_me:-configure}:16150: testing skipping remaining streams features $cf_pty_this..2 ..." 1>&5
+echo "${as_me:-configure}:16400: testing skipping remaining streams features $cf_pty_this..2 ..." 1>&5
 
 					cf_pty_next=3
 					;;
@@ -16166,7 +16416,7 @@
 
 				cf_pty_this=$cf_pty_next
 			done
-			echo "$as_me:16169: result: $cf_grantpt_opts" >&5
+			echo "$as_me:16419: result: $cf_grantpt_opts" >&5
 echo "${ECHO_T}$cf_grantpt_opts" >&6
 			cf_grantpt_opts=`echo "$cf_grantpt_opts" | sed -e 's/ isatty//'`
 		fi
@@ -16176,10 +16426,10 @@
 if test "x$cf_prefer_posix_openpt" = "xyes" && test "x$ac_cv_func_posix_openpt" = "xyes" ; then
 	test -n "$verbose" && echo "	prefer posix_openpt over openpty" 1>&6
 
-echo "${as_me:-configure}:16179: testing prefer posix_openpt over openpty ..." 1>&5
+echo "${as_me:-configure}:16429: testing prefer posix_openpt over openpty ..." 1>&5
 
 elif test "x$disable_openpty" != "xyes" || test -z "$cf_grantpt_opts" ; then
-	echo "$as_me:16182: checking for openpty in -lutil" >&5
+	echo "$as_me:16432: checking for openpty in -lutil" >&5
 echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6
 if test "${ac_cv_lib_util_openpty+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16187,7 +16437,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16190 "configure"
+#line 16440 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16206,16 +16456,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16209: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16459: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16212: \$? = $ac_status" >&5
+  echo "$as_me:16462: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16215: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16465: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16218: \$? = $ac_status" >&5
+  echo "$as_me:16468: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_util_openpty=yes
 else
@@ -16226,7 +16476,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16229: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:16479: result: $ac_cv_lib_util_openpty" >&5
 echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
 if test "$ac_cv_lib_util_openpty" = yes; then
   cf_have_openpty=yes
@@ -16249,23 +16499,23 @@
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:16252: checking for $ac_header" >&5
+echo "$as_me:16502: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 16258 "configure"
+#line 16508 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:16262: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:16512: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:16268: \$? = $ac_status" >&5
+  echo "$as_me:16518: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -16284,7 +16534,7 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:16287: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:16537: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -16301,7 +16551,7 @@
 then
 	test -n "$verbose" && echo "	will rely upon grantpt" 1>&6
 
-echo "${as_me:-configure}:16304: testing will rely upon grantpt ..." 1>&5
+echo "${as_me:-configure}:16554: testing will rely upon grantpt ..." 1>&5
 
 cat >>confdefs.h <<\EOF
 #define HAVE_WORKING_GRANTPT 1
@@ -16322,23 +16572,23 @@
 then
 	test -n "$verbose" && echo "	will rely upon BSD-pseudoterminals" 1>&6
 
-echo "${as_me:-configure}:16325: testing will rely upon BSD-pseudoterminals ..." 1>&5
+echo "${as_me:-configure}:16575: testing will rely upon BSD-pseudoterminals ..." 1>&5
 
 else
 	test -n "$verbose" && echo "	will rely upon openpty" 1>&6
 
-echo "${as_me:-configure}:16330: testing will rely upon openpty ..." 1>&5
+echo "${as_me:-configure}:16580: testing will rely upon openpty ..." 1>&5
 
 fi
 
-echo "$as_me:16334: checking if we can use XkbQueryExtension" >&5
+echo "$as_me:16584: checking if we can use XkbQueryExtension" >&5
 echo $ECHO_N "checking if we can use XkbQueryExtension... $ECHO_C" >&6
 if test "${cf_cv_xkb_query_extension+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16341 "configure"
+#line 16591 "configure"
 #include "confdefs.h"
 
 #include <X11/Xlib.h>
@@ -16367,16 +16617,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16370: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16620: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16373: \$? = $ac_status" >&5
+  echo "$as_me:16623: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16376: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16626: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16379: \$? = $ac_status" >&5
+  echo "$as_me:16629: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 cf_cv_xkb_query_extension=yes
@@ -16391,7 +16641,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16394: result: $cf_cv_xkb_query_extension" >&5
+echo "$as_me:16644: result: $cf_cv_xkb_query_extension" >&5
 echo "${ECHO_T}$cf_cv_xkb_query_extension" >&6
 
 if test $cf_cv_xkb_query_extension = yes
@@ -16400,13 +16650,13 @@
 for ac_func in XkbQueryExtension
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:16403: checking for $ac_func" >&5
+echo "$as_me:16653: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 16409 "configure"
+#line 16659 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -16437,16 +16687,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16440: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16690: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16443: \$? = $ac_status" >&5
+  echo "$as_me:16693: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16446: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16696: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16449: \$? = $ac_status" >&5
+  echo "$as_me:16699: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -16456,7 +16706,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16459: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:16709: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -16468,14 +16718,14 @@
 
 fi
 
-echo "$as_me:16471: checking if we can use XkbKeycodeToKeysym" >&5
+echo "$as_me:16721: checking if we can use XkbKeycodeToKeysym" >&5
 echo $ECHO_N "checking if we can use XkbKeycodeToKeysym... $ECHO_C" >&6
 if test "${cf_cv_xkb_keycode_to_keysym+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16478 "configure"
+#line 16728 "configure"
 #include "confdefs.h"
 
 #include <X11/Xlib.h>
@@ -16493,16 +16743,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16496: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16746: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16499: \$? = $ac_status" >&5
+  echo "$as_me:16749: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16502: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16752: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16505: \$? = $ac_status" >&5
+  echo "$as_me:16755: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 cf_cv_xkb_keycode_to_keysym=yes
@@ -16517,7 +16767,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16520: result: $cf_cv_xkb_keycode_to_keysym" >&5
+echo "$as_me:16770: result: $cf_cv_xkb_keycode_to_keysym" >&5
 echo "${ECHO_T}$cf_cv_xkb_keycode_to_keysym" >&6
 
 if test $cf_cv_xkb_keycode_to_keysym = yes
@@ -16526,13 +16776,13 @@
 for ac_func in XkbKeycodeToKeysym
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:16529: checking for $ac_func" >&5
+echo "$as_me:16779: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 16535 "configure"
+#line 16785 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -16563,16 +16813,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16566: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16816: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16569: \$? = $ac_status" >&5
+  echo "$as_me:16819: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16572: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16822: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16575: \$? = $ac_status" >&5
+  echo "$as_me:16825: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -16582,7 +16832,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16585: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:16835: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -16610,14 +16860,14 @@
 	esac
 done
 
-echo "$as_me:16613: checking for XKB Bell extension" >&5
+echo "$as_me:16863: checking for XKB Bell extension" >&5
 echo $ECHO_N "checking for XKB Bell extension... $ECHO_C" >&6
 if test "${cf_cv_xkb_bell_ext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16620 "configure"
+#line 16870 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -16638,16 +16888,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16641: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16891: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16644: \$? = $ac_status" >&5
+  echo "$as_me:16894: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16647: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16897: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16650: \$? = $ac_status" >&5
+  echo "$as_me:16900: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xkb_bell_ext=yes
 else
@@ -16658,7 +16908,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16661: result: $cf_cv_xkb_bell_ext" >&5
+echo "$as_me:16911: result: $cf_cv_xkb_bell_ext" >&5
 echo "${ECHO_T}$cf_cv_xkb_bell_ext" >&6
 test "$cf_cv_xkb_bell_ext" = yes &&
 cat >>confdefs.h <<\EOF
@@ -16672,13 +16922,13 @@
 for ac_func in Xutf8LookupString
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:16675: checking for $ac_func" >&5
+echo "$as_me:16925: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 16681 "configure"
+#line 16931 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -16709,16 +16959,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16712: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16962: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16715: \$? = $ac_status" >&5
+  echo "$as_me:16965: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16718: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16968: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16721: \$? = $ac_status" >&5
+  echo "$as_me:16971: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -16728,7 +16978,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16731: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:16981: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -16744,7 +16994,7 @@
 fi
 done
 
-echo "$as_me:16747: checking if you want narrow prototypes for X libraries" >&5
+echo "$as_me:16997: checking if you want narrow prototypes for X libraries" >&5
 echo $ECHO_N "checking if you want narrow prototypes for X libraries... $ECHO_C" >&6
 
 case `$ac_config_guess` in
@@ -16770,10 +17020,10 @@
 	enable_narrowproto=$cf_default_narrowproto
 
 fi;
-echo "$as_me:16773: result: $enable_narrowproto" >&5
+echo "$as_me:17023: result: $enable_narrowproto" >&5
 echo "${ECHO_T}$enable_narrowproto" >&6
 
-echo "$as_me:16776: checking if we should use imake to help" >&5
+echo "$as_me:17026: checking if we should use imake to help" >&5
 echo $ECHO_N "checking if we should use imake to help... $ECHO_C" >&6
 
 # Check whether --enable-imake or --disable-imake was given.
@@ -16790,7 +17040,7 @@
 	enable_imake=yes
 
 fi;
-echo "$as_me:16793: result: $enable_imake" >&5
+echo "$as_me:17043: result: $enable_imake" >&5
 echo "${ECHO_T}$enable_imake" >&6
 
 if test "$enable_imake" = yes ; then
@@ -16799,7 +17049,7 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:16802: checking for $ac_word" >&5
+echo "$as_me:17052: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_IMAKE+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16816,7 +17066,7 @@
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_IMAKE="$ac_dir/$ac_word"
-   echo "$as_me:16819: found $ac_dir/$ac_word" >&5
+   echo "$as_me:17069: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -16827,10 +17077,10 @@
 IMAKE=$ac_cv_path_IMAKE
 
 if test -n "$IMAKE"; then
-  echo "$as_me:16830: result: $IMAKE" >&5
+  echo "$as_me:17080: result: $IMAKE" >&5
 echo "${ECHO_T}$IMAKE" >&6
 else
-  echo "$as_me:16833: result: no" >&5
+  echo "$as_me:17083: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -16890,7 +17140,7 @@
 	then
 		test -n "$verbose" && echo "	Using $IMAKE $cf_imake_opts" 1>&6
 
-echo "${as_me:-configure}:16893: testing Using $IMAKE $cf_imake_opts ..." 1>&5
+echo "${as_me:-configure}:17143: testing Using $IMAKE $cf_imake_opts ..." 1>&5
 
 	else
 		# sometimes imake doesn't have the config path compiled in.  Find it.
@@ -16908,7 +17158,7 @@
 			esac
 		done
 		if test -z "$cf_config" ; then
-			{ echo "$as_me:16911: WARNING: Could not find imake config-directory" >&5
+			{ echo "$as_me:17161: WARNING: Could not find imake config-directory" >&5
 echo "$as_me: WARNING: Could not find imake config-directory" >&2;}
 		else
 			cf_imake_opts="$cf_imake_opts -I$cf_config"
@@ -16916,10 +17166,10 @@
 			then
 				test -n "$verbose" && echo "	Using $IMAKE $cf_config" 1>&6
 
-echo "${as_me:-configure}:16919: testing Using $IMAKE $cf_config ..." 1>&5
+echo "${as_me:-configure}:17169: testing Using $IMAKE $cf_config ..." 1>&5
 
 			else
-				{ echo "$as_me:16922: WARNING: Cannot run $IMAKE" >&5
+				{ echo "$as_me:17172: WARNING: Cannot run $IMAKE" >&5
 echo "$as_me: WARNING: Cannot run $IMAKE" >&2;}
 			fi
 		fi
@@ -16963,7 +17213,7 @@
 		else
 		    test -n "$verbose" && echo "	suppressed \"$cf_nostdinc\" and \"$cf_std_incl\"" 1>&6
 
-echo "${as_me:-configure}:16966: testing suppressed \"$cf_nostdinc\" and \"$cf_std_incl\" ..." 1>&5
+echo "${as_me:-configure}:17216: testing suppressed \"$cf_nostdinc\" and \"$cf_std_incl\" ..." 1>&5
 
 		    IMAKE_CFLAGS="$cf_cpp_opts"
 		fi
@@ -16985,11 +17235,11 @@
 
 test -n "$verbose" && echo "	IMAKE_CFLAGS $IMAKE_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:16988: testing IMAKE_CFLAGS $IMAKE_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17238: testing IMAKE_CFLAGS $IMAKE_CFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	IMAKE_LOADFLAGS $IMAKE_LOADFLAGS" 1>&6
 
-echo "${as_me:-configure}:16992: testing IMAKE_LOADFLAGS $IMAKE_LOADFLAGS ..." 1>&5
+echo "${as_me:-configure}:17242: testing IMAKE_LOADFLAGS $IMAKE_LOADFLAGS ..." 1>&5
 
 fi
 
@@ -17098,7 +17348,7 @@
 	IMAKE_LOADFLAGS=
 	test -n "$verbose" && echo "	make fallback definitions" 1>&6
 
-echo "${as_me:-configure}:17101: testing make fallback definitions ..." 1>&5
+echo "${as_me:-configure}:17351: testing make fallback definitions ..." 1>&5
 
 	# We prefer config.guess' values when we can get them, to avoid
 	# inconsistent results with uname (AIX for instance).  However,
@@ -17262,7 +17512,7 @@
 
 # Extract the first word of "groff", so it can be a program name with args.
 set dummy groff; ac_word=$2
-echo "$as_me:17265: checking for $ac_word" >&5
+echo "$as_me:17515: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_GROFF_PATH+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17279,7 +17529,7 @@
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_GROFF_PATH="$ac_dir/$ac_word"
-   echo "$as_me:17282: found $ac_dir/$ac_word" >&5
+   echo "$as_me:17532: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -17291,10 +17541,10 @@
 GROFF_PATH=$ac_cv_path_GROFF_PATH
 
 if test -n "$GROFF_PATH"; then
-  echo "$as_me:17294: result: $GROFF_PATH" >&5
+  echo "$as_me:17544: result: $GROFF_PATH" >&5
 echo "${ECHO_T}$GROFF_PATH" >&6
 else
-  echo "$as_me:17297: result: no" >&5
+  echo "$as_me:17547: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -17302,7 +17552,7 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:17305: checking for $ac_word" >&5
+echo "$as_me:17555: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_NROFF_PATH+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17319,7 +17569,7 @@
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_NROFF_PATH="$ac_dir/$ac_word"
-   echo "$as_me:17322: found $ac_dir/$ac_word" >&5
+   echo "$as_me:17572: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -17330,10 +17580,10 @@
 NROFF_PATH=$ac_cv_path_NROFF_PATH
 
 if test -n "$NROFF_PATH"; then
-  echo "$as_me:17333: result: $NROFF_PATH" >&5
+  echo "$as_me:17583: result: $NROFF_PATH" >&5
 echo "${ECHO_T}$NROFF_PATH" >&6
 else
-  echo "$as_me:17336: result: no" >&5
+  echo "$as_me:17586: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -17343,7 +17593,7 @@
 
 # Extract the first word of "tbl", so it can be a program name with args.
 set dummy tbl; ac_word=$2
-echo "$as_me:17346: checking for $ac_word" >&5
+echo "$as_me:17596: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_TBL_PATH+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17360,7 +17610,7 @@
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_TBL_PATH="$ac_dir/$ac_word"
-   echo "$as_me:17363: found $ac_dir/$ac_word" >&5
+   echo "$as_me:17613: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -17372,10 +17622,10 @@
 TBL_PATH=$ac_cv_path_TBL_PATH
 
 if test -n "$TBL_PATH"; then
-  echo "$as_me:17375: result: $TBL_PATH" >&5
+  echo "$as_me:17625: result: $TBL_PATH" >&5
 echo "${ECHO_T}$TBL_PATH" >&6
 else
-  echo "$as_me:17378: result: no" >&5
+  echo "$as_me:17628: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -17388,7 +17638,7 @@
 	GROFF_NOTE=
 fi
 
-echo "$as_me:17391: checking for fgrep" >&5
+echo "$as_me:17641: checking for fgrep" >&5
 echo $ECHO_N "checking for fgrep... $ECHO_C" >&6
 if test "${ac_cv_path_FGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17400,7 +17650,7 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:17403: checking for $ac_word" >&5
+echo "$as_me:17653: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_FGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17417,7 +17667,7 @@
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_FGREP="$ac_dir/$ac_word"
-   echo "$as_me:17420: found $ac_dir/$ac_word" >&5
+   echo "$as_me:17670: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -17428,10 +17678,10 @@
 FGREP=$ac_cv_path_FGREP
 
 if test -n "$FGREP"; then
-  echo "$as_me:17431: result: $FGREP" >&5
+  echo "$as_me:17681: result: $FGREP" >&5
 echo "${ECHO_T}$FGREP" >&6
 else
-  echo "$as_me:17434: result: no" >&5
+  echo "$as_me:17684: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -17439,12 +17689,12 @@
 done
 test -n "$FGREP" || FGREP=": "
 
-     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:17442: error: cannot find workable fgrep" >&5
+     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:17692: error: cannot find workable fgrep" >&5
 echo "$as_me: error: cannot find workable fgrep" >&2;}
    { (exit 1); exit 1; }; }
    fi
 fi
-echo "$as_me:17447: result: $ac_cv_path_FGREP" >&5
+echo "$as_me:17697: result: $ac_cv_path_FGREP" >&5
 echo "${ECHO_T}$ac_cv_path_FGREP" >&6
  FGREP="$ac_cv_path_FGREP"
 
@@ -17455,7 +17705,7 @@
 (x|xyes)
 	# Extract the first word of "man2html", so it can be a program name with args.
 set dummy man2html; ac_word=$2
-echo "$as_me:17458: checking for $ac_word" >&5
+echo "$as_me:17708: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_cf_man2html+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17472,7 +17722,7 @@
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_cf_man2html="$ac_dir/$ac_word"
-   echo "$as_me:17475: found $ac_dir/$ac_word" >&5
+   echo "$as_me:17725: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -17484,16 +17734,16 @@
 cf_man2html=$ac_cv_path_cf_man2html
 
 if test -n "$cf_man2html"; then
-  echo "$as_me:17487: result: $cf_man2html" >&5
+  echo "$as_me:17737: result: $cf_man2html" >&5
 echo "${ECHO_T}$cf_man2html" >&6
 else
-  echo "$as_me:17490: result: no" >&5
+  echo "$as_me:17740: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 	case "x$cf_man2html" in
 	(x/*)
-		echo "$as_me:17496: checking for the modified Earl Hood script" >&5
+		echo "$as_me:17746: checking for the modified Earl Hood script" >&5
 echo $ECHO_N "checking for the modified Earl Hood script... $ECHO_C" >&6
 		if ( $cf_man2html -help 2>&1 | grep 'Make an index of headers at the end' >/dev/null )
 		then
@@ -17502,7 +17752,7 @@
 			cf_man2html=no
 			cf_man2html_ok=no
 		fi
-		echo "$as_me:17505: result: $cf_man2html_ok" >&5
+		echo "$as_me:17755: result: $cf_man2html_ok" >&5
 echo "${ECHO_T}$cf_man2html_ok" >&6
 		;;
 	(*)
@@ -17511,7 +17761,7 @@
 	esac
 esac
 
-echo "$as_me:17514: checking for program to convert manpage to html" >&5
+echo "$as_me:17764: checking for program to convert manpage to html" >&5
 echo $ECHO_N "checking for program to convert manpage to html... $ECHO_C" >&6
 
 # Check whether --with-man2html or --without-man2html was given.
@@ -17526,11 +17776,11 @@
 
 case $cf_man2html in
 (yes)
-	echo "$as_me:17529: result: man2html" >&5
+	echo "$as_me:17779: result: man2html" >&5
 echo "${ECHO_T}man2html" >&6
 	# Extract the first word of "man2html", so it can be a program name with args.
 set dummy man2html; ac_word=$2
-echo "$as_me:17533: checking for $ac_word" >&5
+echo "$as_me:17783: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_cf_man2html+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17547,7 +17797,7 @@
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_cf_man2html="$ac_dir/$ac_word"
-   echo "$as_me:17550: found $ac_dir/$ac_word" >&5
+   echo "$as_me:17800: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -17559,10 +17809,10 @@
 cf_man2html=$ac_cv_path_cf_man2html
 
 if test -n "$cf_man2html"; then
-  echo "$as_me:17562: result: $cf_man2html" >&5
+  echo "$as_me:17812: result: $cf_man2html" >&5
 echo "${ECHO_T}$cf_man2html" >&6
 else
-  echo "$as_me:17565: result: no" >&5
+  echo "$as_me:17815: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -17570,11 +17820,11 @@
 (no|groff|*/groff*)
 	cf_with_groff=yes
 	cf_man2html=$GROFF_PATH
-	echo "$as_me:17573: result: $cf_man2html" >&5
+	echo "$as_me:17823: result: $cf_man2html" >&5
 echo "${ECHO_T}$cf_man2html" >&6
 	;;
 (*)
-	echo "$as_me:17577: result: $cf_man2html" >&5
+	echo "$as_me:17827: result: $cf_man2html" >&5
 echo "${ECHO_T}$cf_man2html" >&6
 	;;
 esac
@@ -17615,12 +17865,12 @@
 	# disable hyphenation if this is groff
 	if test "x$GROFF_PATH" != xno
 	then
-		echo "$as_me:17618: checking if nroff is really groff" >&5
+		echo "$as_me:17868: checking if nroff is really groff" >&5
 echo $ECHO_N "checking if nroff is really groff... $ECHO_C" >&6
 		cf_check_groff="`$NROFF_PATH --version 2>/dev/null | grep groff`"
 		test -n "$cf_check_groff" && cf_check_groff=yes
 		test -n "$cf_check_groff" || cf_check_groff=no
-		echo "$as_me:17623: result: $cf_check_groff" >&5
+		echo "$as_me:17873: result: $cf_check_groff" >&5
 echo "${ECHO_T}$cf_check_groff" >&6
 		test "x$cf_check_groff" = xyes && NROFF_OPTS="-rHY=0"
 	fi
@@ -17651,14 +17901,14 @@
 	cf_man2html=`echo "$cf_man2html" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:17654: error: expected a pathname, not \"$cf_man2html\"" >&5
+	{ { echo "$as_me:17904: error: expected a pathname, not \"$cf_man2html\"" >&5
 echo "$as_me: error: expected a pathname, not \"$cf_man2html\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
 esac
 
 	MAN2HTML_PATH="$cf_man2html"
-	echo "$as_me:17661: checking for $cf_man2html top/bottom margins" >&5
+	echo "$as_me:17911: checking for $cf_man2html top/bottom margins" >&5
 echo $ECHO_N "checking for $cf_man2html top/bottom margins... $ECHO_C" >&6
 
 	# for this example, expect 3 lines of content, the remainder is head/foot
@@ -17676,10 +17926,10 @@
 	cf_man2html_bot=`expr "$cf_man2html_bot" - 2 - "$cf_man2html_top"`
 	cf_man2html_top_bot="-topm=$cf_man2html_top -botm=$cf_man2html_bot"
 
-	echo "$as_me:17679: result: $cf_man2html_top_bot" >&5
+	echo "$as_me:17929: result: $cf_man2html_top_bot" >&5
 echo "${ECHO_T}$cf_man2html_top_bot" >&6
 
-	echo "$as_me:17682: checking for pagesize to use" >&5
+	echo "$as_me:17932: checking for pagesize to use" >&5
 echo $ECHO_N "checking for pagesize to use... $ECHO_C" >&6
 	for cf_block in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
 	do
@@ -17704,7 +17954,7 @@
 	test "$cf_man2html_page" -gt 100 && cf_man2html_page=99999
 
 	rm -rf conftest*
-	echo "$as_me:17707: result: $cf_man2html_page" >&5
+	echo "$as_me:17957: result: $cf_man2html_page" >&5
 echo "${ECHO_T}$cf_man2html_page" >&6
 
 	cat >>$MAN2HTML_TEMP <<CF_EOF
@@ -17732,27 +17982,27 @@
 
 	test -n "$verbose" && echo "	removing terminfo flags from IMAKE_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17735: testing removing terminfo flags from IMAKE_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17985: testing removing terminfo flags from IMAKE_CFLAGS ..." 1>&5
 
 	IMAKE_CFLAGS=`echo "$IMAKE_CFLAGS" | sed -e 's/-DUSE_TERMINFO[ 	]*-DHAVE_TIGETSTR[ 	]*//'`
 	test -n "$verbose" && echo "	...result $IMAKE_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17740: testing ...result $IMAKE_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17990: testing ...result $IMAKE_CFLAGS ..." 1>&5
 
 	test -n "$verbose" && echo "	removing terminfo flags from CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:17744: testing removing terminfo flags from CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17994: testing removing terminfo flags from CPPFLAGS ..." 1>&5
 
 	CPPFLAGS=`echo "$CPPFLAGS" | sed -e 's/-DUSE_TERMINFO[ 	]*-DHAVE_TIGETSTR[ 	]*//'`
 	test -n "$verbose" && echo "	...result $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:17749: testing ...result $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17999: testing ...result $CPPFLAGS ..." 1>&5
 
 		;;
 	esac
 fi
 
-echo "$as_me:17755: checking for default terminal-id" >&5
+echo "$as_me:18005: checking for default terminal-id" >&5
 echo $ECHO_N "checking for default terminal-id... $ECHO_C" >&6
 
 # Check whether --with-terminal-id or --without-terminal-id was given.
@@ -17762,7 +18012,7 @@
 else
   default_termid=vt420
 fi;
-echo "$as_me:17765: result: $default_termid" >&5
+echo "$as_me:18015: result: $default_termid" >&5
 echo "${ECHO_T}$default_termid" >&6
 case $default_termid in
 (vt*)	default_termid=`echo $default_termid | sed -e 's/^..//'`
@@ -17773,7 +18023,7 @@
 #define DFT_DECID "$default_termid"
 EOF
 
-echo "$as_me:17776: checking for default terminal-type" >&5
+echo "$as_me:18026: checking for default terminal-type" >&5
 echo $ECHO_N "checking for default terminal-type... $ECHO_C" >&6
 
 # Check whether --with-terminal-type or --without-terminal-type was given.
@@ -17783,7 +18033,7 @@
 else
   default_TERM=xterm
 fi;
-echo "$as_me:17786: result: $default_TERM" >&5
+echo "$as_me:18036: result: $default_TERM" >&5
 echo "${ECHO_T}$default_TERM" >&6
 
 cat >>confdefs.h <<EOF
@@ -17791,7 +18041,7 @@
 EOF
 
 ###############################################################################
-echo "$as_me:17794: checking if backarrow-key should be BS" >&5
+echo "$as_me:18044: checking if backarrow-key should be BS" >&5
 echo $ECHO_N "checking if backarrow-key should be BS... $ECHO_C" >&6
 
 # Check whether --enable-backarrow-key or --disable-backarrow-key was given.
@@ -17809,7 +18059,7 @@
 
 fi;
 
-echo "$as_me:17812: result: $backarrow_is_bs" >&5
+echo "$as_me:18062: result: $backarrow_is_bs" >&5
 echo "${ECHO_T}$backarrow_is_bs" >&6
 case $backarrow_is_bs in
 (yes)
@@ -17830,7 +18080,7 @@
 #define DEF_BACKARO_BS $backarrow_is_bs
 EOF
 
-echo "$as_me:17833: checking if backarrow-key should be treated as erase" >&5
+echo "$as_me:18083: checking if backarrow-key should be treated as erase" >&5
 echo $ECHO_N "checking if backarrow-key should be treated as erase... $ECHO_C" >&6
 
 # Check whether --enable-backarrow-is-erase or --disable-backarrow-is-erase was given.
@@ -17848,7 +18098,7 @@
 
 fi;
 
-echo "$as_me:17851: result: $backarrow_is_erase" >&5
+echo "$as_me:18101: result: $backarrow_is_erase" >&5
 echo "${ECHO_T}$backarrow_is_erase" >&6
 case $backarrow_is_erase in
 (yes)
@@ -17869,7 +18119,7 @@
 #define DEF_BACKARO_ERASE $backarrow_is_erase
 EOF
 
-echo "$as_me:17872: checking for default backspace/DEL setting" >&5
+echo "$as_me:18122: checking for default backspace/DEL setting" >&5
 echo $ECHO_N "checking for default backspace/DEL setting... $ECHO_C" >&6
 
 # Check whether --enable-delete-is-del or --disable-delete-is-del was given.
@@ -17880,7 +18130,7 @@
   delete_is_del=maybe
 fi;
 
-echo "$as_me:17883: result: $delete_is_del" >&5
+echo "$as_me:18133: result: $delete_is_del" >&5
 echo "${ECHO_T}$delete_is_del" >&6
 case $delete_is_del in
 (yes)
@@ -17901,7 +18151,7 @@
 #define DEFDELETE_DEL $delete_is_del
 EOF
 
-echo "$as_me:17904: checking for default pty initial erase setting" >&5
+echo "$as_me:18154: checking for default pty initial erase setting" >&5
 echo $ECHO_N "checking for default pty initial erase setting... $ECHO_C" >&6
 
 # Check whether --enable-pty-erase or --disable-pty-erase was given.
@@ -17912,7 +18162,7 @@
   initial_erase=False
 fi;
 
-echo "$as_me:17915: result: $initial_erase" >&5
+echo "$as_me:18165: result: $initial_erase" >&5
 echo "${ECHO_T}$initial_erase" >&6
 case $initial_erase in
 (yes)
@@ -17933,7 +18183,7 @@
 #define DEF_INITIAL_ERASE $initial_erase
 EOF
 
-echo "$as_me:17936: checking if alt should send ESC" >&5
+echo "$as_me:18186: checking if alt should send ESC" >&5
 echo $ECHO_N "checking if alt should send ESC... $ECHO_C" >&6
 
 # Check whether --enable-alt-sends-esc or --disable-alt-sends-esc was given.
@@ -17951,7 +18201,7 @@
 
 fi;
 
-echo "$as_me:17954: result: $alt_sends_esc" >&5
+echo "$as_me:18204: result: $alt_sends_esc" >&5
 echo "${ECHO_T}$alt_sends_esc" >&6
 case $alt_sends_esc in
 (yes)
@@ -17972,7 +18222,7 @@
 #define DEF_ALT_SENDS_ESC $alt_sends_esc
 EOF
 
-echo "$as_me:17975: checking if meta should send ESC" >&5
+echo "$as_me:18225: checking if meta should send ESC" >&5
 echo $ECHO_N "checking if meta should send ESC... $ECHO_C" >&6
 
 # Check whether --enable-meta-sends-esc or --disable-meta-sends-esc was given.
@@ -17990,7 +18240,7 @@
 
 fi;
 
-echo "$as_me:17993: result: $meta_sends_esc" >&5
+echo "$as_me:18243: result: $meta_sends_esc" >&5
 echo "${ECHO_T}$meta_sends_esc" >&6
 case $meta_sends_esc in
 (yes)
@@ -18014,7 +18264,7 @@
 ###############################################################################
 # Extract the first word of "tic", so it can be a program name with args.
 set dummy tic; ac_word=$2
-echo "$as_me:18017: checking for $ac_word" >&5
+echo "$as_me:18267: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_cf_tic_prog+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18029,7 +18279,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_cf_tic_prog="yes"
-echo "$as_me:18032: found $ac_dir/$ac_word" >&5
+echo "$as_me:18282: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -18038,10 +18288,10 @@
 fi
 cf_tic_prog=$ac_cv_prog_cf_tic_prog
 if test -n "$cf_tic_prog"; then
-  echo "$as_me:18041: result: $cf_tic_prog" >&5
+  echo "$as_me:18291: result: $cf_tic_prog" >&5
 echo "${ECHO_T}$cf_tic_prog" >&6
 else
-  echo "$as_me:18044: result: no" >&5
+  echo "$as_me:18294: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -18057,7 +18307,7 @@
 			;;
 		esac
 	fi
-	echo "$as_me:18060: checking for private terminfo-directory" >&5
+	echo "$as_me:18310: checking for private terminfo-directory" >&5
 echo $ECHO_N "checking for private terminfo-directory... $ECHO_C" >&6
 
 # Check whether --with-own-terminfo or --without-own-terminfo was given.
@@ -18067,10 +18317,10 @@
 else
   TERMINFO_DIR=${TERMINFO-none}
 fi;
-	echo "$as_me:18070: result: $TERMINFO_DIR" >&5
+	echo "$as_me:18320: result: $TERMINFO_DIR" >&5
 echo "${ECHO_T}$TERMINFO_DIR" >&6
 	if test "$TERMINFO_DIR" = yes ; then
-		{ echo "$as_me:18073: WARNING: no value given" >&5
+		{ echo "$as_me:18323: WARNING: no value given" >&5
 echo "$as_me: WARNING: no value given" >&2;}
 	elif test "$TERMINFO_DIR" != none ; then
 		if test -d "$TERMINFO_DIR" ; then
@@ -18079,7 +18329,7 @@
 #define OWN_TERMINFO_DIR "$TERMINFO_DIR"
 EOF
 
-			echo "$as_me:18082: checking if \$TERMINFO should also be set" >&5
+			echo "$as_me:18332: checking if \$TERMINFO should also be set" >&5
 echo $ECHO_N "checking if \$TERMINFO should also be set... $ECHO_C" >&6
 
 # Check whether --enable-env-terminfo or --disable-env-terminfo was given.
@@ -18089,7 +18339,7 @@
 else
   cf_env_terminfo=no
 fi;
-			echo "$as_me:18092: result: $cf_env_terminfo" >&5
+			echo "$as_me:18342: result: $cf_env_terminfo" >&5
 echo "${ECHO_T}$cf_env_terminfo" >&6
 			test $cf_env_terminfo = yes &&
 
@@ -18098,7 +18348,7 @@
 EOF
 
 		else
-			{ echo "$as_me:18101: WARNING: not a directory" >&5
+			{ echo "$as_me:18351: WARNING: not a directory" >&5
 echo "$as_me: WARNING: not a directory" >&2;}
 		fi
 	elif test "$prefix" != NONE ; then
@@ -18122,7 +18372,7 @@
 
 ###############################################################################
 
-echo "$as_me:18125: checking if you want active-icons" >&5
+echo "$as_me:18375: checking if you want active-icons" >&5
 echo $ECHO_N "checking if you want active-icons... $ECHO_C" >&6
 
 # Check whether --enable-active-icon or --disable-active-icon was given.
@@ -18139,7 +18389,7 @@
 	enable_active_icon=yes
 
 fi;
-echo "$as_me:18142: result: $enable_active_icon" >&5
+echo "$as_me:18392: result: $enable_active_icon" >&5
 echo "${ECHO_T}$enable_active_icon" >&6
 if test "$enable_active_icon" = no ; then
 
@@ -18149,7 +18399,7 @@
 
 fi
 
-echo "$as_me:18152: checking if you want ANSI color" >&5
+echo "$as_me:18402: checking if you want ANSI color" >&5
 echo $ECHO_N "checking if you want ANSI color... $ECHO_C" >&6
 
 # Check whether --enable-ansi-color or --disable-ansi-color was given.
@@ -18166,7 +18416,7 @@
 	enable_ansi_color=yes
 
 fi;
-echo "$as_me:18169: result: $enable_ansi_color" >&5
+echo "$as_me:18419: result: $enable_ansi_color" >&5
 echo "${ECHO_T}$enable_ansi_color" >&6
 test "$enable_ansi_color" = no &&
 cat >>confdefs.h <<\EOF
@@ -18175,7 +18425,7 @@
 
 if test "$enable_ansi_color" = yes ; then
 
-	echo "$as_me:18178: checking if you want 16 colors like aixterm" >&5
+	echo "$as_me:18428: checking if you want 16 colors like aixterm" >&5
 echo $ECHO_N "checking if you want 16 colors like aixterm... $ECHO_C" >&6
 
 # Check whether --enable-16-color or --disable-16-color was given.
@@ -18192,14 +18442,14 @@
 	enable_16_color=yes
 
 fi;
-	echo "$as_me:18195: result: $enable_16_color" >&5
+	echo "$as_me:18445: result: $enable_16_color" >&5
 echo "${ECHO_T}$enable_16_color" >&6
 	test "$enable_16_color" = no &&
 cat >>confdefs.h <<\EOF
 #define OPT_AIX_COLORS 0
 EOF
 
-	echo "$as_me:18202: checking if you want 256 colors" >&5
+	echo "$as_me:18452: checking if you want 256 colors" >&5
 echo $ECHO_N "checking if you want 256 colors... $ECHO_C" >&6
 
 # Check whether --enable-256-color or --disable-256-color was given.
@@ -18216,7 +18466,7 @@
 	enable_256_color=yes
 
 fi;
-	echo "$as_me:18219: result: $enable_256_color" >&5
+	echo "$as_me:18469: result: $enable_256_color" >&5
 echo "${ECHO_T}$enable_256_color" >&6
 
 	if test "$enable_256_color" = yes ; then
@@ -18228,7 +18478,7 @@
 #define OPT_256_COLORS 1
 EOF
 
-		echo "$as_me:18231: checking if you want direct-color support" >&5
+		echo "$as_me:18481: checking if you want direct-color support" >&5
 echo $ECHO_N "checking if you want direct-color support... $ECHO_C" >&6
 
 # Check whether --enable-direct-color or --disable-direct-color was given.
@@ -18245,7 +18495,7 @@
 	enable_direct_color=yes
 
 fi;
-		echo "$as_me:18248: result: $enable_direct_color" >&5
+		echo "$as_me:18498: result: $enable_direct_color" >&5
 echo "${ECHO_T}$enable_direct_color" >&6
 		if test "$enable_direct_color" = yes ; then
 
@@ -18257,7 +18507,7 @@
 
 	else
 
-		echo "$as_me:18260: checking if you want 88 colors" >&5
+		echo "$as_me:18510: checking if you want 88 colors" >&5
 echo $ECHO_N "checking if you want 88 colors... $ECHO_C" >&6
 
 # Check whether --enable-88-color or --disable-88-color was given.
@@ -18274,7 +18524,7 @@
 	enable_88_color=yes
 
 fi;
-		echo "$as_me:18277: result: $enable_88_color" >&5
+		echo "$as_me:18527: result: $enable_88_color" >&5
 echo "${ECHO_T}$enable_88_color" >&6
 		if test "$enable_88_color" = yes ; then
 			CHARPROC_DEPS="$CHARPROC_DEPS 88colres.h"
@@ -18290,7 +18540,7 @@
 
 fi
 
-echo "$as_me:18293: checking if you want blinking cursor" >&5
+echo "$as_me:18543: checking if you want blinking cursor" >&5
 echo $ECHO_N "checking if you want blinking cursor... $ECHO_C" >&6
 
 # Check whether --enable-blink-cursor or --disable-blink-cursor was given.
@@ -18307,14 +18557,14 @@
 	enable_blink_curs=yes
 
 fi;
-echo "$as_me:18310: result: $enable_blink_curs" >&5
+echo "$as_me:18560: result: $enable_blink_curs" >&5
 echo "${ECHO_T}$enable_blink_curs" >&6
 test "$enable_blink_curs" = no &&
 cat >>confdefs.h <<\EOF
 #define OPT_BLINK_CURS 0
 EOF
 
-echo "$as_me:18317: checking if you want to ignore Linux's broken palette-strings" >&5
+echo "$as_me:18567: checking if you want to ignore Linux's broken palette-strings" >&5
 echo $ECHO_N "checking if you want to ignore Linux's broken palette-strings... $ECHO_C" >&6
 
 case $host_os in
@@ -18338,7 +18588,7 @@
 	enable_broken_osc=$enableval
 
 fi;
-echo "$as_me:18341: result: $enable_broken_osc" >&5
+echo "$as_me:18591: result: $enable_broken_osc" >&5
 echo "${ECHO_T}$enable_broken_osc" >&6
 if test "$enable_broken_osc" = yes ; then
 
@@ -18354,7 +18604,7 @@
 
 fi
 
-echo "$as_me:18357: checking if you want to allow broken string-terminators" >&5
+echo "$as_me:18607: checking if you want to allow broken string-terminators" >&5
 echo $ECHO_N "checking if you want to allow broken string-terminators... $ECHO_C" >&6
 
 # Check whether --enable-broken-st or --disable-broken-st was given.
@@ -18371,14 +18621,14 @@
 	enable_broken_st=yes
 
 fi;
-echo "$as_me:18374: result: $enable_broken_st" >&5
+echo "$as_me:18624: result: $enable_broken_st" >&5
 echo "${ECHO_T}$enable_broken_st" >&6
 test "$enable_broken_st" = no &&
 cat >>confdefs.h <<\EOF
 #define OPT_BROKEN_ST 0
 EOF
 
-echo "$as_me:18381: checking if you want to compile-in icon data" >&5
+echo "$as_me:18631: checking if you want to compile-in icon data" >&5
 echo $ECHO_N "checking if you want to compile-in icon data... $ECHO_C" >&6
 
 # Check whether --enable-builtin-xpms or --disable-builtin-xpms was given.
@@ -18395,14 +18645,14 @@
 	enable_builtin_xpms=no
 
 fi;
-echo "$as_me:18398: result: $enable_builtin_xpms" >&5
+echo "$as_me:18648: result: $enable_builtin_xpms" >&5
 echo "${ECHO_T}$enable_builtin_xpms" >&6
 test "$enable_builtin_xpms" = yes &&
 cat >>confdefs.h <<\EOF
 #define OPT_BUILTIN_XPMS 1
 EOF
 
-echo "$as_me:18405: checking if you want printable 128-159" >&5
+echo "$as_me:18655: checking if you want printable 128-159" >&5
 echo $ECHO_N "checking if you want printable 128-159... $ECHO_C" >&6
 
 # Check whether --enable-c1-print or --disable-c1-print was given.
@@ -18419,7 +18669,7 @@
 	enable_c1_print=yes
 
 fi;
-echo "$as_me:18422: result: $enable_c1_print" >&5
+echo "$as_me:18672: result: $enable_c1_print" >&5
 echo "${ECHO_T}$enable_c1_print" >&6
 test "$enable_c1_print" = no &&
 cat >>confdefs.h <<\EOF
@@ -18428,7 +18678,7 @@
 
 if test "$enable_ansi_color" = yes ; then
 
-	echo "$as_me:18431: checking if you want bold colors mapped like IBM PC" >&5
+	echo "$as_me:18681: checking if you want bold colors mapped like IBM PC" >&5
 echo $ECHO_N "checking if you want bold colors mapped like IBM PC... $ECHO_C" >&6
 
 # Check whether --enable-bold-color or --disable-bold-color was given.
@@ -18445,14 +18695,14 @@
 	enable_pc_color=yes
 
 fi;
-	echo "$as_me:18448: result: $enable_pc_color" >&5
+	echo "$as_me:18698: result: $enable_pc_color" >&5
 echo "${ECHO_T}$enable_pc_color" >&6
 	test "$enable_pc_color" = no &&
 cat >>confdefs.h <<\EOF
 #define OPT_PC_COLORS 0
 EOF
 
-	echo "$as_me:18455: checking if you want separate color-classes" >&5
+	echo "$as_me:18705: checking if you want separate color-classes" >&5
 echo $ECHO_N "checking if you want separate color-classes... $ECHO_C" >&6
 
 # Check whether --enable-color-class or --disable-color-class was given.
@@ -18469,14 +18719,14 @@
 	enable_color_class=yes
 
 fi;
-	echo "$as_me:18472: result: $enable_color_class" >&5
+	echo "$as_me:18722: result: $enable_color_class" >&5
 echo "${ECHO_T}$enable_color_class" >&6
 	test "$enable_color_class" = no &&
 cat >>confdefs.h <<\EOF
 #define OPT_COLOR_CLASS 0
 EOF
 
-	echo "$as_me:18479: checking if you want color-mode enabled by default" >&5
+	echo "$as_me:18729: checking if you want color-mode enabled by default" >&5
 echo $ECHO_N "checking if you want color-mode enabled by default... $ECHO_C" >&6
 
 # Check whether --enable-color-mode or --disable-color-mode was given.
@@ -18493,7 +18743,7 @@
 	default_colormode=yes
 
 fi;
-	echo "$as_me:18496: result: $default_colormode" >&5
+	echo "$as_me:18746: result: $default_colormode" >&5
 echo "${ECHO_T}$default_colormode" >&6
 	test "$default_colormode" = no &&
 cat >>confdefs.h <<\EOF
@@ -18502,7 +18752,7 @@
 
 fi
 
-echo "$as_me:18505: checking if you want support for color highlighting" >&5
+echo "$as_me:18755: checking if you want support for color highlighting" >&5
 echo $ECHO_N "checking if you want support for color highlighting... $ECHO_C" >&6
 
 # Check whether --enable-highlighting or --disable-highlighting was given.
@@ -18519,14 +18769,14 @@
 	default_highlight=yes
 
 fi;
-echo "$as_me:18522: result: $default_highlight" >&5
+echo "$as_me:18772: result: $default_highlight" >&5
 echo "${ECHO_T}$default_highlight" >&6
 test "$default_highlight" = no &&
 cat >>confdefs.h <<\EOF
 #define OPT_HIGHLIGHT_COLOR 0
 EOF
 
-echo "$as_me:18529: checking if you want support for doublesize characters" >&5
+echo "$as_me:18779: checking if you want support for doublesize characters" >&5
 echo $ECHO_N "checking if you want support for doublesize characters... $ECHO_C" >&6
 
 # Check whether --enable-doublechars or --disable-doublechars was given.
@@ -18543,14 +18793,14 @@
 	enable_doublechars=yes
 
 fi;
-echo "$as_me:18546: result: $enable_doublechars" >&5
+echo "$as_me:18796: result: $enable_doublechars" >&5
 echo "${ECHO_T}$enable_doublechars" >&6
 test "$enable_doublechars" = no &&
 cat >>confdefs.h <<\EOF
 #define OPT_DEC_CHRSET 0
 EOF
 
-echo "$as_me:18553: checking if you want fallback-support for box characters" >&5
+echo "$as_me:18803: checking if you want fallback-support for box characters" >&5
 echo $ECHO_N "checking if you want fallback-support for box characters... $ECHO_C" >&6
 
 # Check whether --enable-boxchars or --disable-boxchars was given.
@@ -18567,14 +18817,41 @@
 	enable_boxchars=yes
 
 fi;
-echo "$as_me:18570: result: $enable_boxchars" >&5
+echo "$as_me:18820: result: $enable_boxchars" >&5
 echo "${ECHO_T}$enable_boxchars" >&6
 test "$enable_boxchars" = no &&
 cat >>confdefs.h <<\EOF
 #define OPT_BOX_CHARS 0
 EOF
 
-echo "$as_me:18577: checking if you want to allow spawning new xterms" >&5
+echo "$as_me:18827: checking if you want to allow spawning commands to process selections" >&5
+echo $ECHO_N "checking if you want to allow spawning commands to process selections... $ECHO_C" >&6
+
+# Check whether --enable-exec-selection or --disable-exec-selection was given.
+if test "${enable_exec_selection+set}" = set; then
+  enableval="$enable_exec_selection"
+  test "$enableval" != no && enableval=yes
+	if test "$enableval" != "yes" ; then
+    enable_exec_selection=no
+	else
+		enable_exec_selection=yes
+	fi
+else
+  enableval=yes
+	enable_exec_selection=yes
+
+fi;
+echo "$as_me:18844: result: $enable_exec_selection" >&5
+echo "${ECHO_T}$enable_exec_selection" >&6
+if test "$enable_exec_selection" = no ; then
+
+cat >>confdefs.h <<\EOF
+#define OPT_EXEC_SELECTION 0
+EOF
+
+fi
+
+echo "$as_me:18854: checking if you want to allow spawning new xterms" >&5
 echo $ECHO_N "checking if you want to allow spawning new xterms... $ECHO_C" >&6
 
 # Check whether --enable-exec-xterm or --disable-exec-xterm was given.
@@ -18591,11 +18868,11 @@
 	enable_exec_xterm=no
 
 fi;
-echo "$as_me:18594: result: $enable_exec_xterm" >&5
+echo "$as_me:18871: result: $enable_exec_xterm" >&5
 echo "${ECHO_T}$enable_exec_xterm" >&6
 if test "$enable_exec_xterm" = yes ; then
 
-echo "$as_me:18598: checking for proc tree with cwd-support" >&5
+echo "$as_me:18875: checking for proc tree with cwd-support" >&5
 echo $ECHO_N "checking for proc tree with cwd-support... $ECHO_C" >&6
 if test "${cf_cv_procfs_cwd+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18614,11 +18891,11 @@
 done
 
 fi
-echo "$as_me:18617: result: $cf_cv_procfs_cwd" >&5
+echo "$as_me:18894: result: $cf_cv_procfs_cwd" >&5
 echo "${ECHO_T}$cf_cv_procfs_cwd" >&6
 
 	if test "$cf_cv_procfs_cwd" = no ; then
-		{ echo "$as_me:18621: WARNING: no suitable proc filesystem found" >&5
+		{ echo "$as_me:18898: WARNING: no suitable proc filesystem found" >&5
 echo "$as_me: WARNING: no suitable proc filesystem found" >&2;}
 	else
 
@@ -18636,17 +18913,17 @@
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "Xext"; then
 	test -n "$verbose" && echo "	found package Xext" 1>&6
 
-echo "${as_me:-configure}:18639: testing found package Xext ..." 1>&5
+echo "${as_me:-configure}:18916: testing found package Xext ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "Xext" 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "Xext" 2>/dev/null`"
 	test -n "$verbose" && echo "	package Xext CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:18645: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:18922: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package Xext LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:18649: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:18926: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -18767,7 +19044,7 @@
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
 
-	echo "$as_me:18770: checking for XextCreateExtension in -lXext" >&5
+	echo "$as_me:19047: checking for XextCreateExtension in -lXext" >&5
 echo $ECHO_N "checking for XextCreateExtension in -lXext... $ECHO_C" >&6
 if test "${ac_cv_lib_Xext_XextCreateExtension+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18775,7 +19052,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18778 "configure"
+#line 19055 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18794,16 +19071,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18797: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19074: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18800: \$? = $ac_status" >&5
+  echo "$as_me:19077: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18803: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19080: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18806: \$? = $ac_status" >&5
+  echo "$as_me:19083: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
@@ -18814,7 +19091,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18817: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:19094: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
 echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6
 if test "$ac_cv_lib_Xext_XextCreateExtension" = yes; then
 
@@ -18838,23 +19115,23 @@
 
 fi
 
-echo "$as_me:18841: checking for X11/extensions/Xdbe.h" >&5
+echo "$as_me:19118: checking for X11/extensions/Xdbe.h" >&5
 echo $ECHO_N "checking for X11/extensions/Xdbe.h... $ECHO_C" >&6
 if test "${ac_cv_header_X11_extensions_Xdbe_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 18847 "configure"
+#line 19124 "configure"
 #include "confdefs.h"
 #include <X11/extensions/Xdbe.h>
 _ACEOF
-if { (eval echo "$as_me:18851: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:19128: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18857: \$? = $ac_status" >&5
+  echo "$as_me:19134: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18873,7 +19150,7 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18876: result: $ac_cv_header_X11_extensions_Xdbe_h" >&5
+echo "$as_me:19153: result: $ac_cv_header_X11_extensions_Xdbe_h" >&5
 echo "${ECHO_T}$ac_cv_header_X11_extensions_Xdbe_h" >&6
 if test "$ac_cv_header_X11_extensions_Xdbe_h" = yes; then
 
@@ -18881,13 +19158,13 @@
 #define HAVE_X11_EXTENSIONS_XDBE_H 1
 EOF
 
-	echo "$as_me:18884: checking for XdbeSwapBuffers" >&5
+	echo "$as_me:19161: checking for XdbeSwapBuffers" >&5
 echo $ECHO_N "checking for XdbeSwapBuffers... $ECHO_C" >&6
 if test "${ac_cv_func_XdbeSwapBuffers+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 18890 "configure"
+#line 19167 "configure"
 #include "confdefs.h"
 #define XdbeSwapBuffers autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18918,16 +19195,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18921: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19198: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18924: \$? = $ac_status" >&5
+  echo "$as_me:19201: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18927: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19204: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18930: \$? = $ac_status" >&5
+  echo "$as_me:19207: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_XdbeSwapBuffers=yes
 else
@@ -18937,7 +19214,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18940: result: $ac_cv_func_XdbeSwapBuffers" >&5
+echo "$as_me:19217: result: $ac_cv_func_XdbeSwapBuffers" >&5
 echo "${ECHO_T}$ac_cv_func_XdbeSwapBuffers" >&6
 if test "$ac_cv_func_XdbeSwapBuffers" = yes; then
 
@@ -18952,7 +19229,7 @@
 
 double_buffer=False
 if test "$cf_x_ext_double_buffer" = yes ; then
-	echo "$as_me:18955: checking if you want to enable double-buffering in default resources" >&5
+	echo "$as_me:19232: checking if you want to enable double-buffering in default resources" >&5
 echo $ECHO_N "checking if you want to enable double-buffering in default resources... $ECHO_C" >&6
 
 # Check whether --enable-double-buffer or --disable-double-buffer was given.
@@ -18969,7 +19246,7 @@
 	enable_double_bfr=no
 
 fi;
-	echo "$as_me:18972: result: $enable_double_bfr" >&5
+	echo "$as_me:19249: result: $enable_double_bfr" >&5
 echo "${ECHO_T}$enable_double_bfr" >&6
 	if test "$enable_double_bfr" = yes ; then
 
@@ -18981,7 +19258,7 @@
 	fi
 fi
 
-echo "$as_me:18984: checking if you want to use FreeType library" >&5
+echo "$as_me:19261: checking if you want to use FreeType library" >&5
 echo $ECHO_N "checking if you want to use FreeType library... $ECHO_C" >&6
 
 # Check whether --enable-freetype or --disable-freetype was given.
@@ -18998,7 +19275,7 @@
 	enable_freetype=yes
 
 fi;
-echo "$as_me:19001: result: $enable_freetype" >&5
+echo "$as_me:19278: result: $enable_freetype" >&5
 echo "${ECHO_T}$enable_freetype" >&6
 if test "$enable_freetype" = yes ; then
 
@@ -19008,7 +19285,7 @@
 FREETYPE_CONFIG=none
 FREETYPE_PARAMS=
 
-echo "$as_me:19011: checking for FreeType configuration script" >&5
+echo "$as_me:19288: checking for FreeType configuration script" >&5
 echo $ECHO_N "checking for FreeType configuration script... $ECHO_C" >&6
 
 # Check whether --with-freetype-config or --without-freetype-config was given.
@@ -19020,12 +19297,12 @@
 fi;
 test -z $cf_cv_x_freetype_cfgs && cf_cv_x_freetype_cfgs=auto
 test $cf_cv_x_freetype_cfgs = no && cf_cv_x_freetype_cfgs=none
-echo "$as_me:19023: result: $cf_cv_x_freetype_cfgs" >&5
+echo "$as_me:19300: result: $cf_cv_x_freetype_cfgs" >&5
 echo "${ECHO_T}$cf_cv_x_freetype_cfgs" >&6
 
 case $cf_cv_x_freetype_cfgs in
 (none)
-	echo "$as_me:19028: checking if you specified -D/-I options for FreeType" >&5
+	echo "$as_me:19305: checking if you specified -D/-I options for FreeType" >&5
 echo $ECHO_N "checking if you specified -D/-I options for FreeType... $ECHO_C" >&6
 
 # Check whether --with-freetype-cflags or --without-freetype-cflags was given.
@@ -19035,10 +19312,10 @@
 else
   cf_cv_x_freetype_incs=no
 fi;
-	echo "$as_me:19038: result: $cf_cv_x_freetype_incs" >&5
+	echo "$as_me:19315: result: $cf_cv_x_freetype_incs" >&5
 echo "${ECHO_T}$cf_cv_x_freetype_incs" >&6
 
-	echo "$as_me:19041: checking if you specified -L/-l options for FreeType" >&5
+	echo "$as_me:19318: checking if you specified -L/-l options for FreeType" >&5
 echo $ECHO_N "checking if you specified -L/-l options for FreeType... $ECHO_C" >&6
 
 # Check whether --with-freetype-libs or --without-freetype-libs was given.
@@ -19048,7 +19325,7 @@
 else
   cf_cv_x_freetype_libs=no
 fi;
-	echo "$as_me:19051: result: $cf_cv_x_freetype_libs" >&5
+	echo "$as_me:19328: result: $cf_cv_x_freetype_libs" >&5
 echo "${ECHO_T}$cf_cv_x_freetype_libs" >&6
 	;;
 (auto)
@@ -19058,7 +19335,7 @@
 	else
 		# Extract the first word of "freetype-config", so it can be a program name with args.
 set dummy freetype-config; ac_word=$2
-echo "$as_me:19061: checking for $ac_word" >&5
+echo "$as_me:19338: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_FREETYPE_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19075,7 +19352,7 @@
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_FREETYPE_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:19078: found $ac_dir/$ac_word" >&5
+   echo "$as_me:19355: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -19087,10 +19364,10 @@
 FREETYPE_CONFIG=$ac_cv_path_FREETYPE_CONFIG
 
 if test -n "$FREETYPE_CONFIG"; then
-  echo "$as_me:19090: result: $FREETYPE_CONFIG" >&5
+  echo "$as_me:19367: result: $FREETYPE_CONFIG" >&5
 echo "${ECHO_T}$FREETYPE_CONFIG" >&6
 else
-  echo "$as_me:19093: result: no" >&5
+  echo "$as_me:19370: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -19100,7 +19377,7 @@
 		else
 			# Extract the first word of "xft-config", so it can be a program name with args.
 set dummy xft-config; ac_word=$2
-echo "$as_me:19103: checking for $ac_word" >&5
+echo "$as_me:19380: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_FREETYPE_OLD_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19117,7 +19394,7 @@
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_FREETYPE_OLD_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:19120: found $ac_dir/$ac_word" >&5
+   echo "$as_me:19397: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -19129,10 +19406,10 @@
 FREETYPE_OLD_CONFIG=$ac_cv_path_FREETYPE_OLD_CONFIG
 
 if test -n "$FREETYPE_OLD_CONFIG"; then
-  echo "$as_me:19132: result: $FREETYPE_OLD_CONFIG" >&5
+  echo "$as_me:19409: result: $FREETYPE_OLD_CONFIG" >&5
 echo "${ECHO_T}$FREETYPE_OLD_CONFIG" >&6
 else
-  echo "$as_me:19135: result: no" >&5
+  echo "$as_me:19412: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -19147,14 +19424,14 @@
 		FREETYPE_CONFIG=$cf_cv_x_freetype_cfgs
 		FREETYPE_PARAMS=xft
 	else
-		{ echo "$as_me:19150: WARNING: cannot find pkg-config for Xft" >&5
+		{ echo "$as_me:19427: WARNING: cannot find pkg-config for Xft" >&5
 echo "$as_me: WARNING: cannot find pkg-config for Xft" >&2;}
 	fi
 	;;
 (*)
 	# Extract the first word of "$cf_cv_x_freetype_cfgs", so it can be a program name with args.
 set dummy $cf_cv_x_freetype_cfgs; ac_word=$2
-echo "$as_me:19157: checking for $ac_word" >&5
+echo "$as_me:19434: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_FREETYPE_XFT_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19171,7 +19448,7 @@
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_FREETYPE_XFT_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:19174: found $ac_dir/$ac_word" >&5
+   echo "$as_me:19451: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -19183,41 +19460,41 @@
 FREETYPE_XFT_CONFIG=$ac_cv_path_FREETYPE_XFT_CONFIG
 
 if test -n "$FREETYPE_XFT_CONFIG"; then
-  echo "$as_me:19186: result: $FREETYPE_XFT_CONFIG" >&5
+  echo "$as_me:19463: result: $FREETYPE_XFT_CONFIG" >&5
 echo "${ECHO_T}$FREETYPE_XFT_CONFIG" >&6
 else
-  echo "$as_me:19189: result: no" >&5
+  echo "$as_me:19466: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 	if test "$FREETYPE_XFT_CONFIG" != none; then
 		FREETYPE_CONFIG=$FREETYPE_XFT_CONFIG
 	else
-		{ echo "$as_me:19196: WARNING: cannot find config script for Xft" >&5
+		{ echo "$as_me:19473: WARNING: cannot find config script for Xft" >&5
 echo "$as_me: WARNING: cannot find config script for Xft" >&2;}
 	fi
 	;;
 esac
 
 if test "$FREETYPE_CONFIG" != none ; then
-	echo "$as_me:19203: checking for FreeType config" >&5
+	echo "$as_me:19480: checking for FreeType config" >&5
 echo $ECHO_N "checking for FreeType config... $ECHO_C" >&6
-	echo "$as_me:19205: result: $FREETYPE_CONFIG $FREETYPE_PARAMS" >&5
+	echo "$as_me:19482: result: $FREETYPE_CONFIG $FREETYPE_PARAMS" >&5
 echo "${ECHO_T}$FREETYPE_CONFIG $FREETYPE_PARAMS" >&6
 
 	if test "$cf_cv_x_freetype_incs" = no ; then
-		echo "$as_me:19209: checking for $FREETYPE_CONFIG cflags" >&5
+		echo "$as_me:19486: checking for $FREETYPE_CONFIG cflags" >&5
 echo $ECHO_N "checking for $FREETYPE_CONFIG cflags... $ECHO_C" >&6
 		cf_cv_x_freetype_incs="`$FREETYPE_CONFIG $FREETYPE_PARAMS --cflags 2>/dev/null`"
-		echo "$as_me:19212: result: $cf_cv_x_freetype_incs" >&5
+		echo "$as_me:19489: result: $cf_cv_x_freetype_incs" >&5
 echo "${ECHO_T}$cf_cv_x_freetype_incs" >&6
 	fi
 
 	if test "$cf_cv_x_freetype_libs" = no ; then
-		echo "$as_me:19217: checking for $FREETYPE_CONFIG libs" >&5
+		echo "$as_me:19494: checking for $FREETYPE_CONFIG libs" >&5
 echo $ECHO_N "checking for $FREETYPE_CONFIG libs... $ECHO_C" >&6
 		cf_cv_x_freetype_libs="$cf_extra_freetype_libs `$FREETYPE_CONFIG $FREETYPE_PARAMS --libs 2>/dev/null`"
-		echo "$as_me:19220: result: $cf_cv_x_freetype_libs" >&5
+		echo "$as_me:19497: result: $cf_cv_x_freetype_libs" >&5
 echo "${ECHO_T}$cf_cv_x_freetype_libs" >&6
 	fi
 fi
@@ -19230,7 +19507,7 @@
 	cf_cv_x_freetype_libs=-lXft
 fi
 
-echo "$as_me:19233: checking if we can link with FreeType libraries" >&5
+echo "$as_me:19510: checking if we can link with FreeType libraries" >&5
 echo $ECHO_N "checking if we can link with FreeType libraries... $ECHO_C" >&6
 
 cf_save_LIBS="$LIBS"
@@ -19255,7 +19532,7 @@
 CPPFLAGS="$CPPFLAGS $cf_cv_x_freetype_incs"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19258 "configure"
+#line 19535 "configure"
 #include "confdefs.h"
 
 #include <X11/Xlib.h>
@@ -19271,16 +19548,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19274: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19551: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19277: \$? = $ac_status" >&5
+  echo "$as_me:19554: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19280: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19557: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19283: \$? = $ac_status" >&5
+  echo "$as_me:19560: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_found_freetype=yes
 else
@@ -19289,7 +19566,7 @@
 cf_cv_found_freetype=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-echo "$as_me:19292: result: $cf_cv_found_freetype" >&5
+echo "$as_me:19569: result: $cf_cv_found_freetype" >&5
 echo "${ECHO_T}$cf_cv_found_freetype" >&6
 
 LIBS="$cf_save_LIBS"
@@ -19422,13 +19699,13 @@
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:19425: checking for $ac_func" >&5
+echo "$as_me:19702: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 19431 "configure"
+#line 19708 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -19459,16 +19736,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19462: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19739: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19465: \$? = $ac_status" >&5
+  echo "$as_me:19742: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19468: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19745: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19471: \$? = $ac_status" >&5
+  echo "$as_me:19748: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -19478,7 +19755,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19481: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:19758: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -19489,7 +19766,7 @@
 done
 
 else
-	{ echo "$as_me:19492: WARNING: No libraries found for FreeType" >&5
+	{ echo "$as_me:19769: WARNING: No libraries found for FreeType" >&5
 echo "$as_me: WARNING: No libraries found for FreeType" >&2;}
 	CPPFLAGS=`echo "$CPPFLAGS" | sed -e s/-DXRENDERFONT//`
 fi
@@ -19497,14 +19774,14 @@
 # FIXME: revisit this if needed
 
 if test "$cf_cv_found_freetype" = yes ; then
-echo "$as_me:19500: checking for usable Xft/fontconfig package" >&5
+echo "$as_me:19777: checking for usable Xft/fontconfig package" >&5
 echo $ECHO_N "checking for usable Xft/fontconfig package... $ECHO_C" >&6
 if test "${cf_cv_xft_compat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19507 "configure"
+#line 19784 "configure"
 #include "confdefs.h"
 
 #include <X11/Xft/Xft.h>
@@ -19523,16 +19800,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19526: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19803: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19529: \$? = $ac_status" >&5
+  echo "$as_me:19806: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19532: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19809: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19535: \$? = $ac_status" >&5
+  echo "$as_me:19812: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xft_compat=yes
 else
@@ -19543,7 +19820,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:19546: result: $cf_cv_xft_compat" >&5
+echo "$as_me:19823: result: $cf_cv_xft_compat" >&5
 echo "${ECHO_T}$cf_cv_xft_compat" >&6
 
 if test "$cf_cv_xft_compat" = no
@@ -19555,24 +19832,24 @@
 	(*)
 		test -n "$verbose" && echo "	work around broken package" 1>&6
 
-echo "${as_me:-configure}:19558: testing work around broken package ..." 1>&5
+echo "${as_me:-configure}:19835: testing work around broken package ..." 1>&5
 
 		cf_save_fontconfig="$LIBS"
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "fontconfig"; then
 	test -n "$verbose" && echo "	found package fontconfig" 1>&6
 
-echo "${as_me:-configure}:19565: testing found package fontconfig ..." 1>&5
+echo "${as_me:-configure}:19842: testing found package fontconfig ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "fontconfig" 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "fontconfig" 2>/dev/null`"
 	test -n "$verbose" && echo "	package fontconfig CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:19571: testing package fontconfig CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:19848: testing package fontconfig CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package fontconfig LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:19575: testing package fontconfig LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:19852: testing package fontconfig LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -19790,12 +20067,12 @@
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:19793: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:20070: testing ...before $LIBS ..." 1>&5
 
 LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%-lXft %-lXft $cf_pkgconfig_libs %" -e 's%  % %g'`
 test -n "$verbose" && echo "	...after  $LIBS" 1>&6
 
-echo "${as_me:-configure}:19798: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:20075: testing ...after  $LIBS ..." 1>&5
 
 else
 	cf_pkgconfig_incs=
@@ -19803,12 +20080,12 @@
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:19806: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:20083: testing ...before $LIBS ..." 1>&5
 
 LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%-lXft %-lXft -lfontconfig %" -e 's%  % %g'`
 test -n "$verbose" && echo "	...after  $LIBS" 1>&6
 
-echo "${as_me:-configure}:19811: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:20088: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -19821,7 +20098,7 @@
 	CPPFLAGS=`echo "$CPPFLAGS" | sed -e s/-DXRENDERFONT//`
 fi
 
-echo "$as_me:19824: checking if you want support for HP-style function keys" >&5
+echo "$as_me:20101: checking if you want support for HP-style function keys" >&5
 echo $ECHO_N "checking if you want support for HP-style function keys... $ECHO_C" >&6
 
 # Check whether --enable-hp-fkeys or --disable-hp-fkeys was given.
@@ -19838,7 +20115,7 @@
 	enable_hp_fkeys=no
 
 fi;
-echo "$as_me:19841: result: $enable_hp_fkeys" >&5
+echo "$as_me:20118: result: $enable_hp_fkeys" >&5
 echo "${ECHO_T}$enable_hp_fkeys" >&6
 if test "$enable_hp_fkeys" = yes ; then
 
@@ -19848,7 +20125,7 @@
 
 fi
 
-echo "$as_me:19851: checking if you want support for SCO-style function keys" >&5
+echo "$as_me:20128: checking if you want support for SCO-style function keys" >&5
 echo $ECHO_N "checking if you want support for SCO-style function keys... $ECHO_C" >&6
 
 # Check whether --enable-sco-fkeys or --disable-sco-fkeys was given.
@@ -19865,7 +20142,7 @@
 	enable_sco_fkeys=no
 
 fi;
-echo "$as_me:19868: result: $enable_sco_fkeys" >&5
+echo "$as_me:20145: result: $enable_sco_fkeys" >&5
 echo "${ECHO_T}$enable_sco_fkeys" >&6
 if test "$enable_sco_fkeys" = yes ; then
 
@@ -19875,7 +20152,7 @@
 
 fi
 
-echo "$as_me:19878: checking if you want support for Sun-style function keys" >&5
+echo "$as_me:20155: checking if you want support for Sun-style function keys" >&5
 echo $ECHO_N "checking if you want support for Sun-style function keys... $ECHO_C" >&6
 
 # Check whether --enable-sun-fkeys or --disable-sun-fkeys was given.
@@ -19892,7 +20169,7 @@
 	enable_sun_fkeys=yes
 
 fi;
-echo "$as_me:19895: result: $enable_sun_fkeys" >&5
+echo "$as_me:20172: result: $enable_sun_fkeys" >&5
 echo "${ECHO_T}$enable_sun_fkeys" >&6
 if test "$enable_sun_fkeys" = no ; then
 
@@ -19902,7 +20179,7 @@
 
 fi
 
-echo "$as_me:19905: checking if you want saved-lines stored as a FIFO" >&5
+echo "$as_me:20182: checking if you want saved-lines stored as a FIFO" >&5
 echo $ECHO_N "checking if you want saved-lines stored as a FIFO... $ECHO_C" >&6
 
 # Check whether --enable-fifo-lines or --disable-fifo-lines was given.
@@ -19919,14 +20196,14 @@
 	enable_fifo_lines=yes
 
 fi;
-echo "$as_me:19922: result: $enable_fifo_lines" >&5
+echo "$as_me:20199: result: $enable_fifo_lines" >&5
 echo "${ECHO_T}$enable_fifo_lines" >&6
 if test "$enable_fifo_lines" != yes ; then
-	{ echo "$as_me:19925: WARNING: this option has been deprecated" >&5
+	{ echo "$as_me:20202: WARNING: this option has been deprecated" >&5
 echo "$as_me: WARNING: this option has been deprecated" >&2;}
 fi
 
-echo "$as_me:19929: checking if you want support for internationalization" >&5
+echo "$as_me:20206: checking if you want support for internationalization" >&5
 echo $ECHO_N "checking if you want support for internationalization... $ECHO_C" >&6
 
 # Check whether --enable-i18n or --disable-i18n was given.
@@ -19943,7 +20220,7 @@
 	enable_i18n=yes
 
 fi;
-echo "$as_me:19946: result: $enable_i18n" >&5
+echo "$as_me:20223: result: $enable_i18n" >&5
 echo "${ECHO_T}$enable_i18n" >&6
 if test "$enable_i18n" = no ; then
 
@@ -19953,7 +20230,7 @@
 
 fi
 
-echo "$as_me:19956: checking if you want support for initial-erase setup" >&5
+echo "$as_me:20233: checking if you want support for initial-erase setup" >&5
 echo $ECHO_N "checking if you want support for initial-erase setup... $ECHO_C" >&6
 
 # Check whether --enable-initial-erase or --disable-initial-erase was given.
@@ -19970,7 +20247,7 @@
 	enable_ie=yes
 
 fi;
-echo "$as_me:19973: result: $enable_ie" >&5
+echo "$as_me:20250: result: $enable_ie" >&5
 echo "${ECHO_T}$enable_ie" >&6
 if test "$enable_ie" = no ; then
 
@@ -19980,7 +20257,7 @@
 
 fi
 
-echo "$as_me:19983: checking if you want support for input-method" >&5
+echo "$as_me:20260: checking if you want support for input-method" >&5
 echo $ECHO_N "checking if you want support for input-method... $ECHO_C" >&6
 
 # Check whether --enable-input-method or --disable-input-method was given.
@@ -19997,17 +20274,17 @@
 	enable_ximp=$enable_i18n
 
 fi;
-echo "$as_me:20000: result: $enable_ximp" >&5
+echo "$as_me:20277: result: $enable_ximp" >&5
 echo "${ECHO_T}$enable_ximp" >&6
 
-echo "$as_me:20003: checking if X libraries support input-method" >&5
+echo "$as_me:20280: checking if X libraries support input-method" >&5
 echo $ECHO_N "checking if X libraries support input-method... $ECHO_C" >&6
 if test "${cf_cv_input_method+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20010 "configure"
+#line 20287 "configure"
 #include "confdefs.h"
 
 #include <X11/IntrinsicP.h>
@@ -20041,16 +20318,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20044: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20321: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20047: \$? = $ac_status" >&5
+  echo "$as_me:20324: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20050: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20327: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20053: \$? = $ac_status" >&5
+  echo "$as_me:20330: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_input_method=yes
 else
@@ -20060,13 +20337,13 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20063: result: $cf_cv_input_method" >&5
+echo "$as_me:20340: result: $cf_cv_input_method" >&5
 echo "${ECHO_T}$cf_cv_input_method" >&6
 
 test "$cf_cv_input_method" = no && enable_ximp=no
 if test "$enable_ximp" != no ; then
 	if test "$enable_i18n" = no ; then
-		{ echo "$as_me:20069: WARNING: input-methor relies upon internationalization" >&5
+		{ echo "$as_me:20346: WARNING: input-methor relies upon internationalization" >&5
 echo "$as_me: WARNING: input-methor relies upon internationalization" >&2;}
 		enable_ximp=no
 	fi
@@ -20079,7 +20356,7 @@
 
 fi
 
-echo "$as_me:20082: checking if you want support for load-vt-fonts" >&5
+echo "$as_me:20359: checking if you want support for load-vt-fonts" >&5
 echo $ECHO_N "checking if you want support for load-vt-fonts... $ECHO_C" >&6
 
 # Check whether --enable-load-vt-fonts or --disable-load-vt-fonts was given.
@@ -20096,7 +20373,7 @@
 	enable_load_vt_fonts=no
 
 fi;
-echo "$as_me:20099: result: $enable_load_vt_fonts" >&5
+echo "$as_me:20376: result: $enable_load_vt_fonts" >&5
 echo "${ECHO_T}$enable_load_vt_fonts" >&6
 if test "$enable_load_vt_fonts" = yes ; then
 
@@ -20106,7 +20383,7 @@
 
 fi
 
-echo "$as_me:20109: checking if you want support for logging" >&5
+echo "$as_me:20386: checking if you want support for logging" >&5
 echo $ECHO_N "checking if you want support for logging... $ECHO_C" >&6
 
 # Check whether --enable-logging or --disable-logging was given.
@@ -20123,7 +20400,7 @@
 	enable_logging=no
 
 fi;
-echo "$as_me:20126: result: $enable_logging" >&5
+echo "$as_me:20403: result: $enable_logging" >&5
 echo "${ECHO_T}$enable_logging" >&6
 if test "$enable_logging" = yes ; then
 
@@ -20131,7 +20408,7 @@
 #define ALLOWLOGGING 1
 EOF
 
-	echo "$as_me:20134: checking if you want to allow logging via a pipe" >&5
+	echo "$as_me:20411: checking if you want to allow logging via a pipe" >&5
 echo $ECHO_N "checking if you want to allow logging via a pipe... $ECHO_C" >&6
 
 # Check whether --enable-logfile-exec or --disable-logfile-exec was given.
@@ -20148,7 +20425,7 @@
 	enable_log_exec=no
 
 fi;
-	echo "$as_me:20151: result: $enable_log_exec" >&5
+	echo "$as_me:20428: result: $enable_log_exec" >&5
 echo "${ECHO_T}$enable_log_exec" >&6
 	if test "$enable_log_exec" = yes ; then
 
@@ -20159,7 +20436,7 @@
 	fi
 fi
 
-echo "$as_me:20162: checking if you want support for iconify/maximize translations" >&5
+echo "$as_me:20439: checking if you want support for iconify/maximize translations" >&5
 echo $ECHO_N "checking if you want support for iconify/maximize translations... $ECHO_C" >&6
 
 # Check whether --enable-maximize or --disable-maximize was given.
@@ -20176,14 +20453,14 @@
 	enable_maximize=yes
 
 fi;
-echo "$as_me:20179: result: $enable_maximize" >&5
+echo "$as_me:20456: result: $enable_maximize" >&5
 echo "${ECHO_T}$enable_maximize" >&6
 test "$enable_maximize" = no &&
 cat >>confdefs.h <<\EOF
 #define OPT_MAXIMIZE 0
 EOF
 
-echo "$as_me:20186: checking if you want NumLock to override keyboard tables" >&5
+echo "$as_me:20463: checking if you want NumLock to override keyboard tables" >&5
 echo $ECHO_N "checking if you want NumLock to override keyboard tables... $ECHO_C" >&6
 
 # Check whether --enable-num-lock or --disable-num-lock was given.
@@ -20200,14 +20477,14 @@
 	enable_numlock=yes
 
 fi;
-echo "$as_me:20203: result: $enable_numlock" >&5
+echo "$as_me:20480: result: $enable_numlock" >&5
 echo "${ECHO_T}$enable_numlock" >&6
 test "$enable_numlock" = no &&
 cat >>confdefs.h <<\EOF
 #define OPT_NUM_LOCK 0
 EOF
 
-echo "$as_me:20210: checking if you want support for get/set of base64 selection data" >&5
+echo "$as_me:20487: checking if you want support for get/set of base64 selection data" >&5
 echo $ECHO_N "checking if you want support for get/set of base64 selection data... $ECHO_C" >&6
 
 # Check whether --enable-paste64 or --disable-paste64 was given.
@@ -20224,7 +20501,7 @@
 	enable_paste64=yes
 
 fi;
-echo "$as_me:20227: result: $enable_paste64" >&5
+echo "$as_me:20504: result: $enable_paste64" >&5
 echo "${ECHO_T}$enable_paste64" >&6
 if test "$enable_paste64" = yes ; then
 
@@ -20240,7 +20517,7 @@
 
 fi
 
-echo "$as_me:20243: checking if you want support for pty-handshaking" >&5
+echo "$as_me:20520: checking if you want support for pty-handshaking" >&5
 echo $ECHO_N "checking if you want support for pty-handshaking... $ECHO_C" >&6
 
 # Check whether --enable-pty-handshake or --disable-pty-handshake was given.
@@ -20257,7 +20534,7 @@
 	enable_pty_handshake=yes
 
 fi;
-echo "$as_me:20260: result: $enable_pty_handshake" >&5
+echo "$as_me:20537: result: $enable_pty_handshake" >&5
 echo "${ECHO_T}$enable_pty_handshake" >&6
 if test "$enable_pty_handshake" = yes ; then
 
@@ -20273,7 +20550,7 @@
 
 fi
 
-echo "$as_me:20276: checking if you want support for mouse in readline applications" >&5
+echo "$as_me:20553: checking if you want support for mouse in readline applications" >&5
 echo $ECHO_N "checking if you want support for mouse in readline applications... $ECHO_C" >&6
 
 # Check whether --enable-readline-mouse or --disable-readline-mouse was given.
@@ -20290,7 +20567,7 @@
 	enable_readline_mouse=no
 
 fi;
-echo "$as_me:20293: result: $enable_readline_mouse" >&5
+echo "$as_me:20570: result: $enable_readline_mouse" >&5
 echo "${ECHO_T}$enable_readline_mouse" >&6
 if test "$enable_readline_mouse" = yes ; then
 
@@ -20300,7 +20577,7 @@
 
 fi
 
-echo "$as_me:20303: checking if you want support for regular-expression selections" >&5
+echo "$as_me:20580: checking if you want support for regular-expression selections" >&5
 echo $ECHO_N "checking if you want support for regular-expression selections... $ECHO_C" >&6
 
 # Check whether --enable-regex or --disable-regex was given.
@@ -20317,11 +20594,11 @@
 	enable_regex=yes
 
 fi;
-echo "$as_me:20320: result: $enable_regex" >&5
+echo "$as_me:20597: result: $enable_regex" >&5
 echo "${ECHO_T}$enable_regex" >&6
 if test "$enable_regex" = yes ; then
 
-echo "$as_me:20324: checking if you want to use PCRE2 for regular-expressions" >&5
+echo "$as_me:20601: checking if you want to use PCRE2 for regular-expressions" >&5
 echo $ECHO_N "checking if you want to use PCRE2 for regular-expressions... $ECHO_C" >&6
 
 # Check whether --with-pcre2 or --without-pcre2 was given.
@@ -20330,7 +20607,7 @@
 
 fi;
 test -z "$with_pcre2" && with_pcre2=no
-echo "$as_me:20333: result: $with_pcre2" >&5
+echo "$as_me:20610: result: $with_pcre2" >&5
 echo "${ECHO_T}$with_pcre2" >&6
 
 if test "x$with_pcre2" != xno ; then
@@ -20341,17 +20618,17 @@
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_with_pcre2"; then
 	test -n "$verbose" && echo "	found package $cf_with_pcre2" 1>&6
 
-echo "${as_me:-configure}:20344: testing found package $cf_with_pcre2 ..." 1>&5
+echo "${as_me:-configure}:20621: testing found package $cf_with_pcre2 ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "$cf_with_pcre2" 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "$cf_with_pcre2" 2>/dev/null`"
 	test -n "$verbose" && echo "	package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:20350: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:20627: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:20354: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:20631: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -20475,7 +20752,7 @@
 fi
 
 	done
-	cf_with_pcre2_ok=yes || { { echo "$as_me:20478: error: Cannot find PCRE2 library" >&5
+	cf_with_pcre2_ok=yes || { { echo "$as_me:20755: error: Cannot find PCRE2 library" >&5
 echo "$as_me: error: Cannot find PCRE2 library" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -20488,7 +20765,7 @@
 	(*pcre2-posix*|*pcreposix*)
 		;;
 	(*)
-		echo "$as_me:20491: checking for regcomp in -lpcre2-posix" >&5
+		echo "$as_me:20768: checking for regcomp in -lpcre2-posix" >&5
 echo $ECHO_N "checking for regcomp in -lpcre2-posix... $ECHO_C" >&6
 if test "${ac_cv_lib_pcre2_posix_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20496,7 +20773,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcre2-posix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20499 "configure"
+#line 20776 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20515,16 +20792,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20518: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20795: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20521: \$? = $ac_status" >&5
+  echo "$as_me:20798: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20524: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20801: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20527: \$? = $ac_status" >&5
+  echo "$as_me:20804: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pcre2_posix_regcomp=yes
 else
@@ -20535,7 +20812,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20538: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
+echo "$as_me:20815: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_pcre2_posix_regcomp" >&6
 if test "$ac_cv_lib_pcre2_posix_regcomp" = yes; then
 
@@ -20556,7 +20833,7 @@
 LIBS="$cf_add_libs"
 
 else
-  echo "$as_me:20559: checking for regcomp in -lpcreposix" >&5
+  echo "$as_me:20836: checking for regcomp in -lpcreposix" >&5
 echo $ECHO_N "checking for regcomp in -lpcreposix... $ECHO_C" >&6
 if test "${ac_cv_lib_pcreposix_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20564,7 +20841,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcreposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20567 "configure"
+#line 20844 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20583,16 +20860,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20586: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20863: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20589: \$? = $ac_status" >&5
+  echo "$as_me:20866: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20592: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20869: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20595: \$? = $ac_status" >&5
+  echo "$as_me:20872: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pcreposix_regcomp=yes
 else
@@ -20603,7 +20880,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20606: result: $ac_cv_lib_pcreposix_regcomp" >&5
+echo "$as_me:20883: result: $ac_cv_lib_pcreposix_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_pcreposix_regcomp" >&6
 if test "$ac_cv_lib_pcreposix_regcomp" = yes; then
 
@@ -20624,7 +20901,7 @@
 LIBS="$cf_add_libs"
 
 else
-  { { echo "$as_me:20627: error: Cannot find PCRE2 POSIX library" >&5
+  { { echo "$as_me:20904: error: Cannot find PCRE2 POSIX library" >&5
 echo "$as_me: error: Cannot find PCRE2 POSIX library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -20639,23 +20916,23 @@
 for ac_header in pcre2posix.h pcreposix.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20642: checking for $ac_header" >&5
+echo "$as_me:20919: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20648 "configure"
+#line 20925 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20652: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20929: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20658: \$? = $ac_status" >&5
+  echo "$as_me:20935: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20674,7 +20951,7 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20677: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20954: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20687,13 +20964,13 @@
 for ac_func in PCRE2regcomp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:20690: checking for $ac_func" >&5
+echo "$as_me:20967: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20696 "configure"
+#line 20973 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20724,16 +21001,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20727: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21004: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20730: \$? = $ac_status" >&5
+  echo "$as_me:21007: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20733: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21010: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20736: \$? = $ac_status" >&5
+  echo "$as_me:21013: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -20743,7 +21020,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20746: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:21023: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -20757,7 +21034,7 @@
 
 	if test "$with_pcre2" = no ; then
 
-echo "$as_me:20760: checking if you want to use PCRE for regular-expressions" >&5
+echo "$as_me:21037: checking if you want to use PCRE for regular-expressions" >&5
 echo $ECHO_N "checking if you want to use PCRE for regular-expressions... $ECHO_C" >&6
 
 # Check whether --with-pcre or --without-pcre was given.
@@ -20766,7 +21043,7 @@
 
 fi;
 test -z "$with_pcre" && with_pcre=no
-echo "$as_me:20769: result: $with_pcre" >&5
+echo "$as_me:21046: result: $with_pcre" >&5
 echo "${ECHO_T}$with_pcre" >&6
 
 if test "$with_pcre" != no ; then
@@ -20774,17 +21051,17 @@
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "libpcre"; then
 	test -n "$verbose" && echo "	found package libpcre" 1>&6
 
-echo "${as_me:-configure}:20777: testing found package libpcre ..." 1>&5
+echo "${as_me:-configure}:21054: testing found package libpcre ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "libpcre" 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "libpcre" 2>/dev/null`"
 	test -n "$verbose" && echo "	package libpcre CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:20783: testing package libpcre CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:21060: testing package libpcre CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package libpcre LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:20787: testing package libpcre LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:21064: testing package libpcre LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -20905,7 +21182,7 @@
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
 
-echo "$as_me:20908: checking for pcre_compile in -lpcre" >&5
+echo "$as_me:21185: checking for pcre_compile in -lpcre" >&5
 echo $ECHO_N "checking for pcre_compile in -lpcre... $ECHO_C" >&6
 if test "${ac_cv_lib_pcre_pcre_compile+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20913,7 +21190,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20916 "configure"
+#line 21193 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20932,16 +21209,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20935: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21212: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20938: \$? = $ac_status" >&5
+  echo "$as_me:21215: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20941: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21218: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20944: \$? = $ac_status" >&5
+  echo "$as_me:21221: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pcre_pcre_compile=yes
 else
@@ -20952,7 +21229,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20955: result: $ac_cv_lib_pcre_pcre_compile" >&5
+echo "$as_me:21232: result: $ac_cv_lib_pcre_pcre_compile" >&5
 echo "${ECHO_T}$ac_cv_lib_pcre_pcre_compile" >&6
 if test "$ac_cv_lib_pcre_pcre_compile" = yes; then
   cat >>confdefs.h <<EOF
@@ -20962,7 +21239,7 @@
   LIBS="-lpcre $LIBS"
 
 else
-  { { echo "$as_me:20965: error: Cannot find PCRE library" >&5
+  { { echo "$as_me:21242: error: Cannot find PCRE library" >&5
 echo "$as_me: error: Cannot find PCRE library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -20977,7 +21254,7 @@
 	(*pcreposix*)
 		;;
 	(*)
-		echo "$as_me:20980: checking for pcreposix_regcomp in -lpcreposix" >&5
+		echo "$as_me:21257: checking for pcreposix_regcomp in -lpcreposix" >&5
 echo $ECHO_N "checking for pcreposix_regcomp in -lpcreposix... $ECHO_C" >&6
 if test "${ac_cv_lib_pcreposix_pcreposix_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20985,7 +21262,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcreposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20988 "configure"
+#line 21265 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21004,16 +21281,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21007: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21284: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21010: \$? = $ac_status" >&5
+  echo "$as_me:21287: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21013: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21290: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21016: \$? = $ac_status" >&5
+  echo "$as_me:21293: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pcreposix_pcreposix_regcomp=yes
 else
@@ -21024,7 +21301,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21027: result: $ac_cv_lib_pcreposix_pcreposix_regcomp" >&5
+echo "$as_me:21304: result: $ac_cv_lib_pcreposix_pcreposix_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_pcreposix_pcreposix_regcomp" >&6
 if test "$ac_cv_lib_pcreposix_pcreposix_regcomp" = yes; then
 
@@ -21049,7 +21326,7 @@
 LIBS="$cf_add_libs"
 
 else
-  echo "$as_me:21052: checking for regcomp in -lpcreposix" >&5
+  echo "$as_me:21329: checking for regcomp in -lpcreposix" >&5
 echo $ECHO_N "checking for regcomp in -lpcreposix... $ECHO_C" >&6
 if test "${ac_cv_lib_pcreposix_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21057,7 +21334,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcreposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21060 "configure"
+#line 21337 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21076,16 +21353,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21079: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21356: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21082: \$? = $ac_status" >&5
+  echo "$as_me:21359: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21085: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21362: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21088: \$? = $ac_status" >&5
+  echo "$as_me:21365: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pcreposix_regcomp=yes
 else
@@ -21096,7 +21373,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21099: result: $ac_cv_lib_pcreposix_regcomp" >&5
+echo "$as_me:21376: result: $ac_cv_lib_pcreposix_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_pcreposix_regcomp" >&6
 if test "$ac_cv_lib_pcreposix_regcomp" = yes; then
 
@@ -21121,7 +21398,7 @@
 LIBS="$cf_add_libs"
 
 else
-  { { echo "$as_me:21124: error: Cannot find PCRE POSIX library" >&5
+  { { echo "$as_me:21401: error: Cannot find PCRE POSIX library" >&5
 echo "$as_me: error: Cannot find PCRE POSIX library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -21139,7 +21416,7 @@
 case "$host_os" in
 (mingw*)
 	# -lsystre -ltre -lintl -liconv
-	echo "$as_me:21142: checking for regcomp in -lsystre" >&5
+	echo "$as_me:21419: checking for regcomp in -lsystre" >&5
 echo $ECHO_N "checking for regcomp in -lsystre... $ECHO_C" >&6
 if test "${ac_cv_lib_systre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21147,7 +21424,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsystre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21150 "configure"
+#line 21427 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21166,16 +21443,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21169: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21446: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21172: \$? = $ac_status" >&5
+  echo "$as_me:21449: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21175: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21452: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21178: \$? = $ac_status" >&5
+  echo "$as_me:21455: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_systre_regcomp=yes
 else
@@ -21186,11 +21463,11 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21189: result: $ac_cv_lib_systre_regcomp" >&5
+echo "$as_me:21466: result: $ac_cv_lib_systre_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_systre_regcomp" >&6
 if test "$ac_cv_lib_systre_regcomp" = yes; then
 
-		echo "$as_me:21193: checking for libiconv_open in -liconv" >&5
+		echo "$as_me:21470: checking for libiconv_open in -liconv" >&5
 echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
 if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21198,7 +21475,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-liconv  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21201 "configure"
+#line 21478 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21217,16 +21494,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21220: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21497: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21223: \$? = $ac_status" >&5
+  echo "$as_me:21500: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21226: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21503: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21229: \$? = $ac_status" >&5
+  echo "$as_me:21506: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_iconv_libiconv_open=yes
 else
@@ -21237,7 +21514,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21240: result: $ac_cv_lib_iconv_libiconv_open" >&5
+echo "$as_me:21517: result: $ac_cv_lib_iconv_libiconv_open" >&5
 echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6
 if test "$ac_cv_lib_iconv_libiconv_open" = yes; then
 
@@ -21259,7 +21536,7 @@
 
 fi
 
-		echo "$as_me:21262: checking for libintl_gettext in -lintl" >&5
+		echo "$as_me:21539: checking for libintl_gettext in -lintl" >&5
 echo $ECHO_N "checking for libintl_gettext in -lintl... $ECHO_C" >&6
 if test "${ac_cv_lib_intl_libintl_gettext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21267,7 +21544,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21270 "configure"
+#line 21547 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21286,16 +21563,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21289: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21566: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21292: \$? = $ac_status" >&5
+  echo "$as_me:21569: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21295: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21572: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21298: \$? = $ac_status" >&5
+  echo "$as_me:21575: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_intl_libintl_gettext=yes
 else
@@ -21306,7 +21583,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21309: result: $ac_cv_lib_intl_libintl_gettext" >&5
+echo "$as_me:21586: result: $ac_cv_lib_intl_libintl_gettext" >&5
 echo "${ECHO_T}$ac_cv_lib_intl_libintl_gettext" >&6
 if test "$ac_cv_lib_intl_libintl_gettext" = yes; then
 
@@ -21328,7 +21605,7 @@
 
 fi
 
-		echo "$as_me:21331: checking for tre_regcomp in -ltre" >&5
+		echo "$as_me:21608: checking for tre_regcomp in -ltre" >&5
 echo $ECHO_N "checking for tre_regcomp in -ltre... $ECHO_C" >&6
 if test "${ac_cv_lib_tre_tre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21336,7 +21613,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21339 "configure"
+#line 21616 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21355,16 +21632,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21358: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21635: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21361: \$? = $ac_status" >&5
+  echo "$as_me:21638: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21364: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21641: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21367: \$? = $ac_status" >&5
+  echo "$as_me:21644: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_tre_tre_regcomp=yes
 else
@@ -21375,7 +21652,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21378: result: $ac_cv_lib_tre_tre_regcomp" >&5
+echo "$as_me:21655: result: $ac_cv_lib_tre_tre_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_tre_tre_regcomp" >&6
 if test "$ac_cv_lib_tre_tre_regcomp" = yes; then
 
@@ -21417,7 +21694,7 @@
 
 else
 
-		echo "$as_me:21420: checking for regcomp in -lgnurx" >&5
+		echo "$as_me:21697: checking for regcomp in -lgnurx" >&5
 echo $ECHO_N "checking for regcomp in -lgnurx... $ECHO_C" >&6
 if test "${ac_cv_lib_gnurx_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21425,7 +21702,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnurx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21428 "configure"
+#line 21705 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21444,16 +21721,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21447: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21724: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21450: \$? = $ac_status" >&5
+  echo "$as_me:21727: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21453: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21730: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21456: \$? = $ac_status" >&5
+  echo "$as_me:21733: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gnurx_regcomp=yes
 else
@@ -21464,7 +21741,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21467: result: $ac_cv_lib_gnurx_regcomp" >&5
+echo "$as_me:21744: result: $ac_cv_lib_gnurx_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_gnurx_regcomp" >&6
 if test "$ac_cv_lib_gnurx_regcomp" = yes; then
 
@@ -21492,13 +21769,13 @@
 	;;
 (*)
 	cf_regex_libs="regex re"
-	echo "$as_me:21495: checking for regcomp" >&5
+	echo "$as_me:21772: checking for regcomp" >&5
 echo $ECHO_N "checking for regcomp... $ECHO_C" >&6
 if test "${ac_cv_func_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21501 "configure"
+#line 21778 "configure"
 #include "confdefs.h"
 #define regcomp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21529,16 +21806,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21532: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21809: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21535: \$? = $ac_status" >&5
+  echo "$as_me:21812: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21538: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21815: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21541: \$? = $ac_status" >&5
+  echo "$as_me:21818: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_regcomp=yes
 else
@@ -21548,7 +21825,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21551: result: $ac_cv_func_regcomp" >&5
+echo "$as_me:21828: result: $ac_cv_func_regcomp" >&5
 echo "${ECHO_T}$ac_cv_func_regcomp" >&6
 if test "$ac_cv_func_regcomp" = yes; then
   cf_regex_func=regcomp
@@ -21557,7 +21834,7 @@
 		for cf_regex_lib in $cf_regex_libs
 		do
 			as_ac_Lib=`echo "ac_cv_lib_$cf_regex_lib''_regcomp" | $as_tr_sh`
-echo "$as_me:21560: checking for regcomp in -l$cf_regex_lib" >&5
+echo "$as_me:21837: checking for regcomp in -l$cf_regex_lib" >&5
 echo $ECHO_N "checking for regcomp in -l$cf_regex_lib... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21565,7 +21842,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_regex_lib  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21568 "configure"
+#line 21845 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21584,16 +21861,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21587: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21864: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21590: \$? = $ac_status" >&5
+  echo "$as_me:21867: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21593: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21870: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21596: \$? = $ac_status" >&5
+  echo "$as_me:21873: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -21604,7 +21881,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21607: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:21884: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_Lib"'}'`" >&6
 if test "`eval echo '${'"$as_ac_Lib"'}'`" = yes; then
 
@@ -21636,13 +21913,13 @@
 esac
 
 if test "$cf_regex_func" = no ; then
-	echo "$as_me:21639: checking for compile" >&5
+	echo "$as_me:21916: checking for compile" >&5
 echo $ECHO_N "checking for compile... $ECHO_C" >&6
 if test "${ac_cv_func_compile+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21645 "configure"
+#line 21922 "configure"
 #include "confdefs.h"
 #define compile autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21673,16 +21950,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21676: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21953: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21679: \$? = $ac_status" >&5
+  echo "$as_me:21956: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21682: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21959: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21685: \$? = $ac_status" >&5
+  echo "$as_me:21962: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_compile=yes
 else
@@ -21692,13 +21969,13 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21695: result: $ac_cv_func_compile" >&5
+echo "$as_me:21972: result: $ac_cv_func_compile" >&5
 echo "${ECHO_T}$ac_cv_func_compile" >&6
 if test "$ac_cv_func_compile" = yes; then
   cf_regex_func=compile
 else
 
-		echo "$as_me:21701: checking for compile in -lgen" >&5
+		echo "$as_me:21978: checking for compile in -lgen" >&5
 echo $ECHO_N "checking for compile in -lgen... $ECHO_C" >&6
 if test "${ac_cv_lib_gen_compile+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21706,7 +21983,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgen  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21709 "configure"
+#line 21986 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21725,16 +22002,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21728: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22005: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21731: \$? = $ac_status" >&5
+  echo "$as_me:22008: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21734: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22011: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21737: \$? = $ac_status" >&5
+  echo "$as_me:22014: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gen_compile=yes
 else
@@ -21745,7 +22022,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21748: result: $ac_cv_lib_gen_compile" >&5
+echo "$as_me:22025: result: $ac_cv_lib_gen_compile" >&5
 echo "${ECHO_T}$ac_cv_lib_gen_compile" >&6
 if test "$ac_cv_lib_gen_compile" = yes; then
 
@@ -21773,11 +22050,11 @@
 fi
 
 if test "$cf_regex_func" = no ; then
-	{ echo "$as_me:21776: WARNING: cannot find regular expression library" >&5
+	{ echo "$as_me:22053: WARNING: cannot find regular expression library" >&5
 echo "$as_me: WARNING: cannot find regular expression library" >&2;}
 fi
 
-echo "$as_me:21780: checking for regular-expression headers" >&5
+echo "$as_me:22057: checking for regular-expression headers" >&5
 echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6
 if test "${cf_cv_regex_hdrs+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21789,7 +22066,7 @@
 	for cf_regex_hdr in regexp.h regexpr.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 21792 "configure"
+#line 22069 "configure"
 #include "confdefs.h"
 #include <$cf_regex_hdr>
 int
@@ -21806,16 +22083,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21809: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22086: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21812: \$? = $ac_status" >&5
+  echo "$as_me:22089: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21815: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22092: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21818: \$? = $ac_status" >&5
+  echo "$as_me:22095: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -21832,7 +22109,7 @@
 	for cf_regex_hdr in regex.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 21835 "configure"
+#line 22112 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$cf_regex_hdr>
@@ -21852,16 +22129,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21855: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22132: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21858: \$? = $ac_status" >&5
+  echo "$as_me:22135: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21861: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22138: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21864: \$? = $ac_status" >&5
+  echo "$as_me:22141: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -21877,11 +22154,11 @@
 esac
 
 fi
-echo "$as_me:21880: result: $cf_cv_regex_hdrs" >&5
+echo "$as_me:22157: result: $cf_cv_regex_hdrs" >&5
 echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
 
 case "$cf_cv_regex_hdrs" in
-	(no)		{ echo "$as_me:21884: WARNING: no regular expression header found" >&5
+	(no)		{ echo "$as_me:22161: WARNING: no regular expression header found" >&5
 echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
 	(regex.h)
 cat >>confdefs.h <<\EOF
@@ -21901,7 +22178,7 @@
 esac
 
 			if test "X$cf_cv_regex_hdrs" != "Xregex.h" ; then
-				{ { echo "$as_me:21904: error: Only POSIX, PCRE, or PCRE2 regular expressions are supported" >&5
+				{ { echo "$as_me:22181: error: Only POSIX, PCRE, or PCRE2 regular expressions are supported" >&5
 echo "$as_me: error: Only POSIX, PCRE, or PCRE2 regular expressions are supported" >&2;}
    { (exit 1); exit 1; }; }
 			fi
@@ -21914,7 +22191,7 @@
 
 fi
 
-echo "$as_me:21917: checking if you want support for right-scrollbar" >&5
+echo "$as_me:22194: checking if you want support for right-scrollbar" >&5
 echo $ECHO_N "checking if you want support for right-scrollbar... $ECHO_C" >&6
 
 # Check whether --enable-rightbar or --disable-rightbar was given.
@@ -21931,7 +22208,7 @@
 	enable_rightbar=yes
 
 fi;
-echo "$as_me:21934: result: $enable_rightbar" >&5
+echo "$as_me:22211: result: $enable_rightbar" >&5
 echo "${ECHO_T}$enable_rightbar" >&6
 if test "$enable_rightbar" = yes ; then
 
@@ -21941,7 +22218,7 @@
 
 fi
 
-echo "$as_me:21944: checking if you want check for redundant name-change" >&5
+echo "$as_me:22221: checking if you want check for redundant name-change" >&5
 echo $ECHO_N "checking if you want check for redundant name-change... $ECHO_C" >&6
 
 # Check whether --enable-samename or --disable-samename was given.
@@ -21958,14 +22235,14 @@
 	enable_samename=yes
 
 fi;
-echo "$as_me:21961: result: $enable_samename" >&5
+echo "$as_me:22238: result: $enable_samename" >&5
 echo "${ECHO_T}$enable_samename" >&6
 test "$enable_samename" = no &&
 cat >>confdefs.h <<\EOF
 #define OPT_SAME_NAME 0
 EOF
 
-echo "$as_me:21968: checking if you want support for selection-actions" >&5
+echo "$as_me:22245: checking if you want support for selection-actions" >&5
 echo $ECHO_N "checking if you want support for selection-actions... $ECHO_C" >&6
 
 # Check whether --enable-selection-ops or --disable-selection-ops was given.
@@ -21982,14 +22259,14 @@
 	enable_selection_ops=yes
 
 fi;
-echo "$as_me:21985: result: $enable_selection_ops" >&5
+echo "$as_me:22262: result: $enable_selection_ops" >&5
 echo "${ECHO_T}$enable_selection_ops" >&6
 test "$enable_selection_ops" = no &&
 cat >>confdefs.h <<\EOF
 #define OPT_SELECTION_OPS 0
 EOF
 
-echo "$as_me:21992: checking if you want support for session management" >&5
+echo "$as_me:22269: checking if you want support for session management" >&5
 echo $ECHO_N "checking if you want support for session management... $ECHO_C" >&6
 
 # Check whether --enable-session-mgt or --disable-session-mgt was given.
@@ -22006,14 +22283,14 @@
 	enable_session_mgt=yes
 
 fi;
-echo "$as_me:22009: result: $enable_session_mgt" >&5
+echo "$as_me:22286: result: $enable_session_mgt" >&5
 echo "${ECHO_T}$enable_session_mgt" >&6
 test "$enable_session_mgt" = no &&
 cat >>confdefs.h <<\EOF
 #define OPT_SESSION_MGT 0
 EOF
 
-echo "$as_me:22016: checking if you want support for status-line" >&5
+echo "$as_me:22293: checking if you want support for status-line" >&5
 echo $ECHO_N "checking if you want support for status-line... $ECHO_C" >&6
 
 # Check whether --enable-status-line or --disable-status-line was given.
@@ -22030,14 +22307,14 @@
 	enable_status_line=no
 
 fi;
-echo "$as_me:22033: result: $enable_status_line" >&5
+echo "$as_me:22310: result: $enable_status_line" >&5
 echo "${ECHO_T}$enable_status_line" >&6
 test "$enable_status_line" = yes &&
 cat >>confdefs.h <<\EOF
 #define OPT_STATUS_LINE 1
 EOF
 
-echo "$as_me:22040: checking if you want to use termcap function-keys" >&5
+echo "$as_me:22317: checking if you want to use termcap function-keys" >&5
 echo $ECHO_N "checking if you want to use termcap function-keys... $ECHO_C" >&6
 
 # Check whether --enable-tcap-fkeys or --disable-tcap-fkeys was given.
@@ -22054,14 +22331,14 @@
 	enable_tcap_fkeys=yes
 
 fi;
-echo "$as_me:22057: result: $enable_tcap_fkeys" >&5
+echo "$as_me:22334: result: $enable_tcap_fkeys" >&5
 echo "${ECHO_T}$enable_tcap_fkeys" >&6
 test "$enable_tcap_fkeys" = no &&
 cat >>confdefs.h <<\EOF
 #define OPT_TCAP_FKEYS 0
 EOF
 
-echo "$as_me:22064: checking if you want to use termcap-query/report" >&5
+echo "$as_me:22341: checking if you want to use termcap-query/report" >&5
 echo $ECHO_N "checking if you want to use termcap-query/report... $ECHO_C" >&6
 
 # Check whether --enable-tcap-query or --disable-tcap-query was given.
@@ -22078,14 +22355,14 @@
 	enable_tcap_query=yes
 
 fi;
-echo "$as_me:22081: result: $enable_tcap_query" >&5
+echo "$as_me:22358: result: $enable_tcap_query" >&5
 echo "${ECHO_T}$enable_tcap_query" >&6
 test "$enable_tcap_query" = no &&
 cat >>confdefs.h <<\EOF
 #define OPT_TCAP_QUERY 0
 EOF
 
-echo "$as_me:22088: checking if you want support for tek4014" >&5
+echo "$as_me:22365: checking if you want support for tek4014" >&5
 echo $ECHO_N "checking if you want support for tek4014... $ECHO_C" >&6
 
 # Check whether --enable-tek4014 or --disable-tek4014 was given.
@@ -22102,7 +22379,7 @@
 	enable_tek4014=yes
 
 fi;
-echo "$as_me:22105: result: $enable_tek4014" >&5
+echo "$as_me:22382: result: $enable_tek4014" >&5
 echo "${ECHO_T}$enable_tek4014" >&6
 if test "$enable_tek4014" = no ; then
 
@@ -22116,7 +22393,7 @@
 	EXTRAOBJS="$EXTRAOBJS TekPrsTbl.o Tekproc.o"
 fi
 
-echo "$as_me:22119: checking if you want pulldown menus with a toolbar" >&5
+echo "$as_me:22396: checking if you want pulldown menus with a toolbar" >&5
 echo $ECHO_N "checking if you want pulldown menus with a toolbar... $ECHO_C" >&6
 
 # Check whether --enable-toolbar or --disable-toolbar was given.
@@ -22133,7 +22410,7 @@
 	enable_toolbar=no
 
 fi;
-echo "$as_me:22136: result: $enable_toolbar" >&5
+echo "$as_me:22413: result: $enable_toolbar" >&5
 echo "${ECHO_T}$enable_toolbar" >&6
 if test "$enable_toolbar" = yes ; then
 
@@ -22143,7 +22420,7 @@
 
 fi
 
-echo "$as_me:22146: checking if you want VT52 emulation" >&5
+echo "$as_me:22423: checking if you want VT52 emulation" >&5
 echo $ECHO_N "checking if you want VT52 emulation... $ECHO_C" >&6
 
 # Check whether --enable-vt52 or --disable-vt52 was given.
@@ -22160,14 +22437,14 @@
 	enable_vt52=yes
 
 fi;
-echo "$as_me:22163: result: $enable_vt52" >&5
+echo "$as_me:22440: result: $enable_vt52" >&5
 echo "${ECHO_T}$enable_vt52" >&6
 test "$enable_vt52" = no &&
 cat >>confdefs.h <<\EOF
 #define OPT_VT52_MODE 0
 EOF
 
-echo "$as_me:22170: checking if you want wide-attribute support" >&5
+echo "$as_me:22447: checking if you want wide-attribute support" >&5
 echo $ECHO_N "checking if you want wide-attribute support... $ECHO_C" >&6
 
 # Check whether --enable-wide-attrs or --disable-wide-attrs was given.
@@ -22184,16 +22461,16 @@
 	enable_wattr=yes
 
 fi;
-echo "$as_me:22187: result: $enable_wattr" >&5
+echo "$as_me:22464: result: $enable_wattr" >&5
 echo "${ECHO_T}$enable_wattr" >&6
 
 if test x$enable_wattr = xno && test x$enable_direct_color = xyes ; then
-	{ echo "$as_me:22191: WARNING: overriding wide-attributes to support direct color" >&5
+	{ echo "$as_me:22468: WARNING: overriding wide-attributes to support direct color" >&5
 echo "$as_me: WARNING: overriding wide-attributes to support direct color" >&2;}
 	enable_wattr=yes
 fi
 
-echo "$as_me:22196: checking if you want wide-character support" >&5
+echo "$as_me:22473: checking if you want wide-character support" >&5
 echo $ECHO_N "checking if you want wide-character support... $ECHO_C" >&6
 
 # Check whether --enable-wide-chars or --disable-wide-chars was given.
@@ -22210,14 +22487,14 @@
 	enable_wchar=yes
 
 fi;
-echo "$as_me:22213: result: $enable_wchar" >&5
+echo "$as_me:22490: result: $enable_wchar" >&5
 echo "${ECHO_T}$enable_wchar" >&6
 test "x$enable_wattr" = xno &&
 cat >>confdefs.h <<\EOF
 #define OPT_WIDE_ATTRS 0
 EOF
 
-echo "$as_me:22220: checking if you want only 16-bit character support" >&5
+echo "$as_me:22497: checking if you want only 16-bit character support" >&5
 echo $ECHO_N "checking if you want only 16-bit character support... $ECHO_C" >&6
 
 # Check whether --enable-16bit-chars or --disable-16bit-chars was given.
@@ -22234,7 +22511,7 @@
 	enable_16bit_chars=no
 
 fi;
-echo "$as_me:22237: result: $enable_16bit_chars" >&5
+echo "$as_me:22514: result: $enable_16bit_chars" >&5
 echo "${ECHO_T}$enable_16bit_chars" >&6
 
 if test "$enable_16bit_chars" = yes ; then
@@ -22248,7 +22525,7 @@
 
 if test "$enable_wchar" = yes ; then
 
-echo "$as_me:22251: checking if you want to use mini-luit/Latin9 built-in support" >&5
+echo "$as_me:22528: checking if you want to use mini-luit/Latin9 built-in support" >&5
 echo $ECHO_N "checking if you want to use mini-luit/Latin9 built-in support... $ECHO_C" >&6
 
 # Check whether --enable-mini-luit or --disable-mini-luit was given.
@@ -22265,7 +22542,7 @@
 	enable_mini_luit=no
 
 fi;
-echo "$as_me:22268: result: $enable_mini_luit" >&5
+echo "$as_me:22545: result: $enable_mini_luit" >&5
 echo "${ECHO_T}$enable_mini_luit" >&6
 if test "$enable_mini_luit" = yes ; then
 
@@ -22275,7 +22552,7 @@
 
 fi
 
-echo "$as_me:22278: checking if you want to use luit" >&5
+echo "$as_me:22555: checking if you want to use luit" >&5
 echo $ECHO_N "checking if you want to use luit... $ECHO_C" >&6
 
 # Check whether --enable-luit or --disable-luit was given.
@@ -22292,7 +22569,7 @@
 	enable_luit=yes
 
 fi;
-echo "$as_me:22295: result: $enable_luit" >&5
+echo "$as_me:22572: result: $enable_luit" >&5
 echo "${ECHO_T}$enable_luit" >&6
 if test "$enable_luit" = yes ; then
 
@@ -22305,7 +22582,7 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:22308: checking for $ac_word" >&5
+echo "$as_me:22585: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_LUIT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22322,7 +22599,7 @@
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_LUIT="$ac_dir/$ac_word"
-   echo "$as_me:22325: found $ac_dir/$ac_word" >&5
+   echo "$as_me:22602: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -22333,10 +22610,10 @@
 LUIT=$ac_cv_path_LUIT
 
 if test -n "$LUIT"; then
-  echo "$as_me:22336: result: $LUIT" >&5
+  echo "$as_me:22613: result: $LUIT" >&5
 echo "${ECHO_T}$LUIT" >&6
 else
-  echo "$as_me:22339: result: no" >&5
+  echo "$as_me:22616: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -22395,7 +22672,7 @@
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:22398: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:22675: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define LUIT_PATH "$cf_path_prog"
@@ -22419,7 +22696,7 @@
 	EXTRAOBJS="$EXTRAOBJS charclass.o precompose.o wcwidth.o"
 fi
 
-echo "$as_me:22422: checking if you want dynamic-abbreviation support" >&5
+echo "$as_me:22699: checking if you want dynamic-abbreviation support" >&5
 echo $ECHO_N "checking if you want dynamic-abbreviation support... $ECHO_C" >&6
 
 # Check whether --enable-dabbrev or --disable-dabbrev was given.
@@ -22436,7 +22713,7 @@
 	enable_dabbrev=no
 
 fi;
-echo "$as_me:22439: result: $enable_dabbrev" >&5
+echo "$as_me:22716: result: $enable_dabbrev" >&5
 echo "${ECHO_T}$enable_dabbrev" >&6
 if test "$enable_dabbrev" = yes ; then
 
@@ -22446,7 +22723,7 @@
 
 fi
 
-echo "$as_me:22449: checking if you want DECterm Locator support" >&5
+echo "$as_me:22726: checking if you want DECterm Locator support" >&5
 echo $ECHO_N "checking if you want DECterm Locator support... $ECHO_C" >&6
 
 # Check whether --enable-dec-locator or --disable-dec-locator was given.
@@ -22463,7 +22740,7 @@
 	enable_dec_locator=no
 
 fi;
-echo "$as_me:22466: result: $enable_dec_locator" >&5
+echo "$as_me:22743: result: $enable_dec_locator" >&5
 echo "${ECHO_T}$enable_dec_locator" >&6
 if test "$enable_dec_locator" = yes ; then
 
@@ -22473,7 +22750,7 @@
 
 fi
 
-echo "$as_me:22476: checking if you want XHTML and SVG screen dump support" >&5
+echo "$as_me:22753: checking if you want XHTML and SVG screen dump support" >&5
 echo $ECHO_N "checking if you want XHTML and SVG screen dump support... $ECHO_C" >&6
 
 # Check whether --enable-screen-dumps or --disable-screen-dumps was given.
@@ -22490,7 +22767,7 @@
 	enable_screen_dumps=yes
 
 fi;
-echo "$as_me:22493: result: $enable_screen_dumps" >&5
+echo "$as_me:22770: result: $enable_screen_dumps" >&5
 echo "${ECHO_T}$enable_screen_dumps" >&6
 if test "$enable_screen_dumps" = yes ; then
 	EXTRASRCS="$EXTRASRCS html.c svg.c"
@@ -22503,7 +22780,7 @@
 
 fi
 
-echo "$as_me:22506: checking if you want ReGIS graphics support" >&5
+echo "$as_me:22783: checking if you want ReGIS graphics support" >&5
 echo $ECHO_N "checking if you want ReGIS graphics support... $ECHO_C" >&6
 
 # Check whether --enable-regis-graphics or --disable-regis-graphics was given.
@@ -22520,7 +22797,7 @@
 	enable_regis_graphics=no
 
 fi;
-echo "$as_me:22523: result: $enable_regis_graphics" >&5
+echo "$as_me:22800: result: $enable_regis_graphics" >&5
 echo "${ECHO_T}$enable_regis_graphics" >&6
 if test "$enable_regis_graphics" = yes ; then
 
@@ -22532,19 +22809,19 @@
 	EXTRASRCS="$EXTRASRCS graphics_regis.c"
 	EXTRAOBJS="$EXTRAOBJS graphics_regis.o"
 
-echo "$as_me:22535: checking if -lm needed for math functions" >&5
+echo "$as_me:22812: checking if -lm needed for math functions" >&5
 echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6
 if test "${cf_cv_need_libm+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 22542 "configure"
+#line 22819 "configure"
 #include "confdefs.h"
 
-	#include <stdio.h>
-	#include <stdlib.h>
-	#include <math.h>
+		#include <stdio.h>
+		#include <stdlib.h>
+		#include <math.h>
 
 int
 main (void)
@@ -22555,16 +22832,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22558: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22835: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22561: \$? = $ac_status" >&5
+  echo "$as_me:22838: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22564: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22841: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22567: \$? = $ac_status" >&5
+  echo "$as_me:22844: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libm=no
 else
@@ -22574,11 +22851,63 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22577: result: $cf_cv_need_libm" >&5
+echo "$as_me:22854: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
+
 if test "$cf_cv_need_libm" = yes
 then
 
+	cf_save_LIBS="$LIBS"
+	LIBS="$LIBS -lm"
+	echo "$as_me:22862: checking if -lm is available for math functions" >&5
+echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6
+if test "${cf_cv_have_libm+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+	cat >"conftest.$ac_ext" <<_ACEOF
+#line 22869 "configure"
+#include "confdefs.h"
+
+		#include <stdio.h>
+		#include <stdlib.h>
+		#include <math.h>
+
+int
+main (void)
+{
+double x = rand(); printf("result = %g\\n", sin(x))
+  ;
+  return 0;
+}
+_ACEOF
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:22885: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:22888: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:22891: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:22894: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  cf_cv_have_libm=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat "conftest.$ac_ext" >&5
+cf_cv_have_libm=no
+fi
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+fi
+echo "$as_me:22904: result: $cf_cv_have_libm" >&5
+echo "${ECHO_T}$cf_cv_have_libm" >&6
+	LIBS="$cf_save_LIBS"
+
+	if test "$cf_cv_have_libm" = yes
+	then
+
 cf_add_libs="$LIBS"
 # reverse order
 cf_add_0lib=
@@ -22595,11 +22924,23 @@
 done
 LIBS="$cf_add_libs"
 
+	fi
+else
+	cf_cv_have_libm=yes
+fi
+
+if test "$cf_cv_have_libm" = yes
+then
+
+cat >>confdefs.h <<\EOF
+#define HAVE_MATH_FUNCS 1
+EOF
+
 fi
 
 fi
 
-echo "$as_me:22602: checking if you want sixel graphics support" >&5
+echo "$as_me:22943: checking if you want sixel graphics support" >&5
 echo $ECHO_N "checking if you want sixel graphics support... $ECHO_C" >&6
 
 # Check whether --enable-sixel-graphics or --disable-sixel-graphics was given.
@@ -22616,7 +22957,7 @@
 	enable_sixel_graphics=yes
 
 fi;
-echo "$as_me:22619: result: $enable_sixel_graphics" >&5
+echo "$as_me:22960: result: $enable_sixel_graphics" >&5
 echo "${ECHO_T}$enable_sixel_graphics" >&6
 if test "$enable_sixel_graphics" = yes ; then
 
@@ -22640,7 +22981,7 @@
 	EXTRAOBJS="$EXTRAOBJS graphics.o"
 fi
 
-echo "$as_me:22643: checking if you want sixel screen dump support" >&5
+echo "$as_me:22984: checking if you want sixel screen dump support" >&5
 echo $ECHO_N "checking if you want sixel screen dump support... $ECHO_C" >&6
 
 # Check whether --enable-print-graphics or --disable-print-graphics was given.
@@ -22657,7 +22998,7 @@
 	enable_print_graphics=$enable_regis_graphics
 
 fi;
-echo "$as_me:22660: result: $enable_print_graphics" >&5
+echo "$as_me:23001: result: $enable_print_graphics" >&5
 echo "${ECHO_T}$enable_print_graphics" >&6
 if test "$enable_print_graphics" = yes ; then
 
@@ -22667,7 +23008,7 @@
 
 fi
 
-echo "$as_me:22670: checking if you want VT420 rectangle support" >&5
+echo "$as_me:23011: checking if you want VT420 rectangle support" >&5
 echo $ECHO_N "checking if you want VT420 rectangle support... $ECHO_C" >&6
 
 # Check whether --enable-rectangles or --disable-rectangles was given.
@@ -22684,7 +23025,7 @@
 	enable_rectangles=yes
 
 fi;
-echo "$as_me:22687: result: $enable_rectangles" >&5
+echo "$as_me:23028: result: $enable_rectangles" >&5
 echo "${ECHO_T}$enable_rectangles" >&6
 if test "$enable_rectangles" = no ; then
 
@@ -22694,7 +23035,7 @@
 
 fi
 
-echo "$as_me:22697: checking if you want -ziconbeep option" >&5
+echo "$as_me:23038: checking if you want -ziconbeep option" >&5
 echo $ECHO_N "checking if you want -ziconbeep option... $ECHO_C" >&6
 
 # Check whether --enable-ziconbeep or --disable-ziconbeep was given.
@@ -22711,7 +23052,7 @@
 	enable_ziconbeep=yes
 
 fi;
-echo "$as_me:22714: result: $enable_ziconbeep" >&5
+echo "$as_me:23055: result: $enable_ziconbeep" >&5
 echo "${ECHO_T}$enable_ziconbeep" >&6
 test "$enable_ziconbeep" = no &&
 cat >>confdefs.h <<\EOF
@@ -22720,7 +23061,7 @@
 
 ###############################################################################
 
-echo "$as_me:22723: checking if you want debugging traces" >&5
+echo "$as_me:23064: checking if you want debugging traces" >&5
 echo $ECHO_N "checking if you want debugging traces... $ECHO_C" >&6
 
 # Check whether --enable-trace or --disable-trace was given.
@@ -22737,7 +23078,7 @@
 	enable_trace=no
 
 fi;
-echo "$as_me:22740: result: $enable_trace" >&5
+echo "$as_me:23081: result: $enable_trace" >&5
 echo "${ECHO_T}$enable_trace" >&6
 if test "$enable_trace" = yes ; then
 
@@ -22749,7 +23090,7 @@
 	EXTRAOBJS="$EXTRAOBJS trace.o"
 fi
 
-echo "$as_me:22752: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:23093: checking if you want to use dmalloc for testing" >&5
 echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6
 
 # Check whether --with-dmalloc or --without-dmalloc was given.
@@ -22771,7 +23112,7 @@
 else
   with_dmalloc=
 fi;
-echo "$as_me:22774: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:23115: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -22885,23 +23226,23 @@
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:22888: checking for dmalloc.h" >&5
+	echo "$as_me:23229: checking for dmalloc.h" >&5
 echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6
 if test "${ac_cv_header_dmalloc_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22894 "configure"
+#line 23235 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:22898: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23239: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:22904: \$? = $ac_status" >&5
+  echo "$as_me:23245: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22920,11 +23261,11 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:22923: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:23264: result: $ac_cv_header_dmalloc_h" >&5
 echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6
 if test "$ac_cv_header_dmalloc_h" = yes; then
 
-echo "$as_me:22927: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:23268: checking for dmalloc_debug in -ldmalloc" >&5
 echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6
 if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22932,7 +23273,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22935 "configure"
+#line 23276 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22951,16 +23292,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22954: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23295: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22957: \$? = $ac_status" >&5
+  echo "$as_me:23298: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22960: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23301: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22963: \$? = $ac_status" >&5
+  echo "$as_me:23304: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -22971,7 +23312,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22974: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:23315: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
 if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then
   cat >>confdefs.h <<EOF
@@ -22986,7 +23327,7 @@
 
 fi
 
-echo "$as_me:22989: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:23330: checking if you want to use dbmalloc for testing" >&5
 echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6
 
 # Check whether --with-dbmalloc or --without-dbmalloc was given.
@@ -23008,7 +23349,7 @@
 else
   with_dbmalloc=
 fi;
-echo "$as_me:23011: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:23352: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -23122,23 +23463,23 @@
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:23125: checking for dbmalloc.h" >&5
+	echo "$as_me:23466: checking for dbmalloc.h" >&5
 echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6
 if test "${ac_cv_header_dbmalloc_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23131 "configure"
+#line 23472 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:23135: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23476: \"$ac_cpp "conftest.$ac_ext"\"") >&5
   (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   $EGREP -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:23141: \$? = $ac_status" >&5
+  echo "$as_me:23482: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23157,11 +23498,11 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23160: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:23501: result: $ac_cv_header_dbmalloc_h" >&5
 echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6
 if test "$ac_cv_header_dbmalloc_h" = yes; then
 
-echo "$as_me:23164: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:23505: checking for debug_malloc in -ldbmalloc" >&5
 echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6
 if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -23169,7 +23510,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23172 "configure"
+#line 23513 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23188,16 +23529,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23191: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23532: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23194: \$? = $ac_status" >&5
+  echo "$as_me:23535: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23197: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23538: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23200: \$? = $ac_status" >&5
+  echo "$as_me:23541: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -23208,7 +23549,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23211: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:23552: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
 if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then
   cat >>confdefs.h <<EOF
@@ -23223,7 +23564,7 @@
 
 fi
 
-echo "$as_me:23226: checking if you want to use valgrind for testing" >&5
+echo "$as_me:23567: checking if you want to use valgrind for testing" >&5
 echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6
 
 # Check whether --with-valgrind or --without-valgrind was given.
@@ -23245,7 +23586,7 @@
 else
   with_valgrind=
 fi;
-echo "$as_me:23248: result: ${with_valgrind:-no}" >&5
+echo "$as_me:23589: result: ${with_valgrind:-no}" >&5
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case ".$with_cflags" in
@@ -23358,7 +23699,7 @@
 	;;
 esac
 
-echo "$as_me:23361: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:23702: checking if you want to perform memory-leak testing" >&5
 echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6
 
 # Check whether --enable-leaks or --disable-leaks was given.
@@ -23369,7 +23710,7 @@
   enable_leaks=yes
 fi;
 if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
-echo "$as_me:23372: result: $with_no_leaks" >&5
+echo "$as_me:23713: result: $with_no_leaks" >&5
 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$enable_leaks" = no ; then
@@ -23384,7 +23725,7 @@
 
 fi
 
-echo "$as_me:23387: checking if you want to see long compiling messages" >&5
+echo "$as_me:23728: checking if you want to see long compiling messages" >&5
 echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6
 
 # Check whether --enable-echo or --disable-echo was given.
@@ -23418,10 +23759,10 @@
 	ECHO_CC=''
 
 fi;
-echo "$as_me:23421: result: $enableval" >&5
+echo "$as_me:23762: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:23424: checking if you want magic cookie emulation" >&5
+echo "$as_me:23765: checking if you want magic cookie emulation" >&5
 echo $ECHO_N "checking if you want magic cookie emulation... $ECHO_C" >&6
 
 # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given.
@@ -23438,7 +23779,7 @@
 	enable_xmc=no
 
 fi;
-echo "$as_me:23441: result: $enable_xmc" >&5
+echo "$as_me:23782: result: $enable_xmc" >&5
 echo "${ECHO_T}$enable_xmc" >&6
 if test "$enable_xmc" = yes ; then
 
@@ -23453,13 +23794,13 @@
 for ac_func in tigetstr
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:23456: checking for $ac_func" >&5
+echo "$as_me:23797: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23462 "configure"
+#line 23803 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23490,16 +23831,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23493: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23834: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23496: \$? = $ac_status" >&5
+  echo "$as_me:23837: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23499: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23840: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23502: \$? = $ac_status" >&5
+  echo "$as_me:23843: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -23509,7 +23850,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23512: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:23853: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23524,13 +23865,13 @@
 for ac_func in use_extended_names
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:23527: checking for $ac_func" >&5
+echo "$as_me:23868: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23533 "configure"
+#line 23874 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23561,16 +23902,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23564: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23905: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23567: \$? = $ac_status" >&5
+  echo "$as_me:23908: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23570: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23911: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23573: \$? = $ac_status" >&5
+  echo "$as_me:23914: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -23580,7 +23921,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23583: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:23924: result: `eval echo '${'"$as_ac_var"'}'`" >&5
 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then
   cat >>confdefs.h <<EOF
@@ -23592,7 +23933,7 @@
 
 fi
 
-echo "$as_me:23595: checking if you want to use C11 _Noreturn feature" >&5
+echo "$as_me:23936: checking if you want to use C11 _Noreturn feature" >&5
 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
 
 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.
@@ -23609,17 +23950,17 @@
 	enable_stdnoreturn=no
 
 fi;
-echo "$as_me:23612: result: $enable_stdnoreturn" >&5
+echo "$as_me:23953: result: $enable_stdnoreturn" >&5
 echo "${ECHO_T}$enable_stdnoreturn" >&6
 
 if test $enable_stdnoreturn = yes; then
-echo "$as_me:23616: checking for C11 _Noreturn feature" >&5
+echo "$as_me:23957: checking for C11 _Noreturn feature" >&5
 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6
 if test "${cf_cv_c11_noreturn+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23622 "configure"
+#line 23963 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -23636,16 +23977,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23639: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23980: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23642: \$? = $ac_status" >&5
+  echo "$as_me:23983: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23645: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23986: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23648: \$? = $ac_status" >&5
+  echo "$as_me:23989: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_c11_noreturn=yes
 else
@@ -23656,7 +23997,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:23659: result: $cf_cv_c11_noreturn" >&5
+echo "$as_me:24000: result: $cf_cv_c11_noreturn" >&5
 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
 	cf_cv_c11_noreturn=no,
@@ -23712,16 +24053,16 @@
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:23715: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:24056: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:23720: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:24061: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:23724: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:24065: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -23760,16 +24101,16 @@
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:23763: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:24104: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:23768: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:24109: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:23772: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:24113: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -23808,23 +24149,23 @@
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:23811: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:24152: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:23816: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:24157: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:23820: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:24161: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:23827: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:24168: checking if you want to turn on gcc warnings" >&5
 echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6
 
 # Check whether --enable-warnings or --disable-warnings was given.
@@ -23841,7 +24182,7 @@
 	enable_warnings=no
 
 fi;
-echo "$as_me:23844: result: $enable_warnings" >&5
+echo "$as_me:24185: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -23864,10 +24205,10 @@
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:23867: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:24208: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 23870 "${as_me:-configure}"
+#line 24211 "${as_me:-configure}"
 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"
@@ -23916,12 +24257,12 @@
 			;;
 		esac
 
-		if { (eval echo "$as_me:23919: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:24260: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23922: \$? = $ac_status" >&5
+  echo "$as_me:24263: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:23924: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:24265: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -23999,7 +24340,7 @@
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 24002 "configure"
+#line 24343 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -24014,26 +24355,26 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24017: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24358: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24020: \$? = $ac_status" >&5
+  echo "$as_me:24361: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24023: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24364: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24026: \$? = $ac_status" >&5
+  echo "$as_me:24367: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:24029: checking for X11/Xt const-feature" >&5
+echo "$as_me:24370: checking for X11/Xt const-feature" >&5
 echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6
 if test "${cf_cv_const_x_string+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24036 "configure"
+#line 24377 "configure"
 #include "confdefs.h"
 
 #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
@@ -24050,16 +24391,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24053: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24394: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24056: \$? = $ac_status" >&5
+  echo "$as_me:24397: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24059: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24400: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24062: \$? = $ac_status" >&5
+  echo "$as_me:24403: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -24074,7 +24415,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:24077: result: $cf_cv_const_x_string" >&5
+echo "$as_me:24418: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -24103,7 +24444,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 24106 "${as_me:-configure}"
+#line 24447 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -24119,7 +24460,7 @@
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:24122: checking for $CC warning options..." >&5
+	{ echo "$as_me:24463: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -24135,12 +24476,12 @@
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:24138: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:24479: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24141: \$? = $ac_status" >&5
+  echo "$as_me:24482: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:24143: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:24484: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -24148,7 +24489,7 @@
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:24151: checking for $CC warning options..." >&5
+	{ echo "$as_me:24492: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -24171,12 +24512,12 @@
 		Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wdeclaration-after-statement Wextra Wno-unknown-pragmas Wswitch-enum Wno-cast-qual
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:24174: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:24515: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24177: \$? = $ac_status" >&5
+  echo "$as_me:24518: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:24179: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:24520: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -24184,7 +24525,7 @@
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:24187: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:24528: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -24194,7 +24535,7 @@
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:24197: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:24538: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -24248,7 +24589,7 @@
 	CPPFLAGS=`echo "$CPPFLAGS" | sed -e s/-D$cf_def//`
 done
 
-echo "$as_me:24251: checking if filesystem supports mixed-case filenames" >&5
+echo "$as_me:24592: checking if filesystem supports mixed-case filenames" >&5
 echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6
 if test "${cf_cv_mixedcase+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -24275,7 +24616,7 @@
 fi
 
 fi
-echo "$as_me:24278: result: $cf_cv_mixedcase" >&5
+echo "$as_me:24619: result: $cf_cv_mixedcase" >&5
 echo "${ECHO_T}$cf_cv_mixedcase" >&6
 test "$cf_cv_mixedcase" = yes &&
 cat >>confdefs.h <<\EOF
@@ -24286,7 +24627,7 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:24289: checking for $ac_word" >&5
+echo "$as_me:24630: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CTAGS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -24301,7 +24642,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CTAGS="$ac_prog"
-echo "$as_me:24304: found $ac_dir/$ac_word" >&5
+echo "$as_me:24645: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -24309,10 +24650,10 @@
 fi
 CTAGS=$ac_cv_prog_CTAGS
 if test -n "$CTAGS"; then
-  echo "$as_me:24312: result: $CTAGS" >&5
+  echo "$as_me:24653: result: $CTAGS" >&5
 echo "${ECHO_T}$CTAGS" >&6
 else
-  echo "$as_me:24315: result: no" >&5
+  echo "$as_me:24656: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -24323,7 +24664,7 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:24326: checking for $ac_word" >&5
+echo "$as_me:24667: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ETAGS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -24338,7 +24679,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ETAGS="$ac_prog"
-echo "$as_me:24341: found $ac_dir/$ac_word" >&5
+echo "$as_me:24682: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -24346,10 +24687,10 @@
 fi
 ETAGS=$ac_cv_prog_ETAGS
 if test -n "$ETAGS"; then
-  echo "$as_me:24349: result: $ETAGS" >&5
+  echo "$as_me:24690: result: $ETAGS" >&5
 echo "${ECHO_T}$ETAGS" >&6
 else
-  echo "$as_me:24352: result: no" >&5
+  echo "$as_me:24693: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -24358,7 +24699,7 @@
 
 # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
 set dummy ${CTAGS:-ctags}; ac_word=$2
-echo "$as_me:24361: checking for $ac_word" >&5
+echo "$as_me:24702: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -24373,7 +24714,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_LOWER_TAGS="yes"
-echo "$as_me:24376: found $ac_dir/$ac_word" >&5
+echo "$as_me:24717: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -24382,17 +24723,17 @@
 fi
 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
 if test -n "$MAKE_LOWER_TAGS"; then
-  echo "$as_me:24385: result: $MAKE_LOWER_TAGS" >&5
+  echo "$as_me:24726: result: $MAKE_LOWER_TAGS" >&5
 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
 else
-  echo "$as_me:24388: result: no" >&5
+  echo "$as_me:24729: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 if test "$cf_cv_mixedcase" = yes ; then
 	# Extract the first word of "${ETAGS:-etags}", so it can be a program name with args.
 set dummy ${ETAGS:-etags}; ac_word=$2
-echo "$as_me:24395: checking for $ac_word" >&5
+echo "$as_me:24736: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -24407,7 +24748,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_UPPER_TAGS="yes"
-echo "$as_me:24410: found $ac_dir/$ac_word" >&5
+echo "$as_me:24751: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -24416,10 +24757,10 @@
 fi
 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
 if test -n "$MAKE_UPPER_TAGS"; then
-  echo "$as_me:24419: result: $MAKE_UPPER_TAGS" >&5
+  echo "$as_me:24760: result: $MAKE_UPPER_TAGS" >&5
 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
 else
-  echo "$as_me:24422: result: no" >&5
+  echo "$as_me:24763: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -24442,7 +24783,7 @@
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then
-	echo "$as_me:24445: checking for an rpath option" >&5
+	echo "$as_me:24786: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	case "$cf_cv_system_name" in
 	(irix*)
@@ -24473,12 +24814,12 @@
 	(*)
 		;;
 	esac
-	echo "$as_me:24476: result: $LD_RPATH_OPT" >&5
+	echo "$as_me:24817: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 	case "x$LD_RPATH_OPT" in
 	(x-R*)
-		echo "$as_me:24481: checking if we need a space after rpath option" >&5
+		echo "$as_me:24822: checking if we need a space after rpath option" >&5
 echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
 		cf_save_LIBS="$LIBS"
 
@@ -24499,7 +24840,7 @@
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 24502 "configure"
+#line 24843 "configure"
 #include "confdefs.h"
 
 int
@@ -24511,16 +24852,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24514: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24855: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24517: \$? = $ac_status" >&5
+  echo "$as_me:24858: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24520: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24861: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24523: \$? = $ac_status" >&5
+  echo "$as_me:24864: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_space=no
 else
@@ -24530,14 +24871,14 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 		LIBS="$cf_save_LIBS"
-		echo "$as_me:24533: result: $cf_rpath_space" >&5
+		echo "$as_me:24874: result: $cf_rpath_space" >&5
 echo "${ECHO_T}$cf_rpath_space" >&6
 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
 		;;
 	esac
 fi
 
-echo "$as_me:24540: checking if rpath-hack should be disabled" >&5
+echo "$as_me:24881: checking if rpath-hack should be disabled" >&5
 echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6
 
 # Check whether --enable-rpath-hack or --disable-rpath-hack was given.
@@ -24555,22 +24896,22 @@
 
 fi;
 if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi
-echo "$as_me:24558: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:24899: result: $cf_disable_rpath_hack" >&5
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 
 if test "$enable_rpath_hack" = yes ; then
 
-echo "$as_me:24563: checking for updated LDFLAGS" >&5
+echo "$as_me:24904: checking for updated LDFLAGS" >&5
 echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
 if test -n "$LD_RPATH_OPT" ; then
-	echo "$as_me:24566: result: maybe" >&5
+	echo "$as_me:24907: result: maybe" >&5
 echo "${ECHO_T}maybe" >&6
 
 	for ac_prog in ldd
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:24573: checking for $ac_word" >&5
+echo "$as_me:24914: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -24585,7 +24926,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_cf_ldd_prog="$ac_prog"
-echo "$as_me:24588: found $ac_dir/$ac_word" >&5
+echo "$as_me:24929: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -24593,10 +24934,10 @@
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:24596: result: $cf_ldd_prog" >&5
+  echo "$as_me:24937: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:24599: result: no" >&5
+  echo "$as_me:24940: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -24610,7 +24951,7 @@
 		cf_rpath_oops=
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 24613 "configure"
+#line 24954 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24622,16 +24963,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24625: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24966: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24628: \$? = $ac_status" >&5
+  echo "$as_me:24969: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24631: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24972: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24634: \$? = $ac_status" >&5
+  echo "$as_me:24975: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
 		 cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
@@ -24659,7 +25000,7 @@
 					then
 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
 
-echo "${as_me:-configure}:24662: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:25003: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 
 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
 						break
@@ -24671,11 +25012,11 @@
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:24674: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:25015: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:24678: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:25019: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -24712,7 +25053,7 @@
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:24715: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:25056: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -24725,11 +25066,11 @@
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:24728: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:25069: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:24732: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:25073: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -24766,7 +25107,7 @@
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:24769: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:25110: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -24779,14 +25120,14 @@
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:24782: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:25123: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:24786: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:25127: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 else
-	echo "$as_me:24789: result: no" >&5
+	echo "$as_me:25130: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -24881,7 +25222,7 @@
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:24884: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:25225: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -25057,7 +25398,7 @@
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:25060: error: ambiguous option: $1
+    { { echo "$as_me:25401: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -25076,7 +25417,7 @@
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:25079: error: unrecognized option: $1
+  -*) { { echo "$as_me:25420: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -25115,7 +25456,7 @@
   "df-install" ) CONFIG_FILES="$CONFIG_FILES df-install" ;;
   "minstall" ) CONFIG_FILES="$CONFIG_FILES minstall:minstall.in" ;;
   "xtermcfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS xtermcfg.h:xtermcfg.hin" ;;
-  *) { { echo "$as_me:25118: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:25459: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -25224,6 +25565,7 @@
 s,@LN_S@,$LN_S,;t t
 s,@LINT@,$LINT,;t t
 s,@LINT_OPTS@,$LINT_OPTS,;t t
+s,@LINT_LIBS@,$LINT_LIBS,;t t
 s,@APP_CLASS@,$APP_CLASS,;t t
 s,@APPSDIR@,$APPSDIR,;t t
 s,@no_appsdir@,$no_appsdir,;t t
@@ -25433,7 +25775,7 @@
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:25436: creating $ac_file" >&5
+    { echo "$as_me:25778: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -25451,7 +25793,7 @@
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:25454: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:25796: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -25464,7 +25806,7 @@
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:25467: error: cannot find input file: $f" >&5
+           { { echo "$as_me:25809: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -25480,7 +25822,7 @@
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:25483: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:25825: WARNING: datarootdir was used implicitly but not set:
 $ac_seen" >&5
 echo "$as_me: WARNING: datarootdir was used implicitly but not set:
 $ac_seen" >&2;}
@@ -25489,7 +25831,7 @@
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:25492: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:25834: WARNING: datarootdir was used explicitly but not set:
 $ac_seen" >&5
 echo "$as_me: WARNING: datarootdir was used explicitly but not set:
 $ac_seen" >&2;}
@@ -25526,7 +25868,7 @@
             ac_init=`${EGREP-egrep} '[ 	]*'$ac_name'[ 	]*=' "$ac_file"`
             if test -z "$ac_init"; then
               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
-              { echo "$as_me:25529: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:25871: WARNING: Variable $ac_name is used but was not set:
 $ac_seen" >&5
 echo "$as_me: WARNING: Variable $ac_name is used but was not set:
 $ac_seen" >&2;}
@@ -25537,7 +25879,7 @@
     ${EGREP-egrep} -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>$tmp/out
     if test -s $tmp/out; then
       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
-      { echo "$as_me:25540: WARNING: Some variables may not be substituted:
+      { echo "$as_me:25882: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -25586,7 +25928,7 @@
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:25589: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:25931: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -25597,7 +25939,7 @@
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:25600: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:25942: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -25610,7 +25952,7 @@
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:25613: error: cannot find input file: $f" >&5
+           { { echo "$as_me:25955: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -25728,7 +26070,7 @@
   rm -f $tmp/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:25731: $ac_file is unchanged" >&5
+      { echo "$as_me:26073: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
Index: configure.in
--- xterm-372+/configure.in	2022-02-20 14:18:05.000000000 +0000
+++ xterm-373/configure.in	2022-09-11 22:34:16.000000000 +0000
@@ -1,4 +1,4 @@
-dnl $XTermId: configure.in,v 1.383 2022/02/20 14:18:05 tom Exp $
+dnl $XTermId: configure.in,v 1.387 2022/09/11 22:34:16 tom Exp $
 dnl
 dnl -----------------------------------------------------------------------------
 dnl this file is part of xterm
@@ -104,6 +104,7 @@
 	waitpid \
 	wcswidth \
 	wcwidth )
+CF_MKSTEMP
 CF_UTMP
 CF_STRUCT_LASTLOG
 CF_POSIX_SAVED_IDS
@@ -633,6 +634,16 @@
 AC_MSG_RESULT($enable_boxchars)
 test "$enable_boxchars" = no && AC_DEFINE(OPT_BOX_CHARS,0,[Define to 0 to disable fallback-support for box chars])
 
+AC_MSG_CHECKING(if you want to allow spawning commands to process selections)
+CF_ARG_DISABLE(exec-selection,
+	[  --disable-exec-selection disable "exec-formatted" and "exec-selection" actions],
+	[enable_exec_selection=no],
+	[enable_exec_selection=yes])
+AC_MSG_RESULT($enable_exec_selection)
+if test "$enable_exec_selection" = no ; then
+	AC_DEFINE(OPT_EXEC_SELECTION,0,[Define to 0 to disable "exec-selection" action])
+fi
+
 AC_MSG_CHECKING(if you want to allow spawning new xterms)
 CF_ARG_ENABLE(exec-xterm,
 	[  --enable-exec-xterm     enable "spawn-new-terminal" action],
Index: ctlseqs.ms
--- xterm-372+/ctlseqs.ms	2021-12-26 21:57:14.000000000 +0000
+++ xterm-373/ctlseqs.ms	2022-03-12 20:29:38.000000000 +0000
@@ -1,9 +1,9 @@
 .\"#! troff -ms $1		-*- Nroff -*-
 .\" "Xterm Control Sequences" document
-.\" $XTermId: ctlseqs.ms,v 1.636 2021/12/26 21:57:14 tom Exp $
+.\" $XTermId: ctlseqs.ms,v 1.640 2022/03/12 20:29:38 tom Exp $
 .\"
 .\"
-.\" Copyright 1996-2020,2021 by Thomas E. Dickey
+.\" Copyright 1996-2021,2022 by Thomas E. Dickey
 .\"
 .\"                         All Rights Reserved
 .\"
@@ -69,8 +69,8 @@
 .\"
 .ds XT XTerm
 .ds xt xterm
-.ds LF Patch #371
-.ds RF 2021/12/26
+.ds LF Patch #373
+.ds RF 2022/03/12
 .\"
 .if n .pl 9999v		\" no page breaks in nroff
 .ND
@@ -346,7 +346,7 @@
 Thomas Dickey
 .AI
 XFree86 Project (1996-2006)
-invisible-island.net (2006-2021)
+invisible-island.net (2006-2022)
 updated for \*(XT \*(LF (\*(RF)
 .AU
 .
@@ -3218,6 +3218,12 @@
 .br
 followed by the pasted text, followed by
    \*(Es\*([[\*2\*0\*1\*~.
+.br
+For background and discussion, see the FAQ:
+.ID 2
+.\" https://invisible-island.net/xterm/xterm-paste64.html
+\fIXTerm - bracketed-paste\fP
+.DE
 .
 .Sh "Title Modes"
 .LP
Index: ctlseqs.txt
--- xterm-372+/ctlseqs.txt	2021-12-26 21:57:45.000000000 +0000
+++ xterm-373/ctlseqs.txt	2022-03-12 20:47:06.000000000 +0000
@@ -20,8 +20,8 @@
 
                              Thomas Dickey
                       XFree86 Project (1996-2006)
-                    invisible-island.net (2006-2021)
-               updated for XTerm Patch #371 (2021/12/26)
+                    invisible-island.net (2006-2022)
+               updated for XTerm Patch #373 (2022/03/12)
 
 
 
@@ -2387,6 +2387,10 @@
    ESC [ 2 0 0 ~ ,
 followed by the pasted text, followed by
    ESC [ 2 0 1 ~ .
+For background and discussion, see the FAQ:
+
+  XTerm - bracketed-paste
+
 
 
 Title Modes
Index: cursor.c
--- xterm-372+/cursor.c	2022-02-13 18:20:53.000000000 +0000
+++ xterm-373/cursor.c	2022-09-23 08:13:43.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: cursor.c,v 1.82 2022/02/13 18:20:53 tom Exp $ */
+/* $XTermId: cursor.c,v 1.83 2022/09/23 08:13:43 tom Exp $ */
 
 /*
  * Copyright 2002-2021,2022 by Thomas E. Dickey
@@ -378,13 +378,14 @@
  * DEC 070 does mention the ANSI color text extension saying that it, too, is
  * saved/restored.
  */
+#define ALL_FLAGS (IFlags)(~0)
 #define DECSC_FLAGS (ATTRIBUTES|ORIGIN|PROTECTED)
 
 /*
  * Restore Cursor and Attributes
  */
-void
-CursorRestore2(XtermWidget xw, SavedCursor * sc)
+static void
+CursorRestoreFlags(XtermWidget xw, SavedCursor * sc, IFlags our_flags)
 {
     TScreen *screen = TScreenOf(xw);
 
@@ -399,8 +400,8 @@
 	resetCharsets(screen);
     }
 
-    UIntClr(xw->flags, DECSC_FLAGS);
-    UIntSet(xw->flags, sc->flags & DECSC_FLAGS);
+    UIntClr(xw->flags, our_flags);
+    UIntSet(xw->flags, sc->flags & our_flags);
     if ((xw->flags & ORIGIN)) {
 	CursorSet(screen,
 		  sc->row - screen->top_marg,
@@ -421,11 +422,23 @@
 #endif
 }
 
+/*
+ * Use this entrypoint for the status-line.
+ */
+void
+CursorRestore2(XtermWidget xw, SavedCursor * sc)
+{
+    CursorRestoreFlags(xw, sc, ALL_FLAGS);
+}
+
+/*
+ * Use this entrypoint for the VT100 window.
+ */
 void
 CursorRestore(XtermWidget xw)
 {
     TScreen *screen = TScreenOf(xw);
-    CursorRestore2(xw, &screen->sc[screen->whichBuf]);
+    CursorRestoreFlags(xw, &screen->sc[screen->whichBuf], DECSC_FLAGS);
 }
 
 /*
Index: doublechr.c
--- xterm-372+/doublechr.c	2020-12-10 19:43:26.000000000 +0000
+++ xterm-373/doublechr.c	2022-05-05 22:23:43.000000000 +0000
@@ -1,7 +1,7 @@
-/* $XTermId: doublechr.c,v 1.104 2020/12/10 19:43:26 tom Exp $ */
+/* $XTermId: doublechr.c,v 1.107 2022/05/05 22:23:43 tom Exp $ */
 
 /*
- * Copyright 1997-2019,2020 by Thomas E. Dickey
+ * Copyright 1997-2021,2022 by Thomas E. Dickey
  *
  *                         All Rights Reserved
  *
@@ -342,19 +342,19 @@
 /*
  * Like xterm_DoubleGC(), but returning an Xft font.
  */
-XftFont *
+XTermXftFonts *
 xterm_DoubleFT(XTermDraw * params, unsigned chrset, unsigned attr_flags)
 {
-    XftFont *result;
+    XTermXftFonts *result;
     TScreen *screen = TScreenOf(params->xw);
     unsigned num = (chrset & CSET_DWL);
 
     if ((attr_flags &= BOLD) != 0)
 	num |= 4;
 
-    if ((result = screen->double_xft_fonts[num]) == 0) {
-	result = getDoubleXftFont(params, chrset, attr_flags);
-	screen->double_xft_fonts[num] = result;
+    result = &screen->double_xft_fonts[num];
+    if (XftFp(result) == NULL) {
+	getDoubleXftFont(params, result, chrset, attr_flags);
     }
     return result;
 }
@@ -366,8 +366,9 @@
     unsigned num;
 
     for (num = 0; num < XtNumber(screen->double_xft_fonts); ++num) {
-	closeCachedXft(screen, screen->double_xft_fonts[num]);
-	screen->double_xft_fonts[num] = 0;
+	closeCachedXft(screen, XftFp(&screen->double_xft_fonts[num]));
+	XftFp(&screen->double_xft_fonts[num]) = NULL;
+	XftIs(&screen->double_xft_fonts[num]) = xcEmpty;
     }
 }
 #endif /* OPT_RENDERFONT */
Index: fontutils.c
--- xterm-372+/fontutils.c	2022-02-23 00:46:08.000000000 +0000
+++ xterm-373/fontutils.c	2022-07-20 00:21:20.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: fontutils.c,v 1.712 2022/02/23 00:46:08 tom Exp $ */
+/* $XTermId: fontutils.c,v 1.740 2022/07/20 00:21:20 tom Exp $ */
 
 /*
  * Copyright 1998-2021,2022 by Thomas E. Dickey
@@ -51,6 +51,16 @@
 #include <stdio.h>
 #include <ctype.h>
 
+#define USE_FC_COLOR 0
+#if OPT_RENDERFONT
+#if XftVersion > 20304
+#undef USE_FC_COLOR
+#define USE_FC_COLOR 1
+#endif
+#endif
+
+#define FcOK(func) (func == FcResultMatch)
+
 #define NoFontWarning(data) (data)->warn = fwAlways
 
 #define SetFontWidth(screen,dst,src)  (dst)->f_width = (src)
@@ -159,8 +169,24 @@
 static void fillInFaceSize(XtermWidget, int);
 #endif
 
-#if OPT_SHIFT_FONTS
-static int lookupOneFontSize(XtermWidget, int);
+#if OPT_REPORT_FONTS && OPT_TRACE
+static void
+report_fonts(const char *fmt, ...)
+{
+    va_list ap;
+    va_start(ap, fmt);
+    vfprintf(stdout, fmt, ap);
+    va_end(ap);
+#if OPT_TRACE
+    va_start(ap, fmt);
+    TraceVA(fmt, ap);
+    va_end(ap);
+#endif
+}
+
+#define ReportFonts report_fonts
+#else
+#define ReportFonts printf
 #endif
 
 #if OPT_TRACE
@@ -240,7 +266,7 @@
 	for (e = 0; e < fMAX; ++e) {
 	    XTermXftFonts *data = getMyXftFont(xw, e, screen->menu_font_number);
 	    if (data != 0) {
-		if (data->map.mixed) {
+		if (data->font_info.mixed) {
 		    screen->allow_packing = True;
 		    break;
 		}
@@ -559,7 +585,7 @@
 static Boolean
 open_italic_font(XtermWidget xw, int n, FontNameProperties *fp, XTermFonts * data)
 {
-    static const char *slant[] =
+    static const char *const slant[] =
     {
 	"o",
 	"i"
@@ -577,9 +603,9 @@
 		result = (data->fs != 0);
 #if OPT_REPORT_FONTS
 		if (resource.reportFonts) {
-		    printf("opened italic version of %s:\n\t%s\n",
-			   whichFontEnum((VTFontEnum) n),
-			   name);
+		    ReportFonts("opened italic version of %s:\n\t%s\n",
+				whichFontEnum((VTFontEnum) n),
+				name);
 		}
 #endif
 	    }
@@ -1157,12 +1183,12 @@
 static void
 reportXCharStruct(const char *tag, XCharStruct * cs)
 {
-    printf("\t\t%s:\n", tag);
-    printf("\t\t\tlbearing: %d\n", cs->lbearing);
-    printf("\t\t\trbearing: %d\n", cs->rbearing);
-    printf("\t\t\twidth:    %d\n", cs->width);
-    printf("\t\t\tascent:   %d\n", cs->ascent);
-    printf("\t\t\tdescent:  %d\n", cs->descent);
+    ReportFonts("\t\t%s:\n", tag);
+    ReportFonts("\t\t\tlbearing: %d\n", cs->lbearing);
+    ReportFonts("\t\t\trbearing: %d\n", cs->rbearing);
+    ReportFonts("\t\t\twidth:    %d\n", cs->width);
+    ReportFonts("\t\t\tascent:   %d\n", cs->ascent);
+    ReportFonts("\t\t\tdescent:  %d\n", cs->descent);
 }
 
 static void
@@ -1182,18 +1208,20 @@
 	    last_char = (fs->max_byte1 * 256) + fs->max_char_or_byte2;
 	}
 
-	printf("\t%s: %s\n", tag, NonNull(fnt->fn));
-	printf("\t\tall chars:     %s\n", fs->all_chars_exist ? "yes" : "no");
-	printf("\t\tdefault char:  %d\n", fs->default_char);
-	printf("\t\tdirection:     %d\n", fs->direction);
-	printf("\t\tascent:        %d\n", fs->ascent);
-	printf("\t\tdescent:       %d\n", fs->descent);
-	printf("\t\tfirst char:    %u\n", first_char);
-	printf("\t\tlast char:     %u\n", last_char);
-	printf("\t\tmaximum-chars: %u\n", countGlyphs(fs));
+	ReportFonts("\t%s: %s\n", tag, NonNull(fnt->fn));
+	ReportFonts("\t\tall chars:     %s\n", (fs->all_chars_exist
+						? "yes"
+						: "no"));
+	ReportFonts("\t\tdefault char:  %d\n", fs->default_char);
+	ReportFonts("\t\tdirection:     %d\n", fs->direction);
+	ReportFonts("\t\tascent:        %d\n", fs->ascent);
+	ReportFonts("\t\tdescent:       %d\n", fs->descent);
+	ReportFonts("\t\tfirst char:    %u\n", first_char);
+	ReportFonts("\t\tlast char:     %u\n", last_char);
+	ReportFonts("\t\tmaximum-chars: %u\n", countGlyphs(fs));
 	if (FontLacksMetrics(fnt)) {
-	    printf("\t\tmissing-chars: ?\n");
-	    printf("\t\tpresent-chars: ?\n");
+	    ReportFonts("\t\tmissing-chars: ?\n");
+	    ReportFonts("\t\tpresent-chars: ?\n");
 	} else {
 	    unsigned missing = 0;
 	    unsigned ch;
@@ -1202,12 +1230,12 @@
 		    ++missing;
 		}
 	    }
-	    printf("\t\tmissing-chars: %u\n", missing);
-	    printf("\t\tpresent-chars: %u\n", countGlyphs(fs) - missing);
+	    ReportFonts("\t\tmissing-chars: %u\n", missing);
+	    ReportFonts("\t\tpresent-chars: %u\n", countGlyphs(fs) - missing);
 	}
-	printf("\t\tmin_byte1:     %d\n", fs->min_byte1);
-	printf("\t\tmax_byte1:     %d\n", fs->max_byte1);
-	printf("\t\tproperties:    %d\n", fs->n_properties);
+	ReportFonts("\t\tmin_byte1:     %d\n", fs->min_byte1);
+	ReportFonts("\t\tmax_byte1:     %d\n", fs->max_byte1);
+	ReportFonts("\t\tproperties:    %d\n", fs->n_properties);
 	reportXCharStruct("min_bounds", &(fs->min_bounds));
 	reportXCharStruct("max_bounds", &(fs->max_bounds));
 	/* TODO: report fs->properties and fs->per_char */
@@ -1221,9 +1249,9 @@
 	TScreen *screen = TScreenOf(xw);
 
 	if (fontnum) {
-	    printf("Loaded VTFonts(font%d)\n", fontnum);
+	    ReportFonts("Loaded VTFonts(font%d)\n", fontnum);
 	} else {
-	    printf("Loaded VTFonts(default)\n");
+	    ReportFonts("Loaded VTFonts(default)\n");
 	}
 
 	reportOneVTFont("fNorm", GetNormalFont(screen, fNorm));
@@ -2351,22 +2379,22 @@
 
 #if OPT_RENDERFONT
 
-#define CACHE_XFT(dst,src) if (src.font != 0) {\
-	    int err = checkXftWidth(xw, &(dst[fontnum]), &src);\
+#define CACHE_XFT(data) if (XftFp(data) != NULL) {\
+	    int err = checkXftWidth(xw, data);\
 	    TRACE(("Xft metrics %s[%d] = %d (%d,%d)%s advance %d, actual %d%s%s\n",\
-		#dst,\
+		#data,\
 		fontnum,\
-		src.font->height,\
-		src.font->ascent,\
-		src.font->descent,\
-		((src.font->ascent + src.font->descent) > src.font->height ? "*" : ""),\
-		src.font->max_advance_width,\
-		dst[fontnum].map.min_width,\
-		dst[fontnum].map.mixed ? " mixed" : "",\
+		XftFp(data)->height,\
+		XftFp(data)->ascent,\
+		XftFp(data)->descent,\
+		((XftFp(data)->ascent + XftFp(data)->descent) > XftFp(data)->height ? "*" : ""),\
+		XftFp(data)->max_advance_width,\
+		data->font_info.min_width,\
+		data->font_info.mixed ? " mixed" : "",\
 		err ? " ERROR" : ""));\
 	    if (err) {\
-		xtermCloseXft(screen, &src);\
-		memset((&dst[fontnum]), 0, sizeof(dst[fontnum]));\
+		xtermCloseXft(screen, data);\
+		memset((data), 0, sizeof(*data));\
 		failed += err;\
 	    }\
 	}
@@ -2398,12 +2426,12 @@
 static FcChar32
 xtermXftLastChar(XftFont *xft)
 {
-    FcChar32 this, last, next;
+    FcChar32 temp, last, next;
     FcChar32 map[FC_CHARSET_MAP_SIZE];
     int i;
     last = FcCharSetFirstPage(xft->charset, map, &next);
-    while ((this = FcCharSetNextPage(xft->charset, map, &next)) != FC_CHARSET_DONE)
-	last = this;
+    while ((temp = FcCharSetNextPage(xft->charset, map, &next)) != FC_CHARSET_DONE)
+	last = temp;
     last &= (FcChar32) ~ 0xff;
     for (i = FC_CHARSET_MAP_SIZE - 1; i >= 0; i--) {
 	if (map[i]) {
@@ -2435,7 +2463,7 @@
 static void
 dumpXft(XtermWidget xw, XTermXftFonts *data)
 {
-    XftFont *xft = data->font;
+    XftFont *xft = XftFp(data);
     TScreen *screen = TScreenOf(xw);
     VTwin *win = WhichVWin(screen);
 
@@ -2504,7 +2532,7 @@
  */
 #ifdef FC_COLOR
 #define GetFcBool(pattern, what) \
-    (FcPatternGetBool(pattern, what, 0, &fcbogus) == FcResultMatch)
+    FcOK(FcPatternGetBool(pattern, what, 0, &fcbogus))
 
 static Boolean
 isBogusXft(XftFont *font)
@@ -2514,7 +2542,9 @@
 	FcBool fcbogus;
 	if (GetFcBool(font->pattern, FC_COLOR) && fcbogus) {
 	    TRACE(("...matched color-bitmap font\n"));
+#if !USE_FC_COLOR
 	    result = True;
+#endif
 	} else if (GetFcBool(font->pattern, FC_OUTLINE) && !fcbogus) {
 	    TRACE(("...matched non-outline font\n"));
 	    /* This is legal for regular bitmap fonts - fontconfig attempts to
@@ -2549,11 +2579,11 @@
 {
     Boolean result = False;
 
-    if (FcCharSetHasChar(source->font->charset, c)) {
+    if (FcCharSetHasChar(XftFp(source)->charset, c)) {
 	XGlyphInfo extents;
 
 	result = True;
-	XftTextExtents32(dpy, source->font, &c, 1, &extents);
+	XftTextExtents32(dpy, XftFp(source), &c, 1, &extents);
 	if (*width < extents.width && extents.width <= limit) {
 	    *width = extents.width;
 	}
@@ -2562,11 +2592,11 @@
 }
 
 static int
-checkXftWidth(XtermWidget xw, XTermXftFonts *target, XTermXftFonts *source)
+checkXftWidth(XtermWidget xw, XTermXftFonts *data)
 {
     FcChar32 c;
-    FcChar32 last = xtermXftLastChar(source->font);
-    Dimension limit = (Dimension) source->font->max_advance_width;
+    FcChar32 last = xtermXftLastChar(XftFp(data));
+    Dimension limit = (Dimension) XftFp(data)->max_advance_width;
     Dimension width = 0;
     Dimension width2 = 0;
     int failed = 0;
@@ -2574,10 +2604,8 @@
     Cardinal n;
 #endif
 
-    target->font = source->font;
-    target->pattern = source->pattern;
-    target->map.min_width = 0;
-    target->map.max_width = limit;
+    data->font_info.min_width = 0;
+    data->font_info.max_width = limit;
 
 #if OPT_WIDE_CHARS
     /*
@@ -2586,7 +2614,7 @@
      */
     for (n = 0; n < XtNumber(unicode_boxes) - 1; ++n) {
 	if (!checkedXftWidth(XtDisplay(xw),
-			     source,
+			     data,
 			     limit,
 			     &width2, unicode_boxes[n].code)) {
 	    width2 = 0;
@@ -2628,10 +2656,10 @@
     for (c = 32; c < 256; ++c) {
 	if (CharWidth(TScreenOf(xw), c) <= 0)
 	    continue;
-	if (FcCharSetHasChar(source->font->charset, c)) {
+	if (FcCharSetHasChar(XftFp(data)->charset, c)) {
 	    (void) checkedXftWidth(XtDisplay(xw),
-				   source,
-				   target->map.max_width,
+				   data,
+				   data->font_info.max_width,
 				   &width, c);
 	}
     }
@@ -2643,17 +2671,20 @@
     if (width == 0) {
 	failed = 1;
 	if (last >= 256) {
-	    width = target->map.max_width;
+	    width = data->font_info.max_width;
 	}
     }
-    target->map.min_width = width;
-    target->map.mixed = (target->map.max_width >= (target->map.min_width + 1));
+    data->font_info.min_width = width;
+    data->font_info.mixed = (data->font_info.max_width >=
+			     (data->font_info.min_width + 1));
     return failed;
 }
 
 #if OPT_REPORT_FONTS
 static void
 reportXftFonts(XtermWidget xw,
+	       XTermXftFonts *fontData,
+	       int fontNum,
 	       XftFont *fp,
 	       const char *name,
 	       const char *tag,
@@ -2666,23 +2697,24 @@
 	FcChar32 ch;
 	unsigned missing = 0;
 
-	printf("Loaded XftFonts(%s[%s])\n", name, tag);
+	ReportFonts("Loaded XftFonts(%s[%s])\n", name, tag);
 
 	for (ch = first_char; ch <= last_char; ++ch) {
-	    if (xtermXftMissing(xw, fp, ch)) {
+	    if (xtermXftMissing(xw, fontData, fontNum, fp, ch)) {
 		++missing;
 	    }
 	}
-	printf("\t\tfirst char:    %u\n", first_char);
-	printf("\t\tlast char:     %u\n", last_char);
-	printf("\t\tmissing-chars: %u\n", missing);
-	printf("\t\tpresent-chars: %u\n", (last_char - first_char) + 1 - missing);
+	ReportFonts("\t\tfirst char:    %u\n", first_char);
+	ReportFonts("\t\tlast char:     %u\n", last_char);
+	ReportFonts("\t\tmissing-chars: %u\n", missing);
+	ReportFonts("\t\tpresent-chars: %u\n", ((last_char - first_char)
+						+ 1 - missing));
 
 	if (XftNameUnparse(match, buffer, (int) sizeof(buffer))) {
 	    char *target;
 	    char *source = buffer;
 	    while ((target = strtok(source, ":")) != 0) {
-		printf("\t%s\n", target);
+		ReportFonts("\t%s\n", target);
 		source = 0;
 	    }
 	}
@@ -2690,7 +2722,7 @@
     }
 }
 #else
-#define reportXftFonts(xw, result, name, tag, match)	/* empty */
+#define reportXftFonts(xw, fontData, fontNum, result, name, tag, match)		/* empty */
 #endif /* OPT_REPORT_FONTS */
 
 /*
@@ -2706,10 +2738,10 @@
 maybeXftCache(XtermWidget xw, XftFont *font)
 {
     Boolean result = False;
-    if (font != 0) {
+    if (font != NULL) {
 	TScreen *screen = TScreenOf(xw);
 	ListXftFonts *p;
-	for (p = screen->list_xft_fonts; p != 0; p = p->next) {
+	for (p = screen->list_xft_fonts; p != NULL; p = p->next) {
 	    if (p->font == font) {
 		result = True;
 		break;
@@ -2717,7 +2749,7 @@
 	}
 	if (!result) {
 	    p = TypeXtMalloc(ListXftFonts);
-	    if (p != 0) {
+	    if (p != NULL) {
 		p->font = font;
 		p->next = screen->list_xft_fonts;
 		screen->list_xft_fonts = p;
@@ -2751,8 +2783,13 @@
     }
 }
 
-static XftFont *
-xtermOpenXft(XtermWidget xw, const char *name, XftPattern *pat, const char *tag)
+static void
+xtermOpenXft(XtermWidget xw,
+	     XTermXftFonts *fontData,
+	     int fontNum,
+	     const char *name,
+	     XftPattern *pat,
+	     const char *tag)
 {
     TScreen *screen = TScreenOf(xw);
     Display *dpy = screen->display;
@@ -2771,18 +2808,22 @@
 	    Boolean maybeReopened = False;
 	    result = XftFontOpenPattern(dpy, match);
 #ifdef FC_COLOR
-	    if (result != 0) {
+	    if (result != NULL) {
 		if (isBogusXft(result)) {
 		    XftFontClose(dpy, result);
-		    result = 0;
+		    result = NULL;
 		    maybeReopened = True;
 		}
 	    }
 #endif
-	    if (result != 0) {
+	    if (result != NULL) {
 		TRACE(("...matched %s font\n", tag));
+		if (fontData->fs_size <= (unsigned) fontNum)
+		    fontData->fs_size = (unsigned) (fontNum + 1);
+		XftFpN(fontData, fontNum) = result;
+		XftIsN(fontData, fontNum) = xcOpened;
 		if (!maybeXftCache(xw, result)) {
-		    reportXftFonts(xw, result, name, tag, match);
+		    reportXftFonts(xw, fontData, fontNum, result, name, tag, match);
 		}
 	    } else {
 		TRACE(("...could not open %s font\n", tag));
@@ -2799,7 +2840,10 @@
 	    }
 	}
     }
-    return result;
+    if (result == NULL) {
+	XftFpN(fontData, fontNum) = NULL;
+	XftIsN(fontData, fontNum) = xcEmpty;
+    }
 }
 
 #if OPT_SHIFT_FONTS
@@ -2829,9 +2873,9 @@
 
 #ifdef DEBUG_XFT
 static void
-trace_xft_glyph(TScreen *screen, XftFont *font, FT_Face face, int code, const char *name)
+trace_xft_glyph(XtermWidget xw, XTermXftFonts *data, FT_Face face, int code, const char *name)
 {
-    if (!XftGlyphExists(screen->display, font, code)) {
+    if (xtermXftMissing(xw, data, 0, XftFp(data), code)) {
 	TRACE(("Xft glyph U+%04X missing :%s\n", code, name));
     } else if (FT_Load_Char(face, code, FT_LOAD_RENDER) == 0) {
 	FT_GlyphSlot g = face->glyph;
@@ -2845,16 +2889,16 @@
 
 #if OPT_WIDE_CHARS
 static void
-trace_xft_line_drawing(TScreen *screen, XftFont *font, FT_Face face)
+trace_xft_line_drawing(XtermWidget xw, XTermXftFonts *data, FT_Face face)
 {
     int n;
     for (n = 0; unicode_boxes[n].code != 0; ++n) {
-	trace_xft_glyph(screen, font, face, unicode_boxes[n].code,
+	trace_xft_glyph(xw, data, face, unicode_boxes[n].code,
 			unicode_boxes[n].name);
     }
 }
 #else
-#define trace_xft_line_drawing(screen, font, face)	/* nothing */
+#define trace_xft_line_drawing(xw, data, face)	/* nothing */
 #endif
 #endif /* DEBUG_XFT */
 
@@ -2864,7 +2908,7 @@
  */
 #if OPT_BOX_CHARS
 static void
-linedrawing_gaps(XtermWidget xw, XftFont *font)
+linedrawing_gaps(XtermWidget xw, XTermXftFonts *data)
 {
     Boolean broken;
 
@@ -2872,12 +2916,12 @@
     TScreen *screen = TScreenOf(xw);
     int n;
     FT_Face face;
-    face = XftLockFace(font);
+    face = XftLockFace(XftFp(data));
     broken = False;
     for (n = 0; unicode_boxes[n].code; ++n) {
 	unsigned code = unicode_boxes[n].code;
 
-	if (!XftGlyphExists(screen->display, font, code)) {
+	if (xtermXftMissing(xw, data, 0, XftFp(data), code)) {
 	    TRACE(("Xft glyph U+%04X is missing\n", code));
 	    broken = True;
 	    break;
@@ -2901,7 +2945,7 @@
 	    if (code == 0x2502) {
 		unsigned r, c;
 		unsigned mids = 0, ends = 0;
-		unsigned char *data = g->bitmap.buffer;
+		unsigned char *buffer = g->bitmap.buffer;
 
 		switch (g->bitmap.pixel_mode) {
 		case FT_PIXEL_MODE_MONO:
@@ -2914,11 +2958,11 @@
 			    unsigned xx = 0;
 			    switch (g->bitmap.pixel_mode) {
 			    case FT_PIXEL_MODE_MONO:
-				xx = (unsigned) ((data[k + (c / 8)]
+				xx = (unsigned) ((buffer[k + (c / 8)]
 						  >> (c % 8)) & 1);
 				break;
 			    case FT_PIXEL_MODE_GRAY:
-				xx = data[k + c];
+				xx = buffer[k + c];
 				break;
 			    }
 			    sum += xx;
@@ -2988,9 +3032,9 @@
 		break;
 	}
     }
-    XftUnlockFace(font);
+    XftUnlockFace(XftFp(data));
 #else
-    (void) font;
+    (void) data;
     broken = True;
 #endif
 
@@ -3007,9 +3051,10 @@
  * rule.
  */
 static void
-setRenderFontsize(XtermWidget xw, VTwin *win, XftFont *font, const char *tag)
+setRenderFontsize(XtermWidget xw, VTwin *win, XTermXftFonts *data, const char *tag)
 {
-    if (font != 0) {
+    XftFont *font = XftFp(data);
+    if (font != NULL) {
 	TScreen *screen = TScreenOf(xw);
 	int width, height, ascent, descent;
 #ifdef DEBUG_XFT
@@ -3026,11 +3071,11 @@
 	metrics = size->metrics;
 	is_fixed = FT_IS_FIXED_WIDTH(face);
 	scalable = FT_IS_SCALABLE(face);
-	trace_xft_line_drawing(screen, font, face);
+	trace_xft_line_drawing(xw, data, face);
 	for (n = 32; n < 127; ++n) {
 	    char name[80];
 	    sprintf(name, "letter \"%c\"", n);
-	    trace_xft_glyph(screen, font, face, n, name);
+	    trace_xft_glyph(xw, data, face, n, name);
 	}
 	XftUnlockFace(font);
 
@@ -3122,7 +3167,7 @@
 	}
 #if OPT_BOX_CHARS
 	if (!screen->broken_box_chars && (tag == 0)) {
-	    linedrawing_gaps(xw, font);
+	    linedrawing_gaps(xw, data);
 	}
 #endif
     }
@@ -3146,29 +3191,27 @@
 void
 xtermCloseXft(TScreen *screen, XTermXftFonts *pub)
 {
-    if (pub->font != 0) {
+    if (XftFp(pub) != NULL) {
 	Cardinal n;
 
-	closeCachedXft(screen, pub->font);
-	pub->font = 0;
-
 	if (pub->pattern) {
 	    XftPatternDestroy(pub->pattern);
-	    pub->pattern = 0;
+	    pub->pattern = NULL;
 	}
 	if (pub->fontset) {
 	    XftFontSetDestroy(pub->fontset);
-	    pub->fontset = 0;
+	    pub->fontset = NULL;
 	}
 
-	for (n = 0; n < pub->limit; ++n) {
-	    if (pub->cache[n].font) {
-		closeCachedXft(screen, pub->cache[n].font);
-		pub->cache[n].font = 0;
+	for (n = 0; n < pub->fs_size; ++n) {
+	    if (XftFpN(pub, n) != NULL) {
+		closeCachedXft(screen, XftFpN(pub, n));
+		XftFpN(pub, n) = NULL;
+		XftIsN(pub, n) = xcEmpty;
 	    }
 	}
-	free(pub->cache);
-	pub->cache = NULL;
+	FreeAndNull(pub->font_map.per_font);
+	memset(pub, 0, sizeof(*pub));
     }
 }
 
@@ -3242,18 +3285,19 @@
      */
     if (UsingRenderFont(xw) && fontnum >= 0) {
 	String face_name = getFaceName(xw, False);
-	XTermXftFonts norm = screen->renderFontNorm[fontnum];
-	XTermXftFonts bold = screen->renderFontBold[fontnum];
-	XTermXftFonts ital = screen->renderFontItal[fontnum];
-	XTermXftFonts btal = screen->renderFontBtal[fontnum];
+	XTermXftFonts *norm = &(screen->renderFontNorm[fontnum]);
+	XTermXftFonts *bold = &(screen->renderFontBold[fontnum]);
+	XTermXftFonts *ital = &(screen->renderFontItal[fontnum]);
+	XTermXftFonts *btal = &(screen->renderFontBtal[fontnum]);
 #if OPT_RENDERWIDE
-	XTermXftFonts wnorm = screen->renderWideNorm[fontnum];
-	XTermXftFonts wbold = screen->renderWideBold[fontnum];
-	XTermXftFonts wital = screen->renderWideItal[fontnum];
-	XTermXftFonts wbtal = screen->renderWideBtal[fontnum];
+	XTermXftFonts *wnorm = &(screen->renderWideNorm[fontnum]);
+	XTermXftFonts *wbold = &(screen->renderWideBold[fontnum]);
+	XTermXftFonts *wital = &(screen->renderWideItal[fontnum]);
+	XTermXftFonts *wbtal = &(screen->renderWideBtal[fontnum]);
 #endif
 
-	if (norm.font == 0 && !IsEmpty(face_name)) {
+	if (XftFp(norm) == 0 && !IsEmpty(face_name)) {
+	    Work *work = &(xw->work);
 	    XftPattern *pat;
 	    double face_size;
 
@@ -3261,9 +3305,30 @@
 		   fontnum, face_name,
 		   xw->misc.face_size[fontnum]));
 
-	    TRACE(("Using Xft %d\n", XftVersion));
+	    TRACE(("Using Xft %d\n", XftGetVersion()));
 	    TRACE(("Using FontConfig %d\n", FC_VERSION));
 
+	    if (work->xft_defaults == NULL) {
+		FcInit();
+		work->xft_defaults = FcPatternCreate();
+		if (screen->xft_max_glyph_memory > 0) {
+		    FcPatternAddInteger(work->xft_defaults,
+					XFT_MAX_GLYPH_MEMORY,
+					screen->xft_max_glyph_memory);
+		}
+		if (screen->xft_max_unref_fonts > 0) {
+		    FcPatternAddInteger(work->xft_defaults,
+					XFT_MAX_UNREF_FONTS,
+					screen->xft_max_unref_fonts);
+		}
+#ifdef XFT_TRACK_MEM_USAGE
+		FcPatternAddBool(work->xft_defaults,
+				 XFT_TRACK_MEM_USAGE,
+				 screen->xft_track_mem_usage);
+#endif
+		XftDefaultSet(screen->display, work->xft_defaults);
+	    }
+
 	    fillInFaceSize(xw, fontnum);
 	    face_size = (double) xw->misc.face_size[fontnum];
 
@@ -3273,11 +3338,18 @@
 	     * normal pattern.
 	     */
 #ifdef FC_COLOR
+#if USE_FC_COLOR
+#define NormXftPattern \
+	    XFT_FAMILY,     XftTypeString, "mono", \
+	    FC_OUTLINE,     XftTypeBool,   FcTrue, \
+	    XFT_SIZE,       XftTypeDouble, face_size
+#else
 #define NormXftPattern \
 	    XFT_FAMILY,     XftTypeString, "mono", \
 	    FC_COLOR,       XftTypeBool,   FcFalse, \
 	    FC_OUTLINE,     XftTypeBool,   FcTrue, \
 	    XFT_SIZE,       XftTypeDouble, face_size
+#endif
 #else
 #define NormXftPattern \
 	    XFT_FAMILY,     XftTypeString, "mono", \
@@ -3286,16 +3358,16 @@
 
 #define BoldXftPattern(norm) \
 	    XFT_WEIGHT,     XftTypeInteger, XFT_WEIGHT_BOLD, \
-	    XFT_CHAR_WIDTH, XftTypeInteger, norm.font->max_advance_width
+	    XFT_CHAR_WIDTH, XftTypeInteger, XftFp(norm)->max_advance_width
 
 #define ItalXftPattern(norm) \
 	    XFT_SLANT,      XftTypeInteger, XFT_SLANT_ITALIC, \
-	    XFT_CHAR_WIDTH, XftTypeInteger, norm.font->max_advance_width
+	    XFT_CHAR_WIDTH, XftTypeInteger, XftFp(norm)->max_advance_width
 
 #define BtalXftPattern(norm) \
 	    XFT_WEIGHT,     XftTypeInteger, XFT_WEIGHT_BOLD, \
 	    XFT_SLANT,      XftTypeInteger, XFT_SLANT_ITALIC, \
-	    XFT_CHAR_WIDTH, XftTypeInteger, norm.font->max_advance_width
+	    XFT_CHAR_WIDTH, XftTypeInteger, XftFp(norm)->max_advance_width
 
 #if OPT_WIDE_ATTRS
 #define HAVE_ITALICS 1
@@ -3311,16 +3383,16 @@
 	    freeall_DoubleFT(xw);
 #endif
 	    if ((pat = XftNameParse(face_name)) != 0) {
-#define OPEN_XFT(name, tag) name.font = xtermOpenXft(xw, face_name, name.pattern, tag)
-		norm.pattern = XftPatternDuplicate(pat);
-		XftPatternBuild(norm.pattern,
+#define OPEN_XFT(data, tag) xtermOpenXft(xw, data, 0, face_name, data->pattern, tag)
+		norm->pattern = XftPatternDuplicate(pat);
+		XftPatternBuild(norm->pattern,
 				NormXftPattern,
 				(void *) 0);
 		OPEN_XFT(norm, "normal");
 
-		if (norm.font != 0) {
-		    bold.pattern = XftPatternDuplicate(pat);
-		    XftPatternBuild(bold.pattern,
+		if (XftFp(norm) != 0) {
+		    bold->pattern = XftPatternDuplicate(pat);
+		    XftPatternBuild(bold->pattern,
 				    NormXftPattern,
 				    BoldXftPattern(norm),
 				    (void *) 0);
@@ -3328,14 +3400,14 @@
 
 #if HAVE_ITALICS
 		    if (FIND_ITALICS) {
-			ital.pattern = XftPatternDuplicate(pat);
-			XftPatternBuild(ital.pattern,
+			ital->pattern = XftPatternDuplicate(pat);
+			XftPatternBuild(ital->pattern,
 					NormXftPattern,
 					ItalXftPattern(norm),
 					(void *) 0);
 			OPEN_XFT(ital, "italic");
-			btal.pattern = XftPatternDuplicate(pat);
-			XftPatternBuild(btal.pattern,
+			btal->pattern = XftPatternDuplicate(pat);
+			XftPatternBuild(btal->pattern,
 					NormXftPattern,
 					BtalXftPattern(norm),
 					(void *) 0);
@@ -3354,61 +3426,60 @@
 		    }
 		}
 
-		CACHE_XFT(screen->renderFontNorm, norm);
+		CACHE_XFT(norm);
 
-		CACHE_XFT(screen->renderFontBold, bold);
-		if (norm.font != 0 && !bold.font) {
+		CACHE_XFT(bold);
+		if (XftFp(norm) != 0 && !XftFp(bold)) {
 		    noUsableXft(xw, "bold");
-		    XftPatternDestroy(bold.pattern);
-		    bold.pattern = XftPatternDuplicate(pat);
-		    XftPatternBuild(bold.pattern,
+		    XftPatternDestroy(bold->pattern);
+		    bold->pattern = XftPatternDuplicate(pat);
+		    XftPatternBuild(bold->pattern,
 				    NormXftPattern,
 				    (void *) 0);
 		    OPEN_XFT(bold, "bold");
 		    failed = 0;
-		    CACHE_XFT(screen->renderFontBold, bold);
+		    CACHE_XFT(bold);
 		}
 #if HAVE_ITALICS
-		CACHE_XFT(screen->renderFontItal, ital);
-		if (norm.font != 0 && !ital.font) {
+		CACHE_XFT(ital);
+		if (XftFp(norm) != 0 && !XftFp(ital)) {
 		    noUsableXft(xw, "italic");
-		    XftPatternDestroy(ital.pattern);
-		    ital.pattern = XftPatternDuplicate(pat);
-		    XftPatternBuild(ital.pattern,
+		    XftPatternDestroy(ital->pattern);
+		    ital->pattern = XftPatternDuplicate(pat);
+		    XftPatternBuild(ital->pattern,
 				    NormXftPattern,
 				    (void *) 0);
 		    OPEN_XFT(ital, "italics");
 		    failed = 0;
-		    CACHE_XFT(screen->renderFontItal, ital);
+		    CACHE_XFT(ital);
 		}
-		CACHE_XFT(screen->renderFontBtal, btal);
-		if (norm.font != 0 && !btal.font) {
+		CACHE_XFT(btal);
+		if (XftFp(norm) != 0 && !XftFp(btal)) {
 		    noUsableXft(xw, "bold italic");
-		    XftPatternDestroy(btal.pattern);
-		    btal.pattern = XftPatternDuplicate(pat);
-		    XftPatternBuild(btal.pattern,
+		    XftPatternDestroy(btal->pattern);
+		    btal->pattern = XftPatternDuplicate(pat);
+		    XftPatternBuild(btal->pattern,
 				    NormXftPattern,
 				    (void *) 0);
 		    OPEN_XFT(btal, "bold-italics");
 		    failed = 0;
-		    CACHE_XFT(screen->renderFontBtal, btal);
+		    CACHE_XFT(btal);
 		}
 #endif
 		XftPatternDestroy(pat);
 	    } else {
 		failed = 1;
 	    }
-#undef OPEN_XFT
 
 	    /*
 	     * See xtermXftDrawString().  A separate double-width font is nice
 	     * to have, but not essential.
 	     */
 #if OPT_RENDERWIDE
-	    if (norm.font != 0 && screen->wide_chars) {
-		int char_width = norm.font->max_advance_width * 2;
+	    if (XftFp(norm) != 0 && screen->wide_chars) {
+		int char_width = XftFp(norm)->max_advance_width * 2;
 		double aspect = ((FirstItemOf(xw->work.fonts.xft.list_w)
-				  || screen->renderFontNorm[fontnum].map.mixed)
+				  || screen->renderFontNorm[fontnum].font_info.mixed)
 				 ? 1.0
 				 : 2.0);
 
@@ -3426,16 +3497,15 @@
 
 		if (!IsEmpty(face_name) && (pat = XftNameParse(face_name))
 		    != 0) {
-#define OPEN_XFT(name, tag) name.font = xtermOpenXft(xw, face_name, name.pattern, tag)
-		    wnorm.pattern = XftPatternDuplicate(pat);
-		    XftPatternBuild(wnorm.pattern,
+		    wnorm->pattern = XftPatternDuplicate(pat);
+		    XftPatternBuild(wnorm->pattern,
 				    WideXftPattern,
 				    (void *) 0);
 		    OPEN_XFT(wnorm, "wide");
 
-		    if (wnorm.font != 0) {
-			wbold.pattern = XftPatternDuplicate(pat);
-			XftPatternBuild(wbold.pattern,
+		    if (XftFp(wnorm) != 0) {
+			wbold->pattern = XftPatternDuplicate(pat);
+			XftPatternBuild(wbold->pattern,
 					WideXftPattern,
 					BoldXftPattern(wnorm),
 					(void *) 0);
@@ -3443,54 +3513,54 @@
 
 #if HAVE_ITALICS
 			if (FIND_ITALICS) {
-			    wital.pattern = XftPatternDuplicate(pat);
-			    XftPatternBuild(wital.pattern,
+			    wital->pattern = XftPatternDuplicate(pat);
+			    XftPatternBuild(wital->pattern,
 					    WideXftPattern,
 					    ItalXftPattern(wnorm),
 					    (void *) 0);
 			    OPEN_XFT(wital, "wide-italic");
 			}
-			CACHE_XFT(screen->renderWideBtal, wbtal);
-			if (!wbtal.font) {
+			CACHE_XFT(wbtal);
+			if (!XftFp(wbtal)) {
 			    noUsableXft(xw, "wide bold");
-			    XftPatternDestroy(wbtal.pattern);
-			    wbtal.pattern = XftPatternDuplicate(pat);
-			    XftPatternBuild(wbtal.pattern,
+			    XftPatternDestroy(wbtal->pattern);
+			    wbtal->pattern = XftPatternDuplicate(pat);
+			    XftPatternBuild(wbtal->pattern,
 					    WideXftPattern,
 					    (void *) 0);
 			    OPEN_XFT(wbtal, "wide-bold-italics");
 			    failed = 0;
-			    CACHE_XFT(screen->renderWideBtal, wbtal);
+			    CACHE_XFT(wbtal);
 			}
 #endif
 		    }
 
-		    CACHE_XFT(screen->renderWideNorm, wnorm);
+		    CACHE_XFT(wnorm);
 
-		    CACHE_XFT(screen->renderWideBold, wbold);
-		    if (wnorm.font != 0 && !wbold.font) {
+		    CACHE_XFT(wbold);
+		    if (XftFp(wnorm) != 0 && !XftFp(wbold)) {
 			noUsableXft(xw, "wide-bold");
-			XftPatternDestroy(wbold.pattern);
-			wbold.pattern = XftPatternDuplicate(pat);
-			XftPatternBuild(bold.pattern,
+			XftPatternDestroy(wbold->pattern);
+			wbold->pattern = XftPatternDuplicate(pat);
+			XftPatternBuild(bold->pattern,
 					WideXftPattern,
 					(void *) 0);
 			OPEN_XFT(wbold, "wide-bold");
 			failed = 0;
-			CACHE_XFT(screen->renderWideBold, bold);
+			CACHE_XFT(bold);
 		    }
 
-		    CACHE_XFT(screen->renderWideItal, wital);
-		    if (wnorm.font != 0 && !wital.font) {
+		    CACHE_XFT(wital);
+		    if (XftFp(wnorm) != 0 && !XftFp(wital)) {
 			noUsableXft(xw, "wide-italic");
-			XftPatternDestroy(wital.pattern);
-			wital.pattern = XftPatternDuplicate(pat);
-			XftPatternBuild(wital.pattern,
+			XftPatternDestroy(wital->pattern);
+			wital->pattern = XftPatternDuplicate(pat);
+			XftPatternBuild(wital->pattern,
 					WideXftPattern,
 					(void *) 0);
 			OPEN_XFT(wital, "wide-italic");
 			failed = 0;
-			CACHE_XFT(screen->renderWideItal, wital);
+			CACHE_XFT(wital);
 		    }
 
 		    XftPatternDestroy(pat);
@@ -3499,28 +3569,28 @@
 	    }
 #endif /* OPT_RENDERWIDE */
 	}
-	if (norm.font == 0) {
+	if (XftFp(norm) == 0) {
 	    TRACE(("...no TrueType font found for number %d, disable menu entry\n", fontnum));
 	    xw->work.render_font = False;
 	    update_font_renderfont();
 	    /* now we will fall through into the bitmap fonts */
 	} else {
 	    setBrokenBoxChars(xw, False);
-	    setRenderFontsize(xw, win, norm.font, NULL);
-	    setRenderFontsize(xw, win, bold.font, "bold");
-	    setRenderFontsize(xw, win, ital.font, "ital");
-	    setRenderFontsize(xw, win, btal.font, "btal");
+	    setRenderFontsize(xw, win, norm, NULL);
+	    setRenderFontsize(xw, win, bold, "bold");
+	    setRenderFontsize(xw, win, ital, "ital");
+	    setRenderFontsize(xw, win, btal, "btal");
 #if OPT_BOX_CHARS
 	    setupPackedFonts(xw);
 
 	    if (screen->force_packed) {
 		XTermXftFonts *use = &(screen->renderFontNorm[fontnum]);
-		SetFontHeight(screen, win, use->font->ascent + use->font->descent);
-		SetFontWidth(screen, win, use->map.min_width);
+		SetFontHeight(screen, win, XftFp(use)->ascent + XftFp(use)->descent);
+		SetFontWidth(screen, win, use->font_info.min_width);
 		TRACE(("...packed TrueType font %dx%d vs %d\n",
 		       win->f_height,
 		       win->f_width,
-		       use->map.max_width));
+		       use->font_info.max_width));
 	    }
 #endif
 	    DUMP_XFT(xw, &(screen->renderFontNorm[fontnum]));
@@ -3645,7 +3715,7 @@
 	TRACE2(("xtermMissingChar %#04x (!exists)\n", ch));
 	result = True;
     }
-    if (ch < KNOWN_MISSING) {
+    if (ch < MaxUChar) {
 	font->known_missing[ch] = (Char) (result ? 2 : 1);
     }
     return result;
@@ -3830,7 +3900,7 @@
 
     static const struct {
 	const int mode;			/* 1=y, 2=x, 3=both */
-	const short *data;
+	const short *const data;
     } lines[] =
     {
 	{ 0, 0 },			/* 00 (unused) */
@@ -4061,33 +4131,41 @@
  * cases where double-width glyphs are stuffed into a single-width outline.
  */
 static Boolean
-foundXftGlyph(XtermWidget xw, XftFont *font, unsigned wc)
+foundXftGlyph(XtermWidget xw, XTermXftFonts *data, int fontNum, unsigned wc)
 {
+    XftFont *font = XftFpN(data, fontNum);
     TScreen *screen = TScreenOf(xw);
     Boolean result = False;
 
-    if (font != 0 && XftGlyphExists(screen->display, font, wc)) {
-	int expect;
-
-	if ((expect = CharWidth(screen, wc)) > 0) {
-	    XGlyphInfo gi;
-	    int actual;
+    if (font != 0) {
+	if (!xtermXftMissing(xw, data, fontNum, font, wc)) {
+	    int expect;
 
-	    XftTextExtents32(screen->display, font, &wc, 1, &gi);
-	    /*
-	     * Some (more than a few) fonts are sloppy; allow 10% outside
-	     * the bounding box to accommodate them.
-	     */
-	    actual = ((gi.xOff * 10) >= (11 * FontWidth(screen))) ? 2 : 1;
-	    if (actual <= expect) {
-		/* allow double-cell if wcwidth agrees */
+	    if (XftIsN(data, fontNum) == xcBogus) {
+		;
+	    } else if (XftIsN(data, fontNum) == xcOpened) {
 		result = True;
+	    } else if ((expect = CharWidth(screen, wc)) > 0) {
+		XGlyphInfo gi;
+		int actual;
+
+		XftTextExtents32(screen->display, font, &wc, 1, &gi);
+		/*
+		 * Some (more than a few) fonts are sloppy; allow 10% outside
+		 * the bounding box to accommodate them.
+		 */
+		actual = ((gi.xOff * 10) >= (11 * FontWidth(screen))) ? 2 : 1;
+		if (actual <= expect) {
+		    /* allow double-cell if wcwidth agrees */
+		    result = True;
+		} else {
+		    XftIsN(data, fontNum) = xcBogus;
+		    TRACE(("SKIP U+%04X %d vs %d (%d vs %d)\n",
+			   wc, gi.xOff, FontWidth(screen), actual, expect));
+		}
 	    } else {
-		TRACE(("SKIP U+%04X %d vs %d (%d vs %d)\n",
-		       wc, gi.xOff, FontWidth(screen), actual, expect));
+		result = True;
 	    }
-	} else {
-	    result = True;
 	}
     }
     return result;
@@ -4096,12 +4174,13 @@
 static void
 markXftOpened(XtermWidget xw, XTermXftFonts *which, Cardinal n, unsigned wc)
 {
-    if (which->cache[n].usage != xcOpened) {
+    if (XftIsN(which, n) != xcOpened) {
 	which->opened++;
-	which->cache[n].usage = xcOpened;
+	XftIsN(which, n) = xcOpened;
 	/* XFT_DEBUG=3 will show useful context for this */
 	if (getenv("XFT_DEBUG") != 0) {
-	    printf("xterm: matched U+%04X in fontset #%d [%u:%u]\n",
+	    printf("%s: matched U+%04X in fontset #%d [%u:%u]\n",
+		   ProgramName,
 		   wc, n + 1,
 		   which->opened,
 		   xw->work.max_fontsets);
@@ -4109,159 +4188,253 @@
     }
 }
 
+static char **
+xftData2List(XtermWidget xw, XTermXftFonts *fontData)
+{
+    TScreen *screen = TScreenOf(xw);
+    VTFontList *lists = &xw->work.fonts.xft;
+    char **result = NULL;
+    int n = screen->menu_font_number;
+
+    if (fontData == &screen->renderFontNorm[n])
+	result = lists->list_n;
+    else if (fontData == &screen->renderFontBold[n])
+	result = lists->list_b;
+    else if (fontData == &screen->renderFontItal[n])
+	result = lists->list_i;
+    else if (fontData == &screen->renderFontBtal[n])
+	result = lists->list_bi;
+#if OPT_RENDERWIDE
+    if (fontData == &screen->renderWideNorm[n])
+	result = lists->list_w;
+    else if (fontData == &screen->renderWideBold[n])
+	result = lists->list_wb;
+    else if (fontData == &screen->renderWideItal[n])
+	result = lists->list_wi;
+    else if (fontData == &screen->renderWideBtal[n])
+	result = lists->list_wbi;
+#endif
+    return result;
+}
+
+static FcPattern *
+mergeXftStyle(XtermWidget xw, FcPattern * myPattern, XTermXftFonts *fontData)
+{
+    TScreen *screen = TScreenOf(xw);
+    Display *dpy = screen->display;
+    XftFont *given = XftFp(fontData);
+    XftResult mStatus;
+    int iValue;
+    double dValue;
+
+    if (FcOK(FcPatternGetInteger(fontData->pattern, XFT_WEIGHT, 0, &iValue))) {
+	FcPatternAddInteger(myPattern, XFT_WEIGHT, iValue);
+    }
+    if (FcOK(FcPatternGetInteger(fontData->pattern, XFT_SLANT, 0, &iValue))) {
+	FcPatternAddInteger(myPattern, XFT_SLANT, iValue);
+    }
+    if (FcOK(FcPatternGetDouble(fontData->pattern, FC_ASPECT, 0, &dValue))) {
+	FcPatternAddDouble(myPattern, FC_ASPECT, dValue);
+    }
+    if (FcOK(FcPatternGetDouble(fontData->pattern, XFT_SIZE, 0, &dValue))) {
+	FcPatternAddDouble(myPattern, XFT_SIZE, dValue);
+    }
+    FcPatternAddBool(myPattern, FC_SCALABLE, FcTrue);
+    FcPatternAddInteger(myPattern, XFT_SPACING, XFT_MONO);
+    FcPatternAddInteger(myPattern, FC_CHAR_WIDTH, given->max_advance_width);
+#ifdef FC_COLOR
+#if !USE_FC_COLOR
+    FcPatternAddBool(myPattern, FC_COLOR, FcFalse);
+#endif
+    FcPatternAddBool(myPattern, FC_OUTLINE, FcTrue);
+#endif
+
+    FcConfigSubstitute(NULL, myPattern, FcMatchPattern);
+    XftDefaultSubstitute(dpy, DefaultScreen(dpy), myPattern);
+
+    return FcFontMatch(NULL, myPattern, &mStatus);
+}
+
 /*
  * Check if the given character has a glyph known to Xft.  If it is missing,
  * try first to replace the font with a fallback that provides the glyph.
+ *
+ * Return -1 if nothing is found.  Otherwise, return the index in the cache.
  */
-XftFont *
-findXftGlyph(XtermWidget xw, XftFont *given, unsigned wc)
+int
+findXftGlyph(XtermWidget xw, XTermXftFonts *fontData, unsigned wc)
 {
     TScreen *screen = TScreenOf(xw);
-    XTermXftFonts *which = 0;
-    XftFont *result = 0;
-    /* workaround for interface changes... */
-    int fontnum = screen->menu_font_number;
-    static int table[] =
-    {
-	offsetof(TScreen, renderFontNorm),
-	offsetof(TScreen, renderFontBold),
-	offsetof(TScreen, renderFontItal),
-	offsetof(TScreen, renderFontBtal),
-#if OPT_RENDERWIDE
-	offsetof(TScreen, renderWideNorm),
-	offsetof(TScreen, renderWideBold),
-	offsetof(TScreen, renderWideItal),
-	offsetof(TScreen, renderWideBtal),
-#endif
-    };
+    XftFont *given = XftFp(fontData);
+    XftFont *actual = NULL;
     Cardinal n;
     FcResult status;
-    const char *tag = 0;
+    int result = -1;
+
+    /* sanity-check */
+    if (fontData == NULL)
+	return result;
 
     /* if fontsets are not wanted, just leave */
     if (xw->work.max_fontsets == 0) {
-	return 0;
+	return result;
     }
 
     /* ignore codes in private use areas */
     if ((wc >= 0xe000 && wc <= 0xf8ff)
 	|| (wc >= 0xf0000 && wc <= 0xffffd)
 	|| (wc >= 0x100000 && wc <= 0x10fffd)) {
-	return 0;
+	return result;
     }
     /* the end of the BMP is reserved for non-characters */
     if (wc >= 0xfff0 && wc <= 0xffff) {
-	return 0;
+	return result;
     }
 
-    for (n = 0; n < XtNumber(table); ++n) {
-	XTermXftFonts *check = (XTermXftFonts *) ((void *) ((char *) screen
-							    + table[n]));
-	if (check[fontnum].font == given) {
-	    which = &check[fontnum];
-	    tag = whichFontEnum((VTFontEnum) n);
-	    break;
+    /* initialize on the first call */
+    if (fontData->fontset == NULL) {
+	FcFontSet *sortedFonts;
+	FcPattern *myPattern;
+	int j;
+	char **my_list;
+
+	myPattern = FcPatternDuplicate(fontData->pattern);
+
+	FcPatternAddBool(myPattern, FC_SCALABLE, FcTrue);
+	FcPatternAddInteger(myPattern, FC_CHAR_WIDTH, given->max_advance_width);
+
+	FcConfigSubstitute(FcConfigGetCurrent(),
+			   myPattern,
+			   FcMatchPattern);
+	FcDefaultSubstitute(myPattern);
+
+	fontData->fontset = FcFontSetCreate();
+
+	sortedFonts = FcFontSort(NULL, myPattern, FcTrue, NULL, &status);
+
+	if (!sortedFonts || sortedFonts->nfont <= 0) {
+	    xtermWarning("did not find any usable TrueType font\n");
+	    return 0;
 	}
-    }
-    if (which != 0) {
-	if (which->fontset == 0) {
-	    FcFontSet *sortedFonts;
-	    FcPattern *myPattern;
-	    int j;
-
-	    myPattern = FcPatternDuplicate(which->pattern);
-
-	    FcPatternAddBool(myPattern, FC_SCALABLE, FcTrue);
-	    FcPatternAddInteger(myPattern, FC_CHAR_WIDTH, given->max_advance_width);
-
-	    FcConfigSubstitute(FcConfigGetCurrent(),
-			       myPattern,
-			       FcMatchPattern);
-	    FcDefaultSubstitute(myPattern);
-
-	    which->fontset = FcFontSetCreate();
-
-	    sortedFonts = FcFontSort(0, myPattern, FcTrue, 0, &status);
-
-	    if (!sortedFonts || sortedFonts->nfont <= 0) {
-		xtermWarning("did not find any usable TrueType font\n");
-		return 0;
-	    }
-	    which->limit = (unsigned) sortedFonts->nfont;
-	    which->cache = TypeCallocN(XTermXftCache, (which->limit + 1));
-	    for (j = 0; j < sortedFonts->nfont; j++) {
-		FcPattern *font_pattern;
-
-		font_pattern = FcFontRenderPrepare(FcConfigGetCurrent(),
-						   myPattern,
-						   sortedFonts->fonts[j]);
-		if (font_pattern)
-		    FcFontSetAdd(which->fontset, font_pattern);
-	    }
-
-	    FcFontSetSortDestroy(sortedFonts);
-	    FcPatternDestroy(myPattern);
-	}
-	if (which->fontset != 0) {
-	    XftFont *check;
-	    Cardinal empty = which->limit;
-
-	    for (n = 0; n < which->limit; ++n) {
-		XftCache usage = which->cache[n].usage;
-		if (usage == xcEmpty) {
-		    if (empty > n)
-			empty = n;
-		} else if (usage == xcOpened
-			   || (usage == xcUnused
-			       && (which->opened < xw->work.max_fontsets))) {
-		    check = which->cache[n].font;
-		    if (foundXftGlyph(xw, check, wc)) {
-			markXftOpened(xw, which, n, wc);
-			result = check;
-			TRACE_FALLBACK(xw, "old", wc, (int) n, result);
-			break;
+
+	/*
+	 * Check if there are additional fonts in the XtermFontNames.xft for
+	 * this font-data.
+	 */
+	if ((my_list = xftData2List(xw, fontData)) != NULL
+	    && *++my_list != NULL) {
+	    for (j = 0; my_list[j] != NULL; ++j) {
+		FcPattern *extraPattern;
+		if ((extraPattern = XftNameParse(my_list[j])) != 0) {
+		    FcPattern *match;
+
+		    match = mergeXftStyle(xw, extraPattern, fontData);
+
+		    if (match != NULL) {
+			FcFontSetAdd(fontData->fontset, match);
 		    }
+		    FcPatternDestroy(extraPattern);
 		}
 	    }
+	}
 
-	    if ((result == 0)
-		&& (empty < which->limit)
-		&& (which->opened < xw->work.max_fontsets)) {
-		FcPattern *myPattern = 0;
-		FcPattern *myReport = 0;
-
-		for (n = empty; n < which->limit; ++n) {
-		    if (which->cache[n].usage >= xcBogus)
-			continue;
-		    if (resource.reportFonts) {
-			myReport = FcPatternDuplicate(which->fontset->fonts[n]);
-		    }
-		    myPattern = FcPatternDuplicate(which->fontset->fonts[n]);
-		    check = XftFontOpenPattern(screen->display, myPattern);
-		    closeCachedXft(screen, which->cache[n].font);
-		    (void) maybeXftCache(xw, check);
-		    which->cache[n].font = check;
-		    which->cache[n].usage = xcBogus;
-		    if (check == 0)
-			continue;	/* shouldn't happen... */
+	for (j = 0; j < sortedFonts->nfont; j++) {
+	    FcPattern *font_pattern;
+
+	    font_pattern = FcFontRenderPrepare(FcConfigGetCurrent(),
+					       myPattern,
+					       sortedFonts->fonts[j]);
+	    if (font_pattern) {
+		FcFontSetAdd(fontData->fontset, font_pattern);
+	    }
+	}
+
+	FcFontSetSortDestroy(sortedFonts);
+	FcPatternDestroy(myPattern);
+
+	fontData->fs_size = (unsigned) fontData->fontset->nfont;
+    }
+
+    if (fontData->fontset != NULL) {
+	XftFont *check;
+	Cardinal empty = fontData->fs_size;
+
+	for (n = 1; n <= fontData->fs_size; ++n) {
+	    XTermXftState usage = XftIsN(fontData, n);
+	    if (usage == xcEmpty) {
+		if (empty > n)
+		    empty = n;
+	    } else if (usage == xcOpened
+		       || (usage == xcUnused
+			   && (fontData->opened < xw->work.max_fontsets))) {
+		check = XftFpN(fontData, n);
+		if (foundXftGlyph(xw, fontData, (int) n, wc)) {
+		    markXftOpened(xw, fontData, n, wc);
+		    actual = check;
+		    result = (int) n;
+		    TRACE_FALLBACK(xw, "old", wc, result, actual);
+		    break;
+		}
+	    }
+	}
+
+	if ((actual == NULL)
+	    && (empty <= fontData->fs_size)
+	    && (fontData->opened < xw->work.max_fontsets)) {
+	    FcPattern *myPattern = NULL;
+	    FcPattern *myReport = NULL;
+
+	    if (empty == 0)	/* should not happen */
+		empty++;
+	    for (n = empty; n < fontData->fs_size; ++n) {
+		unsigned nn = n - 1;
+		if (XftIsN(fontData, n) != xcEmpty) {
+		    continue;
+		}
+		if (resource.reportFonts) {
+		    if (myReport != NULL)
+			FcPatternDestroy(myReport);
+		    myReport = FcPatternDuplicate(fontData->fontset->fonts[nn]);
+		}
+		myPattern = FcPatternDuplicate(fontData->fontset->fonts[nn]);
+		check = XftFontOpenPattern(screen->display, myPattern);
+		(void) maybeXftCache(xw, check);
+		if (fontData->fs_size <= n)
+		    fontData->fs_size = (n + 1);
+		XftFpN(fontData, n) = check;
+		if (check == NULL) {
+		    ;		/* shouldn't happen... */
+		} else
 #ifdef FC_COLOR
-		    if (isBogusXft(check)) {
-			continue;
-		    }
+		if (isBogusXft(check)) {
+		    XftIsN(fontData, n) = xcBogus;
+		} else
 #endif
-		    if (foundXftGlyph(xw, check, wc)) {
-			markXftOpened(xw, which, n, wc);
-			reportXftFonts(xw, check, "fallback", tag, myReport);
-			result = check;
-			TRACE_FALLBACK(xw, "new", wc, (int) n, result);
-			break;
+		if (foundXftGlyph(xw, fontData, (int) n, wc)) {
+		    char tag[80];
+		    if (resource.reportFonts) {
+			sprintf(tag, "%s#%d",
+				whichXftFonts(xw, fontData),
+				n + 1);
+		    } else {
+			tag[0] = '\0';
 		    }
+		    markXftOpened(xw, fontData, n, wc);
+		    reportXftFonts(xw, fontData, (int) n, check,
+				   "fallback", tag, myReport);
+		    actual = check;
+		    result = (int) n;
+		    TRACE_FALLBACK(xw, "new", wc, result, actual);
+		    break;
+		} else {
 		    /*
-		     * The slot is opened, but we are not using it.
+		     * The slot is opened, but we are not using it yet.
 		     */
-		    which->cache[n].usage = xcUnused;
+		    XftIsN(fontData, n) = xcUnused;
 		}
 	    }
+	    if (myReport != NULL)
+		FcPatternDestroy(myReport);
 	}
     }
     return result;
@@ -4274,20 +4447,69 @@
  * see xc/lib/Xft/xftglyphs.c
  */
 Bool
-xtermXftMissing(XtermWidget xw, XftFont *font, unsigned wc)
+xtermXftMissing(XtermWidget xw,
+		XTermXftFonts *data,
+		int fontNum,	/* 0=primary, 1+ is fallback */
+		XftFont *font,	/* actual font if no data */
+		unsigned wc)
 {
-    Bool result = False;
+    Bool result = True;
 
-    if (font != 0) {
-	TScreen *screen = TScreenOf(xw);
-	if (!XftGlyphExists(screen->display, font, wc)) {
-#if OPT_WIDE_CHARS
-	    TRACE2(("xtermXftMissing %d (dec=%#x, ucs=%#x)\n",
-		    wc, ucs2dec(screen, wc), dec2ucs(screen, wc)));
-#else
-	    TRACE2(("xtermXftMissing %d\n", wc));
-#endif
-	    result = True;
+    (void) xw;
+    if (data != NULL && font != NULL) {
+	XTermFontMap *font_map = &(data->font_map);
+	/*
+	 * Each fallback font has one chance to be scanned/cached.
+	 * We record in per_font[] the index of the first font containing a
+	 * given glyph.
+	 */
+	if (font_map->depth <= fontNum) {
+	    FcChar32 last = (xtermXftLastChar(font) | 255) + 1;
+	    FcChar32 base;
+	    FcChar32 nextPage;
+	    FcChar32 map[FC_CHARSET_MAP_SIZE];
+	    unsigned added = 0;
+	    unsigned actual = 0;
+
+	    font_map->depth = (fontNum + 1);
+	    /* allocate space */
+	    if (last > font_map->last_char) {
+		font_map->per_font = realloc(font_map->per_font, last);
+		memset(font_map->per_font + font_map->last_char, 0, (last - font_map->last_char));
+		font_map->last_char = last;
+	    }
+
+	    /* scan new font */
+	    base = FcCharSetFirstPage(font->charset, map, &nextPage);
+	    do {
+		unsigned row;
+		unsigned col;
+		FcChar32 bits;
+		for (row = 0; row < FC_CHARSET_MAP_SIZE; ++row) {
+		    bits = map[row];
+		    for (col = 0; col < 32; ++col) {
+			if ((bits & 1) != 0) {
+			    actual++;
+			    if (!font_map->per_font[base]) {
+				font_map->per_font[base] = (Char) font_map->depth;
+				++added;
+			    }
+			}
+			bits >>= 1;
+			++base;
+		    }
+		}
+	    } while ((base = FcCharSetNextPage(font->charset, map,
+					       &nextPage)) != FC_CHARSET_DONE);
+	    TRACE(("xtermXftMissing U+%04X #%-3d %6u added vs %6u of %6ld %s\n",
+		   wc,
+		   font_map->depth,
+		   added, actual,
+		   font_map->last_char + 1,
+		   whichXftFonts(xw, data)));
+	}
+	if (wc < font_map->last_char) {
+	    result = (font_map->per_font[wc] != (fontNum + 1));
 	}
     }
     return result;
@@ -4748,6 +4970,9 @@
 {
     int fontnum;
 
+    if (param == NULL)
+	param = "";
+
     switch (param[0]) {
     case 'd':
     case 'D':
@@ -4787,7 +5012,7 @@
 	fontnum = -1;
 	break;
     }
-    TRACE(("xtermGetFont(%s) ->%d\n", NonNull(param), fontnum));
+    TRACE(("xtermGetFont(%s) ->%d\n", param, fontnum));
     return fontnum;
 }
 
@@ -5120,7 +5345,7 @@
 		}
 	    }
 	    if (success) {
-		next = realloc(*list, sizeof(char *) * (count + 2));
+		next = (char **) realloc(*list, sizeof(char *) * (count + 2));
 		if (next != 0) {
 #if OPT_RENDERFONT
 		    if (use_ttf) {
@@ -5378,11 +5603,9 @@
 }
 
 #if OPT_RENDERFONT
-XftFont *
-getDoubleXftFont(XTermDraw * params, unsigned chrset, unsigned attr_flags)
+void
+getDoubleXftFont(XTermDraw * params, XTermXftFonts *data, unsigned chrset, unsigned attr_flags)
 {
-    XftFont *result = 0;
-
     XtermWidget xw = params->xw;
     TScreen *screen = TScreenOf(xw);
     XftPattern *top_pattern;
@@ -5393,17 +5616,22 @@
 	&& (top_pattern = XftNameParse(face_name)) != 0) {
 	double face_size = (double) xw->misc.face_size[fontnum];
 	XftPattern *sub_pattern = XftPatternDuplicate(top_pattern);
+	const char *category = "doublesize";
 
 	switch (chrset) {
 	case CSET_DHL_TOP:
-	    /* FALLTHRU */
+	    category = "DHL_TOP";
+	    goto double_high;
 	case CSET_DHL_BOT:
+	    category = "DHL_BOT";
+	  double_high:
 	    face_size *= 2;
 	    XftPatternBuild(sub_pattern,
 			    NormXftPattern,
 			    (void *) 0);
 	    break;
 	case CSET_DWL:
+	    category = "DWL";
 	    XftPatternBuild(sub_pattern,
 			    NormXftPattern,
 			    FC_ASPECT, XftTypeDouble, 2.0,
@@ -5415,9 +5643,8 @@
 			    XFT_WEIGHT, XftTypeInteger, XFT_WEIGHT_BOLD,
 			    (void *) 0);
 	}
-	result = xtermOpenXft(xw, face_name, sub_pattern, "doublesize");
+	xtermOpenXft(xw, data, 0, face_name, sub_pattern, category);
     }
-    return result;
 }
 #endif
 #endif /* OPT_DEC_CHRSET */
@@ -5485,13 +5712,55 @@
     return result;
 }
 
+const char *
+whichXftFonts(XtermWidget xw, XTermXftFonts *data)
+{
+    TScreen *screen = TScreenOf(xw);
+    const char *result = "?";
+#define CHECK(name) ((data >= &(screen->name[0])) && (data < &(screen->name[NMENUFONTS]))) result = #name
+    if CHECK
+	(renderFontNorm);
+    else if CHECK
+	(renderFontBold);
+#if OPT_WIDE_ATTRS || OPT_RENDERWIDE
+    else if CHECK
+	(renderFontItal);
+    else if CHECK
+	(renderFontBtal);
+#endif
+#if OPT_WIDE_CHARS
+    else if CHECK
+	(renderWideNorm);
+    else if CHECK
+	(renderWideBold);
+    else if CHECK
+	(renderWideItal);
+    else if CHECK
+	(renderWideBtal);
+#endif
+#if OPT_DEC_CHRSET
+#if OPT_RENDERFONT
+    else {
+	int n;
+	for (n = 0; n < NUM_CHRSET; ++n) {
+	    if (data == &screen->double_xft_fonts[n]) {
+		result = "double_xft_fonts";
+		break;
+	    }
+	}
+    }
+#endif
+#endif /* OPT_DEC_CHRSET */
+    return result;
+}
+
 XftFont *
 getXftFont(XtermWidget xw, VTFontEnum which, int fontnum)
 {
     XTermXftFonts *data = getMyXftFont(xw, (int) which, fontnum);
     XftFont *result = 0;
     if (data != 0)
-	result = data->font;
+	result = XftFp(data);
     return result;
 }
 #endif
Index: fontutils.h
--- xterm-372+/fontutils.h	2021-02-25 23:03:24.000000000 +0000
+++ xterm-373/fontutils.h	2022-05-05 22:24:02.000000000 +0000
@@ -1,7 +1,7 @@
-/* $XTermId: fontutils.h,v 1.137 2021/02/25 23:03:24 tom Exp $ */
+/* $XTermId: fontutils.h,v 1.140 2022/05/05 22:24:02 tom Exp $ */
 
 /*
- * Copyright 1998-2020,2021 by Thomas E. Dickey
+ * Copyright 1998-2021,2022 by Thomas E. Dickey
  *
  *                         All Rights Reserved
  *
@@ -112,7 +112,7 @@
 	  */
 #if OPT_WIDE_CHARS
 #define CheckedKnownMissing(font, ch) \
-	 (((ch) < KNOWN_MISSING) && ((font)->known_missing[(Char)(ch)] > 0))
+	 (((ch) < MaxUChar) && ((font)->known_missing[(Char)(ch)] > 0))
 #else
 #define CheckedKnownMissing(font, ch) \
 	 ((font)->known_missing[(Char)(ch)] > 0)
@@ -146,14 +146,15 @@
 
 #if OPT_RENDERFONT
 extern Boolean maybeXftCache(XtermWidget /* xw */, XftFont * /* font */);
-extern Bool xtermXftMissing (XtermWidget /* xw */, XftFont * /* font */, unsigned /* wc */);
+extern Bool xtermXftMissing (XtermWidget /* xw */, XTermXftFonts * /* fontData */, int /* fontNum */, XftFont * /* font */, unsigned /* wc */);
 extern XTermXftFonts *getMyXftFont (XtermWidget /* xw */, int /* which */, int /* fontnum */);
-extern XftFont *findXftGlyph (XtermWidget /* xw */, XftFont * /* given */, unsigned /* wc */);
+extern const char * whichXftFonts(XtermWidget /* xw */, XTermXftFonts * /* data */);
+extern int findXftGlyph (XtermWidget /* xw */, XTermXftFonts * /* fontData */, unsigned /* wc */);
 extern XftFont *getXftFont (XtermWidget /* xw */, VTFontEnum /* which */, int /* fontnum */);
 extern void closeCachedXft (TScreen * /* screen */, XftFont * /* font */);
 extern void xtermCloseXft (TScreen * /* screen */, XTermXftFonts * /* pub */);
 #if OPT_DEC_CHRSET
-extern XftFont * getDoubleXftFont(XTermDraw * /* params */, unsigned /* chrset */, unsigned /* attr_flags */);
+extern void getDoubleXftFont(XTermDraw * /* params */, XTermXftFonts * /* fontData */, unsigned /* chrset */, unsigned /* attr_flags */);
 #endif
 #endif
 
Index: graphics.c
--- xterm-372+/graphics.c	2022-02-24 09:28:54.000000000 +0000
+++ xterm-373/graphics.c	2022-05-16 23:35:50.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: graphics.c,v 1.117 2022/02/24 09:28:54 tom Exp $ */
+/* $XTermId: graphics.c,v 1.118 2022/05/16 23:35:50 tom Exp $ */
 
 /*
  * Copyright 2013-2021,2022 by Ross Combs
@@ -816,7 +816,7 @@
     } else {
 	*pix = xcolor.pixel;
 
-	if (!(new_color = malloc(sizeof(*new_color)))) {
+	if (!(new_color = TypeMalloc(AllocatedColorRegister))) {
 	    TRACE(("unable to save pixel %lu\n", (unsigned long) *pix));
 	    return 0;
 	} else {
@@ -1252,8 +1252,8 @@
     int const refresh_h = nrows * FontHeight(screen);
     ColorRegister *buffer;
 
-    if (!(buffer = malloc(sizeof(ColorRegister) *
-			  (unsigned) refresh_w * (unsigned) refresh_h))) {
+    if (!(buffer = TypeMallocN(ColorRegister,
+			         (unsigned) refresh_w * (unsigned) refresh_h))) {
 	TRACE(("unable to allocate %dx%d buffer for graphics refresh\n",
 	       refresh_w, refresh_h));
     } else {
@@ -1577,7 +1577,7 @@
 	    free(buffer);
 	    return;
 	}
-	imgdata = malloc((size_t) (image_h * (unsigned) image->bytes_per_line));
+	imgdata = TypeMallocN(char, (size_t)(image_h * (unsigned)image->bytes_per_line));
 	if (!imgdata) {
 	    TRACE(("unable to allocate XImage for graphics refresh\n"));
 	    XDestroyImage(image);
Index: graphics_regis.c
--- xterm-372+/graphics_regis.c	2022-02-21 13:33:08.000000000 +0000
+++ xterm-373/graphics_regis.c	2022-05-16 23:31:18.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: graphics_regis.c,v 1.129 2022/02/21 13:33:08 tom Exp $ */
+/* $XTermId: graphics_regis.c,v 1.130 2022/05/16 23:31:18 tom Exp $ */
 
 /*
  * Copyright 2014-2021,2022 by Ross Combs
@@ -538,8 +538,8 @@
 static int
 sort_points(void const *l, void const *r)
 {
-    RegisPoint const *const lp = l;
-    RegisPoint const *const rp = r;
+    RegisPoint const *const lp = (RegisPoint const *)l;
+    RegisPoint const *const rp = (RegisPoint const *)r;
 
     if (lp->y < rp->y)
 	return -1;
@@ -1696,7 +1696,7 @@
 	workh = (unsigned) font->height + 2U;
     }
 
-    if (!(pixels = malloc((size_t) (workw * workh)))) {
+    if (!(pixels = TypeMallocN(Char, (size_t) (workw * workh)))) {
 	*w = 0U;
 	*h = 0U;
 #ifdef DEBUG_COMPUTED_FONT_METRICS
@@ -6838,12 +6838,12 @@
 static int
 expand_macrographs(RegisDataFragment *input, RegisGraphicsContext const *context)
 {
-    char operator;
+    char op;
     char name;
 
     (void) context;		/* to be used later */
-    operator = get_fragment(input, 0U);
-    if (operator != '@')
+    op = get_fragment(input, 0U);
+    if (op != '@')
 	return 0;
     name = get_fragment(input, 1U);
     if (islower(CharOf(name)))
@@ -7304,7 +7304,7 @@
 		* context->alphabets[state->load_index].pixh;
 	    if (context->alphabets[state->load_index].bytes == NULL) {
 		if (!(context->alphabets[state->load_index].bytes =
-		      calloc((size_t) (MAX_GLYPHS * glyph_size), sizeof(Char)))) {
+		      TypeCallocN(Char, (size_t) (MAX_GLYPHS * glyph_size)))) {
 		    TRACE(("ERROR: unable to allocate %u bytes for glyph storage\n",
 			   MAX_GLYPHS * glyph_size));
 		    return 0;
@@ -7605,7 +7605,7 @@
 
     init_fragment(&state->input, string);
     state->templen = (unsigned) strlen(string) + 1U;
-    if (!(state->temp = malloc((size_t) state->templen))) {
+    if (!(state->temp = TypeMallocN(char, (size_t) state->templen))) {
 	TRACE(("Unable to allocate temporary buffer of size %u\n",
 	       state->templen));
 	return;
Index: linedata.c
--- xterm-372+/linedata.c	2021-12-27 23:43:28.000000000 +0000
+++ xterm-373/linedata.c	2022-09-18 21:17:43.000000000 +0000
@@ -1,7 +1,7 @@
-/* $XTermId: linedata.c,v 1.101 2021/12/27 23:43:28 tom Exp $ */
+/* $XTermId: linedata.c,v 1.102 2022/09/18 21:17:43 tom Exp $ */
 
 /*
- * Copyright 2009-2019,2021 by Thomas E. Dickey
+ * Copyright 2009-2021,2022 by Thomas E. Dickey
  *
  *                         All Rights Reserved
  *
@@ -70,7 +70,7 @@
 void
 copyLineData(LineData *dst, CLineData *src)
 {
-    if (dst == NULL || src == NULL)
+    if (dst == NULL || src == NULL || dst == src)
 	return;
 
     dst->bufHead = src->bufHead;
Index: main.c
--- xterm-372+/main.c	2022-02-22 23:35:41.000000000 +0000
+++ xterm-373/main.c	2022-07-13 07:57:08.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: main.c,v 1.886 2022/02/22 23:35:41 tom Exp $ */
+/* $XTermId: main.c,v 1.889 2022/07/13 07:57:08 Brendan.O.Dea Exp $ */
 
 /*
  * Copyright 2002-2021,2022 by Thomas E. Dickey
@@ -1188,8 +1188,8 @@
 DATA("+sm",		"*sessionMgt",	XrmoptionNoArg,		"off"),
 #endif
 #if OPT_TOOLBAR
-DATA("-tb",		"*"XtNtoolBar,	XrmoptionNoArg,		"on"),
-DATA("+tb",		"*"XtNtoolBar,	XrmoptionNoArg,		"off"),
+DATA("-tb",		"*" XtNtoolBar,	XrmoptionNoArg,		"on"),
+DATA("+tb",		"*" XtNtoolBar,	XrmoptionNoArg,		"off"),
 #endif
 #if OPT_MAXIMIZE
 DATA("-maximized",	"*maximized",	XrmoptionNoArg,		"on"),
@@ -1536,7 +1536,7 @@
 {
     /* table adapted from XtInitialize, used here to improve abbreviations */
     /* *INDENT-OFF* */
-#define DATA(option,kind) { (char *) option, NULL, kind, (XtPointer) NULL }
+#define DATA(option,kind) { (char *) option, NULL, kind, (XPointer) 0 }
     static XrmOptionDescRec opTable[] = {
 	DATA("+synchronous",	   XrmoptionNoArg),
 	DATA("-background",	   XrmoptionSepArg),
@@ -3528,7 +3528,7 @@
 	have = (size_t) (t - s);
 
 	if ((have >= want) && (*s != '#')) {
-	    char *p = malloc(have + 1);
+	    char *p = (char *) malloc(have + 1);
 
 	    if (p != 0) {
 		char *q;
@@ -3666,24 +3666,38 @@
 xtermTrimEnv(void)
 {
 #define DATA(wild,name) { wild, #name }
+    /* *INDENT-OFF* */
     static struct {
 	int wild;
 	const char *name;
     } table[] = {
+	DATA(0, COLUMNS),
 	DATA(0, DEFAULT_COLORS),
-	    DATA(0, DESKTOP_STARTUP_ID),
-	    DATA(0, WCWIDTH_CJK_LEGACY),
-	    DATA(0, XCURSOR_PATH),
-	    DATA(1, COLORFGBG),
-	    DATA(1, COLORTERM),
-	    DATA(1, ITERM2_),
-	    DATA(1, MC_),
-	    DATA(1, PUTTY),
-	    DATA(1, RXVT_),
-	    DATA(1, URXVT_),
-	    DATA(1, VTE_),
+	DATA(0, DESKTOP_STARTUP_ID),
+	DATA(0, LINES),
+	DATA(0, SHLVL),		/* ksh, bash */
+	DATA(0, STY),		/* screen */
+	DATA(0, TERMCAP),
+	DATA(0, TMUX),
+	DATA(0, TMUX_PANE),
+	DATA(0, WCWIDTH_CJK_LEGACY),
+	DATA(0, WINDOW),	/* screen */
+	DATA(0, XCURSOR_PATH),
+	DATA(1, COLORFGBG),
+	DATA(1, COLORTERM),
+	DATA(1, GIO_LAUNCHED_),
+	DATA(1, ITERM2_),
+	DATA(1, MC_),
+	DATA(1, MINTTY_),
+	DATA(1, PUTTY),
+	DATA(1, RXVT_),
+	DATA(1, TERM_),
+	DATA(1, URXVT_),
+	DATA(1, VTE_),
+	DATA(1, XTERM_),
     };
 #undef DATA
+    /* *INDENT-ON* */
     Cardinal n;
 
     for (n = 0; n < XtNumber(table); ++n) {
@@ -3697,7 +3711,7 @@
 		    char *my_var;
 		    if (dstend != NULL &&
 			(dstlen = (size_t) (dstend - environ[s])) >= srclen &&
-			!strncmp(table[n].name, environ[s], dstlen) &&
+			!strncmp(table[n].name, environ[s], srclen) &&
 			(my_var = x_strdup(environ[s])) != NULL) {
 			my_var[dstlen] = '\0';
 			xtermUnsetenv(my_var);
@@ -5133,7 +5147,7 @@
 	    signal(SIGHUP, SIG_DFL);
 #endif
 
-	    if ((shname_minus = malloc(strlen(shname) + 2)) != 0) {
+	    if ((shname_minus = (char *) malloc(strlen(shname) + 2)) != 0) {
 		(void) strcpy(shname_minus, "-");
 		(void) strcat(shname_minus, shname);
 	    } else {
Index: main.h
--- xterm-372+/main.h	2022-01-31 00:42:27.000000000 +0000
+++ xterm-373/main.h	2022-07-07 09:44:28.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: main.h,v 1.80 2022/01/31 00:42:27 tom Exp $ */
+/* $XTermId: main.h,v 1.81 2022/07/07 09:44:28 tom Exp $ */
 
 /*
  * Copyright 2000-2021,2022 by Thomas E. Dickey
@@ -239,6 +239,10 @@
 #define DEF_TI_XTRA_SCROLL	"False"
 #endif
 
+#ifndef DEF_TRACK_USAGE
+#define DEF_TRACK_USAGE		True
+#endif
+
 #ifndef DEF_XFT_CACHE
 #define DEF_XFT_CACHE		50
 #endif
Index: menu.c
--- xterm-372+/menu.c	2021-06-03 21:23:40.000000000 +0000
+++ xterm-373/menu.c	2022-09-08 22:18:39.000000000 +0000
@@ -1,7 +1,7 @@
-/* $XTermId: menu.c,v 1.367 2021/06/03 21:23:40 tom Exp $ */
+/* $XTermId: menu.c,v 1.369 2022/09/08 22:18:39 tom Exp $ */
 
 /*
- * Copyright 1999-2020,2021 by Thomas E. Dickey
+ * Copyright 1999-2021,2022 by Thomas E. Dickey
  *
  *                         All Rights Reserved
  *
@@ -312,7 +312,7 @@
 #ifdef ALLOWLOGGING
     { "logging",	do_logging,	NULL },
 #endif
-#ifdef OPT_PRINT_ON_EXIT
+#if OPT_PRINT_ON_EXIT
     { "print-immediate", do_write_now,	NULL },
     { "print-on-error",	do_write_error,	NULL },
 #endif
@@ -811,7 +811,7 @@
 	    update_meta_esc();
 	    update_delete_del();
 	    update_keyboard_type();
-#ifdef OPT_PRINT_ON_EXIT
+#if OPT_PRINT_ON_EXIT
 	    screen->write_error = !IsEmpty(resource.printFileOnXError);
 	    SetItemSensitivity(mainMenuEntries[mainMenu_write_now].widget, True);
 	    SetItemSensitivity(mainMenuEntries[mainMenu_write_error].widget, screen->write_error);
@@ -1144,7 +1144,7 @@
 }
 #endif
 
-#ifdef OPT_PRINT_ON_EXIT
+#if OPT_PRINT_ON_EXIT
 static void
 do_write_now(Widget gw GCC_UNUSED,
 	     XtPointer closure GCC_UNUSED,
Index: misc.c
--- xterm-372+/misc.c	2022-02-18 09:08:10.000000000 +0000
+++ xterm-373/misc.c	2022-09-15 21:00:41.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: misc.c,v 1.1015 2022/02/18 09:08:10 tom Exp $ */
+/* $XTermId: misc.c,v 1.1022 2022/09/15 21:00:41 tom Exp $ */
 
 /*
  * Copyright 1999-2021,2022 by Thomas E. Dickey
@@ -99,6 +99,12 @@
 
 #include <assert.h>
 
+#ifdef HAVE_MKSTEMP
+#define MakeTemp(f) mkstemp(f)
+#else
+#define MakeTemp(f) mktemp(f)
+#endif
+
 #ifdef VMS
 #define XTERM_VMS_LOGFILE "SYS$SCRATCH:XTERM_LOG.TXT"
 #ifdef ALLOWLOGFILEEXEC
@@ -743,7 +749,7 @@
 init_colored_cursor(Display *dpy)
 {
     static const char theme[] = "index.theme";
-    static const char pattern[] = "xtermXXXXXX";
+    static const char pattern[] = "xtermXXXXXXXX";
     char *env = getenv("XCURSOR_THEME");
 
     xterm_cursor_theme = 0;
@@ -777,7 +783,7 @@
 #ifdef HAVE_MKDTEMP
 	    xterm_cursor_theme = mkdtemp(filename);
 #else
-	    if (mktemp(filename) != 0
+	    if (MakeTemp(filename) != 0
 		&& mkdir(filename, 0700) == 0) {
 		xterm_cursor_theme = filename;
 	    }
@@ -2140,6 +2146,7 @@
 	    tstruct->tm_sec);
 }
 
+#if OPT_SCREEN_DUMPS
 FILE *
 create_printfile(XtermWidget xw, const char *suffix)
 {
@@ -2171,7 +2178,9 @@
     fp = (fd >= 0) ? fdopen(fd, "wb") : NULL;
     return fp;
 }
+#endif /* OPT_SCREEN_DUMPS */
 
+#if OPT_SCREEN_DUMPS || defined(ALLOWLOGGING)
 int
 open_userfile(uid_t uid, gid_t gid, char *path, Bool append)
 {
@@ -2319,6 +2328,7 @@
     }
 }
 #endif /* !VMS */
+#endif /* OPT_SCREEN_DUMPS || defined(ALLOWLOGGING) */
 
 int
 xtermResetIds(TScreen *screen)
@@ -2476,7 +2486,7 @@
 #else
     static const char log_def_name[] = "XtermLog.XXXXXX";
     if ((log_default = x_strdup(log_def_name)) != NULL) {
-	mktemp(log_default);
+	MakeTemp(log_default);
     }
 #endif
 
@@ -2637,6 +2647,9 @@
 			   ((vi->red_mask & vi->green_mask) == 0) &&
 			   ((vi->green_mask & vi->blue_mask) == 0) &&
 			   ((vi->blue_mask & vi->red_mask) == 0) &&
+			   xw->rgb_widths[0] <= (unsigned) vi->bits_per_rgb &&
+			   xw->rgb_widths[1] <= (unsigned) vi->bits_per_rgb &&
+			   xw->rgb_widths[2] <= (unsigned) vi->bits_per_rgb &&
 			   (vi->class == TrueColor
 			    || vi->class == DirectColor));
 
@@ -2755,7 +2768,9 @@
 	             << xw->rgb_shifts[nn]) \
 	 & xw->visInfo->name ##_mask)
 
-    if (getVisualInfo(xw) != NULL && xw->has_rgb) {
+#define VisualIsRGB(xw) (getVisualInfo(xw) != NULL && xw->has_rgb && xw->visInfo->bits_per_rgb <= 8)
+
+    if (VisualIsRGB(xw)) {
 	def->pixel = MaskIt(red, 0) | MaskIt(green, 1) | MaskIt(blue, 2);
     } else {
 	Display *dpy = screen->display;
@@ -2769,6 +2784,9 @@
 	    def->pixel = ((bright >= levels)
 			  ? xw->dft_background
 			  : xw->dft_foreground);
+	    TRACE(("XAllocColor failed, for %04x/%04x/%04x: choose %08lx (%d vs %d)\n",
+		   def->red, def->green, def->blue,
+		   def->pixel, bright, levels));
 	    result = False;
 	}
     }
@@ -2792,13 +2810,17 @@
 	(unsigned short)((((UnMaskIt(name,nn) << 8) \
 			   |UnMaskIt(name,nn))) << (8 - xw->rgb_widths[nn]))
 
-    if (getVisualInfo(xw) != NULL && xw->has_rgb) {
+    if (VisualIsRGB(xw)) {
 	/* *INDENT-EQLS* */
 	def->red   = UnMaskIt2(red, 0);
 	def->green = UnMaskIt2(green, 1);
 	def->blue  = UnMaskIt2(blue, 2);
-    } else if (!XQueryColor(TScreenOf(xw)->display, xw->core.colormap, def)) {
-	result     = False;
+    } else {
+	Display *dpy = TScreenOf(xw)->display;
+	if (!XQueryColor(dpy, xw->core.colormap, def)) {
+	    TRACE(("XQueryColor failed, given %08lx\n", def->pixel));
+	    result     = False;
+	}
     }
     return result;
 }
@@ -7477,14 +7499,6 @@
 	last_cols = cols;
 	last_high = height;
 	last_wide = width;
-#if OPT_STATUS_LINE
-	if (IsStatusShown(screen)) {
-	    ++rows;
-	    height += FontHeight(screen);
-	    TRACE(("... account for status-line -> %dx%d (%dx%d)\n",
-		   rows, cols, height, width));
-	}
-#endif
 	setup_winsize(ts, rows, cols, height, width);
 	TRACE_RC(code, SET_TTYSIZE(screen->respond, ts));
 	trace_winsize(ts, "from SET_TTYSIZE");
Index: package/debian/changelog
--- xterm-372+/package/debian/changelog	2022-03-04 21:39:26.000000000 +0000
+++ xterm-373/package/debian/changelog	2022-03-11 19:51:56.000000000 +0000
@@ -1,3 +1,9 @@
+xterm-dev (373) unstable; urgency=low
+
+  * maintenance updates
+
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 11 Mar 2022 14:51:56 -0500
+
 xterm-dev (372) unstable; urgency=low
 
   * maintenance updates
Index: package/freebsd/Makefile
--- xterm-372+/package/freebsd/Makefile	2022-03-04 21:39:26.000000000 +0000
+++ xterm-373/package/freebsd/Makefile	2022-03-11 19:51:56.000000000 +0000
@@ -1,4 +1,4 @@
-# $XTermId: Makefile,v 1.93 2022/03/04 21:39:26 tom Exp $
+# $XTermId: Makefile,v 1.94 2022/03/11 19:51:56 tom Exp $
 # $FreeBSD: head/x11/xterm/Makefile 492827 2019-02-13 06:43:36Z ehaupt $
 
 # This is adapted from the FreeBSD port, installing as "xterm-dev" with
@@ -7,7 +7,7 @@
 # and "make makesum".
 
 PORTNAME=	xterm
-PORTVERSION=	372
+PORTVERSION=	373
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.invisible-island.net/xterm/:src1 \
 		https://invisible-mirror.net/archives/xterm/:src1
Index: package/pkgsrc/Makefile
--- xterm-372+/package/pkgsrc/Makefile	2022-03-04 21:39:26.000000000 +0000
+++ xterm-373/package/pkgsrc/Makefile	2022-03-11 19:51:56.000000000 +0000
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.117 2018/03/12 11:18:00 wiz Exp $
 
-DISTNAME=	xterm-372
+DISTNAME=	xterm-373
 PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.invisible-island.net/xterm/
Index: package/xterm.spec
--- xterm-372+/package/xterm.spec	2022-03-04 21:39:26.000000000 +0000
+++ xterm-373/package/xterm.spec	2022-03-11 19:51:56.000000000 +0000
@@ -1,11 +1,11 @@
-# $XTermId: xterm.spec,v 1.149 2022/03/04 21:39:26 tom Exp $
+# $XTermId: xterm.spec,v 1.150 2022/03/11 19:51:56 tom Exp $
 Summary: X terminal emulator (development version)
 %global my_middle xterm
 %global my_suffix -dev
 %global fullname %{my_middle}%{my_suffix}
 %global my_class XTermDev
 Name: %{fullname}
-Version: 372
+Version: 373
 Release: 1
 License: X11
 Group: User Interface/X
Index: plink.sh
--- xterm-372+/plink.sh	2022-02-13 14:30:17.000000000 +0000
+++ xterm-373/plink.sh	2022-03-13 18:27:29.000000000 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $XTermId: plink.sh,v 1.16 2022/02/13 14:30:17 tom Exp $
+# $XTermId: plink.sh,v 1.17 2022/03/13 18:27:29 Ryan.Schmidt Exp $
 # -----------------------------------------------------------------------------
 # this file is part of xterm
 #
@@ -44,13 +44,15 @@
 	;;
 esac
 
+: "${TMPDIR=/tmp}"
+
 while [ $# != 0 ]
 do
 	if [ $ASNEED = no ] && [ -n "$LINKIT" ]
 	then
 		ASNEED=yes
 		OPT=-Wl,-as-needed
-		warned=`mktemp`
+		warned=`mktemp "$TMPDIR/xterm.XXXXXXXX"`
 		trap "rm -f $warned; exit 1" 1 2 3 15
 		trap "rm -f $warned" 0
 		if ( eval $LINKIT $OPT $NO_LTO "$@" >"$warned" 2>&1 )
Index: print.c
--- xterm-372+/print.c	2021-03-02 00:19:13.000000000 +0000
+++ xterm-373/print.c	2022-09-18 21:00:08.000000000 +0000
@@ -1,7 +1,7 @@
-/* $XTermId: print.c,v 1.172 2021/03/02 00:19:13 tom Exp $ */
+/* $XTermId: print.c,v 1.173 2022/09/18 21:00:08 tom Exp $ */
 
 /*
- * Copyright 1997-2020,2021 by Thomas E. Dickey
+ * Copyright 1997-2021,2022 by Thomas E. Dickey
  *
  *                         All Rights Reserved
  *
@@ -325,16 +325,16 @@
 	    printLines(xw, -screen->savedlines, -(screen->topline + 1), p);
 	}
 	if (p->print_everything & 4) {
-	    SwitchBufPtrs(screen, 1);
+	    SwitchBufPtrs(xw, 1);
 	    done_which |= 2;
 	    printLines(xw, 0, screen->max_row, p);
-	    SwitchBufPtrs(screen, save_which);
+	    SwitchBufPtrs(xw, save_which);
 	}
 	if (p->print_everything & 2) {
-	    SwitchBufPtrs(screen, 0);
+	    SwitchBufPtrs(xw, 0);
 	    done_which |= 1;
 	    printLines(xw, 0, screen->max_row, p);
-	    SwitchBufPtrs(screen, save_which);
+	    SwitchBufPtrs(xw, save_which);
 	}
 	if (p->print_everything & 1) {
 	    if (!(done_which & (1 << screen->whichBuf))) {
Index: ptyx.h
--- xterm-372+/ptyx.h	2022-03-08 23:31:40.000000000 +0000
+++ xterm-373/ptyx.h	2022-09-23 22:19:42.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: ptyx.h,v 1.1060 2022/03/08 23:31:40 tom Exp $ */
+/* $XTermId: ptyx.h,v 1.1073 2022/09/23 22:19:42 tom Exp $ */
 
 /*
  * Copyright 1999-2021,2022 by Thomas E. Dickey
@@ -81,6 +81,7 @@
 #endif
 
 #include <stdio.h>
+#include <limits.h>
 
 #if defined(HAVE_STDINT_H) || !defined(HAVE_CONFIG_H)
 #include <stdint.h>
@@ -92,8 +93,8 @@
 /* adapted from IntrinsicI.h */
 #define MyStackAlloc(size, stack_cache_array)     \
     ((size) <= sizeof(stack_cache_array)	  \
-    ?  (XtPointer)(stack_cache_array)		  \
-    :  (XtPointer)malloc((size_t)(size)))
+    ?  (stack_cache_array)			  \
+    :  (char*)malloc((size_t)(size)))
 
 #define MyStackFree(pointer, stack_cache_array) \
     if ((pointer) != ((char *)(stack_cache_array))) free(pointer)
@@ -313,6 +314,7 @@
 #define MaxCols(screen)		((screen)->max_col + 1)
 #define MaxRows(screen)		((screen)->max_row + 1)
 
+#define MaxUChar 255
 typedef unsigned char Char;		/* to support 8 bit chars */
 typedef Char *ScrnPtr;
 typedef ScrnPtr *ScrnBuf;
@@ -422,7 +424,7 @@
 #define TERMCAP_SIZE 1500		/* 1023 is standard; 'screen' exceeds */
 
 #define MAX_XLFD_FONTS	1
-#define MAX_XFT_FONTS	1
+#define MAX_XFT_FONTS	2
 #define NMENUFONTS	10		/* font entries in fontMenu */
 
 #define	NBOX	5			/* Number of Points in box	*/
@@ -568,6 +570,10 @@
 #define OPT_DEC_RECTOPS 1 /* true if xterm is configured for VT420 rectangles */
 #endif
 
+#ifndef OPT_SGR2_HASH
+#define OPT_SGR2_HASH 1 /* true if xterm hashes color-lookups for faint color */
+#endif
+
 #ifndef OPT_SIXEL_GRAPHICS
 #define OPT_SIXEL_GRAPHICS 0 /* true if xterm supports VT240-style sixel graphics */
 #endif
@@ -604,6 +610,10 @@
 #endif
 #endif
 
+#ifndef OPT_EXEC_SELECTION
+#define OPT_EXEC_SELECTION 1 /* true if xterm can exec to process selection */
+#endif
+
 #ifndef OPT_EXEC_XTERM
 #define OPT_EXEC_XTERM 0 /* true if xterm can fork/exec copies of itself */
 #endif
@@ -1893,9 +1903,22 @@
 	Bool		mixed;
 	Dimension	min_width;	/* nominal cell width for 0..255 */
 	Dimension	max_width;	/* maximum cell width */
-} FontMap;
+} XTermFontInfo;
 
-#define KNOWN_MISSING	256
+	/*
+	 * Map of characters to simplify/speed-up the checks for missing glyphs
+	 * at runtime.
+	 *
+	 * FIXME: initially implement for Xft, but replace known_missing[] in
+	 * X11 fonts as well.
+	 */
+typedef struct {
+	int		depth;		/* number of fonts merged for map */
+	size_t		limit;		/* allocated size of per_font, etc */
+	size_t		first_char;	/* merged first-character index */
+	size_t		last_char;	/* merged last-character index */
+	Char *		per_font;	/* index 1-n of first font with char */
+} XTermFontMap;
 
 typedef enum {
 	fwNever = 0,
@@ -1909,8 +1932,8 @@
 	fontWarningTypes warn;
 	XFontStruct *	fs;
 	char *		fn;
-	FontMap		map;
-	Char		known_missing[KNOWN_MISSING];
+	XTermFontInfo	font_info;
+	Char		known_missing[MaxUChar + 1];
 } XTermFonts;
 
 #if OPT_RENDERFONT
@@ -1931,23 +1954,29 @@
 	, xcBogus			/* ignore this pattern */
 	, xcOpened			/* slot has open font descriptor */
 	, xcUnused			/* opened, but unused so far */
-} XftCache;
+} XTermXftState;
 
 typedef struct {
 	XftFont *	font;
-	XftCache	usage;
+	XTermXftState	usage;
 } XTermXftCache;
 
 typedef struct {
-	XftFont *	font;		/* main font */
 	XftPattern *	pattern;	/* pattern for main font */
 	XftFontSet *	fontset;	/* ordered list of fallback patterns */
-	XTermXftCache * cache;
-	unsigned	limit;		/* allocated size of cache[] */
-	unsigned	opened;		/* number of slots with xcOpened */
-	FontMap		map;
+	XTermXftCache	cache[MaxUChar + 1]; /* list of open font pointers */
+	unsigned	fs_size;	/* allocated size of cache[] */
+	Char		opened;		/* number in cache[] with xcOpened */
+	XTermFontInfo	font_info;	/* summary of font metrics */
+	XTermFontMap	font_map;	/* map of glyphs provided in fontset */
 } XTermXftFonts;
 
+#define XftFpN(p,n)	(p)->cache[(n)].font
+#define XftIsN(p,n)	(p)->cache[(n)].usage
+
+#define XftFp(p)	XftFpN(p,0)
+#define XftIs(p)	XftIsN(p,0)
+
 typedef	struct _ListXftFonts {
 	struct _ListXftFonts *next;
 	XftFont *	font;
@@ -2330,6 +2359,9 @@
 #if OPT_DIRECT_COLOR
 	Boolean		direct_color;	/* direct-color enabled?	*/
 #endif
+#if OPT_WIDE_ATTRS && OPT_SGR2_HASH
+	Boolean		faint_relative;	/* faint is relative?		*/
+#endif
 #endif /* OPT_ISO_COLORS */
 #if OPT_DEC_CHRSET
 	Boolean		font_doublesize;/* enable font-scaling		*/
@@ -2338,7 +2370,7 @@
 	int		fonts_used;	/* count items in double_fonts	*/
 	XTermFonts	double_fonts[NUM_CHRSET];
 #if OPT_RENDERFONT
-	XftFont *	double_xft_fonts[NUM_CHRSET];
+	XTermXftFonts	double_xft_fonts[NUM_CHRSET];
 #endif
 #endif /* OPT_DEC_CHRSET */
 #if OPT_DEC_RECTOPS
@@ -2758,6 +2790,7 @@
 #define AddStatusLineRows(nrow)         /* nothing */
 #define LastRowNumber(screen)           (screen)->max_row
 #define FirstRowNumber(screen)          0
+#define IsStatusShown(screen) False
 #define PlusStatusLine(screen,expr)     (expr)
 #define if_STATUS_LINE(screen,stmt)	/* nothing */
 
@@ -2892,12 +2925,17 @@
 	void *		icon_cgs_cache;
 #endif
 #if OPT_RENDERFONT
+	int		xft_max_glyph_memory;
+	int		xft_max_unref_fonts;
+	Boolean		xft_track_mem_usage;
 	Boolean		force_xft_height;
 	ListXftFonts	*list_xft_fonts;
 	XTermXftFonts	renderFontNorm[NMENUFONTS];
 	XTermXftFonts	renderFontBold[NMENUFONTS];
+#if OPT_WIDE_ATTRS || OPT_RENDERWIDE
 	XTermXftFonts	renderFontItal[NMENUFONTS];
 	XTermXftFonts	renderFontBtal[NMENUFONTS];
+#endif
 #if OPT_RENDERWIDE
 	XTermXftFonts	renderWideNorm[NMENUFONTS];
 	XTermXftFonts	renderWideBold[NMENUFONTS];
@@ -3234,6 +3272,7 @@
     Boolean force_wideFont;	/* true to single-step wideFont	*/
 #if OPT_RENDERFONT
     Boolean render_font;
+    FcPattern *xft_defaults;
     unsigned max_fontsets;
 #endif
 #if OPT_DABBREV
Index: screen.c
--- xterm-372+/screen.c	2022-03-09 01:20:09.000000000 +0000
+++ xterm-373/screen.c	2022-09-19 23:08:41.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: screen.c,v 1.623 2022/03/09 01:20:09 tom Exp $ */
+/* $XTermId: screen.c,v 1.626 2022/09/19 23:08:41 tom Exp $ */
 
 /*
  * Copyright 1999-2021,2022 by Thomas E. Dickey
@@ -632,7 +632,7 @@
 	 * data in the alternate buffer.
 	 */
 	if (screen->whichBuf)
-	    SwitchBufPtrs(screen, 0);
+	    SwitchBufPtrs(xw, 0);
 
 	ReallocateFifoIndex(xw);
 
@@ -659,7 +659,7 @@
 	 * Switch the pointers back before we start painting on the screen.
 	 */
 	if (whichBuf)
-	    SwitchBufPtrs(screen, whichBuf);
+	    SwitchBufPtrs(xw, whichBuf);
 
 	update_font_utf8_mode();
 	SetVTFont(xw, screen->menu_font_number, True, NULL);
@@ -1985,27 +1985,35 @@
 	cols = 1;
 
 #if OPT_STATUS_LINE
+    /*
+     * The dimensions passed to this function include the status-line.
+     * Discount that here (to obtain the actual rows/columns), and save
+     * the contents of the status-line, to repaint it after resizing.
+     */
     TRACE(("...StatusShown %d/%d\n", IsStatusShown(screen), screen->status_shown));
     if (IsStatusShown(screen)) {
 	int oldRow = MaxRows(screen);
+	int newRow = rows - StatusLineRows;
+	LineData *oldLD;
 	TRACE(("...status line is currently on row %d(%d-%d) vs %d\n",
 	       oldRow,
 	       MaxRows(screen),
 	       (screen->status_shown ? 0 : StatusLineRows),
 	       rows));
-	if (1 || rows != oldRow) {
-	    LineData *oldLD = getLineData(screen, oldRow);
-	    TRACE(("...will move status-line from row %d to %d\n",
-		   oldRow,
-		   rows));
-	    savedStatus = allocLineData(screen, oldLD);
-	    copyLineData(savedStatus, oldLD);
-	    TRACE(("...copied::%s\n",
-		   visibleIChars(savedStatus->charData,
-				 savedStatus->lineSize)));
-	}
+	oldLD = getLineData(screen, oldRow);
+	TRACE(("...copying:%s\n",
+	       visibleIChars(oldLD->charData,
+			     oldLD->lineSize)));
+	TRACE(("...will move status-line from row %d to %d\n",
+	       oldRow,
+	       newRow));
+	savedStatus = allocLineData(screen, oldLD);
+	copyLineData(savedStatus, oldLD);
+	TRACE(("...copied::%s\n",
+	       visibleIChars(savedStatus->charData,
+			     savedStatus->lineSize)));
 	TRACE(("...discount a row for status-line\n"));
-	rows -= StatusLineRows;
+	rows = newRow;
 	height -= FontHeight(screen) * StatusLineRows;
     }
 #endif
@@ -2240,6 +2248,9 @@
 	TRACE(("...status line is currently on row %d\n",
 	       LastRowNumber(screen)));
 	copyLineData(newLD, savedStatus);
+	TRACE(("...copied::%s\n",
+	       visibleIChars(newLD->charData,
+			     newLD->lineSize)));
 	freeLineData(screen, savedStatus);
     }
 #endif
Index: terminfo
--- xterm-372+/terminfo	2022-02-01 00:35:15.000000000 +0000
+++ xterm-373/terminfo	2022-06-20 23:37:59.000000000 +0000
@@ -1,4 +1,4 @@
-# $XTermId: terminfo,v 1.203 2022/02/01 00:35:15 tom Exp $
+# $XTermId: terminfo,v 1.204 2022/06/20 23:37:59 tom Exp $
 #
 # Updates/notes/new entries (e.g., xterm-8bit, xterm-16color, xterm-256color)
 # - Thomas E. Dickey
@@ -2772,7 +2772,7 @@
 dec+sl|DEC VTxx status line,
 	eslok,
 	hs,
-	dsl=\E[1$~,
+	dsl=\E[0$~,
 	fsl=\E[0$},
 	tsl=\E[2$~\E[1$}\E[%i%p1%d`,
 #
Index: trace.c
--- xterm-372+/trace.c	2022-02-18 08:48:47.000000000 +0000
+++ xterm-373/trace.c	2022-09-06 23:55:46.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: trace.c,v 1.236 2022/02/18 08:48:47 tom Exp $ */
+/* $XTermId: trace.c,v 1.238 2022/09/06 23:55:46 tom Exp $ */
 
 /*
  * Copyright 1997-2021,2022 by Thomas E. Dickey
@@ -504,6 +504,7 @@
     return result;
 }
 
+#if OPT_TEK4014
 const char *
 visibleTekparse(int code)
 {
@@ -523,6 +524,7 @@
     }
     return result;
 }
+#endif
 
 const char *
 visibleVTparse(int code)
@@ -902,9 +904,9 @@
 	    for (j = 0; j < XtNumber(ev->xkeymap.key_vector); ++j) {
 		if (ev->xkeymap.key_vector[j] != 0) {
 		    Cardinal k;
-		    for (k = 0; k < 8; ++k) {
+		    for (k = 0; k < CHAR_BIT; ++k) {
 			if (ev->xkeymap.key_vector[j] & (1 << k)) {
-			    TRACE((" key%u", (j * 8) + k));
+			    TRACE((" key%u", (j * CHAR_BIT) + k));
 			}
 		    }
 		}
Index: util.c
--- xterm-372+/util.c	2022-03-08 00:48:22.000000000 +0000
+++ xterm-373/util.c	2022-09-25 17:46:22.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: util.c,v 1.898 2022/03/08 00:48:22 tom Exp $ */
+/* $XTermId: util.c,v 1.913 2022/09/25 17:46:22 tom Exp $ */
 
 /*
  * Copyright 1999-2021,2022 by Thomas E. Dickey
@@ -2991,7 +2991,7 @@
 
 #endif /* OPT_RENDERWIDE */
 
-#define XFT_FONT(which) getXftFont(params->xw, which, fontnum)
+#define XFT_DATA(which) getMyXftFont(params->xw, which, fontnum)
 
 #if OPT_ISO_COLORS
 #define UseBoldFont(screen) (!(screen)->colorBDMode || ((screen)->veryBoldColors & BOLD))
@@ -3003,13 +3003,13 @@
 /*
  * Find Xft (truetype) double-width font for the given normal/bold attributes.
  */
-static XftFont *
+static XTermXftFonts *
 getWideXftFont(XTermDraw * params,
 	       unsigned attr_flags)
 {
     TScreen *screen = TScreenOf(params->xw);
     int fontnum = screen->menu_font_number;
-    XftFont *wfont = 0;
+    XTermXftFonts *result = 0;
 
 #if OPT_WIDE_ATTRS
     if ((attr_flags & ATR_ITALIC)
@@ -3019,13 +3019,13 @@
 	) {
 	if ((attr_flags & BOLDATTR(screen))
 	    && UseBoldFont(screen)
-	    && XFT_FONT(fWBtal)) {
-	    wfont = XFT_FONT(fWBtal);
-	} else if (XFT_FONT(fWItal)) {
-	    wfont = XFT_FONT(fWItal);
+	    && XFT_DATA(fWBtal)) {
+	    result = XFT_DATA(fWBtal);
+	} else if (XFT_DATA(fWItal)) {
+	    result = XFT_DATA(fWItal);
 	}
     }
-    if (wfont != 0) {
+    if (result != 0) {
 	;			/* skip the other tests */
     } else
 #endif
@@ -3033,39 +3033,39 @@
 	if ((attr_flags & UNDERLINE)
 	    && !screen->colorULMode
 	    && screen->italicULMode
-	    && XFT_FONT(fWItal)) {
-	wfont = XFT_FONT(fWItal);
+	    && XFT_DATA(fWItal)) {
+	result = XFT_DATA(fWItal);
     } else
 #endif
 	if ((attr_flags & BOLDATTR(screen))
 	    && UseBoldFont(screen)
-	    && XFT_FONT(fWBold)) {
-	wfont = XFT_FONT(fWBold);
+	    && XFT_DATA(fWBold)) {
+	result = XFT_DATA(fWBold);
     } else {
-	wfont = XFT_FONT(fWide);
+	result = XFT_DATA(fWide);
     }
-    return wfont;
+    return result;
 }
 #endif /* OPT_RENDERWIDE */
 
 /*
  * Find Xft (truetype) single-width font for the given normal/bold attributes.
  */
-static XftFont *
+static XTermXftFonts *
 getNormXftFont(XTermDraw * params,
 	       unsigned attr_flags,
 	       Bool *did_ul)
 {
     TScreen *screen = TScreenOf(params->xw);
     int fontnum = screen->menu_font_number;
-    XftFont *font = 0;
+    XTermXftFonts *result = NULL;
 
     (void) did_ul;
 #if OPT_DEC_CHRSET
     if (CSET_DOUBLE(params->real_chrset)) {
-	font = xterm_DoubleFT(params, params->real_chrset, attr_flags);
+	result = xterm_DoubleFT(params, params->real_chrset, attr_flags);
     }
-    if (font != 0) {
+    if (result != 0) {
 	;			/* found a usable double-sized font */
     } else
 #endif
@@ -3077,13 +3077,13 @@
 	) {
 	if ((attr_flags & BOLDATTR(screen))
 	    && UseBoldFont(screen)
-	    && XFT_FONT(fBtal)) {
-	    font = XFT_FONT(fBtal);
-	} else if (XFT_FONT(fItal)) {
-	    font = XFT_FONT(fItal);
+	    && XFT_DATA(fBtal)) {
+	    result = XFT_DATA(fBtal);
+	} else if (XFT_DATA(fItal)) {
+	    result = XFT_DATA(fItal);
 	}
     }
-    if (font != 0) {
+    if (result != NULL) {
 	;			/* skip the other tests */
     } else
 #endif
@@ -3091,24 +3091,26 @@
 	if ((attr_flags & UNDERLINE)
 	    && !screen->colorULMode
 	    && screen->italicULMode
-	    && XFT_FONT(fItal)) {
-	font = XFT_FONT(fItal);
+	    && XFT_DATA(fItal)) {
+	result = XFT_DATA(fItal);
 	*did_ul = True;
     } else
 #endif
 	if ((attr_flags & BOLDATTR(screen))
 	    && UseBoldFont(screen)
-	    && XFT_FONT(fBold)) {
-	font = XFT_FONT(fBold);
+	    && XFT_DATA(fBold)) {
+	result = XFT_DATA(fBold);
     } else {
-	font = XFT_FONT(fNorm);
+	result = XFT_DATA(fNorm);
     }
-    return font;
+    return result;
 }
 
 #if OPT_RENDERWIDE
-#define pickXftFont(width, nf, wf) ((width == 2 && wf != 0) ? wf : nf)
+#define pickXftData(width, nf, wf) (((width == 2) && ((wf) != NULL) && XftFp(wf) != NULL) ? (wf) : (nf))
+#define pickXftFont(width, nf, wf) (((width == 2) && ((wf) != NULL)) ? (wf) : (nf))
 #else
+#define pickXftData(width, nf, wf) (nf)
 #define pickXftFont(width, nf, wf) (nf)
 #endif
 
@@ -3140,7 +3142,8 @@
     if (len != 0) {
 #if OPT_RENDERWIDE
 	XftCharSpec *sbuf;
-	XftFont *wfont = getWideXftFont(params, attr_flags);
+	XTermXftFonts *wdata = getWideXftFont(params, attr_flags);
+	XftFont *wfont = XftFp(wdata);
 	Cardinal src, dst;
 	XftFont *lastFont = 0;
 	XftFont *currFont = 0;
@@ -3906,12 +3909,14 @@
     if (UsingRenderFont(recur.xw)) {
 	VTwin *currentWin = WhichVWin(screen);
 	Display *dpy = screen->display;
-	XftFont *font;
-	XftFont *font0;
+	XTermXftFonts *ndata;
 	XGCValues values;
+#if OPT_WIDE_CHARS
+	XTermXftFonts *ndata0;
+#endif
 #if OPT_RENDERWIDE
-	XftFont *wfont;
-	XftFont *wfont0;
+	XTermXftFonts *wdata;
+	XTermXftFonts *wdata0;
 #endif
 
 #if OPT_DEC_CHRSET
@@ -3940,19 +3945,18 @@
 	}
 
 	/*
-	 * font0/wfont0 provide fallback to non-bolded Xft font if a glyph is
+	 * ndata0/wdata0 provide fallback to non-bolded Xft font if a glyph is
 	 * not found in the bold version.
 	 */
 #define IS_BOLD  (recur.attr_flags & BOLDATTR(screen))
 #define NOT_BOLD (recur.attr_flags & ~BOLDATTR(screen))
-	font = getNormXftFont(&recur, recur.attr_flags, &did_ul);
-	font0 = IS_BOLD ? getNormXftFont(&recur, NOT_BOLD, &did_ul) : font;
-	(void) font0;
+	ndata = getNormXftFont(&recur, recur.attr_flags, &did_ul);
+#if OPT_WIDE_CHARS
+	ndata0 = IS_BOLD ? getNormXftFont(&recur, NOT_BOLD, &did_ul) : ndata;
+#endif
 #if OPT_RENDERWIDE
-	wfont = getWideXftFont(&recur, recur.attr_flags);
-	wfont0 = IS_BOLD ? getWideXftFont(&recur, NOT_BOLD) : wfont;
-
-	(void) wfont0;
+	wdata = getWideXftFont(&recur, recur.attr_flags);
+	wdata0 = IS_BOLD ? getWideXftFont(&recur, NOT_BOLD) : wdata;
 #endif
 
 #define GET_XFT_FG() getXftColor(recur.xw, values.foreground)
@@ -3965,7 +3969,7 @@
 	    XftColor *bg_color = GET_XFT_BG();
 	    int ncells = xtermXftWidth(&recur, recur.attr_flags,
 				       bg_color,
-				       font, x, y,
+				       XftFp(ndata), x, y,
 				       text,
 				       len);
 	    XftDrawRect(screen->renderDraw,
@@ -3975,7 +3979,7 @@
 			(unsigned) FontHeight(screen));
 	}
 
-	y += font->ascent;
+	y += XftFp(ndata)->ascent;
 #if OPT_BOX_CHARS
 	{
 	    /* adding code to substitute simulated line-drawing characters */
@@ -3989,9 +3993,9 @@
 		int filler = 0;
 #if OPT_WIDE_CHARS
 		int needed = forceDbl ? 2 : CharWidth(screen, ch);
-		XftFont *currFont = pickXftFont(needed, font, wfont);
+		XTermXftFonts *currData = pickXftData(needed, ndata, wdata);
 		XftFont *tempFont = 0;
-#define CURR_TEMP (tempFont ? tempFont : currFont)
+#define CURR_TEMP (tempFont ? tempFont : XftFp(currData))
 
 		if (xtermIsDecGraphic(ch) || ch == 0) {
 		    /*
@@ -4004,7 +4008,8 @@
 		    if (screen->force_box_chars
 			|| screen->broken_box_chars
 			|| xtermXftMissing(recur.xw,
-					   currFont,
+					   currData, 0,
+					   XftFp(currData),
 					   dec2ucs(screen, ch))) {
 			SetMissing("case 1");
 		    } else {
@@ -4026,11 +4031,21 @@
 				ch = part;
 			    }
 			}
-			if (!missing && xtermXftMissing(recur.xw, currFont, ch)) {
-			    XftFont *test = findXftGlyph(recur.xw, currFont, ch);
-			    if (test == 0)
-				test = pickXftFont(needed, font0, wfont0);
-			    if (!xtermXftMissing(recur.xw, test, ch)) {
+			if (!missing && xtermXftMissing(recur.xw,
+							currData, 0,
+							XftFp(currData), ch)) {
+			    int found = findXftGlyph(recur.xw, currData, ch);
+			    XftFont *test;
+			    if (found >= 0) {
+				test = XftFpN(currData, found);
+			    } else {
+				test = pickXftFont(needed,
+						   XftFp(ndata0),
+						   XftFp(wdata0));
+			    }
+			    if (!xtermXftMissing(recur.xw,
+						 currData, found,
+						 test, ch)) {
 				tempFont = test;
 				replace = True;
 				filler = 0;
@@ -4045,8 +4060,8 @@
 		    });
 		}
 #else
-		XftFont *currFont = font;
-#define CURR_TEMP (currFont)
+		XTermXftFonts *currData = ndata;
+#define CURR_TEMP XftFp(currData)
 		if (xtermIsDecGraphic(ch)) {
 		    /*
 		     * Xft generally does not have the line-drawing characters
@@ -4055,7 +4070,9 @@
 		     * Unicode position.  Failing that, use our own
 		     * box-characters.
 		     */
-		    if (xtermXftMissing(recur.xw, currFont, ch)) {
+		    if (xtermXftMissing(recur.xw,
+					currData, 0,
+					XftFp(currData), ch)) {
 			SetMissing("case 4");
 		    }
 		}
@@ -4069,7 +4086,7 @@
 		    if (last > first) {
 			int nc = drawClippedXftString(&recur,
 						      recur.attr_flags,
-						      currFont,
+						      XftFp(currData),
 						      GET_XFT_FG(),
 						      curX,
 						      y,
@@ -4127,7 +4144,7 @@
 		underline_len += (Cardinal)
 		    drawClippedXftString(&recur,
 					 recur.attr_flags,
-					 font,
+					 XftFp(ndata),
 					 GET_XFT_FG(),
 					 curX,
 					 y,
@@ -4140,7 +4157,7 @@
 	    underline_len += (Cardinal)
 		drawClippedXftString(&recur,
 				     recur.attr_flags,
-				     font,
+				     XftFp(ndata),
 				     GET_XFT_FG(),
 				     x,
 				     y,
@@ -5006,15 +5023,18 @@
 		   unsigned fw)
 {
     TScreen *screen = TScreenOf(xw);
+    int actual_rows = PlusStatusLine(screen, screen->max_row + 1);
+    Boolean visible = (((int) width > 0)
+		       && ((left + (int) width) <= screen->max_col + 1)
+		       && (((int) height + top) <= actual_rows));
+
+    TRACE(("ClearCurBackground %d,%d %dx%d%s with %d %s\n",
+	   top, left, height, width,
+	   IsStatusShown(screen) ? "*" : "",
+	   xw->cur_background,
+	   visible ? "(ok)" : "(err)"));
 
-    TRACE(("ClearCurBackground %d,%d %dx%d with %d\n",
-	   top, left, height, width, xw->cur_background));
-
-    assert((int) width > 0);
-    assert((left + (int) width) <= screen->max_col + 1);
-    assert((int) (height + top) <= screen->max_row + 1);
-
-    if (VWindow(screen)) {
+    if (VWindow(screen) && visible) {
 	set_background(xw, xw->cur_background);
 
 	xtermClear2(xw,
@@ -5048,6 +5068,44 @@
     return result;
 }
 
+#if OPT_ISO_COLORS && OPT_WIDE_ATTRS
+#if OPT_SGR2_HASH
+typedef struct _DimColorHT {
+    Pixel org;
+    Pixel dim;
+} DimColorHT;
+
+static unsigned
+jhash1(unsigned char *key, size_t len)
+{
+    unsigned hash;
+    size_t i;
+
+    for (hash = 0, i = 0; i < len; ++i) {
+	hash += key[i];
+	hash += (hash << 10);
+	hash ^= (hash >> 6);
+    }
+    hash += (hash << 3);
+    hash ^= (hash >> 11);
+    hash += (hash << 15);
+    return hash;
+}
+
+static unsigned
+computeFaint(XtermWidget xw, unsigned value, unsigned compare)
+{
+    TScreen *screen = TScreenOf(xw);
+    if (screen->faint_relative) {
+	value = (unsigned) ((value + compare) / 2);
+    } else {
+	value = (unsigned) ((2 * value) / 3);
+    }
+    return value;
+}
+#endif /* OPT_SGR2_HASH */
+#endif /* OPT_ISO_COLORS && OPT_WIDE_ATTRS */
+
 Pixel
 getXtermForeground(XtermWidget xw, unsigned attr_flags, int color)
 {
@@ -5066,9 +5124,57 @@
     (void) color;
 #endif
 
-#if OPT_WIDE_ATTRS
-#define DIM_IT(n) work.n = (unsigned short) ((2 * (unsigned)work.n) / 3)
+#if OPT_ISO_COLORS && OPT_WIDE_ATTRS
     if ((attr_flags & ATR_FAINT)) {
+#if OPT_SGR2_HASH
+#define DIM_IT(n) work.n = (unsigned short) computeFaint(xw, work.n, bkg.n)
+#define SizeOfHT ((unsigned) sizeof(unsigned long) * CHAR_BIT)
+	static DimColorHT ht[SizeOfHT];
+	Pixel bg = T_COLOR(TScreenOf(xw), TEXT_BG);
+	XColor work;
+	Pixel p;
+
+	if ((color >= 0)
+	    || (result != (Pixel) color)) {
+	    static unsigned long have = 0;
+	    static Boolean have_bg = False;
+	    static XColor bkg;
+
+	    /* cache bkg color in r/g/b */
+	    if (!have_bg || bg != bkg.pixel) {
+		bkg.pixel = bg;
+		have_bg = QueryOneColor(xw, &bkg);
+		have = 0;	/* invalidate color cache */
+	    }
+	    if (have_bg) {
+		unsigned hv;
+		hv = jhash1((unsigned char *) &result, sizeof(result));
+		hv %= SizeOfHT;
+
+		if ((have & (1UL << hv))
+		    && ht[hv].org == result) {
+		    result = ht[hv].dim;	/* return cached color */
+		} else {
+		    work.pixel = result;
+		    if (QueryOneColor(xw, &work)) {
+			DIM_IT(red);
+			DIM_IT(green);
+			DIM_IT(blue);
+			p = result;
+			if (allocateBestRGB(xw, &work)) {
+			    result = work.pixel;
+			}
+
+			/* cache the result */
+			have |= (1UL << hv);
+			ht[hv].org = p;
+			ht[hv].dim = result;
+		    }
+		}
+	    }
+	}
+#else /* !OPT_SGR2_HASH */
+#define DIM_IT(n) work.n = (unsigned short) ((2 * (unsigned)work.n) / 3)
 	static Pixel last_in;
 	static Pixel last_out;
 	if ((result != last_in)
@@ -5089,6 +5195,7 @@
 	} else {
 	    result = last_out;
 	}
+#endif /* OPT_SGR2_HASH */
     }
 #endif
     return result;
@@ -5602,11 +5709,7 @@
 void
 discardRenderDraw(TScreen *screen)
 {
-    if (
-#if USE_DOUBLE_BUFFER
-	   resource.buffered &&
-#endif
-	   screen->renderDraw) {
+    if (screen->renderDraw) {
 	XftDrawDestroy(screen->renderDraw);
 	screen->renderDraw = NULL;
     }
Index: uxterm.desktop
--- xterm-372+/uxterm.desktop	2019-02-06 01:36:47.000000000 +0000
+++ xterm-373/uxterm.desktop	2022-09-06 21:09:42.000000000 +0000
@@ -1,8 +1,8 @@
-# $XTermId: uxterm.desktop,v 1.15 2019/02/06 01:36:47 tom Exp $
+# $XTermId: uxterm.desktop,v 1.16 2022/09/06 21:09:42 tom Exp $
 # -----------------------------------------------------------------------------
 # this file is part of xterm
 #
-# Copyright 2006-2016,2019 by Thomas E. Dickey
+# Copyright 2006-2019,2022 by Thomas E. Dickey
 # 
 #                         All Rights Reserved
 # 
@@ -41,3 +41,4 @@
 Icon=xterm-color_48x48
 Categories=System;TerminalEmulator;
 Keywords=shell;prompt;command;commandline;cmd;
+StartupWMClass=UXTerm
Index: version.h
--- xterm-372+/version.h	2022-03-10 00:58:00.000000000 +0000
+++ xterm-373/version.h	2022-09-25 23:03:48.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: version.h,v 1.522 2022/03/10 00:58:00 tom Exp $ */
+/* $XTermId: version.h,v 1.524 2022/09/25 23:03:48 tom Exp $ */
 
 /*
  * Copyright 1998-2021,2022 by Thomas E. Dickey
@@ -38,8 +38,8 @@
  * version of X to which this version of xterm has been built.  The resulting
  * number in parentheses is my patch number (Thomas E. Dickey).
  */
-#define XTERM_PATCH   372
-#define XTERM_DATE    2022-03-09
+#define XTERM_PATCH   373
+#define XTERM_DATE    2022-09-25
 
 #ifndef __vendorversion__
 #define __vendorversion__ "XTerm"
Index: vttests/16colors.sh
--- xterm-372+/vttests/16colors.sh	2022-02-13 14:33:35.000000000 +0000
+++ xterm-373/vttests/16colors.sh	2022-04-24 23:36:20.000000000 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $XTermId: 16colors.sh,v 1.20 2022/02/13 14:33:35 tom Exp $
+# $XTermId: 16colors.sh,v 1.22 2022/04/24 23:36:20 tom Exp $
 # -----------------------------------------------------------------------------
 # this file is part of xterm
 #
@@ -41,14 +41,15 @@
 CMD='/bin/echo'
 OPT='-n'
 SUF=''
-TMP=`(mktemp) 2>/dev/null` || TMP=/tmp/xterm$$
+: "${TMPDIR=/tmp}"
+TMP=`(mktemp "$TMPDIR/xterm.XXXXXXXX") 2>/dev/null` || TMP="$TMPDIR/xterm$$"
 eval '$CMD $OPT >$TMP || echo fail >$TMP' 2>/dev/null
-{ test ! -f $TMP || test -s $TMP; } &&
+{ test ! -f "$TMP" || test -s "$TMP"; } &&
 for verb in "printf" "print" ; do
-    rm -f $TMP
+    rm -f "$TMP"
     eval '$verb "\c" >$TMP || echo fail >$TMP' 2>/dev/null
-    if test -f $TMP ; then
-	if test ! -s $TMP ; then
+    if test -f "$TMP" ; then
+	if test ! -s "$TMP" ; then
 	    CMD="$verb"
 	    OPT=
 	    SUF='\c'
@@ -56,7 +57,7 @@
 	fi
     fi
 done
-rm -f $TMP
+rm -f "$TMP"
 
 trap '$CMD "${CSI}0m"; exit 1' 1 2 3 15
 trap '$CMD "${CSI}0m"' 0
Index: vttests/8colors.sh
--- xterm-372+/vttests/8colors.sh	2022-02-13 14:42:02.000000000 +0000
+++ xterm-373/vttests/8colors.sh	2022-04-24 23:36:20.000000000 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $XTermId: 8colors.sh,v 1.21 2022/02/13 14:42:02 tom Exp $
+# $XTermId: 8colors.sh,v 1.23 2022/04/24 23:36:20 tom Exp $
 # -----------------------------------------------------------------------------
 # this file is part of xterm
 #
@@ -38,14 +38,15 @@
 CMD='/bin/echo'
 OPT='-n'
 SUF=''
-TMP=`(mktemp) 2>/dev/null` || TMP=/tmp/xterm$$
+: "${TMPDIR=/tmp}"
+TMP=`(mktemp "$TMPDIR/xterm.XXXXXXXX") 2>/dev/null` || TMP="$TMPDIR/xterm$$"
 eval '$CMD $OPT >$TMP || echo fail >$TMP' 2>/dev/null
-{ test ! -f $TMP || test -s $TMP; } &&
+{ test ! -f "$TMP" || test -s "$TMP"; } &&
 for verb in "printf" "print" ; do
-    rm -f $TMP
+    rm -f "$TMP"
     eval '$verb "\c" >$TMP || echo fail >$TMP' 2>/dev/null
-    if test -f $TMP ; then
-	if test ! -s $TMP ; then
+    if test -f "$TMP" ; then
+	if test ! -s "$TMP" ; then
 	    CMD="$verb"
 	    OPT=
 	    SUF='\c'
@@ -53,7 +54,7 @@
 	fi
     fi
 done
-rm -f $TMP
+rm -f "$TMP"
 
 trap '$CMD $OPT "${CSI}0m"; exit 1' 1 2 3 15
 trap '$CMD $OPT "${CSI}0m"' 0
Index: vttests/acolors.sh
--- xterm-372+/vttests/acolors.sh	2022-02-13 14:34:17.000000000 +0000
+++ xterm-373/vttests/acolors.sh	2022-04-25 08:19:38.000000000 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $XTermId: acolors.sh,v 1.13 2022/02/13 14:34:17 tom Exp $
+# $XTermId: acolors.sh,v 1.16 2022/04/25 08:19:38 tom Exp $
 # -----------------------------------------------------------------------------
 # this file is part of xterm
 #
@@ -38,14 +38,15 @@
 CMD='/bin/echo'
 OPT='-n'
 SUF=''
-TMP=`(mktemp) 2>/dev/null` || TMP=/tmp/xterm$$
+: "${TMPDIR=/tmp}"
+TMP=`(mktemp "$TMPDIR/xterm.XXXXXXXX") 2>/dev/null` || TMP="$TMPDIR/xterm$$"
 eval '$CMD $OPT >$TMP || echo fail >$TMP' 2>/dev/null
-{ test ! -f $TMP || test -s $TMP; } &&
+{ test ! -f "$TMP" || test -s "$TMP"; } &&
 for verb in "printf" "print" ; do
-    rm -f $TMP
+    rm -f "$TMP"
     eval '$verb "\c" >$TMP || echo fail >$TMP' 2>/dev/null
-    if test -f $TMP ; then
-	if test ! -s $TMP ; then
+    if test -f "$TMP" ; then
+	if test ! -s "$TMP" ; then
 	    CMD="$verb"
 	    OPT=
 	    SUF='\c'
@@ -53,7 +54,7 @@
 	fi
     fi
 done
-rm -f $TMP
+rm -f "$TMP"
 
 LIST="00 30 80 d0 ff"
 
@@ -62,7 +63,7 @@
 stty raw -echo min 0  time 5
 
 $CMD $OPT "${ESC}]4;4;?${SUF}" > /dev/tty
-read original
+read -r original
 stty $old
 original=${original}${SUF}
 
Index: vttests/ctlpix.sh
--- xterm-372+/vttests/ctlpix.sh	2019-05-02 22:02:06.000000000 +0000
+++ xterm-373/vttests/ctlpix.sh	2022-04-25 08:03:21.000000000 +0000
@@ -1,9 +1,9 @@
 #!/bin/sh
-# $XTermId: ctlpix.sh,v 1.2 2019/05/02 22:02:06 tom Exp $
+# $XTermId: ctlpix.sh,v 1.6 2022/04/25 08:03:21 tom Exp $
 # -----------------------------------------------------------------------------
 # this file is part of xterm
 #
-# Copyright 2019 by Thomas E. Dickey
+# Copyright 2019,2022 by Thomas E. Dickey
 # 
 #                         All Rights Reserved
 # 
@@ -31,11 +31,13 @@
 # sale, use or other dealings in this Software without prior written
 # authorization.
 # -----------------------------------------------------------------------------
+PATH="$(dirname "$(readlink -f "$0")"):$PATH"
+export PATH
 clear
 lo=9216
 hi=9232
 for n in `seq $lo $hi`
 do
-	vxt-utf8 $n
+	utf8.pl "$n"
 done
-vxt-altchars
+altchars.sh
Index: vttests/dl.sh
--- xterm-372+/vttests/dl.sh	2019-11-18 10:13:03.000000000 +0000
+++ xterm-373/vttests/dl.sh	2022-04-25 08:25:37.000000000 +0000
@@ -1,9 +1,9 @@
 #!/bin/bash
-# $XTermId: dl.sh,v 1.2 2019/11/18 10:13:03 tom Exp $
+# $XTermId: dl.sh,v 1.4 2022/04/25 08:25:37 tom Exp $
 # -----------------------------------------------------------------------------
 # this file is part of xterm
 #
-# Copyright 2019 by Thomas E. Dickey
+# Copyright 2019,2022 by Thomas E. Dickey
 # 
 #                         All Rights Reserved
 # 
@@ -53,7 +53,7 @@
 
 finish_test() {
 	printf '\033[10;1H'
-	read -p "$*"
+	read -r -p "$*"
 }
 
 start_test
Index: vttests/doublechars.sh
--- xterm-372+/vttests/doublechars.sh	2022-02-13 14:34:47.000000000 +0000
+++ xterm-373/vttests/doublechars.sh	2022-04-25 23:25:41.000000000 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $XTermId: doublechars.sh,v 1.22 2022/02/13 14:34:47 tom Exp $
+# $XTermId: doublechars.sh,v 1.26 2022/04/25 23:25:41 tom Exp $
 # -----------------------------------------------------------------------------
 # this file is part of xterm
 #
@@ -42,14 +42,15 @@
 CMD='/bin/echo'
 OPT='-n'
 SUF=''
-TMP=`(mktemp) 2>/dev/null` || TMP=/tmp/xterm$$
+: "${TMPDIR=/tmp}"
+TMP=`(mktemp "$TMPDIR/xterm.XXXXXXXX") 2>/dev/null` || TMP="$TMPDIR/xterm$$"
 eval '$CMD $OPT >$TMP || echo fail >$TMP' 2>/dev/null
-{ test ! -f $TMP || test -s $TMP; } &&
+{ test ! -f "$TMP" || test -s "$TMP"; } &&
 for verb in "printf" "print" ; do
-    rm -f $TMP
+    rm -f "$TMP"
     eval '$verb "\c" >$TMP || echo fail >$TMP' 2>/dev/null
-    if test -f $TMP ; then
-	if test ! -s $TMP ; then
+    if test -f "$TMP" ; then
+	if test ! -s "$TMP" ; then
 	    CMD="$verb"
 	    OPT=
 	    SUF='\c'
@@ -57,16 +58,21 @@
 	fi
     fi
 done
-rm -f $TMP
+rm -f "$TMP"
 
+ITAL=no
 SAVE=yes
 WRAP=no
 if test $# != 0 ; then
     while test $# != 0
     do
     	case $1 in
+	-i)	ITAL=yes ;;
 	-n)	SAVE=no ;;
 	-w)	WRAP=yes ;;
+	*)
+		echo "usage: $0 [-i] [-n] [-w]"
+		exit 1
 	esac
 	shift
     done
@@ -78,7 +84,7 @@
     stty raw -echo min 0  time 5
 
     $CMD $OPT "${CSI}18t${SUF}" > /dev/tty
-    IFS=';' read junk high wide
+    IFS=';' read -r junk high wide
 
     stty $old
 
@@ -103,6 +109,7 @@
 for SGR in 0 1 4 5 7
 do
 	$CMD $OPT "${CSI}0;${SGR}m" >/dev/tty
+	test "$ITAL" = yes && $CMD $OPT "${CSI}3m" >/dev/tty
 	for DBL in 5 3 4 6 5
 	do
 		$CMD $OPT "${ESC}#${DBL}" >/dev/tty
Index: vttests/dynamic.sh
--- xterm-372+/vttests/dynamic.sh	2022-02-13 14:35:09.000000000 +0000
+++ xterm-373/vttests/dynamic.sh	2022-04-25 08:19:38.000000000 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $XTermId: dynamic.sh,v 1.22 2022/02/13 14:35:09 tom Exp $
+# $XTermId: dynamic.sh,v 1.25 2022/04/25 08:19:38 tom Exp $
 # -----------------------------------------------------------------------------
 # this file is part of xterm
 #
@@ -39,14 +39,15 @@
 CMD='/bin/echo'
 OPT='-n'
 SUF=''
-TMP=`(mktemp) 2>/dev/null` || TMP=/tmp/xterm$$
+: "${TMPDIR=/tmp}"
+TMP=`(mktemp "$TMPDIR/xterm.XXXXXXXX") 2>/dev/null` || TMP="$TMPDIR/xterm$$"
 eval '$CMD $OPT >$TMP || echo fail >$TMP' 2>/dev/null
-{ test ! -f $TMP || test -s $TMP; } &&
+{ test ! -f "$TMP" || test -s "$TMP"; } &&
 for verb in "printf" "print" ; do
-    rm -f $TMP
+    rm -f "$TMP"
     eval '$verb "\c" >$TMP || echo fail >$TMP' 2>/dev/null
-    if test -f $TMP ; then
-	if test ! -s $TMP ; then
+    if test -f "$TMP" ; then
+	if test ! -s "$TMP" ; then
 	    CMD="$verb"
 	    OPT=
 	    SUF='\c'
@@ -54,7 +55,7 @@
 	fi
     fi
 done
-rm -f $TMP
+rm -f "$TMP"
 
 LIST="00 30 80 d0 ff"
 
@@ -63,7 +64,7 @@
 stty raw -echo min 0  time 5
 
 $CMD $OPT "${OSC}11;?${SUF}" > /dev/tty
-read original
+read -r original
 stty $old
 original=${original}${SUF}
 
Index: vttests/dynamic2.sh
--- xterm-372+/vttests/dynamic2.sh	2022-02-13 14:35:30.000000000 +0000
+++ xterm-373/vttests/dynamic2.sh	2022-04-25 08:19:38.000000000 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $XTermId: dynamic2.sh,v 1.8 2022/02/13 14:35:30 tom Exp $
+# $XTermId: dynamic2.sh,v 1.11 2022/04/25 08:19:38 tom Exp $
 # -----------------------------------------------------------------------------
 # this file is part of xterm
 #
@@ -39,14 +39,15 @@
 CMD='/bin/echo'
 OPT='-n'
 SUF=''
-TMP=`(mktemp) 2>/dev/null` || TMP=/tmp/xterm$$
+: "${TMPDIR=/tmp}"
+TMP=`(mktemp "$TMPDIR/xterm.XXXXXXXX") 2>/dev/null` || TMP="$TMPDIR/xterm$$"
 eval '$CMD $OPT >$TMP || echo fail >$TMP' 2>/dev/null
-{ test ! -f $TMP || test -s $TMP; } &&
+{ test ! -f "$TMP" || test -s "$TMP"; } &&
 for verb in "printf" "print" ; do
-    rm -f $TMP
+    rm -f "$TMP"
     eval '$verb "\c" >$TMP || echo fail >$TMP' 2>/dev/null
-    if test -f $TMP ; then
-	if test ! -s $TMP ; then
+    if test -f "$TMP" ; then
+	if test ! -s "$TMP" ; then
 	    CMD="$verb"
 	    OPT=
 	    SUF='\c'
@@ -54,7 +55,7 @@
 	fi
     fi
 done
-rm -f $TMP
+rm -f "$TMP"
 
 LIST="00 30 80 d0 ff"
 FULL="10 11 12 13 14 15 16 17 18"
@@ -69,7 +70,7 @@
 for N in $FULL
 do
     $CMD $OPT "${OSC}$N;?${SUF}" > /dev/tty
-    read reply
+    read -r reply
     eval original"$N"='${reply}${SUF}'
     original=${original}${reply}${SUF}
 done
Index: vttests/fonts.sh
--- xterm-372+/vttests/fonts.sh	2022-02-13 14:35:50.000000000 +0000
+++ xterm-373/vttests/fonts.sh	2022-04-25 08:19:38.000000000 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $XTermId: fonts.sh,v 1.17 2022/02/13 14:35:50 tom Exp $
+# $XTermId: fonts.sh,v 1.20 2022/04/25 08:19:38 tom Exp $
 # -----------------------------------------------------------------------------
 # this file is part of xterm
 #
@@ -38,14 +38,15 @@
 CMD='/bin/echo'
 OPT='-n'
 SUF=''
-TMP=`(mktemp) 2>/dev/null` || TMP=/tmp/xterm$$
+: "${TMPDIR=/tmp}"
+TMP=`(mktemp "$TMPDIR/xterm.XXXXXXXX") 2>/dev/null` || TMP="$TMPDIR/xterm$$"
 eval '$CMD $OPT >$TMP || echo fail >$TMP' 2>/dev/null
-{ test ! -f $TMP || test -s $TMP; } &&
+{ test ! -f "$TMP" || test -s "$TMP"; } &&
 for verb in "printf" "print" ; do
-    rm -f $TMP
+    rm -f "$TMP"
     eval '$verb "\c" >$TMP || echo fail >$TMP' 2>/dev/null
-    if test -f $TMP ; then
-	if test ! -s $TMP ; then
+    if test -f "$TMP" ; then
+	if test ! -s "$TMP" ; then
 	    CMD="$verb"
 	    OPT=
 	    SUF='\c'
@@ -53,14 +54,14 @@
 	fi
     fi
 done
-rm -f $TMP
+rm -f "$TMP"
 
 exec </dev/tty
 old=`stty -g`
 stty raw -echo min 0  time 5
 
 $CMD $OPT "${ESC}]50;?${SUF}" > /dev/tty
-read original
+read -r original
 
 stty $old
 original="${original}${SUF}"
Index: vttests/il.sh
--- xterm-372+/vttests/il.sh	2019-11-18 10:17:38.000000000 +0000
+++ xterm-373/vttests/il.sh	2022-04-25 08:26:38.000000000 +0000
@@ -1,9 +1,9 @@
 #!/bin/bash
-# $XTermId: il.sh,v 1.2 2019/11/18 10:17:38 tom Exp $
+# $XTermId: il.sh,v 1.3 2022/04/25 08:26:38 tom Exp $
 # -----------------------------------------------------------------------------
 # this file is part of xterm
 #
-# Copyright 2019 by Thomas E. Dickey
+# Copyright 2019,2022 by Thomas E. Dickey
 # 
 #                         All Rights Reserved
 # 
@@ -53,7 +53,7 @@
 
 finish_test() {
 	printf '\033[10;1H'
-	read -p "$*"
+	read -r -p "$*"
 }
 
 start_test
Index: vttests/other-sgr.sh
--- xterm-372+/vttests/other-sgr.sh	2022-02-13 14:36:10.000000000 +0000
+++ xterm-373/vttests/other-sgr.sh	2022-04-24 23:36:20.000000000 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $XTermId: other-sgr.sh,v 1.7 2022/02/13 14:36:10 tom Exp $
+# $XTermId: other-sgr.sh,v 1.9 2022/04/24 23:36:20 tom Exp $
 # -----------------------------------------------------------------------------
 # this file is part of xterm
 #
@@ -38,14 +38,15 @@
 CMD='/bin/echo'
 OPT='-n'
 SUF=''
-TMP=`(mktemp) 2>/dev/null` || TMP=/tmp/xterm$$
+: "${TMPDIR=/tmp}"
+TMP=`(mktemp "$TMPDIR/xterm.XXXXXXXX") 2>/dev/null` || TMP="$TMPDIR/xterm$$"
 eval '$CMD $OPT >$TMP || echo fail >$TMP' 2>/dev/null
-{ test ! -f $TMP || test -s $TMP; } &&
+{ test ! -f "$TMP" || test -s "$TMP"; } &&
 for verb in "printf" "print" ; do
-    rm -f $TMP
+    rm -f "$TMP"
     eval '$verb "\c" >$TMP || echo fail >$TMP' 2>/dev/null
-    if test -f $TMP ; then
-	if test ! -s $TMP ; then
+    if test -f "$TMP" ; then
+	if test ! -s "$TMP" ; then
 	    CMD="$verb"
 	    OPT=
 	    SUF='\c'
@@ -53,7 +54,7 @@
 	fi
     fi
 done
-rm -f $TMP
+rm -f "$TMP"
 
 trap '$CMD $OPT "${CSI}0m"; exit 1' 1 2 3 15
 trap '$CMD $OPT "${CSI}0m"' 0
Index: vttests/resize.sh
--- xterm-372+/vttests/resize.sh	2022-02-13 14:36:28.000000000 +0000
+++ xterm-373/vttests/resize.sh	2022-04-25 08:19:38.000000000 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $XTermId: resize.sh,v 1.22 2022/02/13 14:36:28 tom Exp $
+# $XTermId: resize.sh,v 1.25 2022/04/25 08:19:38 tom Exp $
 # -----------------------------------------------------------------------------
 # this file is part of xterm
 #
@@ -39,14 +39,15 @@
 CMD='/bin/echo'
 OPT='-n'
 SUF=''
-TMP=`(mktemp) 2>/dev/null` || TMP=/tmp/xterm$$
+: "${TMPDIR=/tmp}"
+TMP=`(mktemp "$TMPDIR/xterm.XXXXXXXX") 2>/dev/null` || TMP="$TMPDIR/xterm$$"
 eval '$CMD $OPT >$TMP || echo fail >$TMP' 2>/dev/null
-{ test ! -f $TMP || test -s $TMP; } &&
+{ test ! -f "$TMP" || test -s "$TMP"; } &&
 for verb in "printf" "print" ; do
-    rm -f $TMP
+    rm -f "$TMP"
     eval '$verb "\c" >$TMP || echo fail >$TMP' 2>/dev/null
-    if test -f $TMP ; then
-	if test ! -s $TMP ; then
+    if test -f "$TMP" ; then
+	if test ! -s "$TMP" ; then
 	    CMD="$verb"
 	    OPT=
 	    SUF='\c'
@@ -54,17 +55,17 @@
 	fi
     fi
 done
-rm -f $TMP
+rm -f "$TMP"
 
 exec </dev/tty
 old=`stty -g`
 stty raw -echo min 0  time 5
 
 $CMD $OPT "${CSI}18t${SUF}" > /dev/tty
-IFS=';' read junk high wide
+IFS=';' read -r junk high wide
 
 $CMD $OPT "${CSI}19t${SUF}" > /dev/tty
-IFS=';' read junk maxhigh maxwide
+IFS=';' read -r junk maxhigh maxwide
 
 stty $old
 
Index: vttests/tab0.sh
--- xterm-372+/vttests/tab0.sh	2019-06-01 16:03:03.000000000 +0000
+++ xterm-373/vttests/tab0.sh	2022-04-25 22:49:46.000000000 +0000
@@ -1,7 +1,7 @@
 #!/bin/sh
-# $XTermId: tab0.sh,v 1.2 2019/06/01 16:03:03 tom Exp $
+# $XTermId: tab0.sh,v 1.6 2022/04/25 22:49:46 tom Exp $
 # -----------------------------------------------------------------------------
-# Copyright 2019 by Thomas E. Dickey
+# Copyright 2019,2022 by Thomas E. Dickey
 #
 #                         All Rights Reserved
 #
@@ -31,44 +31,44 @@
 # -----------------------------------------------------------------------------
 # Demonstrate hard-tabs.
 
-: ${TABS:=tabs}
-: ${TPUT:=tput}
+: "${TABS:=tabs}"
+: "${TPUT:=tput}"
 
 show() {
-	printf "Tabs $1:"
-	read ignore
+	printf "Tabs %s:" "$1"
+	read -r ignore
 	p=0
-	while [ $p -lt $wide ]
+	while [ "$p" -lt "$wide" ]
 	do
-		printf "%s+----%d" "----" `expr 1 + \( $p / 10 \)`
+		printf "%s+----%d" "----" "`expr 1 + \( "$p" / 10 \)`"
 		p=`expr $p + 10`
 	done
-	printf "\n"
+	printf '\n'
 	p=1
 	printf " "
-	while [ $p -lt $wide ]
+	while [ "$p" -lt "$wide" ]
 	do
-		printf "%*s" $1 "*"
-		p=`expr $p + $1`
+		printf "%*s" "$1" "*"
+		p=`expr "$p" + "$1"`
 	done
-	printf "\n"
+	printf '\n'
 	p=0
-	while [ $p -lt $wide ]
+	while [ "$p" -lt "$wide" ]
 	do
-		printf "\t+"
-		p=`expr $p + $1`
+		printf '\t+'
+		p=`expr "$p" + "$1"`
 	done
-	printf "\n"
+	printf '\n'
 	printf "...done"
-	read ignore
+	read -r ignore
 }
 
 # enable hard tabs, disable autowrap.
 initialize() {
-	$TPUT $1
+	"$TPUT" "$1"
 	clear
 	stty tabs
-	printf "\033[?7l"
+	printf '\033[?7l'
 }
 
 setup() {
@@ -78,7 +78,7 @@
 # Turn hard tabs off, reenable autowrap.
 restore() {
 	stty -tabs
-	printf "\033[?7h"
+	printf '\033[?7h'
 }
 
 wide=`$TPUT cols`
@@ -98,7 +98,7 @@
 	if [ -n "$value" ]
 	then
 		initialize $name
-		printf "Testing after tput $name\r\n"
+		printf 'Testing after tput %s\r\n' "$name"
 		show	8
 		break
 	fi
Index: vttests/title.sh
--- xterm-372+/vttests/title.sh	2022-02-13 14:36:47.000000000 +0000
+++ xterm-373/vttests/title.sh	2022-04-25 08:19:38.000000000 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $XTermId: title.sh,v 1.23 2022/02/13 14:36:47 tom Exp $
+# $XTermId: title.sh,v 1.26 2022/04/25 08:19:38 tom Exp $
 # -----------------------------------------------------------------------------
 # this file is part of xterm
 #
@@ -39,14 +39,15 @@
 CMD='/bin/echo'
 OPT='-n'
 SUF=''
-TMP=`(mktemp) 2>/dev/null` || TMP=/tmp/xterm$$
+: "${TMPDIR=/tmp}"
+TMP=`(mktemp "$TMPDIR/xterm.XXXXXXXX") 2>/dev/null` || TMP="$TMPDIR/xterm$$"
 eval '$CMD $OPT >$TMP || echo fail >$TMP' 2>/dev/null
-{ test ! -f $TMP || test -s $TMP; } &&
+{ test ! -f "$TMP" || test -s "$TMP"; } &&
 for verb in "printf" "print" ; do
-    rm -f $TMP
+    rm -f "$TMP"
     eval '$verb "\c" >$TMP || echo fail >$TMP' 2>/dev/null
-    if test -f $TMP ; then
-	if test ! -s $TMP ; then
+    if test -f "$TMP" ; then
+	if test ! -s "$TMP" ; then
 	    CMD="$verb"
 	    OPT=
 	    SUF='\c'
@@ -54,14 +55,14 @@
 	fi
     fi
 done
-rm -f $TMP
+rm -f "$TMP"
 
 exec </dev/tty
 old=`stty -g`
 stty raw -echo min 0  time 5
 
 $CMD $OPT "${CSI}21t${SUF}" > /dev/tty
-read original
+read -r original
 
 stty $old
 
Index: vttests/unascii.sh
--- xterm-372+/vttests/unascii.sh	2013-09-02 21:54:06.000000000 +0000
+++ xterm-373/vttests/unascii.sh	2022-04-25 07:58:15.000000000 +0000
@@ -1,9 +1,9 @@
 #!/bin/bash
-# $XTermId: unascii.sh,v 1.2 2013/09/02 21:54:06 tom Exp $
+# $XTermId: unascii.sh,v 1.4 2022/04/25 07:58:15 tom Exp $
 # -----------------------------------------------------------------------------
 # this file is part of xterm
 #
-# Copyright 2013 by Thomas E. Dickey
+# Copyright 2013,2022 by Thomas E. Dickey
 # 
 #                         All Rights Reserved
 # 
@@ -32,17 +32,18 @@
 # authorization.
 # -----------------------------------------------------------------------------
 # display the characters recognized by xterm in AsciiEquivs
-export PATH=$(dirname $(readlink -f $0)):$PATH
-vxt-utf8 0x2010
-vxt-utf8 0x2011
-vxt-utf8 0x2012
-vxt-utf8 0x2013
-vxt-utf8 0x2014
-vxt-utf8 0x2015
-vxt-utf8 0x2212
-vxt-utf8 0x2018
-vxt-utf8 0x2019
-vxt-utf8 0x201C
-vxt-utf8 0x201D
-vxt-utf8 0x2329
-vxt-utf8 0x232a
+PATH="$(dirname "$(readlink -f "$0")"):$PATH"
+export PATH
+utf8.pl 0x2010
+utf8.pl 0x2011
+utf8.pl 0x2012
+utf8.pl 0x2013
+utf8.pl 0x2014
+utf8.pl 0x2015
+utf8.pl 0x2212
+utf8.pl 0x2018
+utf8.pl 0x2019
+utf8.pl 0x201C
+utf8.pl 0x201D
+utf8.pl 0x2329
+utf8.pl 0x232a
Index: vttests/utf8.pl
--- xterm-372+/vttests/utf8.pl	2018-12-14 09:25:47.000000000 +0000
+++ xterm-373/vttests/utf8.pl	2022-07-08 18:32:43.000000000 +0000
@@ -1,12 +1,12 @@
 #!/usr/bin/env perl
-# $XTermId: utf8.pl,v 1.5 2018/12/14 09:25:47 tom Exp $
+# $XTermId: utf8.pl,v 1.12 2022/07/08 18:32:43 tom Exp $
 # -----------------------------------------------------------------------------
 # this file is part of xterm
 #
-# Copyright 2012,2018 by Thomas E. Dickey
-# 
+# Copyright 2012-2018,2022 by Thomas E. Dickey
+#
 #                         All Rights Reserved
-# 
+#
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
@@ -14,10 +14,10 @@
 # distribute, sublicense, and/or sell copies of the Software, and to
 # permit persons to whom the Software is furnished to do so, subject to
 # the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
@@ -25,7 +25,7 @@
 # CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-# 
+#
 # Except as contained in this notice, the name(s) of the above copyright
 # holders shall not be used in advertising or otherwise to promote the
 # sale, use or other dealings in this Software without prior written
@@ -33,41 +33,92 @@
 # -----------------------------------------------------------------------------
 # display the given Unicode characters, given their hex or decimal values.
 
+use warnings FATAL => "overflow";
+no warnings "portable";
 use strict;
 use Encode 'encode_utf8';
+use Text::CharWidth qw(mbswidth);
+
+$| = 1;
+
+sub num_bytes($) {
+    my $char  = shift;
+    my $value = length( Encode::encode_utf8($char) );
+    my $result =
+      ( $value <= 0
+        ? "no bytes"
+        : ( $value > 1 ? sprintf( "%d bytes", $value ) : "1 bytes" ) );
+    return $result;
+}
+
+sub num_cells($) {
+    my $char  = shift;
+    my $value = mbswidth($char);
+    my $result =
+      ( $value <= 0
+        ? "no cells"
+        : ( $value > 1 ? sprintf( "%d cells", $value ) : "1 cell" ) );
+    return $result;
+}
+
+sub pad_column($) {
+    my $char  = shift;
+    my $value = mbswidth($char);
+    $value = 0 if ( $value < 0);
+    my $result = sprintf( "%.*s", 3 - $value, "    ");
+    return $result;
+}
 
 sub vxt_utf8($) {
-	my $arg = $_[0];
-	my $hex = $arg;
-	my $dec = $arg;
-	if ( $arg =~ /^u\+[[:xdigit:]]+/i ) {
-		$hex =~ s/^../0x/;
-		$dec = hex($hex);
-	} elsif ( $arg !~ /^0x[[:xdigit:]]+$/i ) {
-		$hex = sprintf "%04X", $arg;
-	} elsif ( $arg !~ /^u\+[[:xdigit:]]+$/i ) {
-		$hex =~ s/^u\+//i;
-		$hex = sprintf "%04X", $arg;
-	} else {
-		$dec = hex($hex);
-	}
-	my $chr = chr($dec);
-	my $type = ( $chr =~ /\p{isPrint}/
-		     ? ( $chr =~ /\p{isAlpha}/
-			 ? "alpha"
-			 : ( $chr =~ /\p{isPunct}/
-			     ? "punct"
-			     : ( $chr =~ /\p{isDigit}/
-			         ? "digit"
-				 : "printing" ) ) )
-		     : ( $chr =~ /\p{isCntrl}/
-		         ? "cntrl"
-			 : "nonprinting" ) );
-	printf "%d ->%#x ->{%s} (%d bytes, %s)\n", $dec, $dec, $chr, length(Encode::encode_utf8($dec)), $type;
+    my $arg = $_[0];
+    my $hex = $arg;
+    my $dec = $arg;
+    if ( $arg =~ /^u\+[[:xdigit:]]+$/i ) {
+        $hex =~ s/^../0x/;
+        $dec = hex($hex);
+    }
+    elsif ( $arg =~ /^0x[[:xdigit:]]+$/i ) {
+        $dec = hex($hex);
+    }
+    elsif ( $arg =~ /^[[:xdigit:]]+$/i ) {
+        $dec = hex($hex);
+    }
+    else {
+        printf STDERR "? not a codepoint: $dec\n";
+        return;
+    }
+    my $chr  = chr($dec);
+    my $type = (
+        $chr =~ /\p{isPrint}/
+        ? (
+            $chr =~ /\p{isAlpha}/
+            ? "alpha"
+            : (
+                $chr =~ /\p{isPunct}/
+                ? "punct"
+                : (
+                    $chr =~ /\p{isDigit}/
+                    ? "digit"
+                    : "printing"
+                )
+            )
+          )
+        : (
+            $chr =~ /\p{isCntrl}/
+            ? "cntrl"
+            : "nonprinting"
+        )
+    );
+    printf "%d ->%#x ->{%s}%s(%s %s %s)\n", $dec, $dec, $chr,
+    &pad_column($chr),
+      &num_bytes($chr),
+      &num_cells($chr),
+      $type;
 }
 
-binmode(STDOUT, ":utf8");
+binmode( STDOUT, ":utf8" );
 while ( $#ARGV >= 0 ) {
-	vxt_utf8 ( shift @ARGV );
+    vxt_utf8( shift @ARGV );
 }
-exit;
+
+1;
Index: vttests/version.sh
--- xterm-372+/vttests/version.sh	2020-04-25 20:47:48.000000000 +0000
+++ xterm-373/vttests/version.sh	2022-04-25 22:47:07.000000000 +0000
@@ -1,9 +1,9 @@
 #!/bin/sh
-# $XTermId: version.sh,v 1.1 2020/04/25 20:47:48 tom Exp $
+# $XTermId: version.sh,v 1.6 2022/04/25 22:47:07 tom Exp $
 # -----------------------------------------------------------------------------
 # this file is part of xterm
 #
-# Copyright 2020 by Thomas E. Dickey
+# Copyright 2020,2022 by Thomas E. Dickey
 # 
 #                         All Rights Reserved
 # 
@@ -37,14 +37,14 @@
 CMD='/bin/echo'
 OPT='-n'
 SUF=''
-TMP=/tmp/xterm$$
+TMP=`(mktemp "$TMPDIR/xterm.XXXXXXXX") 2>/dev/null` || TMP="$TMPDIR/xterm$$"
 eval '$CMD $OPT >$TMP || echo fail >$TMP' 2>/dev/null
-( test ! -f $TMP || test -s $TMP ) &&
+( test ! -f "$TMP" || test -s "$TMP" ) &&
 for verb in printf print ; do
-    rm -f $TMP
-    eval '$verb "\c" >$TMP || echo fail >$TMP' 2>/dev/null
-    if test -f $TMP ; then
-	if test ! -s $TMP ; then
+    rm -f "$TMP"
+    eval '$verb "\c" >"$TMP" || echo fail >"$TMP"' 2>/dev/null
+    if test -f "$TMP" ; then
+	if test ! -s "$TMP" ; then
 	    CMD="$verb"
 	    OPT=
 	    SUF='\c'
@@ -52,14 +52,14 @@
 	fi
     fi
 done
-rm -f $TMP
+rm -f "$TMP"
 
 exec </dev/tty
 old=`stty -g`
 stty raw -echo min 0  time 5
 
 $CMD $OPT "${ESC}[>0q${SUF}" > /dev/tty
-read version
+read -r version
 
 stty $old
 echo "$version" |cat -v
Index: vttests/xorblink.pl
--- xterm-372+/vttests/xorblink.pl	2017-12-24 21:03:54.000000000 +0000
+++ xterm-373/vttests/xorblink.pl	2017-12-24 21:03:54.000000000 +0000
@@ -1,5 +1,34 @@
 #!/usr/bin/env perl
-# $XTermId: xorblink.pl,v 1.15 2017/12/24 21:03:54 tom Exp $
+# $XTermId: xorblink.pl,v 1.16 2017/12/24 21:03:54 tom Exp $
+# -----------------------------------------------------------------------------
+# Copyright 2017 by Thomas E. Dickey
+#
+#                         All Rights Reserved
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY
+# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name(s) of the above copyright
+# holders shall not be used in advertising or otherwise to promote the
+# sale, use or other dealings in this Software without prior written
+# authorization.
+# -----------------------------------------------------------------------------
 # walk through the different states of cursor-blinking, with annotation
 #
 # Manual:
Index: wcwidth.c
--- xterm-372+/wcwidth.c	2022-02-13 16:11:03.000000000 +0000
+++ xterm-373/wcwidth.c	2022-09-24 00:24:57.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: wcwidth.c,v 1.59 2022/02/13 16:11:03 tom Exp $ */
+/* $XTermId: wcwidth.c,v 1.61 2022/09/24 00:24:57 tom Exp $ */
 
 /* $XFree86: xc/programs/xterm/wcwidth.c,v 1.9 2006/06/19 00:36:52 dickey Exp $ */
 
@@ -213,12 +213,28 @@
 {
   unsigned long cmp = (unsigned long) ucs;
 
+  /* sorted list of non-overlapping intervals of formatting characters */
+  /* generated by
+   *    uniset +cat=Cf -00AD -0600-0605 -061C -06DD -070F c
+   */
+  /* *INDENT-OFF* */
+  /* generated by run-uniset_ctl 1.1 */
+  static const struct interval formatting[] = {
+    { 0x0890, 0x0891 }, { 0x08E2, 0x08E2 }, { 0x180E, 0x180E },
+    { 0x200B, 0x200F }, { 0x202A, 0x202E }, { 0x2060, 0x2064 },
+    { 0x2066, 0x206F }, { 0xFEFF, 0xFEFF }, { 0xFFF9, 0xFFFB },
+    { 0x110BD, 0x110BD }, { 0x110CD, 0x110CD }, { 0x13430, 0x13438 },
+    { 0x1BCA0, 0x1BCA3 }, { 0x1D173, 0x1D17A }, { 0xE0001, 0xE0001 },
+    { 0xE0020, 0xE007F }
+  };
+  /* *INDENT-OFF* */
+
   /* sorted list of non-overlapping intervals of non-spacing characters */
   /* generated by
-   *    uniset +cat=Me +cat=Mn +cat=Cf -00AD +1160-11FF +200B c
+   *    uniset +cat=Me +cat=Mn +0600-0605 +061C +06DD +070F +1160-11FF +D7B0-D7C6 +D7CB-D7FB c 
    */
   /* *INDENT-OFF* */
-  /* generated by run-uniset 1.6 */
+  /* generated by run-uniset 1.9 */
   static const struct interval combining[] = {
     { 0x0300, 0x036F }, { 0x0483, 0x0489 }, { 0x0591, 0x05BD },
     { 0x05BF, 0x05BF }, { 0x05C1, 0x05C2 }, { 0x05C4, 0x05C5 },
@@ -229,7 +245,7 @@
     { 0x0730, 0x074A }, { 0x07A6, 0x07B0 }, { 0x07EB, 0x07F3 },
     { 0x07FD, 0x07FD }, { 0x0816, 0x0819 }, { 0x081B, 0x0823 },
     { 0x0825, 0x0827 }, { 0x0829, 0x082D }, { 0x0859, 0x085B },
-    { 0x0890, 0x0891 }, { 0x0898, 0x089F }, { 0x08CA, 0x0902 },
+    { 0x0898, 0x089F }, { 0x08CA, 0x08E1 }, { 0x08E3, 0x0902 },
     { 0x093A, 0x093A }, { 0x093C, 0x093C }, { 0x0941, 0x0948 },
     { 0x094D, 0x094D }, { 0x0951, 0x0957 }, { 0x0962, 0x0963 },
     { 0x0981, 0x0981 }, { 0x09BC, 0x09BC }, { 0x09C1, 0x09C4 },
@@ -262,22 +278,21 @@
     { 0x1160, 0x11FF }, { 0x135D, 0x135F }, { 0x1712, 0x1714 },
     { 0x1732, 0x1733 }, { 0x1752, 0x1753 }, { 0x1772, 0x1773 },
     { 0x17B4, 0x17B5 }, { 0x17B7, 0x17BD }, { 0x17C6, 0x17C6 },
-    { 0x17C9, 0x17D3 }, { 0x17DD, 0x17DD }, { 0x180B, 0x180F },
-    { 0x1885, 0x1886 }, { 0x18A9, 0x18A9 }, { 0x1920, 0x1922 },
-    { 0x1927, 0x1928 }, { 0x1932, 0x1932 }, { 0x1939, 0x193B },
-    { 0x1A17, 0x1A18 }, { 0x1A1B, 0x1A1B }, { 0x1A56, 0x1A56 },
-    { 0x1A58, 0x1A5E }, { 0x1A60, 0x1A60 }, { 0x1A62, 0x1A62 },
-    { 0x1A65, 0x1A6C }, { 0x1A73, 0x1A7C }, { 0x1A7F, 0x1A7F },
-    { 0x1AB0, 0x1ACE }, { 0x1B00, 0x1B03 }, { 0x1B34, 0x1B34 },
-    { 0x1B36, 0x1B3A }, { 0x1B3C, 0x1B3C }, { 0x1B42, 0x1B42 },
-    { 0x1B6B, 0x1B73 }, { 0x1B80, 0x1B81 }, { 0x1BA2, 0x1BA5 },
-    { 0x1BA8, 0x1BA9 }, { 0x1BAB, 0x1BAD }, { 0x1BE6, 0x1BE6 },
-    { 0x1BE8, 0x1BE9 }, { 0x1BED, 0x1BED }, { 0x1BEF, 0x1BF1 },
-    { 0x1C2C, 0x1C33 }, { 0x1C36, 0x1C37 }, { 0x1CD0, 0x1CD2 },
-    { 0x1CD4, 0x1CE0 }, { 0x1CE2, 0x1CE8 }, { 0x1CED, 0x1CED },
-    { 0x1CF4, 0x1CF4 }, { 0x1CF8, 0x1CF9 }, { 0x1DC0, 0x1DFF },
-    { 0x200B, 0x200F }, { 0x202A, 0x202E }, { 0x2060, 0x2064 },
-    { 0x2066, 0x206F }, { 0x20D0, 0x20F0 }, { 0x2CEF, 0x2CF1 },
+    { 0x17C9, 0x17D3 }, { 0x17DD, 0x17DD }, { 0x180B, 0x180D },
+    { 0x180F, 0x180F }, { 0x1885, 0x1886 }, { 0x18A9, 0x18A9 },
+    { 0x1920, 0x1922 }, { 0x1927, 0x1928 }, { 0x1932, 0x1932 },
+    { 0x1939, 0x193B }, { 0x1A17, 0x1A18 }, { 0x1A1B, 0x1A1B },
+    { 0x1A56, 0x1A56 }, { 0x1A58, 0x1A5E }, { 0x1A60, 0x1A60 },
+    { 0x1A62, 0x1A62 }, { 0x1A65, 0x1A6C }, { 0x1A73, 0x1A7C },
+    { 0x1A7F, 0x1A7F }, { 0x1AB0, 0x1ACE }, { 0x1B00, 0x1B03 },
+    { 0x1B34, 0x1B34 }, { 0x1B36, 0x1B3A }, { 0x1B3C, 0x1B3C },
+    { 0x1B42, 0x1B42 }, { 0x1B6B, 0x1B73 }, { 0x1B80, 0x1B81 },
+    { 0x1BA2, 0x1BA5 }, { 0x1BA8, 0x1BA9 }, { 0x1BAB, 0x1BAD },
+    { 0x1BE6, 0x1BE6 }, { 0x1BE8, 0x1BE9 }, { 0x1BED, 0x1BED },
+    { 0x1BEF, 0x1BF1 }, { 0x1C2C, 0x1C33 }, { 0x1C36, 0x1C37 },
+    { 0x1CD0, 0x1CD2 }, { 0x1CD4, 0x1CE0 }, { 0x1CE2, 0x1CE8 },
+    { 0x1CED, 0x1CED }, { 0x1CF4, 0x1CF4 }, { 0x1CF8, 0x1CF9 },
+    { 0x1DC0, 0x1DFF }, { 0x20D0, 0x20F0 }, { 0x2CEF, 0x2CF1 },
     { 0x2D7F, 0x2D7F }, { 0x2DE0, 0x2DFF }, { 0x302A, 0x302D },
     { 0x3099, 0x309A }, { 0xA66F, 0xA672 }, { 0xA674, 0xA67D },
     { 0xA69E, 0xA69F }, { 0xA6F0, 0xA6F1 }, { 0xA802, 0xA802 },
@@ -291,16 +306,15 @@
     { 0xAAB2, 0xAAB4 }, { 0xAAB7, 0xAAB8 }, { 0xAABE, 0xAABF },
     { 0xAAC1, 0xAAC1 }, { 0xAAEC, 0xAAED }, { 0xAAF6, 0xAAF6 },
     { 0xABE5, 0xABE5 }, { 0xABE8, 0xABE8 }, { 0xABED, 0xABED },
-    { 0xD7B0, 0xD7FF }, { 0xFB1E, 0xFB1E }, { 0xFE00, 0xFE0F },
-    { 0xFE20, 0xFE2F }, { 0xFEFF, 0xFEFF }, { 0xFFF9, 0xFFFB },
-    { 0x101FD, 0x101FD }, { 0x102E0, 0x102E0 }, { 0x10376, 0x1037A },
-    { 0x10A01, 0x10A03 }, { 0x10A05, 0x10A06 }, { 0x10A0C, 0x10A0F },
-    { 0x10A38, 0x10A3A }, { 0x10A3F, 0x10A3F }, { 0x10AE5, 0x10AE6 },
-    { 0x10D24, 0x10D27 }, { 0x10EAB, 0x10EAC }, { 0x10F46, 0x10F50 },
-    { 0x10F82, 0x10F85 }, { 0x11001, 0x11001 }, { 0x11038, 0x11046 },
-    { 0x11070, 0x11070 }, { 0x11073, 0x11074 }, { 0x1107F, 0x11081 },
-    { 0x110B3, 0x110B6 }, { 0x110B9, 0x110BA }, { 0x110BD, 0x110BD },
-    { 0x110C2, 0x110C2 }, { 0x110CD, 0x110CD }, { 0x11100, 0x11102 },
+    { 0xD7B0, 0xD7C6 }, { 0xD7CB, 0xD7FB }, { 0xFB1E, 0xFB1E },
+    { 0xFE00, 0xFE0F }, { 0xFE20, 0xFE2F }, { 0x101FD, 0x101FD },
+    { 0x102E0, 0x102E0 }, { 0x10376, 0x1037A }, { 0x10A01, 0x10A03 },
+    { 0x10A05, 0x10A06 }, { 0x10A0C, 0x10A0F }, { 0x10A38, 0x10A3A },
+    { 0x10A3F, 0x10A3F }, { 0x10AE5, 0x10AE6 }, { 0x10D24, 0x10D27 },
+    { 0x10EAB, 0x10EAC }, { 0x10F46, 0x10F50 }, { 0x10F82, 0x10F85 },
+    { 0x11001, 0x11001 }, { 0x11038, 0x11046 }, { 0x11070, 0x11070 },
+    { 0x11073, 0x11074 }, { 0x1107F, 0x11081 }, { 0x110B3, 0x110B6 },
+    { 0x110B9, 0x110BA }, { 0x110C2, 0x110C2 }, { 0x11100, 0x11102 },
     { 0x11127, 0x1112B }, { 0x1112D, 0x11134 }, { 0x11173, 0x11173 },
     { 0x11180, 0x11181 }, { 0x111B6, 0x111BE }, { 0x111C9, 0x111CC },
     { 0x111CF, 0x111CF }, { 0x1122F, 0x11231 }, { 0x11234, 0x11234 },
@@ -325,18 +339,16 @@
     { 0x11D31, 0x11D36 }, { 0x11D3A, 0x11D3A }, { 0x11D3C, 0x11D3D },
     { 0x11D3F, 0x11D45 }, { 0x11D47, 0x11D47 }, { 0x11D90, 0x11D91 },
     { 0x11D95, 0x11D95 }, { 0x11D97, 0x11D97 }, { 0x11EF3, 0x11EF4 },
-    { 0x13430, 0x13438 }, { 0x16AF0, 0x16AF4 }, { 0x16B30, 0x16B36 },
-    { 0x16F4F, 0x16F4F }, { 0x16F8F, 0x16F92 }, { 0x16FE4, 0x16FE4 },
-    { 0x1BC9D, 0x1BC9E }, { 0x1BCA0, 0x1BCA3 }, { 0x1CF00, 0x1CF2D },
-    { 0x1CF30, 0x1CF46 }, { 0x1D167, 0x1D169 }, { 0x1D173, 0x1D182 },
-    { 0x1D185, 0x1D18B }, { 0x1D1AA, 0x1D1AD }, { 0x1D242, 0x1D244 },
-    { 0x1DA00, 0x1DA36 }, { 0x1DA3B, 0x1DA6C }, { 0x1DA75, 0x1DA75 },
-    { 0x1DA84, 0x1DA84 }, { 0x1DA9B, 0x1DA9F }, { 0x1DAA1, 0x1DAAF },
-    { 0x1E000, 0x1E006 }, { 0x1E008, 0x1E018 }, { 0x1E01B, 0x1E021 },
-    { 0x1E023, 0x1E024 }, { 0x1E026, 0x1E02A }, { 0x1E130, 0x1E136 },
-    { 0x1E2AE, 0x1E2AE }, { 0x1E2EC, 0x1E2EF }, { 0x1E8D0, 0x1E8D6 },
-    { 0x1E944, 0x1E94A }, { 0xE0001, 0xE0001 }, { 0xE0020, 0xE007F },
-    { 0xE0100, 0xE01EF }
+    { 0x16AF0, 0x16AF4 }, { 0x16B30, 0x16B36 }, { 0x16F4F, 0x16F4F },
+    { 0x16F8F, 0x16F92 }, { 0x16FE4, 0x16FE4 }, { 0x1BC9D, 0x1BC9E },
+    { 0x1CF00, 0x1CF2D }, { 0x1CF30, 0x1CF46 }, { 0x1D167, 0x1D169 },
+    { 0x1D17B, 0x1D182 }, { 0x1D185, 0x1D18B }, { 0x1D1AA, 0x1D1AD },
+    { 0x1D242, 0x1D244 }, { 0x1DA00, 0x1DA36 }, { 0x1DA3B, 0x1DA6C },
+    { 0x1DA75, 0x1DA75 }, { 0x1DA84, 0x1DA84 }, { 0x1DA9B, 0x1DA9F },
+    { 0x1DAA1, 0x1DAAF }, { 0x1E000, 0x1E006 }, { 0x1E008, 0x1E018 },
+    { 0x1E01B, 0x1E021 }, { 0x1E023, 0x1E024 }, { 0x1E026, 0x1E02A },
+    { 0x1E130, 0x1E136 }, { 0x1E2AE, 0x1E2AE }, { 0x1E2EC, 0x1E2EF },
+    { 0x1E8D0, 0x1E8D6 }, { 0x1E944, 0x1E94A }, { 0xE0100, 0xE01EF }
   };
   /* *INDENT-ON* */
 
@@ -645,6 +657,9 @@
     result = -1;
   } else if (cmp == 0xad) {
     result = use_latin1;
+  } else if (Lookup(cmp, formatting)) {
+    /* treat formatting characters like control characters */
+    result = -1;
   } else if (Lookup(cmp, combining)) {
     /* binary search in table of non-spacing characters */
     result = 0;
Index: xterm.appdata.xml
--- xterm-372+/xterm.appdata.xml	2022-03-10 00:58:49.000000000 +0000
+++ xterm-373/xterm.appdata.xml	2022-09-25 23:04:49.000000000 +0000
@@ -35,7 +35,7 @@
     <keyword>terminal</keyword>
   </keywords>
   <releases>
-    <release version="372" date="2022-03-09"/>
+    <release version="373" date="2022-09-25"/>
   </releases>
   <url type="homepage">https://invisible-island.net/xterm/</url>
   <update_contact>dickey@invisible-island.net</update_contact>
Index: xterm.desktop
--- xterm-372+/xterm.desktop	2016-03-08 01:38:50.000000000 +0000
+++ xterm-373/xterm.desktop	2022-09-06 21:10:14.000000000 +0000
@@ -1,8 +1,8 @@
-# $XTermId: xterm.desktop,v 1.15 2016/03/08 01:38:50 tom Exp $
+# $XTermId: xterm.desktop,v 1.16 2022/09/06 21:10:14 tom Exp $
 # -----------------------------------------------------------------------------
 # this file is part of xterm
 #
-# Copyright 2006-2012,2016 by Thomas E. Dickey
+# Copyright 2006-2016,2022 by Thomas E. Dickey
 # 
 #                         All Rights Reserved
 # 
@@ -41,3 +41,4 @@
 Icon=xterm-color_48x48
 Categories=System;TerminalEmulator;
 Keywords=shell;prompt;command;commandline;cmd;
+StartupWMClass=XTerm
Index: xterm.h
--- xterm-372+/xterm.h	2022-03-09 00:39:01.000000000 +0000
+++ xterm-373/xterm.h	2022-09-18 20:47:29.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: xterm.h,v 1.910 2022/03/09 00:39:01 tom Exp $ */
+/* $XTermId: xterm.h,v 1.915 2022/09/18 20:47:29 tom Exp $ */
 
 /*
  * Copyright 1999-2021,2022 by Thomas E. Dickey
@@ -514,6 +514,7 @@
 #define XtNfaceName		"faceName"
 #define XtNfaceNameDoublesize	"faceNameDoublesize"
 #define XtNfaceSize		"faceSize"
+#define XtNfaintIsRelative	"faintIsRelative"
 #define XtNfastScroll		"fastScroll"
 #define XtNfont1		"font1"
 #define XtNfont2		"font2"
@@ -643,6 +644,9 @@
 #define XtNwideBoldFont		"wideBoldFont"
 #define XtNwideChars		"wideChars"
 #define XtNwideFont		"wideFont"
+#define XtNxftMaxGlyphMemory	"xftMaxGlyphMemory"
+#define XtNxftMaxUnrefFonts	"xftMaxUnrefFonts"
+#define XtNxftTrackMemUsage	"xftTrackMemUsage"
 #define XtNximFont		"ximFont"
 #define XtNxmcAttributes	"xmcAttributes"	/* ncurses-testing */
 #define XtNxmcGlitch		"xmcGlitch"	/* ncurses-testing */
@@ -724,6 +728,7 @@
 #define XtCFaceName		"FaceName"
 #define XtCFaceNameDoublesize	"FaceNameDoublesize"
 #define XtCFaceSize		"FaceSize"
+#define XtCFaintIsRelative	"FaintIsRelative"
 #define XtCFastScroll		"FastScroll"
 #define XtCFont1		"Font1"
 #define XtCFont2		"Font2"
@@ -843,6 +848,9 @@
 #define XtCWideBoldFont		"WideBoldFont"
 #define XtCWideChars		"WideChars"
 #define XtCWideFont		"WideFont"
+#define XtCXftMaxGlyphMemory	"XftMaxGlyphMemory"
+#define XtCXftMaxUnrefFonts	"XftMaxUnrefFonts"
+#define XtCXftTrackMemUsage	"XftTrackMemUsage"
 #define XtCXimFont		"XimFont"
 #define XtCXmcAttributes	"XmcAttributes"	/* ncurses-testing */
 #define XtCXmcGlitch		"XmcGlitch"	/* ncurses-testing */
@@ -1003,7 +1011,7 @@
 extern void HideCursor (XtermWidget /* xw */);
 extern void RestartBlinking(XtermWidget /* xw */);
 extern void ShowCursor (XtermWidget /* xw */);
-extern void SwitchBufPtrs (TScreen * /* screen */, int /* toBuf */);
+extern void SwitchBufPtrs (XtermWidget /* xw */, int /* toBuf */);
 extern void ToggleAlternate (XtermWidget /* xw */);
 extern void VTInitTranslations (void);
 extern GCC_NORETURN void VTReset (XtermWidget /* xw */, int /* full */, int /* saved */);
@@ -1102,7 +1110,7 @@
 #if OPT_DEC_CHRSET
 extern GC xterm_DoubleGC(XTermDraw * /* params */, GC /* old_gc */, int * /* inxp */);
 #if OPT_RENDERFONT
-extern XftFont * xterm_DoubleFT(XTermDraw * /* params */, unsigned /* chrset */, unsigned /* attr_flags */);
+extern XTermXftFonts * xterm_DoubleFT(XTermDraw * /* params */, unsigned /* chrset */, unsigned /* attr_flags */);
 extern void freeall_DoubleFT(XtermWidget /* xw */);
 #endif
 #endif
Index: xterm.log.html
--- xterm-372+/xterm.log.html	2022-03-10 01:00:00.000000000 +0000
+++ xterm-373/xterm.log.html	2022-09-25 23:05:09.000000000 +0000
@@ -30,7 +30,7 @@
  * sale, use or other dealings in this Software without prior written        *
  * authorization.                                                            *
  *****************************************************************************
-  $XTermId: xterm.log.html,v 1.2406 2022/03/10 01:00:00 tom Exp $
+  $XTermId: xterm.log.html,v 1.2437 2022/09/25 23:05:09 tom Exp $
   -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
@@ -70,6 +70,8 @@
   CHANGELOG</a>).</p>
 
   <ul>
+    <li><a href="#xterm_373">Patch #373 - 2022/09/25</a></li>
+
     <li><a href="#xterm_372">Patch #372 - 2022/03/09</a></li>
 
     <li><a href="#xterm_371">Patch #371 - 2022/02/24</a></li>
@@ -1022,6 +1024,124 @@
     <li><a href="#xterm_01">Patch #1 - 1996/1/6</a></li>
   </ul>
 
+  <h1><a name="xterm_373" id="xterm_373">Patch #373 -
+  2022/09/25</a></h1>
+
+  <ul>
+    <li>improve rendering of TrueType fonts:
+      <ul>
+        <li>add resource <tt>xftTrackMemUsage</tt> to
+        enable/disable a new feature of Xft which improves
+        performance.</li>
+
+        <li>add resources <tt>xftMaxGlyphMemory</tt> and
+        <tt>xftMaxUnrefFonts</tt> to customize memory-usage of Xft
+        and fontconfig.</li>
+
+        <li>provide for display of colored fonts in libXft
+        2.3.5</li>
+
+        <li>allow for an extra TrueType font to be specified using
+        the <code>-fa</code> option, as an override to the
+        <em>fontconfig</em> scheme of fallback fonts (request by
+        Nickolas Raymond Kaczynski).</li>
+
+        <li>improve caching of TrueType missing-glyph tests.</li>
+
+        <li>allow no more than 255 fonts to be scanned for a
+        fontset.</li>
+
+        <li>eliminate a table-lookup in <tt>findXftGlyph</tt></li>
+      </ul>
+    </li>
+
+    <li>improvements status-line feature:
+      <ul>
+        <li>save/restore wraparound flag when updating the
+        status-line (report by Rajeev V. Pillai).</li>
+
+        <li>avoid clearing the status-line when switching between
+        normal and alternate screens (report by Valtteri
+        Vuorikoski).</li>
+
+        <li>remove adjustment from <tt>update_winsize</tt> leftover
+        from initial work (report by Valtteri Vuorikoski).</li>
+      </ul>
+    </li>
+
+    <li>modify <tt>wcwidth</tt> tables to separate Unicode
+    <em>Cf</em> category as <em>formatting</em> control-characters,
+    to better match the guideline for <a href=
+    "http://www.unicode.org/faq/unsup_char.html">unsupported
+    characters</a> (report by Tim Chase).</li>
+
+    <li>add configure option
+    <tt>--disable-exec-selection</tt>.</li>
+
+    <li>use <tt>mkstemp</tt> where <tt>mkdtemp</tt> is unavailable,
+    when initializing colored cursor.</li>
+
+    <li>adapt fixes from OpenBSD xenocara:
+      <ul>
+        <li>improve ifdef's for a few optional features.</li>
+
+        <li>correct <tt>#ifdef</tt> to <tt>#if</tt> in a few uses
+        of <tt>OPT_PRINT_ON_EXIT</tt>.</li>
+      </ul>
+    </li>
+
+    <li>set <tt>StartupWMClass</tt> in
+    &ldquo;<tt>.desktop</tt>&rdquo; files, e.g., to help
+    <tt>cinnamon-session</tt> notice that xterm sets
+    <tt>WM_CLASS</tt> and use its icon (patch by Richard de
+    Boer).</li>
+
+    <li>disable pixel computation when rgb width is greater than 8,
+    to work with depth 30 (patch by Denis Kaganovich).</li>
+
+    <li>improve color-computation for SGR 2 faint/dim (patch by
+    Boian Bonev). Add resource <tt>faintIsRelative</tt> to specify
+    if the modified computation should be used (prompted by
+    discussion with Matthieu Herrb).</li>
+
+    <li>correct comparison-length for environment variable cleanup
+    (patch by Brendan O' Dea).</li>
+
+    <li>correct <tt>dsl</tt> capability for <tt>dec+sl</tt> block
+    in terminfo (report by Rajeev V. Pillai).</li>
+
+    <li>improve output formatting by <tt>vttests/utf8.pl</tt></li>
+
+    <li>repair test/demo scripts still using "vxt-" prefix, some
+    cleanup with shellcheck.</li>
+
+    <li>enable page-number for <tt>DECXCPR</tt> response in
+    VT330.</li>
+
+    <li>amend change for combining characters in <a href=
+    "#xterm_371">patch #371</a> to limit it to the
+    currently-defined codes (report by Thomas Wolff).</li>
+
+    <li>add directory-template parameter to <tt>mktemp</tt> in
+    shell-scripts to improve portability to older systems (patch by
+    Ryan Schmidt).</li>
+
+    <li>mention webpage <a href=
+    "https://invisible-island.net/xterm/xterm-paste64.html"><em>XTerm
+    &ndash; bracketed-paste</em></a> in
+    <code>ctlseqs.ms</code></li>
+
+    <li>update manual-page descriptions for
+    <code>allowPasteControls</code> and
+    <code>disallowedPasteControls</code> (<a href=
+    "#xterm_363">patch #363</a>).</li>
+
+    <li>further extended list of environment variables to purge on
+    startup (suggested by Thomas Wolff).</li>
+
+    <li>update config.guess, config.sub</li>
+  </ul>
+
   <h1><a name="xterm_372" id="xterm_372">Patch #372 -
   2022/03/09</a></h1>
 
Index: xterm.man
--- xterm-372+/xterm.man	2022-02-22 09:11:42.000000000 +0000
+++ xterm-373/xterm.man	2022-09-12 20:46:04.000000000 +0000
@@ -1,5 +1,5 @@
 '\" t
-.\" $XTermId: xterm.man,v 1.856 2022/02/22 09:11:42 tom Exp $
+.\" $XTermId: xterm.man,v 1.863 2022/09/12 20:46:04 tom Exp $
 .\"
 .\" Copyright 1996-2021,2022 by Thomas E. Dickey
 .\"
@@ -2260,11 +2260,14 @@
 .TP 8
 .B "allowPasteControls\fP (class\fB AllowPasteControls\fP)"
 If true, allow control characters such as BEL and CAN to be pasted.
-Formatting characters (tab, newline) are always allowed.
+Formatting characters (tab, newline) are normally allowed,
+unless suppressed via the \fBdisallowedPasteControls\fP resource.
 Other C0 control characters are suppressed unless this resource is enabled.
 The exact set of control characters (C0 and C1)
 depends upon whether UTF-8 encoding is used,
-as well as the \fBallowC1Printable\fP resource.
+as well as
+the \fBallowC1Printable\fP
+and \fBdisallowedPasteControls\fP resources.
 The default is \*(``false\*(''.
 .TP 8
 .B "allowScrollLock\fP (class\fB AllowScrollLock\fP)"
@@ -3195,12 +3198,11 @@
 .RE
 .TP 8
 .B "disallowedPasteControls\fP (class\fB DisallowedPasteControls\fP)"
-The \fBallowPasteControls\fP resource is normally used to prevent
-pasting C1 controls, as well as non-formatting C0 controls such
-as the ASCII escape character.
-Those characters are simply ignored.
-This resource further extends the set of control characters
+Use this resource to disallow pasting specific C0 control characters
+when the \fBallowPasteControls\fP resource is false (i.e., the default).
+This resource defines the set of control characters
 which cannot be pasted, converting each into a space.
+Other C0 controls are pasted without change.
 .IP
 The resource value is a comma-separated list of names.
 \fI\*N\fP ignores capitalization.
@@ -3476,6 +3478,10 @@
 XTerm*faceName: x:fixed,xft:Bitstream Vera Sans Mono
 .NE
 .IP
+Two TrueType fonts can be specified in this way.
+The first is the primary font;
+the second acts as a manual override to the fontconfig fontset.
+.IP
 If no \fBfaceName\fP resource is specified,
 or if there is no match for both TrueType normal and bold fonts,
 \fI\*n\fR uses the XLFD (bitmap) \fBfont\fP and related resources.
@@ -3563,6 +3569,14 @@
 .B "faceSize7\fP (class\fB FaceSize7\fP)"
 Specifies the pointsize of the seventh alternative font.
 .TP 8
+.B "faintIsRelative\fP (class\fB FaintIsRelative\fP)"
+Faint colors are derived from the current text color, e.g., the ANSI colors,
+by scaling the red, green and blue components.
+Use this resource to specify whether that is done relative to the
+current background color,
+or as an absolute value.
+The default is \*(``false\*(''.
+.TP 8
 .B "fastScroll\fP (class\fB FastScroll\fP)"
 Modifies the effect of jump scroll (\fBjumpScroll\fP)
 by suppressing screen refreshes
@@ -3962,8 +3976,9 @@
 The default is \*(``B\*('', which corresponds to US ASCII.
 .TP 8
 .B "limitFontsets\fP (class\fB LimitFontsets\fP)"
-Limits the number of TrueType fallback fonts (i.e., fontset) which can be used.
+Limits the number of TrueType fallback fonts (i.e., fontset) which can be tested.
 The default is \*(``50\*(''.
+No more than \*(``255\*('' will be scanned.
 .IP
 This limits the number of fallback fonts
 which \fI\*n\fP uses to display characters.
@@ -5477,6 +5492,24 @@
 If no double-width font is found, it will improvise, by stretching
 the normal font.
 .TP 8
+.B "xftMaxGlyphMemory\fP (class\fB XftMaxGlyphMemory\fP)"
+Set the Xft library's limit on glyph memory (typically 4Mb).
+When it reaches this limit, it discards \*(``randomly chosen\*(''
+glyphs to make room for new ones.
+The default is \*(``0\*('' to use Xft's default value.
+.TP 8
+.B "xftMaxUnrefFonts\fP (class\fB XftMaxUnrefFonts\fP)"
+Set the Xft library's limit on fonts which have been loaded (typically 16),
+e.g., matching patterns for fallback searches,
+but are not actually used.
+The default is \*(``0\*('' to use Xft's default value.
+.TP 8
+.B "xftTrackMemUsage\fP (class\fB XftTrackMemUsage\fP)"
+Enables glyph memory tracking (introduced in Xft 2.3.5),
+which allows Xft to efficiently discard obsolete data when running
+short of memory.
+The default is \*(``true\*(''.
+.TP 8
 .B "ximFont\fP (class\fB XimFont\fP)"
 This option specifies the font to be used for displaying the preedit string
 in the \*(``OverTheSpot\*('' input method.
@@ -8918,7 +8951,7 @@
 Consortium), Dave Serisky (HP), Jonathan Kamens (MIT-Athena).
 .PP
 Beginning with XFree86, there were far more identifiable contributors.
-The \fITHANKS\fP file in \fI\*n\fP's source lists 234 in August 2021.
+The \fITHANKS\fP file in \fI\*n\fP's source lists 243 in June 2022.
 Keep in mind these:
 Jason Bacon,
 Jens Schweikhardt,
Index: xtermcfg.hin
--- xterm-372+/xtermcfg.hin	2022-02-13 13:50:45.000000000 +0000
+++ xterm-373/xtermcfg.hin	2022-09-11 19:26:01.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: xtermcfg.hin,v 1.225 2022/02/13 13:50:45 tom Exp $ */
+/* $XTermId: xtermcfg.hin,v 1.227 2022/09/11 19:26:01 tom Exp $ */
 
 /*
  * Copyright 1997-2021,2022 by Thomas E. Dickey
@@ -84,6 +84,7 @@
 #undef HAVE_LIB_XAWPLUS		/* CF_X_ATHENA(--with-XawPlus) */
 #undef HAVE_LIB_XCURSOR		/* AC_CHECK_LIB(Xcursor) */
 #undef HAVE_MKDTEMP		/* AC_CHECK_FUNCS(mkdtemp) */
+#undef HAVE_MKSTEMP		/* CF_MKSTEMP */
 #undef HAVE_NCURSES_CURSES_H	/* AC_CHECK_HEADERS(ncurses/curses.h) */
 #undef HAVE_NCURSES_TERM_H	/* AC_CHECK_HEADERS(ncurses/term.h) */
 #undef HAVE_PATHS_H		/* CF_LASTLOG */
@@ -157,6 +158,7 @@
 #undef OPT_DEC_RECTOPS		/* CF_ARG_DISABLE(rectangles) */
 #undef OPT_DIRECT_COLOR		/* CF_ARG_ENABLE(direct-color) */
 #undef OPT_DOUBLE_BUFFER	/* CF_ARG_ENABLE(double-buffer) */
+#undef OPT_EXEC_SELECTION	/* CF_ARG_ENABLE(exec-selection) */
 #undef OPT_EXEC_XTERM		/* CF_ARG_ENABLE(exec-xterm) */
 #undef OPT_GRAPHICS		/* CF_ARG_ENABLE(graphics) */
 #undef OPT_HIGHLIGHT_COLOR	/* CF_ARG_DISABLE(highlighting) */
