# https://invisible-island.net/archives/xterm/patches/xterm-396.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created  Tue Dec  3 01:14:52 UTC 2024
# ------------------------------------------------------------------------------
# MANIFEST                          |    3 
# Tekproc.c                         |   44 
# VTPrsTbl.c                        |    6 
# VTparse.def                       |    5 
# aclocal.m4                        |   81 
# button.c                          |  216 -
# cachedGCs.c                       |   74 
# charclass.h                       |    6 
# charproc.c                        |  274 +-
# charsets.h                        |    4 
# config.guess                      |   15 
# config.sub                        |  733 ++++--
# configure                         | 4268 ++++++++++++++++++------------------
# ctlseqs.ms                        |   24 
# ctlseqs.txt                       |   16 
# cursor.c                          |   12 
# doublechr.c                       |   21 
# fontutils.c                       |  372 +--
# fontutils.h                       |   12 
# graphics.c                        |   10 
# graphics_regis.c                  |   11 
# graphics_sixel.c                  |    6 
# html.c                            |    8 
# input.c                           |   35 
# linedata.c                        |    8 
# main.c                            |  135 -
# menu.c                            |   54 
# menu.h                            |    6 
# misc.c                            |  297 +-
# package/debian/changelog          |    6 
# package/debian/control            |    4 
# package/debian/rules              |   89 
# package/freebsd/Makefile          |  103 
# package/freebsd/distinfo          |    8 
# package/freebsd/pkg-descr         |    2 
# package/freebsd/pkg-message.wchar |    8 
# package/freebsd/pkg-plist         |   12 
# package/pkgsrc/Makefile           |   17 
# package/pkgsrc/PLIST              |    6 
# package/pkgsrc/distinfo           |    9 
# package/pkgsrc/options.mk         |    4 
# package/xterm.spec                |   35 
# precompose.c                      |    4 
# print.c                           |   44 
# ptydata.c                         |   12 
# ptyx.h                            |   18 
# resize.c                          |   14 
# screen.c                          |   71 
# scrollback.c                      |   14 
# scrollbar.c                       |   34 
# svg.c                             |    8 
# testxmc.c                         |    6 
# trace.c                           |   38 
# trace.h                           |    4 
# unicode/precompose.c.head         |    2 
# util.c                            |   68 
# version.c                         |    8 
# version.h                         |    6 
# vttests/titlestack.pl             |  148 +
# wcwidth.c                         |    4 
# xstrings.c                        |   40 
# xstrings.h                        |    6 
# xterm.appdata.xml                 |    2 
# xterm.h                           |   10 
# xterm.log.html                    |   33 
# xtermcap.c                        |   18 
# 66 files changed, 4259 insertions(+), 3412 deletions(-)
# ------------------------------------------------------------------------------
# Please remove the following file before applying this patch.
# (You can feed this patch to 'sh' to do so.)

rm -f package/freebsd/pkg-message
exit

Index: MANIFEST
--- xterm-395+/MANIFEST	2024-09-30 07:33:13.000000000 +0000
+++ xterm-396/MANIFEST	2024-12-03 00:35:20.000000000 +0000
@@ -1,4 +1,4 @@
-MANIFEST for xterm, version xterm-395
+MANIFEST for xterm, version xterm-396
 --------------------------------------------------------------------------------
 MANIFEST                        this file
 256colres.h                     resource-definitions for 256-color mode
@@ -164,7 +164,6 @@
 package/freebsd/Makefile        build-script
 package/freebsd/distinfo        generated sums
 package/freebsd/pkg-descr       build-script
-package/freebsd/pkg-message     build-script
 package/freebsd/pkg-message.wchar  build-script
 package/freebsd/pkg-plist       build-script
 package/pkgsrc                  subdirectory
Index: Tekproc.c
--- xterm-395+/Tekproc.c	2024-09-30 07:44:22.000000000 +0000
+++ xterm-396/Tekproc.c	2024-12-01 20:21:19.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: Tekproc.c,v 1.252 2024/09/30 07:44:22 tom Exp $ */
+/* $XTermId: Tekproc.c,v 1.254 2024/12/01 20:21:19 tom Exp $ */
 
 /*
  * Copyright 2001-2022,2024 by Thomas E. Dickey
@@ -358,7 +358,7 @@
     Dimension menu_high;
 
     if (!Tfailed
-	&& tekWidget == 0) {
+	&& tekWidget == NULL) {
 	Cardinal nargs = 0;
 	Arg myArgs[3];
 	Boolean iconic = 0;
@@ -413,7 +413,7 @@
 static int
 TekPtyData(void)
 {
-    if (Tpushb == 0 && !Tfailed) {
+    if (Tpushb == NULL && !Tfailed) {
 	if ((Tpushb = TypeMallocN(Char, 10)) == NULL
 	    || (Tline = TypeMallocN(XSegment, MAX_VTX)) == NULL) {
 	    xtermWarning("Not enough core for Tek mode\n");
@@ -768,7 +768,7 @@
 		IChar c2;
 		size_t len = 0;
 		while ((c2 = input()) != ANSI_BEL) {
-		    if (!isprint((int) (c2 & 0x7f))
+		    if (!isprint(CharOf(c2 & 0x7f))
 			|| len + 2 >= (int) sizeof(buf2))
 			break;
 		    buf2[len++] = (Char) c2;
@@ -802,7 +802,7 @@
     if (tekRefreshList) {
 	if (rcnt-- > 0)
 	    return (IChar) (*rptr++);
-	if ((tek = tekRefreshList->next) != 0) {
+	if ((tek = tekRefreshList->next) != NULL) {
 	    tekRefreshList = tek;
 	    rptr = tek->data;
 	    rcnt = tek->count - 1;
@@ -860,7 +860,7 @@
     tek = TekRecord;
     if (tek->count >= TEK_LINK_BLOCK_SIZE
 	|| tek->fontsize != tekscr->cur.fontsize) {
-	if ((TekRecord = tek->next = CastMalloc(TekLink)) == 0) {
+	if ((TekRecord = tek->next = CastMalloc(TekLink)) == NULL) {
 	    Panic("Tinput: malloc error (%d)\n", errno);
 	} else {
 	    tek = tek->next;
@@ -948,7 +948,7 @@
 TekResize(Widget w)
 {
     TekWidget tw = getTekWidget(w);
-    if (tw != 0) {
+    if (tw != NULL) {
 
 	TRACE(("TekResize " TRACE_L "\n"));
 	TekClear(tw);
@@ -966,7 +966,7 @@
 	  Region region GCC_UNUSED)
 {
     TekWidget tw = getTekWidget(w);
-    if (tw != 0) {
+    if (tw != NULL) {
 	TekScreen *tekscr = TekScreenOf(tw);
 
 	TRACE(("TekExpose " TRACE_L "\n"));
@@ -1002,7 +1002,7 @@
 void
 TekRefresh(TekWidget tw)
 {
-    if (tw != 0) {
+    if (tw != NULL) {
 	TScreen *screen = TScreenOf(tw->vt);
 	TekScreen *tekscr = TekScreenOf(tw);
 	static Cursor wait_cursor = None;
@@ -1317,11 +1317,11 @@
 {
     XtermWidget xw = term;
 
-    assert(xw != 0);
-    if (tekWidget == 0) {
+    assert(xw != NULL);
+    if (tekWidget == NULL) {
 	TekInit();
     }
-    if (tekWidget != 0) {
+    if (tekWidget != NULL) {
 	TRACE(("TekRun ...\n"));
 
 	if (!TEK4014_SHOWN(xw) && !resource.notMapped) {
@@ -1671,7 +1671,7 @@
     TekBackground(tw, vtscr);
 
     tekscr->margin = MARGIN1;	/* Margin 1             */
-    tekscr->TekGIN = False;	/* GIN off              */
+    tekscr->TekGIN = NULL;	/* GIN off              */
 
     XDefineCursor(XtDisplay(tw), TWindow(tekscr), tekscr->arrow);
 
@@ -1756,7 +1756,7 @@
 void
 TekSetFontSize(TekWidget tw, Bool fromMenu, int newitem)
 {
-    if (tw != 0) {
+    if (tw != NULL) {
 	TekScreen *tekscr = TekScreenOf(tw);
 	int oldsize = tekscr->cur.fontsize;
 	int newsize = MI2FS(newitem);
@@ -1910,11 +1910,11 @@
     int c, x, y;
     unsigned cellwidth, cellheight;
 
-    if (tw == 0)
+    if (tw == NULL)
 	return;
-    if ((tekscr = TekScreenOf(tw)) == 0)
+    if ((tekscr = TekScreenOf(tw)) == NULL)
 	return;
-    if ((xw = tw->vt) == 0)
+    if ((xw = tw->vt) == NULL)
 	return;
     if (!TEK4014_SHOWN(xw))
 	return;
@@ -1966,7 +1966,7 @@
 void
 TekSimulatePageButton(TekWidget tw, Bool reset)
 {
-    if (tw != 0) {
+    if (tw != NULL) {
 	TekScreen *tekscr = TekScreenOf(tw);
 
 	if (reset) {
@@ -1985,7 +1985,7 @@
 TekCopy(TekWidget tw)
 {
 #ifdef ALLOWLOGGING
-    if (tw != 0) {
+    if (tw != NULL) {
 	TekScreen *tekscr = TekScreenOf(tw);
 	TScreen *screen = TScreenOf(tw->vt);
 
@@ -2034,7 +2034,7 @@
 {
     TekWidget tw = getTekWidget(w);
 
-    if (tw != 0) {
+    if (tw != NULL) {
 	TekScreen *tekscr = TekScreenOf(tw);
 
 	if (tekscr->TekGIN && *nparamsp == 1) {
@@ -2067,10 +2067,10 @@
 {
     TekWidget tw;
 
-    if (w == 0) {
+    if (w == NULL) {
 	tw = (TekWidget) CURRENT_EMU();
 	if (!IsTekWidget(tw)) {
-	    tw = 0;
+	    tw = NULL;
 	}
     } else if (IsTekWidget(w)) {
 	tw = (TekWidget) w;
Index: VTPrsTbl.c
--- xterm-395+/VTPrsTbl.c	2024-10-03 23:02:04.000000000 +0000
+++ xterm-396/VTPrsTbl.c	2024-11-29 00:43:41.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: VTPrsTbl.c,v 1.120 2024/10/03 23:02:04 tom Exp $ */
+/* $XTermId: VTPrsTbl.c,v 1.121 2024/11/29 00:43:41 tom Exp $ */
 
 /*
  * Copyright 1999-2023,2024 by Thomas E. Dickey
@@ -2470,7 +2470,7 @@
 CASE_XTERM_PUSH_COLORS,
 CASE_XTERM_POP_COLORS,
 CASE_XTERM_REPORT_COLORS,
-CASE_GROUND_STATE,
+CASE_XTERM_TITLE_STACK,
 /*	T		U		V		W	*/
 CASE_GROUND_STATE,
 CASE_GROUND_STATE,
@@ -2630,7 +2630,7 @@
 CASE_XTERM_PUSH_COLORS,
 CASE_XTERM_POP_COLORS,
 CASE_XTERM_REPORT_COLORS,
-CASE_GROUND_STATE,
+CASE_XTERM_TITLE_STACK,
 /*	Ocircumflex	Otilde		Odiaeresis	multiply	*/
 CASE_GROUND_STATE,
 CASE_GROUND_STATE,
Index: VTparse.def
--- xterm-395+/VTparse.def	2023-12-27 22:45:19.000000000 +0000
+++ xterm-396/VTparse.def	2024-11-29 00:31:24.000000000 +0000
@@ -1,10 +1,10 @@
-# $XTermId: VTparse.def,v 1.72 2023/12/27 22:45:19 tom Exp $
+# $XTermId: VTparse.def,v 1.73 2024/11/29 00:31:24 tom Exp $
 #
 # vile:confmode rs=lf
 # -----------------------------------------------------------------------------
 # this file is part of xterm
 #
-# Copyright 1996-2022,2023 by Thomas E. Dickey
+# Copyright 1996-2023,2024 by Thomas E. Dickey
 # 
 #                         All Rights Reserved
 # 
@@ -229,3 +229,4 @@
 CASE_DECATC
 CASE_DECTID
 CASE_DECST8C
+CASE_XTERM_TITLE_STACK		# XTTITLEPOS
Index: aclocal.m4
--- xterm-395+/aclocal.m4	2024-07-05 23:35:35.000000000 +0000
+++ xterm-396/aclocal.m4	2024-11-30 19:37:45.000000000 +0000
@@ -1,4 +1,4 @@
-dnl $XTermId: aclocal.m4,v 1.528 2024/07/05 23:35:35 tom Exp $
+dnl $XTermId: aclocal.m4,v 1.532 2024/11/30 19:37:45 tom Exp $
 dnl
 dnl ---------------------------------------------------------------------------
 dnl
@@ -1457,6 +1457,26 @@
 AC_SUBST(EXTRA_CFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_GLOB_FULLPATH version: 2 updated: 2024/08/03 12:34:02
+dnl ----------------
+dnl Use this in case-statements to check for pathname syntax, i.e., absolute
+dnl pathnames.  The "x" is assumed since we provide an alternate form for DOS.
+AC_DEFUN([CF_GLOB_FULLPATH],[
+AC_REQUIRE([CF_WITH_SYSTYPE])dnl
+case "$cf_cv_system_name" in
+(cygwin*|msys*|mingw32*|mingw64|os2*)
+	GLOB_FULLPATH_POSIX='/*'
+	GLOB_FULLPATH_OTHER='[[a-zA-Z]]:[[\\/]]*'
+	;;
+(*)
+	GLOB_FULLPATH_POSIX='/*'
+	GLOB_FULLPATH_OTHER=$GLOB_FULLPATH_POSIX
+	;;
+esac
+AC_SUBST(GLOB_FULLPATH_POSIX)
+AC_SUBST(GLOB_FULLPATH_OTHER)
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_GNU_SOURCE version: 10 updated: 2018/12/10 20:09:41
 dnl -------------
 dnl Check if we must define _GNU_SOURCE to get a reasonable value for
@@ -2162,35 +2182,35 @@
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_PATH_SYNTAX version: 18 updated: 2020/12/31 18:40:20
+dnl CF_PATH_SYNTAX version: 19 updated: 2024/08/03 13:08:58
 dnl --------------
 dnl Check the argument to see that it looks like a pathname.  Rewrite it if it
 dnl begins with one of the prefix/exec_prefix variables, and then again if the
 dnl result begins with 'NONE'.  This is necessary to work around autoconf's
 dnl delayed evaluation of those symbols.
 AC_DEFUN([CF_PATH_SYNTAX],[
+AC_REQUIRE([CF_GLOB_FULLPATH])dnl
+
 if test "x$prefix" != xNONE; then
 	cf_path_syntax="$prefix"
 else
 	cf_path_syntax="$ac_default_prefix"
 fi
 
-case ".[$]$1" in
-(.\[$]\(*\)*|.\'*\'*)
-	;;
-(..|./*|.\\*)
+case "x[$]$1" in
+(x\[$]\(*\)*|x\'*\'*)
 	;;
-(.[[a-zA-Z]]:[[\\/]]*) # OS/2 EMX
+(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
 	;;
-(.\[$]\{*prefix\}*|.\[$]\{*dir\}*)
+(x\[$]\{*prefix\}*|x\[$]\{*dir\}*)
 	eval $1="[$]$1"
-	case ".[$]$1" in
-	(.NONE/*)
+	case "x[$]$1" in
+	(xNONE/*)
 		$1=`echo "[$]$1" | sed -e s%NONE%$cf_path_syntax%`
 		;;
 	esac
 	;;
-(.no|.NONE/*)
+(xno|xNONE/*)
 	$1=`echo "[$]$1" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
@@ -2477,14 +2497,17 @@
 AC_SUBST(NROFF_NOTE)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_PROG_LINT version: 5 updated: 2022/08/20 15:44:13
+dnl CF_PROG_LINT version: 7 updated: 2024/11/30 14:37:45
 dnl ------------
 AC_DEFUN([CF_PROG_LINT],
 [
 AC_CHECK_PROGS(LINT, lint cppcheck splint)
 case "x$LINT" in
+(xlint|x*/lint) # NetBSD 10
+	test -z "$LINT_OPTS" && LINT_OPTS="-chapbrxzgFS -v -Ac11"
+	;;
 (xcppcheck|x*/cppcheck)
-	test -z "$LINT_OPTS" && LINT_OPTS="--enable=all"
+	test -z "$LINT_OPTS" && LINT_OPTS="--enable=all -D__CPPCHECK__"
 	;;
 esac
 AC_SUBST(LINT_OPTS)
@@ -4347,12 +4370,12 @@
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_MAN2HTML version: 13 updated: 2023/11/23 06:40:35
+dnl CF_WITH_MAN2HTML version: 14 updated: 2024/09/09 17:17:46
 dnl ----------------
 dnl Check for man2html and groff.  Prefer man2html over groff, but use groff
 dnl as a fallback.  See
 dnl
-dnl		http://invisible-island.net/scripts/man2html.html
+dnl		https://invisible-island.net/scripts/man2html.html
 dnl
 dnl Generate a shell script which hides the differences between the two.
 dnl
@@ -4650,6 +4673,26 @@
 AC_SUBST(no_pixmapdir)
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_WITH_SYSTYPE version: 1 updated: 2013/01/26 16:26:12
+dnl ---------------
+dnl For testing, override the derived host system-type which is used to decide
+dnl things such as the linker commands used to build shared libraries.  This is
+dnl normally chosen automatically based on the type of system which you are
+dnl building on.  We use it for testing the configure script.
+dnl
+dnl This is different from the --host option: it is used only for testing parts
+dnl of the configure script which would not be reachable with --host since that
+dnl relies on the build environment being real, rather than mocked up.
+AC_DEFUN([CF_WITH_SYSTYPE],[
+CF_CHECK_CACHE([AC_CANONICAL_SYSTEM])
+AC_ARG_WITH(system-type,
+	[  --with-system-type=XXX  test: override derived host system-type],
+[AC_MSG_WARN(overriding system type to $withval)
+	cf_cv_system_name=$withval
+	host_os=$withval
+])
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_WITH_UTMP_PATH version: 1 updated: 2023/09/04 16:05:17
 dnl -----------------
 dnl utmp and wtmp have different pathnames on different systems, but there
@@ -4894,7 +4937,7 @@
 fi
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_XOPEN_SOURCE version: 67 updated: 2023/09/06 18:55:27
+dnl CF_XOPEN_SOURCE version: 68 updated: 2024/11/09 18:07:29
 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,
@@ -4957,6 +5000,9 @@
 (linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc)
 	CF_GNU_SOURCE($cf_XOPEN_SOURCE)
 	;;
+linux*musl)
+	cf_xopen_source="-D_BSD_SOURCE"
+	;;
 (minix*)
 	cf_xopen_source="-D_NETBSD_SOURCE" # POSIX.1-2001 features are ifdef'd with this...
 	;;
@@ -5292,7 +5338,7 @@
 				   cf_x_ext_double_buffer=yes]))
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_X_FONTCONFIG version: 7 updated: 2020/03/10 18:53:47
+dnl CF_X_FONTCONFIG version: 8 updated: 2024/11/25 04:10:12
 dnl ---------------
 dnl Check for fontconfig library, a dependency of the X FreeType library.
 AC_DEFUN([CF_X_FONTCONFIG],
@@ -5302,6 +5348,7 @@
 if test "$cf_cv_found_freetype" = yes ; then
 AC_CACHE_CHECK(for usable Xft/fontconfig package,cf_cv_xft_compat,[
 AC_TRY_LINK([
+#include <X11/Xlib.h>
 #include <X11/Xft/Xft.h>
 ],[
 	XftPattern *pat = 0;
Index: button.c
--- xterm-395+/button.c	2024-09-30 07:44:57.000000000 +0000
+++ xterm-396/button.c	2024-12-01 19:21:45.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: button.c,v 1.666 2024/09/30 07:44:57 tom Exp $ */
+/* $XTermId: button.c,v 1.668 2024/12/01 19:21:45 tom Exp $ */
 
 /*
  * Copyright 1999-2023,2024 by Thomas E. Dickey
@@ -190,15 +190,15 @@
 static Char *SaveText(TScreen *screen, int row, int scol, int ecol,
 		      Char *lp, int *eol);
 static int Length(TScreen *screen, int row, int scol, int ecol);
-static void ComputeSelect(XtermWidget xw, CELL *startc, CELL *endc, Bool
-			  extend, Bool normal);
+static void ComputeSelect(XtermWidget xw, const CELL *startc, const CELL *endc,
+			  Bool extend, Bool normal);
 static void EditorButton(XtermWidget xw, XButtonEvent *event);
 static void EndExtend(XtermWidget w, XEvent *event, String *params, Cardinal
 		      num_params, Bool use_cursor_loc);
 static void ExtendExtend(XtermWidget xw, const CELL *cell);
 static void PointToCELL(TScreen *screen, int y, int x, CELL *cell);
-static void ReHiliteText(XtermWidget xw, CELL *first, CELL *last);
-static void SaltTextAway(XtermWidget xw, int which, CELL *cellc, CELL *cell);
+static void ReHiliteText(XtermWidget xw, const CELL *first, const CELL *last);
+static void SaltTextAway(XtermWidget xw, int which, const CELL *cellc, const CELL *cell);
 static void SelectSet(XtermWidget xw, XEvent *event, String *params, Cardinal num_params);
 static void SelectionReceived PROTO_XT_SEL_CB_ARGS;
 static void StartSelect(XtermWidget xw, const CELL *cell);
@@ -330,7 +330,7 @@
 
     *first = *last = 0;
     if (IsEmpty(target)) {
-	target = 0;
+	target = NULL;
     } else {
 	do {
 	    char ch;
@@ -440,7 +440,7 @@
 
 	TRACE(("xtermButtonInit length %ld\n", (long) strlen(result)));
 	xw->keyboard.print_translations = data;
-	while ((next = scanTrans(data, &state, &state2, &first, &last)) != 0) {
+	while ((next = scanTrans(data, &state, &state2, &first, &last)) != NULL) {
 	    unsigned len = (last - first);
 	    TRACE2(("parse %s:%d..%d '%.*s'\n",
 		    visibleScan(state), first, last,
@@ -1376,7 +1376,7 @@
 {
     XtermWidget xw;
 
-    if ((xw = getXtermWidget(w)) != 0) {
+    if ((xw = getXtermWidget(w)) != NULL) {
 	TScreen *screen = TScreenOf(xw);
 
 	if (IsBtnEvent(event)
@@ -1408,7 +1408,7 @@
 {
     XtermWidget xw;
 
-    if ((xw = getXtermWidget(w)) != 0) {
+    if ((xw = getXtermWidget(w)) != NULL) {
 	TScreen *screen = TScreenOf(xw);
 	Char Line[6];
 	int line, col, ldelta = 0;
@@ -1464,7 +1464,7 @@
 {
     XtermWidget xw;
 
-    if ((xw = getXtermWidget(w)) != 0) {
+    if ((xw = getXtermWidget(w)) != NULL) {
 	TScreen *screen = TScreenOf(xw);
 	int pty = screen->respond;
 
@@ -1505,7 +1505,7 @@
 {
     XtermWidget xw;
 
-    if ((xw = getXtermWidget(w)) != 0) {
+    if ((xw = getXtermWidget(w)) != NULL) {
 	TScreen *screen = TScreenOf(xw);
 	CELL cell;
 
@@ -1541,7 +1541,7 @@
 {
     XtermWidget xw;
 
-    if ((xw = getXtermWidget(w)) != 0) {
+    if ((xw = getXtermWidget(w)) != NULL) {
 	TScreen *screen = TScreenOf(xw);
 
 	TRACE_EVENT("HandleKeyboardSelectExtend", event, params, num_params);
@@ -1586,7 +1586,7 @@
 {
     XtermWidget xw;
 
-    if ((xw = getXtermWidget(w)) != 0) {
+    if ((xw = getXtermWidget(w)) != NULL) {
 	TRACE(("HandleSelectEnd\n"));
 	do_select_end(xw, event, params, num_params, False);
     }
@@ -1600,7 +1600,7 @@
 {
     XtermWidget xw;
 
-    if ((xw = getXtermWidget(w)) != 0) {
+    if ((xw = getXtermWidget(w)) != NULL) {
 	TRACE(("HandleKeyboardSelectEnd\n"));
 	do_select_end(xw, event, params, num_params, True);
     }
@@ -1616,7 +1616,7 @@
 
     (void) params;
     (void) num_params;
-    if ((xw = getXtermWidget(w)) != 0) {
+    if ((xw = getXtermWidget(w)) != NULL) {
 	TRACE(("HandlePointerMotion\n"));
 	if (event->type == MotionNotify)
 	    (void) SendMousePosition(xw, event);
@@ -1633,7 +1633,7 @@
 
     (void) params;
     (void) num_params;
-    if ((xw = getXtermWidget(w)) != 0) {
+    if ((xw = getXtermWidget(w)) != NULL) {
 	TRACE(("HandlePointerButton\n"));
 	if (IsBtnEvent(event))
 	    (void) SendMousePosition(xw, event);
@@ -1651,7 +1651,7 @@
 {
     XtermWidget xw;
 
-    if ((xw = getXtermWidget(w)) != 0) {
+    if ((xw = getXtermWidget(w)) != NULL) {
 	TRACE_EVENT("HandleCopySelection", event, params, num_params);
 	SelectSet(xw, event, params, *num_params);
     }
@@ -1797,7 +1797,7 @@
 	    for (i = 0; i < (*text_list_count); ++i) {
 		data = (Char *) (*text_list)[i];
 		size = strlen((*text_list)[i]) + 1;
-		if ((data = UTF8toLatin1(screen, data, size, &size)) != 0) {
+		if ((data = UTF8toLatin1(screen, data, size, &size)) != NULL) {
 		    memcpy(tmp, data, size + 1);
 		    new_text_list[i] = tmp;
 		    tmp += size + 1;
@@ -1857,13 +1857,13 @@
     Bool override = False;
     XtermWidget xw;
 
-    if ((xw = getXtermWidget(w)) != 0) {
+    if ((xw = getXtermWidget(w)) != NULL) {
 	TScreen *screen = TScreenOf(xw);
 
 	if (!IsEmpty(value)) {
 	    char *copied = x_strdup(value);
-	    if (copied != 0) {
-		Atom *result = 0;
+	    if (copied != NULL) {
+		Atom *result = NULL;
 		Cardinal count = 1;
 		int n;
 
@@ -1931,7 +1931,7 @@
 {
     Atom **resultp = &(screen->selection_targets_utf8);
 
-    if (*resultp == 0) {
+    if (*resultp == NULL) {
 	Atom *result;
 
 	if (!overrideTargets(w, screen->utf8_select_types, &result)) {
@@ -1967,8 +1967,8 @@
 {
     Atom **resultp = &(screen->selection_targets_8bit);
 
-    if (*resultp == 0) {
-	Atom *result = 0;
+    if (*resultp == NULL) {
+	Atom *result = NULL;
 
 	if (!overrideTargets(w, screen->eightbit_select_types, &result)) {
 	    result = TypeXtMallocN(Atom, 5);
@@ -2003,7 +2003,7 @@
     Atom *result;
     XtermWidget xw;
 
-    if ((xw = getXtermWidget(w)) == 0) {
+    if ((xw = getXtermWidget(w)) == NULL) {
 	result = NULL;
     } else {
 	TScreen *screen = TScreenOf(xw);
@@ -2077,7 +2077,7 @@
 {
     String *result = params;
 
-    if (params != 0 && num_params > 0) {
+    if (params != NULL && num_params > 0) {
 	Cardinal j;
 	Boolean map = False;
 
@@ -2095,13 +2095,13 @@
 				 : PRIMARY_NAME);
 
 	    UnmapSelections(xw);
-	    if ((result = TypeMallocN(String, num_params + 1)) != 0) {
-		result[num_params] = 0;
+	    if ((result = TypeMallocN(String, num_params + 1)) != NULL) {
+		result[num_params] = NULL;
 		for (j = 0; j < num_params; ++j) {
 		    result[j] = (String) (isSELECT(params[j])
 					  ? mapTo
 					  : params[j]);
-		    if (result[j] == 0) {
+		    if (result[j] == NULL) {
 			UnmapSelections(xw);
 			FreeAndNull(result);
 			break;
@@ -2188,7 +2188,7 @@
 
     if (num_params == 0)
 	return;
-    if ((xw = getXtermWidget(w)) == 0)
+    if ((xw = getXtermWidget(w)) == NULL)
 	return;
 
     TRACE(("xtermGetSelection num_params %d @%ld\n", num_params, ev_time));
@@ -2230,7 +2230,7 @@
 	    targets = _SelectionTargets(w);
 	}
 
-	if (targets != 0) {
+	if (targets != NULL) {
 	    struct _SelectionList *list;
 
 	    target = targets[0];
@@ -2246,7 +2246,7 @@
 	    if (num_params) {
 		/* 'list' is freed in SelectionReceived */
 		list = TypeXtMalloc(struct _SelectionList);
-		if (list != 0) {
+		if (list != NULL) {
 		    list->params = params;
 		    list->count = num_params;
 		    list->targets = targets;
@@ -2701,7 +2701,7 @@
 
     XtermWidget xw;
 
-    if ((xw = getXtermWidget(w)) == 0)
+    if ((xw = getXtermWidget(w)) == NULL)
 	return;
 
     screen = TScreenOf(xw);
@@ -2797,7 +2797,7 @@
 		    size_t need = have + len + 1;
 		    char *buffer = realloc(mydata->buffer, need);
 
-		    if (buffer != 0) {
+		    if (buffer != NULL) {
 			strcpy(buffer + have, text_list[i]);
 			mydata->buffer = buffer;
 		    }
@@ -2849,7 +2849,7 @@
     return;
 
   fail:
-    if (client_data != 0) {
+    if (client_data != NULL) {
 	struct _SelectionList *list = (struct _SelectionList *) client_data;
 
 	TRACE(("SelectionReceived ->xtermGetSelection\n"));
@@ -2872,7 +2872,7 @@
 {
     XtermWidget xw;
 
-    if ((xw = getXtermWidget(w)) != 0) {
+    if ((xw = getXtermWidget(w)) != NULL) {
 	TRACE_EVENT("HandleInsertSelection", event, params, num_params);
 	if (!SendMousePosition(xw, event)) {
 #if OPT_READLINE
@@ -2956,7 +2956,7 @@
 {
     XtermWidget xw;
 
-    if ((xw = getXtermWidget(w)) != 0) {
+    if ((xw = getXtermWidget(w)) != NULL) {
 	TScreen *screen = TScreenOf(xw);
 	CELL cell;
 
@@ -2982,7 +2982,7 @@
 {
     XtermWidget xw;
 
-    if ((xw = getXtermWidget(w)) != 0) {
+    if ((xw = getXtermWidget(w)) != NULL) {
 	TScreen *screen = TScreenOf(xw);
 
 	TRACE_EVENT("HandleKeyboardSelectStart", event, params, num_params);
@@ -3018,7 +3018,7 @@
 void
 TrackMouse(XtermWidget xw,
 	   int func,
-	   CELL *start,
+	   const CELL *start,
 	   int firstrow,
 	   int lastrow)
 {
@@ -3174,7 +3174,7 @@
 {
     XtermWidget xw;
 
-    if ((xw = getXtermWidget(w)) != 0) {
+    if ((xw = getXtermWidget(w)) != NULL) {
 	TRACE_EVENT("HandleSelectSet", event, params, num_params);
 	SelectSet(xw, event, params, *num_params);
     }
@@ -3316,7 +3316,7 @@
 {
     XtermWidget xw;
 
-    if ((xw = getXtermWidget(w)) != 0) {
+    if ((xw = getXtermWidget(w)) != NULL) {
 	TRACE_EVENT("HandleStartExtend", event, params, num_params);
 	do_start_extend(xw, event, params, num_params, False);
     }
@@ -3330,7 +3330,7 @@
 {
     XtermWidget xw;
 
-    if ((xw = getXtermWidget(w)) != 0) {
+    if ((xw = getXtermWidget(w)) != NULL) {
 	TRACE_EVENT("HandleKeyboardStartExtend", event, params, num_params);
 	do_start_extend(xw, event, params, num_params, True);
     }
@@ -3465,7 +3465,7 @@
 {
     int i = -1;
 
-    if (ld != 0) {
+    if (ld != NULL) {
 	if (okScrnRow(screen, row)) {
 	    const IAttr *ch;
 	    for (i = screen->max_col,
@@ -3581,7 +3581,7 @@
 #endif
 
 static int
-class_of(LineData *ld, CELL *cell)
+class_of(LineData *ld, const CELL *cell)
 {
     CELL temp = *cell;
     int result = 0;
@@ -3780,11 +3780,11 @@
 static int
 firstRowOfLine(TScreen *screen, int row, Bool visible)
 {
-    LineData *ld = 0;
+    LineData *ld = NULL;
     int limit = visible ? 0 : -screen->savedlines;
 
     while (row > limit &&
-	   (ld = GET_LINEDATA(screen, row - 1)) != 0 &&
+	   (ld = GET_LINEDATA(screen, row - 1)) != NULL &&
 	   LineTstWrapped(ld)) {
 	--row;
     }
@@ -3800,7 +3800,7 @@
     LineData *ld;
 
     while (row < screen->max_row &&
-	   (ld = GET_LINEDATA(screen, row)) != 0 &&
+	   (ld = GET_LINEDATA(screen, row)) != NULL &&
 	   LineTstWrapped(ld)) {
 	++row;
     }
@@ -3833,7 +3833,7 @@
 static char *
 make_indexed_text(TScreen *screen, int row, unsigned length, int *indexed)
 {
-    Char *result = 0;
+    Char *result = NULL;
     size_t need = (length + 1);
 
     /*
@@ -3844,7 +3844,7 @@
 	need *= ((screen->lineExtra + 1) * 6);
     });
 
-    if ((result = TypeCallocN(Char, need + 1)) != 0) {
+    if ((result = TypeCallocN(Char, need + 1)) != NULL) {
 	LineData *ld = GET_LINEDATA(screen, row);
 	unsigned used = 0;
 	Char *last = result;
@@ -3889,7 +3889,7 @@
 	    }
 	} while (used < length &&
 		 LineTstWrapped(ld) &&
-		 (ld = GET_LINEDATA(screen, ++row)) != 0 &&
+		 (ld = GET_LINEDATA(screen, ++row)) != NULL &&
 		 row < screen->max_row);
     }
     /* TRACE(("result:%s\n", result)); */
@@ -3901,7 +3901,7 @@
  * index constructed in make_indexed_text().
  */
 static int
-indexToCol(int *indexed, int len, int off)
+indexToCol(const int *indexed, int len, int off)
 {
     int col = 0;
     while (indexed[col] < len) {
@@ -3950,7 +3950,7 @@
 static int
 cellToColumn(TScreen *screen, CELL *cell)
 {
-    CLineData *ld = 0;
+    CLineData *ld = NULL;
     int col = cell->col;
     int row = firstRowOfLine(screen, cell->row, False);
     while (row < cell->row) {
@@ -3958,7 +3958,7 @@
 	col += LastTextCol(screen, ld, row++);
     }
 #if OPT_DEC_CHRSET
-    if (ld == 0)
+    if (ld == NULL)
 	ld = GET_LINEDATA(screen, row);
     if (CSET_DOUBLE(GetLineDblCS(ld)))
 	col /= 2;
@@ -3976,7 +3976,7 @@
     regmatch_t match;
 
     TRACE(("Select_REGEX[%d]:%s\n", inx, NonNull(expr)));
-    if (okPosition(screen, &ld, startc) && expr != 0) {
+    if (okPosition(screen, &ld, startc) && expr != NULL) {
 	if (regcomp(&preg, expr, REG_EXTENDED) == 0) {
 	    int firstRow = firstRowOfLine(screen, startc->row, True);
 	    int lastRow = lastRowOfLine(screen, firstRow);
@@ -3987,12 +3987,12 @@
 	    TRACE(("regcomp ok rows %d..%d bytes %d\n",
 		   firstRow, lastRow, size));
 
-	    if ((indexed = TypeCallocN(int, size + 1)) != 0) {
+	    if ((indexed = TypeCallocN(int, size + 1)) != NULL) {
 		char *search;
 		if ((search = make_indexed_text(screen,
 						firstRow,
 						size,
-						indexed)) != 0) {
+						indexed)) != NULL) {
 		    int len = (int) strlen(search);
 		    int col;
 		    int offset;
@@ -4047,11 +4047,11 @@
 		}
 		free(indexed);
 #if OPT_DEC_CHRSET
-		if ((ld = GET_LINEDATA(screen, startc->row)) != 0) {
+		if ((ld = GET_LINEDATA(screen, startc->row)) != NULL) {
 		    if (CSET_DOUBLE(GetLineDblCS(ld)))
 			startc->col *= 2;
 		}
-		if ((ld = GET_LINEDATA(screen, endc->row)) != 0) {
+		if ((ld = GET_LINEDATA(screen, endc->row)) != NULL) {
 		    if (CSET_DOUBLE(GetLineDblCS(ld)))
 			endc->col *= 2;
 		}
@@ -4077,7 +4077,7 @@
 
 #define isPrevWrapped(name) \
 	(screen->name.row > 0 \
-	   && (ltmp = GET_LINEDATA(screen, screen->name.row - 1)) != 0 \
+	   && (ltmp = GET_LINEDATA(screen, screen->name.row - 1)) != NULL \
 	   && LineTstWrapped(ltmp))
 
 /*
@@ -4086,8 +4086,8 @@
  */
 static void
 ComputeSelect(XtermWidget xw,
-	      CELL *startc,
-	      CELL *endc,
+	      const CELL *startc,
+	      const CELL *endc,
 	      Bool extend,
 	      Bool normal)
 {
@@ -4353,8 +4353,8 @@
 /* Guaranteed that (first->row, first->col) <= (last->row, last->col) */
 static void
 ReHiliteText(XtermWidget xw,
-	     CELL *firstp,
-	     CELL *lastp)
+	     const CELL *firstp,
+	     const CELL *lastp)
 {
     TScreen *screen = TScreenOf(xw);
     CELL first = *firstp;
@@ -4401,8 +4401,8 @@
 static void
 SaltTextAway(XtermWidget xw,
 	     int which,
-	     CELL *cellc,
-	     CELL *cell)
+	     const CELL *cellc,
+	     const CELL *cell)
 {
     TScreen *screen = TScreenOf(xw);
     SelectedCells *scp;
@@ -4456,7 +4456,7 @@
 	return;
 
     if (scp->data_limit <= (unsigned) need) {
-	if ((line = (Char *) malloc((size_t) need + 1)) == 0)
+	if ((line = (Char *) malloc((size_t) need + 1)) == NULL)
 	    SysError(ERROR_BMALLOC2);
 	free(scp->data_buffer);
 	scp->data_buffer = line;
@@ -4465,7 +4465,7 @@
 	line = scp->data_buffer;
     }
 
-    if (line == 0)
+    if (line == NULL)
 	return;
 
     line[need] = '\0';		/* make sure it is null terminated */
@@ -4533,12 +4533,12 @@
 	    } else {
 		line = (Char *) realloc(scp->data_buffer, k);
 	    }
-	    if (line == 0)
+	    if (line == NULL)
 		SysError(ERROR_BMALLOC2);
 	    scp->data_buffer = line;
 	    scp->data_limit = k;
 	}
-	if (scp->data_buffer != 0) {
+	if (scp->data_buffer != NULL) {
 	    memcpy(scp->data_buffer + scp->data_length, text, len);
 	    scp->data_length += len;
 	    scp->data_buffer[scp->data_length] = 0;
@@ -4621,16 +4621,16 @@
 						    XTextProperty *),
 			XICCEncodingStyle conversion_style)
 {
-    *value = 0;
+    *value = NULL;
     *length = 0;
     *type = 0;
     *format = 0;
 
-    if (getXtermWidget(w) != 0) {
+    if (getXtermWidget(w) != NULL) {
 	Display *dpy = XtDisplay(w);
 	XTextProperty textprop;
 	int out_n = 0;
-	char *result = 0;
+	char *result = NULL;
 	char *the_data = (char *) scp->data_buffer;
 	char *the_next;
 	unsigned long remaining = scp->data_length;
@@ -4644,7 +4644,7 @@
 	 * paste64 feature.  For those cases, we will build up the result in
 	 * parts.
 	 */
-	if (memchr(the_data, 0, scp->data_length) != 0) {
+	if (memchr(the_data, 0, scp->data_length) != NULL) {
 	    TRACE(("selection contains embedded nulls\n"));
 	    result = calloc(scp->data_length + 1, sizeof(char));
 	}
@@ -4654,8 +4654,8 @@
 	if (conversion_function(dpy, &the_data, 1,
 				conversion_style,
 				&textprop) >= Success) {
-	    if ((result != 0)
-		&& (textprop.value != 0)
+	    if ((result != NULL)
+		&& (textprop.value != NULL)
 		&& (textprop.format == 8)) {
 		char *text_values = (char *) textprop.value;
 		unsigned long in_n;
@@ -4669,7 +4669,7 @@
 		    result[out_n++] = text_values[in_n];
 		}
 		*length += textprop.nitems;
-		if ((the_next = memchr(the_data, 0, remaining)) != 0) {
+		if ((the_next = memchr(the_data, 0, remaining)) != NULL) {
 		    unsigned long this_was = (unsigned long) (the_next - the_data);
 		    this_was++;
 		    the_data += this_was;
@@ -4700,7 +4700,7 @@
     Boolean result = False;
 
     *target = XtMalloc(4);
-    if (*target != 0) {
+    if (*target != NULL) {
 	result = True;
 	if (sizeof(unsigned long) == 4) {
 	    *(unsigned long *) *target = source;
@@ -4741,7 +4741,7 @@
 
     XtermWidget xw;
 
-    if ((xw = getXtermWidget(w)) == 0)
+    if ((xw = getXtermWidget(w)) == NULL)
 	return False;
 
     screen = TScreenOf(xw);
@@ -4767,7 +4767,7 @@
 
     if (*target == XA_TARGETS(dpy)) {
 	Atom *targetP;
-	XPointer std_return = 0;
+	XPointer std_return = NULL;
 	unsigned long std_length;
 
 	if (XmuConvertStandardSelection(w, screen->selection_time, selection,
@@ -4786,7 +4786,7 @@
 
 	    *value = (XtPointer) targetP;
 
-	    if (my_targets != 0) {
+	    if (my_targets != NULL) {
 		while (*my_targets != None) {
 		    *targetP++ = *my_targets++;
 		}
@@ -4909,7 +4909,7 @@
 
     XtermWidget xw;
 
-    if ((xw = getXtermWidget(w)) == 0)
+    if ((xw = getXtermWidget(w)) == NULL)
 	return;
 
     screen = TScreenOf(xw);
@@ -5011,7 +5011,7 @@
 		SelectedCells *tcp = &(screen->clipboard_data);
 		TRACE(("saving selection to clipboard buffer\n"));
 		scp = &(screen->selected_cells[CLIPBOARD_CODE]);
-		if ((buf = (Char *) malloc((size_t) scp->data_length)) == 0) {
+		if ((buf = (Char *) malloc((size_t) scp->data_length)) == NULL) {
 		    SysError(ERROR_BMALLOC2);
 		} else {
 		    free(tcp->data_buffer);
@@ -5609,7 +5609,7 @@
 		  Widget w,
 		  XEvent *event,
 		  String *params,
-		  Cardinal *num_params,
+		  const Cardinal *num_params,
 		  FormatSelect format_select)
 {
     TScreen *screen = TScreenOf(xw);
@@ -5656,7 +5656,7 @@
     SelectedCells *scp = &(screen->selected_cells[PRIMARY_CODE]);
     SelectedCells save_selection = *scp;
 
-    char *result = 0;
+    char *result = NULL;
 
     TRACE(("getDataFromScreen %s\n", method));
 
@@ -5737,7 +5737,7 @@
 static char **
 tokenizeFormat(String format)
 {
-    char **result = 0;
+    char **result = NULL;
 
     format = x_skip_blanks(format);
     if (*format != '\0') {
@@ -5796,7 +5796,7 @@
 	    assert(strlen(blob) <= strlen(format));
 	    if (!pass) {
 		result = TypeCallocN(char *, argc + 1);
-		if (result == 0) {
+		if (result == NULL) {
 		    free(blob);
 		    break;
 		}
@@ -5824,7 +5824,7 @@
     LineData *ld = GET_LINEDATA(screen, cell->row);
 
     *buffer = '\0';
-    if (ld != 0 && cell->col < (int) ld->lineSize) {
+    if (ld != NULL && cell->col < (int) ld->lineSize) {
 	IAttr attribs = ld->attribs[cell->col];
 	const char *delim = "";
 
@@ -5877,7 +5877,7 @@
 static char *
 formatStrlen(char *target, char *source, int freeit)
 {
-    if (source != 0) {
+    if (source != NULL) {
 	sprintf(target, "%u", (unsigned) strlen(source));
 	if (freeit) {
 	    free(source);
@@ -5896,14 +5896,14 @@
 	     CELL *start,
 	     CELL *finish)
 {
-    char *result = 0;
+    char *result = NULL;
     if (!IsEmpty(format)) {
 	static char empty[1];
 	int pass;
 	int n;
 	char numbers[80];
 
-	if (data == 0)
+	if (data == NULL)
 	    data = empty;
 
 	for (pass = 0; pass < 2; ++pass) {
@@ -5912,7 +5912,7 @@
 	    for (n = 0; format[n] != '\0'; ++n) {
 
 		if (format[n] == '%') {
-		    char *value = 0;
+		    char *value = NULL;
 
 		    switch (format[++n]) {
 		    case '%':
@@ -5967,7 +5967,7 @@
 			++need;
 			break;
 		    }
-		    if (value != 0) {
+		    if (value != NULL) {
 			if (pass) {
 			    strcpy(result + need, value);
 			}
@@ -5988,7 +5988,7 @@
 	    } else {
 		++need;
 		result = malloc(need);
-		if (result == 0) {
+		if (result == NULL) {
 		    break;
 		}
 	    }
@@ -6004,7 +6004,7 @@
 executeCommand(pid_t pid, char **argv)
 {
     (void) pid;
-    if (argv != 0 && argv[0] != 0) {
+    if (argv != NULL && argv[0] != NULL) {
 	char *child_cwd = ProcGetCWD(pid);
 
 	if (fork() == 0) {
@@ -6037,14 +6037,14 @@
 {
     XtermWidget xw;
 
-    if ((xw = getXtermWidget(w)) != 0) {
+    if ((xw = getXtermWidget(w)) != NULL) {
 	char **argv;
 
-	if ((argv = tokenizeFormat(format)) != 0) {
+	if ((argv = tokenizeFormat(format)) != NULL) {
 	    char *blob = argv[0];
 	    int argc;
 
-	    for (argc = 0; argv[argc] != 0; ++argc) {
+	    for (argc = 0; argv[argc] != NULL; ++argc) {
 		argv[argc] = expandFormat(xw, argv[argc], data, start, finish);
 	    }
 	    executeCommand(TScreenOf(xw)->pid, argv);
@@ -6062,7 +6062,7 @@
     XtermWidget xw;
 
     TRACE_EVENT("HandleExecFormatted", event, params, num_params);
-    if ((xw = getXtermWidget(w)) != 0 &&
+    if ((xw = getXtermWidget(w)) != NULL &&
 	(*num_params > 1)) {
 	doSelectionFormat(xw, w, event, params, num_params, reallyExecFormatted);
     }
@@ -6076,7 +6076,7 @@
 {
     XtermWidget xw;
 
-    if ((xw = getXtermWidget(w)) != 0) {
+    if ((xw = getXtermWidget(w)) != NULL) {
 	TRACE_EVENT("HandleExecSelectable", event, params, num_params);
 
 	if (*num_params == 2) {
@@ -6085,12 +6085,12 @@
 	    char **argv;
 
 	    data = getDataFromScreen(xw, event, params[1], &start, &finish);
-	    if (data != 0) {
-		if ((argv = tokenizeFormat(params[0])) != 0) {
+	    if (data != NULL) {
+		if ((argv = tokenizeFormat(params[0])) != NULL) {
 		    char *blob = argv[0];
 		    int argc;
 
-		    for (argc = 0; argv[argc] != 0; ++argc) {
+		    for (argc = 0; argv[argc] != NULL; ++argc) {
 			argv[argc] = expandFormat(xw, argv[argc], data,
 						  &start, &finish);
 		    }
@@ -6109,10 +6109,10 @@
 {
     XtermWidget xw;
 
-    if ((xw = getXtermWidget(w)) != 0) {
+    if ((xw = getXtermWidget(w)) != NULL) {
 	char *exps;
 
-	if ((exps = expandFormat(xw, format, data, start, finish)) != 0) {
+	if ((exps = expandFormat(xw, format, data, start, finish)) != NULL) {
 	    unparseputs(xw, exps);
 	    unparse_end(xw);
 	    free(exps);
@@ -6129,7 +6129,7 @@
     XtermWidget xw;
 
     TRACE_EVENT("HandleInsertFormatted", event, params, num_params);
-    if ((xw = getXtermWidget(w)) != 0 &&
+    if ((xw = getXtermWidget(w)) != NULL &&
 	(*num_params > 1)) {
 	doSelectionFormat(xw, w, event, params, num_params, reallyInsertFormatted);
     }
@@ -6143,7 +6143,7 @@
 {
     XtermWidget xw;
 
-    if ((xw = getXtermWidget(w)) != 0) {
+    if ((xw = getXtermWidget(w)) != NULL) {
 	TRACE_EVENT("HandleInsertSelectable", event, params, num_params);
 
 	if (*num_params == 2) {
@@ -6152,9 +6152,9 @@
 	    char *temp = x_strdup(params[0]);
 
 	    data = getDataFromScreen(xw, event, params[1], &start, &finish);
-	    if (data != 0) {
+	    if (data != NULL) {
 		char *exps = expandFormat(xw, temp, data, &start, &finish);
-		if (exps != 0) {
+		if (exps != NULL) {
 		    unparseputs(xw, exps);
 		    unparse_end(xw);
 		    free(exps);
Index: cachedGCs.c
--- xterm-395+/cachedGCs.c	2024-09-01 21:26:44.000000000 +0000
+++ xterm-396/cachedGCs.c	2024-12-01 19:24:57.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: cachedGCs.c,v 1.83 2024/09/01 21:26:44 tom Exp $ */
+/* $XTermId: cachedGCs.c,v 1.84 2024/12/01 19:24:57 tom Exp $ */
 
 /*
  * Copyright 2007-2021,2024 by Thomas E. Dickey
@@ -68,7 +68,7 @@
 #define THIS(field) me->data->field
 #define NEXT(field) me->next.field
 
-#define HaveFont(font) (Boolean) ((font) != 0 && (font)->fs != 0)
+#define HaveFont(font) (Boolean) ((font) != NULL && (font)->fs != NULL)
 
 #define GC_CSet GCFunction
 
@@ -124,7 +124,7 @@
 traceVTwin(XtermWidget xw, const VTwin *value)
 {
     const char *result = "?";
-    if (value == 0)
+    if (value == NULL)
 	result = "null";
     else if (value == &(TScreenOf(xw)->fullVwin))
 	result = "fullVwin";
@@ -242,14 +242,14 @@
 static CgsCache *
 allocCache(void **cache_pointer)
 {
-    if (*cache_pointer == 0) {
+    if (*cache_pointer == NULL) {
 	*cache_pointer = TypeCallocN(CgsCache, gcMAX);
 	TRACE(("allocCache %p\n", *cache_pointer));
     }
     return *((CgsCache **) cache_pointer);
 }
 
-#define ALLOC_CACHE(p) ((*(p) == 0) ? allocCache(p) : *(p))
+#define ALLOC_CACHE(p) ((*(p) == NULL) ? allocCache(p) : *(p))
 
 static int
 dataIndex(CgsCache * me)
@@ -269,7 +269,7 @@
 static CgsCache *
 myCache(XtermWidget xw, VTwin *cgsWin, CgsEnum cgsId)
 {
-    CgsCache *result = 0;
+    CgsCache *result = NULL;
 
     if ((int) cgsId >= 0 && cgsId < gcMAX) {
 #ifdef NO_ACTIVE_ICON
@@ -283,7 +283,7 @@
 	    result = ALLOC_CACHE(&(TScreenOf(xw)->main_cgs_cache));
 
 	result += cgsId;
-	if (result->data == 0) {
+	if (result->data == NULL) {
 	    result->data = result->list;
 	}
     }
@@ -302,7 +302,7 @@
 {
     Drawable drawable = 0;
 
-    if (cgsWin != 0 && cgsWin->window != 0)
+    if (cgsWin != NULL && cgsWin->window != 0)
 	drawable = cgsWin->window;
     if (drawable == 0)
 	drawable = RootWindowOfScreen(XtScreen(xw));
@@ -378,7 +378,7 @@
 	/* FIXME */
 #endif
     case gcMAX:		/* should not happen */
-	return 0;
+	return NULL;
     }
     xgcv.foreground = NEXT(fg);
     xgcv.background = NEXT(bg);
@@ -452,7 +452,7 @@
 {
     CgsCache *me;
 
-    if ((me = myCache(xw, cgsWin, cgsId)) != 0) {
+    if ((me = myCache(xw, cgsWin, cgsId)) != NULL) {
 	NEXT(fg) = fg;
 	me->mask |= GCForeground;
 	TRACE2(("setCgsFore(%s) %s\n",
@@ -466,7 +466,7 @@
 {
     CgsCache *me;
 
-    if ((me = myCache(xw, cgsWin, cgsId)) != 0) {
+    if ((me = myCache(xw, cgsWin, cgsId)) != NULL) {
 	NEXT(bg) = bg;
 	me->mask |= GCBackground;
 	TRACE2(("setCgsBack(%s) %s\n",
@@ -481,7 +481,7 @@
 {
     CgsCache *me;
 
-    if ((me = myCache(xw, cgsWin, cgsId)) != 0) {
+    if ((me = myCache(xw, cgsWin, cgsId)) != NULL) {
 	NEXT(cset) = cset;
 	me->mask |= GC_CSet;
     }
@@ -495,7 +495,7 @@
 {
     CgsCache *me;
 
-    if ((me = myCache(xw, cgsWin, cgsId)) != 0) {
+    if ((me = myCache(xw, cgsWin, cgsId)) != NULL) {
 	TScreen *screen = TScreenOf(xw);
 	if (!HaveFont(font)) {
 	    if (cgsId != gcNorm)
@@ -539,7 +539,7 @@
 	int j;
 	for_each_gc(j) {
 	    CgsCache *me;
-	    if ((me = myCache(xw, cgsWin, (CgsEnum) j)) != 0) {
+	    if ((me = myCache(xw, cgsWin, (CgsEnum) j)) != NULL) {
 		int k;
 		for (k = 0; k < DEPTH; ++k) {
 		    if (SameFont(LIST(k).font, font)) {
@@ -548,7 +548,7 @@
 				LIST(k).gc,
 				k,
 				traceFont(font)));
-			LIST(k).font = 0;
+			LIST(k).font = NULL;
 			LIST(k).cset = 0;
 		    }
 		}
@@ -556,7 +556,7 @@
 		    TRACE2(("clrCgsFonts %s next %s\n",
 			    traceCgsEnum((CgsEnum) j),
 			    traceFont(font)));
-		    NEXT(font) = 0;
+		    NEXT(font) = NULL;
 		    NEXT(cset) = 0;
 		    me->mask &= (unsigned) ~(GCFont | GC_CSet);
 		}
@@ -572,9 +572,9 @@
 getCgsGC(XtermWidget xw, VTwin *cgsWin, CgsEnum cgsId)
 {
     CgsCache *me;
-    GC result = 0;
+    GC result = NULL;
 
-    if ((me = myCache(xw, cgsWin, cgsId)) != 0) {
+    if ((me = myCache(xw, cgsWin, cgsId)) != NULL) {
 	TRACE2(("getCgsGC(%s, %s)\n",
 		traceVTwin(xw, cgsWin), traceCgsEnum(cgsId)));
 	if (me->mask != 0) {
@@ -591,8 +591,8 @@
 	    if (!(me->mask & GCBackground))
 		NEXT(bg) = THIS(bg);
 
-	    if (NEXT(font) == 0) {
-		setCgsFont(xw, cgsWin, cgsId, 0);
+	    if (NEXT(font) == NULL) {
+		setCgsFont(xw, cgsWin, cgsId, NULL);
 	    }
 
 	    TRACE2(("...Cgs new data fg=%s, bg=%s, font=%s cset %s\n",
@@ -603,7 +603,7 @@
 
 	    /* try to find the given data in an already-created GC */
 	    for (j = 0; j < DEPTH; ++j) {
-		if (LIST(j).gc != 0
+		if (LIST(j).gc != NULL
 		    && SameFont(LIST(j).font, NEXT(font))
 		    && SameCSet(LIST(j).cset, NEXT(cset))
 		    && SameColor(LIST(j).fg, NEXT(fg))
@@ -615,11 +615,11 @@
 		}
 	    }
 
-	    if (result == 0) {
+	    if (result == NULL) {
 		/* try to find an empty slot, to create a new GC */
 		used = 0;
 		for (j = 0; j < DEPTH; ++j) {
-		    if (LIST(j).gc == 0) {
+		    if (LIST(j).gc == NULL) {
 			LINK(j);
 			result = newCache(xw, cgsWin, cgsId, me);
 			break;
@@ -629,7 +629,7 @@
 		}
 	    }
 
-	    if (result == 0) {
+	    if (result == NULL) {
 		int k;
 		/* if none were empty, pick the least-used slot, to modify */
 		for (j = 0, k = -1; j < DEPTH; ++j) {
@@ -669,7 +669,7 @@
     for_each_gc(n) {
 	CgsCache *me;
 
-	if ((me = myCache(xw, cgsWin, (CgsEnum) n)) != 0) {
+	if ((me = myCache(xw, cgsWin, (CgsEnum) n)) != NULL) {
 	    if (THIS(gc) == gc) {
 		result = (CgsEnum) n;
 		break;
@@ -686,12 +686,12 @@
 getCgsFont(XtermWidget xw, VTwin *cgsWin, GC gc)
 {
     int n;
-    XTermFonts *result = 0;
+    XTermFonts *result = NULL;
 
     for_each_gc(n) {
 	CgsCache *me;
 
-	if ((me = myCache(xw, cgsWin, (CgsEnum) n)) != 0) {
+	if ((me = myCache(xw, cgsWin, (CgsEnum) n)) != NULL) {
 	    if (THIS(gc) == gc) {
 		result = THIS(font);
 		break;
@@ -713,7 +713,7 @@
     for_each_gc(n) {
 	CgsCache *me;
 
-	if ((me = myCache(xw, cgsWin, (CgsEnum) n)) != 0) {
+	if ((me = myCache(xw, cgsWin, (CgsEnum) n)) != NULL) {
 	    if (THIS(gc) == gc) {
 		result = THIS(fg);
 		break;
@@ -735,7 +735,7 @@
     for_each_gc(n) {
 	CgsCache *me;
 
-	if ((me = myCache(xw, cgsWin, (CgsEnum) n)) != 0) {
+	if ((me = myCache(xw, cgsWin, (CgsEnum) n)) != NULL) {
 	    if (THIS(gc) == gc) {
 		result = THIS(bg);
 		break;
@@ -754,7 +754,7 @@
     if (dstCgsId != srcCgsId) {
 	CgsCache *me;
 
-	if ((me = myCache(xw, cgsWin, srcCgsId)) != 0) {
+	if ((me = myCache(xw, cgsWin, srcCgsId)) != NULL) {
 	    TRACE(("copyCgs from %s to %s\n",
 		   traceCgsEnum(srcCgsId),
 		   traceCgsEnum(dstCgsId)));
@@ -784,12 +784,12 @@
     VTwin *cgsWin = WhichVWin(TScreenOf(xw));
     CgsCache *me = myCache(xw, cgsWin, cgsId);
 
-    if (me != 0) {
+    if (me != NULL) {
 	CgsCacheData *save_data = me->data;
 	int n;
 
 	for (n = 0; n < DEPTH; ++n) {
-	    if (LIST(n).gc != 0 && HaveFont(LIST(n).font)) {
+	    if (LIST(n).gc != NULL && HaveFont(LIST(n).font)) {
 		LINK(n);
 
 		if (LIST(n).fg == fg
@@ -820,10 +820,10 @@
     if (dstCgsId != srcCgsId) {
 	CgsCache *src;
 
-	if ((src = myCache(xw, cgsWin, srcCgsId)) != 0) {
+	if ((src = myCache(xw, cgsWin, srcCgsId)) != NULL) {
 	    CgsCache *dst;
 
-	    if ((dst = myCache(xw, cgsWin, dstCgsId)) != 0) {
+	    if ((dst = myCache(xw, cgsWin, dstCgsId)) != NULL) {
 		CgsCache tmp;
 		int srcIndex = dataIndex(src);
 		int dstIndex = dataIndex(dst);
@@ -845,11 +845,11 @@
 {
     CgsCache *me;
 
-    if ((me = myCache(xw, cgsWin, cgsId)) != 0) {
+    if ((me = myCache(xw, cgsWin, cgsId)) != NULL) {
 	int j;
 
 	for (j = 0; j < DEPTH; ++j) {
-	    if (LIST(j).gc != 0) {
+	    if (LIST(j).gc != NULL) {
 		TRACE(("freeCgs(%s, %s) gc %p(%d)\n",
 		       traceVTwin(xw, cgsWin),
 		       traceCgsEnum(cgsId), (void *) LIST(j).gc, j));
@@ -865,7 +865,7 @@
 	    LINK(0);
 	}
     }
-    return 0;
+    return NULL;
 }
 
 #ifdef NO_LEAKS
Index: charclass.h
--- xterm-395+/charclass.h	2023-01-04 09:28:05.000000000 +0000
+++ xterm-396/charclass.h	2024-12-01 23:50:21.000000000 +0000
@@ -1,9 +1,9 @@
-/* $XTermId: charclass.h,v 1.9 2023/01/04 09:28:05 tom Exp $ */
+/* $XTermId: charclass.h,v 1.10 2024/12/01 23:50:21 tom Exp $ */
 
 /* $XFree86: xc/programs/xterm/charclass.h,v 1.3 2006/02/13 01:14:58 dickey Exp $ */
 
 /*
- * Copyright 2006-2020,2023 by Thomas E. Dickey
+ * Copyright 2006-2023,2024 by Thomas E. Dickey
  *
  *                         All Rights Reserved
  *
@@ -50,7 +50,7 @@
 } Classes;
 
 extern void init_classtab(void);
-/* initialise the table. needs calling before either of the 
+/* initialise the table. needs calling before either of the
    others. */
 
 extern int SetCharacterClassRange(int low, int high, int value);
Index: charproc.c
--- xterm-395+/charproc.c	2024-10-03 22:56:45.000000000 +0000
+++ xterm-396/charproc.c	2024-12-01 19:34:23.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: charproc.c,v 1.2047 2024/10/03 22:56:45 tom Exp $ */
+/* $XTermId: charproc.c,v 1.2053 2024/12/01 19:34:23 tom Exp $ */
 
 /*
  * Copyright 1999-2023,2024 by Thomas E. Dickey
@@ -903,7 +903,7 @@
 	NULL,			/* accept_focus                 */
 	XtVersion,		/* version                      */
 	NULL,			/* callback_offsets             */
-	0,			/* tm_table                     */
+	NULL,			/* tm_table                     */
 	XtInheritQueryGeometry,	/* query_geometry               */
 	XtInheritDisplayAccelerator,	/* display_accelerator  */
 	NULL			/* extension                    */
@@ -1674,8 +1674,8 @@
 		} else if (used+1 >= new_length) { \
 		    new_length = size * 2; \
 		    new_string = TypeMallocN(type, new_length); \
-		    if (new_string != 0 \
-		     && area != 0 \
+		    if (new_string != NULL \
+		     && area != NULL \
 		     && used != 0) { \
 			memcpy(new_string, area, used * sizeof(type)); \
 		     } \
@@ -2333,7 +2333,7 @@
 deferparsing(unsigned c, struct ParseState *sp)
 {
     SafeAlloc(Char, sp->defer_area, sp->defer_used, sp->defer_size);
-    if (new_string == 0) {
+    if (new_string == NULL) {
 	xtermWarning("Cannot allocate %lu bytes for deferred parsing of %u\n",
 		     (unsigned long) new_length, c);
 	return;
@@ -2638,7 +2638,7 @@
 		    StatusPutChars(xw, xtermVersion(), -1);
 		} else if (!strncmp(found, "%{unixtime%}", length)) {
 		    char *t = x_strtrim(ctime(&now));
-		    if (t != 0) {
+		    if (t != NULL) {
 			StatusPutChars(xw, t, -1);
 			free(t);
 		    }
@@ -3012,7 +3012,7 @@
 	    if (used) {
 		if (!screen->scroll_amt)
 		    ScrnUpdate(xw, use_row, use_col, 1, 1, 1);
-		continue;
+		break;
 	    }
 	}
 #endif
@@ -3020,7 +3020,7 @@
 	/* Intercept characters for printer controller mode */
 	if (PrinterOf(screen).printer_controlmode == 2) {
 	    if ((c = (unsigned) xtermPrinterControl(xw, (int) c)) == 0)
-		continue;
+		break;
 	}
 
 	/*
@@ -3030,18 +3030,28 @@
 	 */
 #if OPT_VT52_MODE
 	if (sp->vt52_cup) {
+	    int row, col;
 	    if (nparam < NPARAM - 1) {
 		SetParam(nparam++, (int) AsciiOf(c) - 32);
 		parms.is_sub[nparam] = 0;
 	    }
 	    if (nparam < 2)
-		continue;
+		break;
 	    sp->vt52_cup = False;
-	    CursorSet(screen, zero_if_default(0), zero_if_default(1), xw->flags);
+	    /*
+	     * According to EK-VT5X-OP-001 DECscope User's Guide, if the row
+	     * is out of range, no vertical movement occurs, while if the
+	     * column is out of range, it is set to the rightmost column.
+	     */
+	    if ((row = GetParam(0)) > screen->max_row)
+		row = screen->cur_row;
+	    if ((col = GetParam(1)) > screen->max_col)
+		col = screen->max_col;
+	    CursorSet(screen, row, col, xw->flags);
 	    sp->parsestate = vt52_table;
 	    SetParam(0, 0);
 	    SetParam(1, 0);
-	    continue;
+	    break;
 	}
 #endif
 
@@ -3183,10 +3193,10 @@
 	 */
 	if (sp->nextstate == CASE_PRINT) {
 	    SafeAlloc(IChar, sp->print_area, sp->print_used, sp->print_size);
-	    if (new_string == 0) {
+	    if (new_string == NULL) {
 		xtermWarning("Cannot allocate %lu bytes for printable text\n",
 			     (unsigned long) new_length);
-		continue;
+		break;
 	    }
 	    SafeFree(sp->print_area, sp->print_size);
 #if OPT_VT52_MODE
@@ -3204,7 +3214,7 @@
 	    sp->last_was_wide = this_is_wide;
 #endif
 	    if (morePtyData(screen, VTbuffer)) {
-		continue;
+		break;
 	    }
 	}
 
@@ -3251,19 +3261,41 @@
 		FreeAndNull(sp->string_area);
 		sp->string_size = 0;
 	    } else {
+		Boolean utf8Title;
+
 		SafeAlloc(Char, sp->string_area, sp->string_used, sp->string_size);
-		if (new_string == 0) {
+		if (new_string == NULL) {
 		    xtermWarning("Cannot allocate %lu bytes for string mode %#02x\n",
 				 (unsigned long) new_length, sp->string_mode);
-		    continue;
+		    break;
 		}
 		SafeFree(sp->string_area, sp->string_size);
+
+		/*
+		 * Provide for special case where xterm allows an OSC string to
+		 * contain 8-bit data.  Otherwise, ECMA-48 section 9 recommends
+		 * parsing controls with a 7-bit table, precluding the use of
+		 * 8-bit data.
+		 */
+#if OPT_WIDE_CHARS
+		utf8Title = (sp->string_mode == ANSI_OSC
+			     && IsSetUtf8Title(xw)
+			     && (sp->string_used >= 2)
+			     && (sp->string_area[0] == '0'
+				 || sp->string_area[0] == '2')
+			     && sp->string_area[1] == ';');
+#else
+		utf8Title = False;
+#endif
+
 		/*
 		 * ReGIS and SIXEL data can be detected by skipping over (only)
 		 * parameters to the first non-parameter character and
 		 * inspecting it.  Since both are DCS, we can also ignore OSC.
 		 */
-		sp->string_area[(sp->string_used)++] = AsciiOf(c);
+		sp->string_area[(sp->string_used)++] = (utf8Title
+							? CharOf(c)
+							: AsciiOf(c));
 		if (sp->string_args < sa_LAST) {
 		    switch (c) {
 		    case ':':
@@ -3346,7 +3378,7 @@
 		 */
 		TRACE(("...unexpected subparam usage\n"));
 		ResetState(sp);
-		continue;
+		break;
 	    }
 	}
 
@@ -4023,7 +4055,7 @@
 		 * Only SGR 38/48 accept subparameters, and in those cases
 		 * the values will not be seen at this point.
 		 */
-		if ((skip = param_has_subparams(item))) {
+		if ((skip = param_has_subparams(item)) != 0) {
 		    switch (op) {
 		    case 38:
 			/* FALLTHRU */
@@ -4541,7 +4573,7 @@
 	    resetMargins(xw);
 	    xterm_ResetDouble(xw);
 	    CursorSet(screen, 0, 0, xw->flags);
-	    xtermParseRect(xw, 0, 0, &myRect);
+	    xtermParseRect(xw, 0, NULL, &myRect);
 	    ScrnFillRectangle(xw, &myRect, 'E', 0, False);
 	    ResetState(sp);
 	    break;
@@ -4563,7 +4595,7 @@
 	    break;
 
 	case CASE_GSETS:
-	    if (strchr("012AB", AsciiOf(c)) != 0) {
+	    if (strchr("012AB", AsciiOf(c)) != NULL) {
 		TRACE_GSETS("");
 		xtermDecodeSCS(xw, sp->scstype, 1, 0, (int) c);
 	    } else if (screen->vtXX_level >= 2) {
@@ -5723,7 +5755,7 @@
 	    ResetState(sp);
 	    break;
 
-#if OPT_XTERM_SGR
+#if OPT_XTERM_SGR		/* most are related, all use csi_hash_table[] */
 	case CASE_CSI_HASH_STATE:
 	    TRACE(("CASE_CSI_HASH_STATE\n"));
 	    /* csi hash (#) */
@@ -5807,6 +5839,11 @@
 	    xtermReportColors(xw);
 	    ResetState(sp);
 	    break;
+
+	case CASE_XTERM_TITLE_STACK:
+	    xtermReportTitleStack(xw);
+	    ResetState(sp);
+	    break;
 #endif
 
 	case CASE_S7C1T:
@@ -6048,10 +6085,10 @@
 	case CASE_XTERM_SM_TITLE:
 	    TRACE(("CASE_XTERM_SM_TITLE\n"));
 	    if (nparam >= 1) {
-		int n;
-		for (n = 0; n < nparam; ++n) {
-		    if (GetParam(n) != DEFAULT)
-			screen->title_modes |= (1 << GetParam(n));
+		for (count = 0; count < nparam; ++count) {
+		    value = GetParam(count);
+		    if (ValidTitleMode(value))
+			screen->title_modes |= xBIT(value);
 		}
 	    } else {
 		screen->title_modes = DEF_TITLE_MODES;
@@ -6063,10 +6100,10 @@
 	case CASE_XTERM_RM_TITLE:
 	    TRACE(("CASE_XTERM_RM_TITLE\n"));
 	    if (nparam >= 1) {
-		int n;
-		for (n = 0; n < nparam; ++n) {
-		    if (GetParam(n) != DEFAULT)
-			screen->title_modes &= ~(1 << GetParam(n));
+		for (count = 0; count < nparam; ++count) {
+		    value = GetParam(count);
+		    if (ValidTitleMode(value))
+			screen->title_modes &= ~xBIT(value);
 		}
 	    } else {
 		screen->title_modes = DEF_TITLE_MODES;
@@ -6295,8 +6332,7 @@
 			    (size_t) ((v_bufptr - v_bufstr <= MAX_PTY_WRITE)
 				      ? v_bufptr - v_bufstr
 				      : MAX_PTY_WRITE));
-	if (riten < 0)
-	{
+	if (riten < 0) {
 	    if_DEBUG({
 		perror("write");
 	    });
@@ -6562,7 +6598,7 @@
 	    NormalExit();
 	xtermFlushDbe(xw);
 	i = Select(max_plus1, &select_mask, &write_mask, 0,
-		   (time_select ? &my_timeout : 0));
+		   (time_select ? &my_timeout : NULL));
 	if (i < 0) {
 	    if (errno != EINTR)
 		SysError(ERROR_SELECT);
@@ -6610,7 +6646,7 @@
     XVaNestedList list;
 
     if (input && input->xic
-	&& (ld = getLineData(screen, screen->cur_row)) != 0) {
+	&& (ld = getLineData(screen, screen->cur_row)) != NULL) {
 	spot.x = (short) LineCursorX(screen, ld, screen->cur_col);
 	spot.y = (short) (CursorY(screen, screen->cur_row) + xw->work.xim_fs_ascent);
 	list = XVaCreateNestedList(0,
@@ -6630,7 +6666,7 @@
     TScreen *screen = TScreenOf(xw);
     LineData *ld = getLineData(screen, screen->cur_row);
 
-    if (ld != 0) {
+    if (ld != NULL) {
 	/* mark that we had to wrap this line */
 	LineSetFlag(ld, LINEWRAPPED);
 	ShowWrapMarks(xw, screen->cur_row, ld);
@@ -6908,7 +6944,7 @@
     TScreen *screen = TScreenOf(xw);
 
     (void) screen;
-    TRACE_EVENT("HandleStructNotify", event, NULL, 0);
+    TRACE_EVENT("HandleStructNotify", event, NULL, NULL);
     switch (event->type) {
     case MapNotify:
 	resetZIconBeep(xw);
@@ -8471,7 +8507,7 @@
 {
     TScreen *screen = TScreenOf(xw);
     Display *dpy = screen->display;
-    char *result = 0;
+    char *result = NULL;
     char **list = NULL;
     int length = 0;
     int rc;
@@ -8516,12 +8552,12 @@
 		result[need] = '\0';
 	    else
 		result = malloc(need + 1);
-	    if (result == 0)
+	    if (result == NULL)
 		break;
 	}
 	XFreeStringList(list);
     }
-    if (text->value != 0)
+    if (text->value != NULL)
 	XFree(text->value);
 
     return result;
@@ -8531,7 +8567,7 @@
 get_icon_label(XtermWidget xw)
 {
     XTextProperty text;
-    char *result = 0;
+    char *result = NULL;
 
     if (XGetWMIconName(TScreenOf(xw)->display, VShellWindow(xw), &text)) {
 	result = property_to_string(xw, &text);
@@ -8543,7 +8579,7 @@
 get_window_label(XtermWidget xw)
 {
     XTextProperty text;
-    char *result = 0;
+    char *result = NULL;
 
     if (XGetWMName(TScreenOf(xw)->display, VShellWindow(xw), &text)) {
 	result = property_to_string(xw, &text);
@@ -8564,7 +8600,7 @@
     unparseputc(xw, ']');
     unparseputc(xw, code);
 
-    if (text != 0) {
+    if (text != NULL) {
 	int copy = IsTitleMode(xw, tmGetBase16);
 	if (copy) {
 	    TRACE(("Encoding hex:%s\n", text));
@@ -8710,7 +8746,7 @@
 		result_x = 0;
 		{
 		    Widget mw;
-		    for (mw = (Widget) xw; mw != 0; mw = XtParent(mw)) {
+		    for (mw = (Widget) xw; mw != NULL; mw = XtParent(mw)) {
 			result_x += mw->core.x;
 			result_y += mw->core.y;
 			if (mw == SHELL_OF(xw))
@@ -9053,7 +9089,7 @@
 void
 unparseputs(XtermWidget xw, const char *s)
 {
-    if (s != 0) {
+    if (s != NULL) {
 	while (*s)
 	    unparseputc(xw, *s++);
     }
@@ -9207,9 +9243,9 @@
 Bool
 CheckBufPtrs(TScreen *screen)
 {
-    return (screen->visbuf != 0
-	    && screen->editBuf_index[0] != 0
-	    && screen->editBuf_index[1] != 0);
+    return (screen->visbuf != NULL
+	    && screen->editBuf_index[0] != NULL
+	    && screen->editBuf_index[1] != NULL);
 }
 
 /*
@@ -9585,10 +9621,10 @@
     dst->Tcolors[offset] = src->Tcolors[offset];
     dst->Tcolors[offset].mode = False;
 
-    if ((name = x_strtrim(dst->Tcolors[offset].resource)) != 0)
+    if ((name = x_strtrim(dst->Tcolors[offset].resource)) != NULL)
 	dst->Tcolors[offset].resource = name;
 
-    if (name == 0) {
+    if (name == NULL) {
 	dst->Tcolors[offset].value = target->dft_foreground;
     } else if (isDefaultForeground(name)) {
 	dst->Tcolors[offset].value = ((offset == TEXT_FG || offset == TEXT_BG)
@@ -9606,7 +9642,7 @@
 	    dst->Tcolors[offset].value = temp.colors[offset];
 	} else if (offset == TEXT_FG || offset == TEXT_BG) {
 	    free(name);
-	    dst->Tcolors[offset].resource = 0;
+	    dst->Tcolors[offset].resource = NULL;
 	}
     }
     return dst->Tcolors[offset].value;
@@ -9622,13 +9658,13 @@
 {
     TScreen *screen = TScreenOf(target);
 
-    if (screen->Tcolors[TEXT_FG].resource == 0 ||
-	screen->Tcolors[TEXT_BG].resource == 0) {
+    if (screen->Tcolors[TEXT_FG].resource == NULL ||
+	screen->Tcolors[TEXT_BG].resource == NULL) {
 	xtermWarning("unable to allocate fg/bg colors\n");
 	screen->Tcolors[TEXT_FG].resource = x_strdup(XtDefaultForeground);
 	screen->Tcolors[TEXT_BG].resource = x_strdup(XtDefaultBackground);
-	if (screen->Tcolors[TEXT_FG].resource == 0 ||
-	    screen->Tcolors[TEXT_BG].resource == 0) {
+	if (screen->Tcolors[TEXT_FG].resource == NULL ||
+	    screen->Tcolors[TEXT_BG].resource == NULL) {
 	    Exit(ERROR_MISC);
 	}
 	screen->Tcolors[TEXT_FG].value = target->dft_foreground;
@@ -9840,7 +9876,7 @@
 {
     const char *base = *source;
     const char *next;
-    char *value = 0;
+    char *value = NULL;
     char *result;
 
     /* ignore empty values */
@@ -9855,7 +9891,7 @@
 	    ++next;
 	size = (size_t) (1 + next - base);
 	value = malloc(size);
-	if (value != 0) {
+	if (value != NULL) {
 	    memcpy(value, base, size);
 	    value[size - 1] = '\0';
 	}
@@ -9880,7 +9916,7 @@
 	Boolean found = False;
 	char flag = 1;
 
-	if (next == 0)
+	if (next == NULL)
 	    break;
 	if (*next == '~') {
 	    flag = 0;
@@ -9892,7 +9928,7 @@
 	    if (!FullS2L(next, temp)) {
 		xtermWarning("Expected a number: %s\n", next);
 	    } else {
-		for (n = 0; list[n].name != 0; ++n) {
+		for (n = 0; list[n].name != NULL; ++n) {
 		    if (list[n].code == value) {
 			target[value] = flag;
 			found = True;
@@ -9902,7 +9938,7 @@
 		}
 	    }
 	} else {
-	    for (n = 0; list[n].name != 0; ++n) {
+	    for (n = 0; list[n].name != NULL; ++n) {
 		if (!x_wildstrcmp(next, list[n].name)) {
 		    int value = list[n].code;
 		    target[value] = flag;
@@ -9927,7 +9963,7 @@
 findVT100Resource(const char *name)
 {
     Cardinal n;
-    XtResource *result = 0;
+    XtResource *result = NULL;
 
     if (!IsEmpty(name)) {
 	XrmQuark quarkName = XrmPermStringToQuark(name);
@@ -9988,7 +10024,7 @@
     XtResource *data;
     char *result = NULL;
 
-    if ((data = findVT100Resource(name)) != 0) {
+    if ((data = findVT100Resource(name)) != NULL) {
 	int fake_offset = (int) data->resource_offset;
 	void *res_addr;
 	int real_offset;
@@ -10011,17 +10047,17 @@
 	    char *value = *(char **) res_addr;
 	    if (value != NULL) {
 		size_t need = strlen(value);
-		if ((result = malloc(1 + need)) != 0)
+		if ((result = malloc(1 + need)) != NULL)
 		    strcpy(result, value);
 	    }
 	} else if (!strcmp(res_type, XtRInt)) {
-	    if ((result = malloc(1 + (size_t) (3 * data->resource_size))) != 0)
+	    if ((result = malloc(1 + (size_t) (3 * data->resource_size))) != NULL)
 		sprintf(result, "%d", *(int *) res_addr);
 	} else if (!strcmp(res_type, XtRFloat)) {
-	    if ((result = malloc(1 + (size_t) (3 * data->resource_size))) != 0)
+	    if ((result = malloc(1 + (size_t) (3 * data->resource_size))) != NULL)
 		sprintf(result, "%f", (double) (*(float *) res_addr));
-	} else if (!strcmp(res_type, XtRBoolean)) {
-	    if ((result = malloc((size_t) 6)) != 0)
+        } else if (!strcmp(res_type, XtRBoolean)) {
+            if ((result = malloc((size_t) 6)) != NULL)
 		strcpy(result, *(Boolean *) res_addr ? "true" : "false");
 	}
     }
@@ -10405,7 +10441,7 @@
     screen->display = wnew->core.screen->display;
 
     /* prep getVisualInfo() */
-    wnew->visInfo = 0;
+    wnew->visInfo = NULL;
     wnew->numVisuals = 0;
     (void) getVisualInfo(wnew);
 
@@ -10858,7 +10894,7 @@
 
     screen->menu_font_number = fontMenu_default;
     init_Sres(screen.initial_font);
-    if (screen->initial_font != 0) {
+    if (screen->initial_font != NULL) {
 	int result = xtermGetFont(screen->initial_font);
 	if (result >= 0)
 	    screen->menu_font_number = result;
@@ -10949,7 +10985,7 @@
 	if (i >= MIN_ANSI_COLORS && i < NUM_ANSI_COLORS) {
 	    screen->Acolors[i].resource =
 		x_strtrim(fake_resources[i - MIN_ANSI_COLORS].default_addr);
-	    if (screen->Acolors[i].resource == 0)
+	    if (screen->Acolors[i].resource == NULL)
 		screen->Acolors[i].resource = XtDefaultForeground;
 	} else {
 	    screen->Acolors[i] = TScreenOf(request)->Acolors[i];
@@ -11009,7 +11045,7 @@
 	screen->maxClicks = ck;
 	if (i == Select_CHAR)
 	    screen->selectMap[i] = Select_CHAR;
-	else if (TScreenOf(request)->onClick[i] != 0)
+	else if (TScreenOf(request)->onClick[i] != NULL)
 	    ParseOnClicks(wnew, request, (unsigned) i);
 	else if (i <= Select_LINE)
 	    screen->selectMap[i] = (SelectUnit) i;
@@ -11465,7 +11501,7 @@
 
 	sprintf(value, "%d", wnew->misc.resizeGravity);
 	temp[0] = value;
-	temp[1] = 0;
+	temp[1] = NULL;
 	XtAppWarningMsg(app_con, "rangeError", "resizeGravity", "XTermError",
 			"unsupported resizeGravity resource value (%s)",
 			temp, &nparams);
@@ -11577,7 +11613,7 @@
 	if (part) { \
 	    TRACE(("freed %s " #part ": %p\n", name, (const void *) part)); \
 	    XFreeGC(dpy, part); \
-	    part = 0; \
+	    part = NULL; \
 	}
 
 #if OPT_INPUT_METHOD
@@ -11588,7 +11624,7 @@
 
     if (input && input->xim) {
 	XCloseIM(input->xim);
-	input->xim = 0;
+	input->xim = NULL;
 	TRACE(("freed screen->xim\n"));
     }
 }
@@ -11738,7 +11774,7 @@
     discardRenderDraw(screen);
     {
 	ListXftFonts *p;
-	while ((p = screen->list_xft_fonts) != 0) {
+	while ((p = screen->list_xft_fonts) != NULL) {
 	    screen->list_xft_fonts = p->next;
 	    free(p);
 	}
@@ -11904,10 +11940,10 @@
     int actual_format_return = 0;
     unsigned long nitems_return = 0;
     unsigned long bytes_after_return = 0;
-    unsigned char *prop_return = 0;
+    unsigned char *prop_return = NULL;
     long long_length = 1024;
     size_t limit;
-    char *result = 0;
+    char *result = NULL;
 
     TRACE(("getProperty %s(%s)\n", prop_name,
 	   req_type ? TraceAtomName(dpy, req_type) : "?"));
@@ -11925,7 +11961,7 @@
 			 &bytes_after_return,
 			 &prop_return)) {
 	TRACE((".. Cannot get %s property.\n", prop_name));
-    } else if (prop_return != 0) {
+    } else if (prop_return != NULL) {
 
 	if (nitems_return != 0 &&
 	    actual_format_return != 0 &&
@@ -11941,7 +11977,7 @@
 		/* manpage is misleading - X really uses 'long', not 32-bits */
 		limit = sizeof(long) * nitems_return;
 	    }
-	    if ((result = malloc(limit + 1)) != 0) {
+	    if ((result = malloc(limit + 1)) != NULL) {
 		memcpy(result, prop_return, limit);
 		result[limit] = '\0';
 	    }
@@ -11974,12 +12010,12 @@
     TScreen *screen = TScreenOf(xw);
     Display *dpy = screen->display;
     Window *sup_window = NULL;
-    char *result = 0;
+    char *result = NULL;
 
     TRACE(("getWindowManagerName\n"));
 #define getWinProp(type, name) \
     (Window *)getProperty(dpy, DefaultRootWindow(dpy), type, name)
-    if ((sup_window = getWinProp(XA_WINDOW, "_NET_SUPPORTING_WM_CHECK")) == 0) {
+    if ((sup_window = getWinProp(XA_WINDOW, "_NET_SUPPORTING_WM_CHECK")) == NULL) {
 	sup_window = getWinProp(XA_CARDINAL, "_WIN_SUPPORTING_WM_CHECK");
     }
 
@@ -11990,19 +12026,19 @@
      * conventionally it is mixed case.  In practice, the former is more often
      * set; the latter is not given (or is a lowercased version of the former).
      */
-    if (sup_window != 0) {
+    if (sup_window != NULL) {
 #define getStringProp(type,name) \
 	(char *)getProperty(dpy, *sup_window, type, name)
-	if ((result = getStringProp(XA_UTF8_STRING(dpy), "_NET_WM_NAME")) == 0
-	    && (result = getStringProp(XA_STRING, "_NET_WM_NAME")) == 0
-	    && (result = getStringProp(XA_STRING, "WM_CLASS")) == 0) {
+	if ((result = getStringProp(XA_UTF8_STRING(dpy), "_NET_WM_NAME")) == NULL
+	    && (result = getStringProp(XA_STRING, "_NET_WM_NAME")) == NULL
+	    && (result = getStringProp(XA_STRING, "WM_CLASS")) == NULL) {
 	    TRACE(("... window manager does not tell its name\n"));
 	}
 	free(sup_window);
     } else {
 	TRACE(("... Cannot get window manager info properties\n"));
     }
-    if (result == 0)
+    if (result == NULL)
 	result = x_strdup("unknown");
     TRACE(("... window manager name is %s\n", result));
     return result;
@@ -12109,7 +12145,7 @@
 #endif
     else {
 	TRACE((" border unused\n"));
-	win->border_gc = 0;
+	win->border_gc = NULL;
     }
 
     /*
@@ -12374,7 +12410,7 @@
      * iconFont resource, try with font1 aka "Unreadable".
      */
     screen->icon_fontnum = -1;
-    if (getIconicFont(screen)->fs == 0) {
+    if (getIconicFont(screen)->fs == NULL) {
 	getIconicFont(screen)->fs =
 	    xtermLoadQueryFont(xw, screen->MenuFontName(fontMenu_font1));
 	ReportIcons(("%susing font1 '%s' as iconFont\n",
@@ -12391,7 +12427,7 @@
      * particularly at small sizes.
      */
     if (UsingRenderFont(xw)
-	&& getIconicFont(screen)->fs == 0) {
+	&& getIconicFont(screen)->fs == NULL) {
 	screen->icon_fontnum = fontMenu_default;
 	getIconicFont(screen)->fs = GetNormalFont(screen, fNorm)->fs;	/* need for next-if */
 	ReportIcons(("using TrueType font as iconFont\n"));
@@ -12593,7 +12629,7 @@
     int missing_charset_count;
     unsigned i, j;
 
-    if (xw->work.xim_fs == 0) {
+    if (xw->work.xim_fs == NULL) {
 	xw->work.xim_fs = XCreateFontSet(XtDisplay(xw),
 					 xw->misc.f_x,
 					 &missing_charset_list,
@@ -12655,9 +12691,9 @@
 	return;
     }
 
-    if (input == 0) {
+    if (input == NULL) {
 	for (i = 0; i < NINPUTWIDGETS; ++i) {
-	    if (xw->work.inputs[i].w == 0) {
+	    if (xw->work.inputs[i].w == NULL) {
 		input = xw->work.inputs + i;
 		input->w = theInput;
 		break;
@@ -12665,7 +12701,7 @@
 	}
     }
 
-    if (input == 0) {
+    if (input == NULL) {
 	xtermWarning("attempted to add too many input widgets\n");
 	return;
     }
@@ -12690,7 +12726,7 @@
 		    s++;
 		if (!*s)
 		    break;
-		if ((ns = end = strchr(s, ',')) == 0)
+		if ((ns = end = strchr(s, ',')) == NULL)
 		    end = s + strlen(s);
 		while ((end != s) && isspace(CharOf(end[-1])))
 		    end--;
@@ -12699,11 +12735,11 @@
 		    strcpy(t, "@im=");
 		    strncat(t, s, (size_t) (end - s));
 
-		    if ((p = XSetLocaleModifiers(t)) != 0 && *p
+		    if ((p = XSetLocaleModifiers(t)) != NULL && *p
 			&& (input->xim = XOpenIM(myDisplay,
 						 NULL,
 						 NULL,
-						 NULL)) != 0) {
+						 NULL)) != NULL) {
 			break;
 		    }
 
@@ -12741,7 +12777,7 @@
 	    s++;
 	if (!*s)
 	    break;
-	if ((ns = end = strchr(s, ',')) != 0)
+	if ((ns = end = strchr(s, ',')) != NULL)
 	    ns++;
 	else
 	    end = s + strlen(s);
@@ -12869,7 +12905,7 @@
 TInput *
 lookupTInput(XtermWidget xw, Widget w)
 {
-    TInput *result = 0;
+    TInput *result = NULL;
     unsigned n;
 
     for (n = 0; n < NINPUTWIDGETS; ++n) {
@@ -13077,7 +13113,7 @@
     int my_col = 0;
 #endif
     int cursor_col;
-    CLineData *ld = 0;
+    CLineData *ld = NULL;
 
     if (screen->cursor_state == BLINKED_OFF)
 	return;
@@ -13339,7 +13375,7 @@
 			      T_COLOR(screen, TEXT_CURSOR));
 
 	outlineGC = getCgsGC(xw, currentWin, gcVTcursOutline);
-	if (outlineGC == 0)
+	if (outlineGC == NULL)
 	    outlineGC = currentGC;
 
 	if (isCursorUnderline(screen)) {
@@ -13460,7 +13496,7 @@
     int my_col = 0;
 #endif
     int cursor_col;
-    CLineData *ld = 0;
+    CLineData *ld = NULL;
 #if OPT_WIDE_ATTRS
     int which_Cgs = gcMAX;
     unsigned attr_flags;
@@ -13657,7 +13693,7 @@
 LineHasBlinking(TScreen *screen, CLineData *ld)
 {
     Bool result = False;
-    if (ld != 0) {
+    if (ld != NULL) {
 	int col;
 
 	for (col = 0; col < MaxCols(screen); ++col) {
@@ -13719,7 +13755,7 @@
 	for (row = start_row; row >= 0; row--) {
 	    LineData *ld = getLineData(screen, ROW2INX(screen, row));
 
-	    if (ld != 0 && LineTstBlinked(ld)) {
+	    if (ld != NULL && LineTstBlinked(ld)) {
 		if (LineHasBlinking(screen, ld)) {
 		    resume = True;
 		    if (row > last_row)
@@ -13775,7 +13811,7 @@
 	    for (row = screen->max_row; row >= 0; row--) {
 		CLineData *ld = getLineData(screen, ROW2INX(screen, row));
 
-		if (ld != 0 && LineTstBlinked(ld)) {
+		if (ld != NULL && LineTstBlinked(ld)) {
 		    if (LineHasBlinking(screen, ld)) {
 			resume = True;
 			break;
@@ -14052,7 +14088,7 @@
 
 	for (i = 0; i < len; ++i) {
 	    int ch = CharOf(s[i]);
-	    char *t = 0;
+	    char *t = NULL;
 	    long value = 0;
 
 	    if (isspace(ch))
@@ -14098,6 +14134,7 @@
 		break;
 
 	      parse_class:
+		/* FALLTHRU */
 	    case ccCOLON:
 		if (ch == ':') {
 		    state = ccID;
@@ -14116,6 +14153,7 @@
 		break;
 
 	      apply_class:
+		/* FALLTHRU */
 	    case ccCOMMA:
 		if (SetCharacterClassRange(arg[0], arg[1], arg[2]) != 0) {
 		    xtermWarning(FMT, "bad range", s, i);
@@ -14155,7 +14193,7 @@
     key_resources[0].resource_size = (Cardinal) size;
     key_resources[0].resource_offset = 0;
     key_resources[0].default_type = key_resources[0].resource_type;
-    key_resources[0].default_addr = 0;
+    key_resources[0].default_addr = NULL;
     XtGetSubresources(w, (XtPointer) result, mapName, mapClass,
 		      key_resources, (Cardinal) 1, NULL, (Cardinal) 0);
 }
@@ -14254,7 +14292,7 @@
 
     TRACE(("Handle ignore for %p %s\n",
 	   (void *) w, visibleEventType(event->type)));
-    if ((xw = getXtermWidget(w)) != 0) {
+    if ((xw = getXtermWidget(w)) != NULL) {
 	/* do nothing, but check for funny escape sequences */
 	switch (event->type) {
 	case ButtonPress:
@@ -14278,7 +14316,7 @@
 {
     XtermWidget xw = getXtermWidget(w);
 
-    if (xw == 0) {
+    if (xw == NULL) {
 	xtermWarning("unexpected widget in DoSetSelectedFont\n");
     } else if (*type != XA_STRING || *format != 8) {
 	Bell(xw, XkbBI_MinorError, 0);
@@ -14300,7 +14338,7 @@
 	    }
 	}
 
-	if (len > 0 && (val = TypeMallocN(char, len + 1)) != 0) {
+	if (len > 0 && (val = TypeMallocN(char, len + 1)) != NULL) {
 	    char *used;
 
 	    memcpy(val, value, (size_t) len);
@@ -14312,9 +14350,9 @@
 	       XLFD allows up to 255 characters and no control characters;
 	       we are a little more liberal here. */
 	    if (len < 1000
-		&& used != 0
+		&& used != NULL
 		&& !strchr(used, '\n')
-		&& (test = x_strdup(used)) != 0) {
+		&& (test = x_strdup(used)) != NULL) {
 		TScreenOf(xw)->SelectFontName() = test;
 		if (!xtermLoadFont(xw,
 				   xtermFontName(used),
@@ -14368,7 +14406,7 @@
     target = XmuInternAtom(XtDisplay(xw), *pAtom);
     if (justprobe) {
 	screen->SelectFontName() =
-	    XGetSelectionOwner(XtDisplay(xw), target) ? _Font_Selected_ : 0;
+	    XGetSelectionOwner(XtDisplay(xw), target) ? _Font_Selected_ : NULL;
 	TRACE(("...selected fontname '%s'\n",
 	       NonNull(screen->SelectFontName())));
     } else {
@@ -14413,14 +14451,14 @@
      */
 
     TRACE(("set_cursor_gcs cc=%#lx, fg=%#lx, bg=%#lx\n", cc, fg, bg));
-    if (win != 0 && (cc != bg)) {
+    if (win != NULL && (cc != bg)) {
 	Pixel xx = ((fg == cc) ? bg : cc);
 
 	/* set the fonts to the current one */
-	setCgsFont(xw, win, gcVTcursNormal, 0);
-	setCgsFont(xw, win, gcVTcursFilled, 0);
-	setCgsFont(xw, win, gcVTcursReverse, 0);
-	setCgsFont(xw, win, gcVTcursOutline, 0);
+	setCgsFont(xw, win, gcVTcursNormal, NULL);
+	setCgsFont(xw, win, gcVTcursFilled, NULL);
+	setCgsFont(xw, win, gcVTcursReverse, NULL);
+	setCgsFont(xw, win, gcVTcursOutline, NULL);
 
 	/* we have a colored cursor */
 	setCgsFore(xw, win, gcVTcursNormal, fg);
@@ -14567,7 +14605,7 @@
 #undef DATA
     /* *INDENT-ON* */
 
-    char *result = 0;
+    char *result = NULL;
 
     int pass;
     Cardinal item;
@@ -14596,7 +14634,7 @@
 	char *value;
 	const char *source = resource.omitTranslation;
 
-	while (*source != '\0' && (value = ParseList(&source)) != 0) {
+	while (*source != '\0' && (value = ParseList(&source)) != NULL) {
 	    size_t len = strlen(value);
 
 	    TRACE(("parsed:%s\n", value));
Index: charsets.h
--- xterm-395+/charsets.h	2024-10-03 22:01:16.000000000 +0000
+++ xterm-396/charsets.h	2024-12-01 23:50:59.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * $XTermId: charsets.h,v 1.34 2024/10/03 22:01:16 tom Exp $
+ * $XTermId: charsets.h,v 1.35 2024/12/01 23:50:59 tom Exp $
  */
 
 /*
@@ -2352,7 +2352,7 @@
 /*
  * VT520/VT525 manual p 4-35 explains "SCS" as Serbo-Croatian.  The remaining
  * "S" may be Slovene.  With that clue, choose ISO-IR-141, which provides a
- * chart with names of suitable replacement characters. 
+ * chart with names of suitable replacement characters.
  */
 #define map_NRCS_Serbo_Croatian(code) \
 	switch (code) { \
Index: config.guess
--- xterm-395+/config.guess	2023-12-02 20:31:23.000000000 +0000
+++ xterm-396/config.guess	2024-07-28 05:41:28.000000000 +0000
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2023 Free Software Foundation, Inc.
+#   Copyright 1992-2024 Free Software Foundation, Inc.
 
 # shellcheck disable=SC2006,SC2268 # see below for rationale
 
-timestamp='2023-10-19'
+timestamp='2024-07-27'
 
 # 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
@@ -60,7 +60,7 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2023 Free Software Foundation, Inc.
+Copyright 1992-2024 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."
@@ -123,7 +123,7 @@
     dummy=$tmp/dummy
     case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in
 	,,)    echo "int x;" > "$dummy.c"
-	       for driver in cc gcc c89 c99 ; do
+	       for driver in cc gcc c17 c99 c89 ; do
 		   if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
 		       CC_FOR_BUILD=$driver
 		       break
@@ -634,7 +634,8 @@
 		sed 's/^		//' << EOF > "$dummy.c"
 		#include <sys/systemcfg.h>
 
-		main()
+		int
+		main ()
 			{
 			if (!__power_pc())
 				exit(1);
@@ -718,7 +719,8 @@
 		#include <stdlib.h>
 		#include <unistd.h>
 
-		int main ()
+		int
+		main ()
 		{
 		#if defined(_SC_KERNEL_BITS)
 		    long bits = sysconf(_SC_KERNEL_BITS);
@@ -1621,6 +1623,7 @@
 #endif
 #endif
 #endif
+int
 main ()
 {
 #if defined (sony)
Index: config.sub
--- xterm-395+/config.sub	2023-12-27 14:41:27.000000000 +0000
+++ xterm-396/config.sub	2024-06-03 19:28:43.000000000 +0000
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2023 Free Software Foundation, Inc.
+#   Copyright 1992-2024 Free Software Foundation, Inc.
 
-# shellcheck disable=SC2006,SC2268 # see below for rationale
+# shellcheck disable=SC2006,SC2268,SC2162 # see below for rationale
 
-timestamp='2023-12-02'
+timestamp='2024-05-27'
 
 # 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
@@ -76,7 +76,7 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2023 Free Software Foundation, Inc.
+Copyright 1992-2024 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."
@@ -120,7 +120,6 @@
 esac
 
 # Split fields of configuration type
-# shellcheck disable=SC2162
 saved_IFS=$IFS
 IFS="-" read field1 field2 field3 field4 <<EOF
 $1
@@ -142,10 +141,20 @@
 		# parts
 		maybe_os=$field2-$field3
 		case $maybe_os in
-			nto-qnx* | linux-* | uclinux-uclibc* \
-			| uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \
-			| netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
-			| storm-chaos* | os2-emx* | rtmk-nova* | managarm-* \
+			  cloudabi*-eabi* \
+			| kfreebsd*-gnu* \
+			| knetbsd*-gnu* \
+			| kopensolaris*-gnu* \
+			| linux-* \
+			| managarm-* \
+			| netbsd*-eabi* \
+			| netbsd*-gnu* \
+			| nto-qnx* \
+			| os2-emx* \
+			| rtmk-nova* \
+			| storm-chaos* \
+			| uclinux-gnu* \
+			| uclinux-uclibc* \
 			| windows-* )
 				basic_machine=$field1
 				basic_os=$maybe_os
@@ -161,8 +170,12 @@
 		esac
 		;;
 	*-*)
-		# A lone config we happen to match not fitting any pattern
 		case $field1-$field2 in
+			# Shorthands that happen to contain a single dash
+			convex-c[12] | convex-c3[248])
+				basic_machine=$field2-convex
+				basic_os=
+				;;
 			decstation-3100)
 				basic_machine=mips-dec
 				basic_os=
@@ -170,28 +183,88 @@
 			*-*)
 				# Second component is usually, but not always the OS
 				case $field2 in
-					# Prevent following clause from handling this valid os
+					# Do not treat sunos as a manufacturer
 					sun*os*)
 						basic_machine=$field1
 						basic_os=$field2
 						;;
-					zephyr*)
-						basic_machine=$field1-unknown
-						basic_os=$field2
-						;;
 					# Manufacturers
-					dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \
-					| att* | 7300* | 3300* | delta* | motorola* | sun[234]* \
-					| unicom* | ibm* | next | hp | isi* | apollo | altos* \
-					| convergent* | ncr* | news | 32* | 3600* | 3100* \
-					| hitachi* | c[123]* | convex* | sun | crds | omron* | dg \
-					| ultra | tti* | harris | dolphin | highlevel | gould \
-					| cbm | ns | masscomp | apple | axis | knuth | cray \
-					| microblaze* | sim | cisco \
-					| oki | wec | wrs | winbond)
+					  3100* \
+					| 32* \
+					| 3300* \
+					| 3600* \
+					| 7300* \
+					| acorn \
+					| altos* \
+					| apollo \
+					| apple \
+					| atari \
+					| att* \
+					| axis \
+					| be \
+					| bull \
+					| cbm \
+					| ccur \
+					| cisco \
+					| commodore \
+					| convergent* \
+					| convex* \
+					| cray \
+					| crds \
+					| dec* \
+					| delta* \
+					| dg \
+					| digital \
+					| dolphin \
+					| encore* \
+					| gould \
+					| harris \
+					| highlevel \
+					| hitachi* \
+					| hp \
+					| ibm* \
+					| intergraph \
+					| isi* \
+					| knuth \
+					| masscomp \
+					| microblaze* \
+					| mips* \
+					| motorola* \
+					| ncr* \
+					| news \
+					| next \
+					| ns \
+					| oki \
+					| omron* \
+					| pc533* \
+					| rebel \
+					| rom68k \
+					| rombug \
+					| semi \
+					| sequent* \
+					| siemens \
+					| sgi* \
+					| siemens \
+					| sim \
+					| sni \
+					| sony* \
+					| stratus \
+					| sun \
+					| sun[234]* \
+					| tektronix \
+					| tti* \
+					| ultra \
+					| unicom* \
+					| wec \
+					| winbond \
+					| wrs)
 						basic_machine=$field1-$field2
 						basic_os=
 						;;
+					zephyr*)
+						basic_machine=$field1-unknown
+						basic_os=$field2
+						;;
 					*)
 						basic_machine=$field1
 						basic_os=$field2
@@ -272,26 +345,6 @@
 				basic_machine=arm-unknown
 				basic_os=cegcc
 				;;
-			convex-c1)
-				basic_machine=c1-convex
-				basic_os=bsd
-				;;
-			convex-c2)
-				basic_machine=c2-convex
-				basic_os=bsd
-				;;
-			convex-c32)
-				basic_machine=c32-convex
-				basic_os=bsd
-				;;
-			convex-c34)
-				basic_machine=c34-convex
-				basic_os=bsd
-				;;
-			convex-c38)
-				basic_machine=c38-convex
-				basic_os=bsd
-				;;
 			cray)
 				basic_machine=j90-cray
 				basic_os=unicos
@@ -714,15 +767,26 @@
 		vendor=dec
 		basic_os=tops20
 		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
+	delta | 3300 | delta-motorola | 3300-motorola | motorola-delta | motorola-3300)
 		cpu=m68k
 		vendor=motorola
 		;;
-	dpx2*)
+	# This used to be dpx2*, but that gets the RS6000-based
+	# DPX/20 and the x86-based DPX/2-100 wrong.  See
+	# https://oldskool.silicium.org/stations/bull_dpx20.htm
+	# https://www.feb-patrimoine.com/english/bull_dpx2.htm
+	# https://www.feb-patrimoine.com/english/unix_and_bull.htm
+	dpx2 | dpx2[23]00 | dpx2[23]xx)
 		cpu=m68k
 		vendor=bull
-		basic_os=sysv3
+		;;
+	dpx2100 | dpx21xx)
+		cpu=i386
+		vendor=bull
+		;;
+	dpx20)
+		cpu=rs6000
+		vendor=bull
 		;;
 	encore | umax | mmax)
 		cpu=ns32k
@@ -837,18 +901,6 @@
 	next | m*-next)
 		cpu=m68k
 		vendor=next
-		case $basic_os in
-		    openstep*)
-		        ;;
-		    nextstep*)
-			;;
-		    ns2*)
-		      basic_os=nextstep2
-			;;
-		    *)
-		      basic_os=nextstep3
-			;;
-		esac
 		;;
 	np1)
 		cpu=np1
@@ -937,7 +989,6 @@
 		;;
 
 	*-*)
-		# shellcheck disable=SC2162
 		saved_IFS=$IFS
 		IFS="-" read cpu vendor <<EOF
 $basic_machine
@@ -972,15 +1023,19 @@
 
 # Decode basic machines in the full and proper CPU-Company form.
 case $cpu-$vendor in
-	# Here we handle the default manufacturer of certain CPU types in canonical form. It is in
-	# some cases the only manufacturer, in others, it is the most popular.
+	# Here we handle the default manufacturer of certain CPU types in canonical form.
+	# It is in some cases the only manufacturer, in others, it is the most popular.
+	c[12]-convex | c[12]-unknown | c3[248]-convex | c3[248]-unknown)
+		vendor=convex
+		basic_os=${basic_os:-bsd}
+		;;
 	craynv-unknown)
 		vendor=cray
 		basic_os=${basic_os:-unicosmp}
 		;;
 	c90-unknown | c90-cray)
 		vendor=cray
-		basic_os=${Basic_os:-unicos}
+		basic_os=${basic_os:-unicos}
 		;;
 	fx80-unknown)
 		vendor=alliant
@@ -1026,11 +1081,29 @@
 		vendor=alt
 		basic_os=${basic_os:-linux-gnueabihf}
 		;;
-	dpx20-unknown | dpx20-bull)
-		cpu=rs6000
-		vendor=bull
+
+	# Normalized CPU+vendor pairs that imply an OS, if not otherwise specified
+	m68k-isi)
+		basic_os=${basic_os:-sysv}
+		;;
+	m68k-sony)
+		basic_os=${basic_os:-newsos}
+		;;
+	m68k-tektronix)
+		basic_os=${basic_os:-bsd}
+		;;
+	m88k-harris)
+		basic_os=${basic_os:-sysv3}
+		;;
+	i386-bull | m68k-bull)
+		basic_os=${basic_os:-sysv3}
+		;;
+	rs6000-bull)
 		basic_os=${basic_os:-bosx}
 		;;
+	mips-sni)
+		basic_os=${basic_os:-sysv4}
+		;;
 
 	# Here we normalize CPU types irrespective of the vendor
 	amd64-*)
@@ -1038,7 +1111,7 @@
 		;;
 	blackfin-*)
 		cpu=bfin
-		basic_os=linux
+		basic_os=${basic_os:-linux}
 		;;
 	c54x-*)
 		cpu=tic54x
@@ -1061,7 +1134,7 @@
 		;;
 	m68knommu-*)
 		cpu=m68k
-		basic_os=linux
+		basic_os=${basic_os:-linux}
 		;;
 	m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*)
 		cpu=s12z
@@ -1071,7 +1144,7 @@
 		;;
 	parisc-*)
 		cpu=hppa
-		basic_os=linux
+		basic_os=${basic_os:-linux}
 		;;
 	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
 		cpu=i586
@@ -1085,9 +1158,6 @@
 	pentium4-*)
 		cpu=i786
 		;;
-	pc98-*)
-		cpu=i386
-		;;
 	ppc-* | ppcbe-*)
 		cpu=powerpc
 		;;
@@ -1121,9 +1191,6 @@
 	tx39el-*)
 		cpu=mipstx39el
 		;;
-	x64-*)
-		cpu=x86_64
-		;;
 	xscale-* | xscalee[bl]-*)
 		cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
 		;;
@@ -1179,90 +1246,227 @@
 		# Recognize the canonical CPU types that are allowed with any
 		# company name.
 		case $cpu in
-			1750a | 580 \
+			  1750a \
+			| 580 \
+			| [cjt]90 \
 			| a29k \
-			| aarch64 | aarch64_be | aarch64c | arm64ec \
+			| aarch64 \
+			| aarch64_be \
+			| aarch64c \
 			| abacus \
-			| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \
-			| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \
-			| alphapca5[67] | alpha64pca5[67] \
+			| alpha \
+			| alpha64 \
+			| alpha64ev56 \
+			| alpha64ev6[78] \
+			| alpha64ev[4-8] \
+			| alpha64pca5[67] \
+			| alphaev56 \
+			| alphaev6[78] \
+			| alphaev[4-8] \
+			| alphapca5[67] \
 			| am33_2.0 \
 			| amdgcn \
-			| arc | arceb | arc32 | arc64 \
-			| arm | arm[lb]e | arme[lb] | armv* \
-			| avr | avr32 \
+			| arc \
+			| arc32 \
+			| arc64 \
+			| arceb \
+			| arm \
+			| arm64e \
+			| arm64ec \
+			| arm[lb]e \
+			| arme[lb] \
+			| armv* \
 			| asmjs \
+			| avr \
+			| avr32 \
 			| ba \
-			| be32 | be64 \
-			| bfin | bpf | bs2000 \
-			| c[123]* | c30 | [cjt]90 | c4x \
-			| c8051 | clipper | craynv | csky | cydra \
-			| d10v | d30v | dlx | dsp16xx \
-			| e2k | elxsi | epiphany \
-			| f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \
-			| javascript \
-			| h8300 | h8500 \
-			| hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+			| be32 \
+			| be64 \
+			| bfin \
+			| bpf \
+			| bs2000 \
+			| c30 \
+			| c4x \
+			| c8051 \
+			| c[123]* \
+			| clipper \
+			| craynv \
+			| csky \
+			| cydra \
+			| d10v \
+			| d30v \
+			| dlx \
+			| dsp16xx \
+			| e2k \
+			| elxsi \
+			| epiphany \
+			| f30[01] \
+			| f700 \
+			| fido \
+			| fr30 \
+			| frv \
+			| ft32 \
+			| fx80 \
+			| h8300 \
+			| h8500 \
 			| hexagon \
-			| i370 | i*86 | i860 | i960 | ia16 | ia64 \
-			| ip2k | iq2000 \
+			| hppa \
+			| hppa1.[01] \
+			| hppa2.0 \
+			| hppa2.0[nw] \
+			| hppa64 \
+			| i*86 \
+			| i370 \
+			| i860 \
+			| i960 \
+			| ia16 \
+			| ia64 \
+			| ip2k \
+			| iq2000 \
+			| javascript \
 			| k1om \
 			| kvx \
-			| le32 | le64 \
+			| le32 \
+			| le64 \
 			| lm32 \
-			| loongarch32 | loongarch64 \
-			| m32c | m32r | m32rle \
-			| m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \
-			| m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \
-			| m88110 | m88k | maxq | mb | mcore | mep | metag \
-			| microblaze | microblazeel \
+			| loongarch32 \
+			| loongarch64 \
+			| m32c \
+			| m32r \
+			| m32rle \
+			| m5200 \
+			| m68000 \
+			| m680[012346]0 \
+			| m6811 \
+			| m6812 \
+			| m68360 \
+			| m683?2 \
+			| m68hc11 \
+			| m68hc12 \
+			| m68hcs12x \
+			| m68k \
+			| m88110 \
+			| m88k \
+			| maxq \
+			| mb \
+			| mcore \
+			| mep \
+			| metag \
+			| microblaze \
+			| microblazeel \
 			| mips* \
 			| mmix \
-			| mn10200 | mn10300 \
+			| mn10200 \
+			| mn10300 \
 			| moxie \
-			| mt \
 			| msp430 \
+			| mt \
 			| nanomips* \
-			| nds32 | nds32le | nds32be \
+			| nds32 \
+			| nds32be \
+			| nds32le \
 			| nfp \
-			| nios | nios2 | nios2eb | nios2el \
-			| none | np1 | ns16k | ns32k | nvptx \
+			| nios \
+			| nios2 \
+			| nios2eb \
+			| nios2el \
+			| none \
+			| np1 \
+			| ns16k \
+			| ns32k \
+			| nvptx \
 			| open8 \
 			| or1k* \
 			| or32 \
 			| orion \
+			| pdp10 \
+			| pdp11 \
 			| picochip \
-			| pdp10 | pdp11 | pj | pjl | pn | power \
-			| powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \
+			| pj \
+			| pjl \
+			| pn \
+			| power \
+			| powerpc \
+			| powerpc64 \
+			| powerpc64le \
+			| powerpcle \
+			| powerpcspe \
 			| pru \
 			| pyramid \
-			| riscv | riscv32 | riscv32be | riscv64 | riscv64be \
-			| rl78 | romp | rs6000 | rx \
-			| s390 | s390x \
+			| riscv \
+			| riscv32 \
+			| riscv32be \
+			| riscv64 \
+			| riscv64be \
+			| rl78 \
+			| romp \
+			| rs6000 \
+			| rx \
+			| s390 \
+			| s390x \
 			| score \
-			| sh | shl \
-			| sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \
-			| sh[1234]e[lb] |  sh[12345][lb]e | sh[23]ele | sh64 | sh64le \
-			| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \
+			| sh \
+			| sh64 \
+			| sh64le \
+			| sh[12345][lb]e \
+			| sh[1234] \
+			| sh[1234]e[lb] \
+			| sh[23]e \
+			| sh[23]ele \
+			| sh[24]a \
+			| sh[24]ae[lb] \
+			| sh[lb]e \
+			| she[lb] \
+			| shl \
+			| sparc \
+			| sparc64 \
+			| sparc64b \
+			| sparc64v \
+			| sparc86x \
+			| sparclet \
 			| sparclite \
-			| sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \
+			| sparcv8 \
+			| sparcv9 \
+			| sparcv9b \
+			| sparcv9v \
 			| spu \
+			| sv1 \
+			| sx* \
 			| tahoe \
 			| thumbv7* \
-			| tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \
+			| tic30 \
+			| tic4x \
+			| tic54x \
+			| tic55x \
+			| tic6x \
+			| tic80 \
 			| tron \
 			| ubicom32 \
-			| v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \
+			| v70 \
+			| v810 \
+			| v850 \
+			| v850e \
+			| v850e1 \
+			| v850e2 \
+			| v850e2v3 \
+			| v850es \
 			| vax \
 			| vc4 \
 			| visium \
 			| w65 \
-			| wasm32 | wasm64 \
+			| wasm32 \
+			| wasm64 \
 			| we32k \
-			| x86 | x86_64 | xc16x | xgate | xps100 \
-			| xstormy16 | xtensa* \
+			| x86 \
+			| x86_64 \
+			| xc16x \
+			| xgate \
+			| xps100 \
+			| xstormy16 \
+			| xtensa* \
 			| ymp \
-			| z8k | z80)
+			| z80 \
+			| z8k)
 				;;
 
 			*)
@@ -1307,7 +1511,6 @@
 		os=`echo "$basic_os" | sed -e 's|nto-qnx|qnx|'`
 		;;
 	*-*)
-		# shellcheck disable=SC2162
 		saved_IFS=$IFS
 		IFS="-" read kernel os <<EOF
 $basic_os
@@ -1354,6 +1557,23 @@
 	unixware*)
 		os=sysv4.2uw
 		;;
+	# The marketing names for NeXT's operating systems were
+	# NeXTSTEP, NeXTSTEP 2, OpenSTEP 3, OpenSTEP 4.  'openstep' is
+	# mapped to 'openstep3', but 'openstep1' and 'openstep2' are
+	# mapped to 'nextstep' and 'nextstep2', consistent with the
+	# treatment of SunOS/Solaris.
+	ns | ns1 | nextstep | nextstep1 | openstep1)
+		os=nextstep
+		;;
+	ns2 | nextstep2 | openstep2)
+		os=nextstep2
+		;;
+	ns3 | nextstep3 | openstep | openstep3)
+		os=openstep3
+		;;
+	ns4 | nextstep4 | openstep4)
+		os=openstep4
+		;;
 	# es1800 is here to avoid being matched by es* (a different OS)
 	es1800*)
 		os=ose
@@ -1424,6 +1644,7 @@
 		;;
 	utek*)
 		os=bsd
+		vendor=`echo "$vendor" | sed -e 's|^unknown$|tektronix|'`
 		;;
 	dynix*)
 		os=bsd
@@ -1440,21 +1661,25 @@
 	386bsd)
 		os=bsd
 		;;
-	ctix* | uts*)
+	ctix*)
 		os=sysv
+		vendor=`echo "$vendor" | sed -e 's|^unknown$|convergent|'`
 		;;
-	nova*)
-		os=rtmk-nova
+	uts*)
+		os=sysv
 		;;
-	ns2)
-		os=nextstep2
+	nova*)
+		kernel=rtmk
+		os=nova
 		;;
 	# Preserve the version number of sinix5.
 	sinix5.*)
 		os=`echo "$os" | sed -e 's|sinix|sysv|'`
+		vendor=`echo "$vendor" | sed -e 's|^unknown$|sni|'`
 		;;
 	sinix*)
 		os=sysv4
+		vendor=`echo "$vendor" | sed -e 's|^unknown$|sni|'`
 		;;
 	tpf*)
 		os=tpf
@@ -1595,6 +1820,14 @@
 		os=
 		obj=elf
 		;;
+	# The -sgi and -siemens entries must be before the mips- entry
+	# or we get the wrong os.
+	*-sgi)
+		os=irix
+		;;
+	*-siemens)
+		os=sysv4
+		;;
 	mips*-cisco)
 		os=
 		obj=elf
@@ -1607,7 +1840,8 @@
 		os=
 		obj=coff
 		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
+	# This must be before the sparc-* entry or we get the wrong os.
+	*-tti)
 		os=sysv3
 		;;
 	sparc-* | *-sun)
@@ -1639,7 +1873,7 @@
 		os=hpux
 		;;
 	*-hitachi)
-		os=hiux
+		os=hiuxwe2
 		;;
 	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
 		os=sysv
@@ -1683,12 +1917,6 @@
 	*-encore)
 		os=bsd
 		;;
-	*-sgi)
-		os=irix
-		;;
-	*-siemens)
-		os=sysv4
-		;;
 	*-masscomp)
 		os=rtu
 		;;
@@ -1735,40 +1963,193 @@
 	ghcjs)
 		;;
 	# Now accept the basic system types.
-	# The portable systems comes first.
 	# Each alternative MUST end in a * to match a version number.
-	gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
-	     | *vms* | esix* | aix* | cnk* | sunos | sunos[34]* \
-	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
-	     | sym* |  plan9* | psp* | sim* | xray* | os68k* | v88r* \
-	     | hiux* | abug | nacl* | netware* | windows* \
-	     | os9* | macos* | osx* | ios* | tvos* | watchos* \
-	     | mpw* | magic* | mmixware* | mon960* | lnews* \
-	     | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
-	     | aos* | aros* | cloudabi* | sortix* | twizzler* \
-	     | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
-	     | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \
-	     | mirbsd* | netbsd* | dicos* | openedition* | ose* \
-	     | bitrig* | openbsd* | secbsd* | solidbsd* | libertybsd* | os108* \
-	     | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \
-	     | bosx* | nextstep* | cxux* | oabi* \
-	     | ptx* | ecoff* | winnt* | domain* | vsta* \
-	     | udi* | lites* | ieee* | go32* | aux* | hcos* \
-	     | chorusrdb* | cegcc* | glidix* | serenity* \
-	     | cygwin* | msys* | moss* | proelf* | rtems* \
-	     | midipix* | mingw32* | mingw64* | mint* \
-	     | uxpv* | beos* | mpeix* | udk* | moxiebox* \
-	     | interix* | uwin* | mks* | rhapsody* | darwin* \
-	     | openstep* | oskit* | conix* | pw32* | nonstopux* \
-	     | storm-chaos* | tops10* | tenex* | tops20* | its* \
-	     | os2* | vos* | palmos* | uclinux* | nucleus* | morphos* \
-	     | scout* | superux* | sysv* | rtmk* | tpf* | windiss* \
-	     | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
-	     | skyos* | haiku* | rdos* | toppers* | drops* | es* \
-	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
-	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
-	     | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \
-	     | fiwix* | mlibc* | cos* | mbr* | ironclad* )
+	  abug \
+	| aix* \
+	| amdhsa* \
+	| amigados* \
+	| amigaos* \
+	| android* \
+	| aof* \
+	| aos* \
+	| aros* \
+	| atheos* \
+	| auroraux* \
+	| aux* \
+	| beos* \
+	| bitrig* \
+	| bme* \
+	| bosx* \
+	| bsd* \
+	| cegcc* \
+	| chorusos* \
+	| chorusrdb* \
+	| clix* \
+	| cloudabi* \
+	| cnk* \
+	| conix* \
+	| cos* \
+	| cxux* \
+	| cygwin* \
+	| darwin* \
+	| dgux* \
+	| dicos* \
+	| dnix* \
+	| domain* \
+	| dragonfly* \
+	| drops* \
+	| ebmon* \
+	| ecoff* \
+	| ekkobsd* \
+	| emscripten* \
+	| emx* \
+	| es* \
+	| fiwix* \
+	| freebsd* \
+	| fuchsia* \
+	| genix* \
+	| genode* \
+	| glidix* \
+	| gnu* \
+	| go32* \
+	| haiku* \
+	| hcos* \
+	| hiux* \
+	| hms* \
+	| hpux* \
+	| ieee* \
+	| interix* \
+	| ios* \
+	| iris* \
+	| irix* \
+	| ironclad* \
+	| isc* \
+	| its* \
+	| l4re* \
+	| libertybsd* \
+	| lites* \
+	| lnews* \
+	| luna* \
+	| lynxos* \
+	| mach* \
+	| macos* \
+	| magic* \
+	| mbr* \
+	| midipix* \
+	| midnightbsd* \
+	| mingw32* \
+	| mingw64* \
+	| minix* \
+	| mint* \
+	| mirbsd* \
+	| mks* \
+	| mlibc* \
+	| mmixware* \
+	| mon960* \
+	| morphos* \
+	| moss* \
+	| moxiebox* \
+	| mpeix* \
+	| mpw* \
+	| msdos* \
+	| msys* \
+	| mvs* \
+	| nacl* \
+	| netbsd* \
+	| netware* \
+	| newsos* \
+	| nextstep* \
+	| nindy* \
+	| nonstopux* \
+	| nova* \
+	| nsk* \
+	| nucleus* \
+	| nx6 \
+	| nx7 \
+	| oabi* \
+	| ohos* \
+	| onefs* \
+	| openbsd* \
+	| openedition* \
+	| openstep* \
+	| os108* \
+	| os2* \
+	| os400* \
+	| os68k* \
+	| os9* \
+	| ose* \
+	| osf* \
+	| oskit* \
+	| osx* \
+	| palmos* \
+	| phoenix* \
+	| plan9* \
+	| powermax* \
+	| powerunix* \
+	| proelf* \
+	| psos* \
+	| psp* \
+	| ptx* \
+	| pw32* \
+	| qnx* \
+	| rdos* \
+	| redox* \
+	| rhapsody* \
+	| riscix* \
+	| riscos* \
+	| rtems* \
+	| rtmk* \
+	| rtu* \
+	| scout* \
+	| secbsd* \
+	| sei* \
+	| serenity* \
+	| sim* \
+	| skyos* \
+	| solaris* \
+	| solidbsd* \
+	| sortix* \
+	| storm-chaos* \
+	| sunos \
+	| sunos[34]* \
+	| superux* \
+	| syllable* \
+	| sym* \
+	| sysv* \
+	| tenex* \
+	| tirtos* \
+	| toppers* \
+	| tops10* \
+	| tops20* \
+	| tpf* \
+	| tvos* \
+	| twizzler* \
+	| uclinux* \
+	| udi* \
+	| udk* \
+	| ultrix* \
+	| unicos* \
+	| uniplus* \
+	| unleashed* \
+	| unos* \
+	| uwin* \
+	| uxpv* \
+	| v88r* \
+	|*vms* \
+	| vos* \
+	| vsta* \
+	| vxsim* \
+	| vxworks* \
+	| wasi* \
+	| watchos* \
+	| wince* \
+	| windiss* \
+	| windows* \
+	| winnt* \
+	| xenix* \
+	| xray* \
+	| zephyr* \
+	| zvmoe* )
 		;;
 	# This one is extra strict with allowed versions
 	sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
@@ -1829,9 +2210,9 @@
 case $kernel-$os-$obj in
 	linux-gnu*- | linux-android*- | linux-dietlibc*- | linux-llvm*- \
 		    | linux-mlibc*- | linux-musl*- | linux-newlib*- \
-		    | linux-relibc*- | linux-uclibc*- )
+		    | linux-relibc*- | linux-uclibc*- | linux-ohos*- )
 		;;
-	uclinux-uclibc*- )
+	uclinux-uclibc*- | uclinux-gnu*- )
 		;;
 	managarm-mlibc*- | managarm-kernel*- )
 		;;
@@ -1856,7 +2237,7 @@
 		echo "Invalid configuration '$1': '$os' needs 'windows'." 1>&2
 		exit 1
 		;;
-	kfreebsd*-gnu*- | kopensolaris*-gnu*-)
+	kfreebsd*-gnu*- | knetbsd*-gnu*- | netbsd*-gnu*- | kopensolaris*-gnu*-)
 		;;
 	vxworks-simlinux- | vxworks-simwindows- | vxworks-spe-)
 		;;
@@ -1864,6 +2245,8 @@
 		;;
 	os2-emx-)
 		;;
+	rtmk-nova-)
+		;;
 	*-eabi*- | *-gnueabi*-)
 		;;
 	none--*)
@@ -1890,7 +2273,7 @@
 			*-riscix*)
 				vendor=acorn
 				;;
-			*-sunos*)
+			*-sunos* | *-solaris*)
 				vendor=sun
 				;;
 			*-cnk* | *-aix*)
Index: configure
--- xterm-395+/configure	2024-07-05 23:35:54.000000000 +0000
+++ xterm-396/configure	2024-11-30 19:37:45.000000000 +0000
@@ -692,6 +692,7 @@
 System types:
   --build=BUILD           configure for building on BUILD [guessed]
   --host=HOST       build programs to run on HOST [BUILD]
+  --target=TARGET   configure for building compilers for TARGET [HOST]
 EOF
 fi
 
@@ -711,6 +712,7 @@
   --disable-full-tgetent  disable check for full tgetent function
   --with-app-class=XXX    override X applications class (default XTerm)
   --with-app-defaults=DIR directory in which to install resource files (EPREFIX/lib/X11/app-defaults)
+  --with-system-type=XXX  test: override derived host system-type
   --with-icon-name[=XXX]  override icon name (default: mini.xterm)
   --with-icon-symlink[=XXX] make symbolic link for icon name (default: xterm)
   --with-pixmapdir=DIR    directory in which to install pixmaps (DATADIR/pixmaps)
@@ -1023,7 +1025,7 @@
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
-    { echo "$as_me:1026: loading site script $ac_site_file" >&5
+    { echo "$as_me:1028: 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"
@@ -1034,7 +1036,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:1037: loading cache $cache_file" >&5
+    { echo "$as_me:1039: loading cache $cache_file" >&5
 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . $cache_file;;
@@ -1042,7 +1044,7 @@
     esac
   fi
 else
-  { echo "$as_me:1045: creating cache $cache_file" >&5
+  { echo "$as_me:1047: creating cache $cache_file" >&5
 echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -1058,21 +1060,21 @@
   eval ac_new_val="\$ac_env_${ac_var}_value"
   case "$ac_old_set,$ac_new_set" in
     set,)
-      { echo "$as_me:1061: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { echo "$as_me:1063: 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:1065: error: \`$ac_var' was not set in the previous run" >&5
+      { echo "$as_me:1067: 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:1071: error: \`$ac_var' has changed since the previous run:" >&5
+        { echo "$as_me:1073: 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:1073:   former value:  $ac_old_val" >&5
+        { echo "$as_me:1075:   former value:  $ac_old_val" >&5
 echo "$as_me:   former value:  $ac_old_val" >&2;}
-        { echo "$as_me:1075:   current value: $ac_new_val" >&5
+        { echo "$as_me:1077:   current value: $ac_new_val" >&5
 echo "$as_me:   current value: $ac_new_val" >&2;}
         ac_cache_corrupted=:
       fi;;
@@ -1091,9 +1093,9 @@
   fi
 done
 if "$ac_cache_corrupted"; then
-  { echo "$as_me:1094: error: changes in the environment can compromise the build" >&5
+  { echo "$as_me:1096: 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:1096: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+  { { echo "$as_me:1098: 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
@@ -1122,10 +1124,10 @@
 echo "#! $SHELL" >conftest.sh
 echo  "exit 0"   >>conftest.sh
 chmod +x conftest.sh
-if { (echo "$as_me:1125: PATH=\".;.\"; conftest.sh") >&5
+if { (echo "$as_me:1127: PATH=\".;.\"; conftest.sh") >&5
   (PATH=".;."; conftest.sh) 2>&5
   ac_status=$?
-  echo "$as_me:1128: \$? = $ac_status" >&5
+  echo "$as_me:1130: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
   ac_path_separator=';'
 else
@@ -1153,7 +1155,7 @@
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:1156: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+  { { echo "$as_me:1158: 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
@@ -1163,11 +1165,11 @@
 
 # Make sure we can run config.sub.
 $ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:1166: error: cannot run $ac_config_sub" >&5
+  { { echo "$as_me:1168: error: cannot run $ac_config_sub" >&5
 echo "$as_me: error: cannot run $ac_config_sub" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:1170: checking build system type" >&5
+echo "$as_me:1172: 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
@@ -1176,16 +1178,16 @@
 test -z "$ac_cv_build_alias" &&
   ac_cv_build_alias=`$ac_config_guess`
 test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:1179: error: cannot guess build type; you must specify one" >&5
+  { { echo "$as_me:1181: 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:1183: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+  { { echo "$as_me:1185: 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:1188: result: $ac_cv_build" >&5
+echo "$as_me:1190: 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/'`
@@ -1193,7 +1195,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:1196: checking host system type" >&5
+	echo "$as_me:1198: 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
@@ -1202,12 +1204,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:1205: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+  { { echo "$as_me:1207: 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:1210: result: $ac_cv_host" >&5
+echo "$as_me:1212: 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/'`
@@ -1233,13 +1235,13 @@
 fi
 
 test -z "$system_name" && system_name="$cf_cv_system_name"
-test -n "$cf_cv_system_name" && echo "$as_me:1236: result: Configuring for $cf_cv_system_name" >&5
+test -n "$cf_cv_system_name" && echo "$as_me:1238: 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:1240: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
+	echo "$as_me:1242: 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:1242: error: \"Please remove config.cache and try again.\"" >&5
+	{ { echo "$as_me:1244: 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
@@ -1264,7 +1266,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:1267: checking for $ac_word" >&5
+echo "$as_me:1269: 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
@@ -1279,7 +1281,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:1282: found $ac_dir/$ac_word" >&5
+echo "$as_me:1284: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1287,10 +1289,10 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1290: result: $CC" >&5
+  echo "$as_me:1292: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1293: result: no" >&5
+  echo "$as_me:1295: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1299,7 +1301,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:1302: checking for $ac_word" >&5
+echo "$as_me:1304: 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
@@ -1314,7 +1316,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:1317: found $ac_dir/$ac_word" >&5
+echo "$as_me:1319: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1322,10 +1324,10 @@
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1325: result: $ac_ct_CC" >&5
+  echo "$as_me:1327: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1328: result: no" >&5
+  echo "$as_me:1330: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1338,7 +1340,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:1341: checking for $ac_word" >&5
+echo "$as_me:1343: 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
@@ -1353,7 +1355,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:1356: found $ac_dir/$ac_word" >&5
+echo "$as_me:1358: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1361,10 +1363,10 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1364: result: $CC" >&5
+  echo "$as_me:1366: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1367: result: no" >&5
+  echo "$as_me:1369: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1373,7 +1375,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:1376: checking for $ac_word" >&5
+echo "$as_me:1378: 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
@@ -1388,7 +1390,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:1391: found $ac_dir/$ac_word" >&5
+echo "$as_me:1393: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1396,10 +1398,10 @@
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1399: result: $ac_ct_CC" >&5
+  echo "$as_me:1401: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1402: result: no" >&5
+  echo "$as_me:1404: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1412,7 +1414,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:1415: checking for $ac_word" >&5
+echo "$as_me:1417: 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
@@ -1432,7 +1434,7 @@
   continue
 fi
 ac_cv_prog_CC="cc"
-echo "$as_me:1435: found $ac_dir/$ac_word" >&5
+echo "$as_me:1437: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1454,10 +1456,10 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1457: result: $CC" >&5
+  echo "$as_me:1459: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1460: result: no" >&5
+  echo "$as_me:1462: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1468,7 +1470,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:1471: checking for $ac_word" >&5
+echo "$as_me:1473: 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
@@ -1483,7 +1485,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:1486: found $ac_dir/$ac_word" >&5
+echo "$as_me:1488: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1491,10 +1493,10 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1494: result: $CC" >&5
+  echo "$as_me:1496: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1497: result: no" >&5
+  echo "$as_me:1499: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1507,7 +1509,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:1510: checking for $ac_word" >&5
+echo "$as_me:1512: 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
@@ -1522,7 +1524,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:1525: found $ac_dir/$ac_word" >&5
+echo "$as_me:1527: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1530,10 +1532,10 @@
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1533: result: $ac_ct_CC" >&5
+  echo "$as_me:1535: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1536: result: no" >&5
+  echo "$as_me:1538: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1545,32 +1547,32 @@
 
 fi
 
-test -z "$CC" && { { echo "$as_me:1548: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:1550: 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:1553:" \
+echo "$as_me:1555:" \
      "checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo "$2"`
-{ (eval echo "$as_me:1556: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1558: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1559: \$? = $ac_status" >&5
+  echo "$as_me:1561: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:1561: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1563: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1564: \$? = $ac_status" >&5
+  echo "$as_me:1566: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:1566: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1568: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1569: \$? = $ac_status" >&5
+  echo "$as_me:1571: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 1573 "configure"
+#line 1575 "configure"
 #include "confdefs.h"
 
 int
@@ -1586,13 +1588,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:1589: checking for C compiler default output" >&5
+echo "$as_me:1591: 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:1592: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:1594: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5
   ac_status=$?
-  echo "$as_me:1595: \$? = $ac_status" >&5
+  echo "$as_me:1597: \$? = $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
@@ -1615,34 +1617,34 @@
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-{ { echo "$as_me:1618: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:1620: 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:1624: result: $ac_file" >&5
+echo "$as_me:1626: 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:1629: checking whether the C compiler works" >&5
+echo "$as_me:1631: 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:1635: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1637: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1638: \$? = $ac_status" >&5
+  echo "$as_me:1640: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:1645: error: cannot run C compiled programs.
+	{ { echo "$as_me:1647: 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;}
@@ -1650,24 +1652,24 @@
     fi
   fi
 fi
-echo "$as_me:1653: result: yes" >&5
+echo "$as_me:1655: 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:1660: checking whether we are cross compiling" >&5
+echo "$as_me:1662: checking whether we are cross compiling" >&5
 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:1662: result: $cross_compiling" >&5
+echo "$as_me:1664: result: $cross_compiling" >&5
 echo "${ECHO_T}$cross_compiling" >&6
 
-echo "$as_me:1665: checking for executable suffix" >&5
+echo "$as_me:1667: checking for executable suffix" >&5
 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:1667: \"$ac_link\"") >&5
+if { (eval echo "$as_me:1669: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:1670: \$? = $ac_status" >&5
+  echo "$as_me:1672: \$? = $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
@@ -1683,25 +1685,25 @@
   esac
 done
 else
-  { { echo "$as_me:1686: error: cannot compute EXEEXT: cannot compile and link" >&5
+  { { echo "$as_me:1688: 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:1692: result: $ac_cv_exeext" >&5
+echo "$as_me:1694: 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:1698: checking for object suffix" >&5
+echo "$as_me:1700: 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 1704 "configure"
+#line 1706 "configure"
 #include "confdefs.h"
 
 int
@@ -1713,10 +1715,10 @@
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:1716: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1718: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1719: \$? = $ac_status" >&5
+  echo "$as_me:1721: \$? = $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
@@ -1728,24 +1730,24 @@
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-{ { echo "$as_me:1731: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:1733: 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:1738: result: $ac_cv_objext" >&5
+echo "$as_me:1740: result: $ac_cv_objext" >&5
 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:1742: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:1744: 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 1748 "configure"
+#line 1750 "configure"
 #include "confdefs.h"
 
 int
@@ -1760,16 +1762,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1763: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1765: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1766: \$? = $ac_status" >&5
+  echo "$as_me:1768: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1769: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1771: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1772: \$? = $ac_status" >&5
+  echo "$as_me:1774: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_compiler_gnu=yes
 else
@@ -1781,19 +1783,19 @@
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:1784: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:1786: 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:1790: checking whether $CC accepts -g" >&5
+echo "$as_me:1792: 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 1796 "configure"
+#line 1798 "configure"
 #include "confdefs.h"
 
 int
@@ -1805,16 +1807,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1808: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1810: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1811: \$? = $ac_status" >&5
+  echo "$as_me:1813: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1814: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1816: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1817: \$? = $ac_status" >&5
+  echo "$as_me:1819: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_cc_g=yes
 else
@@ -1824,7 +1826,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:1827: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:1829: 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
@@ -1851,16 +1853,16 @@
 #endif
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1854: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1856: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1857: \$? = $ac_status" >&5
+  echo "$as_me:1859: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1860: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1862: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1863: \$? = $ac_status" >&5
+  echo "$as_me:1865: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   for ac_declaration in \
    ''\
@@ -1872,7 +1874,7 @@
    'void exit (int);'
 do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 1875 "configure"
+#line 1877 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -1885,16 +1887,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1888: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1890: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1891: \$? = $ac_status" >&5
+  echo "$as_me:1893: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1894: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1896: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1897: \$? = $ac_status" >&5
+  echo "$as_me:1899: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -1904,7 +1906,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 1907 "configure"
+#line 1909 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -1916,16 +1918,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1919: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1921: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1922: \$? = $ac_status" >&5
+  echo "$as_me:1924: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1925: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1927: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1928: \$? = $ac_status" >&5
+  echo "$as_me:1930: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -1955,11 +1957,11 @@
 
 GCC_VERSION=none
 if test "$GCC" = yes ; then
-	echo "$as_me:1958: checking version of $CC" >&5
+	echo "$as_me:1960: 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/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
-	echo "$as_me:1962: result: $GCC_VERSION" >&5
+	echo "$as_me:1964: result: $GCC_VERSION" >&5
 echo "${ECHO_T}$GCC_VERSION" >&6
 fi
 
@@ -1968,12 +1970,12 @@
 if test "$GCC" = yes ; then
 	case "$host_os" in
 	(linux*|gnu*)
-		echo "$as_me:1971: checking if this is really Intel C compiler" >&5
+		echo "$as_me:1973: 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 1976 "configure"
+#line 1978 "configure"
 #include "confdefs.h"
 
 int
@@ -1990,16 +1992,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1993: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1995: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1996: \$? = $ac_status" >&5
+  echo "$as_me:1998: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1999: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2001: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2002: \$? = $ac_status" >&5
+  echo "$as_me:2004: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -2010,7 +2012,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:2013: result: $INTEL_COMPILER" >&5
+		echo "$as_me:2015: result: $INTEL_COMPILER" >&5
 echo "${ECHO_T}$INTEL_COMPILER" >&6
 		;;
 	esac
@@ -2019,11 +2021,11 @@
 CLANG_COMPILER=no
 
 if test "$GCC" = yes ; then
-	echo "$as_me:2022: checking if this is really Clang C compiler" >&5
+	echo "$as_me:2024: 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 2026 "configure"
+#line 2028 "configure"
 #include "confdefs.h"
 
 int
@@ -2040,16 +2042,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2043: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2045: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2046: \$? = $ac_status" >&5
+  echo "$as_me:2048: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2049: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2051: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2052: \$? = $ac_status" >&5
+  echo "$as_me:2054: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   CLANG_COMPILER=yes
 
@@ -2059,7 +2061,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	CFLAGS="$cf_save_CFLAGS"
-	echo "$as_me:2062: result: $CLANG_COMPILER" >&5
+	echo "$as_me:2064: result: $CLANG_COMPILER" >&5
 echo "${ECHO_T}$CLANG_COMPILER" >&6
 fi
 
@@ -2068,30 +2070,30 @@
 if test "x$CLANG_COMPILER" = "xyes" ; then
 	case "$CC" in
 	(c[1-9][0-9]|*/c[1-9][0-9])
-		{ echo "$as_me:2071: WARNING: replacing broken compiler alias $CC" >&5
+		{ echo "$as_me:2073: 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:2078: checking version of $CC" >&5
+	echo "$as_me:2080: 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:2082: result: $CLANG_VERSION" >&5
+	echo "$as_me:2084: 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:2089: checking if option $cf_clang_opt works" >&5
+		echo "$as_me:2091: 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 2094 "configure"
+#line 2096 "configure"
 #include "confdefs.h"
 
 			#include <stdio.h>
@@ -2105,16 +2107,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:2108: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2110: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2111: \$? = $ac_status" >&5
+  echo "$as_me:2113: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:2114: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2116: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2117: \$? = $ac_status" >&5
+  echo "$as_me:2119: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_clang_optok=yes
@@ -2125,13 +2127,13 @@
 			cf_clang_optok=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:2128: result: $cf_clang_optok" >&5
+		echo "$as_me:2130: 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}:2134: testing adding option $cf_clang_opt ..." 1>&5
+echo "${as_me:-configure}:2136: testing adding option $cf_clang_opt ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_clang_opt"
@@ -2140,7 +2142,7 @@
 	done
 fi
 
-echo "$as_me:2143: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:2145: 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
@@ -2148,7 +2150,7 @@
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 2151 "configure"
+#line 2153 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -2195,16 +2197,16 @@
 do
   CC="$ac_save_CC $ac_arg"
   rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2198: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2200: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2201: \$? = $ac_status" >&5
+  echo "$as_me:2203: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2204: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2206: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2207: \$? = $ac_status" >&5
+  echo "$as_me:2209: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_cc_stdc=$ac_arg
 break
@@ -2221,10 +2223,10 @@
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)
-    echo "$as_me:2224: result: none needed" >&5
+    echo "$as_me:2226: result: none needed" >&5
 echo "${ECHO_T}none needed" >&6 ;;
   *)
-    echo "$as_me:2227: result: $ac_cv_prog_cc_stdc" >&5
+    echo "$as_me:2229: result: $ac_cv_prog_cc_stdc" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
     CC="$CC $ac_cv_prog_cc_stdc" ;;
 esac
@@ -2232,13 +2234,13 @@
 # This should have been defined by AC_PROG_CC
 : "${CC:=cc}"
 
-echo "$as_me:2235: checking \$CFLAGS variable" >&5
+echo "$as_me:2237: checking \$CFLAGS variable" >&5
 echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
 case "x$CFLAGS" in
 (*-[IUD]*)
-	echo "$as_me:2239: result: broken" >&5
+	echo "$as_me:2241: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:2241: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
+	{ echo "$as_me:2243: 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=
@@ -2346,18 +2348,18 @@
 	done
 	;;
 (*)
-	echo "$as_me:2349: result: ok" >&5
+	echo "$as_me:2351: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
 
-echo "$as_me:2354: checking \$CC variable" >&5
+echo "$as_me:2356: checking \$CC variable" >&5
 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
 case "$CC" in
 (*[\ \	]-*)
-	echo "$as_me:2358: result: broken" >&5
+	echo "$as_me:2360: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:2360: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
+	{ echo "$as_me:2362: 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/[ ]*[ ]-[^ ].*//'`
@@ -2474,19 +2476,19 @@
 	done
 	test -n "$verbose" && echo "	resulting CC: '$CC'" 1>&6
 
-echo "${as_me:-configure}:2477: testing resulting CC: '$CC' ..." 1>&5
+echo "${as_me:-configure}:2479: testing resulting CC: '$CC' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CFLAGS: '$CFLAGS'" 1>&6
 
-echo "${as_me:-configure}:2481: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+echo "${as_me:-configure}:2483: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
 
-echo "${as_me:-configure}:2485: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+echo "${as_me:-configure}:2487: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
 
 	;;
 (*)
-	echo "$as_me:2489: result: ok" >&5
+	echo "$as_me:2491: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
@@ -2495,7 +2497,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:2498: checking for $ac_word" >&5
+echo "$as_me:2500: 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
@@ -2510,7 +2512,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_GREP="$ac_prog"
-echo "$as_me:2513: found $ac_dir/$ac_word" >&5
+echo "$as_me:2515: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2518,10 +2520,10 @@
 fi
 GREP=$ac_cv_prog_GREP
 if test -n "$GREP"; then
-  echo "$as_me:2521: result: $GREP" >&5
+  echo "$as_me:2523: result: $GREP" >&5
 echo "${ECHO_T}$GREP" >&6
 else
-  echo "$as_me:2524: result: no" >&5
+  echo "$as_me:2526: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2529,7 +2531,7 @@
 done
 test -n "$GREP" || GREP=": "
 
-echo "$as_me:2532: checking for egrep" >&5
+echo "$as_me:2534: 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
@@ -2541,7 +2543,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:2544: checking for $ac_word" >&5
+echo "$as_me:2546: 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
@@ -2558,7 +2560,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:2561: found $ac_dir/$ac_word" >&5
+   echo "$as_me:2563: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -2569,10 +2571,10 @@
 EGREP=$ac_cv_path_EGREP
 
 if test -n "$EGREP"; then
-  echo "$as_me:2572: result: $EGREP" >&5
+  echo "$as_me:2574: result: $EGREP" >&5
 echo "${ECHO_T}$EGREP" >&6
 else
-  echo "$as_me:2575: result: no" >&5
+  echo "$as_me:2577: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2580,12 +2582,12 @@
 done
 test -n "$EGREP" || EGREP=": "
 
-     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2583: error: cannot find workable egrep" >&5
+     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2585: error: cannot find workable egrep" >&5
 echo "$as_me: error: cannot find workable egrep" >&2;}
    { (exit 1); exit 1; }; }
    fi
 fi
-echo "$as_me:2588: result: $ac_cv_path_EGREP" >&5
+echo "$as_me:2590: result: $ac_cv_path_EGREP" >&5
 echo "${ECHO_T}$ac_cv_path_EGREP" >&6
  EGREP="$ac_cv_path_EGREP"
 
@@ -2595,7 +2597,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:2598: checking how to run the C preprocessor" >&5
+echo "$as_me:2600: 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
@@ -2616,18 +2618,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 2619 "configure"
+#line 2621 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2624: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2626: \"$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:2630: \$? = $ac_status" >&5
+  echo "$as_me:2632: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2650,17 +2652,17 @@
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2653 "configure"
+#line 2655 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2657: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2659: \"$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:2663: \$? = $ac_status" >&5
+  echo "$as_me:2665: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2697,7 +2699,7 @@
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:2700: result: $CPP" >&5
+echo "$as_me:2702: result: $CPP" >&5
 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -2707,18 +2709,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 2710 "configure"
+#line 2712 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2715: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2717: \"$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:2721: \$? = $ac_status" >&5
+  echo "$as_me:2723: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2741,17 +2743,17 @@
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2744 "configure"
+#line 2746 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2748: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2750: \"$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:2754: \$? = $ac_status" >&5
+  echo "$as_me:2756: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2779,7 +2781,7 @@
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:2782: error: C preprocessor \"$CPP\" fails sanity check" >&5
+  { { echo "$as_me:2784: error: C preprocessor \"$CPP\" fails sanity check" >&5
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -2795,7 +2797,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:2798: checking for $ac_word" >&5
+echo "$as_me:2800: 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
@@ -2810,7 +2812,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AWK="$ac_prog"
-echo "$as_me:2813: found $ac_dir/$ac_word" >&5
+echo "$as_me:2815: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2818,10 +2820,10 @@
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$as_me:2821: result: $AWK" >&5
+  echo "$as_me:2823: result: $AWK" >&5
 echo "${ECHO_T}$AWK" >&6
 else
-  echo "$as_me:2824: result: no" >&5
+  echo "$as_me:2826: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2840,7 +2842,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:2843: checking for a BSD compatible install" >&5
+echo "$as_me:2845: 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
@@ -2889,7 +2891,7 @@
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:2892: result: $INSTALL" >&5
+echo "$as_me:2894: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -2900,14 +2902,14 @@
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-echo "$as_me:2903: checking whether ln -s works" >&5
+echo "$as_me:2905: 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:2907: result: yes" >&5
+  echo "$as_me:2909: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:2910: result: no, using $LN_S" >&5
+  echo "$as_me:2912: result: no, using $LN_S" >&5
 echo "${ECHO_T}no, using $LN_S" >&6
 fi
 
@@ -2928,7 +2930,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:2931: checking for $ac_word" >&5
+echo "$as_me:2933: 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
@@ -2943,7 +2945,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LINT="$ac_prog"
-echo "$as_me:2946: found $ac_dir/$ac_word" >&5
+echo "$as_me:2948: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2951,10 +2953,10 @@
 fi
 LINT=$ac_cv_prog_LINT
 if test -n "$LINT"; then
-  echo "$as_me:2954: result: $LINT" >&5
+  echo "$as_me:2956: result: $LINT" >&5
 echo "${ECHO_T}$LINT" >&6
 else
-  echo "$as_me:2957: result: no" >&5
+  echo "$as_me:2959: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2962,21 +2964,24 @@
 done
 
 case "x$LINT" in
+(xlint|x*/lint) # NetBSD 10
+	test -z "$LINT_OPTS" && LINT_OPTS="-chapbrxzgFS -v -Ac11"
+	;;
 (xcppcheck|x*/cppcheck)
-	test -z "$LINT_OPTS" && LINT_OPTS="--enable=all"
+	test -z "$LINT_OPTS" && LINT_OPTS="--enable=all -D__CPPCHECK__"
 	;;
 esac
 
 ###	checks for compiler characteristics
 
-echo "$as_me:2972: checking if the POSIX test-macros are already defined" >&5
+echo "$as_me:2977: 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 2979 "configure"
+#line 2984 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -2995,16 +3000,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2998: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3003: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3001: \$? = $ac_status" >&5
+  echo "$as_me:3006: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3004: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3009: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3007: \$? = $ac_status" >&5
+  echo "$as_me:3012: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_visible=no
 else
@@ -3015,7 +3020,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:3018: result: $cf_cv_posix_visible" >&5
+echo "$as_me:3023: result: $cf_cv_posix_visible" >&5
 echo "${ECHO_T}$cf_cv_posix_visible" >&6
 
 if test "$cf_cv_posix_visible" = no; then
@@ -3057,14 +3062,14 @@
 
 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
 
-echo "$as_me:3060: checking if this is the GNU C library" >&5
+echo "$as_me:3065: 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 3067 "configure"
+#line 3072 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -3083,16 +3088,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3086: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3091: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3089: \$? = $ac_status" >&5
+  echo "$as_me:3094: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3092: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3097: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3095: \$? = $ac_status" >&5
+  echo "$as_me:3100: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library=yes
 else
@@ -3103,7 +3108,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:3106: result: $cf_cv_gnu_library" >&5
+echo "$as_me:3111: result: $cf_cv_gnu_library" >&5
 echo "${ECHO_T}$cf_cv_gnu_library" >&6
 
 if test x$cf_cv_gnu_library = xyes; then
@@ -3111,7 +3116,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:3114: checking if _DEFAULT_SOURCE can be used as a basis" >&5
+	echo "$as_me:3119: 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
@@ -3123,7 +3128,7 @@
 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 3126 "configure"
+#line 3131 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -3142,16 +3147,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3145: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3150: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3148: \$? = $ac_status" >&5
+  echo "$as_me:3153: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3151: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3156: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3154: \$? = $ac_status" >&5
+  echo "$as_me:3159: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library_219=yes
 else
@@ -3163,12 +3168,12 @@
 		CPPFLAGS="$cf_save"
 
 fi
-echo "$as_me:3166: result: $cf_cv_gnu_library_219" >&5
+echo "$as_me:3171: 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:3171: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
+		echo "$as_me:3176: 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
@@ -3273,7 +3278,7 @@
 fi
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 3276 "configure"
+#line 3281 "configure"
 #include "confdefs.h"
 
 				#include <limits.h>
@@ -3293,16 +3298,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3296: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3301: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3299: \$? = $ac_status" >&5
+  echo "$as_me:3304: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3302: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3307: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3305: \$? = $ac_status" >&5
+  echo "$as_me:3310: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_dftsrc_219=yes
 else
@@ -3313,7 +3318,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:3316: result: $cf_cv_gnu_dftsrc_219" >&5
+echo "$as_me:3321: 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
@@ -3322,14 +3327,14 @@
 
 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
 
-		echo "$as_me:3325: checking if we must define _GNU_SOURCE" >&5
+		echo "$as_me:3330: 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 3332 "configure"
+#line 3337 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -3344,16 +3349,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3347: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3352: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3350: \$? = $ac_status" >&5
+  echo "$as_me:3355: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3353: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3358: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3356: \$? = $ac_status" >&5
+  echo "$as_me:3361: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -3460,7 +3465,7 @@
 fi
 
 			 cat >"conftest.$ac_ext" <<_ACEOF
-#line 3463 "configure"
+#line 3468 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -3475,16 +3480,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3478: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3483: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3481: \$? = $ac_status" >&5
+  echo "$as_me:3486: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3484: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3489: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3487: \$? = $ac_status" >&5
+  echo "$as_me:3492: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -3499,12 +3504,12 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:3502: result: $cf_cv_gnu_source" >&5
+echo "$as_me:3507: 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:3507: checking if we should also define _DEFAULT_SOURCE" >&5
+		echo "$as_me:3512: 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
@@ -3514,7 +3519,7 @@
 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 3517 "configure"
+#line 3522 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -3529,16 +3534,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3532: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3537: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3535: \$? = $ac_status" >&5
+  echo "$as_me:3540: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3538: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3543: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3541: \$? = $ac_status" >&5
+  echo "$as_me:3546: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_default_source=no
 else
@@ -3549,7 +3554,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:3552: result: $cf_cv_default_source" >&5
+echo "$as_me:3557: result: $cf_cv_default_source" >&5
 echo "${ECHO_T}$cf_cv_default_source" >&6
 			if test "$cf_cv_default_source" = yes
 			then
@@ -3564,6 +3569,9 @@
 fi
 
 	;;
+linux*musl)
+	cf_xopen_source="-D_BSD_SOURCE"
+	;;
 (minix*)
 	cf_xopen_source="-D_NETBSD_SOURCE" # POSIX.1-2001 features are ifdef'd with this...
 	;;
@@ -3586,16 +3594,16 @@
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:3589: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:3597: 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}:3595: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:3603: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 3598 "configure"
+#line 3606 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -3610,16 +3618,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3613: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3621: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3616: \$? = $ac_status" >&5
+  echo "$as_me:3624: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3619: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3627: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3622: \$? = $ac_status" >&5
+  echo "$as_me:3630: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -3640,7 +3648,7 @@
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 3643 "configure"
+#line 3651 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -3655,16 +3663,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3658: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3666: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3661: \$? = $ac_status" >&5
+  echo "$as_me:3669: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3664: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3672: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3667: \$? = $ac_status" >&5
+  echo "$as_me:3675: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -3675,7 +3683,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:3678: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:3686: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -3683,10 +3691,10 @@
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:3686: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:3694: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 3689 "configure"
+#line 3697 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -3701,16 +3709,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3704: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3712: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3707: \$? = $ac_status" >&5
+  echo "$as_me:3715: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3710: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3718: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3713: \$? = $ac_status" >&5
+  echo "$as_me:3721: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -3726,7 +3734,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:3729: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:3737: 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
@@ -3843,7 +3851,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:3846: WARNING: this system does not provide usable locale support" >&5
+	{ echo "$as_me:3854: 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
@@ -3875,14 +3883,14 @@
 	;;
 (*)
 
-echo "$as_me:3878: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:3886: 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 3885 "configure"
+#line 3893 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -3900,16 +3908,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3903: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3911: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3906: \$? = $ac_status" >&5
+  echo "$as_me:3914: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3909: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3917: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3912: \$? = $ac_status" >&5
+  echo "$as_me:3920: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -3921,7 +3929,7 @@
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 3924 "configure"
+#line 3932 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -3939,16 +3947,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3942: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3950: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3945: \$? = $ac_status" >&5
+  echo "$as_me:3953: \$? = $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:3956: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3951: \$? = $ac_status" >&5
+  echo "$as_me:3959: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -3963,7 +3971,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:3966: result: $cf_cv_xopen_source" >&5
+echo "$as_me:3974: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -4123,16 +4131,16 @@
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:4126: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:4134: 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}:4132: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:4140: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 4135 "configure"
+#line 4143 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4147,16 +4155,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4150: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4158: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4153: \$? = $ac_status" >&5
+  echo "$as_me:4161: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4156: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4164: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4159: \$? = $ac_status" >&5
+  echo "$as_me:4167: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -4177,7 +4185,7 @@
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 4180 "configure"
+#line 4188 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4192,16 +4200,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4195: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4203: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4198: \$? = $ac_status" >&5
+  echo "$as_me:4206: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4201: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4209: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4204: \$? = $ac_status" >&5
+  echo "$as_me:4212: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -4212,7 +4220,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:4215: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:4223: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -4220,10 +4228,10 @@
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:4223: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:4231: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 4226 "configure"
+#line 4234 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4238,16 +4246,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4241: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4249: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4244: \$? = $ac_status" >&5
+  echo "$as_me:4252: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4247: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4255: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4250: \$? = $ac_status" >&5
+  echo "$as_me:4258: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -4263,7 +4271,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:4266: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:4274: 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
@@ -4376,10 +4384,10 @@
 	if test "$cf_cv_xopen_source" = no ; then
 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
 
-echo "${as_me:-configure}:4379: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+echo "${as_me:-configure}:4387: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 4382 "configure"
+#line 4390 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -4397,23 +4405,23 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4400: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4408: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4403: \$? = $ac_status" >&5
+  echo "$as_me:4411: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4406: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4414: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4409: \$? = $ac_status" >&5
+  echo "$as_me:4417: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-			{ echo "$as_me:4416: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+			{ echo "$as_me:4424: 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
@@ -4436,7 +4444,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}:4439: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+echo "${as_me:-configure}:4447: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
 
 	CFLAGS="$cf_old_cflag"
 done
@@ -4448,7 +4456,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}:4451: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:4459: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
 
 	CPPFLAGS="$cf_old_cflag"
 done
@@ -4536,7 +4544,7 @@
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:4539: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:4547: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -4546,7 +4554,7 @@
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:4549: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:4557: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -4556,7 +4564,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}:4559: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:4567: 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"
@@ -4568,10 +4576,10 @@
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-	echo "$as_me:4571: checking if _XOPEN_SOURCE really is set" >&5
+	echo "$as_me:4579: 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 4574 "configure"
+#line 4582 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -4586,16 +4594,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4589: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4597: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4592: \$? = $ac_status" >&5
+  echo "$as_me:4600: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4595: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4603: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4598: \$? = $ac_status" >&5
+  echo "$as_me:4606: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else
@@ -4604,12 +4612,12 @@
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:4607: result: $cf_XOPEN_SOURCE_set" >&5
+	echo "$as_me:4615: 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 4612 "configure"
+#line 4620 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -4624,16 +4632,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4627: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4635: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4630: \$? = $ac_status" >&5
+  echo "$as_me:4638: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4633: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4641: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4636: \$? = $ac_status" >&5
+  echo "$as_me:4644: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set_ok=yes
 else
@@ -4644,19 +4652,19 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_XOPEN_SOURCE_set_ok" = no
 		then
-			{ echo "$as_me:4647: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+			{ echo "$as_me:4655: WARNING: _XOPEN_SOURCE is lower than requested" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
 		fi
 	else
 
-echo "$as_me:4652: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:4660: 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 4659 "configure"
+#line 4667 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -4674,16 +4682,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4677: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4685: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4680: \$? = $ac_status" >&5
+  echo "$as_me:4688: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4683: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4691: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4686: \$? = $ac_status" >&5
+  echo "$as_me:4694: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -4695,7 +4703,7 @@
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 4698 "configure"
+#line 4706 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -4713,16 +4721,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4716: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4724: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4719: \$? = $ac_status" >&5
+  echo "$as_me:4727: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4722: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4730: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4725: \$? = $ac_status" >&5
+  echo "$as_me:4733: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -4737,7 +4745,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:4740: result: $cf_cv_xopen_source" >&5
+echo "$as_me:4748: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -4884,14 +4892,14 @@
 fi
 fi # cf_cv_posix_visible
 
-echo "$as_me:4887: checking if SIGWINCH is defined" >&5
+echo "$as_me:4895: 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 4894 "configure"
+#line 4902 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -4906,23 +4914,23 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4909: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4917: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4912: \$? = $ac_status" >&5
+  echo "$as_me:4920: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4915: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4923: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4918: \$? = $ac_status" >&5
+  echo "$as_me:4926: \$? = $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 4925 "configure"
+#line 4933 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -4940,16 +4948,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4943: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4951: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4946: \$? = $ac_status" >&5
+  echo "$as_me:4954: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4949: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4957: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4952: \$? = $ac_status" >&5
+  echo "$as_me:4960: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_define_sigwinch=maybe
 else
@@ -4963,11 +4971,11 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:4966: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:4974: 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:4970: checking for actual SIGWINCH definition" >&5
+echo "$as_me:4978: 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
@@ -4978,7 +4986,7 @@
 while test "$cf_sigwinch" != 1
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 4981 "configure"
+#line 4989 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -5000,16 +5008,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5003: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5011: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5006: \$? = $ac_status" >&5
+  echo "$as_me:5014: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5009: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5017: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5012: \$? = $ac_status" >&5
+  echo "$as_me:5020: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fixup_sigwinch=$cf_sigwinch
 	 break
@@ -5023,7 +5031,7 @@
 done
 
 fi
-echo "$as_me:5026: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:5034: result: $cf_cv_fixup_sigwinch" >&5
 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
 
 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
@@ -5033,13 +5041,13 @@
 
 ###	checks for header files
 
-echo "$as_me:5036: checking for ANSI C header files" >&5
+echo "$as_me:5044: 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 5042 "configure"
+#line 5050 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -5047,13 +5055,13 @@
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:5050: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:5058: \"$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:5056: \$? = $ac_status" >&5
+  echo "$as_me:5064: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5075,7 +5083,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 5078 "configure"
+#line 5086 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -5093,7 +5101,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 5096 "configure"
+#line 5104 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -5114,7 +5122,7 @@
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5117 "configure"
+#line 5125 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -5140,15 +5148,15 @@
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:5143: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5151: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5146: \$? = $ac_status" >&5
+  echo "$as_me:5154: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:5148: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5156: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5151: \$? = $ac_status" >&5
+  echo "$as_me:5159: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -5161,7 +5169,7 @@
 fi
 fi
 fi
-echo "$as_me:5164: result: $ac_cv_header_stdc" >&5
+echo "$as_me:5172: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -5177,28 +5185,28 @@
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:5180: checking for $ac_header" >&5
+echo "$as_me:5188: 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 5186 "configure"
+#line 5194 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5192: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5200: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5195: \$? = $ac_status" >&5
+  echo "$as_me:5203: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5198: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5206: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5201: \$? = $ac_status" >&5
+  echo "$as_me:5209: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -5208,7 +5216,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:5211: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:5219: 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
@@ -5218,13 +5226,13 @@
 fi
 done
 
-echo "$as_me:5221: checking whether exit is declared" >&5
+echo "$as_me:5229: checking whether exit is declared" >&5
 echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_exit+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5227 "configure"
+#line 5235 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -5239,16 +5247,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5242: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5250: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5245: \$? = $ac_status" >&5
+  echo "$as_me:5253: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5248: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5256: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5251: \$? = $ac_status" >&5
+  echo "$as_me:5259: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_have_decl_exit=yes
 else
@@ -5258,7 +5266,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:5261: result: $ac_cv_have_decl_exit" >&5
+echo "$as_me:5269: result: $ac_cv_have_decl_exit" >&5
 echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
 
 for ac_header in \
@@ -5272,23 +5280,23 @@
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:5275: checking for $ac_header" >&5
+echo "$as_me:5283: 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 5281 "configure"
+#line 5289 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:5285: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:5293: \"$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:5291: \$? = $ac_status" >&5
+  echo "$as_me:5299: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5307,7 +5315,7 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:5310: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:5318: 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
@@ -5317,13 +5325,13 @@
 fi
 done
 
-echo "$as_me:5320: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:5328: 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 5326 "configure"
+#line 5334 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -5339,16 +5347,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5342: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5350: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5345: \$? = $ac_status" >&5
+  echo "$as_me:5353: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5348: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5356: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5351: \$? = $ac_status" >&5
+  echo "$as_me:5359: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
@@ -5358,7 +5366,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:5361: result: $ac_cv_header_time" >&5
+echo "$as_me:5369: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -5368,13 +5376,13 @@
 
 fi
 
-echo "$as_me:5371: checking for nl_langinfo and CODESET" >&5
+echo "$as_me:5379: 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 5377 "configure"
+#line 5385 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -5388,16 +5396,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:5391: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5399: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5394: \$? = $ac_status" >&5
+  echo "$as_me:5402: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:5397: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5405: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5400: \$? = $ac_status" >&5
+  echo "$as_me:5408: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   am_cv_langinfo_codeset=yes
 else
@@ -5408,7 +5416,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:5411: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:5419: result: $am_cv_langinfo_codeset" >&5
 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
 	if test "$am_cv_langinfo_codeset" = yes; then
 
@@ -5420,7 +5428,7 @@
 
 ###	checks for typedefs
 
-echo "$as_me:5423: checking for signal global datatype" >&5
+echo "$as_me:5431: 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
@@ -5432,7 +5440,7 @@
 		"int"
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 5435 "configure"
+#line 5443 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -5456,16 +5464,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5459: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5467: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5462: \$? = $ac_status" >&5
+  echo "$as_me:5470: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5465: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5473: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5468: \$? = $ac_status" >&5
+  echo "$as_me:5476: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sig_atomic_t=$cf_type
 else
@@ -5479,20 +5487,20 @@
 
 fi
 
-echo "$as_me:5482: result: $cf_cv_sig_atomic_t" >&5
+echo "$as_me:5490: 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:5489: checking for time_t" >&5
+echo "$as_me:5497: 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 5495 "configure"
+#line 5503 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -5507,16 +5515,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5510: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5518: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5513: \$? = $ac_status" >&5
+  echo "$as_me:5521: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5516: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5524: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5519: \$? = $ac_status" >&5
+  echo "$as_me:5527: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_time_t=yes
 else
@@ -5526,7 +5534,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:5529: result: $ac_cv_type_time_t" >&5
+echo "$as_me:5537: 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
   :
@@ -5538,14 +5546,14 @@
 
 fi
 
-echo "$as_me:5541: checking for cc_t in <termios.h> or <termio.h>" >&5
+echo "$as_me:5549: 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 5548 "configure"
+#line 5556 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -5565,16 +5573,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5568: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5576: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5571: \$? = $ac_status" >&5
+  echo "$as_me:5579: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5574: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5582: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5577: \$? = $ac_status" >&5
+  echo "$as_me:5585: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_type_cc_t=yes
 else
@@ -5586,21 +5594,21 @@
 
 fi
 
-echo "$as_me:5589: result: $cf_cv_type_cc_t" >&5
+echo "$as_me:5597: 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:5596: checking for nfds_t in <poll.h>" >&5
+echo "$as_me:5604: checking for nfds_t in <poll.h>" >&5
 echo $ECHO_N "checking for nfds_t in <poll.h>... $ECHO_C" >&6
 if test "${cf_cv_type_nfds_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 5603 "configure"
+#line 5611 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -5615,16 +5623,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5618: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5626: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5621: \$? = $ac_status" >&5
+  echo "$as_me:5629: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5624: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5632: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5627: \$? = $ac_status" >&5
+  echo "$as_me:5635: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_type_nfds_t=yes
 else
@@ -5636,20 +5644,20 @@
 
 fi
 
-echo "$as_me:5639: result: $cf_cv_type_nfds_t" >&5
+echo "$as_me:5647: result: $cf_cv_type_nfds_t" >&5
 echo "${ECHO_T}$cf_cv_type_nfds_t" >&6
 test $cf_cv_type_nfds_t = no &&
 cat >>confdefs.h <<\EOF
 #define nfds_t unsigned
 EOF
 
-echo "$as_me:5646: checking for mode_t" >&5
+echo "$as_me:5654: 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 5652 "configure"
+#line 5660 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -5664,16 +5672,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5667: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5675: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5670: \$? = $ac_status" >&5
+  echo "$as_me:5678: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5673: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5681: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5676: \$? = $ac_status" >&5
+  echo "$as_me:5684: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_mode_t=yes
 else
@@ -5683,7 +5691,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:5686: result: $ac_cv_type_mode_t" >&5
+echo "$as_me:5694: 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
   :
@@ -5695,13 +5703,13 @@
 
 fi
 
-echo "$as_me:5698: checking for pid_t" >&5
+echo "$as_me:5706: 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 5704 "configure"
+#line 5712 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -5716,16 +5724,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5719: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5727: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5722: \$? = $ac_status" >&5
+  echo "$as_me:5730: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5725: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5733: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5728: \$? = $ac_status" >&5
+  echo "$as_me:5736: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -5735,7 +5743,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:5738: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:5746: 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
   :
@@ -5747,13 +5755,13 @@
 
 fi
 
-echo "$as_me:5750: checking for uid_t in sys/types.h" >&5
+echo "$as_me:5758: 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 5756 "configure"
+#line 5764 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -5767,7 +5775,7 @@
 rm -rf conftest*
 
 fi
-echo "$as_me:5770: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:5778: 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
 
@@ -5781,13 +5789,13 @@
 
 fi
 
-echo "$as_me:5784: checking for off_t" >&5
+echo "$as_me:5792: 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 5790 "configure"
+#line 5798 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -5802,16 +5810,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5805: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5813: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5808: \$? = $ac_status" >&5
+  echo "$as_me:5816: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5811: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5819: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5814: \$? = $ac_status" >&5
+  echo "$as_me:5822: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -5821,7 +5829,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:5824: result: $ac_cv_type_off_t" >&5
+echo "$as_me:5832: 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
   :
@@ -5853,13 +5861,13 @@
 	wcwidth
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:5856: checking for $ac_func" >&5
+echo "$as_me:5864: 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 5862 "configure"
+#line 5870 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -5890,16 +5898,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:5893: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5901: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5896: \$? = $ac_status" >&5
+  echo "$as_me:5904: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:5899: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5907: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5902: \$? = $ac_status" >&5
+  echo "$as_me:5910: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -5909,7 +5917,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:5912: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:5920: 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
@@ -5920,13 +5928,13 @@
 done
 
 cf_save_libs="$LIBS"
-echo "$as_me:5923: checking for clock_gettime" >&5
+echo "$as_me:5931: checking for clock_gettime" >&5
 echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6
 if test "${ac_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5929 "configure"
+#line 5937 "configure"
 #include "confdefs.h"
 #define clock_gettime autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -5957,16 +5965,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:5960: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5968: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5963: \$? = $ac_status" >&5
+  echo "$as_me:5971: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:5966: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5974: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5969: \$? = $ac_status" >&5
+  echo "$as_me:5977: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_clock_gettime=yes
 else
@@ -5976,12 +5984,12 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:5979: result: $ac_cv_func_clock_gettime" >&5
+echo "$as_me:5987: result: $ac_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6
 if test "$ac_cv_func_clock_gettime" = yes; then
   cf_cv_test_clock_gettime=yes
 else
-  echo "$as_me:5984: checking for clock_gettime in -lrt" >&5
+  echo "$as_me:5992: checking for clock_gettime in -lrt" >&5
 echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
 if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5989,7 +5997,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 5992 "configure"
+#line 6000 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6008,16 +6016,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6011: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6019: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6014: \$? = $ac_status" >&5
+  echo "$as_me:6022: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6017: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6025: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6020: \$? = $ac_status" >&5
+  echo "$as_me:6028: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_rt_clock_gettime=yes
 else
@@ -6028,7 +6036,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6031: result: $ac_cv_lib_rt_clock_gettime" >&5
+echo "$as_me:6039: result: $ac_cv_lib_rt_clock_gettime" >&5
 echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
 if test "$ac_cv_lib_rt_clock_gettime" = yes; then
   LIBS="-lrt $LIBS"
@@ -6040,14 +6048,14 @@
 fi
 
 if test "$cf_cv_test_clock_gettime" = yes ; then
-echo "$as_me:6043: checking if clock_gettime links" >&5
+echo "$as_me:6051: checking if clock_gettime links" >&5
 echo $ECHO_N "checking if clock_gettime links... $ECHO_C" >&6
 if test "${cf_cv_func_clock_gettime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 6050 "configure"
+#line 6058 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -6065,16 +6073,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6068: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6076: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6071: \$? = $ac_status" >&5
+  echo "$as_me:6079: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6074: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6082: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6077: \$? = $ac_status" >&5
+  echo "$as_me:6085: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_clock_gettime=yes
 else
@@ -6085,7 +6093,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:6088: result: $cf_cv_func_clock_gettime" >&5
+echo "$as_me:6096: result: $cf_cv_func_clock_gettime" >&5
 echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6
 else
 	cf_cv_func_clock_gettime=no
@@ -6099,13 +6107,13 @@
 EOF
 
 else
-echo "$as_me:6102: checking for gettimeofday" >&5
+echo "$as_me:6110: checking for gettimeofday" >&5
 echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6
 if test "${ac_cv_func_gettimeofday+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6108 "configure"
+#line 6116 "configure"
 #include "confdefs.h"
 #define gettimeofday autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -6136,16 +6144,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6139: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6147: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6142: \$? = $ac_status" >&5
+  echo "$as_me:6150: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6145: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6153: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6148: \$? = $ac_status" >&5
+  echo "$as_me:6156: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gettimeofday=yes
 else
@@ -6155,7 +6163,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:6158: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:6166: result: $ac_cv_func_gettimeofday" >&5
 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test "$ac_cv_func_gettimeofday" = yes; then
 
@@ -6165,7 +6173,7 @@
 
 else
 
-echo "$as_me:6168: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:6176: checking for gettimeofday in -lbsd" >&5
 echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6
 if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6173,7 +6181,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6176 "configure"
+#line 6184 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6192,16 +6200,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6195: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6203: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6198: \$? = $ac_status" >&5
+  echo "$as_me:6206: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6201: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6209: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6204: \$? = $ac_status" >&5
+  echo "$as_me:6212: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gettimeofday=yes
 else
@@ -6212,7 +6220,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6215: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:6223: result: $ac_cv_lib_bsd_gettimeofday" >&5
 echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6
 if test "$ac_cv_lib_bsd_gettimeofday" = yes; then
 
@@ -6241,14 +6249,14 @@
 fi
 fi
 
-echo "$as_me:6244: checking for strftime function" >&5
+echo "$as_me:6252: checking for strftime function" >&5
 echo $ECHO_N "checking for strftime function... $ECHO_C" >&6
 if test "${cf_cv_func_strftime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6251 "configure"
+#line 6259 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -6271,16 +6279,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6274: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6282: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6277: \$? = $ac_status" >&5
+  echo "$as_me:6285: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6280: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6288: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6283: \$? = $ac_status" >&5
+  echo "$as_me:6291: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_strftime=yes
 else
@@ -6291,7 +6299,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:6294: result: $cf_cv_func_strftime" >&5
+echo "$as_me:6302: result: $cf_cv_func_strftime" >&5
 echo "${ECHO_T}$cf_cv_func_strftime" >&6
 
 test "$cf_cv_func_strftime" = yes &&
@@ -6304,23 +6312,23 @@
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6307: checking for $ac_header" >&5
+echo "$as_me:6315: 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 6313 "configure"
+#line 6321 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:6317: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:6325: \"$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:6323: \$? = $ac_status" >&5
+  echo "$as_me:6331: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6339,7 +6347,7 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:6342: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6350: 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
@@ -6349,7 +6357,7 @@
 fi
 done
 
-echo "$as_me:6352: checking for working mkstemp" >&5
+echo "$as_me:6360: 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
@@ -6360,7 +6368,7 @@
   cf_cv_func_mkstemp=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6363 "configure"
+#line 6371 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -6395,15 +6403,15 @@
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:6398: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6406: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6401: \$? = $ac_status" >&5
+  echo "$as_me:6409: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:6403: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6411: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6406: \$? = $ac_status" >&5
+  echo "$as_me:6414: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_mkstemp=yes
 
@@ -6418,16 +6426,16 @@
 fi
 
 fi
-echo "$as_me:6421: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:6429: 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:6424: checking for mkstemp" >&5
+	echo "$as_me:6432: 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 6430 "configure"
+#line 6438 "configure"
 #include "confdefs.h"
 #define mkstemp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -6458,16 +6466,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6461: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6469: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6464: \$? = $ac_status" >&5
+  echo "$as_me:6472: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6467: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6475: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6470: \$? = $ac_status" >&5
+  echo "$as_me:6478: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_mkstemp=yes
 else
@@ -6477,7 +6485,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:6480: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:6488: result: $ac_cv_func_mkstemp" >&5
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi
@@ -6489,14 +6497,14 @@
 
 fi
 
-echo "$as_me:6492: checking if setitimer is available" >&5
+echo "$as_me:6500: checking if setitimer is available" >&5
 echo $ECHO_N "checking if setitimer is available... $ECHO_C" >&6
 if test "${cf_cv_func_setitimer+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6499 "configure"
+#line 6507 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -6516,16 +6524,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6519: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6527: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6522: \$? = $ac_status" >&5
+  echo "$as_me:6530: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6525: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6533: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6528: \$? = $ac_status" >&5
+  echo "$as_me:6536: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_setitimer=yes
 else
@@ -6536,7 +6544,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:6539: result: $cf_cv_func_setitimer" >&5
+echo "$as_me:6547: result: $cf_cv_func_setitimer" >&5
 echo "${ECHO_T}$cf_cv_func_setitimer" >&6
 test "$cf_cv_func_setitimer" != no &&
 cat >>confdefs.h <<\EOF
@@ -6546,23 +6554,23 @@
 for ac_header in lastlog.h paths.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6549: checking for $ac_header" >&5
+echo "$as_me:6557: 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 6555 "configure"
+#line 6563 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:6559: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:6567: \"$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:6565: \$? = $ac_status" >&5
+  echo "$as_me:6573: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6581,7 +6589,7 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:6584: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6592: 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
@@ -6591,14 +6599,14 @@
 fi
 done
 
-echo "$as_me:6594: checking for lastlog path" >&5
+echo "$as_me:6602: 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 6601 "configure"
+#line 6609 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -6618,16 +6626,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6621: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6629: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6624: \$? = $ac_status" >&5
+  echo "$as_me:6632: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6627: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6635: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6630: \$? = $ac_status" >&5
+  echo "$as_me:6638: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_path_lastlog="_PATH_LASTLOG"
 else
@@ -6642,14 +6650,14 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:6645: result: $cf_cv_path_lastlog" >&5
+echo "$as_me:6653: 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:6652: checking for utmp implementation" >&5
+echo "$as_me:6660: 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
@@ -6666,7 +6674,7 @@
 #endif
 "
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 6669 "configure"
+#line 6677 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -6682,16 +6690,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6685: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6693: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6688: \$? = $ac_status" >&5
+  echo "$as_me:6696: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6691: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6699: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6694: \$? = $ac_status" >&5
+  echo "$as_me:6702: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -6700,7 +6708,7 @@
 cat "conftest.$ac_ext" >&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 6703 "configure"
+#line 6711 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -6716,16 +6724,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6719: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6727: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6722: \$? = $ac_status" >&5
+  echo "$as_me:6730: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6725: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6733: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6728: \$? = $ac_status" >&5
+  echo "$as_me:6736: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -6740,7 +6748,7 @@
 done
 
 fi
-echo "$as_me:6743: result: $cf_cv_have_utmp" >&5
+echo "$as_me:6751: result: $cf_cv_have_utmp" >&5
 echo "${ECHO_T}$cf_cv_have_utmp" >&6
 
 if test "$cf_cv_have_utmp" != no ; then
@@ -6755,14 +6763,14 @@
 EOF
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:6758: checking if ${cf_cv_have_utmp}.ut_host is declared" >&5
+echo "$as_me:6766: 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 6765 "configure"
+#line 6773 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -6779,16 +6787,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6782: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6790: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6785: \$? = $ac_status" >&5
+  echo "$as_me:6793: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6788: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6796: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6791: \$? = $ac_status" >&5
+  echo "$as_me:6799: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_host=yes
 else
@@ -6800,7 +6808,7 @@
 
 fi
 
-echo "$as_me:6803: result: $cf_cv_have_utmp_ut_host" >&5
+echo "$as_me:6811: 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
@@ -6810,14 +6818,14 @@
 fi
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:6813: checking if ${cf_cv_have_utmp}.ut_syslen is declared" >&5
+echo "$as_me:6821: 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 6820 "configure"
+#line 6828 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -6834,16 +6842,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6837: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6845: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6840: \$? = $ac_status" >&5
+  echo "$as_me:6848: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6843: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6851: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6846: \$? = $ac_status" >&5
+  echo "$as_me:6854: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_syslen=yes
 else
@@ -6855,7 +6863,7 @@
 
 fi
 
-echo "$as_me:6858: result: $cf_cv_have_utmp_ut_syslen" >&5
+echo "$as_me:6866: 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
@@ -6865,7 +6873,7 @@
 fi
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:6868: checking if ${cf_cv_have_utmp}.ut_name is declared" >&5
+echo "$as_me:6876: 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
@@ -6882,7 +6890,7 @@
 "
 for cf_header in ut_name ut_user ; do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 6885 "configure"
+#line 6893 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -6898,16 +6906,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6901: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6909: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6904: \$? = $ac_status" >&5
+  echo "$as_me:6912: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6907: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6915: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6910: \$? = $ac_status" >&5
+  echo "$as_me:6918: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_name=$cf_header
 	 break
@@ -6919,12 +6927,12 @@
 done
 
 fi
-echo "$as_me:6922: result: $cf_cv_have_utmp_ut_name" >&5
+echo "$as_me:6930: 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:6927: error: Cannot find declaration for ut.ut_name" >&5
+	{ { echo "$as_me:6935: 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; }; }
 	;;
@@ -6939,7 +6947,7 @@
 fi
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:6942: checking for exit-status in $cf_cv_have_utmp" >&5
+echo "$as_me:6950: 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
@@ -6952,7 +6960,7 @@
 	ut_exit.ut_exit
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6955 "configure"
+#line 6963 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -6969,16 +6977,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6972: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6980: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6975: \$? = $ac_status" >&5
+  echo "$as_me:6983: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6978: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6986: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6981: \$? = $ac_status" >&5
+  echo "$as_me:6989: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_xstatus=$cf_result
 	 break
@@ -6991,7 +6999,7 @@
 done
 
 fi
-echo "$as_me:6994: result: $cf_cv_have_utmp_ut_xstatus" >&5
+echo "$as_me:7002: 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
 
@@ -7007,14 +7015,14 @@
 fi
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:7010: checking if ${cf_cv_have_utmp}.ut_xtime is declared" >&5
+echo "$as_me:7018: 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 7017 "configure"
+#line 7025 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -7031,23 +7039,23 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7034: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7042: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7037: \$? = $ac_status" >&5
+  echo "$as_me:7045: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7040: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7048: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7043: \$? = $ac_status" >&5
+  echo "$as_me:7051: \$? = $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 7050 "configure"
+#line 7058 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -7064,16 +7072,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7067: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7075: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7070: \$? = $ac_status" >&5
+  echo "$as_me:7078: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7073: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7081: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7076: \$? = $ac_status" >&5
+  echo "$as_me:7084: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_xtime=define
 else
@@ -7087,7 +7095,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:7090: result: $cf_cv_have_utmp_ut_xtime" >&5
+echo "$as_me:7098: 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
 
@@ -7106,14 +7114,14 @@
 fi
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:7109: checking if ${cf_cv_have_utmp}.ut_session is declared" >&5
+echo "$as_me:7117: 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 7116 "configure"
+#line 7124 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -7130,16 +7138,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7133: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7141: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7136: \$? = $ac_status" >&5
+  echo "$as_me:7144: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7139: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7147: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7142: \$? = $ac_status" >&5
+  echo "$as_me:7150: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_session=yes
 else
@@ -7150,7 +7158,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:7153: result: $cf_cv_have_utmp_ut_session" >&5
+echo "$as_me:7161: 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
 
@@ -7161,7 +7169,7 @@
 fi
 fi
 
-echo "$as_me:7164: checking if $cf_cv_have_utmp is SYSV flavor" >&5
+echo "$as_me:7172: 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
@@ -7169,7 +7177,7 @@
 
 test "$cf_cv_have_utmp" = "utmp" && cf_prefix="ut" || cf_prefix="utx"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7172 "configure"
+#line 7180 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -7188,16 +7196,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7191: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7199: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7194: \$? = $ac_status" >&5
+  echo "$as_me:7202: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7197: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7205: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7200: \$? = $ac_status" >&5
+  echo "$as_me:7208: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sysv_utmp=yes
 else
@@ -7208,7 +7216,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:7211: result: $cf_cv_sysv_utmp" >&5
+echo "$as_me:7219: result: $cf_cv_sysv_utmp" >&5
 echo "${ECHO_T}$cf_cv_sysv_utmp" >&6
 test "$cf_cv_sysv_utmp" = yes &&
 cat >>confdefs.h <<\EOF
@@ -7220,23 +7228,23 @@
 for ac_header in lastlog.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:7223: checking for $ac_header" >&5
+echo "$as_me:7231: 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 7229 "configure"
+#line 7237 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:7233: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:7241: \"$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:7239: \$? = $ac_status" >&5
+  echo "$as_me:7247: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7255,7 +7263,7 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:7258: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:7266: 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
@@ -7265,7 +7273,7 @@
 fi
 done
 
-echo "$as_me:7268: checking for struct lastlog" >&5
+echo "$as_me:7276: 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
@@ -7276,7 +7284,7 @@
 cf_cv_struct_lastlog=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 7279 "configure"
+#line 7287 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -7291,15 +7299,15 @@
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:7294: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7302: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7297: \$? = $ac_status" >&5
+  echo "$as_me:7305: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:7299: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7307: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7302: \$? = $ac_status" >&5
+  echo "$as_me:7310: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 cf_cv_struct_lastlog=yes
@@ -7313,7 +7321,7 @@
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:7316: result: $cf_cv_struct_lastlog" >&5
+echo "$as_me:7324: result: $cf_cv_struct_lastlog" >&5
 echo "${ECHO_T}$cf_cv_struct_lastlog" >&6
 
 test $cf_cv_struct_lastlog != no &&
@@ -7326,23 +7334,23 @@
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:7329: checking for $ac_header" >&5
+echo "$as_me:7337: 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 7335 "configure"
+#line 7343 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:7339: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:7347: \"$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:7345: \$? = $ac_status" >&5
+  echo "$as_me:7353: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7361,7 +7369,7 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:7364: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:7372: 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
@@ -7371,14 +7379,14 @@
 fi
 done
 
-echo "$as_me:7374: checking if POSIX saved-ids are supported" >&5
+echo "$as_me:7382: 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 7381 "configure"
+#line 7389 "configure"
 #include "confdefs.h"
 
 #include <unistd.h>
@@ -7407,16 +7415,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7410: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7418: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7413: \$? = $ac_status" >&5
+  echo "$as_me:7421: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7416: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7424: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7419: \$? = $ac_status" >&5
+  echo "$as_me:7427: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_saved_ids=yes
 
@@ -7428,7 +7436,7 @@
   cf_cv_posix_saved_ids=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 7431 "configure"
+#line 7439 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -7442,15 +7450,15 @@
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:7445: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7453: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7448: \$? = $ac_status" >&5
+  echo "$as_me:7456: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:7450: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7458: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7453: \$? = $ac_status" >&5
+  echo "$as_me:7461: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_saved_ids=yes
 else
@@ -7466,7 +7474,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:7469: result: $cf_cv_posix_saved_ids" >&5
+echo "$as_me:7477: result: $cf_cv_posix_saved_ids" >&5
 echo "${ECHO_T}$cf_cv_posix_saved_ids" >&6
 
 test "$cf_cv_posix_saved_ids" = yes &&
@@ -7505,23 +7513,23 @@
 for ac_header in termcap.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:7508: checking for $ac_header" >&5
+echo "$as_me:7516: 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 7514 "configure"
+#line 7522 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:7518: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:7526: \"$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:7524: \$? = $ac_status" >&5
+  echo "$as_me:7532: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7540,7 +7548,7 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:7543: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:7551: 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
@@ -7557,7 +7565,7 @@
 extern int tgetent(char *, const char *);
 #endif"
 
-echo "$as_me:7560: checking if we want full tgetent function" >&5
+echo "$as_me:7568: 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.
@@ -7574,7 +7582,7 @@
 	cf_full_tgetent=yes
 
 fi;
-echo "$as_me:7577: result: $cf_full_tgetent" >&5
+echo "$as_me:7585: result: $cf_full_tgetent" >&5
 echo "${ECHO_T}$cf_full_tgetent" >&6
 
 if test "$cf_full_tgetent" = yes ; then
@@ -7583,7 +7591,7 @@
 	cf_test_message="tgetent"
 fi
 
-echo "$as_me:7586: checking for $cf_test_message function" >&5
+echo "$as_me:7594: 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
@@ -7622,7 +7630,7 @@
   echo "cross-compiling, cannot verify if a termcap/tgetent is present in $cf_termlib" 1>&5
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 7625 "configure"
+#line 7633 "configure"
 #include "confdefs.h"
 
 $cf_termcap_h
@@ -7639,15 +7647,15 @@
 	${cf_cv_main_return:-return} ($cf_TERMTST); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:7642: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7650: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7645: \$? = $ac_status" >&5
+  echo "$as_me:7653: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:7647: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7655: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7650: \$? = $ac_status" >&5
+  echo "$as_me:7658: \$? = $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
@@ -7668,7 +7676,7 @@
 LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:7671: result: $cf_cv_lib_tgetent" >&5
+echo "$as_me:7679: 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.
@@ -7700,7 +7708,7 @@
 
 	if test "$cf_full_tgetent" = no ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 7703 "configure"
+#line 7711 "configure"
 #include "confdefs.h"
 
 #include <termcap.h>
@@ -7716,16 +7724,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7719: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7727: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7722: \$? = $ac_status" >&5
+  echo "$as_me:7730: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7725: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7733: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7728: \$? = $ac_status" >&5
+  echo "$as_me:7736: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cat >>confdefs.h <<\EOF
 #define HAVE_TERMCAP_H 1
@@ -7743,7 +7751,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:7746: checking for partial tgetent function" >&5
+	echo "$as_me:7754: 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
@@ -7753,7 +7761,7 @@
 	for cf_termlib in $cf_TERMLIB ; do
 		LIBS="$cf_save_LIBS -l$cf_termlib"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 7756 "configure"
+#line 7764 "configure"
 #include "confdefs.h"
 $cf_termcap_h
 int
@@ -7765,16 +7773,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7768: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7776: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7771: \$? = $ac_status" >&5
+  echo "$as_me:7779: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7774: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7782: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7777: \$? = $ac_status" >&5
+  echo "$as_me:7785: \$? = $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"
@@ -7788,7 +7796,7 @@
 	LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:7791: result: $cf_cv_lib_part_tgetent" >&5
+echo "$as_me:7799: 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
@@ -7819,7 +7827,7 @@
 	fi
 fi
 
-echo "$as_me:7822: checking for X applications class" >&5
+echo "$as_me:7830: 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.
@@ -7832,23 +7840,102 @@
 
 case x$APP_CLASS in
 (*[/@,%]*)
-	{ echo "$as_me:7835: WARNING: X applications class cannot contain punctuation" >&5
+	{ echo "$as_me:7843: 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:7842: WARNING: X applications class must start with capital, ignoring $APP_CLASS" >&5
+	{ echo "$as_me:7850: 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:7848: result: $APP_CLASS" >&5
+echo "$as_me:7856: result: $APP_CLASS" >&5
 echo "${ECHO_T}$APP_CLASS" >&6
 
-echo "$as_me:7851: checking for directory to install resource files" >&5
+if test -f "$srcdir/config.guess" || test -f "$ac_aux_dir/config.guess" ; then
+	echo "$as_me:7860: checking target system type" >&5
+echo $ECHO_N "checking target system type... $ECHO_C" >&6
+if test "${ac_cv_target+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_target_alias=$target_alias
+test "x$ac_cv_target_alias" = "x" &&
+  ac_cv_target_alias=$ac_cv_host_alias
+ac_cv_target=`$ac_config_sub "$ac_cv_target_alias"` ||
+  { { echo "$as_me:7869: error: $ac_config_sub $ac_cv_target_alias failed" >&5
+echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
+   { (exit 1); exit 1; }; }
+
+fi
+echo "$as_me:7874: result: $ac_cv_target" >&5
+echo "${ECHO_T}$ac_cv_target" >&6
+target=$ac_cv_target
+target_cpu=`echo "$ac_cv_target" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+target_vendor=`echo "$ac_cv_target" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+target_os=`echo "$ac_cv_target" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+
+# The aliases save the names the user supplied, while $host etc.
+# will get canonicalized.
+test -n "$target_alias" &&
+  test "$program_prefix$program_suffix$program_transform_name" = \
+    NONENONEs,x,x, &&
+  program_prefix=${target_alias}-
+	system_name="$host_os"
+else
+	system_name="`(uname -s -r) 2>/dev/null`"
+	if test -z "$system_name" ; then
+		system_name="`(hostname) 2>/dev/null`"
+	fi
+fi
+test -n "$system_name" &&
+cat >>confdefs.h <<EOF
+#define SYSTEM_NAME "$system_name"
+EOF
+
+if test "${cf_cv_system_name+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cf_cv_system_name="$system_name"
+fi
+
+test -z "$system_name" && system_name="$cf_cv_system_name"
+test -n "$cf_cv_system_name" && echo "$as_me:7906: 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:7910: 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:7912: 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
+
+# Check whether --with-system-type or --without-system-type was given.
+if test "${with_system_type+set}" = set; then
+  withval="$with_system_type"
+  { echo "$as_me:7920: WARNING: overriding system type to $withval" >&5
+echo "$as_me: WARNING: overriding system type to $withval" >&2;}
+	cf_cv_system_name=$withval
+	host_os=$withval
+
+fi;
+
+case "$cf_cv_system_name" in
+(cygwin*|msys*|mingw32*|mingw64|os2*)
+	GLOB_FULLPATH_POSIX='/*'
+	GLOB_FULLPATH_OTHER='[a-zA-Z]:[\\/]*'
+	;;
+(*)
+	GLOB_FULLPATH_POSIX='/*'
+	GLOB_FULLPATH_OTHER=$GLOB_FULLPATH_POSIX
+	;;
+esac
+
+echo "$as_me:7938: 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.
@@ -7893,26 +7980,24 @@
 	cf_path_syntax="$ac_default_prefix"
 fi
 
-case ".$cf_path" in
-(.\$\(*\)*|.\'*\'*)
+case "x$cf_path" in
+(x\$\(*\)*|x\'*\'*)
 	;;
-(..|./*|.\\*)
+(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
 	;;
-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
-	;;
-(.\$\{*prefix\}*|.\$\{*dir\}*)
+(x\$\{*prefix\}*|x\$\{*dir\}*)
 	eval cf_path="$cf_path"
-	case ".$cf_path" in
-	(.NONE/*)
+	case "x$cf_path" in
+	(xNONE/*)
 		cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
 		;;
 	esac
 	;;
-(.no|.NONE/*)
+(xno|xNONE/*)
 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:7915: error: expected a pathname, not \"$cf_path\"" >&5
+	{ { echo "$as_me:8000: error: expected a pathname, not \"$cf_path\"" >&5
 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -7920,7 +8005,7 @@
 
 fi
 
-echo "$as_me:7923: result: $APPSDIR" >&5
+echo "$as_me:8008: result: $APPSDIR" >&5
 echo "${ECHO_T}$APPSDIR" >&6
 
 no_appsdir=
@@ -7931,7 +8016,7 @@
 	EXTRA_INSTALL_DIRS="$EXTRA_INSTALL_DIRS \$(APPSDIR)"
 fi
 
-echo "$as_me:7934: checking for the icon name" >&5
+echo "$as_me:8019: 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.
@@ -7947,10 +8032,10 @@
 	;;
 esac
 
-echo "$as_me:7950: result: $ICON_NAME" >&5
+echo "$as_me:8035: result: $ICON_NAME" >&5
 echo "${ECHO_T}$ICON_NAME" >&6
 
-echo "$as_me:7953: checking for icon symlink to use" >&5
+echo "$as_me:8038: 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.
@@ -7969,7 +8054,7 @@
 	;;
 esac
 
-echo "$as_me:7972: result: $ICON_SYMLINK" >&5
+echo "$as_me:8057: result: $ICON_SYMLINK" >&5
 echo "${ECHO_T}$ICON_SYMLINK" >&6
 
 # Install all icons except for the overused "terminal".
@@ -7985,20 +8070,20 @@
 	esac
 	test -n "$verbose" && echo "	adding $cf_icon_name to icon-list" 1>&6
 
-echo "${as_me:-configure}:7988: testing adding $cf_icon_name to icon-list ..." 1>&5
+echo "${as_me:-configure}:8073: 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}:7995: testing adding ${cf_icon_name}_48x48 to icon-list ..." 1>&5
+echo "${as_me:-configure}:8080: 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:8001: checking for directory to install pixmaps" >&5
+echo "$as_me:8086: 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.
@@ -8030,33 +8115,31 @@
 	cf_path_syntax="$ac_default_prefix"
 fi
 
-case ".$cf_path" in
-(.\$\(*\)*|.\'*\'*)
-	;;
-(..|./*|.\\*)
+case "x$cf_path" in
+(x\$\(*\)*|x\'*\'*)
 	;;
-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
+(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
 	;;
-(.\$\{*prefix\}*|.\$\{*dir\}*)
+(x\$\{*prefix\}*|x\$\{*dir\}*)
 	eval cf_path="$cf_path"
-	case ".$cf_path" in
-	(.NONE/*)
+	case "x$cf_path" in
+	(xNONE/*)
 		cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
 		;;
 	esac
 	;;
-(.no|.NONE/*)
+(xno|xNONE/*)
 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:8052: error: expected a pathname, not \"$cf_path\"" >&5
+	{ { echo "$as_me:8135: 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:8059: result: $PIXMAPDIR" >&5
+echo "$as_me:8142: result: $PIXMAPDIR" >&5
 echo "${ECHO_T}$PIXMAPDIR" >&6
 
 no_pixmapdir=
@@ -8067,7 +8150,7 @@
 	EXTRA_INSTALL_DIRS="$EXTRA_INSTALL_DIRS \$(PIXMAPDIR)"
 fi
 
-echo "$as_me:8070: checking for directory to install icons" >&5
+echo "$as_me:8153: 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.
@@ -8099,33 +8182,31 @@
 	cf_path_syntax="$ac_default_prefix"
 fi
 
-case ".$cf_path" in
-(.\$\(*\)*|.\'*\'*)
-	;;
-(..|./*|.\\*)
+case "x$cf_path" in
+(x\$\(*\)*|x\'*\'*)
 	;;
-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
+(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
 	;;
-(.\$\{*prefix\}*|.\$\{*dir\}*)
+(x\$\{*prefix\}*|x\$\{*dir\}*)
 	eval cf_path="$cf_path"
-	case ".$cf_path" in
-	(.NONE/*)
+	case "x$cf_path" in
+	(xNONE/*)
 		cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
 		;;
 	esac
 	;;
-(.no|.NONE/*)
+(xno|xNONE/*)
 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:8121: error: expected a pathname, not \"$cf_path\"" >&5
+	{ { echo "$as_me:8202: 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:8128: result: $ICONDIR" >&5
+echo "$as_me:8209: result: $ICONDIR" >&5
 echo "${ECHO_T}$ICONDIR" >&6
 
 no_icondir=
@@ -8136,7 +8217,7 @@
 	EXTRA_INSTALL_DIRS="$EXTRA_INSTALL_DIRS \$(ICONDIR)"
 fi
 
-echo "$as_me:8139: checking if icon theme should be used" >&5
+echo "$as_me:8220: 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.
@@ -8154,7 +8235,7 @@
 	ICON_THEME=hicolor
 	;;
 esac
-echo "$as_me:8157: result: $ICON_THEME" >&5
+echo "$as_me:8238: result: $ICON_THEME" >&5
 echo "${ECHO_T}$ICON_THEME" >&6
 
 if test "x$ICON_THEME" = xno
@@ -8163,14 +8244,14 @@
 	then
 		test -n "$verbose" && echo "	ignoring icondir without theme" 1>&6
 
-echo "${as_me:-configure}:8166: testing ignoring icondir without theme ..." 1>&5
+echo "${as_me:-configure}:8247: testing ignoring icondir without theme ..." 1>&5
 
 		no_icondir="#"
 	fi
 else
 	if test "x$ICONDIR" = xno
 	then
-		{ { echo "$as_me:8173: error: icondir must be set for icon theme" >&5
+		{ { echo "$as_me:8254: 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
@@ -8187,13 +8268,13 @@
 	cf_icon_list="icons/${ICON_NAME}_48x48"
 fi
 
-echo "$as_me:8190: checking for icon(s) to install" >&5
+echo "$as_me:8271: 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}:8196: testing using $ICON_FORMAT ..." 1>&5
+echo "${as_me:-configure}:8277: testing using $ICON_FORMAT ..." 1>&5
 
 	for cf_suffix in $ICON_FORMAT
 	do
@@ -8226,7 +8307,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:8229: WARNING: cannot determine size of $cf_left" >&5
+					{ echo "$as_me:8310: WARNING: cannot determine size of $cf_left" >&5
 echo "$as_me: WARNING: cannot determine size of $cf_left" >&2;}
 					continue
 				fi
@@ -8238,7 +8319,7 @@
 			(*.xpm)
 				test -n "$verbose" && echo "	ignored XPM file in icon theme" 1>&6
 
-echo "${as_me:-configure}:8241: testing ignored XPM file in icon theme ..." 1>&5
+echo "${as_me:-configure}:8322: testing ignored XPM file in icon theme ..." 1>&5
 
 				continue
 				;;
@@ -8250,7 +8331,7 @@
 			esac
 			test -n "$verbose" && echo "	adding $cf_next" 1>&6
 
-echo "${as_me:-configure}:8253: testing adding $cf_next ..." 1>&5
+echo "${as_me:-configure}:8334: testing adding $cf_next ..." 1>&5
 
 			cf_icon="${cf_icon}:${cf_next}"
 		fi
@@ -8265,26 +8346,26 @@
 
 if test -n "$verbose"
 then
-	echo "$as_me:8268: checking result" >&5
+	echo "$as_me:8349: checking result" >&5
 echo $ECHO_N "checking result... $ECHO_C" >&6
 fi
-echo "$as_me:8271: result: $ICON_LIST" >&5
+echo "$as_me:8352: result: $ICON_LIST" >&5
 echo "${ECHO_T}$ICON_LIST" >&6
 
 if test -z "$ICON_LIST"
 then
-	{ { echo "$as_me:8276: error: no icons found" >&5
+	{ { echo "$as_me:8357: error: no icons found" >&5
 echo "$as_me: error: no icons found" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-echo "$as_me:8281: checking for icon name" >&5
+echo "$as_me:8362: checking for icon name" >&5
 echo $ECHO_N "checking for icon name... $ECHO_C" >&6
-echo "$as_me:8283: result: $ICON_NAME" >&5
+echo "$as_me:8364: 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:8287: checking if you want to install desktop files" >&5
+echo "$as_me:8368: 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.
@@ -8301,14 +8382,14 @@
 	enable_desktop=$enableval
 
 fi;
-echo "$as_me:8304: result: $enable_desktop" >&5
+echo "$as_me:8385: 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:8311: checking for $ac_word" >&5
+echo "$as_me:8392: 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
@@ -8323,7 +8404,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_desktop_utils="yes"
-echo "$as_me:8326: found $ac_dir/$ac_word" >&5
+echo "$as_me:8407: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -8332,10 +8413,10 @@
 fi
 desktop_utils=$ac_cv_prog_desktop_utils
 if test -n "$desktop_utils"; then
-  echo "$as_me:8335: result: $desktop_utils" >&5
+  echo "$as_me:8416: result: $desktop_utils" >&5
 echo "${ECHO_T}$desktop_utils" >&6
 else
-  echo "$as_me:8338: result: no" >&5
+  echo "$as_me:8419: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8345,7 +8426,7 @@
 
 if test -z "$desktop_utils"
 then
-	echo "$as_me:8348: checking for requested desktop-category" >&5
+	echo "$as_me:8429: 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.
@@ -8355,7 +8436,7 @@
 else
   cf_desktop_want=auto
 fi;
-	echo "$as_me:8358: result: $cf_desktop_want" >&5
+	echo "$as_me:8439: result: $cf_desktop_want" >&5
 echo "${ECHO_T}$cf_desktop_want" >&6
 
 	if test "$cf_desktop_want" = auto
@@ -8378,7 +8459,7 @@
 					(xterm|*-xterm|*rxvt*|*konsole|*[Tt]erminal)
 						test -n "$verbose" && echo "	inspect $cf_desktop_path" 1>&6
 
-echo "${as_me:-configure}:8381: testing inspect $cf_desktop_path ..." 1>&5
+echo "${as_me:-configure}:8462: testing inspect $cf_desktop_path ..." 1>&5
 
 						${EGREP-egrep} '^Categories=' "$cf_desktop_path" | \
 							tr ';' '\n' | \
@@ -8409,14 +8490,14 @@
 				(Qt*|*Xfce*|*[ABCDEFGHIJKLMNOPQRSTUVWXYZ][ABCDEFGHIJKLMNOPQRSTUVWXYZ]*)
 					test -n "$verbose" && echo "	ignored $cf_desktop_this" 1>&6
 
-echo "${as_me:-configure}:8412: testing ignored $cf_desktop_this ..." 1>&5
+echo "${as_me:-configure}:8493: 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}:8419: testing applied $cf_desktop_this ..." 1>&5
+echo "${as_me:-configure}:8500: testing applied $cf_desktop_this ..." 1>&5
 
 					test "x$cf_desktop_last" != "x$cf_desktop_this" && echo "$cf_desktop_this" >>conftest.2
 					;;
@@ -8443,18 +8524,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}:8446: testing no usable value found for desktop category ..." 1>&5
+echo "${as_me:-configure}:8527: 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}:8453: testing will use Categories=$DESKTOP_CATEGORY ..." 1>&5
+echo "${as_me:-configure}:8534: testing will use Categories=$DESKTOP_CATEGORY ..." 1>&5
 
 fi
 
-echo "$as_me:8457: checking for install-permissions reference" >&5
+echo "$as_me:8538: 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.
@@ -8464,19 +8545,19 @@
 else
   with_reference=xterm
 fi;
-echo "$as_me:8467: result: $with_reference" >&5
+echo "$as_me:8548: result: $with_reference" >&5
 echo "${ECHO_T}$with_reference" >&6
 
 with_full_paths=yes
 
-	echo "$as_me:8472: checking for PATH separator" >&5
+	echo "$as_me:8553: 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:8479: result: $PATH_SEPARATOR" >&5
+	echo "$as_me:8560: result: $PATH_SEPARATOR" >&5
 echo "${ECHO_T}$PATH_SEPARATOR" >&6
 
 test -z "$XTERM_PATH" && XTERM_PATH="$with_reference"
@@ -8484,7 +8565,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:8487: checking for $ac_word" >&5
+echo "$as_me:8568: 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
@@ -8501,7 +8582,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:8504: found $ac_dir/$ac_word" >&5
+   echo "$as_me:8585: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -8512,10 +8593,10 @@
 XTERM_PATH=$ac_cv_path_XTERM_PATH
 
 if test -n "$XTERM_PATH"; then
-  echo "$as_me:8515: result: $XTERM_PATH" >&5
+  echo "$as_me:8596: result: $XTERM_PATH" >&5
 echo "${ECHO_T}$XTERM_PATH" >&6
 else
-  echo "$as_me:8518: result: no" >&5
+  echo "$as_me:8599: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8537,22 +8618,20 @@
 	cf_path_syntax="$ac_default_prefix"
 fi
 
-case ".$cf_temp" in
-(.\$\(*\)*|.\'*\'*)
+case "x$cf_temp" in
+(x\$\(*\)*|x\'*\'*)
 	;;
-(..|./*|.\\*)
+(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
 	;;
-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
-	;;
-(.\$\{*prefix\}*|.\$\{*dir\}*)
+(x\$\{*prefix\}*|x\$\{*dir\}*)
 	eval cf_temp="$cf_temp"
-	case ".$cf_temp" in
-	(.NONE/*)
+	case "x$cf_temp" in
+	(xNONE/*)
 		cf_temp=`echo "$cf_temp" | sed -e s%NONE%$cf_path_syntax%`
 		;;
 	esac
 	;;
-(.no|.NONE/*)
+(xno|xNONE/*)
 	cf_temp=`echo "$cf_temp" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
@@ -8574,7 +8653,7 @@
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:8577: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:8656: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define XTERM_PATH_PATH "$cf_path_prog"
@@ -8595,7 +8674,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:8598: checking for symbolic link to create to $cf_name" >&5
+echo "$as_me:8677: 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.
@@ -8605,7 +8684,7 @@
 else
   with_symlink=xterm
 fi;
-echo "$as_me:8608: result: $with_symlink" >&5
+echo "$as_me:8687: result: $with_symlink" >&5
 echo "${ECHO_T}$with_symlink" >&6
 test "$with_symlink" = yes && with_symlink=xterm
 test -n "$with_symlink" && \
@@ -8614,7 +8693,7 @@
 	XTERM_SYMLINK="$with_symlink"
 fi
 
-echo "$as_me:8617: checking if you want to disable openpty" >&5
+echo "$as_me:8696: 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.
@@ -8631,10 +8710,10 @@
 	disable_openpty=no
 
 fi;
-echo "$as_me:8634: result: $disable_openpty" >&5
+echo "$as_me:8713: result: $disable_openpty" >&5
 echo "${ECHO_T}$disable_openpty" >&6
 
-echo "$as_me:8637: checking if you want to disable setuid" >&5
+echo "$as_me:8716: 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.
@@ -8651,10 +8730,10 @@
 	disable_setuid=no
 
 fi;
-echo "$as_me:8654: result: $disable_setuid" >&5
+echo "$as_me:8733: result: $disable_setuid" >&5
 echo "${ECHO_T}$disable_setuid" >&6
 
-echo "$as_me:8657: checking if you want to disable setgid" >&5
+echo "$as_me:8736: 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.
@@ -8671,10 +8750,10 @@
 	disable_setgid=no
 
 fi;
-echo "$as_me:8674: result: $disable_setgid" >&5
+echo "$as_me:8753: result: $disable_setgid" >&5
 echo "${ECHO_T}$disable_setgid" >&6
 
-echo "$as_me:8677: checking if you want to run xterm setuid to a given user" >&5
+echo "$as_me:8756: 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.
@@ -8684,7 +8763,7 @@
 else
   use_given_setuid=no
 fi;
-echo "$as_me:8687: result: $use_given_setuid" >&5
+echo "$as_me:8766: result: $use_given_setuid" >&5
 echo "${ECHO_T}$use_given_setuid" >&6
 
 if test "$use_given_setuid" != no ; then
@@ -8697,7 +8776,7 @@
 	SINSTALL_OPTS="$SINSTALL_OPTS u+s -u $cf_cv_given_setuid"
 fi
 
-echo "$as_me:8700: checking if you want to run xterm setgid to match utmp/utmpx file" >&5
+echo "$as_me:8779: 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.
@@ -8707,14 +8786,14 @@
 else
   use_utmp_setgid=no
 fi;
-echo "$as_me:8710: result: $use_utmp_setgid" >&5
+echo "$as_me:8789: 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:8717: checking for utmp/utmpx group" >&5
+echo "$as_me:8796: 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
@@ -8756,10 +8835,10 @@
 done
 
 fi
-echo "$as_me:8759: result: $cf_cv_utmp_group" >&5
+echo "$as_me:8838: result: $cf_cv_utmp_group" >&5
 echo "${ECHO_T}$cf_cv_utmp_group" >&6
 else
-	{ { echo "$as_me:8762: error: cannot find utmp group" >&5
+	{ { echo "$as_me:8841: error: cannot find utmp group" >&5
 echo "$as_me: error: cannot find utmp group" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -8768,7 +8847,7 @@
 		cf_cv_utmp_group=$use_utmp_setgid
 	fi
 	if test "$cf_cv_posix_saved_ids" != yes ; then
-		{ { echo "$as_me:8771: error: Your system does not support POSIX saved-ids" >&5
+		{ { echo "$as_me:8850: 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
@@ -8780,7 +8859,7 @@
 	SINSTALL_OPTS="$SINSTALL_OPTS g+s -g $cf_cv_utmp_group"
 fi
 
-echo "$as_me:8783: checking if you want to link with utempter" >&5
+echo "$as_me:8862: 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.
@@ -8790,12 +8869,12 @@
 else
   use_utempter=no
 fi;
-echo "$as_me:8793: result: $use_utempter" >&5
+echo "$as_me:8872: result: $use_utempter" >&5
 echo "${ECHO_T}$use_utempter" >&6
 
 if test "$use_utempter" = yes ; then
 
-echo "$as_me:8798: checking if we can link with utempter library" >&5
+echo "$as_me:8877: 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
@@ -8820,7 +8899,7 @@
 LIBS="$cf_add_libs"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8823 "configure"
+#line 8902 "configure"
 #include "confdefs.h"
 
 #include <utempter.h>
@@ -8837,16 +8916,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8840: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8919: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8843: \$? = $ac_status" >&5
+  echo "$as_me:8922: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8846: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8925: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8849: \$? = $ac_status" >&5
+  echo "$as_me:8928: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_have_utempter=yes
@@ -8860,7 +8939,7 @@
 LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:8863: result: $cf_cv_have_utempter" >&5
+echo "$as_me:8942: result: $cf_cv_have_utempter" >&5
 echo "${ECHO_T}$cf_cv_have_utempter" >&6
 if test "$cf_cv_have_utempter" = yes ; then
 
@@ -8898,7 +8977,7 @@
 		disable_setuid=yes
 		test -n "$verbose" && echo "	No --disable-setuid option given, force to yes" 1>&6
 
-echo "${as_me:-configure}:8901: testing No --disable-setuid option given, force to yes ..." 1>&5
+echo "${as_me:-configure}:8980: testing No --disable-setuid option given, force to yes ..." 1>&5
 
 	fi
 fi
@@ -8930,26 +9009,24 @@
 	cf_path_syntax="$ac_default_prefix"
 fi
 
-case ".$cf_utmp_path" in
-(.\$\(*\)*|.\'*\'*)
-	;;
-(..|./*|.\\*)
+case "x$cf_utmp_path" in
+(x\$\(*\)*|x\'*\'*)
 	;;
-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
+(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
 	;;
-(.\$\{*prefix\}*|.\$\{*dir\}*)
+(x\$\{*prefix\}*|x\$\{*dir\}*)
 	eval cf_utmp_path="$cf_utmp_path"
-	case ".$cf_utmp_path" in
-	(.NONE/*)
+	case "x$cf_utmp_path" in
+	(xNONE/*)
 		cf_utmp_path=`echo "$cf_utmp_path" | sed -e s%NONE%$cf_path_syntax%`
 		;;
 	esac
 	;;
-(.no|.NONE/*)
+(xno|xNONE/*)
 	cf_utmp_path=`echo "$cf_utmp_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:8952: error: expected a pathname, not \"$cf_utmp_path\"" >&5
+	{ { echo "$as_me:9029: error: expected a pathname, not \"$cf_utmp_path\"" >&5
 echo "$as_me: error: expected a pathname, not \"$cf_utmp_path\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -8984,26 +9061,24 @@
 	cf_path_syntax="$ac_default_prefix"
 fi
 
-case ".$cf_wtmp_path" in
-(.\$\(*\)*|.\'*\'*)
-	;;
-(..|./*|.\\*)
+case "x$cf_wtmp_path" in
+(x\$\(*\)*|x\'*\'*)
 	;;
-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
+(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
 	;;
-(.\$\{*prefix\}*|.\$\{*dir\}*)
+(x\$\{*prefix\}*|x\$\{*dir\}*)
 	eval cf_wtmp_path="$cf_wtmp_path"
-	case ".$cf_wtmp_path" in
-	(.NONE/*)
+	case "x$cf_wtmp_path" in
+	(xNONE/*)
 		cf_wtmp_path=`echo "$cf_wtmp_path" | sed -e s%NONE%$cf_path_syntax%`
 		;;
 	esac
 	;;
-(.no|.NONE/*)
+(xno|xNONE/*)
 	cf_wtmp_path=`echo "$cf_wtmp_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9006: error: expected a pathname, not \"$cf_wtmp_path\"" >&5
+	{ { echo "$as_me:9081: error: expected a pathname, not \"$cf_wtmp_path\"" >&5
 echo "$as_me: error: expected a pathname, not \"$cf_wtmp_path\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -9015,14 +9090,14 @@
 
 ###	checks for external data
 
-echo "$as_me:9018: checking if external errno is declared" >&5
+echo "$as_me:9093: 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 9025 "configure"
+#line 9100 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -9036,16 +9111,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9039: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9114: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9042: \$? = $ac_status" >&5
+  echo "$as_me:9117: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9045: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9120: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9048: \$? = $ac_status" >&5
+  echo "$as_me:9123: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -9056,7 +9131,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:9059: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:9134: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -9071,14 +9146,14 @@
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:9074: checking if external errno exists" >&5
+echo "$as_me:9149: 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 9081 "configure"
+#line 9156 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -9093,16 +9168,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9096: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9171: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9099: \$? = $ac_status" >&5
+  echo "$as_me:9174: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9102: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9177: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9105: \$? = $ac_status" >&5
+  echo "$as_me:9180: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_errno=yes
 else
@@ -9113,7 +9188,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:9116: result: $cf_cv_have_errno" >&5
+echo "$as_me:9191: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -9126,7 +9201,7 @@
 
 fi
 
-echo "$as_me:9129: checking for explicit tty group name" >&5
+echo "$as_me:9204: 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.
@@ -9138,11 +9213,11 @@
 fi;
 test -z "$cf_tty_group"    && cf_tty_group=auto...
 test "$cf_tty_group" = yes && cf_tty_group=auto...
-echo "$as_me:9141: result: $cf_tty_group" >&5
+echo "$as_me:9216: result: $cf_tty_group" >&5
 echo "${ECHO_T}$cf_tty_group" >&6
 
 if test "$cf_tty_group" = "auto..." ; then
-echo "$as_me:9145: checking for tty group name" >&5
+echo "$as_me:9220: 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
@@ -9195,7 +9270,7 @@
 fi
 
 fi
-echo "$as_me:9198: result: $cf_cv_tty_group_name" >&5
+echo "$as_me:9273: 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
@@ -9215,7 +9290,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:9218: checking if we may use the $cf_tty_group group" >&5
+echo "$as_me:9293: 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
@@ -9228,7 +9303,7 @@
   cf_cv_tty_group=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 9231 "configure"
+#line 9306 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -9265,15 +9340,15 @@
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:9268: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9343: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9271: \$? = $ac_status" >&5
+  echo "$as_me:9346: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:9273: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9348: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9276: \$? = $ac_status" >&5
+  echo "$as_me:9351: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_tty_group=yes
 else
@@ -9291,11 +9366,11 @@
 fi
 
 fi
-echo "$as_me:9294: result: $cf_cv_tty_group" >&5
+echo "$as_me:9369: 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:9298: WARNING: Cannot use $cf_tty_group group" >&5
+	{ echo "$as_me:9373: WARNING: Cannot use $cf_tty_group group" >&5
 echo "$as_me: WARNING: Cannot use $cf_tty_group group" >&2;}
 else
 	cat >>confdefs.h <<\EOF
@@ -9306,7 +9381,7 @@
 
 ###	checks for system services and user specified options
 
-echo "$as_me:9309: checking for X" >&5
+echo "$as_me:9384: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -9410,17 +9485,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 9413 "configure"
+#line 9488 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:9417: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:9492: \"$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:9423: \$? = $ac_status" >&5
+  echo "$as_me:9498: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9453,7 +9528,7 @@
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 9456 "configure"
+#line 9531 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -9465,16 +9540,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9468: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9543: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9471: \$? = $ac_status" >&5
+  echo "$as_me:9546: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9474: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9549: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9477: \$? = $ac_status" >&5
+  echo "$as_me:9552: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -9512,7 +9587,7 @@
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:9515: result: $have_x" >&5
+  echo "$as_me:9590: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -9522,7 +9597,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:9525: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:9600: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -9549,11 +9624,11 @@
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:9552: checking whether -R must be followed by a space" >&5
+      echo "$as_me:9627: 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 9556 "configure"
+#line 9631 "configure"
 #include "confdefs.h"
 
 int
@@ -9565,16 +9640,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9568: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9643: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9571: \$? = $ac_status" >&5
+  echo "$as_me:9646: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9574: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9649: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9577: \$? = $ac_status" >&5
+  echo "$as_me:9652: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_nospace=yes
 else
@@ -9584,13 +9659,13 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
       if test $ac_R_nospace = yes; then
-	echo "$as_me:9587: result: no" >&5
+	echo "$as_me:9662: 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 9593 "configure"
+#line 9668 "configure"
 #include "confdefs.h"
 
 int
@@ -9602,16 +9677,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9605: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9680: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9608: \$? = $ac_status" >&5
+  echo "$as_me:9683: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9611: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9686: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9614: \$? = $ac_status" >&5
+  echo "$as_me:9689: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_space=yes
 else
@@ -9621,11 +9696,11 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	if test $ac_R_space = yes; then
-	  echo "$as_me:9624: result: yes" >&5
+	  echo "$as_me:9699: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:9628: result: neither works" >&5
+	  echo "$as_me:9703: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -9645,7 +9720,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 9648 "configure"
+#line 9723 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9664,22 +9739,22 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9667: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9742: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9670: \$? = $ac_status" >&5
+  echo "$as_me:9745: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9673: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9748: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9676: \$? = $ac_status" >&5
+  echo "$as_me:9751: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:9682: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:9757: 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
@@ -9687,7 +9762,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9690 "configure"
+#line 9765 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9706,16 +9781,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9709: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9784: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9712: \$? = $ac_status" >&5
+  echo "$as_me:9787: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9715: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9790: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9718: \$? = $ac_status" >&5
+  echo "$as_me:9793: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -9726,14 +9801,14 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9729: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:9804: 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:9736: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:9811: 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
@@ -9741,7 +9816,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9744 "configure"
+#line 9819 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9760,16 +9835,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9763: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9838: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9766: \$? = $ac_status" >&5
+  echo "$as_me:9841: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9769: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9844: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9772: \$? = $ac_status" >&5
+  echo "$as_me:9847: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -9780,7 +9855,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9783: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:9858: 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"
@@ -9799,13 +9874,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:9802: checking for gethostbyname" >&5
+    echo "$as_me:9877: 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 9808 "configure"
+#line 9883 "configure"
 #include "confdefs.h"
 #define gethostbyname autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -9836,16 +9911,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9839: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9914: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9842: \$? = $ac_status" >&5
+  echo "$as_me:9917: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9845: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9920: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9848: \$? = $ac_status" >&5
+  echo "$as_me:9923: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -9855,11 +9930,11 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:9858: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:9933: 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:9862: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:9937: 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
@@ -9867,7 +9942,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9870 "configure"
+#line 9945 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9886,16 +9961,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9889: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9964: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9892: \$? = $ac_status" >&5
+  echo "$as_me:9967: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9895: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9970: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9898: \$? = $ac_status" >&5
+  echo "$as_me:9973: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -9906,14 +9981,14 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9909: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:9984: 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:9916: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:9991: 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
@@ -9921,7 +9996,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9924 "configure"
+#line 9999 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9940,16 +10015,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9943: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10018: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9946: \$? = $ac_status" >&5
+  echo "$as_me:10021: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9949: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10024: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9952: \$? = $ac_status" >&5
+  echo "$as_me:10027: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -9960,7 +10035,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9963: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:10038: 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"
@@ -9976,13 +10051,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:9979: checking for connect" >&5
+    echo "$as_me:10054: 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 9985 "configure"
+#line 10060 "configure"
 #include "confdefs.h"
 #define connect autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -10013,16 +10088,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10016: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10091: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10019: \$? = $ac_status" >&5
+  echo "$as_me:10094: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10022: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10097: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10025: \$? = $ac_status" >&5
+  echo "$as_me:10100: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_connect=yes
 else
@@ -10032,11 +10107,11 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:10035: result: $ac_cv_func_connect" >&5
+echo "$as_me:10110: 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:10039: checking for connect in -lsocket" >&5
+      echo "$as_me:10114: 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
@@ -10044,7 +10119,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10047 "configure"
+#line 10122 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10063,16 +10138,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10066: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10141: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10069: \$? = $ac_status" >&5
+  echo "$as_me:10144: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10072: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10147: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10075: \$? = $ac_status" >&5
+  echo "$as_me:10150: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -10083,7 +10158,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10086: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:10161: 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"
@@ -10092,13 +10167,13 @@
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:10095: checking for remove" >&5
+    echo "$as_me:10170: 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 10101 "configure"
+#line 10176 "configure"
 #include "confdefs.h"
 #define remove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -10129,16 +10204,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10132: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10207: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10135: \$? = $ac_status" >&5
+  echo "$as_me:10210: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10138: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10213: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10141: \$? = $ac_status" >&5
+  echo "$as_me:10216: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_remove=yes
 else
@@ -10148,11 +10223,11 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:10151: result: $ac_cv_func_remove" >&5
+echo "$as_me:10226: 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:10155: checking for remove in -lposix" >&5
+      echo "$as_me:10230: 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
@@ -10160,7 +10235,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10163 "configure"
+#line 10238 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10179,16 +10254,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10182: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10257: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10185: \$? = $ac_status" >&5
+  echo "$as_me:10260: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10188: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10263: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10191: \$? = $ac_status" >&5
+  echo "$as_me:10266: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -10199,7 +10274,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10202: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:10277: 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"
@@ -10208,13 +10283,13 @@
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:10211: checking for shmat" >&5
+    echo "$as_me:10286: 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 10217 "configure"
+#line 10292 "configure"
 #include "confdefs.h"
 #define shmat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -10245,16 +10320,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10248: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10323: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10251: \$? = $ac_status" >&5
+  echo "$as_me:10326: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10254: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10329: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10257: \$? = $ac_status" >&5
+  echo "$as_me:10332: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -10264,11 +10339,11 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:10267: result: $ac_cv_func_shmat" >&5
+echo "$as_me:10342: 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:10271: checking for shmat in -lipc" >&5
+      echo "$as_me:10346: 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
@@ -10276,7 +10351,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10279 "configure"
+#line 10354 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10295,16 +10370,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10298: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10373: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10301: \$? = $ac_status" >&5
+  echo "$as_me:10376: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10304: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10379: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10307: \$? = $ac_status" >&5
+  echo "$as_me:10382: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -10315,7 +10390,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10318: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:10393: 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"
@@ -10333,7 +10408,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:10336: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:10411: 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
@@ -10341,7 +10416,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10344 "configure"
+#line 10419 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10360,16 +10435,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10363: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10438: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10366: \$? = $ac_status" >&5
+  echo "$as_me:10441: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10369: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10444: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10372: \$? = $ac_status" >&5
+  echo "$as_me:10447: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -10380,7 +10455,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10383: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:10458: 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"
@@ -10390,13 +10465,13 @@
 
 fi
 
-echo "$as_me:10393: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "$as_me:10468: 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 10399 "configure"
+#line 10474 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -10418,16 +10493,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10421: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10496: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10424: \$? = $ac_status" >&5
+  echo "$as_me:10499: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10427: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10502: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10430: \$? = $ac_status" >&5
+  echo "$as_me:10505: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_sys_wait_h=yes
 else
@@ -10437,7 +10512,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:10440: result: $ac_cv_header_sys_wait_h" >&5
+echo "$as_me:10515: 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
 
@@ -10447,14 +10522,14 @@
 
 fi
 
-echo "$as_me:10450: checking for POSIX wait functions" >&5
+echo "$as_me:10525: 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 10457 "configure"
+#line 10532 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -10478,16 +10553,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10481: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10556: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10484: \$? = $ac_status" >&5
+  echo "$as_me:10559: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10487: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10562: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10490: \$? = $ac_status" >&5
+  echo "$as_me:10565: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_wait=yes
 else
@@ -10498,21 +10573,21 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10501: result: $cf_cv_posix_wait" >&5
+echo "$as_me:10576: 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:10508: checking if external sys_nerr is declared" >&5
+echo "$as_me:10583: 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 10515 "configure"
+#line 10590 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -10526,16 +10601,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10529: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10604: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10532: \$? = $ac_status" >&5
+  echo "$as_me:10607: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10535: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10610: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10538: \$? = $ac_status" >&5
+  echo "$as_me:10613: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_sys_nerr=yes
 else
@@ -10546,7 +10621,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10549: result: $cf_cv_dcl_sys_nerr" >&5
+echo "$as_me:10624: 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
@@ -10561,14 +10636,14 @@
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:10564: checking if external sys_nerr exists" >&5
+echo "$as_me:10639: 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 10571 "configure"
+#line 10646 "configure"
 #include "confdefs.h"
 
 #undef sys_nerr
@@ -10583,16 +10658,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10586: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10661: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10589: \$? = $ac_status" >&5
+  echo "$as_me:10664: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10592: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10667: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10595: \$? = $ac_status" >&5
+  echo "$as_me:10670: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_sys_nerr=yes
 else
@@ -10603,7 +10678,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10606: result: $cf_cv_have_sys_nerr" >&5
+echo "$as_me:10681: 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
@@ -10616,14 +10691,14 @@
 
 fi
 
-echo "$as_me:10619: checking if external sys_errlist is declared" >&5
+echo "$as_me:10694: 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 10626 "configure"
+#line 10701 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -10637,16 +10712,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10640: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10715: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10643: \$? = $ac_status" >&5
+  echo "$as_me:10718: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10646: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10721: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10649: \$? = $ac_status" >&5
+  echo "$as_me:10724: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_sys_errlist=yes
 else
@@ -10657,7 +10732,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10660: result: $cf_cv_dcl_sys_errlist" >&5
+echo "$as_me:10735: 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
@@ -10672,14 +10747,14 @@
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:10675: checking if external sys_errlist exists" >&5
+echo "$as_me:10750: 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 10682 "configure"
+#line 10757 "configure"
 #include "confdefs.h"
 
 #undef sys_errlist
@@ -10694,16 +10769,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10697: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10772: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10700: \$? = $ac_status" >&5
+  echo "$as_me:10775: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10703: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10778: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10706: \$? = $ac_status" >&5
+  echo "$as_me:10781: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_sys_errlist=yes
 else
@@ -10714,7 +10789,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10717: result: $cf_cv_have_sys_errlist" >&5
+echo "$as_me:10792: 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
@@ -10750,23 +10825,23 @@
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:10753: checking for $ac_header" >&5
+echo "$as_me:10828: 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 10759 "configure"
+#line 10834 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:10763: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:10838: \"$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:10769: \$? = $ac_status" >&5
+  echo "$as_me:10844: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -10785,7 +10860,7 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:10788: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:10863: 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
@@ -10795,14 +10870,14 @@
 fi
 done
 
-echo "$as_me:10798: checking if we should define SYSV" >&5
+echo "$as_me:10873: 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 10805 "configure"
+#line 10880 "configure"
 #include "confdefs.h"
 
 #undef  SYSV
@@ -10846,16 +10921,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10849: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10924: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10852: \$? = $ac_status" >&5
+  echo "$as_me:10927: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10855: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10930: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10858: \$? = $ac_status" >&5
+  echo "$as_me:10933: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sysv=yes
 else
@@ -10866,7 +10941,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10869: result: $cf_cv_sysv" >&5
+echo "$as_me:10944: result: $cf_cv_sysv" >&5
 echo "${ECHO_T}$cf_cv_sysv" >&6
 test "$cf_cv_sysv" = yes &&
 cat >>confdefs.h <<\EOF
@@ -10877,7 +10952,7 @@
 CFLAGS="$cf_save_CFLAGS_CF_SYSV"
 CPPFLAGS="$cf_save_CPPFLAGS_CF_SYSV"
 
-echo "$as_me:10880: checking for elf_begin in -lelf" >&5
+echo "$as_me:10955: 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
@@ -10885,7 +10960,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lelf  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10888 "configure"
+#line 10963 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10904,16 +10979,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10907: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10982: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10910: \$? = $ac_status" >&5
+  echo "$as_me:10985: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10913: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10988: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10916: \$? = $ac_status" >&5
+  echo "$as_me:10991: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_elf_elf_begin=yes
 else
@@ -10924,18 +10999,18 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10927: result: $ac_cv_lib_elf_elf_begin" >&5
+echo "$as_me:11002: 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:10931: checking if this is an SVR4 system" >&5
+echo "$as_me:11006: 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 10938 "configure"
+#line 11013 "configure"
 #include "confdefs.h"
 
 #if defined(__CYGWIN__)
@@ -10964,16 +11039,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10967: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11042: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10970: \$? = $ac_status" >&5
+  echo "$as_me:11045: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10973: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11048: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10976: \$? = $ac_status" >&5
+  echo "$as_me:11051: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_svr4=yes
 else
@@ -10984,7 +11059,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10987: result: $cf_cv_svr4" >&5
+echo "$as_me:11062: result: $cf_cv_svr4" >&5
 echo "${ECHO_T}$cf_cv_svr4" >&6
 
 fi
@@ -10994,7 +11069,7 @@
 #define SVR4 1
 EOF
 
-echo "$as_me:10997: checking if you want to use pkg-config" >&5
+echo "$as_me:11072: 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.
@@ -11004,7 +11079,7 @@
 else
   cf_pkg_config=yes
 fi;
-echo "$as_me:11007: result: $cf_pkg_config" >&5
+echo "$as_me:11082: result: $cf_pkg_config" >&5
 echo "${ECHO_T}$cf_pkg_config" >&6
 
 case "$cf_pkg_config" in
@@ -11016,7 +11091,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:11019: checking for $ac_word" >&5
+echo "$as_me:11094: 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
@@ -11033,7 +11108,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:11036: found $ac_dir/$ac_word" >&5
+   echo "$as_me:11111: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -11044,10 +11119,10 @@
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:11047: result: $PKG_CONFIG" >&5
+  echo "$as_me:11122: result: $PKG_CONFIG" >&5
 echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  echo "$as_me:11050: result: no" >&5
+  echo "$as_me:11125: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -11056,7 +11131,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:11059: checking for $ac_word" >&5
+echo "$as_me:11134: 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
@@ -11073,7 +11148,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:11076: found $ac_dir/$ac_word" >&5
+   echo "$as_me:11151: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -11085,10 +11160,10 @@
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 
 if test -n "$ac_pt_PKG_CONFIG"; then
-  echo "$as_me:11088: result: $ac_pt_PKG_CONFIG" >&5
+  echo "$as_me:11163: result: $ac_pt_PKG_CONFIG" >&5
 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
 else
-  echo "$as_me:11091: result: no" >&5
+  echo "$as_me:11166: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -11112,33 +11187,31 @@
 	cf_path_syntax="$ac_default_prefix"
 fi
 
-case ".$PKG_CONFIG" in
-(.\$\(*\)*|.\'*\'*)
+case "x$PKG_CONFIG" in
+(x\$\(*\)*|x\'*\'*)
 	;;
-(..|./*|.\\*)
+(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
 	;;
-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
-	;;
-(.\$\{*prefix\}*|.\$\{*dir\}*)
+(x\$\{*prefix\}*|x\$\{*dir\}*)
 	eval PKG_CONFIG="$PKG_CONFIG"
-	case ".$PKG_CONFIG" in
-	(.NONE/*)
+	case "x$PKG_CONFIG" in
+	(xNONE/*)
 		PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
 		;;
 	esac
 	;;
-(.no|.NONE/*)
+(xno|xNONE/*)
 	PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:11134: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+	{ { echo "$as_me:11207: 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:11141: WARNING: pkg-config is not installed" >&5
+	{ echo "$as_me:11214: WARNING: pkg-config is not installed" >&5
 echo "$as_me: WARNING: pkg-config is not installed" >&2;}
 fi
 
@@ -11154,17 +11227,17 @@
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then
 	test -n "$verbose" && echo "	found package x11" 1>&6
 
-echo "${as_me:-configure}:11157: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:11230: 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}:11163: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:11236: 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}:11167: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:11240: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -11284,24 +11357,24 @@
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:11287: WARNING: unable to find X11 library" >&5
+	{ echo "$as_me:11360: 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}:11294: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:11367: 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}:11300: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:11373: 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}:11304: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:11377: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -11421,24 +11494,24 @@
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:11424: WARNING: unable to find ICE library" >&5
+	{ echo "$as_me:11497: 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}:11431: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:11504: 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}:11437: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:11510: 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}:11441: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:11514: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -11558,24 +11631,24 @@
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:11561: WARNING: unable to find SM library" >&5
+	{ echo "$as_me:11634: 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}:11568: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:11641: 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}:11574: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:11647: 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}:11578: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:11651: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -11695,7 +11768,7 @@
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:11698: WARNING: unable to find Xt library" >&5
+	{ echo "$as_me:11771: WARNING: unable to find Xt library" >&5
 echo "$as_me: WARNING: unable to find Xt library" >&2;}
 fi
 
@@ -11708,17 +11781,17 @@
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then
 	test -n "$verbose" && echo "	found package xt" 1>&6
 
-echo "${as_me:-configure}:11711: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:11784: 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}:11717: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:11790: 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}:11721: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:11794: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -11839,14 +11912,14 @@
 		;;
 	(*)
 # we have an "xt" package, but it may omit Xt's dependency on X11
-echo "$as_me:11842: checking for usable X dependency" >&5
+echo "$as_me:11915: 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 11849 "configure"
+#line 11922 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -11866,16 +11939,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11869: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11942: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11872: \$? = $ac_status" >&5
+  echo "$as_me:11945: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11875: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11948: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11878: \$? = $ac_status" >&5
+  echo "$as_me:11951: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xt_x11_compat=yes
 else
@@ -11885,30 +11958,30 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:11888: result: $cf_cv_xt_x11_compat" >&5
+echo "$as_me:11961: 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}:11894: testing work around broken X11 dependency ..." 1>&5
+echo "${as_me:-configure}:11967: 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}:11901: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:11974: 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}:11907: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:11980: 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}:11911: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:11984: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -12031,12 +12104,12 @@
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:12034: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:12107: 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}:12039: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:12112: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -12044,14 +12117,14 @@
 		;;
 	esac
 
-echo "$as_me:12047: checking for usable X Toolkit package" >&5
+echo "$as_me:12120: 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 12054 "configure"
+#line 12127 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12067,16 +12140,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12070: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12143: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12073: \$? = $ac_status" >&5
+  echo "$as_me:12146: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12076: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12149: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12079: \$? = $ac_status" >&5
+  echo "$as_me:12152: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xt_ice_compat=yes
 else
@@ -12086,7 +12159,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:12089: result: $cf_cv_xt_ice_compat" >&5
+echo "$as_me:12162: result: $cf_cv_xt_ice_compat" >&5
 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
 
 	if test "$cf_cv_xt_ice_compat" = no
@@ -12100,22 +12173,22 @@
 			(*)
 				test -n "$verbose" && echo "	work around broken ICE dependency" 1>&6
 
-echo "${as_me:-configure}:12103: testing work around broken ICE dependency ..." 1>&5
+echo "${as_me:-configure}:12176: 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}:12108: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:12181: 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}:12114: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:12187: 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}:12118: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:12191: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -12234,17 +12307,17 @@
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then
 	test -n "$verbose" && echo "	found package sm" 1>&6
 
-echo "${as_me:-configure}:12237: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:12310: 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}:12243: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:12316: 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}:12247: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:12320: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -12373,12 +12446,12 @@
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:12376: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:12449: 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}:12381: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:12454: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -12398,7 +12471,7 @@
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:12401: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:12474: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -12483,7 +12556,7 @@
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:12486: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:12559: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -12493,7 +12566,7 @@
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:12496: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:12569: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -12503,7 +12576,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}:12506: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:12579: 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"
@@ -12512,7 +12585,7 @@
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12515 "configure"
+#line 12588 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -12524,16 +12597,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12527: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12600: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12530: \$? = $ac_status" >&5
+  echo "$as_me:12603: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12533: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12606: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12536: \$? = $ac_status" >&5
+  echo "$as_me:12609: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -12541,12 +12614,12 @@
 cat "conftest.$ac_ext" >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:12544: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:12617: 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}:12549: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:12622: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_cflags"
@@ -12554,13 +12627,13 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
-	echo "$as_me:12557: checking for XOpenDisplay" >&5
+	echo "$as_me:12630: 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 12563 "configure"
+#line 12636 "configure"
 #include "confdefs.h"
 #define XOpenDisplay autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -12591,16 +12664,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12594: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12667: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12597: \$? = $ac_status" >&5
+  echo "$as_me:12670: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12600: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12673: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12603: \$? = $ac_status" >&5
+  echo "$as_me:12676: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_XOpenDisplay=yes
 else
@@ -12610,13 +12683,13 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:12613: result: $ac_cv_func_XOpenDisplay" >&5
+echo "$as_me:12686: 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:12619: checking for XOpenDisplay in -lX11" >&5
+	echo "$as_me:12692: 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
@@ -12624,7 +12697,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12627 "configure"
+#line 12700 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12643,16 +12716,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12646: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12719: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12649: \$? = $ac_status" >&5
+  echo "$as_me:12722: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12652: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12725: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12655: \$? = $ac_status" >&5
+  echo "$as_me:12728: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -12663,7 +12736,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12666: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:12739: 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
 
@@ -12687,13 +12760,13 @@
 
 fi
 
-	echo "$as_me:12690: checking for XtAppInitialize" >&5
+	echo "$as_me:12763: 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 12696 "configure"
+#line 12769 "configure"
 #include "confdefs.h"
 #define XtAppInitialize autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -12724,16 +12797,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12727: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12800: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12730: \$? = $ac_status" >&5
+  echo "$as_me:12803: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12733: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12806: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12736: \$? = $ac_status" >&5
+  echo "$as_me:12809: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_XtAppInitialize=yes
 else
@@ -12743,13 +12816,13 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:12746: result: $ac_cv_func_XtAppInitialize" >&5
+echo "$as_me:12819: 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:12752: checking for XtAppInitialize in -lXt" >&5
+	echo "$as_me:12825: 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
@@ -12757,7 +12830,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12760 "configure"
+#line 12833 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12776,16 +12849,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12779: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12852: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12782: \$? = $ac_status" >&5
+  echo "$as_me:12855: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12785: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12858: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12788: \$? = $ac_status" >&5
+  echo "$as_me:12861: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xt_XtAppInitialize=yes
 else
@@ -12796,7 +12869,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12799: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:12872: 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
 
@@ -12813,7 +12886,7 @@
 fi
 
 if test "$cf_have_X_LIBS" = no ; then
-	{ echo "$as_me:12816: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+	{ echo "$as_me:12889: 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
@@ -12832,23 +12905,23 @@
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:12835: checking for $ac_header" >&5
+echo "$as_me:12908: 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 12841 "configure"
+#line 12914 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:12845: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:12918: \"$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:12851: \$? = $ac_status" >&5
+  echo "$as_me:12924: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12867,7 +12940,7 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:12870: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:12943: 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
@@ -12882,7 +12955,7 @@
 cf_save_cppflags="${CPPFLAGS}"
 cf_save_ldflags="${LDFLAGS}"
 
-echo "$as_me:12885: checking if you want to use the Xpm library for colored icon" >&5
+echo "$as_me:12958: 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.
@@ -12892,7 +12965,7 @@
 else
   cf_Xpm_library=yes
 fi;
-echo "$as_me:12895: result: $cf_Xpm_library" >&5
+echo "$as_me:12968: result: $cf_Xpm_library" >&5
 echo "${ECHO_T}$cf_Xpm_library" >&6
 
 if test "$cf_Xpm_library" != no ; then
@@ -12900,23 +12973,23 @@
 	CPPFLAGS="$CPPFLAGS -I$withval/include"
 	LDFLAGS="$LDFLAGS -L$withval/lib"
     fi
-    echo "$as_me:12903: checking for X11/xpm.h" >&5
+    echo "$as_me:12976: 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 12909 "configure"
+#line 12982 "configure"
 #include "confdefs.h"
 #include <X11/xpm.h>
 _ACEOF
-if { (eval echo "$as_me:12913: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:12986: \"$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:12919: \$? = $ac_status" >&5
+  echo "$as_me:12992: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12935,11 +13008,11 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:12938: result: $ac_cv_header_X11_xpm_h" >&5
+echo "$as_me:13011: 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:12942: checking for XpmCreatePixmapFromData in -lXpm" >&5
+	echo "$as_me:13015: 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
@@ -12947,7 +13020,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXpm -lX11 $X_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12950 "configure"
+#line 13023 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12966,16 +13039,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12969: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13042: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12972: \$? = $ac_status" >&5
+  echo "$as_me:13045: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12975: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13048: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12978: \$? = $ac_status" >&5
+  echo "$as_me:13051: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xpm_XpmCreatePixmapFromData=yes
 else
@@ -12986,7 +13059,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12989: result: $ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&5
+echo "$as_me:13062: 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
 
@@ -13006,7 +13079,7 @@
 
 fi
 
-echo "$as_me:13009: checking if you want to use the Xinerama extension" >&5
+echo "$as_me:13082: 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.
@@ -13016,24 +13089,24 @@
 else
   cf_with_xinerama=yes
 fi;
-echo "$as_me:13019: result: $cf_with_xinerama" >&5
+echo "$as_me:13092: 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}:13026: testing found package xinerama ..." 1>&5
+echo "${as_me:-configure}:13099: 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}:13032: testing package xinerama CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:13105: 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}:13036: testing package xinerama LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:13109: testing package xinerama LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -13157,7 +13230,7 @@
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
 
-	echo "$as_me:13160: checking for XineramaQueryScreens in -lXinerama" >&5
+	echo "$as_me:13233: 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
@@ -13165,7 +13238,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXinerama  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13168 "configure"
+#line 13241 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13184,16 +13257,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13187: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13260: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13190: \$? = $ac_status" >&5
+  echo "$as_me:13263: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13193: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13266: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13196: \$? = $ac_status" >&5
+  echo "$as_me:13269: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xinerama_XineramaQueryScreens=yes
 else
@@ -13204,7 +13277,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13207: result: $ac_cv_lib_Xinerama_XineramaQueryScreens" >&5
+echo "$as_me:13280: 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
 
@@ -13229,23 +13302,23 @@
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:13232: checking for $ac_header" >&5
+echo "$as_me:13305: 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 13238 "configure"
+#line 13311 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:13242: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:13315: \"$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:13248: \$? = $ac_status" >&5
+  echo "$as_me:13321: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -13264,7 +13337,7 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:13267: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:13340: 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
@@ -13282,7 +13355,7 @@
 
 cf_x_athena=${cf_x_athena:-Xaw}
 
-echo "$as_me:13285: checking if you want to link with Xaw 3d library" >&5
+echo "$as_me:13358: 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=
 
@@ -13293,14 +13366,14 @@
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3d
-	echo "$as_me:13296: result: yes" >&5
+	echo "$as_me:13369: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:13299: result: no" >&5
+	echo "$as_me:13372: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:13303: checking if you want to link with Xaw 3d xft library" >&5
+echo "$as_me:13376: 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=
 
@@ -13311,14 +13384,14 @@
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3dxft
-	echo "$as_me:13314: result: yes" >&5
+	echo "$as_me:13387: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:13317: result: no" >&5
+	echo "$as_me:13390: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:13321: checking if you want to link with neXT Athena library" >&5
+echo "$as_me:13394: 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=
 
@@ -13329,14 +13402,14 @@
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=neXtaw
-	echo "$as_me:13332: result: yes" >&5
+	echo "$as_me:13405: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:13335: result: no" >&5
+	echo "$as_me:13408: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:13339: checking if you want to link with Athena-Plus library" >&5
+echo "$as_me:13412: 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=
 
@@ -13347,10 +13420,10 @@
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=XawPlus
-	echo "$as_me:13350: result: yes" >&5
+	echo "$as_me:13423: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:13353: result: no" >&5
+	echo "$as_me:13426: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -13370,17 +13443,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}:13373: testing found package $cf_athena_pkg ..." 1>&5
+echo "${as_me:-configure}:13446: 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}:13379: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:13452: 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}:13383: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:13456: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -13511,20 +13584,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}:13514: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:13587: testing ..trimmed $LIBS ..." 1>&5
 
 			;;
 		esac
 	done
 
-echo "$as_me:13520: checking for usable $cf_x_athena/Xmu package" >&5
+echo "$as_me:13593: 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 13527 "configure"
+#line 13600 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -13542,16 +13615,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13545: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13618: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13548: \$? = $ac_status" >&5
+  echo "$as_me:13621: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13551: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13624: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13554: \$? = $ac_status" >&5
+  echo "$as_me:13627: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xaw_compat=yes
 else
@@ -13561,7 +13634,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13564: result: $cf_cv_xaw_compat" >&5
+echo "$as_me:13637: result: $cf_cv_xaw_compat" >&5
 echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 
 			if test "$cf_cv_xaw_compat" = no
@@ -13573,7 +13646,7 @@
 				(*)
 					test -n "$verbose" && echo "	work around broken package" 1>&6
 
-echo "${as_me:-configure}:13576: testing work around broken package ..." 1>&5
+echo "${as_me:-configure}:13649: testing work around broken package ..." 1>&5
 
 					cf_save_xmu="$LIBS"
 					cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^  *//' -e 's/ .*//'`
@@ -13581,17 +13654,17 @@
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xmu"; then
 	test -n "$verbose" && echo "	found package xmu" 1>&6
 
-echo "${as_me:-configure}:13584: testing found package xmu ..." 1>&5
+echo "${as_me:-configure}:13657: 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}:13590: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:13663: 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}:13594: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:13667: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -13711,12 +13784,12 @@
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:13714: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:13787: 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}:13719: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:13792: testing ...after  $LIBS ..." 1>&5
 
 else
 	cf_pkgconfig_incs=
@@ -13724,12 +13797,12 @@
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:13727: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:13800: 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}:13732: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:13805: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -13740,7 +13813,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}:13743: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:13816: testing ..trimmed $LIBS ..." 1>&5
 
 			;;
 		esac
@@ -13765,17 +13838,17 @@
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "Xext"; then
 	test -n "$verbose" && echo "	found package Xext" 1>&6
 
-echo "${as_me:-configure}:13768: testing found package Xext ..." 1>&5
+echo "${as_me:-configure}:13841: 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}:13774: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:13847: 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}:13778: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:13851: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -13896,7 +13969,7 @@
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
 
-	echo "$as_me:13899: checking for XextCreateExtension in -lXext" >&5
+	echo "$as_me:13972: 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
@@ -13904,7 +13977,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13907 "configure"
+#line 13980 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13923,16 +13996,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13926: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13999: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13929: \$? = $ac_status" >&5
+  echo "$as_me:14002: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13932: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14005: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13935: \$? = $ac_status" >&5
+  echo "$as_me:14008: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
@@ -13943,7 +14016,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13946: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:14019: 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
 
@@ -13979,17 +14052,17 @@
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then
 	test -n "$verbose" && echo "	found package x11" 1>&6
 
-echo "${as_me:-configure}:13982: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:14055: 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}:13988: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14061: 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}:13992: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14065: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -14109,24 +14182,24 @@
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:14112: WARNING: unable to find X11 library" >&5
+	{ echo "$as_me:14185: 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}:14119: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:14192: 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}:14125: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14198: 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}:14129: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14202: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -14246,24 +14319,24 @@
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:14249: WARNING: unable to find ICE library" >&5
+	{ echo "$as_me:14322: 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}:14256: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:14329: 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}:14262: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14335: 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}:14266: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14339: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -14383,24 +14456,24 @@
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:14386: WARNING: unable to find SM library" >&5
+	{ echo "$as_me:14459: 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}:14393: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:14466: 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}:14399: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14472: 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}:14403: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14476: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -14520,7 +14593,7 @@
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:14523: WARNING: unable to find Xt library" >&5
+	{ echo "$as_me:14596: WARNING: unable to find Xt library" >&5
 echo "$as_me: WARNING: unable to find Xt library" >&2;}
 fi
 
@@ -14533,17 +14606,17 @@
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then
 	test -n "$verbose" && echo "	found package xt" 1>&6
 
-echo "${as_me:-configure}:14536: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:14609: 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}:14542: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14615: 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}:14546: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14619: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -14664,14 +14737,14 @@
 		;;
 	(*)
 # we have an "xt" package, but it may omit Xt's dependency on X11
-echo "$as_me:14667: checking for usable X dependency" >&5
+echo "$as_me:14740: 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 14674 "configure"
+#line 14747 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -14691,16 +14764,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14694: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14767: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14697: \$? = $ac_status" >&5
+  echo "$as_me:14770: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14700: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14773: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14703: \$? = $ac_status" >&5
+  echo "$as_me:14776: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xt_x11_compat=yes
 else
@@ -14710,30 +14783,30 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:14713: result: $cf_cv_xt_x11_compat" >&5
+echo "$as_me:14786: 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}:14719: testing work around broken X11 dependency ..." 1>&5
+echo "${as_me:-configure}:14792: 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}:14726: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:14799: 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}:14732: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14805: 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}:14736: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14809: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -14856,12 +14929,12 @@
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:14859: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:14932: 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}:14864: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:14937: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -14869,14 +14942,14 @@
 		;;
 	esac
 
-echo "$as_me:14872: checking for usable X Toolkit package" >&5
+echo "$as_me:14945: 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 14879 "configure"
+#line 14952 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -14892,16 +14965,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14895: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14968: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14898: \$? = $ac_status" >&5
+  echo "$as_me:14971: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14901: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14974: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14904: \$? = $ac_status" >&5
+  echo "$as_me:14977: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xt_ice_compat=yes
 else
@@ -14911,7 +14984,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:14914: result: $cf_cv_xt_ice_compat" >&5
+echo "$as_me:14987: result: $cf_cv_xt_ice_compat" >&5
 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
 
 	if test "$cf_cv_xt_ice_compat" = no
@@ -14925,22 +14998,22 @@
 			(*)
 				test -n "$verbose" && echo "	work around broken ICE dependency" 1>&6
 
-echo "${as_me:-configure}:14928: testing work around broken ICE dependency ..." 1>&5
+echo "${as_me:-configure}:15001: 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}:14933: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:15006: 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}:14939: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:15012: 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}:14943: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:15016: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -15059,17 +15132,17 @@
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then
 	test -n "$verbose" && echo "	found package sm" 1>&6
 
-echo "${as_me:-configure}:15062: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:15135: 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}:15068: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:15141: 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}:15072: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:15145: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -15198,12 +15271,12 @@
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:15201: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:15274: 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}:15206: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:15279: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -15223,7 +15296,7 @@
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:15226: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:15299: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -15308,7 +15381,7 @@
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:15311: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:15384: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -15318,7 +15391,7 @@
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:15321: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:15394: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -15328,7 +15401,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}:15331: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:15404: 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"
@@ -15337,7 +15410,7 @@
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15340 "configure"
+#line 15413 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -15349,16 +15422,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15352: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15425: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15355: \$? = $ac_status" >&5
+  echo "$as_me:15428: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15358: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15431: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15361: \$? = $ac_status" >&5
+  echo "$as_me:15434: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -15366,12 +15439,12 @@
 cat "conftest.$ac_ext" >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:15369: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:15442: 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}:15374: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:15447: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_cflags"
@@ -15379,13 +15452,13 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
-	echo "$as_me:15382: checking for XOpenDisplay" >&5
+	echo "$as_me:15455: 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 15388 "configure"
+#line 15461 "configure"
 #include "confdefs.h"
 #define XOpenDisplay autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15416,16 +15489,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15419: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15492: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15422: \$? = $ac_status" >&5
+  echo "$as_me:15495: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15425: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15498: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15428: \$? = $ac_status" >&5
+  echo "$as_me:15501: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_XOpenDisplay=yes
 else
@@ -15435,13 +15508,13 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15438: result: $ac_cv_func_XOpenDisplay" >&5
+echo "$as_me:15511: 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:15444: checking for XOpenDisplay in -lX11" >&5
+	echo "$as_me:15517: 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
@@ -15449,7 +15522,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15452 "configure"
+#line 15525 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15468,16 +15541,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15471: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15544: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15474: \$? = $ac_status" >&5
+  echo "$as_me:15547: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15477: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15550: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15480: \$? = $ac_status" >&5
+  echo "$as_me:15553: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -15488,7 +15561,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15491: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:15564: 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
 
@@ -15512,13 +15585,13 @@
 
 fi
 
-	echo "$as_me:15515: checking for XtAppInitialize" >&5
+	echo "$as_me:15588: 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 15521 "configure"
+#line 15594 "configure"
 #include "confdefs.h"
 #define XtAppInitialize autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15549,16 +15622,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15552: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15625: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15555: \$? = $ac_status" >&5
+  echo "$as_me:15628: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15558: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15631: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15561: \$? = $ac_status" >&5
+  echo "$as_me:15634: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_XtAppInitialize=yes
 else
@@ -15568,13 +15641,13 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15571: result: $ac_cv_func_XtAppInitialize" >&5
+echo "$as_me:15644: 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:15577: checking for XtAppInitialize in -lXt" >&5
+	echo "$as_me:15650: 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
@@ -15582,7 +15655,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15585 "configure"
+#line 15658 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15601,16 +15674,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15604: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15677: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15607: \$? = $ac_status" >&5
+  echo "$as_me:15680: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15610: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15683: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15613: \$? = $ac_status" >&5
+  echo "$as_me:15686: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xt_XtAppInitialize=yes
 else
@@ -15621,7 +15694,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15624: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:15697: 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
 
@@ -15638,7 +15711,7 @@
 fi
 
 if test "$cf_have_X_LIBS" = no ; then
-	{ echo "$as_me:15641: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+	{ echo "$as_me:15714: 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
@@ -15679,14 +15752,14 @@
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}-I$cf_path/include"
 
-			echo "$as_me:15682: checking for $cf_test in $cf_path" >&5
+			echo "$as_me:15755: 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:15685: checking for $cf_test" >&5
+			echo "$as_me:15758: checking for $cf_test" >&5
 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
 		fi
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 15689 "configure"
+#line 15762 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -15700,16 +15773,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15703: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15776: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15706: \$? = $ac_status" >&5
+  echo "$as_me:15779: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15709: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15782: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15712: \$? = $ac_status" >&5
+  echo "$as_me:15785: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -15718,7 +15791,7 @@
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-		echo "$as_me:15721: result: $cf_result" >&5
+		echo "$as_me:15794: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 LIBS="$cf_save_LIBS_CF_X_ATHENA_CPPFLAGS"
@@ -15734,7 +15807,7 @@
 done
 
 if test -z "$cf_x_athena_inc" ; then
-	{ echo "$as_me:15737: WARNING: Unable to find Athena header files" >&5
+	{ echo "$as_me:15810: 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
 
@@ -15799,10 +15872,10 @@
 done
 LIBS="$cf_add_libs"
 
-		echo "$as_me:15802: checking for $cf_test in $cf_libs" >&5
+		echo "$as_me:15875: 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 15805 "configure"
+#line 15878 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -15819,16 +15892,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15822: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15895: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15825: \$? = $ac_status" >&5
+  echo "$as_me:15898: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15828: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15901: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15831: \$? = $ac_status" >&5
+  echo "$as_me:15904: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -15837,7 +15910,7 @@
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:15840: result: $cf_result" >&5
+		echo "$as_me:15913: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 LIBS="$cf_save_LIBS_CF_X_ATHENA_LIBS"
@@ -15854,7 +15927,7 @@
 done
 
 if test -z "$cf_x_athena_lib" ; then
-	{ { echo "$as_me:15857: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+	{ { echo "$as_me:15930: 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
@@ -15886,23 +15959,23 @@
 for ac_header in X11/Xpoll.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:15889: checking for $ac_header" >&5
+echo "$as_me:15962: 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 15895 "configure"
+#line 15968 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:15899: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:15972: \"$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:15905: \$? = $ac_status" >&5
+  echo "$as_me:15978: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15921,7 +15994,7 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:15924: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:15997: 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
@@ -15931,16 +16004,16 @@
 fi
 done
 
-echo "$as_me:15934: checking for declaration of fd_set" >&5
+echo "$as_me:16007: 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}:15940: testing sys/types alone ..." 1>&5
+echo "${as_me:-configure}:16013: testing sys/types alone ..." 1>&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15943 "configure"
+#line 16016 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -15953,26 +16026,26 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15956: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16029: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15959: \$? = $ac_status" >&5
+  echo "$as_me:16032: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15962: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16035: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15965: \$? = $ac_status" >&5
+  echo "$as_me:16038: \$? = $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}:15972: testing X11/Xpoll.h ..." 1>&5
+echo "${as_me:-configure}:16045: testing X11/Xpoll.h ..." 1>&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15975 "configure"
+#line 16048 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_X11_XPOLL_H
@@ -15987,26 +16060,26 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15990: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16063: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15993: \$? = $ac_status" >&5
+  echo "$as_me:16066: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15996: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16069: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15999: \$? = $ac_status" >&5
+  echo "$as_me:16072: \$? = $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}:16006: testing sys/select.h ..." 1>&5
+echo "${as_me:-configure}:16079: testing sys/select.h ..." 1>&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16009 "configure"
+#line 16082 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -16020,16 +16093,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16023: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16096: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16026: \$? = $ac_status" >&5
+  echo "$as_me:16099: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16029: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16102: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16032: \$? = $ac_status" >&5
+  echo "$as_me:16105: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_type_fd_set=sys/select.h
 else
@@ -16043,7 +16116,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:16046: result: $cf_cv_type_fd_set" >&5
+echo "$as_me:16119: 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
 
@@ -16053,7 +16126,7 @@
 
 fi
 
-echo "$as_me:16056: checking for declaration of fd_mask" >&5
+echo "$as_me:16129: 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
@@ -16061,7 +16134,7 @@
 
     if test x$cf_cv_type_fd_set = xX11/Xpoll.h ; then
         cat >"conftest.$ac_ext" <<_ACEOF
-#line 16064 "configure"
+#line 16137 "configure"
 #include "confdefs.h"
 
 #include <X11/Xpoll.h>
@@ -16074,27 +16147,27 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16077: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16150: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16080: \$? = $ac_status" >&5
+  echo "$as_me:16153: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16083: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16156: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16086: \$? = $ac_status" >&5
+  echo "$as_me:16159: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-echo "${as_me:-configure}:16093: testing if we must define CSRG_BASED ..." 1>&5
+echo "${as_me:-configure}:16166: 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 16097 "configure"
+#line 16170 "configure"
 #include "confdefs.h"
 
 #define CSRG_BASED
@@ -16108,16 +16181,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16111: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16184: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16114: \$? = $ac_status" >&5
+  echo "$as_me:16187: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16117: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16190: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16120: \$? = $ac_status" >&5
+  echo "$as_me:16193: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_type_fd_mask=CSRG_BASED
 else
@@ -16132,7 +16205,7 @@
     fi
 
 fi
-echo "$as_me:16135: result: $cf_cv_type_fd_mask" >&5
+echo "$as_me:16208: 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
 
@@ -16142,14 +16215,14 @@
 
 fi
 
-echo "$as_me:16145: checking for IRIX 6.5 baud-rate redefinitions" >&5
+echo "$as_me:16218: 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 16152 "configure"
+#line 16225 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -16168,16 +16241,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16171: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16244: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16174: \$? = $ac_status" >&5
+  echo "$as_me:16247: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16177: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16250: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16180: \$? = $ac_status" >&5
+  echo "$as_me:16253: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_termio_c_ispeed=yes
 
@@ -16189,21 +16262,21 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16192: result: $cf_cv_termio_c_ispeed" >&5
+echo "$as_me:16265: 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:16199: checking for termios type tcflag_t" >&5
+echo "$as_me:16272: 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 16206 "configure"
+#line 16279 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -16216,16 +16289,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16219: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16292: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16222: \$? = $ac_status" >&5
+  echo "$as_me:16295: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16225: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16298: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16228: \$? = $ac_status" >&5
+  echo "$as_me:16301: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_havetype_tcflag_t=yes
 else
@@ -16236,21 +16309,21 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16239: result: $cf_cv_havetype_tcflag_t" >&5
+echo "$as_me:16312: 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:16246: checking for termios type speed_t" >&5
+echo "$as_me:16319: 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 16253 "configure"
+#line 16326 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -16263,16 +16336,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16266: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16339: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16269: \$? = $ac_status" >&5
+  echo "$as_me:16342: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16272: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16345: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16275: \$? = $ac_status" >&5
+  echo "$as_me:16348: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_havetype_speed_t=yes
 else
@@ -16283,21 +16356,21 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16286: result: $cf_cv_havetype_speed_t" >&5
+echo "$as_me:16359: 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:16293: checking for termios type cc_t" >&5
+echo "$as_me:16366: 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 16300 "configure"
+#line 16373 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -16310,16 +16383,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16313: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16386: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16316: \$? = $ac_status" >&5
+  echo "$as_me:16389: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16319: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16392: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16322: \$? = $ac_status" >&5
+  echo "$as_me:16395: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_havetype_cc_t=yes
 else
@@ -16330,7 +16403,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16333: result: $cf_cv_havetype_cc_t" >&5
+echo "$as_me:16406: 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
@@ -16342,7 +16415,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:16345: checking if we expect to use the Xcursor library" >&5
+echo "$as_me:16418: 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.
@@ -16359,7 +16432,7 @@
 	enable_xcursor=yes
 
 fi;
-echo "$as_me:16362: result: $enable_xcursor" >&5
+echo "$as_me:16435: result: $enable_xcursor" >&5
 echo "${ECHO_T}$enable_xcursor" >&6
 if test "$enable_xcursor" = yes; then
 
@@ -16376,23 +16449,23 @@
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:16379: checking for $ac_header" >&5
+echo "$as_me:16452: 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 16385 "configure"
+#line 16458 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:16389: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:16462: \"$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:16395: \$? = $ac_status" >&5
+  echo "$as_me:16468: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -16411,7 +16484,7 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:16414: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:16487: 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
@@ -16441,13 +16514,13 @@
 for ac_func in $cf_func_grantpt
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:16444: checking for $ac_func" >&5
+echo "$as_me:16517: 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 16450 "configure"
+#line 16523 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -16478,16 +16551,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16481: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16554: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16484: \$? = $ac_status" >&5
+  echo "$as_me:16557: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16487: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16560: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16490: \$? = $ac_status" >&5
+  echo "$as_me:16563: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -16497,7 +16570,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16500: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:16573: 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
@@ -16509,10 +16582,10 @@
 
 cf_grantpt_opts=
 if test "x$ac_cv_func_grantpt" = "xyes" ; then
-	echo "$as_me:16512: checking if grantpt really works" >&5
+	echo "$as_me:16585: checking if grantpt really works" >&5
 echo $ECHO_N "checking if grantpt really works... $ECHO_C" >&6
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 16515 "configure"
+#line 16588 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -16612,23 +16685,23 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16615: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16688: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16618: \$? = $ac_status" >&5
+  echo "$as_me:16691: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16621: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16694: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16624: \$? = $ac_status" >&5
+  echo "$as_me:16697: \$? = $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 16631 "configure"
+#line 16704 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -16726,15 +16799,15 @@
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:16729: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16802: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16732: \$? = $ac_status" >&5
+  echo "$as_me:16805: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:16734: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16807: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16737: \$? = $ac_status" >&5
+  echo "$as_me:16810: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -16753,13 +16826,13 @@
 ac_cv_func_grantpt=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-	echo "$as_me:16756: result: $ac_cv_func_grantpt" >&5
+	echo "$as_me:16829: 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:16762: checking for pty features" >&5
+			echo "$as_me:16835: 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
@@ -16775,15 +16848,15 @@
 				cf_pty_feature=
 				cf_pty_next="`expr $cf_pty_this + 1`"
 
-echo "${as_me:-configure}:16778: testing pty feature test $cf_pty_next:5 ..." 1>&5
+echo "${as_me:-configure}:16851: testing pty feature test $cf_pty_next:5 ..." 1>&5
 
 				if test "$cross_compiling" = yes; then
-  { { echo "$as_me:16781: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:16854: 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 16786 "configure"
+#line 16859 "configure"
 #include "confdefs.h"
 #define CONFTEST $cf_pty_this
 $cf_pty_defines
@@ -16883,15 +16956,15 @@
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:16886: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16959: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16889: \$? = $ac_status" >&5
+  echo "$as_me:16962: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:16891: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16964: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16894: \$? = $ac_status" >&5
+  echo "$as_me:16967: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 				case $cf_pty_next in
@@ -16923,7 +16996,7 @@
 				case $cf_pty_next in
 				(1|2|3)
 
-echo "${as_me:-configure}:16926: testing skipping remaining streams features $cf_pty_this..2 ..." 1>&5
+echo "${as_me:-configure}:16999: testing skipping remaining streams features $cf_pty_this..2 ..." 1>&5
 
 					cf_pty_next=3
 					;;
@@ -16942,7 +17015,7 @@
 
 				cf_pty_this=$cf_pty_next
 			done
-			echo "$as_me:16945: result: $cf_grantpt_opts" >&5
+			echo "$as_me:17018: result: $cf_grantpt_opts" >&5
 echo "${ECHO_T}$cf_grantpt_opts" >&6
 			cf_grantpt_opts=`echo "$cf_grantpt_opts" | sed -e 's/ isatty//'`
 		fi
@@ -16952,10 +17025,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}:16955: testing prefer posix_openpt over openpty ..." 1>&5
+echo "${as_me:-configure}:17028: testing prefer posix_openpt over openpty ..." 1>&5
 
 elif test "x$disable_openpty" != "xyes" || test -z "$cf_grantpt_opts" ; then
-	echo "$as_me:16958: checking for openpty in -lutil" >&5
+	echo "$as_me:17031: 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
@@ -16963,7 +17036,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16966 "configure"
+#line 17039 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16982,16 +17055,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16985: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17058: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16988: \$? = $ac_status" >&5
+  echo "$as_me:17061: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16991: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17064: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16994: \$? = $ac_status" >&5
+  echo "$as_me:17067: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_util_openpty=yes
 else
@@ -17002,7 +17075,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17005: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:17078: 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
@@ -17025,23 +17098,23 @@
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:17028: checking for $ac_header" >&5
+echo "$as_me:17101: 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 17034 "configure"
+#line 17107 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:17038: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:17111: \"$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:17044: \$? = $ac_status" >&5
+  echo "$as_me:17117: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -17060,7 +17133,7 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:17063: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:17136: 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
@@ -17077,7 +17150,7 @@
 then
 	test -n "$verbose" && echo "	will rely upon grantpt" 1>&6
 
-echo "${as_me:-configure}:17080: testing will rely upon grantpt ..." 1>&5
+echo "${as_me:-configure}:17153: testing will rely upon grantpt ..." 1>&5
 
 cat >>confdefs.h <<\EOF
 #define HAVE_WORKING_GRANTPT 1
@@ -17098,23 +17171,23 @@
 then
 	test -n "$verbose" && echo "	will rely upon BSD-pseudoterminals" 1>&6
 
-echo "${as_me:-configure}:17101: testing will rely upon BSD-pseudoterminals ..." 1>&5
+echo "${as_me:-configure}:17174: testing will rely upon BSD-pseudoterminals ..." 1>&5
 
 else
 	test -n "$verbose" && echo "	will rely upon openpty" 1>&6
 
-echo "${as_me:-configure}:17106: testing will rely upon openpty ..." 1>&5
+echo "${as_me:-configure}:17179: testing will rely upon openpty ..." 1>&5
 
 fi
 
-echo "$as_me:17110: checking if we can use XkbQueryExtension" >&5
+echo "$as_me:17183: 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 17117 "configure"
+#line 17190 "configure"
 #include "confdefs.h"
 
 #include <X11/Xlib.h>
@@ -17143,16 +17216,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17146: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17219: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17149: \$? = $ac_status" >&5
+  echo "$as_me:17222: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17152: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17225: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17155: \$? = $ac_status" >&5
+  echo "$as_me:17228: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 cf_cv_xkb_query_extension=yes
@@ -17167,7 +17240,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17170: result: $cf_cv_xkb_query_extension" >&5
+echo "$as_me:17243: result: $cf_cv_xkb_query_extension" >&5
 echo "${ECHO_T}$cf_cv_xkb_query_extension" >&6
 
 if test $cf_cv_xkb_query_extension = yes
@@ -17176,13 +17249,13 @@
 for ac_func in XkbQueryExtension
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:17179: checking for $ac_func" >&5
+echo "$as_me:17252: 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 17185 "configure"
+#line 17258 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -17213,16 +17286,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17216: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17289: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17219: \$? = $ac_status" >&5
+  echo "$as_me:17292: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17222: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17295: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17225: \$? = $ac_status" >&5
+  echo "$as_me:17298: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -17232,7 +17305,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:17235: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:17308: 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
@@ -17244,14 +17317,14 @@
 
 fi
 
-echo "$as_me:17247: checking if we can use XkbKeycodeToKeysym" >&5
+echo "$as_me:17320: 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 17254 "configure"
+#line 17327 "configure"
 #include "confdefs.h"
 
 #include <X11/Xlib.h>
@@ -17269,16 +17342,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17272: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17345: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17275: \$? = $ac_status" >&5
+  echo "$as_me:17348: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17278: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17351: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17281: \$? = $ac_status" >&5
+  echo "$as_me:17354: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 cf_cv_xkb_keycode_to_keysym=yes
@@ -17293,7 +17366,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17296: result: $cf_cv_xkb_keycode_to_keysym" >&5
+echo "$as_me:17369: 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
@@ -17302,13 +17375,13 @@
 for ac_func in XkbKeycodeToKeysym
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:17305: checking for $ac_func" >&5
+echo "$as_me:17378: 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 17311 "configure"
+#line 17384 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -17339,16 +17412,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17342: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17415: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17345: \$? = $ac_status" >&5
+  echo "$as_me:17418: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17348: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17421: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17351: \$? = $ac_status" >&5
+  echo "$as_me:17424: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -17358,7 +17431,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:17361: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:17434: 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
@@ -17386,14 +17459,14 @@
 	esac
 done
 
-echo "$as_me:17389: checking for XKB Bell extension" >&5
+echo "$as_me:17462: 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 17396 "configure"
+#line 17469 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -17414,16 +17487,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17417: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17490: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17420: \$? = $ac_status" >&5
+  echo "$as_me:17493: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17423: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17496: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17426: \$? = $ac_status" >&5
+  echo "$as_me:17499: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xkb_bell_ext=yes
 else
@@ -17434,7 +17507,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17437: result: $cf_cv_xkb_bell_ext" >&5
+echo "$as_me:17510: 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
@@ -17448,13 +17521,13 @@
 for ac_func in Xutf8LookupString
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:17451: checking for $ac_func" >&5
+echo "$as_me:17524: 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 17457 "configure"
+#line 17530 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -17485,16 +17558,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17488: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17561: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17491: \$? = $ac_status" >&5
+  echo "$as_me:17564: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17494: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17567: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17497: \$? = $ac_status" >&5
+  echo "$as_me:17570: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -17504,7 +17577,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:17507: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:17580: 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
@@ -17520,7 +17593,7 @@
 fi
 done
 
-echo "$as_me:17523: checking if you want narrow prototypes for X libraries" >&5
+echo "$as_me:17596: 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
@@ -17546,10 +17619,10 @@
 	enable_narrowproto=$cf_default_narrowproto
 
 fi;
-echo "$as_me:17549: result: $enable_narrowproto" >&5
+echo "$as_me:17622: result: $enable_narrowproto" >&5
 echo "${ECHO_T}$enable_narrowproto" >&6
 
-echo "$as_me:17552: checking if we should use imake to help" >&5
+echo "$as_me:17625: 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.
@@ -17566,7 +17639,7 @@
 	enable_imake=no
 
 fi;
-echo "$as_me:17569: result: $enable_imake" >&5
+echo "$as_me:17642: result: $enable_imake" >&5
 echo "${ECHO_T}$enable_imake" >&6
 
 if test "$enable_imake" = yes ; then
@@ -17575,7 +17648,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:17578: checking for $ac_word" >&5
+echo "$as_me:17651: 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
@@ -17592,7 +17665,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:17595: found $ac_dir/$ac_word" >&5
+   echo "$as_me:17668: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -17603,10 +17676,10 @@
 IMAKE=$ac_cv_path_IMAKE
 
 if test -n "$IMAKE"; then
-  echo "$as_me:17606: result: $IMAKE" >&5
+  echo "$as_me:17679: result: $IMAKE" >&5
 echo "${ECHO_T}$IMAKE" >&6
 else
-  echo "$as_me:17609: result: no" >&5
+  echo "$as_me:17682: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -17666,7 +17739,7 @@
 	then
 		test -n "$verbose" && echo "	Using $IMAKE $cf_imake_opts" 1>&6
 
-echo "${as_me:-configure}:17669: testing Using $IMAKE $cf_imake_opts ..." 1>&5
+echo "${as_me:-configure}:17742: testing Using $IMAKE $cf_imake_opts ..." 1>&5
 
 	else
 		# sometimes imake doesn't have the config path compiled in.  Find it.
@@ -17684,7 +17757,7 @@
 			esac
 		done
 		if test -z "$cf_config" ; then
-			{ echo "$as_me:17687: WARNING: Could not find imake config-directory" >&5
+			{ echo "$as_me:17760: 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"
@@ -17692,10 +17765,10 @@
 			then
 				test -n "$verbose" && echo "	Using $IMAKE $cf_config" 1>&6
 
-echo "${as_me:-configure}:17695: testing Using $IMAKE $cf_config ..." 1>&5
+echo "${as_me:-configure}:17768: testing Using $IMAKE $cf_config ..." 1>&5
 
 			else
-				{ echo "$as_me:17698: WARNING: Cannot run $IMAKE" >&5
+				{ echo "$as_me:17771: WARNING: Cannot run $IMAKE" >&5
 echo "$as_me: WARNING: Cannot run $IMAKE" >&2;}
 			fi
 		fi
@@ -17739,7 +17812,7 @@
 		else
 		    test -n "$verbose" && echo "	suppressed \"$cf_nostdinc\" and \"$cf_std_incl\"" 1>&6
 
-echo "${as_me:-configure}:17742: testing suppressed \"$cf_nostdinc\" and \"$cf_std_incl\" ..." 1>&5
+echo "${as_me:-configure}:17815: testing suppressed \"$cf_nostdinc\" and \"$cf_std_incl\" ..." 1>&5
 
 		    IMAKE_CFLAGS="$cf_cpp_opts"
 		fi
@@ -17761,11 +17834,11 @@
 
 test -n "$verbose" && echo "	IMAKE_CFLAGS $IMAKE_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17764: testing IMAKE_CFLAGS $IMAKE_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17837: testing IMAKE_CFLAGS $IMAKE_CFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	IMAKE_LOADFLAGS $IMAKE_LOADFLAGS" 1>&6
 
-echo "${as_me:-configure}:17768: testing IMAKE_LOADFLAGS $IMAKE_LOADFLAGS ..." 1>&5
+echo "${as_me:-configure}:17841: testing IMAKE_LOADFLAGS $IMAKE_LOADFLAGS ..." 1>&5
 
 fi
 
@@ -17874,7 +17947,7 @@
 	IMAKE_LOADFLAGS=
 	test -n "$verbose" && echo "	make fallback definitions" 1>&6
 
-echo "${as_me:-configure}:17877: testing make fallback definitions ..." 1>&5
+echo "${as_me:-configure}:17950: 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,
@@ -18038,7 +18111,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:18041: checking for $ac_word" >&5
+echo "$as_me:18114: 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
@@ -18055,7 +18128,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:18058: found $ac_dir/$ac_word" >&5
+   echo "$as_me:18131: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -18067,10 +18140,10 @@
 GROFF_PATH=$ac_cv_path_GROFF_PATH
 
 if test -n "$GROFF_PATH"; then
-  echo "$as_me:18070: result: $GROFF_PATH" >&5
+  echo "$as_me:18143: result: $GROFF_PATH" >&5
 echo "${ECHO_T}$GROFF_PATH" >&6
 else
-  echo "$as_me:18073: result: no" >&5
+  echo "$as_me:18146: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -18078,7 +18151,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:18081: checking for $ac_word" >&5
+echo "$as_me:18154: 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
@@ -18095,7 +18168,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:18098: found $ac_dir/$ac_word" >&5
+   echo "$as_me:18171: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -18106,10 +18179,10 @@
 NROFF_PATH=$ac_cv_path_NROFF_PATH
 
 if test -n "$NROFF_PATH"; then
-  echo "$as_me:18109: result: $NROFF_PATH" >&5
+  echo "$as_me:18182: result: $NROFF_PATH" >&5
 echo "${ECHO_T}$NROFF_PATH" >&6
 else
-  echo "$as_me:18112: result: no" >&5
+  echo "$as_me:18185: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -18119,7 +18192,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:18122: checking for $ac_word" >&5
+echo "$as_me:18195: 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
@@ -18136,7 +18209,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:18139: found $ac_dir/$ac_word" >&5
+   echo "$as_me:18212: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -18148,10 +18221,10 @@
 TBL_PATH=$ac_cv_path_TBL_PATH
 
 if test -n "$TBL_PATH"; then
-  echo "$as_me:18151: result: $TBL_PATH" >&5
+  echo "$as_me:18224: result: $TBL_PATH" >&5
 echo "${ECHO_T}$TBL_PATH" >&6
 else
-  echo "$as_me:18154: result: no" >&5
+  echo "$as_me:18227: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -18164,7 +18237,7 @@
 	GROFF_NOTE=
 fi
 
-echo "$as_me:18167: checking for fgrep" >&5
+echo "$as_me:18240: 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
@@ -18176,7 +18249,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:18179: checking for $ac_word" >&5
+echo "$as_me:18252: 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
@@ -18193,7 +18266,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:18196: found $ac_dir/$ac_word" >&5
+   echo "$as_me:18269: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -18204,10 +18277,10 @@
 FGREP=$ac_cv_path_FGREP
 
 if test -n "$FGREP"; then
-  echo "$as_me:18207: result: $FGREP" >&5
+  echo "$as_me:18280: result: $FGREP" >&5
 echo "${ECHO_T}$FGREP" >&6
 else
-  echo "$as_me:18210: result: no" >&5
+  echo "$as_me:18283: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -18215,12 +18288,12 @@
 done
 test -n "$FGREP" || FGREP=": "
 
-     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:18218: error: cannot find workable fgrep" >&5
+     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:18291: error: cannot find workable fgrep" >&5
 echo "$as_me: error: cannot find workable fgrep" >&2;}
    { (exit 1); exit 1; }; }
    fi
 fi
-echo "$as_me:18223: result: $ac_cv_path_FGREP" >&5
+echo "$as_me:18296: result: $ac_cv_path_FGREP" >&5
 echo "${ECHO_T}$ac_cv_path_FGREP" >&6
  FGREP="$ac_cv_path_FGREP"
 
@@ -18231,7 +18304,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:18234: checking for $ac_word" >&5
+echo "$as_me:18307: 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
@@ -18248,7 +18321,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:18251: found $ac_dir/$ac_word" >&5
+   echo "$as_me:18324: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -18260,16 +18333,16 @@
 cf_man2html=$ac_cv_path_cf_man2html
 
 if test -n "$cf_man2html"; then
-  echo "$as_me:18263: result: $cf_man2html" >&5
+  echo "$as_me:18336: result: $cf_man2html" >&5
 echo "${ECHO_T}$cf_man2html" >&6
 else
-  echo "$as_me:18266: result: no" >&5
+  echo "$as_me:18339: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 	case "x$cf_man2html" in
 	(x/*)
-		echo "$as_me:18272: checking for the modified Earl Hood script" >&5
+		echo "$as_me:18345: 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
@@ -18278,7 +18351,7 @@
 			cf_man2html=no
 			cf_man2html_ok=no
 		fi
-		echo "$as_me:18281: result: $cf_man2html_ok" >&5
+		echo "$as_me:18354: result: $cf_man2html_ok" >&5
 echo "${ECHO_T}$cf_man2html_ok" >&6
 		;;
 	(*)
@@ -18287,7 +18360,7 @@
 	esac
 esac
 
-echo "$as_me:18290: checking for program to convert manpage to html" >&5
+echo "$as_me:18363: 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.
@@ -18302,11 +18375,11 @@
 
 case $cf_man2html in
 (yes)
-	echo "$as_me:18305: result: man2html" >&5
+	echo "$as_me:18378: 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:18309: checking for $ac_word" >&5
+echo "$as_me:18382: 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
@@ -18323,7 +18396,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:18326: found $ac_dir/$ac_word" >&5
+   echo "$as_me:18399: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -18335,10 +18408,10 @@
 cf_man2html=$ac_cv_path_cf_man2html
 
 if test -n "$cf_man2html"; then
-  echo "$as_me:18338: result: $cf_man2html" >&5
+  echo "$as_me:18411: result: $cf_man2html" >&5
 echo "${ECHO_T}$cf_man2html" >&6
 else
-  echo "$as_me:18341: result: no" >&5
+  echo "$as_me:18414: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -18346,11 +18419,11 @@
 (no|groff|*/groff*)
 	cf_with_groff=yes
 	cf_man2html=$GROFF_PATH
-	echo "$as_me:18349: result: $cf_man2html" >&5
+	echo "$as_me:18422: result: $cf_man2html" >&5
 echo "${ECHO_T}$cf_man2html" >&6
 	;;
 (*)
-	echo "$as_me:18353: result: $cf_man2html" >&5
+	echo "$as_me:18426: result: $cf_man2html" >&5
 echo "${ECHO_T}$cf_man2html" >&6
 	;;
 esac
@@ -18391,12 +18464,12 @@
 	# disable hyphenation if this is groff
 	if test "x$GROFF_PATH" != xno
 	then
-		echo "$as_me:18394: checking if nroff is really groff" >&5
+		echo "$as_me:18467: 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:18399: result: $cf_check_groff" >&5
+		echo "$as_me:18472: result: $cf_check_groff" >&5
 echo "${ECHO_T}$cf_check_groff" >&6
 		test "x$cf_check_groff" = xyes && NROFF_OPTS="-rHY=0"
 	fi
@@ -18408,33 +18481,31 @@
 	cf_path_syntax="$ac_default_prefix"
 fi
 
-case ".$cf_man2html" in
-(.\$\(*\)*|.\'*\'*)
-	;;
-(..|./*|.\\*)
+case "x$cf_man2html" in
+(x\$\(*\)*|x\'*\'*)
 	;;
-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
+(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
 	;;
-(.\$\{*prefix\}*|.\$\{*dir\}*)
+(x\$\{*prefix\}*|x\$\{*dir\}*)
 	eval cf_man2html="$cf_man2html"
-	case ".$cf_man2html" in
-	(.NONE/*)
+	case "x$cf_man2html" in
+	(xNONE/*)
 		cf_man2html=`echo "$cf_man2html" | sed -e s%NONE%$cf_path_syntax%`
 		;;
 	esac
 	;;
-(.no|.NONE/*)
+(xno|xNONE/*)
 	cf_man2html=`echo "$cf_man2html" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:18430: error: expected a pathname, not \"$cf_man2html\"" >&5
+	{ { echo "$as_me:18501: 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:18437: checking for $cf_man2html top/bottom margins" >&5
+	echo "$as_me:18508: 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
@@ -18452,10 +18523,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:18455: result: $cf_man2html_top_bot" >&5
+	echo "$as_me:18526: result: $cf_man2html_top_bot" >&5
 echo "${ECHO_T}$cf_man2html_top_bot" >&6
 
-	echo "$as_me:18458: checking for pagesize to use" >&5
+	echo "$as_me:18529: 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
@@ -18480,7 +18551,7 @@
 	test "$cf_man2html_page" -gt 100 && cf_man2html_page=99999
 
 	rm -rf conftest*
-	echo "$as_me:18483: result: $cf_man2html_page" >&5
+	echo "$as_me:18554: result: $cf_man2html_page" >&5
 echo "${ECHO_T}$cf_man2html_page" >&6
 
 	cat >>$MAN2HTML_TEMP <<CF_EOF
@@ -18508,27 +18579,27 @@
 
 	test -n "$verbose" && echo "	removing terminfo flags from IMAKE_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:18511: testing removing terminfo flags from IMAKE_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:18582: 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}:18516: testing ...result $IMAKE_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:18587: testing ...result $IMAKE_CFLAGS ..." 1>&5
 
 	test -n "$verbose" && echo "	removing terminfo flags from CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:18520: testing removing terminfo flags from CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:18591: 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}:18525: testing ...result $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:18596: testing ...result $CPPFLAGS ..." 1>&5
 
 		;;
 	esac
 fi
 
-echo "$as_me:18531: checking for default terminal-id" >&5
+echo "$as_me:18602: 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.
@@ -18538,7 +18609,7 @@
 else
   default_termid=vt420
 fi;
-echo "$as_me:18541: result: $default_termid" >&5
+echo "$as_me:18612: result: $default_termid" >&5
 echo "${ECHO_T}$default_termid" >&6
 case $default_termid in
 (vt*)	default_termid=`echo $default_termid | sed -e 's/^..//'`
@@ -18546,7 +18617,7 @@
 ([1-9][0-9][0-9]|[1-9][0-9])
 	;;
 (*)
-	{ { echo "$as_me:18549: error: expected a number, not $default_termid" >&5
+	{ { echo "$as_me:18620: error: expected a number, not $default_termid" >&5
 echo "$as_me: error: expected a number, not $default_termid" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -18556,7 +18627,7 @@
 #define DFT_DECID "$default_termid"
 EOF
 
-echo "$as_me:18559: checking for default terminal-type" >&5
+echo "$as_me:18630: 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.
@@ -18566,7 +18637,7 @@
 else
   default_TERM=xterm
 fi;
-echo "$as_me:18569: result: $default_TERM" >&5
+echo "$as_me:18640: result: $default_TERM" >&5
 echo "${ECHO_T}$default_TERM" >&6
 
 cat >>confdefs.h <<EOF
@@ -18574,7 +18645,7 @@
 EOF
 
 ###############################################################################
-echo "$as_me:18577: checking if backarrow-key should be BS" >&5
+echo "$as_me:18648: 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.
@@ -18592,7 +18663,7 @@
 
 fi;
 
-echo "$as_me:18595: result: $backarrow_is_bs" >&5
+echo "$as_me:18666: result: $backarrow_is_bs" >&5
 echo "${ECHO_T}$backarrow_is_bs" >&6
 case $backarrow_is_bs in
 (yes)
@@ -18613,7 +18684,7 @@
 #define DEF_BACKARO_BS $backarrow_is_bs
 EOF
 
-echo "$as_me:18616: checking if backarrow-key should be treated as erase" >&5
+echo "$as_me:18687: 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.
@@ -18631,7 +18702,7 @@
 
 fi;
 
-echo "$as_me:18634: result: $backarrow_is_erase" >&5
+echo "$as_me:18705: result: $backarrow_is_erase" >&5
 echo "${ECHO_T}$backarrow_is_erase" >&6
 case $backarrow_is_erase in
 (yes)
@@ -18652,7 +18723,7 @@
 #define DEF_BACKARO_ERASE $backarrow_is_erase
 EOF
 
-echo "$as_me:18655: checking for default backspace/DEL setting" >&5
+echo "$as_me:18726: 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.
@@ -18663,7 +18734,7 @@
   delete_is_del=maybe
 fi;
 
-echo "$as_me:18666: result: $delete_is_del" >&5
+echo "$as_me:18737: result: $delete_is_del" >&5
 echo "${ECHO_T}$delete_is_del" >&6
 case $delete_is_del in
 (yes)
@@ -18684,7 +18755,7 @@
 #define DEFDELETE_DEL $delete_is_del
 EOF
 
-echo "$as_me:18687: checking for default pty initial erase setting" >&5
+echo "$as_me:18758: 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.
@@ -18695,7 +18766,7 @@
   initial_erase=False
 fi;
 
-echo "$as_me:18698: result: $initial_erase" >&5
+echo "$as_me:18769: result: $initial_erase" >&5
 echo "${ECHO_T}$initial_erase" >&6
 case $initial_erase in
 (yes)
@@ -18716,7 +18787,7 @@
 #define DEF_INITIAL_ERASE $initial_erase
 EOF
 
-echo "$as_me:18719: checking if alt should send ESC" >&5
+echo "$as_me:18790: 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.
@@ -18734,7 +18805,7 @@
 
 fi;
 
-echo "$as_me:18737: result: $alt_sends_esc" >&5
+echo "$as_me:18808: result: $alt_sends_esc" >&5
 echo "${ECHO_T}$alt_sends_esc" >&6
 case $alt_sends_esc in
 (yes)
@@ -18755,7 +18826,7 @@
 #define DEF_ALT_SENDS_ESC $alt_sends_esc
 EOF
 
-echo "$as_me:18758: checking if meta should send ESC" >&5
+echo "$as_me:18829: 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.
@@ -18773,7 +18844,7 @@
 
 fi;
 
-echo "$as_me:18776: result: $meta_sends_esc" >&5
+echo "$as_me:18847: result: $meta_sends_esc" >&5
 echo "${ECHO_T}$meta_sends_esc" >&6
 case $meta_sends_esc in
 (yes)
@@ -18797,7 +18868,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:18800: checking for $ac_word" >&5
+echo "$as_me:18871: 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
@@ -18812,7 +18883,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:18815: found $ac_dir/$ac_word" >&5
+echo "$as_me:18886: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -18821,10 +18892,10 @@
 fi
 cf_tic_prog=$ac_cv_prog_cf_tic_prog
 if test -n "$cf_tic_prog"; then
-  echo "$as_me:18824: result: $cf_tic_prog" >&5
+  echo "$as_me:18895: result: $cf_tic_prog" >&5
 echo "${ECHO_T}$cf_tic_prog" >&6
 else
-  echo "$as_me:18827: result: no" >&5
+  echo "$as_me:18898: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -18840,7 +18911,7 @@
 			;;
 		esac
 	fi
-	echo "$as_me:18843: checking for private terminfo-directory" >&5
+	echo "$as_me:18914: 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.
@@ -18850,10 +18921,10 @@
 else
   TERMINFO_DIR=${TERMINFO-none}
 fi;
-	echo "$as_me:18853: result: $TERMINFO_DIR" >&5
+	echo "$as_me:18924: result: $TERMINFO_DIR" >&5
 echo "${ECHO_T}$TERMINFO_DIR" >&6
 	if test "$TERMINFO_DIR" = yes ; then
-		{ echo "$as_me:18856: WARNING: no value given" >&5
+		{ echo "$as_me:18927: 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
@@ -18862,7 +18933,7 @@
 #define OWN_TERMINFO_DIR "$TERMINFO_DIR"
 EOF
 
-			echo "$as_me:18865: checking if \$TERMINFO should also be set" >&5
+			echo "$as_me:18936: 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.
@@ -18872,7 +18943,7 @@
 else
   cf_env_terminfo=no
 fi;
-			echo "$as_me:18875: result: $cf_env_terminfo" >&5
+			echo "$as_me:18946: result: $cf_env_terminfo" >&5
 echo "${ECHO_T}$cf_env_terminfo" >&6
 			test $cf_env_terminfo = yes &&
 
@@ -18881,7 +18952,7 @@
 EOF
 
 		else
-			{ echo "$as_me:18884: WARNING: not a directory" >&5
+			{ echo "$as_me:18955: WARNING: not a directory" >&5
 echo "$as_me: WARNING: not a directory" >&2;}
 		fi
 	elif test "$prefix" != NONE ; then
@@ -18905,7 +18976,7 @@
 
 ###############################################################################
 
-echo "$as_me:18908: checking if you want active-icons" >&5
+echo "$as_me:18979: 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.
@@ -18922,7 +18993,7 @@
 	enable_active_icon=yes
 
 fi;
-echo "$as_me:18925: result: $enable_active_icon" >&5
+echo "$as_me:18996: result: $enable_active_icon" >&5
 echo "${ECHO_T}$enable_active_icon" >&6
 if test "$enable_active_icon" = no ; then
 
@@ -18932,7 +19003,7 @@
 
 fi
 
-echo "$as_me:18935: checking if you want ANSI color" >&5
+echo "$as_me:19006: 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.
@@ -18949,7 +19020,7 @@
 	enable_ansi_color=yes
 
 fi;
-echo "$as_me:18952: result: $enable_ansi_color" >&5
+echo "$as_me:19023: result: $enable_ansi_color" >&5
 echo "${ECHO_T}$enable_ansi_color" >&6
 test "$enable_ansi_color" = no &&
 cat >>confdefs.h <<\EOF
@@ -18958,7 +19029,7 @@
 
 if test "$enable_ansi_color" = yes ; then
 
-	echo "$as_me:18961: checking if you want 16 colors like aixterm" >&5
+	echo "$as_me:19032: 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.
@@ -18975,14 +19046,14 @@
 	enable_16_color=yes
 
 fi;
-	echo "$as_me:18978: result: $enable_16_color" >&5
+	echo "$as_me:19049: 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:18985: checking if you want 256 colors" >&5
+	echo "$as_me:19056: 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.
@@ -18999,7 +19070,7 @@
 	enable_256_color=yes
 
 fi;
-	echo "$as_me:19002: result: $enable_256_color" >&5
+	echo "$as_me:19073: result: $enable_256_color" >&5
 echo "${ECHO_T}$enable_256_color" >&6
 
 	if test "$enable_256_color" = yes ; then
@@ -19011,7 +19082,7 @@
 #define OPT_256_COLORS 1
 EOF
 
-		echo "$as_me:19014: checking if you want direct-color support" >&5
+		echo "$as_me:19085: 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.
@@ -19028,7 +19099,7 @@
 	enable_direct_color=yes
 
 fi;
-		echo "$as_me:19031: result: $enable_direct_color" >&5
+		echo "$as_me:19102: result: $enable_direct_color" >&5
 echo "${ECHO_T}$enable_direct_color" >&6
 		if test "$enable_direct_color" = yes ; then
 
@@ -19040,7 +19111,7 @@
 
 	else
 
-		echo "$as_me:19043: checking if you want 88 colors" >&5
+		echo "$as_me:19114: 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.
@@ -19057,7 +19128,7 @@
 	enable_88_color=yes
 
 fi;
-		echo "$as_me:19060: result: $enable_88_color" >&5
+		echo "$as_me:19131: 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"
@@ -19073,7 +19144,7 @@
 
 fi
 
-echo "$as_me:19076: checking if you want blinking cursor" >&5
+echo "$as_me:19147: 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.
@@ -19090,14 +19161,14 @@
 	enable_blink_curs=yes
 
 fi;
-echo "$as_me:19093: result: $enable_blink_curs" >&5
+echo "$as_me:19164: 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:19100: checking if you want to ignore Linux's broken palette-strings" >&5
+echo "$as_me:19171: 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
@@ -19121,7 +19192,7 @@
 	enable_broken_osc=$enableval
 
 fi;
-echo "$as_me:19124: result: $enable_broken_osc" >&5
+echo "$as_me:19195: result: $enable_broken_osc" >&5
 echo "${ECHO_T}$enable_broken_osc" >&6
 if test "$enable_broken_osc" = yes ; then
 
@@ -19137,7 +19208,7 @@
 
 fi
 
-echo "$as_me:19140: checking if you want to allow broken string-terminators" >&5
+echo "$as_me:19211: 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.
@@ -19154,14 +19225,14 @@
 	enable_broken_st=yes
 
 fi;
-echo "$as_me:19157: result: $enable_broken_st" >&5
+echo "$as_me:19228: 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:19164: checking if you want to compile-in icon data" >&5
+echo "$as_me:19235: 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.
@@ -19178,14 +19249,14 @@
 	enable_builtin_xpms=no
 
 fi;
-echo "$as_me:19181: result: $enable_builtin_xpms" >&5
+echo "$as_me:19252: 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:19188: checking if you want printable 128-159" >&5
+echo "$as_me:19259: 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.
@@ -19202,7 +19273,7 @@
 	enable_c1_print=yes
 
 fi;
-echo "$as_me:19205: result: $enable_c1_print" >&5
+echo "$as_me:19276: result: $enable_c1_print" >&5
 echo "${ECHO_T}$enable_c1_print" >&6
 test "$enable_c1_print" = no &&
 cat >>confdefs.h <<\EOF
@@ -19211,7 +19282,7 @@
 
 if test "$enable_ansi_color" = yes ; then
 
-	echo "$as_me:19214: checking if you want bold colors mapped like IBM PC" >&5
+	echo "$as_me:19285: 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.
@@ -19228,14 +19299,14 @@
 	enable_pc_color=yes
 
 fi;
-	echo "$as_me:19231: result: $enable_pc_color" >&5
+	echo "$as_me:19302: 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:19238: checking if you want separate color-classes" >&5
+	echo "$as_me:19309: 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.
@@ -19252,14 +19323,14 @@
 	enable_color_class=yes
 
 fi;
-	echo "$as_me:19255: result: $enable_color_class" >&5
+	echo "$as_me:19326: 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:19262: checking if you want color-mode enabled by default" >&5
+	echo "$as_me:19333: 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.
@@ -19276,7 +19347,7 @@
 	default_colormode=yes
 
 fi;
-	echo "$as_me:19279: result: $default_colormode" >&5
+	echo "$as_me:19350: result: $default_colormode" >&5
 echo "${ECHO_T}$default_colormode" >&6
 	test "$default_colormode" = no &&
 cat >>confdefs.h <<\EOF
@@ -19285,7 +19356,7 @@
 
 fi
 
-echo "$as_me:19288: checking if you want support for color highlighting" >&5
+echo "$as_me:19359: 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.
@@ -19302,14 +19373,14 @@
 	default_highlight=yes
 
 fi;
-echo "$as_me:19305: result: $default_highlight" >&5
+echo "$as_me:19376: 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:19312: checking if you want support for doublesize characters" >&5
+echo "$as_me:19383: 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.
@@ -19326,14 +19397,14 @@
 	enable_doublechars=yes
 
 fi;
-echo "$as_me:19329: result: $enable_doublechars" >&5
+echo "$as_me:19400: 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:19336: checking if you want fallback-support for box characters" >&5
+echo "$as_me:19407: 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.
@@ -19350,14 +19421,14 @@
 	enable_boxchars=yes
 
 fi;
-echo "$as_me:19353: result: $enable_boxchars" >&5
+echo "$as_me:19424: 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:19360: checking if you want to allow spawning commands to process selections" >&5
+echo "$as_me:19431: 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.
@@ -19374,7 +19445,7 @@
 	enable_exec_selection=yes
 
 fi;
-echo "$as_me:19377: result: $enable_exec_selection" >&5
+echo "$as_me:19448: result: $enable_exec_selection" >&5
 echo "${ECHO_T}$enable_exec_selection" >&6
 if test "$enable_exec_selection" = no ; then
 
@@ -19384,7 +19455,7 @@
 
 fi
 
-echo "$as_me:19387: checking if you want to allow spawning new xterms" >&5
+echo "$as_me:19458: 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.
@@ -19401,11 +19472,11 @@
 	enable_exec_xterm=no
 
 fi;
-echo "$as_me:19404: result: $enable_exec_xterm" >&5
+echo "$as_me:19475: result: $enable_exec_xterm" >&5
 echo "${ECHO_T}$enable_exec_xterm" >&6
 if test "$enable_exec_xterm" = yes ; then
 
-echo "$as_me:19408: checking for proc tree with cwd-support" >&5
+echo "$as_me:19479: 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
@@ -19424,11 +19495,11 @@
 done
 
 fi
-echo "$as_me:19427: result: $cf_cv_procfs_cwd" >&5
+echo "$as_me:19498: 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:19431: WARNING: no suitable proc filesystem found" >&5
+		{ echo "$as_me:19502: WARNING: no suitable proc filesystem found" >&5
 echo "$as_me: WARNING: no suitable proc filesystem found" >&2;}
 	else
 
@@ -19446,17 +19517,17 @@
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "Xext"; then
 	test -n "$verbose" && echo "	found package Xext" 1>&6
 
-echo "${as_me:-configure}:19449: testing found package Xext ..." 1>&5
+echo "${as_me:-configure}:19520: 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}:19455: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:19526: 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}:19459: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:19530: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -19577,7 +19648,7 @@
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
 
-	echo "$as_me:19580: checking for XextCreateExtension in -lXext" >&5
+	echo "$as_me:19651: 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
@@ -19585,7 +19656,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19588 "configure"
+#line 19659 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19604,16 +19675,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19607: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19678: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19610: \$? = $ac_status" >&5
+  echo "$as_me:19681: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19613: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19684: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19616: \$? = $ac_status" >&5
+  echo "$as_me:19687: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
@@ -19624,7 +19695,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19627: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:19698: 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
 
@@ -19648,23 +19719,23 @@
 
 fi
 
-echo "$as_me:19651: checking for X11/extensions/Xdbe.h" >&5
+echo "$as_me:19722: 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 19657 "configure"
+#line 19728 "configure"
 #include "confdefs.h"
 #include <X11/extensions/Xdbe.h>
 _ACEOF
-if { (eval echo "$as_me:19661: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:19732: \"$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:19667: \$? = $ac_status" >&5
+  echo "$as_me:19738: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -19683,7 +19754,7 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:19686: result: $ac_cv_header_X11_extensions_Xdbe_h" >&5
+echo "$as_me:19757: 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
 
@@ -19691,13 +19762,13 @@
 #define HAVE_X11_EXTENSIONS_XDBE_H 1
 EOF
 
-	echo "$as_me:19694: checking for XdbeSwapBuffers" >&5
+	echo "$as_me:19765: 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 19700 "configure"
+#line 19771 "configure"
 #include "confdefs.h"
 #define XdbeSwapBuffers autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -19728,16 +19799,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19731: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19802: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19734: \$? = $ac_status" >&5
+  echo "$as_me:19805: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19737: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19808: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19740: \$? = $ac_status" >&5
+  echo "$as_me:19811: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_XdbeSwapBuffers=yes
 else
@@ -19747,7 +19818,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19750: result: $ac_cv_func_XdbeSwapBuffers" >&5
+echo "$as_me:19821: result: $ac_cv_func_XdbeSwapBuffers" >&5
 echo "${ECHO_T}$ac_cv_func_XdbeSwapBuffers" >&6
 if test "$ac_cv_func_XdbeSwapBuffers" = yes; then
 
@@ -19762,7 +19833,7 @@
 
 double_buffer=False
 if test "$cf_x_ext_double_buffer" = yes ; then
-	echo "$as_me:19765: checking if you want to enable double-buffering in default resources" >&5
+	echo "$as_me:19836: 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.
@@ -19779,7 +19850,7 @@
 	enable_double_bfr=no
 
 fi;
-	echo "$as_me:19782: result: $enable_double_bfr" >&5
+	echo "$as_me:19853: result: $enable_double_bfr" >&5
 echo "${ECHO_T}$enable_double_bfr" >&6
 	if test "$enable_double_bfr" = yes ; then
 
@@ -19791,7 +19862,7 @@
 	fi
 fi
 
-echo "$as_me:19794: checking if you want to use FreeType library" >&5
+echo "$as_me:19865: 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.
@@ -19808,7 +19879,7 @@
 	enable_freetype=yes
 
 fi;
-echo "$as_me:19811: result: $enable_freetype" >&5
+echo "$as_me:19882: result: $enable_freetype" >&5
 echo "${ECHO_T}$enable_freetype" >&6
 if test "$enable_freetype" = yes ; then
 
@@ -19818,7 +19889,7 @@
 FREETYPE_CONFIG=none
 FREETYPE_PARAMS=
 
-echo "$as_me:19821: checking for FreeType configuration script" >&5
+echo "$as_me:19892: 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.
@@ -19830,12 +19901,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:19833: result: $cf_cv_x_freetype_cfgs" >&5
+echo "$as_me:19904: 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:19838: checking if you specified -D/-I options for FreeType" >&5
+	echo "$as_me:19909: 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.
@@ -19845,10 +19916,10 @@
 else
   cf_cv_x_freetype_incs=no
 fi;
-	echo "$as_me:19848: result: $cf_cv_x_freetype_incs" >&5
+	echo "$as_me:19919: result: $cf_cv_x_freetype_incs" >&5
 echo "${ECHO_T}$cf_cv_x_freetype_incs" >&6
 
-	echo "$as_me:19851: checking if you specified -L/-l options for FreeType" >&5
+	echo "$as_me:19922: 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.
@@ -19858,7 +19929,7 @@
 else
   cf_cv_x_freetype_libs=no
 fi;
-	echo "$as_me:19861: result: $cf_cv_x_freetype_libs" >&5
+	echo "$as_me:19932: result: $cf_cv_x_freetype_libs" >&5
 echo "${ECHO_T}$cf_cv_x_freetype_libs" >&6
 	;;
 (auto)
@@ -19868,7 +19939,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:19871: checking for $ac_word" >&5
+echo "$as_me:19942: 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
@@ -19885,7 +19956,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:19888: found $ac_dir/$ac_word" >&5
+   echo "$as_me:19959: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -19897,10 +19968,10 @@
 FREETYPE_CONFIG=$ac_cv_path_FREETYPE_CONFIG
 
 if test -n "$FREETYPE_CONFIG"; then
-  echo "$as_me:19900: result: $FREETYPE_CONFIG" >&5
+  echo "$as_me:19971: result: $FREETYPE_CONFIG" >&5
 echo "${ECHO_T}$FREETYPE_CONFIG" >&6
 else
-  echo "$as_me:19903: result: no" >&5
+  echo "$as_me:19974: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -19910,7 +19981,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:19913: checking for $ac_word" >&5
+echo "$as_me:19984: 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
@@ -19927,7 +19998,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:19930: found $ac_dir/$ac_word" >&5
+   echo "$as_me:20001: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -19939,10 +20010,10 @@
 FREETYPE_OLD_CONFIG=$ac_cv_path_FREETYPE_OLD_CONFIG
 
 if test -n "$FREETYPE_OLD_CONFIG"; then
-  echo "$as_me:19942: result: $FREETYPE_OLD_CONFIG" >&5
+  echo "$as_me:20013: result: $FREETYPE_OLD_CONFIG" >&5
 echo "${ECHO_T}$FREETYPE_OLD_CONFIG" >&6
 else
-  echo "$as_me:19945: result: no" >&5
+  echo "$as_me:20016: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -19957,14 +20028,14 @@
 		FREETYPE_CONFIG=$cf_cv_x_freetype_cfgs
 		FREETYPE_PARAMS=xft
 	else
-		{ echo "$as_me:19960: WARNING: cannot find pkg-config for Xft" >&5
+		{ echo "$as_me:20031: 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:19967: checking for $ac_word" >&5
+echo "$as_me:20038: 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
@@ -19981,7 +20052,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:19984: found $ac_dir/$ac_word" >&5
+   echo "$as_me:20055: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -19993,41 +20064,41 @@
 FREETYPE_XFT_CONFIG=$ac_cv_path_FREETYPE_XFT_CONFIG
 
 if test -n "$FREETYPE_XFT_CONFIG"; then
-  echo "$as_me:19996: result: $FREETYPE_XFT_CONFIG" >&5
+  echo "$as_me:20067: result: $FREETYPE_XFT_CONFIG" >&5
 echo "${ECHO_T}$FREETYPE_XFT_CONFIG" >&6
 else
-  echo "$as_me:19999: result: no" >&5
+  echo "$as_me:20070: 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:20006: WARNING: cannot find config script for Xft" >&5
+		{ echo "$as_me:20077: 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:20013: checking for FreeType config" >&5
+	echo "$as_me:20084: checking for FreeType config" >&5
 echo $ECHO_N "checking for FreeType config... $ECHO_C" >&6
-	echo "$as_me:20015: result: $FREETYPE_CONFIG $FREETYPE_PARAMS" >&5
+	echo "$as_me:20086: 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:20019: checking for $FREETYPE_CONFIG cflags" >&5
+		echo "$as_me:20090: 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:20022: result: $cf_cv_x_freetype_incs" >&5
+		echo "$as_me:20093: 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:20027: checking for $FREETYPE_CONFIG libs" >&5
+		echo "$as_me:20098: 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:20030: result: $cf_cv_x_freetype_libs" >&5
+		echo "$as_me:20101: result: $cf_cv_x_freetype_libs" >&5
 echo "${ECHO_T}$cf_cv_x_freetype_libs" >&6
 	fi
 fi
@@ -20040,7 +20111,7 @@
 	cf_cv_x_freetype_libs=-lXft
 fi
 
-echo "$as_me:20043: checking if we can link with FreeType libraries" >&5
+echo "$as_me:20114: 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"
@@ -20065,7 +20136,7 @@
 CPPFLAGS="$CPPFLAGS $cf_cv_x_freetype_incs"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20068 "configure"
+#line 20139 "configure"
 #include "confdefs.h"
 
 #include <X11/Xlib.h>
@@ -20081,16 +20152,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20084: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20155: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20087: \$? = $ac_status" >&5
+  echo "$as_me:20158: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20090: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20161: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20093: \$? = $ac_status" >&5
+  echo "$as_me:20164: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_found_freetype=yes
 else
@@ -20099,7 +20170,7 @@
 cf_cv_found_freetype=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-echo "$as_me:20102: result: $cf_cv_found_freetype" >&5
+echo "$as_me:20173: result: $cf_cv_found_freetype" >&5
 echo "${ECHO_T}$cf_cv_found_freetype" >&6
 
 LIBS="$cf_save_LIBS"
@@ -20232,13 +20303,13 @@
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:20235: checking for $ac_func" >&5
+echo "$as_me:20306: 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 20241 "configure"
+#line 20312 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20269,16 +20340,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20272: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20343: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20275: \$? = $ac_status" >&5
+  echo "$as_me:20346: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20278: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20349: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20281: \$? = $ac_status" >&5
+  echo "$as_me:20352: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -20288,7 +20359,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20291: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:20362: 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
@@ -20299,7 +20370,7 @@
 done
 
 else
-	{ echo "$as_me:20302: WARNING: No libraries found for FreeType" >&5
+	{ echo "$as_me:20373: 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
@@ -20307,16 +20378,17 @@
 # FIXME: revisit this if needed
 
 if test "$cf_cv_found_freetype" = yes ; then
-echo "$as_me:20310: checking for usable Xft/fontconfig package" >&5
+echo "$as_me:20381: 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 20317 "configure"
+#line 20388 "configure"
 #include "confdefs.h"
 
+#include <X11/Xlib.h>
 #include <X11/Xft/Xft.h>
 
 int
@@ -20333,16 +20405,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20336: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20408: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20339: \$? = $ac_status" >&5
+  echo "$as_me:20411: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20342: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20414: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20345: \$? = $ac_status" >&5
+  echo "$as_me:20417: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xft_compat=yes
 else
@@ -20353,7 +20425,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:20356: result: $cf_cv_xft_compat" >&5
+echo "$as_me:20428: result: $cf_cv_xft_compat" >&5
 echo "${ECHO_T}$cf_cv_xft_compat" >&6
 
 if test "$cf_cv_xft_compat" = no
@@ -20365,24 +20437,24 @@
 	(*)
 		test -n "$verbose" && echo "	work around broken package" 1>&6
 
-echo "${as_me:-configure}:20368: testing work around broken package ..." 1>&5
+echo "${as_me:-configure}:20440: 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}:20375: testing found package fontconfig ..." 1>&5
+echo "${as_me:-configure}:20447: 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}:20381: testing package fontconfig CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:20453: 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}:20385: testing package fontconfig LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:20457: testing package fontconfig LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -20600,12 +20672,12 @@
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:20603: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:20675: 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}:20608: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:20680: testing ...after  $LIBS ..." 1>&5
 
 else
 	cf_pkgconfig_incs=
@@ -20613,12 +20685,12 @@
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:20616: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:20688: 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}:20621: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:20693: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -20631,7 +20703,7 @@
 	CPPFLAGS=`echo "$CPPFLAGS" | sed -e s/-DXRENDERFONT//`
 fi
 
-echo "$as_me:20634: checking if you want support for HP-style function keys" >&5
+echo "$as_me:20706: 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.
@@ -20648,7 +20720,7 @@
 	enable_hp_fkeys=no
 
 fi;
-echo "$as_me:20651: result: $enable_hp_fkeys" >&5
+echo "$as_me:20723: result: $enable_hp_fkeys" >&5
 echo "${ECHO_T}$enable_hp_fkeys" >&6
 if test "$enable_hp_fkeys" = yes ; then
 
@@ -20658,7 +20730,7 @@
 
 fi
 
-echo "$as_me:20661: checking if you want support for SCO-style function keys" >&5
+echo "$as_me:20733: 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.
@@ -20675,7 +20747,7 @@
 	enable_sco_fkeys=no
 
 fi;
-echo "$as_me:20678: result: $enable_sco_fkeys" >&5
+echo "$as_me:20750: result: $enable_sco_fkeys" >&5
 echo "${ECHO_T}$enable_sco_fkeys" >&6
 if test "$enable_sco_fkeys" = yes ; then
 
@@ -20685,7 +20757,7 @@
 
 fi
 
-echo "$as_me:20688: checking if you want support for Sun-style function keys" >&5
+echo "$as_me:20760: 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.
@@ -20702,7 +20774,7 @@
 	enable_sun_fkeys=yes
 
 fi;
-echo "$as_me:20705: result: $enable_sun_fkeys" >&5
+echo "$as_me:20777: result: $enable_sun_fkeys" >&5
 echo "${ECHO_T}$enable_sun_fkeys" >&6
 if test "$enable_sun_fkeys" = no ; then
 
@@ -20712,7 +20784,7 @@
 
 fi
 
-echo "$as_me:20715: checking if you want saved-lines stored as a FIFO" >&5
+echo "$as_me:20787: 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.
@@ -20729,14 +20801,14 @@
 	enable_fifo_lines=yes
 
 fi;
-echo "$as_me:20732: result: $enable_fifo_lines" >&5
+echo "$as_me:20804: result: $enable_fifo_lines" >&5
 echo "${ECHO_T}$enable_fifo_lines" >&6
 if test "$enable_fifo_lines" != yes ; then
-	{ echo "$as_me:20735: WARNING: this option has been deprecated" >&5
+	{ echo "$as_me:20807: WARNING: this option has been deprecated" >&5
 echo "$as_me: WARNING: this option has been deprecated" >&2;}
 fi
 
-echo "$as_me:20739: checking if you want support for internationalization" >&5
+echo "$as_me:20811: 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.
@@ -20753,7 +20825,7 @@
 	enable_i18n=yes
 
 fi;
-echo "$as_me:20756: result: $enable_i18n" >&5
+echo "$as_me:20828: result: $enable_i18n" >&5
 echo "${ECHO_T}$enable_i18n" >&6
 if test "$enable_i18n" = no ; then
 
@@ -20763,7 +20835,7 @@
 
 fi
 
-echo "$as_me:20766: checking if you want support for initial-erase setup" >&5
+echo "$as_me:20838: 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.
@@ -20780,7 +20852,7 @@
 	enable_ie=yes
 
 fi;
-echo "$as_me:20783: result: $enable_ie" >&5
+echo "$as_me:20855: result: $enable_ie" >&5
 echo "${ECHO_T}$enable_ie" >&6
 if test "$enable_ie" = no ; then
 
@@ -20790,7 +20862,7 @@
 
 fi
 
-echo "$as_me:20793: checking if you want support for input-method" >&5
+echo "$as_me:20865: 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.
@@ -20807,17 +20879,17 @@
 	enable_ximp=$enable_i18n
 
 fi;
-echo "$as_me:20810: result: $enable_ximp" >&5
+echo "$as_me:20882: result: $enable_ximp" >&5
 echo "${ECHO_T}$enable_ximp" >&6
 
-echo "$as_me:20813: checking if X libraries support input-method" >&5
+echo "$as_me:20885: 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 20820 "configure"
+#line 20892 "configure"
 #include "confdefs.h"
 
 #include <X11/IntrinsicP.h>
@@ -20851,16 +20923,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20854: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20926: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20857: \$? = $ac_status" >&5
+  echo "$as_me:20929: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20860: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20932: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20863: \$? = $ac_status" >&5
+  echo "$as_me:20935: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_input_method=yes
 else
@@ -20870,13 +20942,13 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20873: result: $cf_cv_input_method" >&5
+echo "$as_me:20945: 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:20879: WARNING: input-method relies upon internationalization" >&5
+		{ echo "$as_me:20951: WARNING: input-method relies upon internationalization" >&5
 echo "$as_me: WARNING: input-method relies upon internationalization" >&2;}
 		enable_ximp=no
 	fi
@@ -20889,7 +20961,7 @@
 
 fi
 
-echo "$as_me:20892: checking if you want support for load-vt-fonts" >&5
+echo "$as_me:20964: 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.
@@ -20906,7 +20978,7 @@
 	enable_load_vt_fonts=no
 
 fi;
-echo "$as_me:20909: result: $enable_load_vt_fonts" >&5
+echo "$as_me:20981: result: $enable_load_vt_fonts" >&5
 echo "${ECHO_T}$enable_load_vt_fonts" >&6
 if test "$enable_load_vt_fonts" = yes ; then
 
@@ -20916,7 +20988,7 @@
 
 fi
 
-echo "$as_me:20919: checking if you want support for logging" >&5
+echo "$as_me:20991: 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.
@@ -20933,7 +21005,7 @@
 	enable_logging=no
 
 fi;
-echo "$as_me:20936: result: $enable_logging" >&5
+echo "$as_me:21008: result: $enable_logging" >&5
 echo "${ECHO_T}$enable_logging" >&6
 if test "$enable_logging" = yes ; then
 
@@ -20941,7 +21013,7 @@
 #define ALLOWLOGGING 1
 EOF
 
-	echo "$as_me:20944: checking if you want to allow logging via a pipe" >&5
+	echo "$as_me:21016: 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.
@@ -20958,7 +21030,7 @@
 	enable_log_exec=no
 
 fi;
-	echo "$as_me:20961: result: $enable_log_exec" >&5
+	echo "$as_me:21033: result: $enable_log_exec" >&5
 echo "${ECHO_T}$enable_log_exec" >&6
 	if test "$enable_log_exec" = yes ; then
 
@@ -20969,7 +21041,7 @@
 	fi
 fi
 
-echo "$as_me:20972: checking if you want support for iconify/maximize translations" >&5
+echo "$as_me:21044: 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.
@@ -20986,14 +21058,14 @@
 	enable_maximize=yes
 
 fi;
-echo "$as_me:20989: result: $enable_maximize" >&5
+echo "$as_me:21061: 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:20996: checking if you want NumLock to override keyboard tables" >&5
+echo "$as_me:21068: 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.
@@ -21010,14 +21082,14 @@
 	enable_numlock=yes
 
 fi;
-echo "$as_me:21013: result: $enable_numlock" >&5
+echo "$as_me:21085: 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:21020: checking if you want support for get/set of base64 selection data" >&5
+echo "$as_me:21092: 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.
@@ -21034,7 +21106,7 @@
 	enable_paste64=yes
 
 fi;
-echo "$as_me:21037: result: $enable_paste64" >&5
+echo "$as_me:21109: result: $enable_paste64" >&5
 echo "${ECHO_T}$enable_paste64" >&6
 if test "$enable_paste64" = yes ; then
 
@@ -21050,7 +21122,7 @@
 
 fi
 
-echo "$as_me:21053: checking if you want support for pty-handshaking" >&5
+echo "$as_me:21125: 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.
@@ -21067,7 +21139,7 @@
 	enable_pty_handshake=yes
 
 fi;
-echo "$as_me:21070: result: $enable_pty_handshake" >&5
+echo "$as_me:21142: result: $enable_pty_handshake" >&5
 echo "${ECHO_T}$enable_pty_handshake" >&6
 if test "$enable_pty_handshake" = yes ; then
 
@@ -21083,7 +21155,7 @@
 
 fi
 
-echo "$as_me:21086: checking if you want support for mouse in readline applications" >&5
+echo "$as_me:21158: 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.
@@ -21100,7 +21172,7 @@
 	enable_readline_mouse=yes
 
 fi;
-echo "$as_me:21103: result: $enable_readline_mouse" >&5
+echo "$as_me:21175: result: $enable_readline_mouse" >&5
 echo "${ECHO_T}$enable_readline_mouse" >&6
 if test "$enable_readline_mouse" = yes ; then
 
@@ -21110,7 +21182,7 @@
 
 fi
 
-echo "$as_me:21113: checking if you want support for regular-expression selections" >&5
+echo "$as_me:21185: 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.
@@ -21127,11 +21199,11 @@
 	enable_regex=yes
 
 fi;
-echo "$as_me:21130: result: $enable_regex" >&5
+echo "$as_me:21202: result: $enable_regex" >&5
 echo "${ECHO_T}$enable_regex" >&6
 if test "$enable_regex" = yes ; then
 
-echo "$as_me:21134: checking if you want to use PCRE2 for regular-expressions" >&5
+echo "$as_me:21206: 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.
@@ -21140,7 +21212,7 @@
 
 fi;
 test -z "$with_pcre2" && with_pcre2=no
-echo "$as_me:21143: result: $with_pcre2" >&5
+echo "$as_me:21215: result: $with_pcre2" >&5
 echo "${ECHO_T}$with_pcre2" >&6
 
 if test "x$with_pcre2" != xno ; then
@@ -21151,17 +21223,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}:21154: testing found package $cf_with_pcre2 ..." 1>&5
+echo "${as_me:-configure}:21226: 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}:21160: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:21232: 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}:21164: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:21236: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -21285,7 +21357,7 @@
 fi
 
 	done
-	cf_with_pcre2_ok=yes || { { echo "$as_me:21288: error: Cannot find PCRE2 library" >&5
+	cf_with_pcre2_ok=yes || { { echo "$as_me:21360: error: Cannot find PCRE2 library" >&5
 echo "$as_me: error: Cannot find PCRE2 library" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -21298,7 +21370,7 @@
 	(*pcre2-posix*|*pcreposix*)
 		;;
 	(*)
-		echo "$as_me:21301: checking for regcomp in -lpcre2-posix" >&5
+		echo "$as_me:21373: 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
@@ -21306,7 +21378,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcre2-posix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21309 "configure"
+#line 21381 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21325,16 +21397,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21328: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21400: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21331: \$? = $ac_status" >&5
+  echo "$as_me:21403: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21334: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21406: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21337: \$? = $ac_status" >&5
+  echo "$as_me:21409: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pcre2_posix_regcomp=yes
 else
@@ -21345,7 +21417,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21348: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
+echo "$as_me:21420: 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
 
@@ -21366,7 +21438,7 @@
 LIBS="$cf_add_libs"
 
 else
-  echo "$as_me:21369: checking for regcomp in -lpcreposix" >&5
+  echo "$as_me:21441: 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
@@ -21374,7 +21446,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcreposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21377 "configure"
+#line 21449 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21393,16 +21465,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21396: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21468: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21399: \$? = $ac_status" >&5
+  echo "$as_me:21471: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21402: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21474: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21405: \$? = $ac_status" >&5
+  echo "$as_me:21477: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pcreposix_regcomp=yes
 else
@@ -21413,7 +21485,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21416: result: $ac_cv_lib_pcreposix_regcomp" >&5
+echo "$as_me:21488: 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
 
@@ -21434,7 +21506,7 @@
 LIBS="$cf_add_libs"
 
 else
-  { { echo "$as_me:21437: error: Cannot find PCRE2 POSIX library" >&5
+  { { echo "$as_me:21509: error: Cannot find PCRE2 POSIX library" >&5
 echo "$as_me: error: Cannot find PCRE2 POSIX library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -21449,23 +21521,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:21452: checking for $ac_header" >&5
+echo "$as_me:21524: 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 21458 "configure"
+#line 21530 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:21462: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:21534: \"$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:21468: \$? = $ac_status" >&5
+  echo "$as_me:21540: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -21484,7 +21556,7 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:21487: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:21559: 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
@@ -21497,13 +21569,13 @@
 for ac_func in PCRE2regcomp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:21500: checking for $ac_func" >&5
+echo "$as_me:21572: 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 21506 "configure"
+#line 21578 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21534,16 +21606,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21537: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21609: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21540: \$? = $ac_status" >&5
+  echo "$as_me:21612: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21543: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21615: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21546: \$? = $ac_status" >&5
+  echo "$as_me:21618: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -21553,7 +21625,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21556: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:21628: 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
@@ -21567,7 +21639,7 @@
 
 	if test "$with_pcre2" = no ; then
 
-echo "$as_me:21570: checking if you want to use PCRE for regular-expressions" >&5
+echo "$as_me:21642: 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.
@@ -21576,7 +21648,7 @@
 
 fi;
 test -z "$with_pcre" && with_pcre=no
-echo "$as_me:21579: result: $with_pcre" >&5
+echo "$as_me:21651: result: $with_pcre" >&5
 echo "${ECHO_T}$with_pcre" >&6
 
 if test "$with_pcre" != no ; then
@@ -21584,17 +21656,17 @@
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "libpcre"; then
 	test -n "$verbose" && echo "	found package libpcre" 1>&6
 
-echo "${as_me:-configure}:21587: testing found package libpcre ..." 1>&5
+echo "${as_me:-configure}:21659: 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}:21593: testing package libpcre CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:21665: 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}:21597: testing package libpcre LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:21669: testing package libpcre LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -21715,7 +21787,7 @@
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
 
-echo "$as_me:21718: checking for pcre_compile in -lpcre" >&5
+echo "$as_me:21790: 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
@@ -21723,7 +21795,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21726 "configure"
+#line 21798 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21742,16 +21814,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21745: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21817: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21748: \$? = $ac_status" >&5
+  echo "$as_me:21820: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21751: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21823: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21754: \$? = $ac_status" >&5
+  echo "$as_me:21826: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pcre_pcre_compile=yes
 else
@@ -21762,7 +21834,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21765: result: $ac_cv_lib_pcre_pcre_compile" >&5
+echo "$as_me:21837: 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
@@ -21772,7 +21844,7 @@
   LIBS="-lpcre $LIBS"
 
 else
-  { { echo "$as_me:21775: error: Cannot find PCRE library" >&5
+  { { echo "$as_me:21847: error: Cannot find PCRE library" >&5
 echo "$as_me: error: Cannot find PCRE library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -21787,7 +21859,7 @@
 	(*pcreposix*)
 		;;
 	(*)
-		echo "$as_me:21790: checking for pcreposix_regcomp in -lpcreposix" >&5
+		echo "$as_me:21862: 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
@@ -21795,7 +21867,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcreposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21798 "configure"
+#line 21870 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21814,16 +21886,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21817: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21889: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21820: \$? = $ac_status" >&5
+  echo "$as_me:21892: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21823: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21895: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21826: \$? = $ac_status" >&5
+  echo "$as_me:21898: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pcreposix_pcreposix_regcomp=yes
 else
@@ -21834,7 +21906,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21837: result: $ac_cv_lib_pcreposix_pcreposix_regcomp" >&5
+echo "$as_me:21909: 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
 
@@ -21859,7 +21931,7 @@
 LIBS="$cf_add_libs"
 
 else
-  echo "$as_me:21862: checking for regcomp in -lpcreposix" >&5
+  echo "$as_me:21934: 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
@@ -21867,7 +21939,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcreposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21870 "configure"
+#line 21942 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21886,16 +21958,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21889: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21961: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21892: \$? = $ac_status" >&5
+  echo "$as_me:21964: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21895: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21967: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21898: \$? = $ac_status" >&5
+  echo "$as_me:21970: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pcreposix_regcomp=yes
 else
@@ -21906,7 +21978,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21909: result: $ac_cv_lib_pcreposix_regcomp" >&5
+echo "$as_me:21981: 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
 
@@ -21931,7 +22003,7 @@
 LIBS="$cf_add_libs"
 
 else
-  { { echo "$as_me:21934: error: Cannot find PCRE POSIX library" >&5
+  { { echo "$as_me:22006: error: Cannot find PCRE POSIX library" >&5
 echo "$as_me: error: Cannot find PCRE POSIX library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -21949,7 +22021,7 @@
 case "$host_os" in
 (mingw*)
 	# -lsystre -ltre -lintl -liconv
-	echo "$as_me:21952: checking for regcomp in -lsystre" >&5
+	echo "$as_me:22024: 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
@@ -21957,7 +22029,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsystre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21960 "configure"
+#line 22032 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21976,16 +22048,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21979: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22051: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21982: \$? = $ac_status" >&5
+  echo "$as_me:22054: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21985: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22057: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21988: \$? = $ac_status" >&5
+  echo "$as_me:22060: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_systre_regcomp=yes
 else
@@ -21996,11 +22068,11 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21999: result: $ac_cv_lib_systre_regcomp" >&5
+echo "$as_me:22071: 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:22003: checking for libiconv_open in -liconv" >&5
+		echo "$as_me:22075: 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
@@ -22008,7 +22080,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-liconv  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22011 "configure"
+#line 22083 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22027,16 +22099,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22030: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22102: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22033: \$? = $ac_status" >&5
+  echo "$as_me:22105: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22036: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22108: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22039: \$? = $ac_status" >&5
+  echo "$as_me:22111: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_iconv_libiconv_open=yes
 else
@@ -22047,7 +22119,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22050: result: $ac_cv_lib_iconv_libiconv_open" >&5
+echo "$as_me:22122: 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
 
@@ -22069,7 +22141,7 @@
 
 fi
 
-		echo "$as_me:22072: checking for libintl_gettext in -lintl" >&5
+		echo "$as_me:22144: 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
@@ -22077,7 +22149,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22080 "configure"
+#line 22152 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22096,16 +22168,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22099: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22171: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22102: \$? = $ac_status" >&5
+  echo "$as_me:22174: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22105: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22177: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22108: \$? = $ac_status" >&5
+  echo "$as_me:22180: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_intl_libintl_gettext=yes
 else
@@ -22116,7 +22188,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22119: result: $ac_cv_lib_intl_libintl_gettext" >&5
+echo "$as_me:22191: 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
 
@@ -22138,7 +22210,7 @@
 
 fi
 
-		echo "$as_me:22141: checking for tre_regcomp in -ltre" >&5
+		echo "$as_me:22213: 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
@@ -22146,7 +22218,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22149 "configure"
+#line 22221 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22165,16 +22237,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22168: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22240: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22171: \$? = $ac_status" >&5
+  echo "$as_me:22243: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22174: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22246: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22177: \$? = $ac_status" >&5
+  echo "$as_me:22249: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_tre_tre_regcomp=yes
 else
@@ -22185,7 +22257,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22188: result: $ac_cv_lib_tre_tre_regcomp" >&5
+echo "$as_me:22260: 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
 
@@ -22227,7 +22299,7 @@
 
 else
 
-		echo "$as_me:22230: checking for regcomp in -lgnurx" >&5
+		echo "$as_me:22302: 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
@@ -22235,7 +22307,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnurx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22238 "configure"
+#line 22310 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22254,16 +22326,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22257: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22329: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22260: \$? = $ac_status" >&5
+  echo "$as_me:22332: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22263: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22335: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22266: \$? = $ac_status" >&5
+  echo "$as_me:22338: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gnurx_regcomp=yes
 else
@@ -22274,7 +22346,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22277: result: $ac_cv_lib_gnurx_regcomp" >&5
+echo "$as_me:22349: 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
 
@@ -22302,13 +22374,13 @@
 	;;
 (*)
 	cf_regex_libs="regex re"
-	echo "$as_me:22305: checking for regcomp" >&5
+	echo "$as_me:22377: 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 22311 "configure"
+#line 22383 "configure"
 #include "confdefs.h"
 #define regcomp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22339,16 +22411,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22342: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22414: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22345: \$? = $ac_status" >&5
+  echo "$as_me:22417: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22348: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22420: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22351: \$? = $ac_status" >&5
+  echo "$as_me:22423: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_regcomp=yes
 else
@@ -22358,7 +22430,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22361: result: $ac_cv_func_regcomp" >&5
+echo "$as_me:22433: 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
@@ -22367,7 +22439,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:22370: checking for regcomp in -l$cf_regex_lib" >&5
+echo "$as_me:22442: 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
@@ -22375,7 +22447,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_regex_lib  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22378 "configure"
+#line 22450 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22394,16 +22466,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22397: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22469: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22400: \$? = $ac_status" >&5
+  echo "$as_me:22472: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22403: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22475: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22406: \$? = $ac_status" >&5
+  echo "$as_me:22478: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -22414,7 +22486,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22417: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:22489: 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
 
@@ -22446,13 +22518,13 @@
 esac
 
 if test "$cf_regex_func" = no ; then
-	echo "$as_me:22449: checking for compile" >&5
+	echo "$as_me:22521: 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 22455 "configure"
+#line 22527 "configure"
 #include "confdefs.h"
 #define compile autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22483,16 +22555,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22486: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22558: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22489: \$? = $ac_status" >&5
+  echo "$as_me:22561: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22492: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22564: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22495: \$? = $ac_status" >&5
+  echo "$as_me:22567: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_compile=yes
 else
@@ -22502,13 +22574,13 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22505: result: $ac_cv_func_compile" >&5
+echo "$as_me:22577: 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:22511: checking for compile in -lgen" >&5
+		echo "$as_me:22583: 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
@@ -22516,7 +22588,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgen  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22519 "configure"
+#line 22591 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22535,16 +22607,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22538: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22610: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22541: \$? = $ac_status" >&5
+  echo "$as_me:22613: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22544: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22616: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22547: \$? = $ac_status" >&5
+  echo "$as_me:22619: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gen_compile=yes
 else
@@ -22555,7 +22627,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22558: result: $ac_cv_lib_gen_compile" >&5
+echo "$as_me:22630: 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
 
@@ -22583,11 +22655,11 @@
 fi
 
 if test "$cf_regex_func" = no ; then
-	{ echo "$as_me:22586: WARNING: cannot find regular expression library" >&5
+	{ echo "$as_me:22658: WARNING: cannot find regular expression library" >&5
 echo "$as_me: WARNING: cannot find regular expression library" >&2;}
 fi
 
-echo "$as_me:22590: checking for regular-expression headers" >&5
+echo "$as_me:22662: 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
@@ -22599,7 +22671,7 @@
 	for cf_regex_hdr in regexp.h regexpr.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 22602 "configure"
+#line 22674 "configure"
 #include "confdefs.h"
 #include <$cf_regex_hdr>
 int
@@ -22616,16 +22688,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22619: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22691: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22622: \$? = $ac_status" >&5
+  echo "$as_me:22694: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22625: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22697: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22628: \$? = $ac_status" >&5
+  echo "$as_me:22700: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -22642,7 +22714,7 @@
 	for cf_regex_hdr in regex.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 22645 "configure"
+#line 22717 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$cf_regex_hdr>
@@ -22662,16 +22734,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22665: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22737: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22668: \$? = $ac_status" >&5
+  echo "$as_me:22740: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22671: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22743: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22674: \$? = $ac_status" >&5
+  echo "$as_me:22746: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -22687,11 +22759,11 @@
 esac
 
 fi
-echo "$as_me:22690: result: $cf_cv_regex_hdrs" >&5
+echo "$as_me:22762: result: $cf_cv_regex_hdrs" >&5
 echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
 
 case "$cf_cv_regex_hdrs" in
-	(no)		{ echo "$as_me:22694: WARNING: no regular expression header found" >&5
+	(no)		{ echo "$as_me:22766: WARNING: no regular expression header found" >&5
 echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
 	(regex.h)
 cat >>confdefs.h <<\EOF
@@ -22711,7 +22783,7 @@
 esac
 
 			if test "X$cf_cv_regex_hdrs" != "Xregex.h" ; then
-				{ { echo "$as_me:22714: error: Only POSIX, PCRE, or PCRE2 regular expressions are supported" >&5
+				{ { echo "$as_me:22786: 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
@@ -22724,7 +22796,7 @@
 
 fi
 
-echo "$as_me:22727: checking if you want support for right-scrollbar" >&5
+echo "$as_me:22799: 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.
@@ -22741,7 +22813,7 @@
 	enable_rightbar=yes
 
 fi;
-echo "$as_me:22744: result: $enable_rightbar" >&5
+echo "$as_me:22816: result: $enable_rightbar" >&5
 echo "${ECHO_T}$enable_rightbar" >&6
 if test "$enable_rightbar" = yes ; then
 
@@ -22751,7 +22823,7 @@
 
 fi
 
-echo "$as_me:22754: checking if you want check for redundant name-change" >&5
+echo "$as_me:22826: 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.
@@ -22768,14 +22840,14 @@
 	enable_samename=yes
 
 fi;
-echo "$as_me:22771: result: $enable_samename" >&5
+echo "$as_me:22843: 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:22778: checking if you want support for selection-actions" >&5
+echo "$as_me:22850: 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.
@@ -22792,14 +22864,14 @@
 	enable_selection_ops=yes
 
 fi;
-echo "$as_me:22795: result: $enable_selection_ops" >&5
+echo "$as_me:22867: 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:22802: checking if you want support for session management" >&5
+echo "$as_me:22874: 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.
@@ -22816,14 +22888,14 @@
 	enable_session_mgt=yes
 
 fi;
-echo "$as_me:22819: result: $enable_session_mgt" >&5
+echo "$as_me:22891: 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:22826: checking if you want support for status-line" >&5
+echo "$as_me:22898: 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.
@@ -22840,14 +22912,14 @@
 	enable_status_line=no
 
 fi;
-echo "$as_me:22843: result: $enable_status_line" >&5
+echo "$as_me:22915: 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:22850: checking if you want to use termcap function-keys" >&5
+echo "$as_me:22922: 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.
@@ -22864,14 +22936,14 @@
 	enable_tcap_fkeys=yes
 
 fi;
-echo "$as_me:22867: result: $enable_tcap_fkeys" >&5
+echo "$as_me:22939: 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:22874: checking if you want to use termcap-query/report" >&5
+echo "$as_me:22946: 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.
@@ -22888,14 +22960,14 @@
 	enable_tcap_query=yes
 
 fi;
-echo "$as_me:22891: result: $enable_tcap_query" >&5
+echo "$as_me:22963: 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:22898: checking if you want support for tek4014" >&5
+echo "$as_me:22970: 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.
@@ -22912,7 +22984,7 @@
 	enable_tek4014=yes
 
 fi;
-echo "$as_me:22915: result: $enable_tek4014" >&5
+echo "$as_me:22987: result: $enable_tek4014" >&5
 echo "${ECHO_T}$enable_tek4014" >&6
 if test "$enable_tek4014" = no ; then
 
@@ -22926,7 +22998,7 @@
 	EXTRAOBJS="$EXTRAOBJS TekPrsTbl.o Tekproc.o"
 fi
 
-echo "$as_me:22929: checking if you want pulldown menus with a toolbar" >&5
+echo "$as_me:23001: 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.
@@ -22943,7 +23015,7 @@
 	enable_toolbar=no
 
 fi;
-echo "$as_me:22946: result: $enable_toolbar" >&5
+echo "$as_me:23018: result: $enable_toolbar" >&5
 echo "${ECHO_T}$enable_toolbar" >&6
 if test "$enable_toolbar" = yes ; then
 
@@ -22953,7 +23025,7 @@
 
 fi
 
-echo "$as_me:22956: checking if you want VT52 emulation" >&5
+echo "$as_me:23028: 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.
@@ -22970,14 +23042,14 @@
 	enable_vt52=yes
 
 fi;
-echo "$as_me:22973: result: $enable_vt52" >&5
+echo "$as_me:23045: 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:22980: checking if you want wide-attribute support" >&5
+echo "$as_me:23052: 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.
@@ -22994,16 +23066,16 @@
 	enable_wattr=yes
 
 fi;
-echo "$as_me:22997: result: $enable_wattr" >&5
+echo "$as_me:23069: 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:23001: WARNING: overriding wide-attributes to support direct color" >&5
+	{ echo "$as_me:23073: 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:23006: checking if you want wide-character support" >&5
+echo "$as_me:23078: 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.
@@ -23020,14 +23092,14 @@
 	enable_wchar=yes
 
 fi;
-echo "$as_me:23023: result: $enable_wchar" >&5
+echo "$as_me:23095: 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:23030: checking if you want only 16-bit character support" >&5
+echo "$as_me:23102: 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.
@@ -23044,7 +23116,7 @@
 	enable_16bit_chars=no
 
 fi;
-echo "$as_me:23047: result: $enable_16bit_chars" >&5
+echo "$as_me:23119: result: $enable_16bit_chars" >&5
 echo "${ECHO_T}$enable_16bit_chars" >&6
 
 if test "$enable_16bit_chars" = yes ; then
@@ -23058,7 +23130,7 @@
 
 if test "$enable_wchar" = yes ; then
 
-echo "$as_me:23061: checking if you want to use mini-luit/Latin9 built-in support" >&5
+echo "$as_me:23133: 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.
@@ -23075,7 +23147,7 @@
 	enable_mini_luit=no
 
 fi;
-echo "$as_me:23078: result: $enable_mini_luit" >&5
+echo "$as_me:23150: result: $enable_mini_luit" >&5
 echo "${ECHO_T}$enable_mini_luit" >&6
 if test "$enable_mini_luit" = yes ; then
 
@@ -23085,7 +23157,7 @@
 
 fi
 
-echo "$as_me:23088: checking if you want to use luit" >&5
+echo "$as_me:23160: 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.
@@ -23102,7 +23174,7 @@
 	enable_luit=yes
 
 fi;
-echo "$as_me:23105: result: $enable_luit" >&5
+echo "$as_me:23177: result: $enable_luit" >&5
 echo "${ECHO_T}$enable_luit" >&6
 if test "$enable_luit" = yes ; then
 
@@ -23115,7 +23187,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:23118: checking for $ac_word" >&5
+echo "$as_me:23190: 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
@@ -23132,7 +23204,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:23135: found $ac_dir/$ac_word" >&5
+   echo "$as_me:23207: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -23143,10 +23215,10 @@
 LUIT=$ac_cv_path_LUIT
 
 if test -n "$LUIT"; then
-  echo "$as_me:23146: result: $LUIT" >&5
+  echo "$as_me:23218: result: $LUIT" >&5
 echo "${ECHO_T}$LUIT" >&6
 else
-  echo "$as_me:23149: result: no" >&5
+  echo "$as_me:23221: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -23168,22 +23240,20 @@
 	cf_path_syntax="$ac_default_prefix"
 fi
 
-case ".$cf_temp" in
-(.\$\(*\)*|.\'*\'*)
-	;;
-(..|./*|.\\*)
+case "x$cf_temp" in
+(x\$\(*\)*|x\'*\'*)
 	;;
-(.[a-zA-Z]:[\\/]*) # OS/2 EMX
+(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER)
 	;;
-(.\$\{*prefix\}*|.\$\{*dir\}*)
+(x\$\{*prefix\}*|x\$\{*dir\}*)
 	eval cf_temp="$cf_temp"
-	case ".$cf_temp" in
-	(.NONE/*)
+	case "x$cf_temp" in
+	(xNONE/*)
 		cf_temp=`echo "$cf_temp" | sed -e s%NONE%$cf_path_syntax%`
 		;;
 	esac
 	;;
-(.no|.NONE/*)
+(xno|xNONE/*)
 	cf_temp=`echo "$cf_temp" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
@@ -23205,7 +23275,7 @@
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:23208: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:23278: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define LUIT_PATH "$cf_path_prog"
@@ -23229,7 +23299,7 @@
 	EXTRAOBJS="$EXTRAOBJS charclass.o precompose.o wcwidth.o"
 fi
 
-echo "$as_me:23232: checking if you want dynamic-abbreviation support" >&5
+echo "$as_me:23302: 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.
@@ -23246,7 +23316,7 @@
 	enable_dabbrev=no
 
 fi;
-echo "$as_me:23249: result: $enable_dabbrev" >&5
+echo "$as_me:23319: result: $enable_dabbrev" >&5
 echo "${ECHO_T}$enable_dabbrev" >&6
 if test "$enable_dabbrev" = yes ; then
 
@@ -23256,7 +23326,7 @@
 
 fi
 
-echo "$as_me:23259: checking if you want DECterm Locator support" >&5
+echo "$as_me:23329: 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.
@@ -23273,7 +23343,7 @@
 	enable_dec_locator=no
 
 fi;
-echo "$as_me:23276: result: $enable_dec_locator" >&5
+echo "$as_me:23346: result: $enable_dec_locator" >&5
 echo "${ECHO_T}$enable_dec_locator" >&6
 if test "$enable_dec_locator" = yes ; then
 
@@ -23283,7 +23353,7 @@
 
 fi
 
-echo "$as_me:23286: checking if you want XHTML and SVG screen dump support" >&5
+echo "$as_me:23356: 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.
@@ -23300,7 +23370,7 @@
 	enable_screen_dumps=yes
 
 fi;
-echo "$as_me:23303: result: $enable_screen_dumps" >&5
+echo "$as_me:23373: 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"
@@ -23313,7 +23383,7 @@
 
 fi
 
-echo "$as_me:23316: checking if you want ReGIS graphics support" >&5
+echo "$as_me:23386: 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.
@@ -23330,7 +23400,7 @@
 	enable_regis_graphics=no
 
 fi;
-echo "$as_me:23333: result: $enable_regis_graphics" >&5
+echo "$as_me:23403: result: $enable_regis_graphics" >&5
 echo "${ECHO_T}$enable_regis_graphics" >&6
 if test "$enable_regis_graphics" = yes ; then
 
@@ -23342,14 +23412,14 @@
 	EXTRASRCS="$EXTRASRCS graphics_regis.c"
 	EXTRAOBJS="$EXTRAOBJS graphics_regis.o"
 
-echo "$as_me:23345: checking if -lm needed for math functions" >&5
+echo "$as_me:23415: 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 23352 "configure"
+#line 23422 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -23365,16 +23435,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23368: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23438: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23371: \$? = $ac_status" >&5
+  echo "$as_me:23441: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23374: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23444: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23377: \$? = $ac_status" >&5
+  echo "$as_me:23447: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libm=no
 else
@@ -23384,7 +23454,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23387: result: $cf_cv_need_libm" >&5
+echo "$as_me:23457: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 
 if test "$cf_cv_need_libm" = yes
@@ -23392,14 +23462,14 @@
 
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lm"
-	echo "$as_me:23395: checking if -lm is available for math functions" >&5
+	echo "$as_me:23465: 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 23402 "configure"
+#line 23472 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -23415,16 +23485,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23418: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23488: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23421: \$? = $ac_status" >&5
+  echo "$as_me:23491: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23424: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23494: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23427: \$? = $ac_status" >&5
+  echo "$as_me:23497: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_libm=yes
 else
@@ -23434,7 +23504,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23437: result: $cf_cv_have_libm" >&5
+echo "$as_me:23507: result: $cf_cv_have_libm" >&5
 echo "${ECHO_T}$cf_cv_have_libm" >&6
 	LIBS="$cf_save_LIBS"
 
@@ -23473,7 +23543,7 @@
 
 fi
 
-echo "$as_me:23476: checking if you want sixel graphics support" >&5
+echo "$as_me:23546: 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.
@@ -23490,7 +23560,7 @@
 	enable_sixel_graphics=yes
 
 fi;
-echo "$as_me:23493: result: $enable_sixel_graphics" >&5
+echo "$as_me:23563: result: $enable_sixel_graphics" >&5
 echo "${ECHO_T}$enable_sixel_graphics" >&6
 if test "$enable_sixel_graphics" = yes ; then
 
@@ -23517,7 +23587,7 @@
 	STRINGS_MAX=20000
 fi
 
-echo "$as_me:23520: checking if you want sixel screen dump support" >&5
+echo "$as_me:23590: 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.
@@ -23534,7 +23604,7 @@
 	enable_print_graphics=$enable_regis_graphics
 
 fi;
-echo "$as_me:23537: result: $enable_print_graphics" >&5
+echo "$as_me:23607: result: $enable_print_graphics" >&5
 echo "${ECHO_T}$enable_print_graphics" >&6
 if test "$enable_print_graphics" = yes ; then
 
@@ -23544,7 +23614,7 @@
 
 fi
 
-echo "$as_me:23547: checking if you want VT420 rectangle support" >&5
+echo "$as_me:23617: 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.
@@ -23561,7 +23631,7 @@
 	enable_rectangles=yes
 
 fi;
-echo "$as_me:23564: result: $enable_rectangles" >&5
+echo "$as_me:23634: result: $enable_rectangles" >&5
 echo "${ECHO_T}$enable_rectangles" >&6
 if test "$enable_rectangles" = no ; then
 
@@ -23571,7 +23641,7 @@
 
 fi
 
-echo "$as_me:23574: checking if you want -ziconbeep option" >&5
+echo "$as_me:23644: 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.
@@ -23588,7 +23658,7 @@
 	enable_ziconbeep=yes
 
 fi;
-echo "$as_me:23591: result: $enable_ziconbeep" >&5
+echo "$as_me:23661: result: $enable_ziconbeep" >&5
 echo "${ECHO_T}$enable_ziconbeep" >&6
 test "$enable_ziconbeep" = no &&
 cat >>confdefs.h <<\EOF
@@ -23597,7 +23667,7 @@
 
 ###############################################################################
 
-echo "$as_me:23600: checking if you want debugging traces" >&5
+echo "$as_me:23670: 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.
@@ -23614,7 +23684,7 @@
 	enable_trace=no
 
 fi;
-echo "$as_me:23617: result: $enable_trace" >&5
+echo "$as_me:23687: result: $enable_trace" >&5
 echo "${ECHO_T}$enable_trace" >&6
 if test "$enable_trace" = yes ; then
 
@@ -23626,7 +23696,7 @@
 	EXTRAOBJS="$EXTRAOBJS trace.o"
 fi
 
-echo "$as_me:23629: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:23699: 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.
@@ -23648,7 +23718,7 @@
 else
   with_dmalloc=
 fi;
-echo "$as_me:23651: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:23721: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -23762,23 +23832,23 @@
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:23765: checking for dmalloc.h" >&5
+	echo "$as_me:23835: 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 23771 "configure"
+#line 23841 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:23775: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23845: \"$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:23781: \$? = $ac_status" >&5
+  echo "$as_me:23851: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23797,11 +23867,11 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23800: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:23870: 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:23804: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:23874: 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
@@ -23809,7 +23879,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23812 "configure"
+#line 23882 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23828,16 +23898,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23831: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23901: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23834: \$? = $ac_status" >&5
+  echo "$as_me:23904: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23837: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23907: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23840: \$? = $ac_status" >&5
+  echo "$as_me:23910: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -23848,7 +23918,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23851: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:23921: 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
@@ -23863,7 +23933,7 @@
 
 fi
 
-echo "$as_me:23866: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:23936: 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.
@@ -23885,7 +23955,7 @@
 else
   with_dbmalloc=
 fi;
-echo "$as_me:23888: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:23958: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -23999,23 +24069,23 @@
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:24002: checking for dbmalloc.h" >&5
+	echo "$as_me:24072: 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 24008 "configure"
+#line 24078 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:24012: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:24082: \"$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:24018: \$? = $ac_status" >&5
+  echo "$as_me:24088: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -24034,11 +24104,11 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:24037: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:24107: 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:24041: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:24111: 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
@@ -24046,7 +24116,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 24049 "configure"
+#line 24119 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24065,16 +24135,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24068: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24138: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24071: \$? = $ac_status" >&5
+  echo "$as_me:24141: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24074: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24144: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24077: \$? = $ac_status" >&5
+  echo "$as_me:24147: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -24085,7 +24155,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24088: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:24158: 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
@@ -24100,7 +24170,7 @@
 
 fi
 
-echo "$as_me:24103: checking if you want to use valgrind for testing" >&5
+echo "$as_me:24173: 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.
@@ -24122,7 +24192,7 @@
 else
   with_valgrind=
 fi;
-echo "$as_me:24125: result: ${with_valgrind:-no}" >&5
+echo "$as_me:24195: result: ${with_valgrind:-no}" >&5
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case ".$with_cflags" in
@@ -24235,7 +24305,7 @@
 	;;
 esac
 
-echo "$as_me:24238: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:24308: 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.
@@ -24246,7 +24316,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:24249: result: $with_no_leaks" >&5
+echo "$as_me:24319: result: $with_no_leaks" >&5
 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$enable_leaks" = no ; then
@@ -24261,7 +24331,7 @@
 
 fi
 
-echo "$as_me:24264: checking if you want to see long compiling messages" >&5
+echo "$as_me:24334: 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.
@@ -24295,10 +24365,10 @@
 	ECHO_CC=''
 
 fi;
-echo "$as_me:24298: result: $enableval" >&5
+echo "$as_me:24368: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:24301: checking if you want magic cookie emulation" >&5
+echo "$as_me:24371: 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.
@@ -24315,7 +24385,7 @@
 	enable_xmc=no
 
 fi;
-echo "$as_me:24318: result: $enable_xmc" >&5
+echo "$as_me:24388: result: $enable_xmc" >&5
 echo "${ECHO_T}$enable_xmc" >&6
 if test "$enable_xmc" = yes ; then
 
@@ -24330,13 +24400,13 @@
 for ac_func in tigetstr
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:24333: checking for $ac_func" >&5
+echo "$as_me:24403: 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 24339 "configure"
+#line 24409 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -24367,16 +24437,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24370: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24440: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24373: \$? = $ac_status" >&5
+  echo "$as_me:24443: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24376: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24446: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24379: \$? = $ac_status" >&5
+  echo "$as_me:24449: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -24386,7 +24456,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24389: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:24459: 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
@@ -24401,13 +24471,13 @@
 for ac_func in use_extended_names
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:24404: checking for $ac_func" >&5
+echo "$as_me:24474: 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 24410 "configure"
+#line 24480 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -24438,16 +24508,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24441: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24511: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24444: \$? = $ac_status" >&5
+  echo "$as_me:24514: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24447: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24517: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24450: \$? = $ac_status" >&5
+  echo "$as_me:24520: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -24457,7 +24527,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24460: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:24530: 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
@@ -24469,7 +24539,7 @@
 
 fi
 
-echo "$as_me:24472: checking if you want to use C11 _Noreturn feature" >&5
+echo "$as_me:24542: 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.
@@ -24486,17 +24556,17 @@
 	enable_stdnoreturn=no
 
 fi;
-echo "$as_me:24489: result: $enable_stdnoreturn" >&5
+echo "$as_me:24559: result: $enable_stdnoreturn" >&5
 echo "${ECHO_T}$enable_stdnoreturn" >&6
 
 if test $enable_stdnoreturn = yes; then
-echo "$as_me:24493: checking for C11 _Noreturn feature" >&5
+echo "$as_me:24563: 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 24499 "configure"
+#line 24569 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24512,16 +24582,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24515: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24585: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24518: \$? = $ac_status" >&5
+  echo "$as_me:24588: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24521: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24591: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24524: \$? = $ac_status" >&5
+  echo "$as_me:24594: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_c11_noreturn=yes
 else
@@ -24532,7 +24602,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:24535: result: $cf_cv_c11_noreturn" >&5
+echo "$as_me:24605: result: $cf_cv_c11_noreturn" >&5
 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
 	cf_cv_c11_noreturn=no,
@@ -24588,16 +24658,16 @@
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:24591: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:24661: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:24596: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:24666: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:24600: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:24670: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -24636,16 +24706,16 @@
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:24639: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:24709: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:24644: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:24714: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:24648: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:24718: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -24684,23 +24754,23 @@
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:24687: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:24757: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:24692: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:24762: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:24696: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:24766: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:24703: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:24773: 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.
@@ -24717,7 +24787,7 @@
 	enable_warnings=no
 
 fi;
-echo "$as_me:24720: result: $enable_warnings" >&5
+echo "$as_me:24790: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -24741,7 +24811,7 @@
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 24744 "configure"
+#line 24814 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -24756,26 +24826,26 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24759: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24829: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24762: \$? = $ac_status" >&5
+  echo "$as_me:24832: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24765: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24835: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24768: \$? = $ac_status" >&5
+  echo "$as_me:24838: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:24771: checking for X11/Xt const-feature" >&5
+echo "$as_me:24841: 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 24778 "configure"
+#line 24848 "configure"
 #include "confdefs.h"
 
 #undef  _CONST_X_STRING
@@ -24793,16 +24863,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24796: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24866: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24799: \$? = $ac_status" >&5
+  echo "$as_me:24869: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24802: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24872: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24805: \$? = $ac_status" >&5
+  echo "$as_me:24875: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -24817,7 +24887,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:24820: result: $cf_cv_const_x_string" >&5
+echo "$as_me:24890: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -24846,7 +24916,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 24849 "${as_me:-configure}"
+#line 24919 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -24862,7 +24932,7 @@
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:24865: checking for $CC warning options..." >&5
+	{ echo "$as_me:24935: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -24878,12 +24948,12 @@
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:24881: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:24951: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24884: \$? = $ac_status" >&5
+  echo "$as_me:24954: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:24886: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:24956: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -24891,7 +24961,7 @@
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:24894: checking for $CC warning options..." >&5
+	{ echo "$as_me:24964: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -24914,12 +24984,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:24917: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:24987: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24920: \$? = $ac_status" >&5
+  echo "$as_me:24990: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:24922: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:24992: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -24927,7 +24997,7 @@
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:24930: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:25000: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -24937,7 +25007,7 @@
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:24940: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:25010: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -24970,10 +25040,10 @@
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:24973: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:25043: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 24976 "${as_me:-configure}"
+#line 25046 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -25023,12 +25093,12 @@
 			;;
 		esac
 
-		if { (eval echo "$as_me:25026: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:25096: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25029: \$? = $ac_status" >&5
+  echo "$as_me:25099: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:25031: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:25101: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -25126,7 +25196,7 @@
 	CPPFLAGS=`echo "$CPPFLAGS" | sed -e s/-D$cf_def//`
 done
 
-echo "$as_me:25129: checking if filesystem supports mixed-case filenames" >&5
+echo "$as_me:25199: 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
@@ -25153,7 +25223,7 @@
 fi
 
 fi
-echo "$as_me:25156: result: $cf_cv_mixedcase" >&5
+echo "$as_me:25226: result: $cf_cv_mixedcase" >&5
 echo "${ECHO_T}$cf_cv_mixedcase" >&6
 test "$cf_cv_mixedcase" = yes &&
 cat >>confdefs.h <<\EOF
@@ -25164,7 +25234,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:25167: checking for $ac_word" >&5
+echo "$as_me:25237: 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
@@ -25179,7 +25249,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CTAGS="$ac_prog"
-echo "$as_me:25182: found $ac_dir/$ac_word" >&5
+echo "$as_me:25252: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -25187,10 +25257,10 @@
 fi
 CTAGS=$ac_cv_prog_CTAGS
 if test -n "$CTAGS"; then
-  echo "$as_me:25190: result: $CTAGS" >&5
+  echo "$as_me:25260: result: $CTAGS" >&5
 echo "${ECHO_T}$CTAGS" >&6
 else
-  echo "$as_me:25193: result: no" >&5
+  echo "$as_me:25263: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25201,7 +25271,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:25204: checking for $ac_word" >&5
+echo "$as_me:25274: 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
@@ -25216,7 +25286,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ETAGS="$ac_prog"
-echo "$as_me:25219: found $ac_dir/$ac_word" >&5
+echo "$as_me:25289: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -25224,10 +25294,10 @@
 fi
 ETAGS=$ac_cv_prog_ETAGS
 if test -n "$ETAGS"; then
-  echo "$as_me:25227: result: $ETAGS" >&5
+  echo "$as_me:25297: result: $ETAGS" >&5
 echo "${ECHO_T}$ETAGS" >&6
 else
-  echo "$as_me:25230: result: no" >&5
+  echo "$as_me:25300: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25236,7 +25306,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:25239: checking for $ac_word" >&5
+echo "$as_me:25309: 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
@@ -25251,7 +25321,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:25254: found $ac_dir/$ac_word" >&5
+echo "$as_me:25324: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -25260,17 +25330,17 @@
 fi
 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
 if test -n "$MAKE_LOWER_TAGS"; then
-  echo "$as_me:25263: result: $MAKE_LOWER_TAGS" >&5
+  echo "$as_me:25333: result: $MAKE_LOWER_TAGS" >&5
 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
 else
-  echo "$as_me:25266: result: no" >&5
+  echo "$as_me:25336: 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:25273: checking for $ac_word" >&5
+echo "$as_me:25343: 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
@@ -25285,7 +25355,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:25288: found $ac_dir/$ac_word" >&5
+echo "$as_me:25358: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -25294,10 +25364,10 @@
 fi
 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
 if test -n "$MAKE_UPPER_TAGS"; then
-  echo "$as_me:25297: result: $MAKE_UPPER_TAGS" >&5
+  echo "$as_me:25367: result: $MAKE_UPPER_TAGS" >&5
 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
 else
-  echo "$as_me:25300: result: no" >&5
+  echo "$as_me:25370: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25320,7 +25390,7 @@
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then
-	echo "$as_me:25323: checking for an rpath option" >&5
+	echo "$as_me:25393: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	case "$cf_cv_system_name" in
 	(irix*)
@@ -25351,12 +25421,12 @@
 	(*)
 		;;
 	esac
-	echo "$as_me:25354: result: $LD_RPATH_OPT" >&5
+	echo "$as_me:25424: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 	case "x$LD_RPATH_OPT" in
 	(x-R*)
-		echo "$as_me:25359: checking if we need a space after rpath option" >&5
+		echo "$as_me:25429: 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"
 
@@ -25377,7 +25447,7 @@
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 25380 "configure"
+#line 25450 "configure"
 #include "confdefs.h"
 
 int
@@ -25389,16 +25459,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25392: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25462: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25395: \$? = $ac_status" >&5
+  echo "$as_me:25465: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25398: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25468: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25401: \$? = $ac_status" >&5
+  echo "$as_me:25471: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_space=no
 else
@@ -25408,14 +25478,14 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 		LIBS="$cf_save_LIBS"
-		echo "$as_me:25411: result: $cf_rpath_space" >&5
+		echo "$as_me:25481: 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:25418: checking if rpath-hack should be disabled" >&5
+echo "$as_me:25488: 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.
@@ -25433,22 +25503,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:25436: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:25506: result: $cf_disable_rpath_hack" >&5
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 
 if test "$enable_rpath_hack" = yes ; then
 
-echo "$as_me:25441: checking for updated LDFLAGS" >&5
+echo "$as_me:25511: 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:25444: result: maybe" >&5
+	echo "$as_me:25514: 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:25451: checking for $ac_word" >&5
+echo "$as_me:25521: 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
@@ -25463,7 +25533,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:25466: found $ac_dir/$ac_word" >&5
+echo "$as_me:25536: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -25471,10 +25541,10 @@
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:25474: result: $cf_ldd_prog" >&5
+  echo "$as_me:25544: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:25477: result: no" >&5
+  echo "$as_me:25547: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25488,7 +25558,7 @@
 		cf_rpath_oops=
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 25491 "configure"
+#line 25561 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -25500,16 +25570,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25503: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25573: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25506: \$? = $ac_status" >&5
+  echo "$as_me:25576: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25509: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25579: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25512: \$? = $ac_status" >&5
+  echo "$as_me:25582: \$? = $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`
@@ -25537,7 +25607,7 @@
 					then
 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
 
-echo "${as_me:-configure}:25540: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:25610: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 
 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
 						break
@@ -25549,11 +25619,11 @@
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:25552: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:25622: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:25556: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:25626: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -25590,7 +25660,7 @@
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:25593: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:25663: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -25603,11 +25673,11 @@
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:25606: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:25676: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:25610: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:25680: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -25644,7 +25714,7 @@
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:25647: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:25717: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -25657,14 +25727,14 @@
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:25660: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:25730: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:25664: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:25734: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 else
-	echo "$as_me:25667: result: no" >&5
+	echo "$as_me:25737: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25759,7 +25829,7 @@
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:25762: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:25832: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -25937,7 +26007,7 @@
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:25940: error: ambiguous option: $1
+    { { echo "$as_me:26010: 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;}
@@ -25956,7 +26026,7 @@
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:25959: error: unrecognized option: $1
+  -*) { { echo "$as_me:26029: 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;}
@@ -25996,7 +26066,7 @@
   "minstall" ) CONFIG_FILES="$CONFIG_FILES minstall:minstall.in" ;;
   "run-tic.sh" ) CONFIG_FILES="$CONFIG_FILES run-tic.sh:run-tic.in" ;;
   "xtermcfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS xtermcfg.h:xtermcfg.hin" ;;
-  *) { { echo "$as_me:25999: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:26069: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -26107,6 +26177,12 @@
 s,@LINT_OPTS@,$LINT_OPTS,;t t
 s,@LINT_LIBS@,$LINT_LIBS,;t t
 s,@APP_CLASS@,$APP_CLASS,;t t
+s,@target@,$target,;t t
+s,@target_cpu@,$target_cpu,;t t
+s,@target_vendor@,$target_vendor,;t t
+s,@target_os@,$target_os,;t t
+s,@GLOB_FULLPATH_POSIX@,$GLOB_FULLPATH_POSIX,;t t
+s,@GLOB_FULLPATH_OTHER@,$GLOB_FULLPATH_OTHER,;t t
 s,@APPSDIR@,$APPSDIR,;t t
 s,@no_appsdir@,$no_appsdir,;t t
 s,@ICON_NAME@,$ICON_NAME,;t t
@@ -26320,7 +26396,7 @@
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:26323: creating $ac_file" >&5
+    { echo "$as_me:26399: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -26338,7 +26414,7 @@
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:26341: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:26417: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -26351,7 +26427,7 @@
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:26354: error: cannot find input file: $f" >&5
+           { { echo "$as_me:26430: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -26367,7 +26443,7 @@
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:26370: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:26446: 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;}
@@ -26376,7 +26452,7 @@
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:26379: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:26455: 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;}
@@ -26421,7 +26497,7 @@
             ac_init=`$EGREP '[ 	]*'$ac_name'[ 	]*=' "$ac_file"`
             if test -z "$ac_init"; then
               ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'`
-              { echo "$as_me:26424: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:26500: 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;}
@@ -26432,7 +26508,7 @@
     $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:26435: WARNING: Some variables may not be substituted:
+      { echo "$as_me:26511: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -26481,7 +26557,7 @@
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:26484: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:26560: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -26492,7 +26568,7 @@
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:26495: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:26571: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -26505,7 +26581,7 @@
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:26508: error: cannot find input file: $f" >&5
+           { { echo "$as_me:26584: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -26624,7 +26700,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:26627: $ac_file is unchanged" >&5
+      { echo "$as_me:26703: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
Index: ctlseqs.ms
--- xterm-395+/ctlseqs.ms	2024-10-14 16:52:40.000000000 +0000
+++ xterm-396/ctlseqs.ms	2024-11-29 00:54:36.000000000 +0000
@@ -1,6 +1,6 @@
 .\"#! troff -ms $1		-*- Nroff -*-
 .\" "XTerm Control Sequences" document
-.\" $XTermId: ctlseqs.ms,v 1.726 2024/10/14 16:52:40 tom Exp $
+.\" $XTermId: ctlseqs.ms,v 1.729 2024/11/29 00:54:36 tom Exp $
 .\"
 .\"
 .\" Copyright 1996-2023,2024 by Thomas E. Dickey
@@ -69,8 +69,8 @@
 .\"
 .ds XT XTerm
 .ds xt xterm
-.ds LF Patch #395
-.ds RF 2024/10/14
+.ds LF Patch #396
+.ds RF 2024/11/28
 .\"
 .if n .pl 9999v		\" no page breaks in nroff
 .ND
@@ -988,6 +988,7 @@
   \*,\*|	\(-> DECAC (VT525 only)
   \*,\*}	\(-> DECATC (VT525 only)
   \*>\*(Pm\*s\*m \(-> XTQMODKEYS (xterm)
+  \*>\*(Pm\*s\*t \(-> XTSMTITLE (xterm)
 .br
 \fI\*(xt\fP responds with
 \*(Dc\*1\*$\*r\*(Pt\*s\*(ST
@@ -1293,6 +1294,9 @@
 It is possible to disable the ability to reset features
 by compiling a different default for the title modes into \fI\*(xt\fP.
 .iP
+If no parameters are given, all title mode features are reset to
+the initial (compiled-in) default.
+.iP
   \*(Ps = \*0 \(-> Do not set window/icon labels using hexadecimal.
   \*(Ps = \*1 \(-> Do not query window/icon labels using hexadecimal.
   \*(Ps = \*2 \(-> Do not set window/icon labels using UTF-8.
@@ -2316,6 +2320,9 @@
   \*(Ps = \*2 \(-> Set window/icon labels using UTF-8.
   \*(Ps = \*3 \(-> Query window/icon labels using UTF-8.
 (See discussion of \fBTitle Modes\fP)
+.iP
+If no parameters are given, title mode features are set to the initial
+(compiled-in) default.
 .
 .iP
 .IP \\*(Cs\\*(Ps\\*s\\*(Sp\\*t
@@ -2325,6 +2332,17 @@
   \*(Ps = \*5, \*6, \*7, or \*8 \(-> high.
 .
 .iP
+.IP \\*(Cs\\*#\\*t
+Report position on title-stack (XTTITLEPOS), \fI\*(xt\fP.
+.br
+Response is the same format, with parameters:
+  \*(Cs\*(Pn\*;\*(Pm\*s\*#\*t
+.br
+where
+.br
+  \*(Pn is the current index into the title stack
+  \*(Pm is the maximum index for the title stack
+.iP
 .IP \\*(Cs\\*(Pt\\*s\\*;\\*(Pl\\*s\\*;\\*(Pb\\*s\\*;\\*(Pr\\*s\\*;\\*(Pm\\*s\\*$\\*t
 Reverse Attributes in Rectangular Area (DECRARA), VT400 and up.
   \*(Pt\*s\*;\*(Pl\*s\*;\*(Pb\*s\*;\*(Pr denotes the rectangle.
Index: ctlseqs.txt
--- xterm-395+/ctlseqs.txt	2024-10-14 17:09:40.000000000 +0000
+++ xterm-396/ctlseqs.txt	2024-11-29 01:13:54.000000000 +0000
@@ -21,7 +21,7 @@
                              Thomas Dickey
                       XFree86 Project (1996-2006)
                     invisible-island.net (2006-2024)
-               updated for XTerm Patch #395 (2024/10/14)
+               updated for XTerm Patch #396 (2024/11/28)
 
 
 
@@ -494,6 +494,7 @@
             , |     -> DECAC (VT525 only)
             , }     -> DECATC (VT525 only)
             > Pm m  -> XTQMODKEYS (xterm)
+            > Pm t  -> XTSMTITLE (xterm)
           xterm responds with DCS 1 $ r Pt ST for valid requests,
           replacing the Pt with the corresponding CSI string, or DCS 0 $
           r  ST for invalid requests.
@@ -714,6 +715,9 @@
           disable the ability to reset features by compiling a different
           default for the title modes into xterm.
 
+          If no parameters are given, all title mode features are reset
+          to the initial (compiled-in) default.
+
             Ps = 0  -> Do not set window/icon labels using hexadecimal.
             Ps = 1  -> Do not query window/icon labels using
           hexadecimal.
@@ -1613,12 +1617,22 @@
             Ps = 3  -> Query window/icon labels using UTF-8.  (See
           discussion of Title Modes)
 
+          If no parameters are given, title mode features are set to the
+          initial (compiled-in) default.
+
 CSI Ps SP t
           Set warning-bell volume (DECSWBV), VT520.
             Ps = 0  or 1  -> off.
             Ps = 2 , 3  or 4  -> low.
             Ps = 5 , 6 , 7 , or 8  -> high.
 
+CSI # t   Report position on title-stack (XTTITLEPOS), xterm.
+          Response is the same format, with parameters:
+            CSI Pn; Pm # t
+          where
+            Pn is the current index into the title stack
+            Pm is the maximum index for the title stack
+
 CSI Pt ; Pl ; Pb ; Pr ; Pm $ t
           Reverse Attributes in Rectangular Area (DECRARA), VT400 and
           up.
Index: cursor.c
--- xterm-395+/cursor.c	2023-09-21 08:17:56.000000000 +0000
+++ xterm-396/cursor.c	2024-12-01 23:51:16.000000000 +0000
@@ -1,7 +1,7 @@
-/* $XTermId: cursor.c,v 1.93 2023/09/21 08:17:56 tom Exp $ */
+/* $XTermId: cursor.c,v 1.95 2024/12/01 23:51:16 tom Exp $ */
 
 /*
- * Copyright 2002-2022,2023 by Thomas E. Dickey
+ * Copyright 2002-2023,2024 by Thomas E. Dickey
  *
  *                         All Rights Reserved
  *
@@ -427,8 +427,8 @@
  *	https://github.com/mattiase/wraptest
  *
  * states
- *	The LCF is saved/restored by the Save/Restore Cursor (DECSC/DECRC)      
- *	control sequences.  The DECAWM flag is not included in the state        
+ *	The LCF is saved/restored by the Save/Restore Cursor (DECSC/DECRC)
+ *	control sequences.  The DECAWM flag is not included in the state
  *	managed by these operations.
  *
  * DEC 070 does mention the ANSI color text extension saying that it, too, is
@@ -557,7 +557,7 @@
 {
     TRACE(("set_cur_row %d vs %d\n", value, screen ? LastRowNumber(screen) : -1));
 
-    assert(screen != 0);
+    assert(screen != NULL);
     assert(value >= 0);
     assert(value <= LastRowNumber(screen));
     if_STATUS_LINE(screen, {
@@ -572,7 +572,7 @@
 {
     TRACE(("set_cur_col %d vs %d\n", value, screen ? screen->max_col : -1));
 
-    assert(screen != 0);
+    assert(screen != NULL);
     assert(value >= 0);
     assert(value <= screen->max_col);
     screen->cur_col = value;
Index: doublechr.c
--- xterm-395+/doublechr.c	2024-09-01 22:49:10.000000000 +0000
+++ xterm-396/doublechr.c	2024-12-01 19:38:29.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: doublechr.c,v 1.109 2024/09/01 22:49:10 tom Exp $ */
+/* $XTermId: doublechr.c,v 1.110 2024/12/01 19:38:29 tom Exp $ */
 
 /*
  * Copyright 1997-2022,2024 by Thomas E. Dickey
@@ -61,7 +61,7 @@
      * Ignore repetition.
      */
     if (!IsLeftRightMode(xw)
-	&& (ld = getLineData(screen, currow)) != 0) {
+	&& (ld = getLineData(screen, currow)) != NULL) {
 	unsigned oldChrSet = GetLineDblCS(ld);
 
 	if (oldChrSet != newChrSet) {
@@ -156,7 +156,7 @@
     for (row = 0; row < screen->max_row; ++row) {
 	LineData *ld;
 
-	if ((ld = getLineData(screen, ROW2INX(screen, row))) != 0) {
+	if ((ld = getLineData(screen, ROW2INX(screen, row))) != NULL) {
 	    code = GetLineDblCS(ld);
 	    if (code != CSET_SWL) {
 		SetLineDblCS(ld, CSET_SWL);
@@ -180,7 +180,7 @@
     XTermFonts *data = getDoubleFont(screen, n);
 
     TRACE(("discard_font chrset=%d %s\n", data->chrset,
-	   (data->fn != 0) ? data->fn : "<no-name>"));
+	   (data->fn != NULL) ? data->fn : "<no-name>"));
 
     data->chrset = 0;
     data->flags = 0;
@@ -261,20 +261,19 @@
     TScreen *screen = TScreenOf(params->xw);
     VTwin *cgsWin = WhichVWin(screen);
     char *name;
-    GC result = 0;
+    GC result = NULL;
 
-    if ((name = xtermSpecialFont(params))
-	!= 0) {
+    if ((name = xtermSpecialFont(params)) != NULL) {
 	CgsEnum cgsId = WhichCgsId(params->attr_flags);
 	Boolean found = False;
-	XTermFonts *data = 0;
+	XTermFonts *data = NULL;
 	int n;
 
 	if ((n = xterm_Double_index(params)) >= 0) {
 	    data = getDoubleFont(screen, n);
-	    if (data->fn != 0) {
+	    if (data->fn != NULL) {
 		if (!strcmp(data->fn, name)
-		    && data->fs != 0) {
+		    && data->fs != NULL) {
 		    found = True;
 		    FreeAndNull(name);
 		} else {
@@ -302,7 +301,7 @@
 		/* Retry with * in resolutions */
 		local.draw_flags |= NORESOLUTION;
 		nname = xtermSpecialFont(&local);
-		if (nname != 0) {
+		if (nname != NULL) {
 		    found = (Boolean) xtermOpenFont(params->xw, nname, &temp,
 						    NULL, False);
 		    free(nname);
Index: fontutils.c
--- xterm-395+/fontutils.c	2024-09-30 07:35:30.000000000 +0000
+++ xterm-396/fontutils.c	2024-12-01 20:29:42.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: fontutils.c,v 1.786 2024/09/30 07:35:30 tom Exp $ */
+/* $XTermId: fontutils.c,v 1.787 2024/12/01 20:29:42 tom Exp $ */
 
 /*
  * Copyright 1998-2023,2024 by Thomas E. Dickey
@@ -74,20 +74,20 @@
 
 #define CI_GET_CHAR_INFO_1D(fs,col,cs) \
 { \
-    cs = 0; \
+    cs = NULL; \
     if (col >= fs->min_char_or_byte2 && col <= fs->max_char_or_byte2) { \
 	if (fs->per_char == NULL) { \
 	    cs = &fs->min_bounds; \
 	} else { \
 	    cs = &fs->per_char[(col - fs->min_char_or_byte2)]; \
 	} \
-	if (CI_NONEXISTCHAR(cs)) cs = 0; \
+	if (CI_NONEXISTCHAR(cs)) cs = NULL; \
     } \
 }
 
 #define CI_GET_CHAR_INFO_2D(fs,row,col,cs) \
 { \
-    cs = 0; \
+    cs = NULL; \
     if (row >= fs->min_byte1 && row <= fs->max_byte1 && \
 	col >= fs->min_char_or_byte2 && col <= fs->max_char_or_byte2) { \
 	if (fs->per_char == NULL) { \
@@ -98,14 +98,14 @@
 				 fs->min_char_or_byte2 + 1)) + \
 			       (col - fs->min_char_or_byte2)]; \
 	} \
-	if (CI_NONEXISTCHAR(cs)) cs = 0; \
+	if (CI_NONEXISTCHAR(cs)) cs = NULL; \
     } \
 }
 
 #define FREE_FNAME(field) \
-	    if (fonts == 0 || new_fnames.field != fonts->field) { \
+	    if (fonts == NULL || new_fnames.field != fonts->field) { \
 		FREE_STRING(new_fnames.field); \
-		new_fnames.field = 0; \
+		new_fnames.field = NULL; \
 	    }
 
 /*
@@ -217,7 +217,7 @@
 {
     unsigned count = 0;
 
-    if (fp != 0) {
+    if (fp != NULL) {
 	if (fp->min_byte1 == 0 && fp->max_byte1 == 0) {
 	    count = fp->max_char_or_byte2 - fp->min_char_or_byte2 + 1;
 	} else if (fp->min_char_or_byte2 < 256
@@ -266,7 +266,7 @@
 
 	for (e = 0; e < fMAX; ++e) {
 	    XTermXftFonts *data = getMyXftFont(xw, e, screen->menu_font_number);
-	    if (data != 0) {
+	    if (data != NULL) {
 		if (data->font_info.mixed) {
 		    screen->allow_packing = True;
 		    break;
@@ -295,7 +295,7 @@
     Boolean result = False;
     NameList *list;
     if (!IsEmpty(name)) {
-	for (list = derived_fonts; list != 0; list = list->next) {
+	for (list = derived_fonts; list != NULL; list = list->next) {
 	    if (!x_strcasecmp(name, list->name)) {
 		result = True;
 		break;
@@ -333,16 +333,16 @@
      * find the start-1th dash
      */
     for (i = start - 1, str = *source; i; i--, str++) {
-	if ((str = strchr(str, '-')) == 0)
-	    return 0;
+	if ((str = strchr(str, '-')) == NULL)
+	    return NULL;
     }
 
     /*
      * find the stopth dash
      */
     for (i = stop - start + 1, str1 = str; i; i--, str1++) {
-	if ((str1 = strchr(str1, '-')) == 0)
-	    return 0;
+	if ((str1 = strchr(str1, '-')) == NULL)
+	    return NULL;
     }
 
     /*
@@ -393,7 +393,7 @@
     /*
      * first get the full font name
      */
-    name = 0;
+    name = NULL;
     fontatom = CachedInternAtom(dpy, "FONT");
     if (fontatom != 0) {
 	XFontProp *fp;
@@ -407,8 +407,8 @@
 	}
     }
 
-    if (name == 0)
-	return 0;
+    if (name == NULL)
+	return NULL;
 
     /*
      * XGetAtomName allocates memory - don't leak
@@ -416,9 +416,9 @@
     XFree(last_name);
     last_name = name;
 
-    if (result != 0) {
+    if (result != NULL) {
 	if (!check_fontname(name))
-	    return 0;
+	    return NULL;
 	free(*result);
 	*result = x_strdup(name);
     }
@@ -430,56 +430,56 @@
      */
 
     /* registry, foundry, family */
-    if ((props.beginning = n_fields(&name, 1, 3)) == 0)
-	return 0;
+    if ((props.beginning = n_fields(&name, 1, 3)) == NULL)
+	return NULL;
 
     /* weight is the next */
-    if ((props.weight = n_fields(&name, 1, 1)) == 0)
-	return 0;
+    if ((props.weight = n_fields(&name, 1, 1)) == NULL)
+	return NULL;
 
     /* slant */
-    if ((props.slant = n_fields(&name, 1, 1)) == 0)
-	return 0;
+    if ((props.slant = n_fields(&name, 1, 1)) == NULL)
+	return NULL;
 
     /* width */
-    if ((props.wideness = n_fields(&name, 1, 1)) == 0)
-	return 0;
+    if ((props.wideness = n_fields(&name, 1, 1)) == NULL)
+	return NULL;
 
     /* add style */
-    if ((props.add_style = n_fields(&name, 1, 1)) == 0)
-	return 0;
+    if ((props.add_style = n_fields(&name, 1, 1)) == NULL)
+	return NULL;
 
     /* pixel size */
-    if ((str = n_fields(&name, 1, 1)) == 0)
-	return 0;
+    if ((str = n_fields(&name, 1, 1)) == NULL)
+	return NULL;
     if ((props.pixel_size = atoi(str)) == 0)
-	return 0;
+	return NULL;
 
     /* point size */
-    if ((props.point_size = n_fields(&name, 1, 1)) == 0)
-	return 0;
+    if ((props.point_size = n_fields(&name, 1, 1)) == NULL)
+	return NULL;
 
     /* res_x */
-    if ((str = n_fields(&name, 1, 1)) == 0)
-	return 0;
+    if ((str = n_fields(&name, 1, 1)) == NULL)
+	return NULL;
     if ((props.res_x = atoi(str)) == 0)
-	return 0;
+	return NULL;
 
     /* res_y */
-    if ((str = n_fields(&name, 1, 1)) == 0)
-	return 0;
+    if ((str = n_fields(&name, 1, 1)) == NULL)
+	return NULL;
     if ((props.res_y = atoi(str)) == 0)
-	return 0;
+	return NULL;
 
     /* spacing */
-    if ((props.spacing = n_fields(&name, 1, 1)) == 0)
-	return 0;
+    if ((props.spacing = n_fields(&name, 1, 1)) == NULL)
+	return NULL;
 
     /* average width */
-    if ((str = n_fields(&name, 1, 1)) == 0)
-	return 0;
+    if ((str = n_fields(&name, 1, 1)) == NULL)
+	return NULL;
     if ((props.average_width = atoi(str)) == 0)
-	return 0;
+	return NULL;
 
     /* the rest: charset registry and charset encoding */
     props.end = name;
@@ -492,8 +492,8 @@
 static void
 alloca_fontname(char **result, size_t next)
 {
-    size_t last = (*result != 0) ? strlen(*result) : 0;
-    size_t have = (*result != 0) ? ALLOCHUNK(last) : 0;
+    size_t last = (*result != NULL) ? strlen(*result) : 0;
+    size_t have = (*result != NULL) ? ALLOCHUNK(last) : 0;
     size_t want = last + next + 2;
 
     if (want >= have) {
@@ -501,10 +501,10 @@
 	want = ALLOCHUNK(want);
 	if (last != 0) {
 	    *result = TypeRealloc(char, want, *result);
-	    if (*result == 0)
+	    if (*result == NULL)
 		free(save);
 	} else {
-	    if ((*result = TypeMallocN(char, want)) != 0) {
+	    if ((*result = TypeMallocN(char, want)) != NULL) {
 		free(save);
 		**result = '\0';
 	    }
@@ -515,10 +515,10 @@
 static void
 append_fontname_str(char **result, const char *value)
 {
-    if (value == 0)
+    if (value == NULL)
 	value = "*";
     alloca_fontname(result, strlen(value));
-    if (*result != 0) {
+    if (*result != NULL) {
 	if (**result != '\0')
 	    strcat(*result, "-");
 	strcat(*result, value);
@@ -549,13 +549,13 @@
 		 int use_average_width,
 		 const char *use_encoding)
 {
-    char *result = 0;
+    char *result = NULL;
 
     append_fontname_str(&result, props->beginning);
     append_fontname_str(&result, use_weight);
     append_fontname_str(&result, props->slant);
-    append_fontname_str(&result, 0);
-    append_fontname_str(&result, 0);
+    append_fontname_str(&result, NULL);
+    append_fontname_str(&result, NULL);
     append_fontname_num(&result, props->pixel_size);
     append_fontname_str(&result, props->point_size);
     append_fontname_num(&result, props->res_x);
@@ -597,11 +597,11 @@
     NoFontWarning(data);
     for (pass = 0; pass < XtNumber(slant); ++pass) {
 	char *name;
-	if ((name = italic_font_name(fp, slant[pass])) != 0) {
+	if ((name = italic_font_name(fp, slant[pass])) != NULL) {
 	    TRACE(("open_italic_font %s %s\n",
 		   whichFontEnum((VTFontEnum) n), name));
 	    if (xtermOpenFont(xw, name, data, NULL, False)) {
-		result = (data->fs != 0);
+		result = (data->fs != NULL);
 #if OPT_REPORT_FONTS
 		if (resource.reportFonts) {
 		    ReportFonts("opened italic version of %s:\n\t%s\n",
@@ -618,7 +618,7 @@
 #if OPT_TRACE
     if (result) {
 	XFontStruct *fs = data->fs;
-	if (fs != 0) {
+	if (fs != NULL) {
 	    TRACE(("...actual size %dx%d (ascent %d, descent %d)\n",
 		   fs->ascent +
 		   fs->descent,
@@ -666,15 +666,15 @@
     static FontNameProperties old_props;
 #endif
     FontNameProperties *props;
-    char *result = 0;
+    char *result = NULL;
     const char *weight;
     int pixel_size;
     int res_x;
     int res_y;
 
     props = get_font_name_props(screen->display,
-				GetNormalFont(screen, fNorm)->fs, 0);
-    if (props == 0)
+				GetNormalFont(screen, fNorm)->fs, NULL);
+    if (props == NULL)
 	return result;
 
     pixel_size = props->pixel_size;
@@ -723,7 +723,7 @@
     append_fontname_num(&result, (params->draw_flags & NORESOLUTION) ? -1 : res_x);
     append_fontname_num(&result, (params->draw_flags & NORESOLUTION) ? -1 : res_y);
     append_fontname_str(&result, props->spacing);
-    append_fontname_str(&result, 0);
+    append_fontname_str(&result, NULL);
     append_fontname_str(&result, props->end);
 
     xtermDerivedFont(result);
@@ -779,10 +779,10 @@
 static int
 got_bold_font(Display *dpy, XFontStruct *fs, String requested)
 {
-    char *actual = 0;
+    char *actual = NULL;
     int got;
 
-    if (get_font_name_props(dpy, fs, &actual) == 0)
+    if (get_font_name_props(dpy, fs, &actual) == NULL)
 	got = 0;
     else
 	got = same_font_name(requested, actual);
@@ -800,7 +800,7 @@
 #define DATA "comparable_metrics: "
     int result = 0;
 
-    if (normal == 0 || bold == 0) {
+    if (normal == NULL || bold == NULL) {
 	;
     } else if (normal->all_chars_exist) {
 	if (bold->all_chars_exist) {
@@ -808,8 +808,8 @@
 	} else {
 	    TRACE((DATA "all chars exist in normal font, but not in bold\n"));
 	}
-    } else if (normal->per_char != 0) {
-	if (bold->per_char != 0) {
+    } else if (normal->per_char != NULL) {
+	if (bold->per_char != NULL) {
 	    result = 1;
 	} else {
 	    TRACE((DATA "normal font has per-char metrics, but not bold\n"));
@@ -833,7 +833,7 @@
     TScreen *screen = TScreenOf(xw);
     int result = 0;
 
-    if (nfs != 0 && bfs != 0) {
+    if (nfs != NULL && bfs != NULL) {
 	TRACE(("same_font_size height %d/%d, min %d/%d max %d/%d\n",
 	       nfs->ascent + nfs->descent,
 	       bfs->ascent + bfs->descent,
@@ -950,7 +950,7 @@
 #define is_double_width_font_xft(dpy, xftfont) 0
 #endif
 
-#define EmptyFont(fs) (fs != 0 \
+#define EmptyFont(fs) (fs != NULL \
 		   && ((fs)->ascent + (fs)->descent == 0 \
 		    || (fs)->max_bounds.width == 0))
 
@@ -985,9 +985,9 @@
 static void
 cache_menu_font_name(TScreen *screen, int fontnum, int which, const char *name)
 {
-    if (name != 0) {
+    if (name != NULL) {
 	String last = screen->menu_font_names[fontnum][which];
-	if (last != 0) {
+	if (last != NULL) {
 	    if (strcmp(last, name)) {
 		FREE_STRING(last);
 		TRACE(("caching menu fontname %d.%d %s\n", fontnum, which, name));
@@ -1016,12 +1016,12 @@
     case fwAlways:
 	break;
     }
-    for (list = reported; list != 0; list = list->next) {
+    for (list = reported; list != NULL; list = list->next) {
 	if (!x_strcasecmp(name, list->name)) {
 	    return;
 	}
     }
-    if ((list = TypeMalloc(NameList)) != 0) {
+    if ((list = TypeMalloc(NameList)) != NULL) {
 	list->name = x_strdup(name);
 	list->next = reported;
 	reported = list;
@@ -1084,7 +1084,7 @@
 			 && current->fs != NULL
 			 && current->fn != NULL);
 
-	if ((result->fs = xtermLoadQueryFont(xw, name)) != 0) {
+	if ((result->fs = xtermLoadQueryFont(xw, name)) != NULL) {
 	    code = True;
 	    if (EmptyFont(result->fs)) {
 		xtermCloseFont(xw, result);
@@ -1122,7 +1122,7 @@
 void
 xtermCloseFont(XtermWidget xw, XTermFonts * fnt)
 {
-    if (fnt != 0 && fnt->fs != 0) {
+    if (fnt != NULL && fnt->fs != NULL) {
 	TScreen *screen = TScreenOf(xw);
 
 	clrCgsFonts(xw, WhichVWin(screen), fnt);
@@ -1139,7 +1139,7 @@
 {
     XFontStruct *thisFont = fnts[which].fs;
 
-    if (thisFont != 0) {
+    if (thisFont != NULL) {
 	int k;
 
 	xtermCloseFont(xw, &fnts[which]);
@@ -1187,7 +1187,7 @@
     target->chrset = 0;
     target->flags = 0;
     FreeAndNull(target->fn);
-    target->fs = 0;
+    target->fs = NULL;
 }
 
 #if OPT_REPORT_FONTS
@@ -1291,7 +1291,7 @@
 reportOneVTFont(const char *tag,
 		XTermFonts * fnt)
 {
-    if (!IsEmpty(fnt->fn) && fnt->fs != 0) {
+    if (!IsEmpty(fnt->fn) && fnt->fs != NULL) {
 	XFontStruct *fs = fnt->fs;
 	unsigned first_char = 0;
 	unsigned last_char = 0;
@@ -1387,8 +1387,8 @@
     if_OPT_WIDE_CHARS(screen, {
 	XTermFonts *wide_xx = myfunc(screen, fWide);
 	XTermFonts *bold_xx = myfunc(screen, fWBold);
-	if (wide_xx->fs != 0
-	    && bold_xx->fs != 0) {
+	if (wide_xx->fs != NULL
+	    && bold_xx->fs != NULL) {
 	    setCgsFore(xw, win, gcWide, new_normal);
 	    setCgsBack(xw, win, gcWide, new_revers);
 	    setCgsFont(xw, win, gcWide, wide_xx);
@@ -1429,7 +1429,7 @@
 static void
 show_font_misses(const char *name, XTermFonts * fp)
 {
-    if (fp->fs != 0) {
+    if (fp->fs != NULL) {
 	if (FontLacksMetrics(fp)) {
 	    TRACE(("%s font lacks metrics\n", name));
 	} else if (FontIsIncomplete(fp)) {
@@ -1489,7 +1489,7 @@
 	char *normal = x_strdup(nameRef);
 
 	fp = get_font_name_props(screen->display, infoRef->fs, &normal);
-	if (fp != 0) {
+	if (fp != NULL) {
 	    NoFontWarning(infoOut);
 	    *nameOutP = bold_font_name(fp, fp->average_width);
 	    if (!xtermOpenFont(xw, *nameOutP, infoOut, NULL, False)) {
@@ -1499,7 +1499,7 @@
 	    }
 	    TRACE(("...derived bold '%s'\n", NonNull(*nameOutP)));
 	}
-	if (fp == 0 || infoOut->fs == 0) {
+	if (fp == NULL || infoOut->fs == NULL) {
 	    xtermCopyFontInfo(infoOut, infoRef);
 	    TRACE(("...cannot load a matching bold font\n"));
 	} else if (comparable_metrics(infoRef->fs, infoOut->fs)
@@ -1559,7 +1559,7 @@
 	char *normal = x_strdup(nameRef);
 	FontNameProperties *fp = get_font_name_props(screen->display,
 						     infoRef->fs, &normal);
-	if (fp != 0) {
+	if (fp != NULL) {
 	    *nameOutP = wide_font_name(fp);
 	    NoFontWarning(infoOut);
 	}
@@ -1572,7 +1572,7 @@
 	    && EmptyFont(infoOut->fs)) {
 	    xtermCloseFont2(xw, infoOut - fWide, fWide);
 	}
-	if (infoOut->fs == 0) {
+	if (infoOut->fs == NULL) {
 	    xtermCopyFontInfo(infoOut, infoRef);
 	} else {
 	    TRACE(("...%s wide %s\n",
@@ -1612,7 +1612,7 @@
     if (!check_fontname(*nameOutP)) {
 	FontNameProperties *fp;
 	fp = get_font_name_props(screen->display, boldInfoRef->fs, &bold);
-	if (fp != 0) {
+	if (fp != NULL) {
 	    *nameOutP = widebold_font_name(fp);
 	    NoFontWarning(infoOut);
 	}
@@ -1626,7 +1626,7 @@
 	    xtermCloseFont2(xw, infoOut - fWBold, fWBold);
 	}
 
-	if (infoOut->fs == 0) {
+	if (infoOut->fs == NULL) {
 	    if (is_derived_font_name(*nameOutP))
 		free(*nameOutP);
 	    if (IsEmpty(wideNameRef)) {
@@ -1698,14 +1698,14 @@
     memset(new_fonts, 0, sizeof(new_fonts));
     memcpy(&old_fonts, screen->fnts, sizeof(old_fonts));
 
-    if (fonts != 0)
+    if (fonts != NULL)
 	new_fnames = *fonts;
     if (!check_fontname(new_fnames.f_n))
 	return code;
 
     if (fontnum == fontMenu_fontescape
 	&& new_fnames.f_n != screen->MenuFontName(fontnum)) {
-	if ((tmpname = x_strdup(new_fnames.f_n)) == 0)
+	if ((tmpname = x_strdup(new_fnames.f_n)) == NULL)
 	    return code;
     }
 
@@ -1770,8 +1770,8 @@
      * Normal/bold fonts should be the same width.  Also, the min/max
      * values should be the same.
      */
-    if (new_fonts[fNorm].fs != 0
-	&& new_fonts[fBold].fs != 0
+    if (new_fonts[fNorm].fs != NULL
+	&& new_fonts[fBold].fs != NULL
 	&& (!is_fixed_font(new_fonts[fNorm].fs)
 	    || !is_fixed_font(new_fonts[fBold].fs)
 	    || differing_widths(new_fonts[fNorm].fs, new_fonts[fBold].fs))) {
@@ -1784,8 +1784,8 @@
     }
 
     if_OPT_WIDE_CHARS(screen, {
-	if (new_fonts[fWide].fs != 0
-	    && new_fonts[fWBold].fs != 0
+	if (new_fonts[fWide].fs != NULL
+	    && new_fonts[fWBold].fs != NULL
 	    && (!is_fixed_font(new_fonts[fWide].fs)
 		|| !is_fixed_font(new_fonts[fWBold].fs)
 		|| differing_widths(new_fonts[fWide].fs, new_fonts[fWBold].fs))) {
@@ -2018,11 +2018,11 @@
 		/*
 		 * FIXME - need to handle font-leaks
 		 */
-		data->fs = 0;
-		if (getNormalFont(screen, n)->fs != 0 &&
+		data->fs = NULL;
+		if (getNormalFont(screen, n)->fs != NULL &&
 		    (fp = get_font_name_props(screen->display,
 					      getNormalFont(screen, n)->fs,
-					      0)) != 0) {
+					      NULL)) != NULL) {
 		    if (!open_italic_font(xw, n, fp, data)) {
 			if (n > 0) {
 			    xtermCopyFontInfo(data,
@@ -2074,7 +2074,7 @@
 	for (n = fontMenu_default; n <= fontMenu_lastBuiltin; ++n) { \
 	    for (m = 0; m < fMAX; ++m) { \
 		FREE_STRING(dst.menu_font_names[n][m]); \
-		dst.menu_font_names[n][m] = 0; \
+		dst.menu_font_names[n][m] = NULL; \
 	    } \
 	}
 
@@ -2428,7 +2428,7 @@
 {
     XtermWidget xw;
 
-    if ((xw = getXtermWidget(w)) != 0) {
+    if ((xw = getXtermWidget(w)) != NULL) {
 	static char empty[] = "";	/* appease strict compilers */
 
 	TScreen *screen = TScreenOf(xw);
@@ -2437,13 +2437,13 @@
 	char *myName = MyStackAlloc(strlen(name) + 1, name_buf);
 
 	TRACE(("HandleLoadVTFonts(%d)\n", *param_count));
-	if (myName != 0) {
+	if (myName != NULL) {
 	    char class_buf[80];
 	    String convert = (String) ((*param_count > 1) ? params[1] : myName);
 	    char *myClass = MyStackAlloc(strlen(convert) + 1, class_buf);
 
 	    strcpy(myName, name);
-	    if (myClass != 0) {
+	    if (myClass != NULL) {
 		strcpy(myClass, convert);
 		if (*param_count == 1)
 		    myClass[0] = x_toupper(myClass[0]);
@@ -2663,7 +2663,7 @@
 isBogusXft(XftFont *font)
 {
     Boolean result = False;
-    if (font != 0) {
+    if (font != NULL) {
 	FcBool fcbogus;
 	if (GetFcBool(font->pattern, FC_COLOR) && fcbogus) {
 	    TRACE(("...matched color-bitmap font\n"));
@@ -2834,7 +2834,7 @@
     if (XftNameUnparse(fp->pattern, buffer, (int) sizeof(buffer))) {
 	char *target;
 	char *source = buffer;
-	if ((target = strtok(source, ":")) != 0) {
+	if ((target = strtok(source, ":")) != NULL) {
 	    result = x_strdup(target);
 	}
     }
@@ -2875,9 +2875,9 @@
 	if (XftNameUnparse(match, buffer, (int) sizeof(buffer))) {
 	    char *target;
 	    char *source = buffer;
-	    while ((target = strtok(source, ":")) != 0) {
+	    while ((target = strtok(source, ":")) != NULL) {
 		ReportFonts("\t%s\n", target);
-		source = 0;
+		source = NULL;
 	    }
 	}
 	fflush(stdout);
@@ -2945,13 +2945,13 @@
 void
 closeCachedXft(TScreen *screen, XftFont *font)
 {
-    if (font != 0) {
+    if (font != NULL) {
 	ListXftFonts *p, *q;
 
-	for (p = screen->list_xft_fonts, q = 0; p != 0; q = p, p = p->next) {
+	for (p = screen->list_xft_fonts, q = NULL; p != NULL; q = p, p = p->next) {
 	    if (p->font == font) {
 		XftFontClose(screen->display, font);
-		if (q != 0) {
+		if (q != NULL) {
 		    q->next = p->next;
 		} else {
 		    screen->list_xft_fonts = p->next;
@@ -2974,17 +2974,17 @@
     TScreen *screen = TScreenOf(xw);
     Display *dpy = screen->display;
     XftResult status;
-    XftFont *result = 0;
+    XftFont *result = NULL;
 
     TRACE(("xtermOpenXft(name=%s, tag=%s)\n", name, tag));
-    if (pat != 0 && (fontNum <= MaxXftCache)) {
+    if (pat != NULL && (fontNum <= MaxXftCache)) {
 	XftPattern *match;
 
 	FcConfigSubstitute(NULL, pat, FcMatchPattern);
 	XftDefaultSubstitute(dpy, DefaultScreen(dpy), pat);
 
 	match = FcFontMatch(NULL, pat, &status);
-	if (match != 0) {
+	if (match != NULL) {
 	    Boolean maybeReopened = False;
 	    result = XftFontOpenPattern(dpy, match);
 #ifdef FC_COLOR
@@ -3322,7 +3322,7 @@
 	    TRACE(("...reduce width from %d to %d\n", width, width >> 1));
 	    width >>= 1;
 	}
-	if (tag == 0) {
+	if (tag == NULL) {
 	    SetFontWidth(screen, win, width);
 	    SetFontHeight(screen, win, height);
 	    win->f_ascent = ascent;
@@ -3346,7 +3346,7 @@
 	    TRACE(("setRenderFontsize %s unchanged\n", tag));
 	}
 #if OPT_BOX_CHARS
-	if (!screen->broken_box_chars && (tag == 0)) {
+	if (!screen->broken_box_chars && (tag == NULL)) {
 	    linedrawing_gaps(xw, data);
 	}
 #endif
@@ -3420,7 +3420,7 @@
 setFaceName(XtermWidget xw, const char *value)
 {
     TScreen *screen = TScreenOf(xw);
-    Boolean changed = (Boolean) ((CurrentXftFont(xw) == 0)
+    Boolean changed = (Boolean) ((CurrentXftFont(xw) == NULL)
 				 || strcmp(CurrentXftFont(xw), value));
 
     if (changed) {
@@ -3476,7 +3476,7 @@
 	XTermXftFonts *wbtal = &(screen->renderWideBtal[fontnum]);
 #endif
 
-	if (XftFp(norm) == 0 && !IsEmpty(face_name)) {
+	if (XftFp(norm) == NULL && !IsEmpty(face_name)) {
 	    Work *work = &(xw->work);
 	    XftPattern *pat;
 	    double face_size;
@@ -3554,7 +3554,7 @@
 
 #if OPT_WIDE_ATTRS
 #define HAVE_ITALICS 1
-#define FIND_ITALICS ((pat = XftNameParse(face_name)) != 0)
+#define FIND_ITALICS ((pat = XftNameParse(face_name)) != NULL)
 #elif OPT_ISO_COLORS
 #define HAVE_ITALICS 1
 #define FIND_ITALICS (screen->italicULMode && (pat = XftNameParse(face_name)) != 0)
@@ -3565,7 +3565,7 @@
 #if OPT_DEC_CHRSET
 	    freeall_DoubleFT(xw);
 #endif
-	    if ((pat = XftNameParse(face_name)) != 0) {
+	    if ((pat = XftNameParse(face_name)) != NULL) {
 #define OPEN_XFT(data, tag) xtermOpenXft(xw, data, 0, face_name, data->pattern, tag)
 		norm->pattern = XftPatternDuplicate(pat);
 		XftPatternBuild(norm->pattern,
@@ -3573,7 +3573,7 @@
 				(void *) 0);
 		OPEN_XFT(norm, "normal");
 
-		if (XftFp(norm) != 0) {
+		if (XftFp(norm) != NULL) {
 		    bold->pattern = XftPatternDuplicate(pat);
 		    XftPatternBuild(bold->pattern,
 				    NormXftPattern,
@@ -3611,7 +3611,7 @@
 		CACHE_XFT(norm);
 
 		CACHE_XFT(bold);
-		if (XftFp(norm) != 0 && !XftFp(bold)) {
+		if (XftFp(norm) != NULL && !XftFp(bold)) {
 		    noUsableXft(xw, "bold");
 		    XftPatternDestroy(bold->pattern);
 		    bold->pattern = XftPatternDuplicate(pat);
@@ -3624,7 +3624,7 @@
 		}
 #if HAVE_ITALICS
 		CACHE_XFT(ital);
-		if (XftFp(norm) != 0 && !XftFp(ital)) {
+		if (XftFp(norm) != NULL && !XftFp(ital)) {
 		    noUsableXft(xw, "italic");
 		    XftPatternDestroy(ital->pattern);
 		    ital->pattern = XftPatternDuplicate(pat);
@@ -3636,7 +3636,7 @@
 		    CACHE_XFT(ital);
 		}
 		CACHE_XFT(btal);
-		if (XftFp(norm) != 0 && !XftFp(btal)) {
+		if (XftFp(norm) != NULL && !XftFp(btal)) {
 		    noUsableXft(xw, "bold italic");
 		    XftPatternDestroy(btal->pattern);
 		    btal->pattern = XftPatternDuplicate(pat);
@@ -3658,7 +3658,7 @@
 	     * to have, but not essential.
 	     */
 #if OPT_RENDERWIDE
-	    if (XftFp(norm) != 0 && screen->wide_chars) {
+	    if (XftFp(norm) != NULL && screen->wide_chars) {
 		int char_width = XftFp(norm)->max_advance_width * 2;
 		double aspect = ((FirstItemOf(xw->work.fonts.xft.list_w)
 				  || screen->renderFontNorm[fontnum].font_info.mixed)
@@ -3678,14 +3678,14 @@
 		FC_ASPECT,      XftTypeDouble,   aspect
 
 		if (!IsEmpty(face_name) && (pat = XftNameParse(face_name))
-		    != 0) {
+		    != NULL) {
 		    wnorm->pattern = XftPatternDuplicate(pat);
 		    XftPatternBuild(wnorm->pattern,
 				    WideXftPattern,
 				    (void *) 0);
 		    OPEN_XFT(wnorm, "wide");
 
-		    if (XftFp(wnorm) != 0) {
+		    if (XftFp(wnorm) != NULL) {
 			wbold->pattern = XftPatternDuplicate(pat);
 			XftPatternBuild(wbold->pattern,
 					WideXftPattern,
@@ -3720,7 +3720,7 @@
 		    CACHE_XFT(wnorm);
 
 		    CACHE_XFT(wbold);
-		    if (XftFp(wnorm) != 0 && !XftFp(wbold)) {
+		    if (XftFp(wnorm) != NULL && !XftFp(wbold)) {
 			noUsableXft(xw, "wide-bold");
 			XftPatternDestroy(wbold->pattern);
 			wbold->pattern = XftPatternDuplicate(pat);
@@ -3733,7 +3733,7 @@
 		    }
 
 		    CACHE_XFT(wital);
-		    if (XftFp(wnorm) != 0 && !XftFp(wital)) {
+		    if (XftFp(wnorm) != NULL && !XftFp(wital)) {
 			noUsableXft(xw, "wide-italic");
 			XftPatternDestroy(wital->pattern);
 			wital->pattern = XftPatternDuplicate(pat);
@@ -3751,7 +3751,7 @@
 	    }
 #endif /* OPT_RENDERWIDE */
 	}
-	if (XftFp(norm) == 0) {
+	if (XftFp(norm) == NULL) {
 	    TRACE(("...no TrueType font found for number %d, disable menu entry\n", fontnum));
 	    xw->work.render_font = False;
 	    update_font_renderfont();
@@ -3873,7 +3873,7 @@
 {
     Bool result = False;
     XFontStruct *fs = font->fs;
-    XCharStruct *pc = 0;
+    XCharStruct *pc = NULL;
 
     if (fs == NULL) {
 	result = True;
@@ -3893,7 +3893,7 @@
     }
 #endif
 
-    if (pc == 0 || CI_NONEXISTCHAR(pc)) {
+    if (pc == NULL || CI_NONEXISTCHAR(pc)) {
 	TRACE2(("xtermMissingChar %#04x (!exists)\n", ch));
 	result = True;
     }
@@ -4118,14 +4118,14 @@
 	const short *const data;
     } lines[] =
     {
-	{ 0, 0 },			/* 00 (unused) */
-	{ 0, 0 },			/* 01 diamond */
-	{ 0, 0 },			/* 02 box */
+	{ 0, NULL },			/* 00 (unused) */
+	{ 0, NULL },			/* 01 diamond */
+	{ 0, NULL },			/* 02 box */
 	{ 0, glyph_ht },		/* 03 HT */
 	{ 0, glyph_ff },		/* 04 FF */
-	{ 0, 0 },			/* 05 CR */
+	{ 0, NULL },			/* 05 CR */
 	{ 0, glyph_lf },		/* 06 LF */
-	{ 0, 0 },			/* 07 degrees (small circle) */
+	{ 0, NULL },			/* 07 degrees (small circle) */
 	{ 3, plus_or_minus },		/* 08 */
 	{ 0, glyph_nl },		/* 09 */
 	{ 0, glyph_vt },		/* 0A */
@@ -4148,9 +4148,9 @@
 	{ 0, greater_than_or_equal },	/* 1B */
 	{ 0, greek_pi },		/* 1C */
 	{ 0, not_equal_to },		/* 1D */
-	{ 0, 0 },			/* 1E LB */
-	{ 0, 0 },			/* 1F bullet */
-	{ 0, 0 },			/* 20 space */
+	{ 0, NULL },			/* 1E LB */
+	{ 0, NULL },			/* 1F bullet */
+	{ 0, NULL },			/* 20 space */
 	{ 3, sigma_1 },			/* PUA(0) */
 	{ 3, sigma_2 },			/* PUA(1) */
 	{ 3, sigma_3 },			/* PUA(2) */
@@ -4327,7 +4327,7 @@
 		 0,
 		 360 * 64);
     } else if (ch < XtNumber(lines)
-	       && (p = lines[ch].data) != 0) {
+	       && (p = lines[ch].data) != NULL) {
 	int coord[4];
 	int n = 0;
 	while (*p >= 0) {
@@ -4426,7 +4426,7 @@
     XftFont *font = XftFpN(data, fontNum);
     int result = 0;
 
-    if (font != 0) {
+    if (font != NULL) {
 	if (!xtermXftMissing(xw, data, fontNum, font, wc)) {
 
 	    if (XftIsN(data, fontNum) == xcBogus) {
@@ -4448,7 +4448,7 @@
 	which->opened++;
 	XftIsN(which, n) = xcOpened;
 	/* XFT_DEBUG=3 will show useful context for this */
-	if (getenv("XFT_DEBUG") != 0) {
+	if (getenv("XFT_DEBUG") != NULL) {
 	    printf("%s: matched U+%04X in fontset #%d [%u:%u]\n",
 		   ProgramName,
 		   wc, n + 1,
@@ -4583,7 +4583,9 @@
 
 	fontData->fontset = FcFontSetCreate();
 
-	if (fontData->fontset == 0 || !sortedFonts || sortedFonts->nfont <= 0) {
+	if (fontData->fontset == NULL
+	    || !sortedFonts
+	    || sortedFonts->nfont <= 0) {
 	    xtermWarning("did not find any usable TrueType font\n");
 	    return 0;
 	}
@@ -4596,7 +4598,7 @@
 	    && *++my_list != NULL) {
 	    for (j = 0; my_list[j] != NULL; ++j) {
 		FcPattern *extraPattern;
-		if ((extraPattern = XftNameParse(my_list[j])) != 0) {
+		if ((extraPattern = XftNameParse(my_list[j])) != NULL) {
 		    FcPattern *match;
 
 		    match = mergeXftStyle(xw, extraPattern, fontData);
@@ -4824,7 +4826,7 @@
     if ((ch > 127)
 	&& !is_UCS_SPECIAL(ch)) {
 #if OPT_VT52_MODE
-	if (screen != 0 && !(screen->vtXX_level)) {
+	if (screen != NULL && !(screen->vtXX_level)) {
 	    /*
 	     * Intentionally empty: it would be possible to use the built-in
 	     * line-drawing fallback in xtermDrawBoxChar(), but for testing
@@ -4882,7 +4884,7 @@
     (void) screen;
     if (xtermIsDecGraphic(ch)) {
 #if OPT_VT52_MODE
-	if (screen != 0 && !(screen->vtXX_level)) {
+	if (screen != NULL && !(screen->vtXX_level)) {
 	    switch (ch) {
 		MY_UCS(0x0020, 0);	/* nbsp, treat as blank           */
 		MY_UCS(0x0020, 1);	/* reserved, treat as blank       */
@@ -5221,7 +5223,7 @@
     XtermWidget xw;
 
     TRACE(("Handle larger-vt-font for %p\n", (void *) w));
-    if ((xw = getXtermWidget(w)) != 0) {
+    if ((xw = getXtermWidget(w)) != NULL) {
 	if (xw->misc.shift_fonts) {
 	    TScreen *screen = TScreenOf(xw);
 	    int m;
@@ -5246,7 +5248,7 @@
     XtermWidget xw;
 
     TRACE(("Handle smaller-vt-font for %p\n", (void *) w));
-    if ((xw = getXtermWidget(w)) != 0) {
+    if ((xw = getXtermWidget(w)) != NULL) {
 	if (xw->misc.shift_fonts) {
 	    TScreen *screen = TScreenOf(xw);
 	    int m;
@@ -5322,7 +5324,7 @@
 {
     XtermWidget xw;
 
-    if ((xw = getXtermWidget(w)) != 0) {
+    if ((xw = getXtermWidget(w)) != NULL) {
 	int fontnum;
 	VTFontNames fonts;
 
@@ -5405,7 +5407,7 @@
 	VTFontNames new_fnames;
 
 	memset(&new_fnames, 0, sizeof(new_fnames));
-	if (fonts != 0)
+	if (fonts != NULL)
 	    new_fnames = *fonts;
 
 	if (which == fontMenu_fontsel) {	/* go get the selection */
@@ -5471,7 +5473,7 @@
 trimSizeFromFace(char *face_name, float *face_size)
 {
     char *first = strstr(face_name, ":size=");
-    if (first == 0) {
+    if (first == NULL) {
 	first = face_name;
     } else {
 	first++;
@@ -5482,13 +5484,13 @@
 	float value;
 	char extra;
 	TRACE(("...before trimming, font = \"%s\"\n", face_name));
-	if (last == 0)
+	if (last == NULL)
 	    last = first + strlen(first);
 	mark = *last;
 	*last = '\0';
 	if (sscanf(first, "size=%g%c", &value, &extra) == 1) {
 	    TRACE(("...trimmed size from font: %g\n", value));
-	    if (face_size != 0)
+	    if (face_size != NULL)
 		*face_size = value;
 	}
 	if (mark) {
@@ -5524,7 +5526,7 @@
 
     (void) xw;
 
-    if (source == 0)
+    if (source == NULL)
 	source = "";
     while (isspace(CharOf(*source)))
 	++source;
@@ -5575,7 +5577,7 @@
     if (!marked)
 	plen = 0;
     value = x_strtrim(source + plen);
-    if (value != 0) {
+    if (value != NULL) {
 	Bool success = False;
 #if OPT_RENDERFONT
 	VTFontList *target = (use_ttf
@@ -5584,8 +5586,8 @@
 #else
 	VTFontList *target = &(fontnames->x11);
 #endif
-	char ***list = 0;
-	char **next = 0;
+	char ***list = NULL;
+	char **next = NULL;
 	size_t count = 0;
 
 	(void) use_ttf;
@@ -5619,14 +5621,14 @@
 	    break;
 #endif
 	case fMAX:
-	    list = 0;
+	    list = NULL;
 	    break;
 	}
 
-	if (list != 0) {
+	if (list != NULL) {
 	    success = True;
-	    if (*list != 0) {
-		while ((*list)[count] != 0) {
+	    if (*list != NULL) {
+		while ((*list)[count] != NULL) {
 		    if (IsEmpty((*list)[count])) {
 			TRACE(("... initial %s\n", value));
 			free((*list)[count]);
@@ -5641,7 +5643,7 @@
 	    }
 	    if (success) {
 		next = (char **) realloc(*list, sizeof(char *) * (count + 2));
-		if (next != 0) {
+		if (next != NULL) {
 #if OPT_RENDERFONT
 		    if (use_ttf) {
 			trimSizeFromFace(value,
@@ -5651,7 +5653,7 @@
 		    }
 #endif
 		    next[count++] = value;
-		    next[count] = 0;
+		    next[count] = NULL;
 		    *list = next;
 		    TRACE(("... saved \"%s\" \"%s\" %lu:\"%s\"\n",
 			   whichFontList(xw, target),
@@ -5679,7 +5681,7 @@
 		}
 		if (list && *list) {
 		    free((*list)[limit]);
-		    (*list)[limit] = 0;
+		    (*list)[limit] = NULL;
 		}
 	    }
 	} else {
@@ -5705,10 +5707,10 @@
     char *blob;
 
     blob = x_strdup(source);
-    if (blob != 0) {
+    if (blob != NULL) {
 	int n;
 	int pass;
-	char **list = 0;
+	char **list = NULL;
 
 	TRACE(("allocFontList %s name=\"%s\" source=\"%s\"\n",
 	       whichFontEnum(which), name, blob));
@@ -5730,12 +5732,12 @@
 		if (count == 0 && *blob == '\0')
 		    break;
 		list = TypeCallocN(char *, count + 2);
-		if (list == 0)
+		if (list == NULL)
 		    break;
 	    }
 	}
 	if (list) {
-	    for (n = 0; list[n] != 0; ++n) {
+	    for (n = 0; list[n] != NULL; ++n) {
 		if (*list[n]) {
 		    save2FontList(xw, name, target, which, list[n], True, ttf);
 		}
@@ -5779,12 +5781,12 @@
 {
     freeFontList(targetp);
 
-    if (source != 0) {
+    if (source != NULL) {
 	int pass;
 	size_t count;
 
 	for (pass = 0; pass < 2; ++pass) {
-	    for (count = 0; source[count] != 0; ++count) {
+	    for (count = 0; source[count] != NULL; ++count) {
 		if (pass)
 		    (*targetp)[count] = x_strdup(source[count]);
 	    }
@@ -5804,7 +5806,7 @@
 merge_sublist(char ***targetp, char **source)
 {
     Boolean result = False;
-    if ((*targetp == 0 || IsEmpty(**targetp)) && !IsEmpty(*source)) {
+    if ((*targetp == NULL || IsEmpty(**targetp)) && !IsEmpty(*source)) {
 	copyFontList(targetp, source);
 	result = True;
     }
@@ -5815,15 +5817,15 @@
 void
 freeFontList(char ***targetp)
 {
-    if (targetp != 0) {
+    if (targetp != NULL) {
 	char **target = *targetp;
-	if (target != 0) {
+	if (target != NULL) {
 	    int n;
-	    for (n = 0; target[n] != 0; ++n) {
+	    for (n = 0; target[n] != NULL; ++n) {
 		free(target[n]);
 	    }
 	    free(target);
-	    *targetp = 0;
+	    *targetp = NULL;
 	}
     }
 }
@@ -5835,7 +5837,7 @@
 
     TRACE(("freeFontLists\n"));
     for (which = 0; which < fMAX; ++which) {
-	char ***target = 0;
+	char ***target = NULL;
 	switch (which) {
 	case fNorm:
 	    target = &(lists->list_n);
@@ -5866,7 +5868,7 @@
 	    break;
 #endif
 	default:
-	    target = 0;
+	    target = NULL;
 	    break;
 	}
 	freeFontList(target);
@@ -5880,7 +5882,7 @@
 XTermFonts *
 getNormalFont(TScreen *screen, int which)
 {
-    XTermFonts *result = 0;
+    XTermFonts *result = NULL;
     if (which >= 0 && which < fMAX)
 	result = GetNormalFont(screen, which);
     return result;
@@ -5890,7 +5892,7 @@
 XTermFonts *
 getDoubleFont(TScreen *screen, int which)
 {
-    XTermFonts *result = 0;
+    XTermFonts *result = NULL;
     if ((int) which >= 0 && which < NUM_CHRSET)
 	result = GetDoubleFont(screen, which);
     return result;
@@ -5907,7 +5909,7 @@
     const char *face_name = getFaceName(xw, False);
 
     if (chrset != CSET_SWL
-	&& (top_pattern = XftNameParse(face_name)) != 0) {
+	&& (top_pattern = XftNameParse(face_name)) != NULL) {
 	double face_size = (double) xw->misc.face_size[fontnum];
 	XftPattern *sub_pattern = XftPatternDuplicate(top_pattern);
 	const char *category = "doublesize";
@@ -5948,7 +5950,7 @@
 XTermFonts *
 getItalicFont(TScreen *screen, int which)
 {
-    XTermFonts *result = 0;
+    XTermFonts *result = NULL;
 #if OPT_WIDE_ATTRS
     if (which >= 0 && which < fMAX)
 	result = GetItalicFont(screen, which);
@@ -5969,7 +5971,7 @@
 getMyXftFont(XtermWidget xw, int which, int fontnum)
 {
     TScreen *screen = TScreenOf(xw);
-    XTermXftFonts *result = 0;
+    XTermXftFonts *result = NULL;
     if (fontnum >= 0 && fontnum < NMENUFONTS) {
 	switch ((VTFontEnum) which) {
 	case fNorm:
@@ -6053,8 +6055,8 @@
 getXftFont(XtermWidget xw, VTFontEnum which, int fontnum)
 {
     XTermXftFonts *data = getMyXftFont(xw, (int) which, fontnum);
-    XftFont *result = 0;
-    if (data != 0)
+    XftFont *result = NULL;
+    if (data != NULL)
 	result = XftFp(data);
     return result;
 }
@@ -6104,7 +6106,7 @@
 static const char *
 whichFontList2s(VTFontList * list, char **value)
 {
-    const char *result = 0;
+    const char *result = NULL;
 #define DATA(name) if (value == (list->name)) result = #name
     DATA(list_n);
     DATA(list_b);
@@ -6125,14 +6127,14 @@
 const char *
 whichFontList2(XtermWidget xw, char **value)
 {
-    const char *result = 0;
+    const char *result = NULL;
 #define DATA(name) (result = whichFontList2s(&(xw->name), value))
-    if (DATA(work.fonts.x11) == 0) {
+    if (DATA(work.fonts.x11) == NULL) {
 #if OPT_RENDERFONT
-	if (DATA(work.fonts.xft) == 0)
+	if (DATA(work.fonts.xft) == NULL)
 #endif
 #if OPT_LOAD_VTFONTS || OPT_WIDE_CHARS
-	    if (DATA(screen.cacheVTFonts.fonts.x11) == 0)
+	    if (DATA(screen.cacheVTFonts.fonts.x11) == NULL)
 #endif
 		result = "?";
     }
Index: fontutils.h
--- xterm-395+/fontutils.h	2024-09-01 22:40:13.000000000 +0000
+++ xterm-396/fontutils.h	2024-12-01 19:48:57.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: fontutils.h,v 1.149 2024/09/01 22:40:13 tom Exp $ */
+/* $XTermId: fontutils.h,v 1.150 2024/12/01 19:48:57 tom Exp $ */
 
 /*
  * Copyright 1998-2022,2024 by Thomas E. Dickey
@@ -78,7 +78,7 @@
 #define GetItalicFont(screen, which) 0
 #endif
 
-#define FirstItemOf(vector) ((vector) ? (vector)[0] : 0)
+#define FirstItemOf(vector) ((vector) ? (vector)[0] : NULL)
 #define CurrentXftFont(xw)  ((xw)->work.fonts.xft.list_n[0])
 #define DefaultFontN(xw)    ((xw)->work.fonts.x11.list_n[0])
 #define DefaultFontB(xw)    ((xw)->work.fonts.x11.list_b[0])
@@ -90,12 +90,12 @@
 #endif
 
 #define FontLacksMetrics(font) \
-	((font)->fs != 0 \
-	 && ((font)->fs->per_char == 0))
+	((font)->fs != NULL \
+	 && ((font)->fs->per_char == NULL))
 
 #define FontIsIncomplete(font) \
-	((font)->fs != 0 \
-	 && (font)->fs->per_char != 0 \
+	((font)->fs != NULL \
+	 && (font)->fs->per_char != NULL \
 	 && !(font)->fs->all_chars_exist)
 
 #if OPT_BOX_CHARS
Index: graphics.c
--- xterm-395+/graphics.c	2024-05-11 09:49:08.000000000 +0000
+++ xterm-396/graphics.c	2024-12-01 20:21:19.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: graphics.c,v 1.135 2024/05/11 09:49:08 tom Exp $ */
+/* $XTermId: graphics.c,v 1.137 2024/12/01 20:21:19 tom Exp $ */
 
 /*
  * Copyright 2013-2023,2024 by Thomas E. Dickey
@@ -771,7 +771,7 @@
     TRACE(("get_new_graphic %d,%d type %d\n", charrow, charcol, type));
 
     FOR_EACH_SLOT(ii) {
-	if ((graphic = getInactiveSlot(screen, ii))) {
+	if ((graphic = getInactiveSlot(screen, ii)) != NULL) {
 	    TRACE(("using fresh graphic index %u as id %u\n",
 		   ii, next_graphic_id));
 	    break;
@@ -832,7 +832,7 @@
 	       charrow, charcol,
 	       actual_width, actual_height,
 	       bufferid, type));
-	if ((graphic = getActiveSlot(ii))) {
+	if ((graphic = getActiveSlot(ii)) != NULL) {
 	    if (graphic->type == type &&
 		graphic->bufferid == bufferid &&
 		graphic->charrow == charrow &&
@@ -850,7 +850,7 @@
     }
 
     /* if no match get a new graphic */
-    if ((graphic = get_new_graphic(xw, charrow, charcol, type))) {
+    if ((graphic = get_new_graphic(xw, charrow, charcol, type)) != NULL) {
 	graphic->actual_width = actual_width;
 	graphic->actual_height = actual_height;
 	TRACE(("no match; created graphic at %d,%d %dx%d bufferid=%d type=%u\n",
@@ -1577,7 +1577,7 @@
 	graphics_gc = XCreateGC(display, drawable, GCGraphicsExposures, &xgcv);
 	last_color = null_color;
 	gc_color = null_color;
-	if (graphics_gc == None) {
+	if (graphics_gc == NULL) {
 	    TRACE(("unable to allocate GC for graphics refresh\n"));
 	    valid_graphics = -1;
 	} else {
Index: graphics_regis.c
--- xterm-395+/graphics_regis.c	2024-09-01 22:49:10.000000000 +0000
+++ xterm-396/graphics_regis.c	2024-12-01 20:21:19.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: graphics_regis.c,v 1.150 2024/09/01 22:49:10 tom Exp $ */
+/* $XTermId: graphics_regis.c,v 1.153 2024/12/01 20:21:19 tom Exp $ */
 
 /*
  * Copyright 2014-2023,2024 by Thomas E. Dickey
@@ -1377,6 +1377,9 @@
 #endif
 
     assert(n > 2);		/* need at least 4 points P[0]..P[n] */
+#ifdef __CPPCHECK__
+    memset(m, 0, sizeof(m));	/* work around false-positive */
+#endif
 
 #ifdef DEBUG_SPLINE_POINTS
     {
@@ -1948,7 +1951,7 @@
 	    XftPattern *match;
 	    XftResult status;
 
-	    if ((pat = XftNameParse(fontname))) {
+	    if ((pat = XftNameParse(fontname)) != NULL) {
 #ifdef DEBUG_FONT_SIZE_SEARCH
 		TRACE(("trying targeth=%g\n", targeth / 10.0));
 #endif
@@ -1961,7 +1964,7 @@
 				NULL);
 		if ((match = XftFontMatch(display,
 					  XScreenNumberOfScreen(screen),
-					  pat, &status))) {
+					  pat, &status)) != NULL) {
 		    font = XftFontOpenPattern(display, match);
 		    maybeXftCache(xw, font);
 		}
@@ -3856,7 +3859,7 @@
     char const *ypart;
 
     xpart = extent;
-    if ((ypart = strchr(extent, ','))) {
+    if ((ypart = strchr(extent, ',')) != NULL) {
 	ypart++;
     } else {
 	ypart = "";
Index: graphics_sixel.c
--- xterm-395+/graphics_sixel.c	2024-07-01 21:19:30.000000000 +0000
+++ xterm-396/graphics_sixel.c	2024-12-01 15:41:40.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: graphics_sixel.c,v 1.62 2024/07/01 21:19:30 tom Exp $ */
+/* $XTermId: graphics_sixel.c,v 1.63 2024/12/01 15:41:40 tom Exp $ */
 
 /*
  * Copyright 2014-2023,2024 by Thomas E. Dickey
@@ -539,7 +539,7 @@
 {
     /* s_* variables are static state, defined above */
 
-    if (cp == '\0' || isspace(cp)) {
+    if (cp == '\0' || isspace(CharOf(cp))) {
 	if (s_repeating && cp == '\0') {
 	    TRACE(("DATA_ERROR: sixel data string terminated in the middle of a repeat operator\n"));
 	    s_repeating = False;
@@ -548,7 +548,7 @@
 	return;
     }
 
-    if (isdigit(cp)) {
+    if (isdigit(CharOf(cp))) {
 	if (s_accumulator == -1)
 	    s_accumulator = 0;
 	s_accumulator *= 10;
Index: html.c
--- xterm-395+/html.c	2021-09-19 18:30:48.000000000 +0000
+++ xterm-396/html.c	2024-12-01 20:27:00.000000000 +0000
@@ -1,7 +1,7 @@
-/* $XTermId: html.c,v 1.23 2021/09/19 18:30:48 tom Exp $ */
+/* $XTermId: html.c,v 1.24 2024/12/01 20:27:00 tom Exp $ */
 
 /*
- * Copyright 2018-2020,2021	Thomas E. Dickey
+ * Copyright 2018-2021,2024	Thomas E. Dickey
  * Copyright 2015,2018		Jens Schweikhardt
  *
  * All Rights Reserved
@@ -56,7 +56,7 @@
     TRACE(("xtermDumpHtml...\n"));
     saveLocale = xtermSetLocale(LC_NUMERIC, "C");
     fp = create_printfile(xw, ".xhtml");
-    if (fp != 0) {
+    if (fp != NULL) {
 	dumpHtmlHeader(xw, fp);
 	dumpHtmlScreen(xw, fp);
 	dumpHtmlFooter(xw, fp);
@@ -144,7 +144,7 @@
     LineData *ld = getLineData(s, inx);
     int col;
 
-    if (ld == 0)
+    if (ld == NULL)
 	return;
 
     for (col = 0; col < MaxCols(s); col++) {
Index: input.c
--- xterm-395+/input.c	2024-09-30 07:48:35.000000000 +0000
+++ xterm-396/input.c	2024-12-01 20:30:19.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: input.c,v 1.373 2024/09/30 07:48:35 tom Exp $ */
+/* $XTermId: input.c,v 1.375 2024/12/01 20:30:19 tom Exp $ */
 
 /*
  * Copyright 1999-2023,2024 by Thomas E. Dickey
@@ -119,7 +119,7 @@
 
 #define KEYSYM_FMT "0x%04lX"	/* simplify matching <X11/keysymdef.h> */
 
-#define TEK4014_GIN(tw) (tw != 0 && TekScreenOf(tw)->TekGIN)
+#define TEK4014_GIN(tw) (tw != NULL && TekScreenOf(tw)->TekGIN)
 
 typedef struct {
     KeySym keysym;
@@ -1154,7 +1154,7 @@
 #if OPT_SUNPC_KBD
 	    && keyboard->type == keyboardIsVT220
 #endif
-	    && ((string = (Char *) udk_lookup(xw, dec_code, &kd.nbytes)) != 0)) {
+	    && ((string = (Char *) udk_lookup(xw, dec_code, &kd.nbytes)) != NULL)) {
 	    /* UIntClr(evt_state, ShiftMask); */
 	    while (kd.nbytes-- > 0)
 		unparseputc(xw, CharOf(*string++));
@@ -1773,7 +1773,7 @@
  * Strip the entire action, to avoid matching it.
  */
 static char *
-stripAction(char *base, char *last)
+stripAction(const char *base, char *last)
 {
     while (last != base) {
 	if (*--last == '\n') {
@@ -1784,7 +1784,7 @@
 }
 
 static char *
-stripBlanks(char *base, char *last)
+stripBlanks(const char *base, char *last)
 {
     while (last != base) {
 	int ch = CharOf(last[-1]);
@@ -1802,12 +1802,12 @@
 static char *
 stripTranslations(const char *s, Bool onlyInsert)
 {
-    char *dst = 0;
+    char *dst = NULL;
 
-    if (s != 0) {
+    if (s != NULL) {
 	dst = TypeMallocN(char, strlen(s) + 1);
 
-	if (dst != 0) {
+	if (dst != NULL) {
 	    int state = 0;
 	    int prv = 0;
 	    char *d = dst;
@@ -1819,7 +1819,7 @@
 		    if (d != dst)
 			*d++ = (char) ch;
 		    state = 0;
-		} else if (strchr(":!#", ch) != 0) {
+		} else if (strchr(":!#", ch) != NULL) {
 		    d = stripBlanks(dst, d);
 		    if (onlyInsert && (ch == ':') && !keyCanInsert(s)) {
 			d = stripAction(dst, d);
@@ -1865,16 +1865,17 @@
     char *copy;
     char *test;
 
-    if ((test = stripTranslations(keyword, onlyInsert)) != 0) {
-	if (*cache == 0) {
-	    String data = 0;
+    if ((test = stripTranslations(keyword, onlyInsert)) != NULL) {
+	if (*cache == NULL) {
+	    String data = NULL;
 	    getKeymapResources(w, "vt100", "VT100", XtRString, &data, sizeof(data));
-	    if (data != 0 && (copy = stripTranslations(data, onlyInsert)) != 0) {
+	    if (data != NULL
+		&& (copy = stripTranslations(data, onlyInsert)) != NULL) {
 		*cache = copy;
 	    }
 	}
 
-	if (*cache != 0) {
+	if (*cache != NULL) {
 	    char *p = *cache;
 	    int state = 0;
 	    int now = ' ';
@@ -1937,7 +1938,7 @@
     if (!xtermHasTranslation(xw, fromString, False)) {
 	xw->keyboard.extra_translations
 	    = TypeRealloc(char, need, xw->keyboard.extra_translations);
-	if ((xw->keyboard.extra_translations) != 0) {
+	if ((xw->keyboard.extra_translations) != NULL) {
 	    TRACE(("adding %s: %s\n", fromString, toString));
 	    if (have)
 		strcat(xw->keyboard.extra_translations, " \\n\\");
@@ -1970,7 +1971,7 @@
     KeySym keysym;
     int min_keycode, max_keycode, keysyms_per_keycode = 0;
 
-    if (keymap != 0) {
+    if (keymap != NULL) {
 	KeySym *theMap;
 	int keycode_count;
 
@@ -1983,7 +1984,7 @@
 				     keycode_count,
 				     &keysyms_per_keycode);
 
-	if (theMap != 0) {
+	if (theMap != NULL) {
 	    int i, j, k, l;
 	    unsigned long mask;
 
Index: linedata.c
--- xterm-395+/linedata.c	2023-12-31 20:12:06.000000000 +0000
+++ xterm-396/linedata.c	2024-12-01 20:27:00.000000000 +0000
@@ -1,7 +1,7 @@
-/* $XTermId: linedata.c,v 1.106 2023/12/31 20:12:06 tom Exp $ */
+/* $XTermId: linedata.c,v 1.107 2024/12/01 20:27:00 tom Exp $ */
 
 /*
- * Copyright 2009-2022,2023 by Thomas E. Dickey
+ * Copyright 2009-2023,2024 by Thomas E. Dickey
  *
  *                         All Rights Reserved
  *
@@ -44,14 +44,14 @@
 LineData *
 getLineData(TScreen *screen, int row)
 {
-    LineData *result = 0;
+    LineData *result = NULL;
     ScrnBuf buffer;
     int max_row = LastRowNumber(screen);
 
     if (row >= 0) {
 	buffer = screen->visbuf;
     } else {
-	buffer = 0;
+	buffer = NULL;
 	result = getScrollback(screen, row);
     }
     if (row >= 0 && row <= max_row) {
Index: main.c
--- xterm-395+/main.c	2024-09-30 08:03:20.000000000 +0000
+++ xterm-396/main.c	2024-12-01 19:57:13.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: main.c,v 1.927 2024/09/30 08:03:20 tom Exp $ */
+/* $XTermId: main.c,v 1.930 2024/12/01 19:57:13 tom Exp $ */
 
 /*
  * Copyright 2002-2023,2024 by Thomas E. Dickey
@@ -1694,32 +1694,32 @@
     };
 #undef DATA
     /* *INDENT-ON* */
-    XrmOptionDescRec *result = 0;
+    XrmOptionDescRec *result = NULL;
     Cardinal inlist;
     Cardinal limit = XtNumber(optionDescList) + XtNumber(opTable);
     int atbest = -1;
-    int best = -1;
-    int test;
     Boolean exact = False;
     int ambiguous1 = -1;
     int ambiguous2 = -1;
     char *option;
-    char *value;
 
 #define ITEM(n) ((Cardinal)(n) < XtNumber(optionDescList) \
 		 ? &optionDescList[n] \
 		 : &opTable[(Cardinal)(n) - XtNumber(optionDescList)])
 
-    if ((option = argv[*num]) != 0) {
+    if ((option = argv[*num]) != NULL) {
 	Boolean need_value;
 	Boolean have_value = False;
+	int best = -1;
+	char *value;
 
 	TRACE(("parseArg %s\n", option));
-	if ((value = argv[(*num) + 1]) != 0) {
+	if ((value = argv[(*num) + 1]) != NULL) {
 	    have_value = (Boolean) !isOption(value);
 	}
 	for (inlist = 0; inlist < limit; ++inlist) {
 	    XrmOptionDescRec *check = ITEM(inlist);
+	    int test;
 
 	    test = matchArg(check, option);
 	    if (test < 0)
@@ -1742,7 +1742,7 @@
 
 	    need_value = (Boolean) (test > 0 && countArg(check) > 0);
 
-	    if (need_value && value != 0) {
+	    if (need_value && value != NULL) {
 		;
 	    } else if (need_value ^ have_value) {
 		TRACE(("...skipping, need %d vs have %d\n", need_value, have_value));
@@ -1774,7 +1774,7 @@
 	}
     }
 
-    *valuep = 0;
+    *valuep = NULL;
     if (atbest >= 0) {
 	result = ITEM(atbest);
 	if (!exact) {
@@ -1783,10 +1783,10 @@
 			     ITEM(ambiguous1)->option,
 			     ITEM(ambiguous2)->option);
 	    } else if (strlen(option) > strlen(result->option)) {
-		result = 0;
+		result = NULL;
 	    }
 	}
-	if (result != 0) {
+	if (result != NULL) {
 	    TRACE(("...result %s\n", result->option));
 	    /* expand abbreviations */
 	    if (result->argKind != XrmoptionStickyArg) {
@@ -1976,7 +1976,7 @@
 	if (PTYCHARLEN < len)
 	    leaf = leaf + (len - PTYCHARLEN);
     }
-    TRACE(("my_pty_id  (%s) -> '%s'\n", device, leaf));
+    TRACE(("my_pty_id  (%s) -> '%s'\n", NonNull(device), NonNull(leaf)));
     return leaf;
 }
 
@@ -2185,7 +2185,7 @@
     Boolean result = False;
     if (x_countargv(args) == 1) {
 	char *check = xtermFindShell(args[0], False);
-	if (check == 0) {
+	if (check == NULL) {
 	    result = True;
 	} else {
 	    free(check);
@@ -2291,12 +2291,14 @@
     };
 #undef DATA
     unsigned result = 0;
-    long check;
-    char *next;
+
     if (x_toupper(*value) == 'B')
 	value++;
+
     if (isdigit(CharOf(*value))) {
-	check = strtol(value, &next, 10);
+	char *next;
+	long check = strtol(value, &next, 10);
+
 	if (FullS2L(value, next) && (check > 0)) {
 	    Cardinal n;
 	    for (n = 0; n < XtNumber(speeds); ++n) {
@@ -2338,21 +2340,16 @@
 int
 get_tty_lnext(int fd, int default_lnext, const char *tag)
 {
-    int result = default_lnext;
-    int rc;
-
 #ifdef TERMIO_STRUCT
     TERMIO_STRUCT my_tio;
-    rc = ttyGetAttr(fd, &my_tio);
-    if (rc == 0)
-	result = my_tio.c_cc[VLNEXT];
+    int rc = ttyGetAttr(fd, &my_tio);
+    int result = (rc == 0) ? my_tio.c_cc[VLNEXT] : default_lnext;
 #elif defined(HAS_LTCHARS)
     struct ltchars my_ltc;
-    rc = ioctl(fd, TIOCGLTC, (char *) &my_ltc);
-    if (rc == 0)
-	result = my_ltc.t_lnextc;
+    int rc = ioctl(fd, TIOCGLTC, (char *) &my_ltc);
+    int result = (rc == 0) ? my_ltc.t_lnextc : default_lnext;
 #else
-    result = XTERM_LNEXT;
+    int result = XTERM_LNEXT;
 #endif /* TERMIO_STRUCT */
     TRACE(("%s lnext:%d (from %s)\n", (rc == 0) ? "OK" : "FAIL", result, tag));
     (void) tag;
@@ -2436,23 +2433,24 @@
     TRACE_ARGV("Before XtOpenApplication", argv);
     restart_params = 0;
     if (argc > 1) {
-	XrmOptionDescRec *option_ptr;
-	char *option_value;
 	int n;
 	Bool quit = False;
 
 	for (n = 1; n < argc; n++) {
-	    if ((option_ptr = parseArg(&n, argv, &option_value)) == 0) {
-		if (argv[n] == 0) {
+	    XrmOptionDescRec *option_ptr;
+	    char *option_value;
+
+	    if ((option_ptr = parseArg(&n, argv, &option_value)) == NULL) {
+		if (argv[n] == NULL) {
 		    break;
 		} else if (isOption(argv[n])) {
 		    Syntax(argv[n]);
-		} else if (explicit_shname != 0) {
+		} else if (explicit_shname != NULL) {
 		    xtermWarning("Explicit shell already was %s\n", explicit_shname);
 		    Syntax(argv[n]);
 		}
 		explicit_shname = xtermFindShell(argv[n], True);
-		if (explicit_shname == 0)
+		if (explicit_shname == NULL)
 		    exit(0);
 		TRACE(("...explicit shell %s\n", explicit_shname));
 		restart_params = (argc - n);
@@ -2477,7 +2475,7 @@
 	    } else if (!strcmp(option_ptr->option, "-class")) {
 		NeedParam(option_ptr, option_value);
 		free(my_class);
-		if ((my_class = x_strdup(option_value)) == 0) {
+		if ((my_class = x_strdup(option_value)) == NULL) {
 		    Help();
 		    quit = True;
 		}
@@ -2907,18 +2905,24 @@
 	    char *encoding_opt[4];
 	    encoding_opt[0] = x_strdup("-encoding");
 	    encoding_opt[1] = term->misc.locale_str;
-	    encoding_opt[2] = 0;
+	    encoding_opt[2] = NULL;
 	    x_appendargv(command_to_exec_with_luit, encoding_opt);
 	}
 	command_length_with_luit = x_countargv(command_to_exec_with_luit);
 	if (count_exec) {
-	    static char *fixup_shell[] =
-	    {(char *) "sh", (char *) "-c", 0};
 	    char *delimiter[2];
 	    delimiter[0] = x_strdup("--");
-	    delimiter[1] = 0;
+	    delimiter[1] = NULL;
 	    x_appendargv(command_to_exec_with_luit, delimiter);
 	    if (complex_command(command_to_exec)) {
+		static char shell_name[] = "sh";
+		static char c_option[] = "-c";
+		static char *fixup_shell[] =
+		{
+		    shell_name,
+		    c_option,
+		    NULL
+		};
 		x_appendargv(command_to_exec_with_luit, fixup_shell);
 	    }
 	    x_appendargv(command_to_exec_with_luit, command_to_exec);
@@ -3194,10 +3198,10 @@
 #endif
 
     TRACE(("get_pty(ttydev=%s, ptydev=%s) %s fd=%d\n",
-	   ttydev != 0 ? ttydev : "?",
-	   ptydev != 0 ? ptydev : "?",
+	   ttydev != NULL ? ttydev : "?",
+	   ptydev != NULL ? ptydev : "?",
 	   result ? "FAIL" : "OK",
-	   pty != 0 ? *pty : -1));
+	   pty != NULL ? *pty : -1));
     return result;
 }
 
@@ -3207,7 +3211,7 @@
 #ifdef USE_TTY_GROUP
     struct group *ttygrp;
 
-    if ((ttygrp = getgrnam(TTY_GROUP_NAME)) != 0) {
+    if ((ttygrp = getgrnam(TTY_GROUP_NAME)) != NULL) {
 	gid = (unsigned) ttygrp->gr_gid;
 	mode &= 0660U;
     }
@@ -3342,7 +3346,7 @@
     "tek4013",			/* 4012 with APL character set support */
     "tek4010",			/* small screen, upper-case only */
     "dumb",
-    0
+    NULL
 };
 #endif
 
@@ -3364,7 +3368,7 @@
     "vt100",
     "ansi",
     "dumb",
-    0
+    NULL
 };
 
 /* ARGSUSED */
@@ -3613,7 +3617,7 @@
 #if defined(__digital__) && defined(__unix__) && (defined(OSMAJORVERSION) && OSMAJORVERSION < 5)
 	working.ut_type = 0;
 #endif
-	if ((result = call_getutid(&working)) == 0)
+	if ((result = call_getutid(&working)) == NULL)
 	    break;
 	copy_filled(limited.ut_line, result->ut_line, sizeof(result->ut_line));
 	if (!memcmp(limited.ut_line, tofind->ut_line, sizeof(limited.ut_line)))
@@ -3672,14 +3676,15 @@
     int result = -1;
     int count = -1;
     const char *s, *t;
-    size_t have;
     size_t want = strlen(needle);
 
     TRACE(("findValidShell:\n%s\n", NonNull(haystack)));
 
-    for (s = haystack; (s != 0) && (*s != '\0'); s = t) {
+    for (s = haystack; (s != NULL) && (*s != '\0'); s = t) {
+	size_t have;
+
 	++count;
-	if ((t = strchr(s, '\n')) == 0) {
+	if ((t = strchr(s, '\n')) == NULL) {
 	    t = s + strlen(s);
 	}
 	have = (size_t) (t - s);
@@ -3687,12 +3692,12 @@
 	if ((have >= want) && (*s != '#')) {
 	    char *p = (char *) malloc(have + 1);
 
-	    if (p != 0) {
+	    if (p != NULL) {
 		char *q;
 
 		memcpy(p, s, have);
 		p[have] = '\0';
-		if ((q = x_strtrim(p)) != 0) {
+		if ((q = x_strtrim(p)) != NULL) {
 		    TRACE(("...test %s\n", q));
 		    if (!strcmp(q, needle)) {
 			result = count;
@@ -3734,7 +3739,7 @@
 	int count = -1;
 
 	TRACE(("validShell:getusershell\n"));
-	while ((q = getusershell()) != 0) {
+	while ((q = getusershell()) != NULL) {
 	    ++count;
 	    TRACE(("...test \"%s\"\n", q));
 	    if (!strcmp(q, pathname)) {
@@ -3909,7 +3914,6 @@
 spawnXTerm(XtermWidget xw, unsigned line_speed)
 {
     TScreen *screen = TScreenOf(xw);
-    Cardinal nn;
 #if OPT_PTY_HANDSHAKE
     Bool got_handshake_size = False;
     handshake_t handshake;
@@ -3925,6 +3929,7 @@
     char *newtc;
 
 #ifdef TERMIO_STRUCT
+    Cardinal nn;
     TERMIO_STRUCT tio;
 #ifdef TIOCLSET
     unsigned lmode;
@@ -3945,7 +3950,7 @@
 #endif /* sony */
 #endif /* TERMIO_STRUCT */
 
-    char *shell_path = 0;
+    char *shell_path = NULL;
     char *shname, *shname_minus;
     int i;
 #if USE_NO_DEV_TTY
@@ -4024,7 +4029,7 @@
 	    ttyfd = -1;
 	    errno = ENXIO;
 	}
-	shell_path = 0;
+	shell_path = NULL;
 	memset(&pw, 0, sizeof(pw));
 #if OPT_PTY_HANDSHAKE
 	got_handshake_size = False;
@@ -4227,7 +4232,7 @@
     } else if (ok_termcap) {
 	char *s = get_tcap_erase(xw);
 	TRACE(("...extracting initial_erase value from termcap\n"));
-	if (s != 0) {
+	if (s != NULL) {
 	    char *save = s;
 	    initial_erase = decode_keyvalue(&s, True);
 	    setInitialErase = True;
@@ -4502,7 +4507,7 @@
 		/* use the same tty name that everyone else will use
 		 * (from ttyname)
 		 */
-		if ((ptr = ttyname(ttyfd)) != 0) {
+		if ((ptr = ttyname(ttyfd)) != NULL) {
 		    free(ttydev);
 		    ttydev = x_strdup(ptr);
 		}
@@ -4537,7 +4542,7 @@
 		tio.c_iflag |= ICRNL;
 #if OPT_WIDE_CHARS && defined(IUTF8)
 #if OPT_LUIT_PROG
-		if (command_to_exec_with_luit == 0)
+		if (command_to_exec_with_luit == NULL)
 #endif
 		    if (screen->utf8_mode)
 			tio.c_iflag |= IUTF8;
@@ -4886,11 +4891,11 @@
 	    /* position to entry in utmp file */
 	    /* Test return value: beware of entries left behind: PSz 9 Mar 00 */
 	    utret = find_utmp(&utmp);
-	    if (utret == 0) {
+	    if (utret == NULL) {
 		(void) call_setutent();
 		init_utmp(USER_PROCESS, &utmp);
 		utret = find_utmp(&utmp);
-		if (utret == 0) {
+		if (utret == NULL) {
 		    (void) call_setutent();
 		}
 	    }
@@ -5238,7 +5243,7 @@
 	     */
 	    if (validProgram(explicit_shname)) {
 		shell_path = explicit_shname;
-	    } else if (shell_path == 0) {
+	    } else if (shell_path == NULL) {
 		/* this could happen if the explicit shname lost a race */
 		shell_path = resetShell(shell_path);
 	    }
@@ -5269,7 +5274,7 @@
 		free(myShell);
 		TRACE_ARGV("spawning command", command_to_exec);
 		execvp(*command_to_exec, command_to_exec);
-		if (command_to_exec[1] == 0)
+		if (command_to_exec[1] == NULL)
 		    execlp(shell_path, shname, "-c", command_to_exec[0],
 			   (void *) 0);
 		xtermPerror("Can't execvp %s", *command_to_exec);
@@ -5279,7 +5284,7 @@
 	    signal(SIGHUP, SIG_DFL);
 #endif
 
-	    if ((shname_minus = (char *) malloc(strlen(shname) + 2)) != 0) {
+	    if ((shname_minus = (char *) malloc(strlen(shname) + 2)) != NULL) {
 		(void) strcpy(shname_minus, "-");
 		(void) strcat(shname_minus, shname);
 	    } else {
@@ -5517,7 +5522,7 @@
 	/*
 	 * We could use getutline() if we didn't support old systems.
 	 */
-	while ((utptr = find_utmp(&utmp)) != 0) {
+	while ((utptr = find_utmp(&utmp)) != NULL) {
 	    if (utptr->ut_pid == screen->pid) {
 		utptr->ut_type = DEAD_PROCESS;
 #if defined(HAVE_UTMP_UT_XTIME)
@@ -5637,7 +5642,7 @@
 	    XtDestroyWidget(toplevel);
 	    TRACE(("destroyed top-level widget\n"));
 	}
-	sortedOpts(0, 0, 0);
+	sortedOpts(NULL, NULL, 0);
 	noleaks_charproc();
 	noleaks_ptydata();
 #if OPT_GRAPHICS
@@ -5702,13 +5707,13 @@
 			     ? MaxRows(screen)
 			     : MaxCols(screen)));
 	temp += strlen(temp);
-	if ((ptr1 = strchr(ptr1, ':')) != 0 && (ptr1 < ptr2)) {
+	if ((ptr1 = strchr(ptr1, ':')) != NULL && (ptr1 < ptr2)) {
 	    strncpy(temp, ptr1, i = (size_t) (ptr2 - ptr1));
 	    temp += i;
 	    sprintf(temp, "%d", (li_first
 				 ? MaxCols(screen)
 				 : MaxRows(screen)));
-	    if ((ptr2 = strchr(ptr2, ':')) != 0) {
+	    if ((ptr2 = strchr(ptr2, ':')) != NULL) {
 		strcat(temp, ptr2);
 	    }
 	}
Index: menu.c
--- xterm-395+/menu.c	2024-09-30 07:53:29.000000000 +0000
+++ xterm-396/menu.c	2024-12-01 19:58:52.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: menu.c,v 1.377 2024/09/30 07:53:29 tom Exp $ */
+/* $XTermId: menu.c,v 1.378 2024/12/01 19:58:52 tom Exp $ */
 
 /*
  * Copyright 1999-2023,2024 by Thomas E. Dickey
@@ -488,7 +488,7 @@
 #if OPT_TEK4014
     DATA( tekMenu),
 #endif
-    { NULL, 0, 0 },
+    { NULL, NULL, 0 },
 };
 #undef DATA
 /* *INDENT-ON* */
@@ -516,7 +516,7 @@
 select_menu(Widget w, MenuIndex num)
 {
 #if OPT_TEK4014 && OPT_TOOLBAR
-    while (w != 0) {
+    while (w != NULL) {
 	if (w == tekshellwidget) {
 	    return &tek_shell[num];
 	}
@@ -699,12 +699,12 @@
     TRACE(("created popupShell(%s) widget %p, window %#lx\n",
 	   data->internal_name, (void *) list->w, XtWindow(list->w)));
 #endif
-    if (list->w != 0) {
+    if (list->w != NULL) {
 	Boolean *unused = unusedEntries(xw, num);
 	Cardinal n;
 #if OPT_TOOLBAR
 	Boolean useLocale = !strcmp(resource.menuLocale, "");
-	XtErrorMsgHandler warningHandler = 0;
+	XtErrorMsgHandler warningHandler = NULL;
 	if (!useLocale)
 	    warningHandler = XtAppSetWarningMsgHandler(app_con, ignoreWarning);
 #endif
@@ -787,12 +787,12 @@
 	return False;
     }
 
-    if ((mw = obtain_menu(w, me)) == 0
+    if ((mw = obtain_menu(w, me)) == NULL
 	|| sizeof_menu(w, me) == 0) {
 	mw = create_menu(w, xw, me);
-	created = (mw != 0);
+	created = (mw != NULL);
     }
-    if (mw == 0)
+    if (mw == NULL)
 	return False;
 
     TRACE(("domenu(%s) %s\n", params[0], created ? "create" : "update"));
@@ -1197,7 +1197,7 @@
 	 XtPointer closure GCC_UNUSED,
 	 XtPointer data GCC_UNUSED)
 {
-    xtermPrintScreen(term, True, getPrinterFlags(term, NULL, 0));
+    xtermPrintScreen(term, True, getPrinterFlags(term, NULL, NULL));
 }
 
 static void
@@ -2149,7 +2149,7 @@
 	       String *params GCC_UNUSED,
 	       Cardinal *param_count GCC_UNUSED)
 {
-    do_write_now(w, 0, 0);
+    do_write_now(w, NULL, NULL);
 }
 
 void
@@ -2936,7 +2936,7 @@
 		 Cardinal *param_count)
 {
     XtermWidget xw = term;
-    void (*proc) PROTO_XT_CALLBACK_ARGS = 0;
+    void (*proc) PROTO_XT_CALLBACK_ARGS = NULL;
 
     switch (*param_count) {
     case 0:
@@ -3012,7 +3012,7 @@
     Cardinal count = 1;
 
     params[0] = (char *) closure;
-    params[1] = 0;
+    params[1] = NULL;
     TRACE(("InitPopup(%s)\n", params[0]));
 
     domenu(gw, (XEvent *) 0, params, &count);
@@ -3024,7 +3024,7 @@
 SetupShell(Widget *menus, MenuList * shell, int n, int m)
 {
     char temp[80];
-    char *external_name = 0;
+    char *external_name = NULL;
     Dimension button_height;
     Dimension button_border;
     char *saveLocale = xtermSetLocale(LC_CTYPE, resource.menuLocale);
@@ -3053,7 +3053,7 @@
 					 *menus,
 					 XtNfromHoriz, ((m >= 0)
 							? shell[m].b
-							: 0),
+							: NULL),
 					 XtNmenuName, menu_names[n].internal_name,
 					 XtNlabel, external_name,
 					 (XtPointer) 0);
@@ -3172,7 +3172,7 @@
 }
 
 #if OPT_TOOLBAR
-#define INIT_POPUP(s, n) InitPopup(s[n].w, menu_names[n].internal_name, 0)
+#define INIT_POPUP(s, n) InitPopup(s[n].w, menu_names[n].internal_name, NULL)
 
 static Bool
 InitWidgetMenu(Widget shell)
@@ -3180,7 +3180,7 @@
     Bool result = False;
 
     TRACE(("InitWidgetMenu(%p)\n", (void *) shell));
-    if (term != 0) {
+    if (term != NULL) {
 	if (shell == toplevel) {	/* vt100 */
 	    if (!term->init_menu) {
 		INIT_POPUP(vt_shell, mainMenu);
@@ -3223,7 +3223,7 @@
 static void
 hide_toolbar(Widget w)
 {
-    if (w != 0) {
+    if (w != NULL) {
 	TbInfo *info = toolbar_info(w);
 
 	TRACE(("hiding toolbar\n"));
@@ -3231,7 +3231,7 @@
 		      XtNfromVert, (Widget) 0,
 		      (XtPointer) 0);
 
-	if (info->menu_bar != 0) {
+	if (info->menu_bar != NULL) {
 	    repairSizeHints();
 	    XtUnmanageChild(info->menu_bar);
 	    if (XtIsRealized(info->menu_bar)) {
@@ -3245,11 +3245,11 @@
 static void
 show_toolbar(Widget w)
 {
-    if (w != 0) {
+    if (w != NULL) {
 	TbInfo *info = toolbar_info(w);
 
 	TRACE(("showing toolbar\n"));
-	if (info->menu_bar != 0) {
+	if (info->menu_bar != NULL) {
 	    XtVaSetValues(w,
 			  XtNfromVert, info->menu_bar,
 			  (XtPointer) 0);
@@ -3765,7 +3765,7 @@
 		  XtPointer data GCC_UNUSED)
 {
     XtermWidget xw = getXtermWidget(w);
-    if (xw != 0) {
+    if (xw != NULL) {
 	ToggleFlag(TScreenOf(xw)->allowBoldFonts);
 	update_menu_allowBoldFonts();
 	Redraw();
@@ -3913,7 +3913,7 @@
 		 XtPointer data GCC_UNUSED)
 {
     XtermWidget xw = getXtermWidget(w);
-    if (xw != 0) {
+    if (xw != NULL) {
 	ToggleFlag(TScreenOf(xw)->allowColorOps);
 	update_menu_allowColorOps();
     }
@@ -3925,7 +3925,7 @@
 		XtPointer data GCC_UNUSED)
 {
     XtermWidget xw = getXtermWidget(w);
-    if (xw != 0) {
+    if (xw != NULL) {
 	ToggleFlag(TScreenOf(xw)->allowFontOps);
 	update_menu_allowFontOps();
     }
@@ -3937,7 +3937,7 @@
 		 XtPointer data GCC_UNUSED)
 {
     XtermWidget xw = getXtermWidget(w);
-    if (xw != 0) {
+    if (xw != NULL) {
 	ToggleFlag(TScreenOf(xw)->allowMouseOps);
 	update_menu_allowMouseOps();
     }
@@ -3949,7 +3949,7 @@
 		XtPointer data GCC_UNUSED)
 {
     XtermWidget xw = getXtermWidget(w);
-    if (xw != 0) {
+    if (xw != NULL) {
 	ToggleFlag(TScreenOf(xw)->allowTcapOps);
 	update_menu_allowTcapOps();
     }
@@ -3961,7 +3961,7 @@
 		 XtPointer data GCC_UNUSED)
 {
     XtermWidget xw = getXtermWidget(w);
-    if (xw != 0) {
+    if (xw != NULL) {
 	ToggleFlag(TScreenOf(xw)->allowTitleOps);
 	update_menu_allowTitleOps();
     }
@@ -3973,7 +3973,7 @@
 		  XtPointer data GCC_UNUSED)
 {
     XtermWidget xw = getXtermWidget(w);
-    if (xw != 0) {
+    if (xw != NULL) {
 	ToggleFlag(TScreenOf(xw)->allowWindowOps);
 	update_menu_allowWindowOps();
     }
Index: menu.h
--- xterm-395+/menu.h	2021-03-21 20:03:03.000000000 +0000
+++ xterm-396/menu.h	2024-12-01 23:38:29.000000000 +0000
@@ -1,7 +1,7 @@
-/* $XTermId: menu.h,v 1.146 2021/03/21 20:03:03 tom Exp $ */
+/* $XTermId: menu.h,v 1.147 2024/12/01 23:38:29 tom Exp $ */
 
 /*
- * Copyright 1999-2020,2021 by Thomas E. Dickey
+ * Copyright 1999-2021,2024 by Thomas E. Dickey
  *
  *                         All Rights Reserved
  *
@@ -61,7 +61,7 @@
 
 #include <xterm.h>
 
-#ifndef OPT_MENU_KEEPCLIPBOARD 
+#ifndef OPT_MENU_KEEPCLIPBOARD
 #define OPT_MENU_KEEPCLIPBOARD 0	/* useful for debugging */
 #endif
 
Index: misc.c
--- xterm-395+/misc.c	2024-10-14 16:00:49.000000000 +0000
+++ xterm-396/misc.c	2024-12-01 20:06:49.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: misc.c,v 1.1099 2024/10/14 16:00:49 tom Exp $ */
+/* $XTermId: misc.c,v 1.1107 2024/12/01 20:06:49 tom Exp $ */
 
 /*
  * Copyright 1999-2023,2024 by Thomas E. Dickey
@@ -172,7 +172,7 @@
 
     select_timeout.tv_sec = 0;
     select_timeout.tv_usec = msec * 1000;
-    select(0, 0, 0, 0, &select_timeout);
+    select(0, NULL, NULL, NULL, &select_timeout);
 }
 
 static void
@@ -282,7 +282,7 @@
 
     if (screen->bellIsUrgent) {
 	XWMHints *h = XGetWMHints(screen->display, VShellWindow(xw));
-	if (h != 0) {
+	if (h != NULL) {
 	    if (enable && !(screen->select & FOCUS)) {
 		h->flags |= XUrgencyHint;
 	    } else {
@@ -404,7 +404,7 @@
 	XExposeEvent *q = (XExposeEvent *) (&next_event);
 
 	XtAppNextEvent(app_con, &next_event);
-	TRACE_EVENT("pending", &next_event, (String *) 0, 0);
+	TRACE_EVENT("pending", &next_event, (String *) 0, NULL);
 
 	/*
 	 * If either window is contained within the other, merge the events.
@@ -459,7 +459,7 @@
 	XConfigureEvent *q = (XConfigureEvent *) (&next_event);
 
 	XtAppNextEvent(app_con, &next_event);
-	TRACE_EVENT("pending", &next_event, (String *) 0, 0);
+	TRACE_EVENT("pending", &next_event, (String *) 0, NULL);
 
 	if (p->window == q->window) {
 	    TRACE(("pending Configure...merged\n"));
@@ -512,7 +512,7 @@
 	XButtonEvent *q = (XButtonEvent *) (&next_event);
 
 	XtAppNextEvent(app_con, &next_event);
-	TRACE_EVENT("pending", &next_event, (String *) 0, 0);
+	TRACE_EVENT("pending", &next_event, (String *) 0, NULL);
 
 	if (p->window == q->window) {
 	    TRACE(("pending ButtonEvent...merged\n"));
@@ -546,7 +546,7 @@
 
     while (result && XtAppPeekEvent(app_con, &this_event)) {
 	found = True;
-	TRACE_EVENT("pending", &this_event, (String *) 0, 0);
+	TRACE_EVENT("pending", &this_event, (String *) 0, NULL);
 	if (this_event.type == Expose) {
 	    result = mergeExposeEvents(&this_event);
 	} else if (this_event.type == ConfigureNotify) {
@@ -708,12 +708,12 @@
      * server insists on drawing _something_.
      */
     TRACE(("Ask for nil2 font\n"));
-    if ((fn = xtermLoadQueryFont(xw, "nil2")) == 0) {
+    if ((fn = xtermLoadQueryFont(xw, "nil2")) == NULL) {
 	TRACE(("...Ask for fixed font\n"));
 	fn = xtermLoadQueryFont(xw, DEFFONT);
     }
 
-    if (fn != None) {
+    if (fn != NULL) {
 	/* a space character seems to work as a cursor (dots are not needed) */
 	c = XCreateGlyphCursor(dpy, fn->fid, fn->fid, 'X', ' ', &dummy, &dummy);
 	XFreeFont(dpy, fn);
@@ -738,7 +738,7 @@
     static const char pattern[] = "xtermXXXXXXXX";
     char *env = getenv("XCURSOR_THEME");
 
-    xterm_cursor_theme = 0;
+    xterm_cursor_theme = NULL;
     /*
      * The environment variable overrides a (possible) resource Xcursor.theme
      */
@@ -759,11 +759,11 @@
 
 	TRACE(("init_colored_cursor will make an empty Xcursor theme\n"));
 
-	if ((tmp_dir = getenv("TMPDIR")) == 0) {
+	if ((tmp_dir = getenv("TMPDIR")) == NULL) {
 	    tmp_dir = P_tmpdir;
 	}
 	needed = strlen(tmp_dir) + 4 + strlen(theme) + strlen(pattern);
-	if ((filename = malloc(needed)) != 0) {
+	if ((filename = malloc(needed)) != NULL) {
 	    sprintf(filename, "%s/%s", tmp_dir, pattern);
 
 #ifdef HAVE_MKDTEMP
@@ -781,14 +781,14 @@
 	     * search path away from home.  We are setting up the complete
 	     * theme just in case the library ever acquires a maintainer.
 	     */
-	    if (xterm_cursor_theme != 0) {
+	    if (xterm_cursor_theme != NULL) {
 		char *leaf = xterm_cursor_theme + strlen(xterm_cursor_theme);
 		FILE *fp;
 
 		strcat(leaf, "/");
 		strcat(leaf, theme);
 
-		if ((fp = fopen(xterm_cursor_theme, "w")) != 0) {
+		if ((fp = fopen(xterm_cursor_theme, "w")) != NULL) {
 		    fprintf(fp, "[Icon Theme]\n");
 		    fclose(fp);
 		    *leaf = '\0';
@@ -814,7 +814,7 @@
 cleanup_colored_cursor(void)
 {
 #ifdef HAVE_LIB_XCURSOR
-    if (xterm_cursor_theme != 0) {
+    if (xterm_cursor_theme != NULL) {
 	char *my_path = getenv("XCURSOR_PATH");
 	struct stat sb;
 	if (!IsEmpty(my_path)
@@ -1069,7 +1069,7 @@
 	    value *= 16;
 	    if (c >= '0' && c <= '9')
 		value += (unsigned) (c - '0');
-	    else if ((xxxxxx = (strchr) (abcdef, c)) != 0)
+	    else if ((xxxxxx = (strchr) (abcdef, c)) != NULL)
 		value += (unsigned) (xxxxxx - abcdef) + 10;
 	    else
 		break;
@@ -1621,7 +1621,7 @@
     char *abword;
     int c;
     char *ab_end = (xw->work.dabbrev_data + MAX_DABBREV - 1);
-    char *result = 0;
+    char *result = NULL;
 
     abword = ab_end;
     *abword = '\0';		/* end of string marker */
@@ -1638,7 +1638,7 @@
 	result = abword;
     }
 
-    if (result != 0) {
+    if (result != NULL) {
 	while ((c = dabbrev_prev_char(screen, cell, ld)) >= 0 &&
 	       !IS_WORD_CONSTITUENT(c)) {
 	    ;			/* skip preceding spaces */
@@ -1655,7 +1655,7 @@
     int pty = screen->respond;	/* file descriptor of pty */
 
     static CELL cell;
-    static char *dabbrev_hint = 0, *lastexpansion = 0;
+    static char *dabbrev_hint = NULL, *lastexpansion = NULL;
     static unsigned int expansions;
 
     char *expansion;
@@ -1670,14 +1670,14 @@
 
 	free(dabbrev_hint);
 
-	if ((dabbrev_hint = dabbrev_prev_word(xw, &cell, &ld)) != 0) {
+	if ((dabbrev_hint = dabbrev_prev_word(xw, &cell, &ld)) != NULL) {
 
 	    free(lastexpansion);
 
-	    if ((lastexpansion = strdup(dabbrev_hint)) != 0) {
+	    if ((lastexpansion = strdup(dabbrev_hint)) != NULL) {
 
 		/* make own copy */
-		if ((dabbrev_hint = strdup(dabbrev_hint)) != 0) {
+		if ((dabbrev_hint = strdup(dabbrev_hint)) != NULL) {
 		    screen->dabbrev_working = True;
 		    /* we are in the middle of dabbrev process */
 		}
@@ -1689,17 +1689,17 @@
 	}
 	if (!screen->dabbrev_working) {
 	    free(lastexpansion);
-	    lastexpansion = 0;
+	    lastexpansion = NULL;
 	    return result;
 	}
     }
 
-    if (dabbrev_hint == 0)
+    if (dabbrev_hint == NULL)
 	return result;
 
     hint_len = strlen(dabbrev_hint);
     for (;;) {
-	if ((expansion = dabbrev_prev_word(xw, &cell, &ld)) == 0) {
+	if ((expansion = dabbrev_prev_word(xw, &cell, &ld)) == NULL) {
 	    if (expansions >= 2) {
 		expansions = 0;
 		cell.col = screen->cur_col;
@@ -1714,12 +1714,12 @@
 	    break;
     }
 
-    if (expansion != 0) {
+    if (expansion != NULL) {
 	Char *copybuffer;
 	size_t del_cnt = strlen(lastexpansion) - hint_len;
 	size_t buf_cnt = del_cnt + strlen(expansion) - hint_len;
 
-	if ((copybuffer = TypeMallocN(Char, buf_cnt)) != 0) {
+	if ((copybuffer = TypeMallocN(Char, buf_cnt)) != NULL) {
 	    /* delete previous expansion */
 	    memset(copybuffer, screen->dabbrev_erase_char, del_cnt);
 	    memmove(copybuffer + del_cnt,
@@ -1732,7 +1732,7 @@
 
 	    free(lastexpansion);
 
-	    if ((lastexpansion = strdup(expansion)) != 0) {
+	    if ((lastexpansion = strdup(expansion)) != NULL) {
 		result = 1;
 		expansions++;
 	    }
@@ -1752,7 +1752,7 @@
     XtermWidget xw;
 
     TRACE(("Handle dabbrev-expand for %p\n", (void *) w));
-    if ((xw = getXtermWidget(w)) != 0) {
+    if ((xw = getXtermWidget(w)) != NULL) {
 	if (!dabbrev_expand(xw))
 	    Bell(xw, XkbBI_TerminalBell, 0);
     }
@@ -1817,7 +1817,7 @@
 	int actual_format_return = 0;
 	unsigned long nitems_return = 0;
 	unsigned long bytes_after_return = 0;
-	unsigned char *prop_return = 0;
+	unsigned char *prop_return = NULL;
 	long long_length = 1024;
 	Atom requested_type = XA_ATOM;
 	Atom is_hidden = CachedInternAtom(dpy, "_NET_WM_STATE_HIDDEN");
@@ -1838,7 +1838,7 @@
 			    &nitems_return,
 			    &bytes_after_return,
 			    &prop_return)) {
-	    if (prop_return != 0
+	    if (prop_return != NULL
 		&& actual_return_type == requested_type
 		&& actual_format_return == 32) {
 		unsigned long n;
@@ -1870,7 +1870,7 @@
 {
     XtermWidget xw;
 
-    if ((xw = getXtermWidget(w)) != 0) {
+    if ((xw = getXtermWidget(w)) != NULL) {
 	xtermDeiconify(xw);
     }
 }
@@ -1884,7 +1884,7 @@
 {
     XtermWidget xw;
 
-    if ((xw = getXtermWidget(w)) != 0) {
+    if ((xw = getXtermWidget(w)) != NULL) {
 	xtermIconify(xw);
     }
 }
@@ -2051,7 +2051,7 @@
 {
     XtermWidget xw;
 
-    if ((xw = getXtermWidget(w)) != 0) {
+    if ((xw = getXtermWidget(w)) != NULL) {
 	RequestMaximize(xw, 1);
     }
 }
@@ -2065,7 +2065,7 @@
 {
     XtermWidget xw;
 
-    if ((xw = getXtermWidget(w)) != 0) {
+    if ((xw = getXtermWidget(w)) != NULL) {
 	RequestMaximize(xw, 0);
     }
 }
@@ -2359,7 +2359,7 @@
 	}
     }
 
-    if (shell == 0) {
+    if (shell == NULL) {
 	static char dummy[] = "/bin/sh";
 	shell = dummy;
     }
@@ -2523,7 +2523,7 @@
 	size_t i;
 
 	cp = VTbuffer->next;
-	if (screen->logstart != 0
+	if (screen->logstart != NULL
 	    && (i = (size_t) (cp - screen->logstart)) > 0) {
 	    IGNORE_RC(write(screen->logfd, screen->logstart, i));
 	}
@@ -2581,13 +2581,13 @@
     Display *dpy = screen->display;
     XVisualInfo myTemplate;
 
-    if (xw->visInfo == 0 && xw->numVisuals == 0) {
+    if (xw->visInfo == NULL && xw->numVisuals == 0) {
 	myTemplate.visualid = XVisualIDFromVisual(DefaultVisual(dpy,
 								XDefaultScreen(dpy)));
 	xw->visInfo = XGetVisualInfo(dpy, (long) VisualIDMask,
 				     &myTemplate, &xw->numVisuals);
 
-	if ((xw->visInfo != 0) && (xw->numVisuals > 0)) {
+	if ((xw->visInfo != NULL) && (xw->numVisuals > 0)) {
 	    XVisualInfo *vi = xw->visInfo;
 	    xw->rgb_widths[0] = maskToWidth(vi->red_mask);
 	    xw->rgb_widths[1] = maskToWidth(vi->green_mask);
@@ -2622,7 +2622,7 @@
 		   xw->rgb_widths[2]));
 	}
     }
-    return (xw->visInfo != 0) && (xw->numVisuals > 0) ? xw->visInfo : NULL;
+    return (xw->visInfo != NULL) && (xw->numVisuals > 0) ? xw->visInfo : NULL;
 #undef MYFMT
 #undef MYARG
 }
@@ -2676,14 +2676,14 @@
 {
     Colormap cmap = xw->core.colormap;
     TScreen *screen = TScreenOf(xw);
-    Boolean result = (screen->cmap_data != 0);
+    Boolean result = (screen->cmap_data != NULL);
 
     if (!result
 	&& length != 0
 	&& length < MAX_COLORTABLE) {
 	screen->cmap_data = TypeMallocN(XColor, (size_t) length);
 
-	if (screen->cmap_data != 0) {
+	if (screen->cmap_data != NULL) {
 	    unsigned i;
 	    unsigned shift;
 
@@ -2807,7 +2807,7 @@
 	if (loadColorTable(xw, cmap_size)) {
 	    char *tried = TypeCallocN(char, (size_t) cmap_size);
 
-	    if (tried != 0) {
+	    if (tried != NULL) {
 		unsigned attempts;
 
 		/*
@@ -3058,8 +3058,8 @@
 	    color = (int) (strtol) (buf, &next, 10);
 	    if (!PartS2L(buf, next) || (color < 0))
 		break;		/* no number at all */
-	    if (next != 0) {
-		if (strchr(";", *next) == 0)
+	    if (next != NULL) {
+		if (strchr(";", *next) == NULL)
 		    break;	/* unexpected delimiter */
 		++next;
 	    }
@@ -3332,8 +3332,6 @@
 	    PDATA('7', CUT_BUFFER7),
     };
     char target_used[XtNumber(table)];
-    char select_code[XtNumber(table) + 1];
-    String select_args[XtNumber(table) + 1];
 
     const char *base = buf;
     Cardinal j;
@@ -3347,6 +3345,8 @@
     }
 
     if (*buf == ';') {
+	char select_code[XtNumber(table) + 1];
+	String select_args[XtNumber(table) + 1];
 
 	*buf++ = '\0';
 	if (*base == '\0')
@@ -3417,10 +3417,6 @@
 
 /***====================================================================***/
 
-#define IsSetUtf8Title(xw) (IsTitleMode(xw, tmSetUtf8) \
-			 || (xw->screen.utf8_title) \
-			 || (xw->screen.c1_printable))
-
 static Bool
 xtermIsPrintable(XtermWidget xw, Char **bufp, Char *last)
 {
@@ -3707,7 +3703,7 @@
 		if (names != NULL) {
 		    *names++ = '\0';
 		}
-		if (thisName != 0) {
+		if (thisName != NULL) {
 		    if (!strcmp(thisName, "?")) {
 			if (ReportColorRequest(xw, ndx, final))
 			    ++queried;
@@ -3753,8 +3749,8 @@
 	newColors.which = 0;
 	newColors.names[ndx] = NULL;
 
-	if (thisName != 0
-	    && xw->work.oldColors->names[ndx] != 0
+	if (thisName != NULL
+	    && xw->work.oldColors->names[ndx] != NULL
 	    && strcmp(thisName, xw->work.oldColors->names[ndx])) {
 	    AllocateTermColor(xw, &newColors, ndx, thisName, False);
 
@@ -3818,7 +3814,7 @@
 	Bool success = True;
 	int num;
 	String base = buf + 1;
-	const char *name = 0;
+	const char *name = NULL;
 
 	num = ParseShiftedFont(xw, buf, &buf);
 	if (num < 0
@@ -3831,7 +3827,7 @@
 		name = getFaceName(xw, False);
 	    } else
 #endif
-	    if ((name = screen->MenuFontName(num)) == 0) {
+	    if ((name = screen->MenuFontName(num)) == NULL) {
 		success = False;
 	    }
 	}
@@ -3909,7 +3905,7 @@
 		     * But if there is, simply overwrite the font entry.
 		     */
 		    if (*buf == '\0') {
-			if ((buf = screen->MenuFontName(num)) == 0) {
+			if ((buf = screen->MenuFontName(num)) == NULL) {
 			    success = False;
 			}
 		    }
@@ -3921,7 +3917,7 @@
 	name = x_strtrim(buf);
 	if (screen->EscapeFontName()) {
 	    FREE_STRING(screen->EscapeFontName());
-	    screen->EscapeFontName() = 0;
+	    screen->EscapeFontName() = NULL;
 	}
 	if (success && !IsEmpty(name)) {
 #if OPT_RENDERFONT
@@ -3972,6 +3968,7 @@
     CASE(allowTcapOps);
     CASE(allowTitleOps);
     CASE(allowWindowOps);
+    (void) delimiter;
 #undef CASE
 
     unparseputc1(xw, final);
@@ -3995,7 +3992,7 @@
     int mode;
     Char *cp;
     int state = 0;
-    char *buf = 0;
+    char *buf = NULL;
     char temp[20];
 #if OPT_ISO_COLORS
     int ansi_colors = 0;
@@ -4553,7 +4550,7 @@
 
 	    ch = CharOf(ch - 0x3f);
 	    for (n = 0; n < 6; ++n) {
-		bits[row + n][col] = CharOf((ch & (1 << n)) ? '*' : '.');
+		bits[row + n][col] = CharOf((ch & xBIT(n)) ? '*' : '.');
 	    }
 	    col += 1;
 	    prior = True;
@@ -4893,10 +4890,8 @@
 		sprintf(reply, "%d%s%s",
 			(screen->vtXX_level ?
 			 screen->vtXX_level : 1) + 60,
-			(screen->vtXX_level >= 2)
-			? (screen->control_eight_bits
-			   ? ";0" : ";1")
-			: "",
+			(screen->control_eight_bits
+			 ? ";0" : ";1"),
 			cp);
 	    } else if (!strcmp(cp, "r")) {	/* DECSTBM */
 		TRACE(("DECRQSS -> DECSTBM\n"));
@@ -5030,7 +5025,44 @@
 		}
 	    } else
 #endif
-	    {
+		/*
+		 * This query returns the settings assuming the default value
+		 * of DEF_TITLE_MODES, which is zero.  Someone could in
+		 * principle alter that (so that some states could only be
+		 * reached by removing rather than consistently by setting),
+		 * but the default value could be discovered by resetting the
+		 * title modes, querying the resulting reset state.
+		 */
+	    if (*cp == '>' && !strcmp(skip_params(1 + cp), "t")) {	/* XTSMTITLE */
+		char buffer[80];
+		int n;
+
+		++cp;
+		okay = True;
+		ival = parse_int_param(&cp);
+		*buffer = '\0';
+		if (ival == -1) {	/* DEFAULT */
+		    for (n = 0; n <= MAX_TITLEMODE; ++n) {
+			int check = xBIT(n);
+			char *s = buffer + strlen(buffer);
+			if (s != buffer)
+			    *s++ = ';';
+			sprintf(s, "%d",
+				((check & screen->title_modes) != 0
+				 ? 1
+				 : 0));
+		    }
+		} else if (ival >= 0 && ival <= MAX_TITLEMODE) {
+		    sprintf(buffer, "%d",
+			    ((xBIT(ival) & screen->title_modes) != 0
+			     ? 1
+			     : 0));
+		} else {
+		    okay = False;
+		}
+		if (okay)
+		    sprintf(reply, ">%st", buffer);
+	    } else {
 		okay = False;
 	    }
 
@@ -5139,7 +5171,7 @@
 		Boolean first = True;
 		okay = True;
 		while (*cp != '\0' && okay) {
-		    const char *parsed = 0;
+		    const char *parsed = NULL;
 		    const char *tmp;
 		    char *name = x_decode_hex(cp, &parsed);
 		    char *value;
@@ -5153,7 +5185,7 @@
 			break;	/* ignore improbable resource */
 		    }
 		    TRACE(("query-feature '%s'\n", name));
-		    if ((value = vt100ResourceToString(xw, name)) != 0) {
+		    if ((value = vt100ResourceToString(xw, name)) != NULL) {
 			okay = True;	/* valid */
 		    } else {
 			okay = False;	/* invalid */
@@ -5169,7 +5201,7 @@
 		    for (tmp = cp; tmp != parsed; ++tmp)
 			unparseputc(xw, *tmp);
 
-		    if (value != 0) {
+		    if (value != NULL) {
 			unparseputc1(xw, '=');
 			result = x_encode_hex(value);
 			unparseputs(xw, result);
@@ -5789,7 +5821,7 @@
 {
     const char *prefix = PIXMAP_ROOTDIR;
     const char *larger = "_48x48";
-    char *result = 0;
+    char *result = NULL;
 
     if (*state >= 0) {
 	if ((*state & 1) == 0)
@@ -5813,7 +5845,7 @@
 	FreeAndNull(*work);
 	length = 3 + strlen(prefix) + strlen(filename) + strlen(larger) +
 	    strlen(suffix);
-	if ((result = malloc(length)) != 0) {
+	if ((result = malloc(length)) != NULL) {
 	    sprintf(result, "%s%s%s%s", prefix, filename, larger, suffix);
 	    *work = result;
 	}
@@ -5828,7 +5860,7 @@
 static const XPM_DATA *
 built_in_xpm(const XPM_DATA * table, Cardinal length, const char *find)
 {
-    const XPM_DATA *result = 0;
+    const XPM_DATA *result = NULL;
     if (!IsEmpty(find)) {
 	Cardinal n;
 	for (n = 0; n < length; ++n) {
@@ -5843,10 +5875,10 @@
 	 * As a fallback, check if the icon name matches without the lengths,
 	 * which are all _HHxWW format.
 	 */
-	if (result == 0) {
+	if (result == NULL) {
 	    const char *base = table[0].name;
 	    const char *last = strchr(base, '_');
-	    if (last != 0
+	    if (last != NULL
 		&& !x_strncasecmp(find, base, (unsigned) (last - base))) {
 		result = table + length - 1;
 		ReportIcons(("use builtin-icon %s\n", table[0].name));
@@ -5886,7 +5918,7 @@
     Display *dpy = XtDisplay(xw);
     Pixmap myIcon = 0;
     Pixmap myMask = 0;
-    char *workname = 0;
+    char *workname = NULL;
     ICON_HINT hint = eHintDefault;
 #include <builtin_icons.h>
 
@@ -5901,7 +5933,7 @@
 
     if (hint == eHintSearch) {
 	int state = 0;
-	while (x_find_icon(&workname, &state, icon_hint, ".xpm") != 0) {
+	while (x_find_icon(&workname, &state, icon_hint, ".xpm") != NULL) {
 	    Pixmap resIcon = 0;
 	    Pixmap shapemask = 0;
 	    XpmAttributes attributes;
@@ -5941,15 +5973,15 @@
     if (myIcon == 0 && hint != eHintNone) {
 	char **data;
 #if OPT_BUILTIN_XPMS
-	const XPM_DATA *myData = 0;
+	const XPM_DATA *myData = NULL;
 	myData = BuiltInXPM(mini_xterm_xpms);
-	if (myData == 0)
+	if (myData == NULL)
 	    myData = BuiltInXPM(filled_xterm_xpms);
-	if (myData == 0)
+	if (myData == NULL)
 	    myData = BuiltInXPM(xterm_color_xpms);
-	if (myData == 0)
+	if (myData == NULL)
 	    myData = BuiltInXPM(xterm_xpms);
-	if (myData == 0)
+	if (myData == NULL)
 	    myData = &mini_xterm_xpms[XtNumber(mini_xterm_xpms) - 1];
 	data = (char **) myData->data;
 #else
@@ -5958,7 +5990,7 @@
 	if (XpmCreatePixmapFromData(dpy,
 				    DefaultRootWindow(dpy),
 				    data,
-				    &myIcon, &myMask, 0) == 0) {
+				    &myIcon, &myMask, NULL) == 0) {
 	    ReportIcons(("loaded built-in pixmap icon\n"));
 	} else {
 	    myIcon = 0;
@@ -6013,7 +6045,7 @@
     /*
      * Ignore empty or too-long requests.
      */
-    if (value == 0 || strlen(value) > 1000)
+    if (value == NULL || strlen(value) > 1000)
 	return;
 
     if (IsTitleMode(xw, tmSetBase16)) {
@@ -6022,7 +6054,7 @@
 
 	/* this allocates a new string, if no error is detected */
 	value = x_decode_hex(value, &temp);
-	if (value == 0 || *temp != '\0') {
+	if (value == NULL || *temp != '\0') {
 	    free(value);
 	    return;
 	}
@@ -6126,7 +6158,7 @@
 	for (n = 0; c1[n] != '\0'; ++n) {
 	    if (c1[n] > 127) {
 		Char *converted;
-		if ((converted = TypeMallocN(Char, 1 + (6 * limit))) != 0) {
+		if ((converted = TypeMallocN(Char, 1 + (6 * limit))) != NULL) {
 		    Char *temp = converted;
 		    while (*c1 != 0) {
 			temp = convertToUTF8(temp, *c1++);
@@ -6146,13 +6178,13 @@
 #if OPT_SAME_NAME
     /* If the attribute isn't going to change, then don't bother... */
     if (resource.sameName) {
-	char *buf = 0;
+	char *buf = NULL;
 	XtSetArg(args[0], my_attr, &buf);
 	XtGetValues(top, args, 1);
 	TRACE(("...comparing resource{%s} to new value{%s}\n",
 	       NonNull(buf),
 	       NonNull(value)));
-	if (buf != 0 && strcmp(value, buf) == 0)
+	if (buf != NULL && strcmp(value, buf) == 0)
 	    changed = False;
     }
 #endif /* OPT_SAME_NAME */
@@ -6183,7 +6215,7 @@
 		    long long_length = 1024;
 		    unsigned long nitems = 0;
 		    unsigned long bytes_after = 0;
-		    unsigned char *prop = 0;
+		    unsigned char *prop = NULL;
 
 		    if (xtermGetWinProp(dpy,
 					VShellWindow(xw),
@@ -6198,7 +6230,7 @@
 					&prop)) {
 			if (actual_type == requested_type
 			    && actual_format == 8
-			    && prop != 0
+			    && prop != NULL
 			    && nitems == strlen(value)
 			    && memcmp(value, prop, nitems) == 0) {
 			    changed = False;
@@ -6292,7 +6324,7 @@
 		pOld->names[TEXT_CURSOR] = NULL;
 	    }
 	    if (pOld->names[TEXT_BG]) {
-		if ((tmpName = x_strdup(pOld->names[TEXT_BG])) != 0) {
+		if ((tmpName = x_strdup(pOld->names[TEXT_BG])) != NULL) {
 		    pOld->names[TEXT_CURSOR] = tmpName;
 		}
 	    }
@@ -6336,7 +6368,7 @@
 	}
 
 	if (result
-	    && (newName = x_strdup(name)) != 0) {
+	    && (newName = x_strdup(name)) != NULL) {
 	    if (COLOR_DEFINED(pNew, ndx)) {
 		free(pNew->names[ndx]);
 	    }
@@ -6546,7 +6578,7 @@
 
     if (!IsEmpty(pathname)
 	&& *pathname == '/'
-	&& strstr(pathname, "/..") == 0
+	&& strstr(pathname, "/..") == NULL
 	&& stat(pathname, &sb) == 0
 	&& (sb.st_mode & S_IFMT) == S_IFREG
 	&& (sb.st_mode & S_IXOTH) != 0) {
@@ -6575,8 +6607,8 @@
 	size_t need = PATH_MAX;
 	size_t used = strlen(result) + 2;
 	char *buffer = malloc(used + need);
-	if (buffer != 0) {
-	    if (getcwd(buffer, need) != 0) {
+	if (buffer != NULL) {
+	    if (getcwd(buffer, need) != NULL) {
 		sprintf(buffer + strlen(buffer), "/%s", result);
 		result = buffer;
 		allocated = True;
@@ -6584,10 +6616,10 @@
 		free(buffer);
 	    }
 	}
-    } else if (*result != '\0' && strchr("+/-", *result) == 0) {
+    } else if (*result != '\0' && strchr("+/-", *result) == NULL) {
 	/* find it in $PATH */
-	if ((s = s0 = x_getenv("PATH")) != 0) {
-	    if ((tmp = TypeMallocN(char, strlen(leaf) + strlen(s) + 2)) != 0) {
+	if ((s = s0 = x_getenv("PATH")) != NULL) {
+	    if ((tmp = TypeMallocN(char, strlen(leaf) + strlen(s) + 2)) != NULL) {
 		Bool found = False;
 		while (*s != '\0') {
 		    strcpy(tmp, s);
@@ -6621,10 +6653,10 @@
 	    xtermWarning("No absolute path found for shell: %s\n", result);
 	if (allocated)
 	    free(result);
-	result = 0;
+	result = NULL;
     }
     /* be consistent, so that caller can always free the result */
-    if (result != 0 && !allocated)
+    if (result != NULL && !allocated)
 	result = x_strdup(result);
     return result;
 }
@@ -6702,7 +6734,7 @@
 void
 xtermSetenv(const char *var, const char *value)
 {
-    if (value != 0) {
+    if (value != NULL) {
 #ifdef HAVE_PUTENV
 	char *both = malloc(2 + strlen(var) + strlen(value));
 	TRACE(("xtermSetenv(%s=%s)\n", var, value));
@@ -6810,7 +6842,7 @@
     /*
      * Check for the obvious - Xt does a poor job of reporting this.
      */
-    if (x_getenv("DISPLAY") == 0) {
+    if (x_getenv("DISPLAY") == NULL) {
 	xtermWarning("DISPLAY is not set\n");
     }
     exit(ERROR_MISC);
@@ -6888,10 +6920,10 @@
 
     if (on) {
 	if (!TEK4014_SHOWN(xw)) {
-	    if (tekWidget == 0) {
+	    if (tekWidget == NULL) {
 		TekInit();	/* will exit on failure */
 	    }
-	    if (tekWidget != 0) {
+	    if (tekWidget != NULL) {
 		Widget tekParent = SHELL_OF(tekWidget);
 		resource.notMapped = False;
 		XtRealizeWidget(tekParent);
@@ -7010,21 +7042,21 @@
 }
 
 XrmOptionDescRec *
-sortedOptDescs(XrmOptionDescRec * descs, Cardinal res_count)
+sortedOptDescs(const XrmOptionDescRec * descs, Cardinal res_count)
 {
-    static XrmOptionDescRec *res_array = 0;
+    static XrmOptionDescRec *res_array = NULL;
 
 #ifdef NO_LEAKS
-    if (descs == 0) {
+    if (descs == NULL) {
 	FreeAndNull(res_array);
     } else
 #endif
-    if (res_array == 0) {
+    if (res_array == NULL) {
 	Cardinal j;
 
 	/* make a sorted index to 'resources' */
 	res_array = TypeCallocN(XrmOptionDescRec, res_count);
-	if (res_array != 0) {
+	if (res_array != NULL) {
 	    for (j = 0; j < res_count; j++)
 		res_array[j] = descs[j];
 	    qsort(res_array, (size_t) res_count, sizeof(*res_array), cmp_resources);
@@ -7042,19 +7074,19 @@
 OptionHelp *
 sortedOpts(OptionHelp * options, XrmOptionDescRec * descs, Cardinal numDescs)
 {
-    static OptionHelp *opt_array = 0;
+    static OptionHelp *opt_array = NULL;
 
 #ifdef NO_LEAKS
-    if (descs == 0 && opt_array != 0) {
+    if (descs == NULL && opt_array != NULL) {
 	sortedOptDescs(descs, numDescs);
 	FreeAndNull(opt_array);
-	return 0;
-    } else if (options == 0 || descs == 0) {
-	return 0;
+	return NULL;
+    } else if (options == NULL || descs == NULL) {
+	return NULL;
     }
 #endif
 
-    if (opt_array == 0) {
+    if (opt_array == NULL) {
 	size_t opt_count, j;
 #if OPT_TRACE
 	Cardinal k;
@@ -7067,7 +7099,7 @@
 #endif
 
 	/* count 'options' and make a sorted index to it */
-	for (opt_count = 0; options[opt_count].opt != 0; ++opt_count) {
+	for (opt_count = 0; options[opt_count].opt != NULL; ++opt_count) {
 	    ;
 	}
 	opt_array = TypeCallocN(OptionHelp, opt_count + 1);
@@ -7093,10 +7125,10 @@
 		    sprintf(temp, "%.*s",
 			    (int) sizeof(temp) - 2,
 			    opt_array[j].desc);
-		    if (x_strindex(temp, "inhibit") != 0)
+		    if (x_strindex(temp, "inhibit") != NULL)
 			code = -code;
 		    if (code != 0
-			&& res_array[k].value != 0
+			&& res_array[k].value != NULL
 			&& !strcmp(name, res_array[k].option + 1)) {
 			if (((code < 0) && !strcmp(value, "on"))
 			    || ((code > 0) && !strcmp(value, "off"))
@@ -7129,8 +7161,8 @@
 {
     static String result;
 
-    if (result == 0) {
-	if ((result = x_nonempty(setlocale(LC_CTYPE, 0))) == 0) {
+    if (result == NULL) {
+	if ((result = x_nonempty(setlocale(LC_CTYPE, NULL))) == NULL) {
 	    result = x_strdup("C");
 	} else {
 	    result = x_strdup(result);
@@ -7145,7 +7177,7 @@
 {
     static char *result;
 
-    if (result == 0) {
+    if (result == NULL) {
 #ifdef HAVE_LANGINFO_CODESET
 	result = nl_langinfo(CODESET);
 #else
@@ -7205,10 +7237,10 @@
 {
     XtermWidget xw;
 
-    if (w == 0) {
+    if (w == NULL) {
 	xw = (XtermWidget) CURRENT_EMU();
 	if (!IsXtermWidget(xw)) {
-	    xw = 0;
+	    xw = NULL;
 	}
     } else if (IsXtermWidget(w)) {
 	xw = (XtermWidget) w;
@@ -7226,7 +7258,7 @@
 trace_1_SM(const char *tag, String name)
 {
     Arg args[1];
-    char *buf = 0;
+    char *buf = NULL;
 
     XtSetArg(args[0], name, &buf);
     XtGetValues(toplevel, args, 1);
@@ -7397,7 +7429,7 @@
 formatFontParam(char *result, XtermWidget xw, const FontParams * parameter)
 {
     sprintf(result, "%s*%s:", ProgramName, parameter->name);
-    if (xw != None) {
+    if (xw != NULL) {
 	char *next = result + strlen(result);
 	switch (parameter->type) {
 	case B_ARG:
@@ -7471,7 +7503,7 @@
 		break;
 
 	    if (value) {
-		formatFontParam(expect, None, fontParams + my_param);
+		formatFontParam(expect, NULL, fontParams + my_param);
 	    } else {
 		strcpy(expect, "-xrm");
 	    }
@@ -7531,7 +7563,7 @@
 {
     if (resource.sessionMgt) {
 	Arg args[1];
-	char **argv = 0;
+	char **argv = NULL;
 
 	XtSetArg(args[0], XtNrestartCommand, &argv);
 	XtGetValues(toplevel, args, 1);
@@ -7913,6 +7945,19 @@
 }
 
 #if OPT_XTERM_SGR
+void
+xtermReportTitleStack(XtermWidget xw)
+{
+    TScreen *screen = TScreenOf(xw);
+    char reply[100];
+
+    sprintf(reply, "%d;%d", screen->saved_titles.used, MAX_SAVED_TITLES);
+    unparseputc1(xw, ANSI_CSI);
+    unparseputs(xw, reply);
+    unparseputc(xw, '#');
+    unparseputc(xw, 'S');
+    unparse_end(xw);
+}
 
 #if OPT_TRACE
 static char *
@@ -8013,7 +8058,7 @@
     memset(&working, 0, sizeof(working));
     for (row = value->top - 1; row < value->bottom; ++row) {
 	LineData *ld = getLineData(screen, row);
-	if (ld == 0)
+	if (ld == NULL)
 	    continue;
 	for (col = value->left - 1; col < value->right; ++col) {
 	    if (first) {
Index: package/debian/changelog
--- xterm-395+/package/debian/changelog	2024-09-11 07:48:16.000000000 +0000
+++ xterm-396/package/debian/changelog	2024-11-20 21:39:31.000000000 +0000
@@ -1,3 +1,9 @@
+xterm-dev (396) unstable; urgency=low
+
+  * maintenance updates
+
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Wed, 20 Nov 2024 16:39:31 -0500
+
 xterm-dev (395) unstable; urgency=low
 
   * maintenance updates
Index: package/debian/control
--- xterm-395+/package/debian/control	2019-02-06 01:37:35.000000000 +0000
+++ xterm-396/package/debian/control	2024-12-02 00:47:23.000000000 +0000
@@ -3,14 +3,14 @@
 Priority: optional
 Maintainer: Thomas E. Dickey <dickey@invisible-island.net>
 Homepage: https://invisible-island.net/xterm/
-Build-Depends: debhelper (>= 7), xorg-docs-core
+Build-Depends: debhelper (>= 7), xorg-docs-core, libxft-dev, libxpm-dev, libxaw7-dev, libutempter-dev
 Standards-Version: 3.8.2
 
 Package: xterm-dev
 Architecture: any
 Depends: xbitmaps, libc6 (>= 2.7), libfontconfig1, libice6 (>= 1:1.0.0), libutempter0 (>= 1.1.5), libx11-6, libxaw7, libxft2 (>> 2.1.1), libxmu6, libxt6
 Provides: x-terminal-emulator
-Recommends: x11-utils | xutils | bluit
+Recommends: xfonts-75dpi, xfonts-base, x11-utils | luit | bluit
 Description: X terminal emulator (development version)
  xterm is the standard terminal emulator for the X Window System.
  It provides DEC VT102 and Tektronix 4014 compatible terminals for
Index: package/debian/rules
--- xterm-395+/package/debian/rules	2023-03-10 23:53:19.000000000 +0000
+++ xterm-396/package/debian/rules	2024-12-02 01:12:04.000000000 +0000
@@ -6,6 +6,12 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+SHELL = /bin/bash
+DPKG_EXPORT_BUILDFLAGS = 1
+export DEB_BUILD_MAINT_OPTIONS := hardening=+all qa=+bug reproducible=+all
+
+include /usr/share/dpkg/buildflags.mk
+
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -25,10 +31,6 @@
 DSTDIR		:= $(CURDIR)/debian/$(PACKAGE)
 MY_DESKTOP	:= $(DSTDIR)/usr/share/applications
 
-CPPFLAGS	:= $(shell dpkg-buildflags --get CPPFLAGS)
-CFLAGS		:= $(shell dpkg-buildflags --get CFLAGS)
-LDFLAGS		:= $(shell dpkg-buildflags --get LDFLAGS)
-
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 DEBOP=--enable-debug
 else
@@ -44,48 +46,51 @@
         INSTALL_PROGRAM += -s
 endif
 
+configure_flags = \
+	--host=$(DEB_HOST_GNU_TYPE) \
+	--build=$(DEB_BUILD_GNU_TYPE) \
+	--program-suffix=$(PKG_SUFFIX) \
+	--prefix=/usr \
+	--libexecdir=\$${prefix}/lib \
+	--mandir=\$${prefix}/share/man \
+	--sysconfdir=/etc/$(PACKAGE) \
+	--localstatedir=/var \
+	--libdir=/etc/$(PACKAGE) \
+	--with-app-class=$(PKG_CLASS) \
+	--without-xterm-symlink \
+	--disable-imake \
+	--enable-dabbrev \
+	--enable-dec-locator \
+	--enable-exec-xterm \
+	--enable-hp-fkeys \
+	--enable-load-vt-fonts \
+	--enable-logfile-exec \
+	--enable-logging \
+	--enable-mini-luit \
+	--enable-regis-graphics \
+	--enable-sco-fkeys \
+	--enable-status-line \
+	--enable-toolbar \
+	--enable-xmc-glitch \
+	--with-app-defaults=$(PKG_APPDEFAULTS) \
+	--with-icondir=\$${prefix}/share/icons \
+	--with-pixmapdir=\$${prefix}/share/pixmaps \
+	--with-own-terminfo=\$${prefix}/share/terminfo \
+	--with-icon-theme \
+	--with-terminal-type=xterm-new \
+	--with-utempter \
+	--with-icon-name=mini.xterm \
+	--with-xpm ${DEBOP}
+
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
 
-	CPPFLAGS="$(CPPFLAGS)" \
-	CFLAGS="$(CFLAGS)" \
-	LDFLAGS="$(LDFLAGS)" \
-	./configure \
-		--host=$(DEB_HOST_GNU_TYPE) \
-		--build=$(DEB_BUILD_GNU_TYPE) \
-		--program-suffix=$(PKG_SUFFIX) \
-		--prefix=/usr \
-		--libexecdir=\$${prefix}/lib \
-		--mandir=\$${prefix}/share/man \
-		--sysconfdir=/etc/$(PACKAGE) \
-		--localstatedir=/var \
-		--libdir=/etc/$(PACKAGE) \
-		--with-app-class=$(PKG_CLASS) \
-		--without-xterm-symlink \
-		--disable-imake \
-		--enable-dabbrev \
-		--enable-dec-locator \
-		--enable-exec-xterm \
-		--enable-hp-fkeys \
-		--enable-load-vt-fonts \
-		--enable-logfile-exec \
-		--enable-logging \
-		--enable-mini-luit \
-		--enable-regis-graphics \
-		--enable-sco-fkeys \
-		--enable-status-line \
-		--enable-toolbar \
-		--enable-xmc-glitch \
-		--with-app-defaults=$(PKG_APPDEFAULTS) \
-		--with-icondir=\$${prefix}/share/icons \
-		--with-pixmapdir=\$${prefix}/share/pixmaps \
-		--with-own-terminfo=\$${prefix}/share/terminfo \
-		--with-icon-theme \
-		--with-terminal-type=xterm-new \
-		--with-utempter \
-		--with-icon-name=mini.xterm \
-		--with-xpm ${DEBOP}
+	# Update config.guess, config.sub
+	dh_update_autotools_config
+
+	# Configure xterm-dev
+	dh_auto_configure -- $(configure_flags)
 
 	touch configure-stamp
 
Index: package/freebsd/Makefile
--- xterm-395+/package/freebsd/Makefile	2024-09-11 07:48:16.000000000 +0000
+++ xterm-396/package/freebsd/Makefile	2024-12-03 00:29:24.000000000 +0000
@@ -1,5 +1,4 @@
-# $XTermId: Makefile,v 1.116 2024/09/11 07:48:16 tom Exp $
-# $FreeBSD: head/x11/xterm/Makefile 492827 2019-02-13 06:43:36Z ehaupt $
+# $XTermId: Makefile,v 1.118 2024/12/03 00:29:24 tom Exp $
 
 # This is adapted from the FreeBSD port, installing as "xterm-dev" with
 # separate resource- and manpage files.
@@ -7,84 +6,84 @@
 # and "make makesum".
 
 PORTNAME=	xterm
-PORTVERSION=	395
+DISTVERSION=	396
 CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.invisible-island.net/xterm/:src1 \
+MASTER_SITES=	https://invisible-island.net/archives/xterm/:src1 \
 		https://invisible-mirror.net/archives/xterm/:src1
 PKGNAMESUFFIX=	-dev
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:src1
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Terminal emulator for the X Window System
+WWW=		https://invisible-island.net/xterm/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		cpe ncurses tar:tgz
-USE_XORG=	xft xmu xt x11 xpm ice
-
-GNU_CONFIGURE=	yes
-
-CPE_VENDOR=	invisible-island
-
-CONFIGURE_ARGS+=	--with-utempter --enable-narrowproto
-
-CONFLICTS=	x11iraf-[0-9]*
-
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib
-
-ICONVERSION=	1
+LIB_DEPENDS+=	libfontconfig.so:x11-fonts/fontconfig
 
-OPTIONS_DEFINE=	WCHAR LUIT DECTERM PCRE DABBREV 256COLOR SIXEL GNOME LOGGING \
-		SCRNDUMP REGIS TOOLBAR XINERAMA
-OPTIONS_RADIO=	3D
-OPTIONS_RADIO_3D=	XAW3D XAW3DXFT NEXTAW
+USES=			cpe localbase ncurses tar:tgz xorg
+CPE_VENDOR=		invisible-island
+USE_XORG=		ice x11 xext xft xmu xpm xt
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--enable-narrowproto \
+			--with-utempter
+
+CPPFLAGS+=	-DPIXMAP_ROOTDIR=${LOCALBASE}/share/pixmaps
+
+CONFLICTS=	x11iraf
+
+OPTIONS_DEFINE=		256COLOR DABBREV DECTERM GNOME LOGGING LUIT PCRE2 REGIS \
+			SCRNDUMP SIXEL TOOLBAR WCHAR XINERAMA
+OPTIONS_DEFAULT=	256COLOR LUIT SIXEL WCHAR XAW
+OPTIONS_SINGLE=		ATHENA
+OPTIONS_SINGLE_ATHENA=	NEXTAW XAW XAW3D XAW3DXFT
 
+256COLOR_DESC=	Enable 256-color support
 DABBREV_DESC=	Enable support for dabbrev-expand
 DECTERM_DESC=	Enable DECterm Locator support
-LUIT_DESC=	Use LUIT for locale conversion from/to UTF-8
-SIXEL_DESC=	Enable Sixel graphics support
-REGIS_DESC=	Enable ReGIS graphics support
-WCHAR_DESC=	Enable wide-character support
-256COLOR_DESC=	Enable 256-color support
 LOGGING_DESC=	Enable logging terminal I/O to a file
-XAW3D_DESC=	Link with Xaw 3d library
-XAW3DXFT_DESC=	Link with Xaw 3d xft (extended fonts) library
+LUIT_DESC=	Use LUIT for locale convertion from/to UTF-8
 NEXTAW_DESC=	Link with neXT Athena library
+PCRE2_DESC=	${PCRE_DESC} version 2
+REGIS_DESC=	Enable ReGIS graphics support
 SCRNDUMP_DESC=	Enable XHTML and SVG screen dumps
+SIXEL_DESC=	Enable Sixel graphics support
 TOOLBAR_DESC=	Enable pulldown menus with a toolbar
-
-OPTIONS_DEFAULT=WCHAR LUIT 256COLOR
+WCHAR_DESC=	Enable wide-character support
+XAW3DXFT_DESC=	Link with Xaw 3d xft (extended fonts) library
+XAW3D_DESC=	Link with Xaw 3d library
+XAW_DESC=	Link with Xaw library
 
 256COLOR_CONFIGURE_ENABLE=	256-color
-LUIT_BUILD_DEPENDS=		luit:x11/luit
-LUIT_CONFIGURE_ENABLE=		luit
-LUIT_IMPLIES=			WCHAR
-WCHAR_CONFIGURE_ENABLE=		wide-chars
-WCHAR_VARS=			PKGMESSAGE="${PKGDIR}/pkg-message.wchar"
-DECTERM_CONFIGURE_ENABLE=	dec-locator
-PCRE_CONFIGURE_WITH=		pcre
-PCRE_LIB_DEPENDS=		libpcre.so:devel/pcre
 DABBREV_CONFIGURE_ENABLE=	dabbrev
-SIXEL_CONFIGURE_ENABLE=		sixel-graphics
-REGIS_CONFIGURE_ENABLE=		regis-graphics
+DECTERM_CONFIGURE_ENABLE=	dec-locator
 GNOME_USES=			desktop-file-utils
 LOGGING_CONFIGURE_ENABLE=	logging
-SCRNDUMP_CONFIGURE_ENABLE=	screen-dumps
-XAW3D_CONFIGURE_WITH=		Xaw3d
-XAW3D_LIB_DEPENDS=		libXaw3d.so:x11-toolkits/Xaw3d
-XAW3DXFT_CONFIGURE_WITH=	Xaw3dxft
-XAW3DXFT_LIB_DEPENDS=		libXaw3dxft.so:x11-toolkits/libxaw3dxft
-NEXTAW_CONFIGURE_WITH=		neXtaw
+LUIT_IMPLIES=			WCHAR
+LUIT_BUILD_DEPENDS=		luit:x11/luit
+LUIT_RUN_DEPENDS=		luit:x11/luit
+LUIT_CONFIGURE_ENABLE=		luit
 NEXTAW_LIB_DEPENDS=		libneXtaw.so:x11-toolkits/neXtaw
+NEXTAW_CONFIGURE_WITH=		neXtaw
+PCRE2_LIB_DEPENDS=		libpcre2-8.so:devel/pcre2
+PCRE2_CONFIGURE_WITH=		pcre2
+REGIS_CONFIGURE_ENABLE=		regis-graphics
+SCRNDUMP_CONFIGURE_ENABLE=	screen-dumps
+SIXEL_CONFIGURE_ENABLE=		sixel-graphics
 TOOLBAR_CONFIGURE_ENABLE=	toolbar
 WCHAR_LIB_DEPENDS=		libfreetype.so:print/freetype2
+WCHAR_CONFIGURE_ENABLE=		wide-chars
+WCHAR_VARS=			PKGMESSAGE="${PKGDIR}/pkg-message.wchar"
+XAW3DXFT_LIB_DEPENDS=		libXaw3dxft.so:x11-toolkits/libxaw3dxft
+XAW3DXFT_CONFIGURE_WITH=	Xaw3dxft
+XAW3D_LIB_DEPENDS=		libXaw3d.so:x11-toolkits/Xaw3d
+XAW3D_CONFIGURE_WITH=		Xaw3d
+XAW_USE=			XORG=xaw
 XINERAMA_USE=			XORG=xinerama,xorgproto
 XINERAMA_CONFIGURE_OFF=		--without-xinerama
 
 PKG_CLASS=	XTermDev
-LIB_DEPENDS+=	libfontconfig.so:x11-fonts/fontconfig
 
 .include <bsd.port.options.mk>
 
@@ -94,9 +93,11 @@
 USE_XORG+=	xaw
 .endif
 
+#ICONVERSION=	1
+#
 #post-extract:
-#	@${CP} ${WRKDIR}/bsd-xterm-icons-1/*.png \
-#		${WRKDIR}/bsd-xterm-icons-1/*.xpm \
+#	@${CP} ${WRKDIR}/bsd-xterm-icons-${ICONVERSION}/*.png \
+#		${WRKDIR}/bsd-xterm-icons-${ICONVERSION}/*.xpm \
 #			${WRKSRC}/icons/
 
 post-install:
Index: package/freebsd/distinfo
--- xterm-395+/package/freebsd/distinfo	2020-07-05 23:16:38.000000000 +0000
+++ xterm-396/package/freebsd/distinfo	2024-12-02 08:55:32.000000000 +0000
@@ -1,3 +1,5 @@
-TIMESTAMP = 1593990998
-SHA256 (xterm-357.tgz) = a2fbe692f7d9324f6db8820ace7ec4696e838d3053edb45d13801fd684dabdc3
-SIZE (xterm-357.tgz) = 1422256
+TIMESTAMP = 1733129732
+SHA256 (xterm-396.tgz) = a1f6be14857a31c87722605ff7b4e7c8bb82ff4dce859abac85c085548e87153
+SIZE (xterm-396.tgz) = 1585022
+SHA256 (bsd-xterm-icons-1.tgz) = fcf51dce0e23e9911a16ed7f2ce835bb6ff2ada65f023c29fdd8abda2795bf7c
+SIZE (bsd-xterm-icons-1.tgz) = 22718
Index: package/freebsd/pkg-descr
--- xterm-395+/package/freebsd/pkg-descr	2019-02-06 01:39:06.000000000 +0000
+++ xterm-396/package/freebsd/pkg-descr	2022-09-07 21:30:14.000000000 +0000
@@ -6,5 +6,3 @@
 signal in systems derived from 4.3bsd), xterm will use the
 facilities to notify programs running in the window whenever it
 is resized.
-
-WWW: https://invisible-island.net/xterm/
Index: package/freebsd/pkg-message.wchar
--- xterm-395+/package/freebsd/pkg-message.wchar	2015-10-07 01:36:53.000000000 +0000
+++ xterm-396/package/freebsd/pkg-message.wchar	2019-08-14 12:25:52.000000000 +0000
@@ -1,4 +1,6 @@
-================================================================================
+[
+{ type: install
+  message: <<EOM
 You installed xterm with wide chars support. This introduces some limitations
 comparing to the plain single chars version: this version of xterm will use
 UTF-8 charset for selection buffers, breaking 8-bit copy/paste support unless
@@ -7,4 +9,6 @@
 
 For further information refer to the SELECT/PASTE section of xterm(1) manual
 page.
-================================================================================
+EOM
+}
+]
Index: package/freebsd/pkg-plist
--- xterm-395+/package/freebsd/pkg-plist	2014-07-25 23:39:51.000000000 +0000
+++ xterm-396/package/freebsd/pkg-plist	2024-12-03 00:47:50.000000000 +0000
@@ -8,16 +8,20 @@
 lib/X11/app-defaults/UXTermDev-color
 lib/X11/app-defaults/XTermDev
 lib/X11/app-defaults/XTermDev-color
-man/man1/resize-dev.1.gz
-man/man1/koi8rxterm-dev.1.gz
-man/man1/uxterm-dev.1.gz
-man/man1/xterm-dev.1.gz
+share/man/man1/resize-dev.1.gz
+share/man/man1/koi8rxterm-dev.1.gz
+share/man/man1/uxterm-dev.1.gz
+share/man/man1/xterm-dev.1.gz
 share/applications/xterm-dev.desktop
+share/pixmaps/filled-xterm-dev_16x16.xpm
 share/pixmaps/filled-xterm-dev_32x32.xpm
 share/pixmaps/filled-xterm-dev_48x48.xpm
+share/pixmaps/mini.xterm-dev_16x16.xpm
 share/pixmaps/mini.xterm-dev_32x32.xpm
 share/pixmaps/mini.xterm-dev_48x48.xpm
+share/pixmaps/xterm-dev-color_16x16.xpm
 share/pixmaps/xterm-dev-color_32x32.xpm
 share/pixmaps/xterm-dev-color_48x48.xpm
+share/pixmaps/xterm-dev_16x16.xpm
 share/pixmaps/xterm-dev_32x32.xpm
 share/pixmaps/xterm-dev_48x48.xpm
Index: package/pkgsrc/Makefile
--- xterm-395+/package/pkgsrc/Makefile	2024-09-11 07:48:16.000000000 +0000
+++ xterm-396/package/pkgsrc/Makefile	2024-12-02 09:10:48.000000000 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.117 2018/03/12 11:18:00 wiz Exp $
+# $NetBSD: Makefile,v 1.156 2024/10/27 05:42:46 pin Exp $
 
-DISTNAME=	xterm-395
-PKGREVISION=	1
+DISTNAME=	xterm-396
 CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.invisible-island.net/xterm/
+MASTER_SITES=	https://invisible-island.net/archives/xterm/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -21,11 +20,11 @@
 CONFIGURE_ARGS+=	--enable-paste64
 CONFIGURE_ARGS+=	--enable-readline-mouse
 
-CONFIGURE_ARGS.standard=# empty
-CONFIGURE_ARGS.3d=	--with-Xaw3d
-CONFIGURE_ARGS.xpm=	--with-Xaw3d
-CONFIGURE_ARGS.neXtaw=	--with-neXtaw
-CONFIGURE_ARGS+=	${${CONFIGURE_ARGS.${XAW_TYPE}}:L}
+CONFIGURE_ARGS.standard=	# empty
+CONFIGURE_ARGS.3d=		--with-Xaw3d
+CONFIGURE_ARGS.xpm=		--with-Xaw3d
+CONFIGURE_ARGS.neXtaw=		--with-neXtaw
+CONFIGURE_ARGS+=		${${CONFIGURE_ARGS.${XAW_TYPE}}:L}
 
 INSTALLATION_DIRS=	share/applications
 
Index: package/pkgsrc/PLIST
--- xterm-395+/package/pkgsrc/PLIST	2012-10-10 13:50:56.000000000 +0000
+++ xterm-396/package/pkgsrc/PLIST	2023-06-05 15:52:19.000000000 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2012/10/10 13:50:56 wiz Exp $
+@comment $NetBSD: PLIST,v 1.10 2023/06/05 15:52:19 wiz Exp $
 bin/koi8rxterm
 bin/resize
 bin/uxterm
@@ -15,11 +15,15 @@
 man/man1/xterm.1
 share/applications/uxterm.desktop
 share/applications/xterm.desktop
+share/pixmaps/filled-xterm_16x16.xpm
 share/pixmaps/filled-xterm_32x32.xpm
 share/pixmaps/filled-xterm_48x48.xpm
+share/pixmaps/mini.xterm_16x16.xpm
 share/pixmaps/mini.xterm_32x32.xpm
 share/pixmaps/mini.xterm_48x48.xpm
+share/pixmaps/xterm-color_16x16.xpm
 share/pixmaps/xterm-color_32x32.xpm
 share/pixmaps/xterm-color_48x48.xpm
+share/pixmaps/xterm_16x16.xpm
 share/pixmaps/xterm_32x32.xpm
 share/pixmaps/xterm_48x48.xpm
Index: package/pkgsrc/distinfo
--- xterm-395+/package/pkgsrc/distinfo	2019-09-22 22:03:13.000000000 +0000
+++ xterm-396/package/pkgsrc/distinfo	2024-12-02 09:12:00.000000000 +0000
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.82 2017/07/04 08:52:38 wiz Exp $
+$NetBSD: distinfo,v 1.115 2024/10/27 05:42:46 pin Exp $
 
-SHA1 (xterm-349.tgz) = fd4f1029148dac5a2b23de87330ba6599cf6b21e
-RMD160 (xterm-349.tgz) = b419e56c1391fa2d582a0c9f5c1dae9965f90ba7
-SHA512 (xterm-349.tgz) = a93b35a9086bd33685ac6b8a030b43287978e769c6d446faeedeeaec8789c5fb173deab10e85ee8b800c22026bfdf8f5143afad309c327710c25832e02404715
-Size (xterm-349.tgz) = 1381954 bytes
+BLAKE2s (xterm-396.tgz) = 55bc016e4003c2b09435f7624686a5ed1511581e18bdc5a6df2a507cd88c7c8e
+SHA512 (xterm-396.tgz) = 49b89222e15423e7ca4058a77cb81677282f1c4a3e754abb3191808878777f6f23d16b4dc5760486531054673722c333a4025fefbee73963e82a4f9bb57c4d57
+Size (xterm-396.tgz) = 1585022 bytes
Index: package/pkgsrc/options.mk
--- xterm-395+/package/pkgsrc/options.mk	2013-07-11 11:44:07.000000000 +0000
+++ xterm-396/package/pkgsrc/options.mk	2019-11-03 09:14:21.000000000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.14 2013/07/11 11:44:07 wiz Exp $
+# $NetBSD: options.mk,v 1.15 2019/11/03 09:14:21 rillig Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.xterm
 PKG_SUPPORTED_OPTIONS=		debug pcre freetype luit xpm xterm-toolbar
@@ -32,7 +32,7 @@
 .endif
 
 .if !empty(PKG_OPTIONS:Mluit)
-DEPENDS+=	luit-[0-9]*:../../x11/luit
+DEPENDS+=		luit-[0-9]*:../../x11/luit
 CONFIGURE_ARGS+=	--enable-luit --enable-mini-luit
 .else
 CONFIGURE_ARGS+=	--disable-luit --disable-mini-luit
Index: package/xterm.spec
--- xterm-395+/package/xterm.spec	2024-09-11 07:48:16.000000000 +0000
+++ xterm-396/package/xterm.spec	2024-12-03 00:06:25.000000000 +0000
@@ -1,11 +1,11 @@
-# $XTermId: xterm.spec,v 1.174 2024/09/11 07:48:16 tom Exp $
+# $XTermId: xterm.spec,v 1.177 2024/12/03 00:06:25 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: 395
+Version: 396
 Release: 1
 License: X11
 Group: User Interface/X
@@ -13,6 +13,37 @@
 URL: https://invisible-island.net/xterm/
 Provides: x-terminal-emulator >= %{version}
 
+# Using "find-xterm-fonts" gives these package names:
+#
+# fedora:
+#     xorg-x11-fonts-misc
+# mageia:
+#     x11-font-adobe-75dpi
+#     x11-font-misc-misc
+# opensuse:
+#     efont-unicode-bitmap-fonts
+#     xorg-x11-fonts-core
+#     xorg-x11-fonts-legacy
+
+# Library dependencies (chiefly Xft and Xpm) are similar across my test
+# machines for mageia/fedora/opensuse, but package names vary:
+#
+# fedora:
+#     libXft            libXft-devel
+#     libXpm            libXpm-devel
+#     libutempter       libutempter-devel
+#     ncurses-libs      ncurses-devel
+# mageia
+#     lib64xft2         lib64xft-devel
+#     lib64xpm4         lib64xpm-devel
+#     lib64utempter0    lib64utempter-devel
+#     lib64ncurses6     lib64ncurses-devel
+# opensuse
+#     libXft2           libXft-devel
+#     libXpm4           libXpm-devel
+#     libutempter0      utempter-devel
+#     libncurses6       ncurses-devel
+
 # This part (the build-requires) would be useful if the various distributions
 # had provided stable package-naming, or virtual packages to cover transitions. 
 # However, they have not done this in the past.
Index: precompose.c
--- xterm-395+/precompose.c	2016-05-22 13:26:20.000000000 +0000
+++ xterm-396/precompose.c	2024-12-01 23:52:36.000000000 +0000
@@ -4,14 +4,14 @@
  * DO NOT EDIT BY HAND! This is generated by the script
  * unicode/make-precompose.sh
  */
-/* $XTermId: precompose.c,v 1.11 2016/05/22 13:26:20 tom Exp $ */
+/* $XTermId: precompose.c,v 1.12 2024/12/01 23:52:36 tom Exp $ */
 
 #include <precompose.h>
 
 static struct {
   int replacement;
   int base;
-  int comb; 
+  int comb;
 } precompositions[] = {
 { 0x226E, 0x003C, 0x0338},
 { 0x2260, 0x003D, 0x0338},
Index: print.c
--- xterm-395+/print.c	2024-09-30 08:11:40.000000000 +0000
+++ xterm-396/print.c	2024-12-01 20:10:04.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: print.c,v 1.178 2024/09/30 08:11:40 tom Exp $ */
+/* $XTermId: print.c,v 1.179 2024/12/01 20:10:04 tom Exp $ */
 
 /*
  * Copyright 1997-2023,2024 by Thomas E. Dickey
@@ -81,10 +81,10 @@
 closePrinter(XtermWidget xw)
 {
     TScreen *screen = TScreenOf(xw);
-    if (SPS.fp != 0) {
+    if (SPS.fp != NULL) {
 	if (SPS.toFile) {
 	    fclose(SPS.fp);
-	    SPS.fp = 0;
+	    SPS.fp = NULL;
 	} else if (xtermHasPrinter(xw) != 0) {
 
 	    DEBUG_MSG("closePrinter\n");
@@ -93,7 +93,7 @@
 	    while (nonblocking_wait() > 0) {
 		;
 	    }
-	    SPS.fp = 0;
+	    SPS.fp = NULL;
 	    SPS.isOpen = False;
 	    TRACE(("closed printer\n"));
 	    DEBUG_MSG("...closePrinter (done)\n");
@@ -107,7 +107,7 @@
     TScreen *screen = TScreenOf(xw);
 
     TRACE(("printCursorLine\n"));
-    printLine(xw, screen->cur_row, '\n', getPrinterFlags(xw, NULL, 0));
+    printLine(xw, screen->cur_row, '\n', getPrinterFlags(xw, NULL, NULL));
 }
 
 /*
@@ -133,7 +133,7 @@
 #endif
 
     ld = getLineData(screen, inx);
-    if (ld == 0)
+    if (ld == NULL)
 	return;
 
     TRACE(("printLine(row=%d/%d, top=%d:%d, chr=%d):%s\n",
@@ -346,7 +346,7 @@
 send_CharSet(XtermWidget xw, LineData *ld)
 {
 #if OPT_DEC_CHRSET
-    const char *msg = 0;
+    const char *msg = NULL;
 
     switch (GetLineDblCS(ld)) {
     case CSET_SWL:
@@ -362,7 +362,7 @@
 	msg = "\033#6";
 	break;
     }
-    if (msg != 0)
+    if (msg != NULL)
 	stringToPrinter(xw, msg);
 #else
     (void) xw;
@@ -443,10 +443,10 @@
 			exit(ERROR_MISC);
 
 		    SPS.fp = popen(SPS.printer_command, "w");
-		    if (SPS.fp != 0) {
+		    if (SPS.fp != NULL) {
 			FILE *input;
 			DEBUG_MSG("charToPrinter: opened pipe to printer\n");
-			if ((input = fdopen(my_pipe[0], "r")) != 0) {
+			if ((input = fdopen(my_pipe[0], "r")) != NULL) {
 			    clearerr(input);
 
 			    for (;;) {
@@ -475,7 +475,7 @@
 		    exit(0);
 		} else {
 		    close(my_pipe[0]);	/* won't read from printer */
-		    if ((SPS.fp = fdopen(my_pipe[1], "w")) != 0) {
+		    if ((SPS.fp = fdopen(my_pipe[1], "w")) != NULL) {
 			DEBUG_MSG("charToPrinter: opened printer in parent\n");
 			TRACE(("opened printer from pid %d/%d\n",
 			       (int) getpid(), (int) my_pid));
@@ -493,7 +493,7 @@
 	}
 	SPS.isOpen = True;
     }
-    if (SPS.fp != 0) {
+    if (SPS.fp != NULL) {
 #if OPT_WIDE_CHARS
 	if (chr > 127) {
 	    Char temp[10];
@@ -545,18 +545,18 @@
 	    break;
 	case 10:		/* VT320 */
 	    /* print whole screen, across sessions */
-	    xtermPrintScreen(xw, False, getPrinterFlags(xw, NULL, 0));
+	    xtermPrintScreen(xw, False, getPrinterFlags(xw, NULL, NULL));
 	    break;
 	case 11:		/* VT320 */
 	    /* print all pages in current session */
-	    xtermPrintEverything(xw, getPrinterFlags(xw, NULL, 0));
+	    xtermPrintEverything(xw, getPrinterFlags(xw, NULL, NULL));
 	    break;
 	}
     } else {
 	switch (param) {
 	case -1:
 	case 0:
-	    xtermPrintScreen(xw, True, getPrinterFlags(xw, NULL, 0));
+	    xtermPrintScreen(xw, True, getPrinterFlags(xw, NULL, NULL));
 	    break;
 	case 4:
 	    setPrinterControlMode(xw, 0);	/* printer controller mode off */
@@ -589,8 +589,8 @@
 
     if (SPS.printer_controlmode == 1) {
 	TRACE(("AutoPrint %d\n", chr));
-	printLine(xw, screen->cursorp.row, chr, getPrinterFlags(xw, NULL, 0));
-	if (SPS.fp != 0)
+	printLine(xw, screen->cursorp.row, chr, getPrinterFlags(xw, NULL, NULL));
+	if (SPS.fp != NULL)
 	    fflush(SPS.fp);
     }
 }
@@ -689,7 +689,7 @@
 	if (argv) {
 	    if (argv[0]) {
 		char *myShell = xtermFindShell(argv[0], False);
-		if (myShell == 0) {
+		if (myShell == NULL) {
 		    xtermWarning("No program found for printerCommand: %s\n", SPS.printer_command);
 		    SPS.printer_command = x_strdup("");
 		} else {
@@ -773,7 +773,7 @@
     result->print_attributes = SPS.print_attributes;
     result->print_everything = SPS.print_everything;
 
-    if (param_count != 0 && *param_count != 0) {
+    if (param_count != NULL && *param_count != 0) {
 	Cardinal j;
 	unsigned k;
 	for (j = 0; j < *param_count; ++j) {
@@ -805,11 +805,11 @@
     PrinterState save_state = screen->printer_state;
     char *my_filename = malloc(TIMESTAMP_LEN + strlen(filename));
 
-    if (my_filename != 0) {
+    if (my_filename != NULL) {
 	mode_t save_umask = umask(0177);
 
 	timestamp_filename(my_filename, filename);
-	SPS.fp = 0;
+	SPS.fp = NULL;
 	SPS.isOpen = False;
 	SPS.toFile = True;
 	SPS.printer_command = my_filename;
@@ -818,7 +818,7 @@
 	SPS.printer_newline = True;
 	SPS.print_attributes = attrs;
 	SPS.print_everything = opts;
-	xtermPrintEverything(xw, getPrinterFlags(xw, NULL, 0));
+	xtermPrintEverything(xw, getPrinterFlags(xw, NULL, NULL));
 
 	umask(save_umask);
 	screen->printer_state = save_state;
Index: ptydata.c
--- xterm-395+/ptydata.c	2024-09-30 07:55:25.000000000 +0000
+++ xterm-396/ptydata.c	2024-12-01 23:48:07.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: ptydata.c,v 1.161 2024/09/30 07:55:25 tom Exp $ */
+/* $XTermId: ptydata.c,v 1.163 2024/12/01 23:48:07 tom Exp $ */
 
 /*
  * Copyright 1999-2023,2024 by Thomas E. Dickey
@@ -624,7 +624,7 @@
 void
 noleaks_ptydata(void)
 {
-    if (VTbuffer != 0) {
+    if (VTbuffer != NULL) {
 #if OPT_WIDE_CHARS
 	free(VTbuffer->write_buf);
 #endif
@@ -775,10 +775,10 @@
     memset(bucket, 0, sizeof(bucket));
     for (c_in = 0; c_in < limit; ++c_in) {
 	memset(buffer, 0, sizeof(buffer));
-	if ((result = convertToUTF8(buffer, c_in)) == 0) {
+	if ((result = convertToUTF8(buffer, c_in)) == NULL) {
 	    TRACE(("conversion of U+%04X to UTF-8 failed\n", c_in));
 	} else {
-	    if ((result = convertFromUTF8(buffer, &c_out)) == 0) {
+	    if ((result = convertFromUTF8(buffer, &c_out)) == NULL) {
 		TRACE(("conversion of U+%04X from UTF-8 failed\n", c_in));
 	    } else if (c_in != c_out) {
 		TRACE(("conversion of U+%04X to/from UTF-8 gave U+%04X\n",
@@ -906,10 +906,10 @@
 		Char *result;
 
 		memset(buffer, 0, sizeof(buffer));
-		if ((result = next = convertToUTF8(buffer, c_in)) == 0) {
+		if ((result = next = convertToUTF8(buffer, c_in)) == NULL) {
 		    fprintf(stderr,
 			    "conversion of U+%04X to UTF-8 failed\n", c_in);
-		} else if ((result = convertFromUTF8(buffer, &c_out)) == 0) {
+		} else if ((result = convertFromUTF8(buffer, &c_out)) == NULL) {
 		    fprintf(stderr,
 			    "conversion of U+%04X from UTF-8 failed\n", c_in);
 		    total_errs++;
Index: ptyx.h
--- xterm-395+/ptyx.h	2024-09-30 08:03:20.000000000 +0000
+++ xterm-396/ptyx.h	2024-12-01 19:28:23.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: ptyx.h,v 1.1130 2024/09/30 08:03:20 tom Exp $ */
+/* $XTermId: ptyx.h,v 1.1133 2024/12/01 19:28:23 tom Exp $ */
 
 /*
  * Copyright 1999-2023,2024 by Thomas E. Dickey
@@ -315,7 +315,7 @@
 typedef Char *UString;
 #endif
 
-#define IsEmpty(s) ((s) == 0 || *(s) == '\0')
+#define IsEmpty(s) ((s) == NULL || *(s) == '\0')
 #define IsSpace(c) ((c) == ' ' || (c) == '\t' || (c) == '\r' || (c) == '\n')
 
 /*
@@ -323,7 +323,7 @@
  * "PartS2L" when more data may follow in the string.
  */
 #define FullS2L(s,d) (PartS2L(s,d) && (*(d) == '\0'))
-#define PartS2L(s,d) (isdigit(CharOf(*(s))) && (d) != (s) && (d) != 0)
+#define PartS2L(s,d) (isdigit(CharOf(*(s))) && (d) != (s) && (d) != NULL)
 
 #define CASETYPE(name) case name: result = #name; break
 
@@ -995,13 +995,21 @@
     tmSetBase16 = 1		/* set title using hex-string */
     , tmGetBase16 = 2		/* get title using hex-string */
 #if OPT_WIDE_CHARS
+#define MAX_TITLEMODE 3
     , tmSetUtf8 = 4		/* like utf8Title, but controllable */
     , tmGetUtf8 = 8		/* retrieve title encoded as UTF-8 */
+#else
+#define MAX_TITLEMODE 1
 #endif
 } TitleModes;
 
+#define ValidTitleMode(code) ((code) >= 0 && (code) <= MAX_TITLEMODE)
 #define IsTitleMode(xw,mode) (((xw)->screen.title_modes & mode) != 0)
 
+#define IsSetUtf8Title(xw) (IsTitleMode(xw, tmSetUtf8) \
+			 || ((xw)->screen.utf8_title) \
+			 || ((xw)->screen.c1_printable))
+
 #include <xcharmouse.h>
 
 /*
@@ -1823,7 +1831,7 @@
 #define isSameCColor(p,q)	((p) == (q))
 #endif
 
-#define BITS2MASK(b)		((1 << b) - 1)
+#define BITS2MASK(b)		(xBIT(b) - 1)
 
 #define COLOR_MASK		BITS2MASK(COLOR_BITS)
 
@@ -3716,7 +3724,7 @@
 
 #endif /* NO_ACTIVE_ICON */
 
-#define okFont(font) ((font) != 0 && (font)->fid != 0)
+#define okFont(font) ((font) != NULL && (font)->fid != 0)
 
 /*
  * Macro to check if we are iconified; do not use render for that case.
Index: resize.c
--- xterm-395+/resize.c	2024-09-30 08:11:57.000000000 +0000
+++ xterm-396/resize.c	2024-12-01 20:21:19.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: resize.c,v 1.152 2024/09/30 08:11:57 tom Exp $ */
+/* $XTermId: resize.c,v 1.153 2024/12/01 20:21:19 tom Exp $ */
 
 /*
  * Copyright 2003-2023,2024 by Thomas E. Dickey
@@ -142,18 +142,18 @@
 #if defined(USE_STRUCT_WINSIZE)
 static const char *const getwsize[EMULATIONS] =
 {				/* size in pixels */
-    0,
+    NULL,
     ESCAPE("[14t"),
 };
 #endif /* USE_STRUCT_WINSIZE */
 static const char *const restore[EMULATIONS] =
 {
     ESCAPE("8"),
-    0,
+    NULL,
 };
 static const char *const setsize[EMULATIONS] =
 {
-    0,
+    NULL,
     ESCAPE("[8;%s;%st"),
 };
 
@@ -182,7 +182,7 @@
 #if defined(USE_STRUCT_WINSIZE)
 static const char *wsize[EMULATIONS] =
 {
-    0,
+    NULL,
     ESCAPE("[4;%hd;%hdt"),
 };
 #endif /* USE_STRUCT_WINSIZE */
@@ -459,7 +459,7 @@
     }
 #endif /* USE_TERMCAP */
 #ifdef USE_TERMINFO
-    if (x_getenv("TERM") == 0) {
+    if (x_getenv("TERM") == NULL) {
 	if (SHELL_BOURNE == shell_type) {
 	    setname = "TERM=" DFT_TERMTYPE ";\nexport TERM;\n";
 	} else {
@@ -513,7 +513,7 @@
 				   strlen(argv[0]) +
 				   strlen(argv[1]) +
 				   1);
-	if (tmpbuf == 0) {
+	if (tmpbuf == NULL) {
 	    fprintf(stderr, "%s: Cannot query size\n", myname);
 	    onintr(0);
 	} else {
Index: screen.c
--- xterm-395+/screen.c	2024-09-01 19:16:42.000000000 +0000
+++ xterm-396/screen.c	2024-12-01 20:14:26.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: screen.c,v 1.652 2024/09/01 19:16:42 tom Exp $ */
+/* $XTermId: screen.c,v 1.655 2024/12/01 20:14:26 tom Exp $ */
 
 /*
  * Copyright 1999-2023,2024 by Thomas E. Dickey
@@ -290,7 +290,7 @@
     (void) screen;
     AddStatusLineRows(nrow);
     result = (ScrnPtr *) calloc((size_t) nrow, (size_t) size);
-    if (result == 0)
+    if (result == NULL)
 	SysError(ERROR_SCALLOC);
 
     TRACE(("allocScrnHead %d -> %d -> %p..%p\n", nrow, nrow * size,
@@ -345,7 +345,7 @@
 Char *
 allocScrnData(TScreen *screen, unsigned nrow, unsigned ncol, Bool bottom)
 {
-    Char *result = 0;
+    Char *result = NULL;
     size_t length;
 
     AlignValue(ncol);
@@ -354,7 +354,7 @@
     }
     length = (nrow * sizeofScrnRow(screen, ncol));
     if (length == 0
-	|| (result = (Char *) calloc(length, sizeof(Char))) == 0)
+	|| (result = (Char *) calloc(length, sizeof(Char))) == NULL)
 	  SysError(ERROR_SCALLOC2);
 
     TRACE(("allocScrnData %ux%u -> %lu -> %p..%p\n",
@@ -379,7 +379,7 @@
 allocScrnBuf(XtermWidget xw, unsigned nrow, unsigned ncol, Char **addr)
 {
     TScreen *screen = TScreenOf(xw);
-    ScrnBuf base = 0;
+    ScrnBuf base = NULL;
 
     if (nrow != 0) {
 	base = allocScrnHead(screen, nrow);
@@ -602,7 +602,7 @@
 {
     TScreen *screen = TScreenOf(xw);
 
-    if (screen->savelines > 0 && screen->saveBuf_index != 0) {
+    if (screen->savelines > 0 && screen->saveBuf_index != NULL) {
 	ScrnBuf newBufHead;
 	LineData *dstPtrs;
 	LineData *srcPtrs;
@@ -1116,7 +1116,7 @@
  * lines.  Check the pointer that's sure to work.
  */
 
-#define OkAllocBuf(screen) (screen->editBuf_index[0] != 0)
+#define OkAllocBuf(screen) (screen->editBuf_index[0] != NULL)
 
 void
 ScrnAllocBuf(XtermWidget xw)
@@ -1134,7 +1134,7 @@
 	    screen->saveBuf_index = allocScrnHead(screen,
 						  (unsigned) (screen->savelines));
 	} else {
-	    screen->saveBuf_index = 0;
+	    screen->saveBuf_index = NULL;
 	}
 	screen->editBuf_index[0] = allocScrnBuf(xw,
 						(unsigned) nrows,
@@ -1156,7 +1156,7 @@
 	else
 	    screen->save_ptr = (ScrnPtr *) malloc(result);
 	screen->save_len = len;
-	if (screen->save_ptr == 0)
+	if (screen->save_ptr == NULL)
 	    SysError(ERROR_SAVE_PTR);
     }
     TRACE2(("ScrnPointers %ld ->%p\n", (long) len, screen->save_ptr));
@@ -1238,7 +1238,7 @@
 	/* we shouldn't be editing the saveBuf, only scroll into it */
 	assert(last >= screen->savelines);
 
-	if (sb != 0) {
+	if (sb != NULL) {
 	    /* copy lines from editBuf to saveBuf (allocating as we go...) */
 	    saveEditBufLines(screen, n);
 	}
@@ -1280,7 +1280,6 @@
     int last = ScrnRightMargin(xw);
     int row = screen->cur_row;
     int col = screen->cur_col;
-    int j;
     LineData *ld;
 
     if (col < first || col > last) {
@@ -1308,7 +1307,9 @@
 	}
     });
 
-    if ((ld = getLineData(screen, row)) != 0) {
+    if ((ld = getLineData(screen, row)) != NULL) {
+	int j;
+
 	MemMove(ld->charData);
 	MemMove(ld->attribs);
 
@@ -1342,7 +1343,6 @@
     int last = ScrnRightMargin(xw) + 1;
     int row = screen->cur_row;
     int col = screen->cur_col;
-    int j;
     LineData *ld;
 
     if (col < first || col > last) {
@@ -1366,7 +1366,9 @@
 	    ClearCells(xw, 0, (unsigned) (kr - kl + 1), row, kl);
     });
 
-    if ((ld = getLineData(screen, row)) != 0) {
+    if ((ld = getLineData(screen, row)) != NULL) {
+	int j;
+
 	MemMove(ld->charData);
 	MemMove(ld->attribs);
 
@@ -1507,7 +1509,7 @@
 
     for (row = toprow; row <= maxrow; y += FontHeight(screen), row++) {
 #if OPT_ISO_COLORS
-	CellColor *fb = 0;
+	CellColor *fb = NULL;
 #define ColorOf(col) (fb ? fb[col] : initCColor)
 #endif
 #if OPT_WIDE_CHARS
@@ -1545,9 +1547,9 @@
 	TRACE2(("ScrnRefresh row=%d lastind=%d ->%d\n",
 		row, lastind, ROW2INX(screen, lastind)));
 
-	if ((ld = getLineData(screen, ROW2INX(screen, lastind))) == 0
-	    || ld->charData == 0
-	    || ld->attribs == 0) {
+	if ((ld = getLineData(screen, ROW2INX(screen, lastind))) == NULL
+	    || ld->charData == NULL
+	    || ld->attribs == NULL) {
 	    break;
 	}
 
@@ -1740,7 +1742,7 @@
 			    int my_x = LineCursorX(screen, ld, i);
 			    IChar base = chars[i];
 
-			    if ((params.on_wide = isWide((int) base)))
+			    if ((params.on_wide = isWide((int) base)) != 0)
 				my_x = LineCursorX(screen, ld, i - 1);
 
 			    if (com_off[i] != 0)
@@ -1815,7 +1817,7 @@
 		    int my_x = LineCursorX(screen, ld, i);
 		    int base = (int) chars[i];
 
-		    if ((params.on_wide = isWide(base)))
+		    if ((params.on_wide = isWide(base)) != 0)
 			my_x = LineCursorX(screen, ld, i - 1);
 
 		    if (com_off[i] != 0)
@@ -1898,7 +1900,7 @@
     TRACE(("ClearBufRows %d..%d\n", first, last));
     for (row = first; row <= last; row++) {
 	LineData *ld = getLineData(screen, row);
-	if (ld != 0) {
+	if (ld != NULL) {
 	    if_OPT_DEC_CHRSET({
 		/* clearing the whole row resets the doublesize characters */
 		SetLineDblCS(ld, CSET_SWL);
@@ -2114,7 +2116,7 @@
 	     */
 	    if (GravityIsSouthWest(xw)
 		&& delta_rows
-		&& screen->saveBuf_index != 0) {
+		&& screen->saveBuf_index != NULL) {
 
 		if (delta_rows < 0) {
 		    unsigned move_up = (unsigned) (-delta_rows);
@@ -2330,11 +2332,12 @@
 	       int col,
 	       int len)
 {
-    int i;
     Bool found = False;
     LineData *ld = getLineData(screen, row);
 
-    if (ld != 0) {
+    if (ld != NULL) {
+	int i;
+
 	for (i = col; i < len; i++) {
 	    if (ld->charData[i]) {
 		found = True;
@@ -2422,7 +2425,7 @@
 validRect(XtermWidget xw, XTermRect *target)
 {
     TScreen *screen = TScreenOf(xw);
-    Bool result = (target != 0
+    Bool result = (target != NULL
 		   && target->top >= minRectRow(screen)
 		   && target->left >= minRectCol(screen)
 		   && target->top <= target->bottom
@@ -2574,7 +2577,7 @@
 
 	    CellData *cells = newCellData(xw, size);
 
-	    if (cells != 0) {
+	    if (cells != NULL) {
 
 		TRACE(("OK - make copy %dx%d\n", high, wide));
 		target.bottom = target.top + (int) (high - 1);
@@ -2582,7 +2585,7 @@
 
 		for (row = source->top - 1; row < source->bottom; ++row) {
 		    ld = getLineData(screen, row);
-		    if (ld == 0)
+		    if (ld == NULL)
 			continue;
 		    j = (Cardinal) (row - (source->top - 1));
 		    TRACE2(("ROW %d\n", row + 1));
@@ -2595,7 +2598,7 @@
 		}
 		for (row = target.top - 1; row < target.bottom; ++row) {
 		    ld = getLineData(screen, row);
-		    if (ld == 0)
+		    if (ld == NULL)
 			continue;
 		    j = (Cardinal) (row - (target.top - 1));
 		    TRACE2(("ROW %d\n", row + 1));
@@ -2854,7 +2857,6 @@
 		 && (ld->attribs[col] & PROTECTED))
 
     if (validRect(xw, target)) {
-	LineData *ld;
 	int top = target->top - 1;
 	int left = target->left - 1;
 	int right = target->right - 1;
@@ -2866,6 +2868,8 @@
 	int b_right = 0;
 
 	for (row = top; row <= bottom; ++row) {
+	    LineData *ld;
+
 	    TRACE(("wiping %d [%d..%d]\n", row, left, right));
 
 	    ld = getLineData(screen, row);
@@ -2949,7 +2953,7 @@
 	    int ch;
 
 	    ld = getLineData(screen, row);
-	    if (ld == 0)
+	    if (ld == NULL)
 		continue;
 	    for (col = left; col <= right && col < (int) ld->lineSize; ++col) {
 		if (!(ld->attribs[col] & CHARDRAWN)) {
@@ -3010,9 +3014,8 @@
 		if (first || (ch != ' ') || (ld->attribs[col] & DRAWX_MASK)) {
 		    trimmed += ch + embedded;
 		    embedded = 0;
-		} else if (ch == ' ') {
-		    if ((mode & csNOTRIM))
-			embedded += ch;
+		} else if ((mode & csNOTRIM)) {
+		    embedded += ch;
 		}
 		total += ch;
 		if_OPT_WIDE_CHARS(screen, {
@@ -3097,7 +3100,7 @@
     _Xconst char *result;
     switch (mode) {
     default:
-	result = 0;
+	result = NULL;
 	break;
     case 1:
 	result = "_NET_WM_STATE_FULLSCREEN";
Index: scrollback.c
--- xterm-395+/scrollback.c	2022-03-09 00:38:51.000000000 +0000
+++ xterm-396/scrollback.c	2024-12-01 20:27:00.000000000 +0000
@@ -1,7 +1,7 @@
-/* $XTermId: scrollback.c,v 1.23 2022/03/09 00:38:51 tom Exp $ */
+/* $XTermId: scrollback.c,v 1.24 2024/12/01 20:27:00 tom Exp $ */
 
 /*
- * Copyright 2009-2020,2022 by Thomas E. Dickey
+ * Copyright 2009-2022,2024 by Thomas E. Dickey
  *
  *                         All Rights Reserved
  *
@@ -44,7 +44,7 @@
 LineData *
 getScrollback(TScreen *screen, int row)
 {
-    LineData *result = 0;
+    LineData *result = NULL;
 
     if (screen->saved_fifo > 0 && REAL_ROW(screen, row) >= 0) {
 	unsigned which = ROW2FIFO(screen, row);
@@ -64,10 +64,10 @@
 LineData *
 addScrollback(TScreen *screen)
 {
-    ScrnBuf where = 0;
+    ScrnBuf where = NULL;
     unsigned ncols = (unsigned) MaxCols(screen);
 
-    if (screen->saveBuf_index != 0 && screen->savelines != 0) {
+    if (screen->saveBuf_index != NULL && screen->savelines != 0) {
 	unsigned which;
 	Char *block;
 
@@ -84,7 +84,7 @@
 	     * setupLineData uses the attribs as the first address used from the
 	     * data block.
 	     */
-	    if (prior->attribs != 0) {
+	    if (prior->attribs != NULL) {
 		TRACE(("...freeing prior FIFO data in slot %d: %p->%p\n",
 		       which, (void *) prior, (void *) prior->attribs));
 		FreeAndNull(prior->attribs);
@@ -118,7 +118,7 @@
      * setupLineData uses the attribs as the first address used from the
      * data block.
      */
-    if (prior->attribs != 0) {
+    if (prior->attribs != NULL) {
 	TRACE(("...freeing prior FIFO data in slot %d: %p->%p\n",
 	       which, (void *) prior, (void *) prior->attribs));
 	FreeAndNull(prior->attribs);
Index: scrollbar.c
--- xterm-395+/scrollbar.c	2023-11-12 22:08:19.000000000 +0000
+++ xterm-396/scrollbar.c	2024-12-01 20:27:00.000000000 +0000
@@ -1,7 +1,7 @@
-/* $XTermId: scrollbar.c,v 1.215 2023/11/12 22:08:19 tom Exp $ */
+/* $XTermId: scrollbar.c,v 1.216 2024/12/01 20:27:00 tom Exp $ */
 
 /*
- * Copyright 2000-2021,2023 by Thomas E. Dickey
+ * Copyright 2000-2023,2024 by Thomas E. Dickey
  *
  *                         All Rights Reserved
  *
@@ -256,8 +256,8 @@
 
     result = XtCreateWidget("scrollbar", scrollbarWidgetClass,
 			    (Widget) xw, args, XtNumber(args));
-    XtAddCallback(result, XtNscrollProc, ScrollTextUpDownBy, 0);
-    XtAddCallback(result, XtNjumpProc, ScrollTextTo, 0);
+    XtAddCallback(result, XtNscrollProc, ScrollTextUpDownBy, NULL);
+    XtAddCallback(result, XtNjumpProc, ScrollTextTo, NULL);
     return (result);
 }
 
@@ -266,7 +266,7 @@
 {
     XtermWidget xw = getXtermWidget(scrollWidget);
 
-    if (xw != 0) {
+    if (xw != NULL) {
 	SbInfo *sb = &(TScreenOf(xw)->fullVwin.sb_info);
 	Arg args[4];
 	Cardinal nargs = XtNumber(args);
@@ -312,7 +312,7 @@
 {
     TScreen *screen = TScreenOf(xw);
 
-    if (screen->scrollWidget != 0) {
+    if (screen->scrollWidget != NULL) {
 	int thumbTop, thumbHeight, totalHeight;
 
 #if USE_DOUBLE_BUFFER
@@ -345,7 +345,7 @@
 {
     TScreen *screen = TScreenOf(xw);
 
-    if (screen->scrollWidget != 0) {
+    if (screen->scrollWidget != NULL) {
 	int height = screen->fullVwin.height + screen->border * 2;
 	int width = screen->scrollWidget->core.width;
 	int ypos = -ScrollBarBorder(xw);
@@ -465,7 +465,7 @@
 
     TRACE(("ScrollBarOn(init %s)\n", BtoS(init)));
     if (init) {			/* then create it only */
-	if (screen->scrollWidget == 0) {
+	if (screen->scrollWidget == NULL) {
 	    /* make it a dummy size and resize later */
 	    screen->scrollWidget = CreateScrollBar(xw,
 						   -ScrollBarBorder(xw),
@@ -565,7 +565,7 @@
 {
     XtermWidget xw = getXtermWidget(scrollbarWidget);
 
-    if (xw != 0) {
+    if (xw != NULL) {
 	float *topPercent = (float *) call_data;
 	TScreen *screen = TScreenOf(xw);
 	int thumbTop;		/* relative to first saved line */
@@ -591,7 +591,7 @@
 {
     XtermWidget xw = getXtermWidget(scrollbarWidget);
 
-    if (xw != 0) {
+    if (xw != NULL) {
 	long pixels = (long) call_data;
 
 	TScreen *screen = TScreenOf(xw);
@@ -695,7 +695,7 @@
     long result = 0;
     XtermWidget xw;
 
-    if ((xw = getXtermWidget(w)) != 0) {
+    if ((xw = getXtermWidget(w)) != NULL) {
 	TScreen *screen = TScreenOf(xw);
 	if (nparams <= 2
 	    || screen->send_mouse_pos == MOUSE_OFF) {
@@ -711,8 +711,8 @@
     XtermWidget xw;
     TScreen *screen;
 
-    if ((xw = getXtermWidget(w)) != 0 &&
-	(screen = TScreenOf(xw)) != 0 &&
+    if ((xw = getXtermWidget(w)) != NULL &&
+	(screen = TScreenOf(xw)) != NULL &&
 	screen->alternateScroll && screen->whichBuf) {
 	ANSI reply;
 
@@ -746,8 +746,8 @@
     XtermWidget xw;
     TScreen *screen;
 
-    if ((xw = getXtermWidget(w)) != 0 &&
-	(screen = TScreenOf(xw)) != 0 &&
+    if ((xw = getXtermWidget(w)) != NULL &&
+	(screen = TScreenOf(xw)) != NULL &&
 	*nparams > 0) {
 	long amount;
 	int value;
@@ -836,7 +836,7 @@
 			if (xkb->names->vmods[n] != 0) {
 			    char *modStr = XGetAtomName(xkb->dpy,
 							xkb->names->vmods[n]);
-			    if (modStr != 0) {
+			    if (modStr != NULL) {
 				XkbVirtualModsToReal(xkb,
 						     (unsigned) (1 << n),
 						     &mask);
@@ -1013,7 +1013,7 @@
 {
     XtermWidget xw;
 
-    if ((xw = getXtermWidget(w)) != 0) {
+    if ((xw = getXtermWidget(w)) != NULL) {
 	TScreen *screen = TScreenOf(xw);
 
 	if (screen->allowScrollLock) {
Index: svg.c
--- xterm-395+/svg.c	2023-03-31 23:08:13.000000000 +0000
+++ xterm-396/svg.c	2024-12-01 20:27:00.000000000 +0000
@@ -1,7 +1,7 @@
-/* $XTermId: svg.c,v 1.23 2023/03/31 23:08:13 tom Exp $ */
+/* $XTermId: svg.c,v 1.24 2024/12/01 20:27:00 tom Exp $ */
 
 /*
- * Copyright 2017-2021,2023	Thomas E. Dickey
+ * Copyright 2017-2023,2024	Thomas E. Dickey
  * Copyright 2015-2016,2017	Jens Schweikhardt
  *
  * All Rights Reserved
@@ -63,7 +63,7 @@
     TRACE(("xtermDumpSvg...\n"));
     saveLocale = xtermSetLocale(LC_NUMERIC, "C");
     fp = create_printfile(xw, ".svg");
-    if (fp != 0) {
+    if (fp != NULL) {
 	dumpSvgHeader(xw, fp);
 	dumpSvgScreen(xw, fp);
 	dumpSvgFooter(xw, fp);
@@ -128,7 +128,7 @@
     LineData *ld = getLineData(s, inx);
     int col, sal, i;		/* sal: same attribute length */
 
-    if (ld == 0)
+    if (ld == NULL)
 	return;
 
     for (col = 0; col < MaxCols(s); col += sal) {
Index: testxmc.c
--- xterm-395+/testxmc.c	2020-11-08 20:12:21.000000000 +0000
+++ xterm-396/testxmc.c	2024-12-01 20:27:00.000000000 +0000
@@ -1,7 +1,7 @@
-/* $XTermId: testxmc.c,v 1.54 2020/11/08 20:12:21 tom Exp $ */
+/* $XTermId: testxmc.c,v 1.55 2024/12/01 20:27:00 tom Exp $ */
 
 /*
- * Copyright 1997-2019,2020 by Thomas E. Dickey
+ * Copyright 1997-2020,2024 by Thomas E. Dickey
  *
  *                         All Rights Reserved
  *
@@ -99,7 +99,7 @@
     unsigned my_attrs = CharOf(screen->xmc_attributes & XMC_FLAGS);
     unsigned whichone = 0;
 
-    if (glitch == 0) {
+    if (glitch == NULL) {
 	unsigned len = screen->xmc_glitch;
 	glitch = TypeMallocN(IChar, len);
 	if (glitch == NULL) {
Index: trace.c
--- xterm-395+/trace.c	2024-09-30 07:36:29.000000000 +0000
+++ xterm-396/trace.c	2024-12-01 20:23:01.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: trace.c,v 1.243 2024/09/30 07:36:29 tom Exp $ */
+/* $XTermId: trace.c,v 1.244 2024/12/01 20:23:01 tom Exp $ */
 
 /*
  * Copyright 1997-2023,2024 by Thomas E. Dickey
@@ -81,10 +81,10 @@
 {
     static const char *trace_out;
 
-    if (trace_fp != 0
+    if (trace_fp != NULL
 	&& trace_who != trace_out) {
 	fclose(trace_fp);
-	trace_fp = 0;
+	trace_fp = NULL;
     }
     trace_out = trace_who;
 
@@ -118,7 +118,7 @@
 	    sprintf(name, "%s/Trace-%s.out", home, trace_who);
 #endif
 	    trace_fp = fopen(name, "w");
-	    if (trace_fp != 0) {
+	    if (trace_fp != NULL) {
 		fprintf(trace_fp, "%s\n", xtermVersion());
 		TraceIds(NULL, 0);
 	    }
@@ -157,13 +157,13 @@
 void
 TraceClose(void)
 {
-    if (trace_fp != 0) {
+    if (trace_fp != NULL) {
 	(void) fclose(trace_fp);
 	(void) fflush(stdout);
 	(void) fflush(stderr);
 	(void) visibleChars(NULL, 0);
 	(void) visibleIChars(NULL, 0);
-	trace_fp = 0;
+	trace_fp = NULL;
     }
 }
 
@@ -184,7 +184,7 @@
 	  (unsigned) getuid(), (unsigned) getgid(),
 	  (unsigned) geteuid(), (unsigned) getegid());
 #endif
-    if (fname != 0) {
+    if (fname != NULL) {
 	Trace(" (%s@%d)\n", fname, lnum);
     } else {
 	time_t now = time((time_t *) 0);
@@ -196,7 +196,7 @@
 TraceTime(const char *fname, int lnum)
 {
     time_t now;
-    if (fname != 0) {
+    if (fname != NULL) {
 	Trace("datetime (%s@%d) ", fname, lnum);
     }
     now = time((time_t *) 0);
@@ -317,14 +317,14 @@
     static char *result;
     static size_t used;
 
-    if (buf != 0) {
+    if (buf != NULL) {
 	size_t limit = ((len + 1) * 8) + 1;
 
 	if (limit > used) {
 	    used = limit;
 	    result = realloc(result, used);
 	}
-	if (result != 0) {
+	if (result != NULL) {
 	    char *dst = result;
 	    *dst = '\0';
 	    while (len--) {
@@ -367,14 +367,14 @@
     static char *result;
     static size_t used;
 
-    if (buf != 0) {
+    if (buf != NULL) {
 	size_t limit = ((len + 1) * 12) + 1;
 
 	if (limit > used) {
 	    used = limit;
 	    result = realloc(result, used);
 	}
-	if (result != 0) {
+	if (result != NULL) {
 	    char *dst = result;
 	    *dst = '\0';
 	    while (len--) {
@@ -671,7 +671,7 @@
 	    LineData *ld = getLineData(screen, row);
 
 	    TRACE((" %3d:", row));
-	    if (ld != 0) {
+	    if (ld != NULL) {
 		int col;
 
 		for (col = 0; col < ld->lineSize; ++col) {
@@ -954,7 +954,7 @@
 	break;
     }
     TRACE(("\n"));
-    if (params != 0 && *num_params != 0) {
+    if (params != NULL && *num_params != 0) {
 	Cardinal n;
 	for (n = 0; n < *num_params; ++n) {
 	    TRACE(("  param[%d] = %s\n", n, params[n]));
@@ -1022,7 +1022,7 @@
 	}
 	break;
     }
-    while (w != 0) {
+    while (w != NULL) {
 	TRACE(("w %p -> %#lx\n", (void *) w, XtWindow(w)));
 	w = XtParent(w);
     }
@@ -1321,10 +1321,10 @@
 TraceArgv(const char *tag, char **argv)
 {
     TRACE(("%s:\n", tag));
-    if (argv != 0) {
+    if (argv != NULL) {
 	int n = 0;
 
-	while (*argv != 0) {
+	while (*argv != NULL) {
 	    TRACE(("  %d:%s\n", n++, *argv++));
 	}
     }
@@ -1423,7 +1423,7 @@
 #endif
 
     /* list all options[] not found in resources[] */
-    for (j = 0, first = True; options[j].opt != 0; j++) {
+    for (j = 0, first = True; options[j].opt != NULL; j++) {
 	found = False;
 	for (k = 0; k < res_count; k++) {
 	    if (same_option(&opt_array[j], &res_array[k])) {
@@ -1444,7 +1444,7 @@
     /* list all resources[] not found in options[] */
     for (j = 0, first = True; j < res_count; j++) {
 	found = False;
-	for (k = 0; options[k].opt != 0; k++) {
+	for (k = 0; options[k].opt != NULL; k++) {
 	    if (same_option(&opt_array[k], &res_array[j])) {
 		found = True;
 		break;
Index: trace.h
--- xterm-395+/trace.h	2024-09-01 22:42:54.000000000 +0000
+++ xterm-396/trace.h	2024-12-01 19:54:13.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: trace.h,v 1.96 2024/09/01 22:42:54 tom Exp $ */
+/* $XTermId: trace.h,v 1.97 2024/12/01 19:54:13 tom Exp $ */
 
 /*
  * Copyright 1997-2022,2024 by Thomas E. Dickey
@@ -92,7 +92,7 @@
 
 extern	const	char *trace_who;
 #undef  TRACE_CHILD
-#define TRACE_CHILD int tracing_child = (trace_who = "child") != 0; (void) tracing_child
+#define TRACE_CHILD int tracing_child = (trace_who = "child") != NULL; (void) tracing_child
 
 extern	void	TraceEvent(const char *, XEvent *, String *, const Cardinal *);
 #undef  TRACE_EVENT
Index: unicode/precompose.c.head
--- xterm-395+/unicode/precompose.c.head	2014-07-15 21:18:32.000000000 +0000
+++ xterm-396/unicode/precompose.c.head	2024-12-01 23:52:12.000000000 +0000
@@ -11,5 +11,5 @@
 static struct {
   int replacement;
   int base;
-  int comb; 
+  int comb;
 } precompositions[] = {
Index: util.c
--- xterm-395+/util.c	2024-09-01 22:51:57.000000000 +0000
+++ xterm-396/util.c	2024-12-01 20:14:26.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: util.c,v 1.955 2024/09/01 22:51:57 tom Exp $ */
+/* $XTermId: util.c,v 1.956 2024/12/01 20:14:26 tom Exp $ */
 
 /*
  * Copyright 1999-2023,2024 by Thomas E. Dickey
@@ -517,7 +517,7 @@
 	if (amount != 0) {
 	    for (row = top; row <= screen->bot_marg; ++row) {
 		LineData *ld;
-		if ((ld = getLineData(screen, row + amount)) != 0) {
+		if ((ld = getLineData(screen, row + amount)) != NULL) {
 		    if (left > 0) {
 			if (ld->charData[left] == HIDDEN_CHAR) {
 			    Clear1Cell(ld, left - 1);
@@ -537,8 +537,8 @@
 
     if (amount > 0) {
 	for (row = top; row <= screen->bot_marg - amount; ++row) {
-	    if ((src = getLineData(screen, row + amount)) != 0
-		&& (dst = getLineData(screen, row)) != 0) {
+	    if ((src = getLineData(screen, row + amount)) != NULL
+		&& (dst = getLineData(screen, row)) != NULL) {
 		CopyCells(screen, src, dst, left, length, False);
 	    }
 	}
@@ -548,8 +548,8 @@
 	}
     } else if (amount < 0) {
 	for (row = screen->bot_marg; row >= top - amount; --row) {
-	    if ((src = getLineData(screen, row + amount)) != 0
-		&& (dst = getLineData(screen, row)) != 0) {
+	    if ((src = getLineData(screen, row + amount)) != NULL
+		&& (dst = getLineData(screen, row)) != NULL) {
 		CopyCells(screen, src, dst, left, length, True);
 	    }
 	}
@@ -1022,7 +1022,7 @@
 	} else {
 	    char *marker = strstr(format, "%s");
 	    char *result = newname;
-	    if (marker != 0) {
+	    if (marker != NULL) {
 		size_t skip = (size_t) (marker - format);
 		if (skip) {
 		    strncpy(result, format, skip);
@@ -1062,7 +1062,7 @@
 		char *marker = strstr(format, "%s");
 		Boolean found = False;
 
-		if (marker != 0) {
+		if (marker != NULL) {
 		    if (marker == format
 			|| !strncmp(icon_name, format, (size_t) (marker - format))) {
 			found = True;
@@ -1102,7 +1102,7 @@
     IChar *str = xw->work.write_text + offset;
     TScreen *screen = TScreenOf(xw);
     XTermDraw params;
-    CLineData *ld = 0;
+    CLineData *ld = NULL;
     unsigned attr_flags = xw->flags;
     CellColor fg_bg = xtermColorPair(xw);
     unsigned cells = visual_width(str, length);
@@ -1143,7 +1143,7 @@
     }
 
     if (AddToVisible(xw)
-	&& ((ld = getLineData(screen, screen->cur_row))) != 0) {
+	&& ((ld = getLineData(screen, screen->cur_row))) != NULL) {
 	unsigned test;
 
 	if (screen->cursor_state)
@@ -1454,7 +1454,7 @@
     if (screen->cur_col < left || screen->cur_col > right) {
 	n = 0;
     } else if (AddToVisible(xw)
-	       && (ld = getLineData(screen, screen->cur_row)) != 0) {
+	       && (ld = getLineData(screen, screen->cur_row)) != NULL) {
 	int col = right + 1 - (int) n;
 
 	/*
@@ -1537,7 +1537,7 @@
 	n = limit;
 
     if (AddToVisible(xw)
-	&& (ld = getLineData(screen, screen->cur_row)) != 0) {
+	&& (ld = getLineData(screen, screen->cur_row)) != NULL) {
 	int col = right + 1 - (int) n;
 
 	/*
@@ -1737,7 +1737,7 @@
     ResetWrap(screen);
 
     if (AddToVisible(xw)
-	&& (ld = getLineData(screen, row)) != 0) {
+	&& (ld = getLineData(screen, row)) != NULL) {
 
 	ClearCurBackground(xw,
 			   INX2ROW(screen, row),
@@ -2015,7 +2015,7 @@
     Boolean result = False;
     CLineData *ld;
 
-    if ((ld = getLineData(screen, row)) != 0) {
+    if ((ld = getLineData(screen, row)) != NULL) {
 	int col;
 
 	for (col = 0; col < screen->max_col; ++col) {
@@ -2231,7 +2231,7 @@
     TScreen *screen = TScreenOf(xw);
     CLineData *ld;
 
-    if ((ld = getLineData(screen, screen->cur_row)) != 0) {
+    if ((ld = getLineData(screen, screen->cur_row)) != NULL) {
 	int src_x = LineCursorX(screen, ld, firstchar);
 	int src_y = CursorY(screen, screen->cur_row);
 
@@ -2277,7 +2277,7 @@
 		CLineData *ld;
 		int mapped = amount + row + screen->topline;
 
-		if ((ld = getLineData(screen, mapped)) != 0) {
+		if ((ld = getLineData(screen, mapped)) != NULL) {
 		    ShowWrapMarks(xw, row, ld);
 		}
 	    }
@@ -2387,7 +2387,7 @@
     Drawable draw = VDrawable(screen);
     GC gc;
 
-    if ((gc = vwin->border_gc) != 0) {
+    if ((gc = vwin->border_gc) != NULL) {
 	int vmark1 = screen->border;
 	int vmark2 = vwin->height + vmark1;
 	int hmark1 = OriginX(screen);
@@ -3002,7 +3002,7 @@
 {
     TScreen *screen = TScreenOf(params->xw);
     int fontnum = screen->menu_font_number;
-    XTermXftFonts *result = 0;
+    XTermXftFonts *result = NULL;
 
 #if OPT_WIDE_ATTRS
     if ((attr_flags & ATR_ITALIC)
@@ -3018,7 +3018,7 @@
 	    result = XFT_DATA(fWItal);
 	}
     }
-    if (result != 0) {
+    if (result != NULL) {
 	;			/* skip the other tests */
     } else
 #endif
@@ -3058,7 +3058,7 @@
     if (CSET_DOUBLE(params->real_chrset)) {
 	result = xterm_DoubleFT(params, params->real_chrset, attr_flags);
     }
-    if (result != 0) {
+    if (result != NULL) {
 	;			/* found a usable double-sized font */
     } else
 #endif
@@ -3138,8 +3138,8 @@
 	XTermXftFonts *wdata = getWideXftFont(params, attr_flags);
 	XftFont *wfont = XftFp(wdata);
 	Cardinal src, dst;
-	XftFont *lastFont = 0;
-	XftFont *currFont = 0;
+	XftFont *lastFont = NULL;
+	XftFont *currFont = NULL;
 	Cardinal start = 0;
 	int charWidth;
 	int fwidth = FontWidth(screen);
@@ -3167,7 +3167,7 @@
 	    ncells += charWidth;
 
 	    if (lastFont != currFont) {
-		if ((lastFont != 0) && really) {
+		if ((lastFont != NULL) && really) {
 		    XftDrawCharSpec(screen->renderDraw,
 				    color,
 				    lastFont,
@@ -3597,7 +3597,7 @@
 		       text,
 		       len,
 		       True);
-    XftDrawSetClip(screen->renderDraw, 0);
+    XftDrawSetClip(screen->renderDraw, NULL);
     return ncells;
 }
 #endif
@@ -3712,7 +3712,7 @@
     unsigned need = 2 * len;
     IChar *temp = TypeMallocN(IChar, need);
 
-    if (temp != 0) {
+    if (temp != NULL) {
 	unsigned n = 0;
 	XTermDraw recur = *params;
 
@@ -4001,7 +4001,7 @@
 #endif
 
 #if OPT_WIDE_CHARS
-    if (text == 0)
+    if (text == NULL)
 	return 0;
 #endif
     TRACE(("DRAWTEXT%c[%4d,%4d] (%d)%3d:%s\n",
@@ -4039,7 +4039,7 @@
 	} else
 #endif
 	    if ((!IsIcon(screen) && screen->font_doublesize)
-		&& (gc2 = xterm_DoubleGC(&recur, gc, &inx)) != 0) {
+		&& (gc2 = xterm_DoubleGC(&recur, gc, &inx)) != NULL) {
 	    /* draw actual double-sized characters */
 	    XFontStruct *fs = getDoubleFont(screen, inx)->fs;
 	    XRectangle rect, *rp = &rect;
@@ -4226,7 +4226,7 @@
 #if OPT_WIDE_CHARS
 		int needed = forceDbl ? 2 : ch_width;
 		XTermXftFonts *currData = pickXftData(needed, ndata, wdata);
-		XftFont *tempFont = 0;
+		XftFont *tempFont = NULL;
 #define CURR_TEMP (tempFont ? tempFont : XftFp(currData))
 
 		if (xtermIsInternalCs(ch) || ch == 0) {
@@ -4720,8 +4720,8 @@
 	 */
 	useBoldFont = ((recur.attr_flags & BOLDATTR(screen)) != 0);
 	if (useBoldFont) {
-	    XTermFonts *norm = 0;
-	    XTermFonts *bold = 0;
+	    XTermFonts *norm = NULL;
+	    XTermFonts *bold = NULL;
 	    Bool noBold, noNorm;
 
 	    (void) norm;
@@ -4901,7 +4901,7 @@
 void
 allocXtermChars(ScrnPtr *buffer, Cardinal length)
 {
-    if (*buffer == 0) {
+    if (*buffer == NULL) {
 	*buffer = (ScrnPtr) XtMalloc(length);
     } else {
 	*buffer = (ScrnPtr) XtRealloc((char *) *buffer, length);
@@ -5919,11 +5919,11 @@
 char *
 xtermSetLocale(int category, String after)
 {
-    char *before = x_strdup(setlocale(category, 0));
+    char *before = x_strdup(setlocale(category, NULL));
 
     (void) setlocale(category, after);
     TRACE(("before setlocale :%s\n", NonNull(before)));
-    TRACE(("updated locale   :%s\n", NonNull(setlocale(category, 0))));
+    TRACE(("updated locale   :%s\n", NonNull(setlocale(category, NULL))));
     return before;
 }
 
@@ -5932,5 +5932,5 @@
 {
     (void) setlocale(category, before);
     free(before);
-    TRACE(("restored locale  :%s\n", NonNull(setlocale(category, 0))));
+    TRACE(("restored locale  :%s\n", NonNull(setlocale(category, NULL))));
 }
Index: version.c
--- xterm-395+/version.c	2020-06-23 22:46:02.000000000 +0000
+++ xterm-396/version.c	2024-12-01 20:27:00.000000000 +0000
@@ -1,7 +1,7 @@
-/* $XTermId: version.c,v 1.7 2020/06/23 22:46:02 tom Exp $ */
+/* $XTermId: version.c,v 1.8 2024/12/01 20:27:00 tom Exp $ */
 
 /*
- * Copyright 2013-2019,2020 by Thomas E. Dickey
+ * Copyright 2013-2020,2024 by Thomas E. Dickey
  *
  *                         All Rights Reserved
  *
@@ -46,11 +46,11 @@
     static char *buffer;
     const char *result;
 
-    if (buffer == 0) {
+    if (buffer == NULL) {
 	const char *vendor = vendor_version;
 
 	buffer = malloc(sizeof(vendor_version) + 256);
-	if (buffer == 0) {
+	if (buffer == NULL) {
 	    result = vendor;
 	} else {
 	    char first[sizeof(vendor_version)];
Index: version.h
--- xterm-395+/version.h	2024-10-24 08:21:36.000000000 +0000
+++ xterm-396/version.h	2024-12-03 00:57:37.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: version.h,v 1.569 2024/10/24 08:21:36 tom Exp $ */
+/* $XTermId: version.h,v 1.571 2024/12/03 00:57:37 tom Exp $ */
 
 /*
  * Copyright 1998-2023,2024 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   395
-#define XTERM_DATE    2024-10-24
+#define XTERM_PATCH   396
+#define XTERM_DATE    2024-12-02
 
 #ifndef __vendorversion__
 #define __vendorversion__ "XTerm"
Index: vttests/titlestack.pl
--- xterm-395+/vttests/titlestack.pl	2019-09-20 00:50:10.000000000 +0000
+++ xterm-396/vttests/titlestack.pl	2024-11-29 01:09:46.000000000 +0000
@@ -1,9 +1,9 @@
 #!/usr/bin/env perl
-# $XTermId: titlestack.pl,v 1.29 2019/09/20 00:50:10 tom Exp $
+# $XTermId: titlestack.pl,v 1.35 2024/11/29 01:09:46 tom Exp $
 # -----------------------------------------------------------------------------
 # this file is part of xterm
 #
-# Copyright 2019 by Thomas E. Dickey
+# Copyright 2019,2024 by Thomas E. Dickey
 #
 #                         All Rights Reserved
 #
@@ -48,17 +48,22 @@
 
 our $encoding = lc( langinfo( CODESET() ) );
 our $wm_name;
-our ( $opt_b, $opt_g, $opt_v, $opt_8 );
+our ( $opt_b, $opt_c, $opt_g, $opt_l, $opt_s, $opt_v, $opt_8 );
 
 our @titlestack;    # stack of title-strings, using current encoding
 our @item_stack;    # selector used when doing a push
 our @mode_stack;    # titleModes in effect when titlestack was loaded
 our $SP;            # stack-pointer
+our $SQ = 10;       # stack-limit
 our $TM;            # current titleModes, in various combinations
+our @cmd_buffer;    # command-input
+our $cmd_index;     # current index in $cmd_buffer[]
+our $log_fp;        # logging-output
 
 our $utf8_sample = 0;
 
 our $CSI = "\x1b[";
+our $DCS = "\x1bP";
 our $OSC = "\x1b]";
 our $ST  = "\x1b\\";
 
@@ -160,6 +165,39 @@
     return $reply;
 }
 
+sub get_level() {
+    my $reply = &get_reply( sprintf( "%s#S", $CSI ) );
+    if ( index( $reply, $CSI ) == 0 ) {
+        $reply = substr( $reply, length($CSI) );
+        if ( $reply =~ /^\d+;\d+#S$/ ) {
+            $reply =~ s/#S//;
+            my @params = split /;/, $reply;
+            $SP = $params[0];
+            $SQ = $params[1];
+        }
+    }
+}
+
+sub get_titlemodes() {
+    my $reply  = &get_reply( sprintf( "%s\$q>t%s", $DCS, $ST ) );
+    my $prefix = "${DCS}1\$r";
+    my $p      = index( $reply, $prefix );
+    my $q      = index( $reply, $ST );
+    my $r      = length($reply) - length($ST);
+    if ( $p == 0 and $q == $r ) {
+        $reply = substr( $reply, 0, $q );
+        $reply = substr( $reply, length($prefix) );
+        if ( $reply =~ /^>(\d;)*\dt$/ ) {
+            $reply =~ s/^.(.+).$/$1/;
+            my @modes = split /;/, $reply;
+            $TM = 0;
+            for my $n ( 0 .. $#modes ) {
+                $TM += ( 1 << $n ) if ( $modes[$n] != 0 );
+            }
+        }
+    }
+}
+
 sub get_title($) {
     my $icon   = shift;
     my $reply  = &get_reply( sprintf( "%s%dt", $CSI, $icon ? 20 : 21 ) );
@@ -199,6 +237,57 @@
     ReadMode 'normal';
 }
 
+sub get_cmd() {
+    my $result;
+    select( undef, undef, undef, $opt_s );
+    if ( $cmd_index <= $#cmd_buffer ) {
+        $result = $cmd_buffer[ $cmd_index++ ];
+    }
+    else {
+        $result = "q";
+    }
+    return $result;
+}
+
+sub get_char() {
+    my $result;
+    if ($opt_c) {
+        $result = &get_cmd();
+        if ( index( $result, "char:" ) == 0 ) {
+            $result = substr( $result, 5 );
+        }
+        else {
+            $result = "q";
+        }
+    }
+    else {
+        $result = ReadKey 0;
+    }
+    printf $log_fp "char:%s\n", $result if ($opt_l);
+    return $result;
+}
+
+sub get_line() {
+    my $result;
+    if ($opt_c) {
+        $result = &get_cmd();
+        if ( index( $result, "line:" ) == 0 ) {
+            $result = substr( $result, 5 );
+        }
+        else {
+            $result = "";
+        }
+    }
+    else {
+        &cooked;
+        $result = ReadLine 0;
+        chomp $result;
+        &raw;
+    }
+    printf $log_fp "line:%s\n", $result if ($opt_l);
+    return $result;
+}
+
 sub read_cmd($) {
     my $command = shift;
     my @result;
@@ -249,7 +338,7 @@
     my $help   = 0;
     my $result = "?";
     while ( $result !~ /^[0123]$/ ) {
-        $result = ReadKey 0;
+        $result = &get_char;
         if ( $result eq "q" ) {
             $result = -1;
             last;
@@ -291,7 +380,7 @@
     my $help   = 0;
     printf "\t:";
     while ( $result !~ /^[012]$/ ) {
-        $result = ReadKey 0;
+        $result = &get_char;
         if ( $result eq "q" ) {
             $result = -1;
             last;
@@ -361,6 +450,15 @@
     if ( $opts ne "" ) {
         &send_command( sprintf( "%s>%s%s", $CSI, $opts, $set ? "t" : "T" ) );
     }
+
+    if ($opt_l) {
+        my $save = $TM;
+        &get_titlemodes;
+
+        if ( $TM != $save ) {
+            printf $log_fp "note: expected title-modes $save, got $TM\n";
+        }
+    }
 }
 
 sub utf8_sample($) {
@@ -435,13 +533,12 @@
                   . $gap
                   . $u_chars;
             }
+            &cooked;
             printf "%s\r\n", $text;
+            &raw;
         }
         else {
-            &cooked;
-            $text = ReadLine 0;
-            chomp $text;
-            &raw;
+            $text = &get_line;
         }
         $titlestack[$SP] = $text;
         $item_stack[$SP] = $opt;
@@ -509,7 +606,10 @@
 Options:
   -8      use 8-bit controls
   -b      use BEL rather than ST for terminating strings
+  -c FILE read commands from this file.
   -g      generate title-strings rather than prompting
+  -l FILE log commands to this file.
+  -s SECS sleep this long each time a command is read from file
   -v      verbose
 EOF
       ;
@@ -517,11 +617,26 @@
 }
 
 $Getopt::Std::STANDARD_HELP_VERSION = 1;
-&getopts('bgv8') || &main::HELP_MESSAGE;
+&getopts('bc:gl:s:v8') || &main::HELP_MESSAGE;
+
+if ($opt_c) {
+    open( my $cmd_fp, "<", $opt_c ) || &main::HELP_MESSAGE;
+    @cmd_buffer = <$cmd_fp>;
+    close $cmd_fp;
+    chomp @cmd_buffer;
+    $cmd_index = 0;
+}
+
+if ($opt_l) {
+    open( $log_fp, ">", $opt_l ) || &main::HELP_MESSAGE;
+}
+
+$opt_s = "1" unless ( defined($opt_s) and ( $opt_s =~ /^(\d*\.)?\d+$/ ) );
 
 $ST = "\007" if ($opt_b);
 
-$titlestack[ $SP = 0 ] = "unknown";
+$SP              = 0;
+$titlestack[$SP] = "unknown";
 $item_stack[$SP] = 0;
 $mode_stack[$SP] = $TM = 0;
 
@@ -534,6 +649,7 @@
     else {
         printf STDERR "\x1b G";
         $CSI = "\x9b";
+        $DCS = "\x90";
         $OSC = "\x9d";
         $ST  = "\x9c";
     }
@@ -542,12 +658,14 @@
 &get_WM_NAME;
 
 &raw;
+&get_titlemodes;
+&get_level;
 &raw;
 while (1) {
     my $cmd;
 
-    printf "\r\nCommand (? for help):";
-    $cmd = ReadKey 0;
+    printf "\r\n[$SP:$SQ] Command (? for help):";
+    $cmd = &get_char;
     if ( not $cmd ) {
         sleep 1;
     }
@@ -562,9 +680,7 @@
     }
     elsif ( $cmd eq "#" ) {
         printf " ...comment\r\n\t#";
-        &cooked;
-        ReadLine 0;
-        &raw;
+        &get_line;
     }
     elsif ( $cmd eq "!" ) {
         printf " ...shell\r\n";
Index: wcwidth.c
--- xterm-395+/wcwidth.c	2024-10-23 22:08:40.000000000 +0000
+++ xterm-396/wcwidth.c	2024-12-01 23:49:26.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: wcwidth.c,v 1.75 2024/10/23 22:08:40 tom Exp $ */
+/* $XTermId: wcwidth.c,v 1.76 2024/12/01 23:49:26 tom Exp $ */
 
 /* $XFree86: xc/programs/xterm/wcwidth.c,v 1.9 2006/06/19 00:36:52 dickey Exp $ */
 
@@ -238,7 +238,7 @@
 
   /* sorted list of non-overlapping intervals of non-spacing characters */
   /* generated by
-   *    uniset +cat=Me +cat=Mn +0600-0605 +061C +06DD +070F +1160-11FF +D7B0-D7C6 +D7CB-D7FB 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.9 */
Index: xstrings.c
--- xterm-395+/xstrings.c	2023-05-09 08:13:56.000000000 +0000
+++ xterm-396/xstrings.c	2024-12-01 20:27:00.000000000 +0000
@@ -1,7 +1,7 @@
-/* $XTermId: xstrings.c,v 1.80 2023/05/09 08:13:56 tom Exp $ */
+/* $XTermId: xstrings.c,v 1.81 2024/12/01 20:27:00 tom Exp $ */
 
 /*
- * Copyright 2000-2022,2023 by Thomas E. Dickey
+ * Copyright 2000-2023,2024 by Thomas E. Dickey
  *
  *                         All Rights Reserved
  *
@@ -62,7 +62,7 @@
 {
     if (target && source) {
 	target += x_countargv(target);
-	while ((*target++ = *source++) != 0) ;
+	while ((*target++ = *source++) != NULL) ;
     }
 }
 
@@ -95,7 +95,7 @@
 char *
 x_decode_hex(const char *source, const char **next)
 {
-    char *result = 0;
+    char *result = NULL;
     int pass;
     size_t j, k;
 
@@ -112,7 +112,7 @@
 		result[k] = '\0';
 	    } else {
 		result = malloc(++j);
-		if (result == 0)
+		if (result == NULL)
 		    break;	/* not enough memory */
 	    }
 	} else {
@@ -132,7 +132,7 @@
     size_t need = (strlen(source) * 2) + 1;
     char *result = malloc(need);
 
-    if (result != 0) {
+    if (result != NULL) {
 	unsigned j, k;
 	result[0] = '\0';
 	for (j = k = 0; source[j] != '\0'; ++j) {
@@ -233,7 +233,7 @@
     struct passwd *ptr = getpwnam(name);
     Boolean code;
 
-    if (ptr != 0 && OkPasswd(ptr)) {
+    if (ptr != NULL && OkPasswd(ptr)) {
 	code = True;
 	alloc_pw(result, ptr);
     } else {
@@ -253,7 +253,7 @@
     struct passwd *ptr = getpwuid((uid_t) uid);
     Boolean code;
 
-    if (ptr != 0 && OkPasswd(ptr)) {
+    if (ptr != NULL && OkPasswd(ptr)) {
 	code = True;
 	alloc_pw(result, ptr);
     } else {
@@ -286,13 +286,13 @@
 String
 x_nonempty(String s)
 {
-    if (s != 0) {
+    if (s != NULL) {
 	if (*s == '\0') {
-	    s = 0;
+	    s = NULL;
 	} else {
 	    s = x_skip_blanks(s);
 	    if (*s == '\0')
-		s = 0;
+		s = NULL;
 	}
     }
     return s;
@@ -328,13 +328,13 @@
 char **
 x_splitargs(const char *command)
 {
-    char **result = 0;
+    char **result = NULL;
 
-    if (command != 0) {
+    if (command != NULL) {
 	const char *first = skip_blanks(command);
 	char *blob = x_strdup(first);
 
-	if (blob != 0) {
+	if (blob != NULL) {
 	    int pass;
 
 	    for (pass = 0; pass < 2; ++pass) {
@@ -384,7 +384,7 @@
 void
 x_freeargs(char **argv)
 {
-    if (argv != 0) {
+    if (argv != NULL) {
 	free(*argv);
 	free(argv);
     }
@@ -434,11 +434,11 @@
 char *
 x_strdup(const char *s)
 {
-    char *result = 0;
+    char *result = NULL;
 
-    if (s != 0) {
+    if (s != NULL) {
 	char *t = malloc(strlen(s) + 5);
-	if (t != 0) {
+	if (t != NULL) {
 	    strcpy(t, s);
 	}
 	result = t;
@@ -476,7 +476,7 @@
 	result = x_strdup("");
     } else {
 	char *t = x_strdup(source);
-	if (t != 0) {
+	if (t != NULL) {
 	    char *s = t;
 	    char *d = s;
 	    while (IsSpace(CharOf(*s)))
@@ -508,7 +508,7 @@
 	result = x_strdup("");
     } else {
 	char *t = x_strdup(source);
-	if (t != 0) {
+	if (t != NULL) {
 	    if (*t != '\0') {
 		char *s = t + strlen(t);
 		while (s != t && IsSpace(CharOf(s[-1]))) {
Index: xstrings.h
--- xterm-395+/xstrings.h	2016-12-22 23:48:38.000000000 +0000
+++ xterm-396/xstrings.h	2024-12-01 20:27:00.000000000 +0000
@@ -1,7 +1,7 @@
-/* $XTermId: xstrings.h,v 1.30 2016/12/22 23:48:38 tom Exp $ */
+/* $XTermId: xstrings.h,v 1.31 2024/12/01 20:27:00 tom Exp $ */
 
 /*
- * Copyright 2000-2015,2016 by Thomas E. Dickey
+ * Copyright 2000-2016,2024 by Thomas E. Dickey
  *
  *                         All Rights Reserved
  *
@@ -37,7 +37,7 @@
 #include <X11/Intrinsic.h>
 #include <pwd.h>
 
-#define OkPasswd(p) ((p)->pw_name != 0 && (p)->pw_name[0] != 0)
+#define OkPasswd(p) ((p)->pw_name != NULL && (p)->pw_name[0] != 0)
 
 extern Boolean x_getpwnam(const char * /* name */, struct passwd * /* result */);
 extern Boolean x_getpwuid(uid_t /* uid */, struct passwd * /* result */);
Index: xterm.appdata.xml
--- xterm-395+/xterm.appdata.xml	2024-10-24 08:22:02.000000000 +0000
+++ xterm-396/xterm.appdata.xml	2024-12-03 00:58:17.000000000 +0000
@@ -35,7 +35,7 @@
     <keyword>terminal</keyword>
   </keywords>
   <releases>
-    <release version="395" date="2024-10-24"/>
+    <release version="396" date="2024-12-02"/>
   </releases>
   <url type="homepage">https://invisible-island.net/xterm/</url>
   <update_contact>dickey@invisible-island.net</update_contact>
Index: xterm.h
--- xterm-395+/xterm.h	2024-09-30 08:03:20.000000000 +0000
+++ xterm-396/xterm.h	2024-12-01 19:45:14.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: xterm.h,v 1.952 2024/09/30 08:03:20 tom Exp $ */
+/* $XTermId: xterm.h,v 1.957 2024/12/01 19:45:14 tom Exp $ */
 
 /*
  * Copyright 1999-2023,2024 by Thomas E. Dickey
@@ -265,6 +265,7 @@
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#undef HAVE_UNISTD_H
 #endif
 
 #ifdef HAVE_SYS_WAIT_H
@@ -401,7 +402,7 @@
 #define Maybe		2
 
 #define ALLOC_STRING(name) \
-	if (name != 0) \
+	if (name != NULL) \
 	    name = x_strdup(name)
 #define FREE_STRING(name) \
 	    free_string(name)
@@ -1039,7 +1040,7 @@
 extern void HandleStartExtend          PROTO_XT_ACTIONS_ARGS;
 extern void ResizeSelection (TScreen * /* screen */, int /* rows */, int /* cols */);
 extern void ScrollSelection (TScreen * /* screen */, int /* amount */,  Bool /* always */);
-extern void TrackMouse (XtermWidget /* xw */, int /* func */, CELL * /* start */, int /* firstrow */, int /* lastrow */);
+extern void TrackMouse (XtermWidget /* xw */, int /* func */, const CELL * /* start */, int /* firstrow */, int /* lastrow */);
 extern void ViButton                   PROTO_XT_ACTIONS_ARGS;
 
 extern void UnmapSelections (XtermWidget /* xw */);
@@ -1299,7 +1300,7 @@
 extern Widget xtermOpenApplication (XtAppContext * /* app_context_return */, String /* application_class */, XrmOptionDescRec */* options */, Cardinal /* num_options */, int * /* argc_in_out */, char **/* argv_in_out */, String * /* fallback_resources */, WidgetClass /* widget_class */, ArgList /* args */, Cardinal /* num_args */);
 extern Window WMFrameWindow (XtermWidget /* xw */);
 extern XtInputMask xtermAppPending (void);
-extern XrmOptionDescRec * sortedOptDescs (XrmOptionDescRec *, Cardinal);
+extern XrmOptionDescRec * sortedOptDescs (const XrmOptionDescRec *, Cardinal);
 extern XtermWidget getXtermWidget (Widget /* w */);
 extern XVisualInfo *getVisualInfo (XtermWidget /* xw */);
 extern char *udk_lookup (XtermWidget /* xw */, int /* keycode */, int * /* len */);
@@ -1379,6 +1380,7 @@
 extern Boolean xtermPopTitle(TScreen * /* screen */, int /* which */, SaveTitle * /* item */);
 extern void xtermPushTitle(TScreen * /* screen */, int /* which */, SaveTitle * /* item */);
 extern void xtermFreeTitle(SaveTitle *item);
+extern void xtermReportTitleStack(XtermWidget /* xw */);
 
 #if OPT_DABBREV
 extern void HandleDabbrevExpand        PROTO_XT_ACTIONS_ARGS;
Index: xterm.log.html
--- xterm-395+/xterm.log.html	2024-10-24 08:21:09.000000000 +0000
+++ xterm-396/xterm.log.html	2024-12-03 00:57:12.000000000 +0000
@@ -30,7 +30,7 @@
  * sale, use or other dealings in this Software without prior written        *
  * authorization.                                                            *
  *****************************************************************************
-  $XTermId: xterm.log.html,v 1.2653 2024/10/24 08:21:09 tom Exp $
+  $XTermId: xterm.log.html,v 1.2662 2024/12/03 00:57:12 tom Exp $
   -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
@@ -70,6 +70,8 @@
   CHANGELOG</a>).</p>
 
   <ul>
+    <li><a href="#xterm_396">Patch #396 - 2024/12/02</a></li>
+
     <li><a href="#xterm_395">Patch #395 - 2024/10/24</a></li>
 
     <li><a href="#xterm_394">Patch #394 - 2024/09/02</a></li>
@@ -1068,6 +1070,35 @@
     <li><a href="#xterm_01">Patch #1 - 1996/1/6</a></li>
   </ul>
 
+  <h1><a name="xterm_396" id="xterm_396">Patch #396 -
+  2024/12/02</a></h1>
+
+  <ul>
+    <li>fix stricter warnings provided by upcoming gcc 15, as well
+    as NetBSD lint.</li>
+
+    <li>modify title-stack test script, adding logging and
+    command-replay options. Improved the script with new controls:
+      <ul>
+        <li>add <tt>XTTITLEPOS</tt> query to get position in
+        title-stack.</li>
+
+        <li>add <tt>DECRQSS</tt> for <tt>XTSMTITLE</tt>.</li>
+      </ul>
+    </li>
+
+    <li>correct cursor-addressing limit for VT52 mode (report by
+    Serguei Fichel).</li>
+
+    <li>amend change in <a href="#xterm_395">patch #395</a> for
+    7-bit parsing to allow UTF-8 titles (report by Dmytro
+    Bagril).</li>
+
+    <li>portability fixes for configure script, from ncurses</li>
+
+    <li>update config.guess, config.sub</li>
+  </ul>
+
   <h1><a name="xterm_395" id="xterm_395">Patch #395 -
   2024/10/24</a></h1>
 
Index: xtermcap.c
--- xterm-395+/xtermcap.c	2024-10-23 21:14:15.000000000 +0000
+++ xterm-396/xtermcap.c	2024-12-01 20:17:29.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: xtermcap.c,v 1.62 2024/10/23 21:14:15 tom Exp $ */
+/* $XTermId: xtermcap.c,v 1.63 2024/12/01 20:17:29 tom Exp $ */
 
 /*
  * Copyright 2007-2023,2024 by Thomas E. Dickey
@@ -225,7 +225,7 @@
 {
     Boolean result = True;
 
-    if (screen->tcap_fkeys == 0) {
+    if (screen->tcap_fkeys == NULL) {
 	Cardinal want = XtNumber(table);
 	Cardinal have;
 #if !USE_TERMINFO
@@ -233,7 +233,7 @@
 #endif
 
 	TRACE(("loadTermcapStrings\n"));
-	if ((screen->tcap_fkeys = TypeCallocN(char *, want)) != 0) {
+	if ((screen->tcap_fkeys = TypeCallocN(char *, want)) != NULL) {
 
 	    for (have = 0; have < want; ++have) {
 		char name[80];
@@ -244,7 +244,7 @@
 #else
 		fkey = tgetstr(strcpy(name, table[have].tc), &area);
 #endif
-		if (fkey != 0 && fkey != NO_STRING) {
+		if (fkey != NULL && fkey != NO_STRING) {
 		    screen->tcap_fkeys[have] = x_strdup(fkey);
 		} else {
 		    screen->tcap_fkeys[have] = NO_STRING;
@@ -557,8 +557,8 @@
 #endif
 
     if (fkey == NO_STRING)
-	fkey = 0;
-    if (fkey != 0)
+	fkey = NULL;
+    if (fkey != NULL)
 	fkey = x_strdup(fkey);
     return fkey;
 }
@@ -578,7 +578,7 @@
 	result = True;
 	while (*name != '\0') {
 	    if (++length < 32 && isgraph(CharOf(*name))) {
-		if (strchr("\\|,:'\"", *name) != 0) {
+		if (strchr("\\|,:'\"", *name) != NULL) {
 		    result = False;
 		    break;
 		}
@@ -611,7 +611,7 @@
 	const char *temp;
 	char *value;
 
-	if ((value = x_decode_hex(name, &temp)) != 0) {
+	if ((value = x_decode_hex(name, &temp)) != NULL) {
 	    if (*temp == '\0' && isLegalTcapName(value)) {
 		if (TcapInit(buffer, value)) {
 		    TRACE(("...set_termcap(%s)\n", NonNull(value)));
@@ -635,7 +635,7 @@
 #if OPT_TCAP_FKEYS
     TScreen *screen = TScreenOf(xw);
 
-    if (screen->tcap_fkeys != 0) {
+    if (screen->tcap_fkeys != NULL) {
 	Cardinal want = XtNumber(table);
 	Cardinal have;
 
