# ftp://ftp.invisible-island.net/xterm/patches/xterm-368.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created  Tue Jun  8 00:44:48 UTC 2021
# ------------------------------------------------------------------------------
# MANIFEST                 |    2 
# Tekproc.c                |    4 
# aclocal.m4               |   62 
# charproc.c               |    7 
# config.guess             |   60 
# config.sub               |   44 
# configure                | 3388 ++++++++++++++++++++++-----------------------
# data.c                   |    8 
# data.h                   |   10 
# fontutils.c              |    2 
# main.c                   |   14 
# menu.c                   |   14 
# misc.c                   |  354 ++++
# package/debian/changelog |    6 
# package/freebsd/Makefile |    4 
# package/pkgsrc/Makefile  |    2 
# package/xterm.spec       |    4 
# ptyx.h                   |    4 
# scrollbar.c              |    6 
# util.c                   |    5 
# version.h                |    6 
# xterm.appdata.xml        |    2 
# xterm.h                  |    6 
# xterm.log.html           |   25 
# xterm.man                |   21 
# 25 files changed, 2271 insertions(+), 1789 deletions(-)
# ------------------------------------------------------------------------------
Index: MANIFEST
--- xterm-367+/MANIFEST	2021-02-22 21:18:59.000000000 +0000
+++ xterm-368/MANIFEST	2021-04-28 00:02:52.000000000 +0000
@@ -1,4 +1,4 @@
-MANIFEST for xterm-367, version xterm-367
+MANIFEST for xterm-368, version xterm-368
 --------------------------------------------------------------------------------
 MANIFEST                        this file
 256colres.h                     resource-definitions for 256-color mode
Index: Tekproc.c
--- xterm-367+/Tekproc.c	2021-03-21 22:08:46.000000000 +0000
+++ xterm-368/Tekproc.c	2021-06-03 21:23:18.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: Tekproc.c,v 1.243 2021/03/21 22:08:46 tom Exp $ */
+/* $XTermId: Tekproc.c,v 1.245 2021/06/03 21:23:18 tom Exp $ */
 
 /*
  * Copyright 2001-2020,2021 by Thomas E. Dickey
@@ -402,6 +402,8 @@
 				    XtNmenuHeight, menu_high,
 #endif
 				    (XtPointer) 0);
+	TRACE(("created tek4014 widget %p, window %#lx\n",
+	       (void *) tekWidget, XtWindow(tekWidget)));
 #if OPT_TOOLBAR
 	ShowToolbar(resource.toolBar);
 #endif
Index: aclocal.m4
--- xterm-367+/aclocal.m4	2021-03-23 00:37:21.000000000 +0000
+++ xterm-368/aclocal.m4	2021-06-07 21:41:21.000000000 +0000
@@ -1,4 +1,4 @@
-dnl $XTermId: aclocal.m4,v 1.487 2021/03/23 00:37:21 tom Exp $
+dnl $XTermId: aclocal.m4,v 1.488 2021/06/07 21:41:21 tom Exp $
 dnl
 dnl ---------------------------------------------------------------------------
 dnl
@@ -266,7 +266,7 @@
 ])dnl
 ])])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_C11_NORETURN version: 2 updated: 2021/03/22 20:37:21
+dnl CF_C11_NORETURN version: 3 updated: 2021/03/28 11:36:23
 dnl ---------------
 AC_DEFUN([CF_C11_NORETURN],
 [
@@ -283,7 +283,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdnoreturn.h>
-static void giveup(void) { exit(0); }
+static _Noreturn void giveup(void) { exit(0); }
 	],
 	[if (feof(stdin)) giveup()],
 	cf_cv_c11_noreturn=yes,
@@ -294,7 +294,7 @@
 fi
 
 if test "$cf_cv_c11_noreturn" = yes; then
-	AC_DEFINE(HAVE_STDNORETURN_H, 1)
+	AC_DEFINE(HAVE_STDNORETURN_H, 1,[Define if <stdnoreturn.h> header is available and working])
 	AC_DEFINE_UNQUOTED(STDC_NORETURN,_Noreturn,[Define if C11 _Noreturn keyword is supported])
 	HAVE_STDNORETURN_H=1
 else
@@ -302,6 +302,7 @@
 fi
 
 AC_SUBST(HAVE_STDNORETURN_H)
+AC_SUBST(STDC_NORETURN)
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_CC_ENV_FLAGS version: 10 updated: 2020/12/31 18:40:20
@@ -550,7 +551,7 @@
 fi
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_CONST_X_STRING version: 6 updated: 2021/01/01 13:31:04
+dnl CF_CONST_X_STRING version: 7 updated: 2021/06/07 17:39:17
 dnl -----------------
 dnl The X11R4-X11R6 Xt specification uses an ambiguous String type for most
 dnl character-strings.
@@ -580,7 +581,7 @@
 #include <stdlib.h>
 #include <X11/Intrinsic.h>
 ],
-[String foo = malloc(1); (void)foo],[
+[String foo = malloc(1); free((void*)foo)],[
 
 AC_CACHE_CHECK(for X11/Xt const-feature,cf_cv_const_x_string,[
 	AC_TRY_COMPILE(
@@ -677,7 +678,7 @@
 AC_SUBST(ECHO_CC)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_DISABLE_LEAKS version: 8 updated: 2021/01/05 20:05:09
+dnl CF_DISABLE_LEAKS version: 9 updated: 2021/04/03 16:41:50
 dnl ----------------
 dnl Combine no-leak checks with the libraries or tools that are used for the
 dnl checks.
@@ -690,9 +691,9 @@
 AC_MSG_CHECKING(if you want to perform memory-leak testing)
 AC_ARG_ENABLE(leaks,
 	[  --disable-leaks         test: free permanent memory, analyze leaks],
-	[enable_leaks=no],
+	[enable_leaks=$enableval],
 	[enable_leaks=yes])
-dnl TODO - drop with_no_leaks
+dnl with_no_leaks is more readable...
 if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
 AC_MSG_RESULT($with_no_leaks)
 
@@ -1637,7 +1638,7 @@
 AC_SUBST(IMAKE_LOADFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_INPUT_METHOD version: 4 updated: 2020/03/10 18:53:47
+dnl CF_INPUT_METHOD version: 5 updated: 2021/06/07 17:39:17
 dnl ---------------
 dnl Check if the X libraries support input-method
 AC_DEFUN([CF_INPUT_METHOD],
@@ -1655,7 +1656,7 @@
 	XIM xim;
 	XIMStyles *xim_styles = 0;
 	XIMStyle input_style;
-	Widget w = 0;
+	Widget w = XtCreateWidget("none", (WidgetClass)0, None, (ArgList)0, 0);
 
 	XSetLocaleModifiers("@im=none");
 	xim = XOpenIM(XtDisplay(w), NULL, NULL, NULL);
@@ -3396,7 +3397,7 @@
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_UTMP_UT_SESSION version: 8 updated: 2021/01/02 09:31:20
+dnl CF_UTMP_UT_SESSION version: 9 updated: 2021/06/07 17:39:17
 dnl ------------------
 dnl Check if UTMP/UTMPX struct defines ut_session member
 AC_DEFUN([CF_UTMP_UT_SESSION],
@@ -3406,7 +3407,7 @@
 	AC_TRY_COMPILE([
 #include <sys/types.h>
 #include <${cf_cv_have_utmp}.h>],
-	[struct $cf_cv_have_utmp x;
+	[static struct $cf_cv_have_utmp x;
 	 long y = x.ut_session;
 	 (void)x;
 	 (void)y],
@@ -4595,7 +4596,7 @@
 fi
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_XOPEN_SOURCE version: 57 updated: 2021/01/01 16:53:59
+dnl CF_XOPEN_SOURCE version: 58 updated: 2021/05/01 17:49:36
 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,
@@ -4660,7 +4661,15 @@
 (netbsd*)
 	cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw
 	;;
-(openbsd[[4-9]]*)
+(openbsd[[6-9]]*)
+	# 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.
+	AC_MSG_WARN(this system does not provide usable locale support)
+	cf_xopen_source="-D_BSD_SOURCE"
+	cf_XOPEN_SOURCE=700
+	;;
+(openbsd[[4-5]]*)
 	# setting _XOPEN_SOURCE lower than 500 breaks g++ compile with wchar.h, needed for ncursesw
 	cf_xopen_source="-D_BSD_SOURCE"
 	cf_XOPEN_SOURCE=600
@@ -5257,12 +5266,11 @@
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF__GRANTPT_BODY version: 5 updated: 2020/03/10 18:53:47
+dnl CF__GRANTPT_BODY version: 6 updated: 2021/06/07 17:39:17
 dnl ----------------
 dnl Body for workability check of grantpt.
 define([CF__GRANTPT_BODY],[
 	int code = 0;
-	int rc;
 	int pty;
 	int tty;
 	char *slave;
@@ -5275,9 +5283,9 @@
 		failed(9);
 	else if ((pty = posix_openpt(O_RDWR)) < 0)
 		failed(1);
-	else if ((rc = grantpt(pty)) < 0)
+	else if (grantpt(pty) < 0)
 		failed(2);
-	else if ((rc = unlockpt(pty)) < 0)
+	else if (unlockpt(pty) < 0)
 		failed(3);
 	else if ((slave = ptsname(pty)) == 0)
 		failed(4);
@@ -5286,9 +5294,9 @@
 		failed(4);
 #endif
 #if CONFTEST >= 4
-    else if ((rc = tcgetattr(pty, &tio)) < 0)
+    else if (tcgetattr(pty, &tio) < 0)
 		failed(20);
-    else if ((rc = tcsetattr(pty, TCSAFLUSH, &tio)) < 0)
+    else if (tcsetattr(pty, TCSAFLUSH, &tio) < 0)
 		failed(21);
 #endif
 	/* BSD posix_openpt does not treat pty as a terminal until slave is opened.
@@ -5299,26 +5307,26 @@
 #ifdef CONFTEST
 #ifdef I_PUSH
 #if (CONFTEST == 0) || defined(CONFTEST_ptem)
-    else if ((rc = ioctl(tty, I_PUSH, "ptem")) < 0)
+    else if (ioctl(tty, I_PUSH, "ptem") < 0)
 		failed(10);
 #endif
 #if (CONFTEST == 1) || defined(CONFTEST_ldterm)
-    else if ((rc = ioctl(tty, I_PUSH, "ldterm")) < 0)
+    else if (ioctl(tty, I_PUSH, "ldterm") < 0)
 		failed(11);
 #endif
 #if (CONFTEST == 2) || defined(CONFTEST_ttcompat)
-    else if ((rc = ioctl(tty, I_PUSH, "ttcompat")) < 0)
+    else if (ioctl(tty, I_PUSH, "ttcompat") < 0)
 		failed(12);
 #endif
 #endif /* I_PUSH */
 #if CONFTEST >= 5
-    else if ((rc = tcgetattr(tty, &tio)) < 0)
+    else if (tcgetattr(tty, &tio) < 0)
 		failed(30);
-    else if ((rc = tcsetattr(tty, TCSAFLUSH, &tio)) < 0)
+    else if (tcsetattr(tty, TCSAFLUSH, &tio) < 0)
 		failed(31);
 #endif
 #endif /* CONFTEST */
-
+    (void) tty;
 	${cf_cv_main_return:-return}(code);
 ])
 dnl ---------------------------------------------------------------------------
Index: charproc.c
--- xterm-367+/charproc.c	2021-03-21 22:45:24.000000000 +0000
+++ xterm-368/charproc.c	2021-06-07 19:51:06.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: charproc.c,v 1.1830 2021/03/21 22:45:24 tom Exp $ */
+/* $XTermId: charproc.c,v 1.1832 2021/06/07 19:51:06 tom Exp $ */
 
 /*
  * Copyright 1999-2020,2021 by Thomas E. Dickey
@@ -801,6 +801,7 @@
 
 #if OPT_SCROLL_LOCK
     Bres(XtNallowScrollLock, XtCAllowScrollLock, screen.allowScrollLock0, False),
+    Bres(XtNautoScrollLock, XtCAutoScrollLock, screen.autoScrollLock, False),
 #endif
 
     /* these are used only for testing ncurses, not in the manual page */
@@ -9069,6 +9070,7 @@
     static const FlagList tblRenderFont[] =
     {
 	DATA(Default)
+	,DATA(DefaultOff)
 	,DATA_END
     };
 #undef DATA
@@ -9441,6 +9443,7 @@
 
 #if OPT_SCROLL_LOCK
     init_Bres(screen.allowScrollLock0);
+    init_Bres(screen.autoScrollLock);
 #endif
 
     init_Sres(screen.disallowedColorOps);
@@ -9837,6 +9840,8 @@
 	    wnew->work.render_font = erTrue;
 	    TRACE(("initially using TrueType font\n"));
 	}
+    } else if (wnew->work.render_font == erDefaultOff) {
+	wnew->work.render_font = erFalse;
     }
     /* minor tweak to make debug traces consistent: */
     if (wnew->work.render_font) {
Index: config.guess
--- xterm-367+/config.guess	2020-08-17 03:36:41.000000000 +0000
+++ xterm-368/config.guess	2021-01-25 20:35:13.000000000 +0000
@@ -1,8 +1,9 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2020 Free Software Foundation, Inc.
+#   Copyright 2021 Thomas E. Dickey
+#   Copyright 1992-2021 Free Software Foundation, Inc.
 
-timestamp='2020-08-17'
+timestamp='2021-01-25'
 
 # 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
@@ -27,7 +28,7 @@
 # Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
 #
 # You can get the latest version of this script from:
-# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+# https://git.savannah.gnu.org/cgit/config.git/plain/config.guess
 #
 # Please send patches to <config-patches@gnu.org>.
 
@@ -50,7 +51,7 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2020 Free Software Foundation, Inc.
+Copyright 1992-2021 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."
@@ -133,14 +134,12 @@
 
 UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
 UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
 case "$UNAME_SYSTEM" in
 Linux|GNU|GNU/*)
-	# If the system lacks a compiler, then just pick glibc.
-	# We could probably try harder.
-	LIBC=gnu
+	LIBC=unknown
 
 	set_cc_for_build
 	cat <<-EOF > "$dummy.c"
@@ -149,17 +148,29 @@
 	LIBC=uclibc
 	#elif defined(__dietlibc__)
 	LIBC=dietlibc
-	#else
+	#elif defined(__GLIBC__)
 	LIBC=gnu
+	#else
+	#include <stdarg.h>
+	/* First heuristic to detect musl libc.  */
+	#ifdef __DEFINED_va_list
+	LIBC=musl
+	#endif
 	#endif
 	EOF
 	eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`"
 
-	# If ldd exists, use it to detect musl libc.
-	if command -v ldd >/dev/null && \
-		ldd --version 2>&1 | grep -q ^musl
-	then
-	    LIBC=musl
+	# Second heuristic to detect musl libc.
+	if [ "$LIBC" = unknown ] &&
+	   command -v ldd >/dev/null &&
+	   ldd --version 2>&1 | grep -q ^musl; then
+		LIBC=musl
+	fi
+
+	# If the system lacks a compiler, then just pick glibc.
+	# We could probably try harder.
+	if [ "$LIBC" = unknown ]; then
+		LIBC=gnu
 	fi
 	;;
 esac
@@ -178,12 +189,12 @@
 	#
 	# Note: NetBSD doesn't particularly care about the vendor
 	# portion of the name.  We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
 	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
-	    "/sbin/$sysctl" 2>/dev/null || \
-	    "/usr/sbin/$sysctl" 2>/dev/null || \
+	    /sbin/sysctl -n hw.machine_arch 2>/dev/null || \
+	    /usr/sbin/sysctl -n hw.machine_arch 2>/dev/null || \
 	    echo unknown)`
 	case "$UNAME_MACHINE_ARCH" in
+	    aarch64eb) machine=aarch64_be-unknown ;;
 	    armeb) machine=armeb-unknown ;;
 	    arm*) machine=arm-unknown ;;
 	    sh3el) machine=shl-unknown ;;
@@ -575,7 +586,7 @@
 	exit ;;
     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
 	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
+	exit ;;               # Note that: echo "'$(uname -s)'" gives 'AIX '
     i*86:AIX:*:*)
 	echo i386-ibm-aix
 	exit ;;
@@ -985,6 +996,9 @@
     k1om:Linux:*:*)
 	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 	exit ;;
+    loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*)
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
     m32r*:Linux:*:*)
 	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 	exit ;;
@@ -1073,7 +1087,7 @@
     ppcle:Linux:*:*)
 	echo powerpcle-unknown-linux-"$LIBC"
 	exit ;;
-    riscv32:Linux:*:* | riscv64:Linux:*:*)
+    riscv32:Linux:*:* | riscv32be:Linux:*:* | riscv64:Linux:*:* | riscv64be:Linux:*:*)
 	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
@@ -1469,8 +1483,8 @@
     i*86:rdos:*:*)
 	echo "$UNAME_MACHINE"-pc-rdos
 	exit ;;
-    i*86:AROS:*:*)
-	echo "$UNAME_MACHINE"-pc-aros
+    *:AROS:*:*)
+	echo "$UNAME_MACHINE"-unknown-aros
 	exit ;;
     x86_64:VMkernel:*:*)
 	echo "$UNAME_MACHINE"-unknown-esx
@@ -1639,9 +1653,9 @@
 operating system you are using. If your script is old, overwrite *all*
 copies of config.guess and config.sub with the latest versions from:
 
-  https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+  https://git.savannah.gnu.org/cgit/config.git/plain/config.guess
 and
-  https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+  https://git.savannah.gnu.org/cgit/config.git/plain/config.sub
 EOF
 
 year=`echo $timestamp | sed 's,-.*,,'`
Index: config.sub
--- xterm-367+/config.sub	2020-08-17 03:36:41.000000000 +0000
+++ xterm-368/config.sub	2021-03-10 15:27:49.000000000 +0000
@@ -1,8 +1,9 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2020 Free Software Foundation, Inc.
+#   Copyright 2021 Thomas E. Dickey
+#   Copyright 1992-2021 Free Software Foundation, Inc.
 
-timestamp='2020-08-17'
+timestamp='2021-03-10'
 
 # 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
@@ -33,7 +34,7 @@
 # Otherwise, we print the canonical config type on stdout and succeed.
 
 # You can get the latest version of this script from:
-# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+# https://git.savannah.gnu.org/cgit/config.git/plain/config.sub
 
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
@@ -67,7 +68,7 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2020 Free Software Foundation, Inc.
+Copyright 1992-2021 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."
@@ -1185,6 +1186,7 @@
 			| k1om \
 			| le32 | le64 \
 			| lm32 \
+			| loongarch32 | loongarch64 | loongarchx32 \
 			| m32c | m32r | m32rle \
 			| m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \
 			| m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \
@@ -1229,7 +1231,7 @@
 			| powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \
 			| pru \
 			| pyramid \
-			| riscv | riscv32 | riscv64 \
+			| riscv | riscv32 | riscv32be | riscv64 | riscv64be \
 			| rl78 | romp | rs6000 | rx \
 			| s390 | s390x \
 			| score \
@@ -1241,6 +1243,7 @@
 			| sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \
 			| spu \
 			| tahoe \
+			| thumbv7* \
 			| tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \
 			| tron \
 			| ubicom32 \
@@ -1288,6 +1291,10 @@
 		kernel=linux
 		os=`echo $basic_os | sed -e 's|gnu/linux|gnu|'`
 		;;
+	os2-emx)
+		kernel=os2
+		os=`echo $basic_os | sed -e 's|os2-emx|emx|'`
+		;;
 	nto-qnx*)
 		kernel=nto
 		os=`echo $basic_os | sed -e 's|nto-qnx|qnx|'`
@@ -1367,13 +1374,7 @@
 		os=psos
 		;;
 	qnx*)
-		case $cpu in
-		    x86 | i*86)
-			;;
-		    *)
-			os=nto-$os
-			;;
-		esac
+		os=qnx
 		;;
 	hiux*)
 		os=hiuxwe2
@@ -1683,11 +1684,14 @@
 
 # Now, validate our (potentially fixed-up) OS.
 case $os in
-	# Sometimes we do "kernel-abi", so those need to count as OSes.
+	# Sometimes we do "kernel-libc", so those need to count as OSes.
 	musl* | newlib* | uclibc*)
 		;;
-	# Likewise for "kernel-libc"
-	eabi | eabihf | gnueabi | gnueabihf)
+	# Likewise for "kernel-abi"
+	eabi* | gnueabi*)
+		;;
+	# VxWorks passes extra cpu info in the 4th filed.
+	simlinux | simwindows | spe)
 		;;
 	# Now accept the basic system types.
 	# The portable systems comes first.
@@ -1709,7 +1713,7 @@
 	     | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \
 	     | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \
 	     | udi* | lites* | ieee* | go32* | aux* | hcos* \
-	     | chorusrdb* | cegcc* | glidix* \
+	     | chorusrdb* | cegcc* | glidix* | serenity* \
 	     | cygwin* | msys* | pe* | moss* | proelf* | rtems* \
 	     | midipix* | mingw32* | mingw64* | mint* \
 	     | uxpv* | beos* | mpeix* | udk* | moxiebox* \
@@ -1722,7 +1726,7 @@
 	     | skyos* | haiku* | rdos* | toppers* | drops* | es* \
 	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
 	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
-	     | nsk* | powerunix* | genode* | zvmoe* )
+	     | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx*)
 		;;
 	# This one is extra strict with allowed versions
 	sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
@@ -1741,6 +1745,8 @@
 case $kernel-$os in
 	linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* | linux-musl* | linux-uclibc* )
 		;;
+	uclinux-uclibc* )
+		;;
 	-dietlibc* | -newlib* | -musl* | -uclibc* )
 		# These are just libc implementations, not actual OSes, and thus
 		# require a kernel.
@@ -1749,8 +1755,12 @@
 		;;
 	kfreebsd*-gnu* | kopensolaris*-gnu*)
 		;;
+	vxworks-simlinux | vxworks-simwindows | vxworks-spe)
+		;;
 	nto-qnx*)
 		;;
+	os2-emx)
+		;;
 	*-eabi* | *-gnueabi*)
 		;;
 	-*)
Index: configure
--- xterm-367+/configure	2021-03-23 00:37:21.000000000 +0000
+++ xterm-368/configure	2021-06-07 21:41:47.000000000 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by Autoconf 2.52.20210105.
+# Generated by Autoconf 2.52.20210509.
 #
 # Copyright 2003-2020,2021	Thomas E. Dickey
 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
@@ -891,7 +891,7 @@
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.52.20210105.  Invocation command line was
+generated by GNU Autoconf 2.52.20210509.  Invocation command line was
 
   $ $0 $@
 
@@ -3836,7 +3836,16 @@
 (netbsd*)
 	cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw
 	;;
-(openbsd[4-9]*)
+(openbsd[6-9]*)
+	# 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:3843: 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
+	;;
+(openbsd[4-5]*)
 	# setting _XOPEN_SOURCE lower than 500 breaks g++ compile with wchar.h, needed for ncursesw
 	cf_xopen_source="-D_BSD_SOURCE"
 	cf_XOPEN_SOURCE=600
@@ -3863,14 +3872,14 @@
 	;;
 (*)
 
-echo "$as_me:3866: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:3875: 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 3873 "configure"
+#line 3882 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -3889,16 +3898,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3892: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3901: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3895: \$? = $ac_status" >&5
+  echo "$as_me:3904: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3898: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3907: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3901: \$? = $ac_status" >&5
+  echo "$as_me:3910: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -3910,7 +3919,7 @@
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 3913 "configure"
+#line 3922 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -3929,16 +3938,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:3932: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3941: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3935: \$? = $ac_status" >&5
+  echo "$as_me:3944: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:3938: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3947: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3941: \$? = $ac_status" >&5
+  echo "$as_me:3950: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -3953,7 +3962,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:3956: result: $cf_cv_xopen_source" >&5
+echo "$as_me:3965: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -4083,16 +4092,16 @@
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:4086: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:4095: 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}:4092: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:4101: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 4095 "configure"
+#line 4104 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4107,16 +4116,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4110: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4119: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4113: \$? = $ac_status" >&5
+  echo "$as_me:4122: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4116: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4125: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4119: \$? = $ac_status" >&5
+  echo "$as_me:4128: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -4137,7 +4146,7 @@
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 4140 "configure"
+#line 4149 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4152,16 +4161,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4155: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4164: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4158: \$? = $ac_status" >&5
+  echo "$as_me:4167: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4161: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4170: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4164: \$? = $ac_status" >&5
+  echo "$as_me:4173: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -4172,7 +4181,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:4175: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:4184: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -4180,10 +4189,10 @@
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:4183: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:4192: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 4186 "configure"
+#line 4195 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -4198,16 +4207,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4201: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4210: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4204: \$? = $ac_status" >&5
+  echo "$as_me:4213: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4207: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4216: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4210: \$? = $ac_status" >&5
+  echo "$as_me:4219: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -4223,7 +4232,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:4226: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:4235: 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
@@ -4417,7 +4426,7 @@
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:4420: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:4429: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -4427,7 +4436,7 @@
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:4430: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:4439: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -4437,7 +4446,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}:4440: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:4449: 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"
@@ -4447,10 +4456,10 @@
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-	echo "$as_me:4450: checking if _XOPEN_SOURCE really is set" >&5
+	echo "$as_me:4459: 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 4453 "configure"
+#line 4462 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -4465,16 +4474,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4468: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4477: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4471: \$? = $ac_status" >&5
+  echo "$as_me:4480: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4474: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4483: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4477: \$? = $ac_status" >&5
+  echo "$as_me:4486: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else
@@ -4483,12 +4492,12 @@
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:4486: result: $cf_XOPEN_SOURCE_set" >&5
+	echo "$as_me:4495: 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 4491 "configure"
+#line 4500 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -4503,16 +4512,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4506: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4515: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4509: \$? = $ac_status" >&5
+  echo "$as_me:4518: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4512: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4521: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4515: \$? = $ac_status" >&5
+  echo "$as_me:4524: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set_ok=yes
 else
@@ -4523,19 +4532,19 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_XOPEN_SOURCE_set_ok" = no
 		then
-			{ echo "$as_me:4526: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+			{ echo "$as_me:4535: WARNING: _XOPEN_SOURCE is lower than requested" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
 		fi
 	else
 
-echo "$as_me:4531: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:4540: 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 4538 "configure"
+#line 4547 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -4554,16 +4563,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4557: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4566: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4560: \$? = $ac_status" >&5
+  echo "$as_me:4569: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4563: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4572: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4566: \$? = $ac_status" >&5
+  echo "$as_me:4575: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -4575,7 +4584,7 @@
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 4578 "configure"
+#line 4587 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -4594,16 +4603,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4597: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4606: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4600: \$? = $ac_status" >&5
+  echo "$as_me:4609: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4603: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4612: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4606: \$? = $ac_status" >&5
+  echo "$as_me:4615: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -4618,7 +4627,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:4621: result: $cf_cv_xopen_source" >&5
+echo "$as_me:4630: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -4737,14 +4746,14 @@
 fi
 fi # cf_cv_posix_visible
 
-echo "$as_me:4740: checking if SIGWINCH is defined" >&5
+echo "$as_me:4749: 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 4747 "configure"
+#line 4756 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -4759,23 +4768,23 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4762: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4771: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4765: \$? = $ac_status" >&5
+  echo "$as_me:4774: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4768: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4777: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4771: \$? = $ac_status" >&5
+  echo "$as_me:4780: \$? = $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 4778 "configure"
+#line 4787 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -4793,16 +4802,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4796: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4805: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4799: \$? = $ac_status" >&5
+  echo "$as_me:4808: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4802: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4811: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4805: \$? = $ac_status" >&5
+  echo "$as_me:4814: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_define_sigwinch=maybe
 else
@@ -4816,11 +4825,11 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:4819: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:4828: 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:4823: checking for actual SIGWINCH definition" >&5
+echo "$as_me:4832: 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
@@ -4831,7 +4840,7 @@
 while test "$cf_sigwinch" != 1
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 4834 "configure"
+#line 4843 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -4853,16 +4862,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4856: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4865: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4859: \$? = $ac_status" >&5
+  echo "$as_me:4868: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4862: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4871: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4865: \$? = $ac_status" >&5
+  echo "$as_me:4874: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fixup_sigwinch=$cf_sigwinch
 	 break
@@ -4876,7 +4885,7 @@
 done
 
 fi
-echo "$as_me:4879: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:4888: result: $cf_cv_fixup_sigwinch" >&5
 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
 
 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
@@ -4898,23 +4907,23 @@
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:4901: checking for $ac_header" >&5
+echo "$as_me:4910: 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 4907 "configure"
+#line 4916 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:4911: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:4920: \"$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:4917: \$? = $ac_status" >&5
+  echo "$as_me:4926: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4933,7 +4942,7 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:4936: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:4945: 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
@@ -4943,13 +4952,13 @@
 fi
 done
 
-echo "$as_me:4946: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:4955: 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 4952 "configure"
+#line 4961 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -4965,16 +4974,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:4968: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4977: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4971: \$? = $ac_status" >&5
+  echo "$as_me:4980: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:4974: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4983: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4977: \$? = $ac_status" >&5
+  echo "$as_me:4986: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
@@ -4984,7 +4993,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:4987: result: $ac_cv_header_time" >&5
+echo "$as_me:4996: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -4994,13 +5003,13 @@
 
 fi
 
-echo "$as_me:4997: checking for nl_langinfo and CODESET" >&5
+echo "$as_me:5006: 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 5003 "configure"
+#line 5012 "configure"
 #include "confdefs.h"
 #include <langinfo.h>
 int
@@ -5012,16 +5021,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:5015: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5024: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5018: \$? = $ac_status" >&5
+  echo "$as_me:5027: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:5021: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5030: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5024: \$? = $ac_status" >&5
+  echo "$as_me:5033: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   am_cv_langinfo_codeset=yes
 else
@@ -5032,7 +5041,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:5035: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:5044: result: $am_cv_langinfo_codeset" >&5
 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
 	if test "$am_cv_langinfo_codeset" = yes; then
 
@@ -5044,7 +5053,7 @@
 
 ###	checks for typedefs
 
-echo "$as_me:5047: checking for signal global datatype" >&5
+echo "$as_me:5056: 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
@@ -5056,7 +5065,7 @@
 		"int"
 	do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 5059 "configure"
+#line 5068 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -5080,16 +5089,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5083: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5092: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5086: \$? = $ac_status" >&5
+  echo "$as_me:5095: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5089: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5098: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5092: \$? = $ac_status" >&5
+  echo "$as_me:5101: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sig_atomic_t=$cf_type
 else
@@ -5103,20 +5112,20 @@
 
 fi
 
-echo "$as_me:5106: result: $cf_cv_sig_atomic_t" >&5
+echo "$as_me:5115: 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:5113: checking for ANSI C header files" >&5
+echo "$as_me:5122: 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 5119 "configure"
+#line 5128 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -5124,13 +5133,13 @@
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:5127: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:5136: \"$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:5133: \$? = $ac_status" >&5
+  echo "$as_me:5142: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5152,7 +5161,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 5155 "configure"
+#line 5164 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -5170,7 +5179,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 5173 "configure"
+#line 5182 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -5191,7 +5200,7 @@
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5194 "configure"
+#line 5203 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -5217,15 +5226,15 @@
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:5220: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5229: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5223: \$? = $ac_status" >&5
+  echo "$as_me:5232: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:5225: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5234: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5228: \$? = $ac_status" >&5
+  echo "$as_me:5237: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -5238,7 +5247,7 @@
 fi
 fi
 fi
-echo "$as_me:5241: result: $ac_cv_header_stdc" >&5
+echo "$as_me:5250: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -5254,28 +5263,28 @@
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:5257: checking for $ac_header" >&5
+echo "$as_me:5266: 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 5263 "configure"
+#line 5272 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5269: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5278: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5272: \$? = $ac_status" >&5
+  echo "$as_me:5281: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5275: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5284: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5278: \$? = $ac_status" >&5
+  echo "$as_me:5287: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -5285,7 +5294,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:5288: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:5297: 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
@@ -5295,13 +5304,13 @@
 fi
 done
 
-echo "$as_me:5298: checking for time_t" >&5
+echo "$as_me:5307: 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 5304 "configure"
+#line 5313 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -5316,16 +5325,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5319: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5328: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5322: \$? = $ac_status" >&5
+  echo "$as_me:5331: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5325: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5334: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5328: \$? = $ac_status" >&5
+  echo "$as_me:5337: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_time_t=yes
 else
@@ -5335,7 +5344,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:5338: result: $ac_cv_type_time_t" >&5
+echo "$as_me:5347: 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
   :
@@ -5347,14 +5356,14 @@
 
 fi
 
-echo "$as_me:5350: checking for cc_t in <termios.h> or <termio.h>" >&5
+echo "$as_me:5359: 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 5357 "configure"
+#line 5366 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -5374,16 +5383,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5377: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5386: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5380: \$? = $ac_status" >&5
+  echo "$as_me:5389: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5383: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5392: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5386: \$? = $ac_status" >&5
+  echo "$as_me:5395: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_type_cc_t=yes
 else
@@ -5395,20 +5404,20 @@
 
 fi
 
-echo "$as_me:5398: result: $cf_cv_type_cc_t" >&5
+echo "$as_me:5407: 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:5405: checking for mode_t" >&5
+echo "$as_me:5414: 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 5411 "configure"
+#line 5420 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -5423,16 +5432,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5426: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5435: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5429: \$? = $ac_status" >&5
+  echo "$as_me:5438: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5432: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5441: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5435: \$? = $ac_status" >&5
+  echo "$as_me:5444: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_mode_t=yes
 else
@@ -5442,7 +5451,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:5445: result: $ac_cv_type_mode_t" >&5
+echo "$as_me:5454: 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
   :
@@ -5454,13 +5463,13 @@
 
 fi
 
-echo "$as_me:5457: checking for pid_t" >&5
+echo "$as_me:5466: 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 5463 "configure"
+#line 5472 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -5475,16 +5484,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5478: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5487: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5481: \$? = $ac_status" >&5
+  echo "$as_me:5490: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5484: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5493: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5487: \$? = $ac_status" >&5
+  echo "$as_me:5496: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -5494,7 +5503,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:5497: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:5506: 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
   :
@@ -5506,13 +5515,13 @@
 
 fi
 
-echo "$as_me:5509: checking for uid_t in sys/types.h" >&5
+echo "$as_me:5518: 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 5515 "configure"
+#line 5524 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -5526,7 +5535,7 @@
 rm -rf conftest*
 
 fi
-echo "$as_me:5529: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:5538: 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
 
@@ -5540,13 +5549,13 @@
 
 fi
 
-echo "$as_me:5543: checking for off_t" >&5
+echo "$as_me:5552: 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 5549 "configure"
+#line 5558 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -5561,16 +5570,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5564: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5573: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5567: \$? = $ac_status" >&5
+  echo "$as_me:5576: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5570: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5579: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5573: \$? = $ac_status" >&5
+  echo "$as_me:5582: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -5580,7 +5589,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:5583: result: $ac_cv_type_off_t" >&5
+echo "$as_me:5592: 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
   :
@@ -5612,13 +5621,13 @@
 	wcwidth
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:5615: checking for $ac_func" >&5
+echo "$as_me:5624: 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 5621 "configure"
+#line 5630 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -5649,16 +5658,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:5652: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5661: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5655: \$? = $ac_status" >&5
+  echo "$as_me:5664: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:5658: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5667: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5661: \$? = $ac_status" >&5
+  echo "$as_me:5670: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -5668,7 +5677,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:5671: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:5680: 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
@@ -5681,23 +5690,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:5684: checking for $ac_header" >&5
+echo "$as_me:5693: 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 5690 "configure"
+#line 5699 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:5694: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:5703: \"$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:5700: \$? = $ac_status" >&5
+  echo "$as_me:5709: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5716,7 +5725,7 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:5719: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:5728: 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
@@ -5726,14 +5735,14 @@
 fi
 done
 
-echo "$as_me:5729: checking for lastlog path" >&5
+echo "$as_me:5738: 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 5736 "configure"
+#line 5745 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -5753,16 +5762,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5756: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5765: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5759: \$? = $ac_status" >&5
+  echo "$as_me:5768: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5762: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5771: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5765: \$? = $ac_status" >&5
+  echo "$as_me:5774: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_path_lastlog="_PATH_LASTLOG"
 else
@@ -5777,14 +5786,14 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:5780: result: $cf_cv_path_lastlog" >&5
+echo "$as_me:5789: 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:5787: checking for utmp implementation" >&5
+echo "$as_me:5796: 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
@@ -5801,7 +5810,7 @@
 #endif
 "
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 5804 "configure"
+#line 5813 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -5817,16 +5826,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5820: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5829: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5823: \$? = $ac_status" >&5
+  echo "$as_me:5832: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5826: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5835: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5829: \$? = $ac_status" >&5
+  echo "$as_me:5838: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -5835,7 +5844,7 @@
 cat "conftest.$ac_ext" >&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 5838 "configure"
+#line 5847 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -5851,16 +5860,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5854: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5863: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5857: \$? = $ac_status" >&5
+  echo "$as_me:5866: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5860: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5869: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5863: \$? = $ac_status" >&5
+  echo "$as_me:5872: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -5875,7 +5884,7 @@
 done
 
 fi
-echo "$as_me:5878: result: $cf_cv_have_utmp" >&5
+echo "$as_me:5887: result: $cf_cv_have_utmp" >&5
 echo "${ECHO_T}$cf_cv_have_utmp" >&6
 
 if test "$cf_cv_have_utmp" != no ; then
@@ -5890,14 +5899,14 @@
 EOF
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:5893: checking if ${cf_cv_have_utmp}.ut_host is declared" >&5
+echo "$as_me:5902: 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 5900 "configure"
+#line 5909 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -5914,16 +5923,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5917: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5926: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5920: \$? = $ac_status" >&5
+  echo "$as_me:5929: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5923: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5932: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5926: \$? = $ac_status" >&5
+  echo "$as_me:5935: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_host=yes
 else
@@ -5935,7 +5944,7 @@
 
 fi
 
-echo "$as_me:5938: result: $cf_cv_have_utmp_ut_host" >&5
+echo "$as_me:5947: 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
@@ -5945,14 +5954,14 @@
 fi
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:5948: checking if ${cf_cv_have_utmp}.ut_syslen is declared" >&5
+echo "$as_me:5957: 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 5955 "configure"
+#line 5964 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -5969,16 +5978,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5972: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5981: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5975: \$? = $ac_status" >&5
+  echo "$as_me:5984: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5978: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5987: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5981: \$? = $ac_status" >&5
+  echo "$as_me:5990: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_syslen=yes
 else
@@ -5990,7 +5999,7 @@
 
 fi
 
-echo "$as_me:5993: result: $cf_cv_have_utmp_ut_syslen" >&5
+echo "$as_me:6002: 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
@@ -6000,7 +6009,7 @@
 fi
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:6003: checking if ${cf_cv_have_utmp}.ut_name is declared" >&5
+echo "$as_me:6012: 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
@@ -6017,7 +6026,7 @@
 "
 for cf_header in ut_name ut_user ; do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 6020 "configure"
+#line 6029 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -6033,16 +6042,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6036: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6045: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6039: \$? = $ac_status" >&5
+  echo "$as_me:6048: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6042: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6051: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6045: \$? = $ac_status" >&5
+  echo "$as_me:6054: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_name=$cf_header
 	 break
@@ -6054,12 +6063,12 @@
 done
 
 fi
-echo "$as_me:6057: result: $cf_cv_have_utmp_ut_name" >&5
+echo "$as_me:6066: 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:6062: error: Cannot find declaration for ut.ut_name" >&5
+	{ { echo "$as_me:6071: 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; }; }
 	;;
@@ -6074,7 +6083,7 @@
 fi
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:6077: checking for exit-status in $cf_cv_have_utmp" >&5
+echo "$as_me:6086: 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
@@ -6087,7 +6096,7 @@
 	ut_exit.ut_exit
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6090 "configure"
+#line 6099 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -6104,16 +6113,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6107: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6116: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6110: \$? = $ac_status" >&5
+  echo "$as_me:6119: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6113: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6122: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6116: \$? = $ac_status" >&5
+  echo "$as_me:6125: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_xstatus=$cf_result
 	 break
@@ -6126,7 +6135,7 @@
 done
 
 fi
-echo "$as_me:6129: result: $cf_cv_have_utmp_ut_xstatus" >&5
+echo "$as_me:6138: 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
 
@@ -6142,14 +6151,14 @@
 fi
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:6145: checking if ${cf_cv_have_utmp}.ut_xtime is declared" >&5
+echo "$as_me:6154: 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 6152 "configure"
+#line 6161 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -6166,23 +6175,23 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6169: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6178: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6172: \$? = $ac_status" >&5
+  echo "$as_me:6181: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6175: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6184: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6178: \$? = $ac_status" >&5
+  echo "$as_me:6187: \$? = $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 6185 "configure"
+#line 6194 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -6199,16 +6208,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6202: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6211: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6205: \$? = $ac_status" >&5
+  echo "$as_me:6214: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6208: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6217: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6211: \$? = $ac_status" >&5
+  echo "$as_me:6220: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_xtime=define
 else
@@ -6222,7 +6231,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:6225: result: $cf_cv_have_utmp_ut_xtime" >&5
+echo "$as_me:6234: 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
 
@@ -6241,14 +6250,14 @@
 fi
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:6244: checking if ${cf_cv_have_utmp}.ut_session is declared" >&5
+echo "$as_me:6253: 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 6251 "configure"
+#line 6260 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -6256,7 +6265,7 @@
 int
 main (void)
 {
-struct $cf_cv_have_utmp x;
+static struct $cf_cv_have_utmp x;
 	 long y = x.ut_session;
 	 (void)x;
 	 (void)y
@@ -6265,16 +6274,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6268: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6277: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6271: \$? = $ac_status" >&5
+  echo "$as_me:6280: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6274: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6283: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6277: \$? = $ac_status" >&5
+  echo "$as_me:6286: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_session=yes
 else
@@ -6285,7 +6294,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:6288: result: $cf_cv_have_utmp_ut_session" >&5
+echo "$as_me:6297: 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
 
@@ -6296,7 +6305,7 @@
 fi
 fi
 
-echo "$as_me:6299: checking if $cf_cv_have_utmp is SYSV flavor" >&5
+echo "$as_me:6308: 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
@@ -6304,7 +6313,7 @@
 
 test "$cf_cv_have_utmp" = "utmp" && cf_prefix="ut" || cf_prefix="utx"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6307 "configure"
+#line 6316 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -6323,16 +6332,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6326: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6335: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6329: \$? = $ac_status" >&5
+  echo "$as_me:6338: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6332: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6341: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6335: \$? = $ac_status" >&5
+  echo "$as_me:6344: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sysv_utmp=yes
 else
@@ -6343,7 +6352,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:6346: result: $cf_cv_sysv_utmp" >&5
+echo "$as_me:6355: result: $cf_cv_sysv_utmp" >&5
 echo "${ECHO_T}$cf_cv_sysv_utmp" >&6
 test "$cf_cv_sysv_utmp" = yes &&
 cat >>confdefs.h <<\EOF
@@ -6355,23 +6364,23 @@
 for ac_header in lastlog.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6358: checking for $ac_header" >&5
+echo "$as_me:6367: 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 6364 "configure"
+#line 6373 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:6368: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:6377: \"$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:6374: \$? = $ac_status" >&5
+  echo "$as_me:6383: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6390,7 +6399,7 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:6393: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6402: 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
@@ -6400,7 +6409,7 @@
 fi
 done
 
-echo "$as_me:6403: checking for struct lastlog" >&5
+echo "$as_me:6412: 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
@@ -6411,7 +6420,7 @@
 cf_cv_struct_lastlog=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6414 "configure"
+#line 6423 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -6425,15 +6434,15 @@
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:6428: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6437: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6431: \$? = $ac_status" >&5
+  echo "$as_me:6440: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:6433: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6442: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6436: \$? = $ac_status" >&5
+  echo "$as_me:6445: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 cf_cv_struct_lastlog=yes
@@ -6447,7 +6456,7 @@
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:6450: result: $cf_cv_struct_lastlog" >&5
+echo "$as_me:6459: result: $cf_cv_struct_lastlog" >&5
 echo "${ECHO_T}$cf_cv_struct_lastlog" >&6
 
 test $cf_cv_struct_lastlog != no &&
@@ -6460,23 +6469,23 @@
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6463: checking for $ac_header" >&5
+echo "$as_me:6472: 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 6469 "configure"
+#line 6478 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:6473: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:6482: \"$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:6479: \$? = $ac_status" >&5
+  echo "$as_me:6488: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6495,7 +6504,7 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:6498: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6507: 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
@@ -6505,14 +6514,14 @@
 fi
 done
 
-echo "$as_me:6508: checking if POSIX saved-ids are supported" >&5
+echo "$as_me:6517: 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 6515 "configure"
+#line 6524 "configure"
 #include "confdefs.h"
 
 #include <unistd.h>
@@ -6542,16 +6551,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6545: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6554: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6548: \$? = $ac_status" >&5
+  echo "$as_me:6557: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6551: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6560: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6554: \$? = $ac_status" >&5
+  echo "$as_me:6563: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_saved_ids=yes
 
@@ -6563,7 +6572,7 @@
   cf_cv_posix_saved_ids=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6566 "configure"
+#line 6575 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -6579,15 +6588,15 @@
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:6582: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6591: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6585: \$? = $ac_status" >&5
+  echo "$as_me:6594: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:6587: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6596: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6590: \$? = $ac_status" >&5
+  echo "$as_me:6599: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_saved_ids=yes
 else
@@ -6603,7 +6612,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:6606: result: $cf_cv_posix_saved_ids" >&5
+echo "$as_me:6615: result: $cf_cv_posix_saved_ids" >&5
 echo "${ECHO_T}$cf_cv_posix_saved_ids" >&6
 
 test "$cf_cv_posix_saved_ids" = yes &&
@@ -6642,23 +6651,23 @@
 for ac_header in termcap.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6645: checking for $ac_header" >&5
+echo "$as_me:6654: 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 6651 "configure"
+#line 6660 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:6655: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:6664: \"$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:6661: \$? = $ac_status" >&5
+  echo "$as_me:6670: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6677,7 +6686,7 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:6680: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6689: 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
@@ -6687,7 +6696,7 @@
 fi
 done
 
-echo "$as_me:6690: checking if we want full tgetent function" >&5
+echo "$as_me:6699: 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.
@@ -6704,7 +6713,7 @@
 	cf_full_tgetent=yes
 
 fi;
-echo "$as_me:6707: result: $cf_full_tgetent" >&5
+echo "$as_me:6716: result: $cf_full_tgetent" >&5
 echo "${ECHO_T}$cf_full_tgetent" >&6
 
 if test "$cf_full_tgetent" = yes ; then
@@ -6713,7 +6722,7 @@
 	cf_test_message="tgetent"
 fi
 
-echo "$as_me:6716: checking for $cf_test_message function" >&5
+echo "$as_me:6725: 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
@@ -6751,7 +6760,7 @@
   echo "cross-compiling, cannot verify if a termcap/tgetent is present in $cf_termlib" 1>&5
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6754 "configure"
+#line 6763 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_TERMCAP_H
@@ -6769,15 +6778,15 @@
 	${cf_cv_main_return:-return} ($cf_TERMTST); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:6772: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6781: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6775: \$? = $ac_status" >&5
+  echo "$as_me:6784: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:6777: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6786: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6780: \$? = $ac_status" >&5
+  echo "$as_me:6789: \$? = $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
@@ -6798,7 +6807,7 @@
 LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:6801: result: $cf_cv_lib_tgetent" >&5
+echo "$as_me:6810: 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.
@@ -6830,7 +6839,7 @@
 
 	if test "$cf_full_tgetent" = no ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 6833 "configure"
+#line 6842 "configure"
 #include "confdefs.h"
 
 #include <termcap.h>
@@ -6846,16 +6855,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:6849: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6858: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6852: \$? = $ac_status" >&5
+  echo "$as_me:6861: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:6855: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6864: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6858: \$? = $ac_status" >&5
+  echo "$as_me:6867: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cat >>confdefs.h <<\EOF
 #define HAVE_TERMCAP_H 1
@@ -6871,23 +6880,23 @@
 for ac_header in termcap.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6874: checking for $ac_header" >&5
+echo "$as_me:6883: 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 6880 "configure"
+#line 6889 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:6884: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:6893: \"$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:6890: \$? = $ac_status" >&5
+  echo "$as_me:6899: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6906,7 +6915,7 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:6909: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6918: 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
@@ -6923,7 +6932,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:6926: checking for partial tgetent function" >&5
+	echo "$as_me:6935: 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
@@ -6933,7 +6942,7 @@
 	for cf_termlib in $cf_TERMLIB ; do
 		LIBS="$cf_save_LIBS -l$cf_termlib"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 6936 "configure"
+#line 6945 "configure"
 #include "confdefs.h"
 
 int
@@ -6945,16 +6954,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6948: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6957: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6951: \$? = $ac_status" >&5
+  echo "$as_me:6960: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6954: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6963: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6957: \$? = $ac_status" >&5
+  echo "$as_me:6966: \$? = $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"
@@ -6968,7 +6977,7 @@
 	LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:6971: result: $cf_cv_lib_part_tgetent" >&5
+echo "$as_me:6980: 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
@@ -6992,23 +7001,23 @@
 for ac_header in termcap.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6995: checking for $ac_header" >&5
+echo "$as_me:7004: 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 7001 "configure"
+#line 7010 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:7005: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:7014: \"$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:7011: \$? = $ac_status" >&5
+  echo "$as_me:7020: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7027,7 +7036,7 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:7030: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:7039: 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
@@ -7047,7 +7056,7 @@
 	fi
 fi
 
-echo "$as_me:7050: checking for X applications class" >&5
+echo "$as_me:7059: 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.
@@ -7060,23 +7069,23 @@
 
 case x$APP_CLASS in
 (*[/@,%]*)
-	{ echo "$as_me:7063: WARNING: X applications class cannot contain punctuation" >&5
+	{ echo "$as_me:7072: 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:7070: WARNING: X applications class must start with capital, ignoring $APP_CLASS" >&5
+	{ echo "$as_me:7079: 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:7076: result: $APP_CLASS" >&5
+echo "$as_me:7085: result: $APP_CLASS" >&5
 echo "${ECHO_T}$APP_CLASS" >&6
 
-echo "$as_me:7079: checking for directory to install resource files" >&5
+echo "$as_me:7088: 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.
@@ -7140,7 +7149,7 @@
 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:7143: error: expected a pathname, not \"$cf_path\"" >&5
+	{ { echo "$as_me:7152: error: expected a pathname, not \"$cf_path\"" >&5
 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -7148,7 +7157,7 @@
 
 fi
 
-echo "$as_me:7151: result: $APPSDIR" >&5
+echo "$as_me:7160: result: $APPSDIR" >&5
 echo "${ECHO_T}$APPSDIR" >&6
 
 no_appsdir=
@@ -7159,7 +7168,7 @@
 	EXTRA_INSTALL_DIRS="$EXTRA_INSTALL_DIRS \$(APPSDIR)"
 fi
 
-echo "$as_me:7162: checking for the icon name" >&5
+echo "$as_me:7171: 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.
@@ -7175,10 +7184,10 @@
 	;;
 esac
 
-echo "$as_me:7178: result: $ICON_NAME" >&5
+echo "$as_me:7187: result: $ICON_NAME" >&5
 echo "${ECHO_T}$ICON_NAME" >&6
 
-echo "$as_me:7181: checking for icon symlink to use" >&5
+echo "$as_me:7190: 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.
@@ -7197,7 +7206,7 @@
 	;;
 esac
 
-echo "$as_me:7200: result: $ICON_SYMLINK" >&5
+echo "$as_me:7209: result: $ICON_SYMLINK" >&5
 echo "${ECHO_T}$ICON_SYMLINK" >&6
 
 # Install all icons except for the overused "terminal".
@@ -7213,20 +7222,20 @@
 	esac
 	test -n "$verbose" && echo "	adding $cf_icon_name to icon-list" 1>&6
 
-echo "${as_me:-configure}:7216: testing adding $cf_icon_name to icon-list ..." 1>&5
+echo "${as_me:-configure}:7225: 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}:7223: testing adding ${cf_icon_name}_48x48 to icon-list ..." 1>&5
+echo "${as_me:-configure}:7232: 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:7229: checking for directory to install pixmaps" >&5
+echo "$as_me:7238: 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.
@@ -7277,14 +7286,14 @@
 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:7280: error: expected a pathname, not \"$cf_path\"" >&5
+	{ { echo "$as_me:7289: 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:7287: result: $PIXMAPDIR" >&5
+echo "$as_me:7296: result: $PIXMAPDIR" >&5
 echo "${ECHO_T}$PIXMAPDIR" >&6
 
 no_pixmapdir=
@@ -7295,7 +7304,7 @@
 	EXTRA_INSTALL_DIRS="$EXTRA_INSTALL_DIRS \$(PIXMAPDIR)"
 fi
 
-echo "$as_me:7298: checking for directory to install icons" >&5
+echo "$as_me:7307: 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.
@@ -7346,14 +7355,14 @@
 	cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:7349: error: expected a pathname, not \"$cf_path\"" >&5
+	{ { echo "$as_me:7358: 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:7356: result: $ICONDIR" >&5
+echo "$as_me:7365: result: $ICONDIR" >&5
 echo "${ECHO_T}$ICONDIR" >&6
 
 no_icondir=
@@ -7364,7 +7373,7 @@
 	EXTRA_INSTALL_DIRS="$EXTRA_INSTALL_DIRS \$(ICONDIR)"
 fi
 
-echo "$as_me:7367: checking if icon theme should be used" >&5
+echo "$as_me:7376: 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.
@@ -7382,7 +7391,7 @@
 	ICON_THEME=hicolor
 	;;
 esac
-echo "$as_me:7385: result: $ICON_THEME" >&5
+echo "$as_me:7394: result: $ICON_THEME" >&5
 echo "${ECHO_T}$ICON_THEME" >&6
 
 if test "x$ICON_THEME" = xno
@@ -7391,14 +7400,14 @@
 	then
 		test -n "$verbose" && echo "	ignoring icondir without theme" 1>&6
 
-echo "${as_me:-configure}:7394: testing ignoring icondir without theme ..." 1>&5
+echo "${as_me:-configure}:7403: testing ignoring icondir without theme ..." 1>&5
 
 		no_icondir="#"
 	fi
 else
 	if test "x$ICONDIR" = xno
 	then
-		{ { echo "$as_me:7401: error: icondir must be set for icon theme" >&5
+		{ { echo "$as_me:7410: 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
@@ -7415,13 +7424,13 @@
 	cf_icon_list="icons/${ICON_NAME}_48x48"
 fi
 
-echo "$as_me:7418: checking for icon(s) to install" >&5
+echo "$as_me:7427: 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}:7424: testing using $ICON_FORMAT ..." 1>&5
+echo "${as_me:-configure}:7433: testing using $ICON_FORMAT ..." 1>&5
 
 	for cf_suffix in $ICON_FORMAT
 	do
@@ -7454,7 +7463,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:7457: WARNING: cannot determine size of $cf_left" >&5
+					{ echo "$as_me:7466: WARNING: cannot determine size of $cf_left" >&5
 echo "$as_me: WARNING: cannot determine size of $cf_left" >&2;}
 					continue
 				fi
@@ -7466,7 +7475,7 @@
 			(*.xpm)
 				test -n "$verbose" && echo "	ignored XPM file in icon theme" 1>&6
 
-echo "${as_me:-configure}:7469: testing ignored XPM file in icon theme ..." 1>&5
+echo "${as_me:-configure}:7478: testing ignored XPM file in icon theme ..." 1>&5
 
 				continue
 				;;
@@ -7478,7 +7487,7 @@
 			esac
 			test -n "$verbose" && echo "	adding $cf_next" 1>&6
 
-echo "${as_me:-configure}:7481: testing adding $cf_next ..." 1>&5
+echo "${as_me:-configure}:7490: testing adding $cf_next ..." 1>&5
 
 			cf_icon="${cf_icon}:${cf_next}"
 		fi
@@ -7493,26 +7502,26 @@
 
 if test -n "$verbose"
 then
-	echo "$as_me:7496: checking result" >&5
+	echo "$as_me:7505: checking result" >&5
 echo $ECHO_N "checking result... $ECHO_C" >&6
 fi
-echo "$as_me:7499: result: $ICON_LIST" >&5
+echo "$as_me:7508: result: $ICON_LIST" >&5
 echo "${ECHO_T}$ICON_LIST" >&6
 
 if test -z "$ICON_LIST"
 then
-	{ { echo "$as_me:7504: error: no icons found" >&5
+	{ { echo "$as_me:7513: error: no icons found" >&5
 echo "$as_me: error: no icons found" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-echo "$as_me:7509: checking for icon name" >&5
+echo "$as_me:7518: checking for icon name" >&5
 echo $ECHO_N "checking for icon name... $ECHO_C" >&6
-echo "$as_me:7511: result: $ICON_NAME" >&5
+echo "$as_me:7520: 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:7515: checking if you want to install desktop files" >&5
+echo "$as_me:7524: 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.
@@ -7529,14 +7538,14 @@
 	enable_desktop=$enableval
 
 fi;
-echo "$as_me:7532: result: $enable_desktop" >&5
+echo "$as_me:7541: 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:7539: checking for $ac_word" >&5
+echo "$as_me:7548: 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
@@ -7551,7 +7560,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_desktop_utils="yes"
-echo "$as_me:7554: found $ac_dir/$ac_word" >&5
+echo "$as_me:7563: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -7560,10 +7569,10 @@
 fi
 desktop_utils=$ac_cv_prog_desktop_utils
 if test -n "$desktop_utils"; then
-  echo "$as_me:7563: result: $desktop_utils" >&5
+  echo "$as_me:7572: result: $desktop_utils" >&5
 echo "${ECHO_T}$desktop_utils" >&6
 else
-  echo "$as_me:7566: result: no" >&5
+  echo "$as_me:7575: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -7573,7 +7582,7 @@
 
 if test -z "$desktop_utils"
 then
-	echo "$as_me:7576: checking for requested desktop-category" >&5
+	echo "$as_me:7585: 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.
@@ -7583,7 +7592,7 @@
 else
   cf_desktop_want=auto
 fi;
-	echo "$as_me:7586: result: $cf_desktop_want" >&5
+	echo "$as_me:7595: result: $cf_desktop_want" >&5
 echo "${ECHO_T}$cf_desktop_want" >&6
 
 	if test "$cf_desktop_want" = auto
@@ -7606,7 +7615,7 @@
 					(xterm|*-xterm|*rxvt*|*konsole|*[Tt]erminal)
 						test -n "$verbose" && echo "	inspect $cf_desktop_path" 1>&6
 
-echo "${as_me:-configure}:7609: testing inspect $cf_desktop_path ..." 1>&5
+echo "${as_me:-configure}:7618: testing inspect $cf_desktop_path ..." 1>&5
 
 						${EGREP-egrep} '^Categories=' "$cf_desktop_path" | \
 							tr ';' '\n' | \
@@ -7637,14 +7646,14 @@
 				(Qt*|*Xfce*|*[ABCDEFGHIJKLMNOPQRSTUVWXYZ][ABCDEFGHIJKLMNOPQRSTUVWXYZ]*)
 					test -n "$verbose" && echo "	ignored $cf_desktop_this" 1>&6
 
-echo "${as_me:-configure}:7640: testing ignored $cf_desktop_this ..." 1>&5
+echo "${as_me:-configure}:7649: 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}:7647: testing applied $cf_desktop_this ..." 1>&5
+echo "${as_me:-configure}:7656: testing applied $cf_desktop_this ..." 1>&5
 
 					test "x$cf_desktop_last" != "x$cf_desktop_this" && echo "$cf_desktop_this" >>conftest.2
 					;;
@@ -7671,18 +7680,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}:7674: testing no usable value found for desktop category ..." 1>&5
+echo "${as_me:-configure}:7683: 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}:7681: testing will use Categories=$DESKTOP_CATEGORY ..." 1>&5
+echo "${as_me:-configure}:7690: testing will use Categories=$DESKTOP_CATEGORY ..." 1>&5
 
 fi
 
-echo "$as_me:7685: checking for install-permissions reference" >&5
+echo "$as_me:7694: 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.
@@ -7692,19 +7701,19 @@
 else
   with_reference=xterm
 fi;
-echo "$as_me:7695: result: $with_reference" >&5
+echo "$as_me:7704: result: $with_reference" >&5
 echo "${ECHO_T}$with_reference" >&6
 
 with_full_paths=yes
 
-	echo "$as_me:7700: checking for PATH separator" >&5
+	echo "$as_me:7709: 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:7707: result: $PATH_SEPARATOR" >&5
+	echo "$as_me:7716: result: $PATH_SEPARATOR" >&5
 echo "${ECHO_T}$PATH_SEPARATOR" >&6
 
 test -z "$XTERM_PATH" && XTERM_PATH="$with_reference"
@@ -7712,7 +7721,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:7715: checking for $ac_word" >&5
+echo "$as_me:7724: 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
@@ -7729,7 +7738,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:7732: found $ac_dir/$ac_word" >&5
+   echo "$as_me:7741: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -7740,10 +7749,10 @@
 XTERM_PATH=$ac_cv_path_XTERM_PATH
 
 if test -n "$XTERM_PATH"; then
-  echo "$as_me:7743: result: $XTERM_PATH" >&5
+  echo "$as_me:7752: result: $XTERM_PATH" >&5
 echo "${ECHO_T}$XTERM_PATH" >&6
 else
-  echo "$as_me:7746: result: no" >&5
+  echo "$as_me:7755: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -7802,7 +7811,7 @@
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:7805: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:7814: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define XTERM_PATH_PATH "$cf_path_prog"
@@ -7823,7 +7832,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:7826: checking for symbolic link to create to $cf_name" >&5
+echo "$as_me:7835: 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.
@@ -7833,7 +7842,7 @@
 else
   with_symlink=xterm
 fi;
-echo "$as_me:7836: result: $with_symlink" >&5
+echo "$as_me:7845: result: $with_symlink" >&5
 echo "${ECHO_T}$with_symlink" >&6
 test "$with_symlink" = yes && with_symlink=xterm
 test -n "$with_symlink" && \
@@ -7842,7 +7851,7 @@
 	XTERM_SYMLINK="$with_symlink"
 fi
 
-echo "$as_me:7845: checking if you want to disable openpty" >&5
+echo "$as_me:7854: 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.
@@ -7859,10 +7868,10 @@
 	disable_openpty=no
 
 fi;
-echo "$as_me:7862: result: $disable_openpty" >&5
+echo "$as_me:7871: result: $disable_openpty" >&5
 echo "${ECHO_T}$disable_openpty" >&6
 
-echo "$as_me:7865: checking if you want to disable setuid" >&5
+echo "$as_me:7874: 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.
@@ -7879,10 +7888,10 @@
 	disable_setuid=no
 
 fi;
-echo "$as_me:7882: result: $disable_setuid" >&5
+echo "$as_me:7891: result: $disable_setuid" >&5
 echo "${ECHO_T}$disable_setuid" >&6
 
-echo "$as_me:7885: checking if you want to disable setgid" >&5
+echo "$as_me:7894: 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.
@@ -7899,10 +7908,10 @@
 	disable_setgid=no
 
 fi;
-echo "$as_me:7902: result: $disable_setgid" >&5
+echo "$as_me:7911: result: $disable_setgid" >&5
 echo "${ECHO_T}$disable_setgid" >&6
 
-echo "$as_me:7905: checking if you want to run xterm setuid to a given user" >&5
+echo "$as_me:7914: 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.
@@ -7912,7 +7921,7 @@
 else
   use_given_setuid=no
 fi;
-echo "$as_me:7915: result: $use_given_setuid" >&5
+echo "$as_me:7924: result: $use_given_setuid" >&5
 echo "${ECHO_T}$use_given_setuid" >&6
 
 if test "$use_given_setuid" != no ; then
@@ -7925,7 +7934,7 @@
 	SINSTALL_OPTS="$SINSTALL_OPTS u+s -u $cf_cv_given_setuid"
 fi
 
-echo "$as_me:7928: checking if you want to run xterm setgid to match utmp/utmpx file" >&5
+echo "$as_me:7937: 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.
@@ -7935,14 +7944,14 @@
 else
   use_utmp_setgid=no
 fi;
-echo "$as_me:7938: result: $use_utmp_setgid" >&5
+echo "$as_me:7947: 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:7945: checking for utmp/utmpx group" >&5
+echo "$as_me:7954: 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
@@ -7984,10 +7993,10 @@
 done
 
 fi
-echo "$as_me:7987: result: $cf_cv_utmp_group" >&5
+echo "$as_me:7996: result: $cf_cv_utmp_group" >&5
 echo "${ECHO_T}$cf_cv_utmp_group" >&6
 else
-	{ { echo "$as_me:7990: error: cannot find utmp group" >&5
+	{ { echo "$as_me:7999: error: cannot find utmp group" >&5
 echo "$as_me: error: cannot find utmp group" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -7996,7 +8005,7 @@
 		cf_cv_utmp_group=$use_utmp_setgid
 	fi
 	if test "$cf_cv_posix_saved_ids" != yes ; then
-		{ { echo "$as_me:7999: error: Your system does not support POSIX saved-ids" >&5
+		{ { echo "$as_me:8008: 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
@@ -8008,7 +8017,7 @@
 	SINSTALL_OPTS="$SINSTALL_OPTS g+s -g $cf_cv_utmp_group"
 fi
 
-echo "$as_me:8011: checking if you want to link with utempter" >&5
+echo "$as_me:8020: 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.
@@ -8018,12 +8027,12 @@
 else
   use_utempter=no
 fi;
-echo "$as_me:8021: result: $use_utempter" >&5
+echo "$as_me:8030: result: $use_utempter" >&5
 echo "${ECHO_T}$use_utempter" >&6
 
 if test "$use_utempter" = yes ; then
 
-echo "$as_me:8026: checking if we can link with utempter library" >&5
+echo "$as_me:8035: 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
@@ -8048,7 +8057,7 @@
 LIBS="$cf_add_libs"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8051 "configure"
+#line 8060 "configure"
 #include "confdefs.h"
 
 #include <utempter.h>
@@ -8065,16 +8074,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8068: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8077: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8071: \$? = $ac_status" >&5
+  echo "$as_me:8080: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8074: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8083: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8077: \$? = $ac_status" >&5
+  echo "$as_me:8086: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_have_utempter=yes
@@ -8088,7 +8097,7 @@
 LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:8091: result: $cf_cv_have_utempter" >&5
+echo "$as_me:8100: result: $cf_cv_have_utempter" >&5
 echo "${ECHO_T}$cf_cv_have_utempter" >&6
 if test "$cf_cv_have_utempter" = yes ; then
 
@@ -8126,21 +8135,21 @@
 		disable_setuid=yes
 		test -n "$verbose" && echo "	No --disable-setuid option given, force to yes" 1>&6
 
-echo "${as_me:-configure}:8129: testing No --disable-setuid option given, force to yes ..." 1>&5
+echo "${as_me:-configure}:8138: testing No --disable-setuid option given, force to yes ..." 1>&5
 
 	fi
 fi
 
 ###	checks for external data
 
-echo "$as_me:8136: checking if external errno is declared" >&5
+echo "$as_me:8145: 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 8143 "configure"
+#line 8152 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -8158,16 +8167,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8161: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8170: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8164: \$? = $ac_status" >&5
+  echo "$as_me:8173: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8167: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8176: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8170: \$? = $ac_status" >&5
+  echo "$as_me:8179: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -8178,7 +8187,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:8181: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:8190: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -8193,14 +8202,14 @@
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:8196: checking if external errno exists" >&5
+echo "$as_me:8205: 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 8203 "configure"
+#line 8212 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -8215,16 +8224,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8218: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8227: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8221: \$? = $ac_status" >&5
+  echo "$as_me:8230: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8224: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8233: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8227: \$? = $ac_status" >&5
+  echo "$as_me:8236: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_errno=yes
 else
@@ -8235,7 +8244,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:8238: result: $cf_cv_have_errno" >&5
+echo "$as_me:8247: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -8248,7 +8257,7 @@
 
 fi
 
-echo "$as_me:8251: checking for explicit tty group name" >&5
+echo "$as_me:8260: 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.
@@ -8260,11 +8269,11 @@
 fi;
 test -z "$cf_tty_group"    && cf_tty_group=auto...
 test "$cf_tty_group" = yes && cf_tty_group=auto...
-echo "$as_me:8263: result: $cf_tty_group" >&5
+echo "$as_me:8272: result: $cf_tty_group" >&5
 echo "${ECHO_T}$cf_tty_group" >&6
 
 if test "$cf_tty_group" = "auto..." ; then
-echo "$as_me:8267: checking for tty group name" >&5
+echo "$as_me:8276: 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
@@ -8317,7 +8326,7 @@
 fi
 
 fi
-echo "$as_me:8320: result: $cf_cv_tty_group_name" >&5
+echo "$as_me:8329: 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
@@ -8337,7 +8346,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:8340: checking if we may use the $cf_tty_group group" >&5
+echo "$as_me:8349: 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
@@ -8350,7 +8359,7 @@
   cf_cv_tty_group=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 8353 "configure"
+#line 8362 "configure"
 #include "confdefs.h"
 
 #include <unistd.h>
@@ -8386,15 +8395,15 @@
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:8389: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8398: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8392: \$? = $ac_status" >&5
+  echo "$as_me:8401: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:8394: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8403: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8397: \$? = $ac_status" >&5
+  echo "$as_me:8406: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_tty_group=yes
 else
@@ -8412,11 +8421,11 @@
 fi
 
 fi
-echo "$as_me:8415: result: $cf_cv_tty_group" >&5
+echo "$as_me:8424: 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:8419: WARNING: Cannot use $cf_tty_group group" >&5
+	{ echo "$as_me:8428: WARNING: Cannot use $cf_tty_group group" >&5
 echo "$as_me: WARNING: Cannot use $cf_tty_group group" >&2;}
 else
 	cat >>confdefs.h <<\EOF
@@ -8427,7 +8436,7 @@
 
 ###	checks for system services and user specified options
 
-echo "$as_me:8430: checking for X" >&5
+echo "$as_me:8439: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -8531,17 +8540,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 8534 "configure"
+#line 8543 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:8538: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:8547: \"$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:8544: \$? = $ac_status" >&5
+  echo "$as_me:8553: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8574,7 +8583,7 @@
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 8577 "configure"
+#line 8586 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -8586,16 +8595,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8589: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8598: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8592: \$? = $ac_status" >&5
+  echo "$as_me:8601: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8595: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8604: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8598: \$? = $ac_status" >&5
+  echo "$as_me:8607: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -8633,7 +8642,7 @@
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:8636: result: $have_x" >&5
+  echo "$as_me:8645: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -8643,7 +8652,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:8646: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:8655: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -8670,11 +8679,11 @@
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:8673: checking whether -R must be followed by a space" >&5
+      echo "$as_me:8682: 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 8677 "configure"
+#line 8686 "configure"
 #include "confdefs.h"
 
 int
@@ -8686,16 +8695,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8689: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8698: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8692: \$? = $ac_status" >&5
+  echo "$as_me:8701: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8695: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8704: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8698: \$? = $ac_status" >&5
+  echo "$as_me:8707: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_nospace=yes
 else
@@ -8705,13 +8714,13 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
       if test $ac_R_nospace = yes; then
-	echo "$as_me:8708: result: no" >&5
+	echo "$as_me:8717: 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 8714 "configure"
+#line 8723 "configure"
 #include "confdefs.h"
 
 int
@@ -8723,16 +8732,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8726: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8735: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8729: \$? = $ac_status" >&5
+  echo "$as_me:8738: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8732: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8741: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8735: \$? = $ac_status" >&5
+  echo "$as_me:8744: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_space=yes
 else
@@ -8742,11 +8751,11 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	if test $ac_R_space = yes; then
-	  echo "$as_me:8745: result: yes" >&5
+	  echo "$as_me:8754: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:8749: result: neither works" >&5
+	  echo "$as_me:8758: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -8766,7 +8775,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 8769 "configure"
+#line 8778 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8785,22 +8794,22 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8788: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8797: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8791: \$? = $ac_status" >&5
+  echo "$as_me:8800: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8794: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8803: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8797: \$? = $ac_status" >&5
+  echo "$as_me:8806: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:8803: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:8812: 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
@@ -8808,7 +8817,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8811 "configure"
+#line 8820 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8827,16 +8836,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8830: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8839: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8833: \$? = $ac_status" >&5
+  echo "$as_me:8842: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8836: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8845: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8839: \$? = $ac_status" >&5
+  echo "$as_me:8848: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -8847,14 +8856,14 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8850: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:8859: 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:8857: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:8866: 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
@@ -8862,7 +8871,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8865 "configure"
+#line 8874 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8881,16 +8890,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8884: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8893: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8887: \$? = $ac_status" >&5
+  echo "$as_me:8896: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8890: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8899: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8893: \$? = $ac_status" >&5
+  echo "$as_me:8902: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -8901,7 +8910,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8904: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:8913: 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"
@@ -8920,13 +8929,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:8923: checking for gethostbyname" >&5
+    echo "$as_me:8932: 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 8929 "configure"
+#line 8938 "configure"
 #include "confdefs.h"
 #define gethostbyname autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -8957,16 +8966,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8960: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8969: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8963: \$? = $ac_status" >&5
+  echo "$as_me:8972: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8966: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8975: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8969: \$? = $ac_status" >&5
+  echo "$as_me:8978: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -8976,11 +8985,11 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:8979: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:8988: 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:8983: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:8992: 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
@@ -8988,7 +8997,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8991 "configure"
+#line 9000 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9007,16 +9016,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9010: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9019: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9013: \$? = $ac_status" >&5
+  echo "$as_me:9022: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9016: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9025: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9019: \$? = $ac_status" >&5
+  echo "$as_me:9028: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -9027,14 +9036,14 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9030: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:9039: 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:9037: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:9046: 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
@@ -9042,7 +9051,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9045 "configure"
+#line 9054 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9061,16 +9070,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9064: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9073: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9067: \$? = $ac_status" >&5
+  echo "$as_me:9076: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9070: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9079: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9073: \$? = $ac_status" >&5
+  echo "$as_me:9082: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -9081,7 +9090,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9084: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:9093: 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"
@@ -9097,13 +9106,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:9100: checking for connect" >&5
+    echo "$as_me:9109: 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 9106 "configure"
+#line 9115 "configure"
 #include "confdefs.h"
 #define connect autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -9134,16 +9143,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9137: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9146: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9140: \$? = $ac_status" >&5
+  echo "$as_me:9149: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9143: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9152: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9146: \$? = $ac_status" >&5
+  echo "$as_me:9155: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_connect=yes
 else
@@ -9153,11 +9162,11 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:9156: result: $ac_cv_func_connect" >&5
+echo "$as_me:9165: 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:9160: checking for connect in -lsocket" >&5
+      echo "$as_me:9169: 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
@@ -9165,7 +9174,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9168 "configure"
+#line 9177 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9184,16 +9193,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9187: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9196: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9190: \$? = $ac_status" >&5
+  echo "$as_me:9199: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9193: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9202: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9196: \$? = $ac_status" >&5
+  echo "$as_me:9205: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -9204,7 +9213,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9207: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:9216: 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"
@@ -9213,13 +9222,13 @@
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:9216: checking for remove" >&5
+    echo "$as_me:9225: 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 9222 "configure"
+#line 9231 "configure"
 #include "confdefs.h"
 #define remove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -9250,16 +9259,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9253: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9262: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9256: \$? = $ac_status" >&5
+  echo "$as_me:9265: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9259: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9268: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9262: \$? = $ac_status" >&5
+  echo "$as_me:9271: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_remove=yes
 else
@@ -9269,11 +9278,11 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:9272: result: $ac_cv_func_remove" >&5
+echo "$as_me:9281: 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:9276: checking for remove in -lposix" >&5
+      echo "$as_me:9285: 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
@@ -9281,7 +9290,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9284 "configure"
+#line 9293 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9300,16 +9309,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9303: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9312: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9306: \$? = $ac_status" >&5
+  echo "$as_me:9315: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9309: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9318: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9312: \$? = $ac_status" >&5
+  echo "$as_me:9321: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -9320,7 +9329,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9323: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:9332: 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"
@@ -9329,13 +9338,13 @@
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:9332: checking for shmat" >&5
+    echo "$as_me:9341: 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 9338 "configure"
+#line 9347 "configure"
 #include "confdefs.h"
 #define shmat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -9366,16 +9375,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9369: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9378: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9372: \$? = $ac_status" >&5
+  echo "$as_me:9381: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9375: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9384: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9378: \$? = $ac_status" >&5
+  echo "$as_me:9387: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -9385,11 +9394,11 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:9388: result: $ac_cv_func_shmat" >&5
+echo "$as_me:9397: 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:9392: checking for shmat in -lipc" >&5
+      echo "$as_me:9401: 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
@@ -9397,7 +9406,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9400 "configure"
+#line 9409 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9416,16 +9425,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9419: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9428: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9422: \$? = $ac_status" >&5
+  echo "$as_me:9431: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9425: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9434: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9428: \$? = $ac_status" >&5
+  echo "$as_me:9437: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -9436,7 +9445,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9439: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:9448: 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"
@@ -9454,7 +9463,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:9457: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:9466: 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
@@ -9462,7 +9471,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9465 "configure"
+#line 9474 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9481,16 +9490,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9484: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9493: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9487: \$? = $ac_status" >&5
+  echo "$as_me:9496: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9490: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9499: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9493: \$? = $ac_status" >&5
+  echo "$as_me:9502: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -9501,7 +9510,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9504: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:9513: 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"
@@ -9511,13 +9520,13 @@
 
 fi
 
-echo "$as_me:9514: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "$as_me:9523: 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 9520 "configure"
+#line 9529 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -9539,16 +9548,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9542: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9551: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9545: \$? = $ac_status" >&5
+  echo "$as_me:9554: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9548: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9557: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9551: \$? = $ac_status" >&5
+  echo "$as_me:9560: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_sys_wait_h=yes
 else
@@ -9558,7 +9567,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:9561: result: $ac_cv_header_sys_wait_h" >&5
+echo "$as_me:9570: 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
 
@@ -9568,14 +9577,14 @@
 
 fi
 
-echo "$as_me:9571: checking for POSIX wait functions" >&5
+echo "$as_me:9580: 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 9578 "configure"
+#line 9587 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -9600,16 +9609,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9603: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9612: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9606: \$? = $ac_status" >&5
+  echo "$as_me:9615: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9609: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9618: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9612: \$? = $ac_status" >&5
+  echo "$as_me:9621: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_wait=yes
 else
@@ -9620,21 +9629,21 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:9623: result: $cf_cv_posix_wait" >&5
+echo "$as_me:9632: 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:9630: checking if external sys_nerr is declared" >&5
+echo "$as_me:9639: 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 9637 "configure"
+#line 9646 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -9652,16 +9661,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9655: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9664: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9658: \$? = $ac_status" >&5
+  echo "$as_me:9667: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9661: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9670: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9664: \$? = $ac_status" >&5
+  echo "$as_me:9673: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_sys_nerr=yes
 else
@@ -9672,7 +9681,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:9675: result: $cf_cv_dcl_sys_nerr" >&5
+echo "$as_me:9684: 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
@@ -9687,14 +9696,14 @@
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:9690: checking if external sys_nerr exists" >&5
+echo "$as_me:9699: 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 9697 "configure"
+#line 9706 "configure"
 #include "confdefs.h"
 
 #undef sys_nerr
@@ -9709,16 +9718,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9712: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9721: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9715: \$? = $ac_status" >&5
+  echo "$as_me:9724: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9718: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9727: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9721: \$? = $ac_status" >&5
+  echo "$as_me:9730: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_sys_nerr=yes
 else
@@ -9729,7 +9738,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:9732: result: $cf_cv_have_sys_nerr" >&5
+echo "$as_me:9741: 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
@@ -9742,14 +9751,14 @@
 
 fi
 
-echo "$as_me:9745: checking if external sys_errlist is declared" >&5
+echo "$as_me:9754: 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 9752 "configure"
+#line 9761 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -9767,16 +9776,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9770: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9779: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9773: \$? = $ac_status" >&5
+  echo "$as_me:9782: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9776: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9785: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9779: \$? = $ac_status" >&5
+  echo "$as_me:9788: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_sys_errlist=yes
 else
@@ -9787,7 +9796,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:9790: result: $cf_cv_dcl_sys_errlist" >&5
+echo "$as_me:9799: 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
@@ -9802,14 +9811,14 @@
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:9805: checking if external sys_errlist exists" >&5
+echo "$as_me:9814: 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 9812 "configure"
+#line 9821 "configure"
 #include "confdefs.h"
 
 #undef sys_errlist
@@ -9824,16 +9833,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9827: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9836: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9830: \$? = $ac_status" >&5
+  echo "$as_me:9839: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9833: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9842: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9836: \$? = $ac_status" >&5
+  echo "$as_me:9845: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_sys_errlist=yes
 else
@@ -9844,7 +9853,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:9847: result: $cf_cv_have_sys_errlist" >&5
+echo "$as_me:9856: 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
@@ -9880,23 +9889,23 @@
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:9883: checking for $ac_header" >&5
+echo "$as_me:9892: 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 9889 "configure"
+#line 9898 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:9893: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:9902: \"$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:9899: \$? = $ac_status" >&5
+  echo "$as_me:9908: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9915,7 +9924,7 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:9918: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:9927: 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
@@ -9925,14 +9934,14 @@
 fi
 done
 
-echo "$as_me:9928: checking if we should define SYSV" >&5
+echo "$as_me:9937: 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 9935 "configure"
+#line 9944 "configure"
 #include "confdefs.h"
 
 #undef  SYSV
@@ -9976,16 +9985,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9979: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9988: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9982: \$? = $ac_status" >&5
+  echo "$as_me:9991: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9985: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9994: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9988: \$? = $ac_status" >&5
+  echo "$as_me:9997: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sysv=yes
 else
@@ -9996,7 +10005,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:9999: result: $cf_cv_sysv" >&5
+echo "$as_me:10008: result: $cf_cv_sysv" >&5
 echo "${ECHO_T}$cf_cv_sysv" >&6
 test "$cf_cv_sysv" = yes &&
 cat >>confdefs.h <<\EOF
@@ -10007,7 +10016,7 @@
 CFLAGS="$cf_save_CFLAGS_CF_SYSV"
 CPPFLAGS="$cf_save_CPPFLAGS_CF_SYSV"
 
-echo "$as_me:10010: checking for elf_begin in -lelf" >&5
+echo "$as_me:10019: 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
@@ -10015,7 +10024,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lelf  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10018 "configure"
+#line 10027 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10034,16 +10043,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10037: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10046: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10040: \$? = $ac_status" >&5
+  echo "$as_me:10049: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10043: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10052: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10046: \$? = $ac_status" >&5
+  echo "$as_me:10055: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_elf_elf_begin=yes
 else
@@ -10054,18 +10063,18 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10057: result: $ac_cv_lib_elf_elf_begin" >&5
+echo "$as_me:10066: 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:10061: checking if this is an SVR4 system" >&5
+echo "$as_me:10070: 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 10068 "configure"
+#line 10077 "configure"
 #include "confdefs.h"
 
 #if defined(__CYGWIN__)
@@ -10094,16 +10103,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10097: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10106: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10100: \$? = $ac_status" >&5
+  echo "$as_me:10109: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10103: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10112: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10106: \$? = $ac_status" >&5
+  echo "$as_me:10115: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_svr4=yes
 else
@@ -10114,7 +10123,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10117: result: $cf_cv_svr4" >&5
+echo "$as_me:10126: result: $cf_cv_svr4" >&5
 echo "${ECHO_T}$cf_cv_svr4" >&6
 
 fi
@@ -10124,7 +10133,7 @@
 #define SVR4 1
 EOF
 
-echo "$as_me:10127: checking if you want to use pkg-config" >&5
+echo "$as_me:10136: 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.
@@ -10134,7 +10143,7 @@
 else
   cf_pkg_config=yes
 fi;
-echo "$as_me:10137: result: $cf_pkg_config" >&5
+echo "$as_me:10146: result: $cf_pkg_config" >&5
 echo "${ECHO_T}$cf_pkg_config" >&6
 
 case "$cf_pkg_config" in
@@ -10146,7 +10155,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:10149: checking for $ac_word" >&5
+echo "$as_me:10158: 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
@@ -10163,7 +10172,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:10166: found $ac_dir/$ac_word" >&5
+   echo "$as_me:10175: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -10174,10 +10183,10 @@
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:10177: result: $PKG_CONFIG" >&5
+  echo "$as_me:10186: result: $PKG_CONFIG" >&5
 echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  echo "$as_me:10180: result: no" >&5
+  echo "$as_me:10189: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -10186,7 +10195,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:10189: checking for $ac_word" >&5
+echo "$as_me:10198: 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
@@ -10203,7 +10212,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:10206: found $ac_dir/$ac_word" >&5
+   echo "$as_me:10215: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -10215,10 +10224,10 @@
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 
 if test -n "$ac_pt_PKG_CONFIG"; then
-  echo "$as_me:10218: result: $ac_pt_PKG_CONFIG" >&5
+  echo "$as_me:10227: result: $ac_pt_PKG_CONFIG" >&5
 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
 else
-  echo "$as_me:10221: result: no" >&5
+  echo "$as_me:10230: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -10261,14 +10270,14 @@
 	PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:10264: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+	{ { echo "$as_me:10273: 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:10271: WARNING: pkg-config is not installed" >&5
+	{ echo "$as_me:10280: WARNING: pkg-config is not installed" >&5
 echo "$as_me: WARNING: pkg-config is not installed" >&2;}
 fi
 
@@ -10284,17 +10293,17 @@
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then
 	test -n "$verbose" && echo "	found package x11" 1>&6
 
-echo "${as_me:-configure}:10287: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:10296: 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}:10293: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:10302: 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}:10297: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:10306: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -10414,24 +10423,24 @@
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:10417: WARNING: unable to find X11 library" >&5
+	{ echo "$as_me:10426: 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}:10424: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:10433: 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}:10430: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:10439: 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}:10434: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:10443: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -10551,24 +10560,24 @@
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:10554: WARNING: unable to find ICE library" >&5
+	{ echo "$as_me:10563: 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}:10561: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:10570: 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}:10567: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:10576: 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}:10571: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:10580: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -10688,24 +10697,24 @@
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:10691: WARNING: unable to find SM library" >&5
+	{ echo "$as_me:10700: 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}:10698: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:10707: 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}:10704: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:10713: 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}:10708: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:10717: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -10825,7 +10834,7 @@
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:10828: WARNING: unable to find Xt library" >&5
+	{ echo "$as_me:10837: WARNING: unable to find Xt library" >&5
 echo "$as_me: WARNING: unable to find Xt library" >&2;}
 fi
 
@@ -10838,17 +10847,17 @@
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then
 	test -n "$verbose" && echo "	found package xt" 1>&6
 
-echo "${as_me:-configure}:10841: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:10850: 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}:10847: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:10856: 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}:10851: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:10860: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -10969,14 +10978,14 @@
 		;;
 	(*)
 # we have an "xt" package, but it may omit Xt's dependency on X11
-echo "$as_me:10972: checking for usable X dependency" >&5
+echo "$as_me:10981: 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 10979 "configure"
+#line 10988 "configure"
 #include "confdefs.h"
 
 #include <X11/Xlib.h>
@@ -10995,16 +11004,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10998: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11007: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11001: \$? = $ac_status" >&5
+  echo "$as_me:11010: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11004: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11013: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11007: \$? = $ac_status" >&5
+  echo "$as_me:11016: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xt_x11_compat=yes
 else
@@ -11014,30 +11023,30 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:11017: result: $cf_cv_xt_x11_compat" >&5
+echo "$as_me:11026: 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}:11023: testing work around broken X11 dependency ..." 1>&5
+echo "${as_me:-configure}:11032: 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}:11030: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:11039: 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}:11036: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:11045: 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}:11040: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:11049: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -11160,12 +11169,12 @@
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:11163: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:11172: 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}:11168: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:11177: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -11173,14 +11182,14 @@
 		;;
 	esac
 
-echo "$as_me:11176: checking for usable X Toolkit package" >&5
+echo "$as_me:11185: 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 11183 "configure"
+#line 11192 "configure"
 #include "confdefs.h"
 
 #include <X11/Shell.h>
@@ -11195,16 +11204,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11198: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11207: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11201: \$? = $ac_status" >&5
+  echo "$as_me:11210: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11204: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11213: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11207: \$? = $ac_status" >&5
+  echo "$as_me:11216: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xt_ice_compat=yes
 else
@@ -11214,7 +11223,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:11217: result: $cf_cv_xt_ice_compat" >&5
+echo "$as_me:11226: result: $cf_cv_xt_ice_compat" >&5
 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
 
 	if test "$cf_cv_xt_ice_compat" = no
@@ -11228,22 +11237,22 @@
 			(*)
 				test -n "$verbose" && echo "	work around broken ICE dependency" 1>&6
 
-echo "${as_me:-configure}:11231: testing work around broken ICE dependency ..." 1>&5
+echo "${as_me:-configure}:11240: 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}:11236: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:11245: 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}:11242: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:11251: 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}:11246: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:11255: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -11362,17 +11371,17 @@
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then
 	test -n "$verbose" && echo "	found package sm" 1>&6
 
-echo "${as_me:-configure}:11365: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:11374: 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}:11371: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:11380: 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}:11375: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:11384: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -11501,12 +11510,12 @@
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:11504: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:11513: testing ...before $LIBS ..." 1>&5
 
 LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%-lXt %-lXt $X_PRE_LIBS %" -e 's%  % %g'`
 test -n "$verbose" && echo "	...after  $LIBS" 1>&6
 
-echo "${as_me:-configure}:11509: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:11518: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -11526,7 +11535,7 @@
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:11529: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:11538: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -11611,7 +11620,7 @@
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:11614: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:11623: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -11621,7 +11630,7 @@
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:11624: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:11633: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -11631,7 +11640,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}:11634: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:11643: 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"
@@ -11640,7 +11649,7 @@
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11643 "configure"
+#line 11652 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11652,16 +11661,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11655: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11664: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11658: \$? = $ac_status" >&5
+  echo "$as_me:11667: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11661: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11670: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11664: \$? = $ac_status" >&5
+  echo "$as_me:11673: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11669,12 +11678,12 @@
 cat "conftest.$ac_ext" >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:11672: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:11681: 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}:11677: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:11686: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_cflags"
@@ -11682,13 +11691,13 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
-	echo "$as_me:11685: checking for XOpenDisplay" >&5
+	echo "$as_me:11694: 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 11691 "configure"
+#line 11700 "configure"
 #include "confdefs.h"
 #define XOpenDisplay autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -11719,16 +11728,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11722: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11731: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11725: \$? = $ac_status" >&5
+  echo "$as_me:11734: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11728: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11737: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11731: \$? = $ac_status" >&5
+  echo "$as_me:11740: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_XOpenDisplay=yes
 else
@@ -11738,13 +11747,13 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:11741: result: $ac_cv_func_XOpenDisplay" >&5
+echo "$as_me:11750: 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:11747: checking for XOpenDisplay in -lX11" >&5
+	echo "$as_me:11756: 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
@@ -11752,7 +11761,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11755 "configure"
+#line 11764 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11771,16 +11780,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11774: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11783: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11777: \$? = $ac_status" >&5
+  echo "$as_me:11786: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11780: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11789: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11783: \$? = $ac_status" >&5
+  echo "$as_me:11792: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -11791,7 +11800,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11794: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:11803: 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
 
@@ -11815,13 +11824,13 @@
 
 fi
 
-	echo "$as_me:11818: checking for XtAppInitialize" >&5
+	echo "$as_me:11827: 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 11824 "configure"
+#line 11833 "configure"
 #include "confdefs.h"
 #define XtAppInitialize autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -11852,16 +11861,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11855: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11864: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11858: \$? = $ac_status" >&5
+  echo "$as_me:11867: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11861: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11870: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11864: \$? = $ac_status" >&5
+  echo "$as_me:11873: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_XtAppInitialize=yes
 else
@@ -11871,13 +11880,13 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:11874: result: $ac_cv_func_XtAppInitialize" >&5
+echo "$as_me:11883: 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:11880: checking for XtAppInitialize in -lXt" >&5
+	echo "$as_me:11889: 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
@@ -11885,7 +11894,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11888 "configure"
+#line 11897 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11904,16 +11913,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11907: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11916: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11910: \$? = $ac_status" >&5
+  echo "$as_me:11919: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11913: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11922: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11916: \$? = $ac_status" >&5
+  echo "$as_me:11925: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xt_XtAppInitialize=yes
 else
@@ -11924,7 +11933,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11927: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:11936: 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
 
@@ -11941,7 +11950,7 @@
 fi
 
 if test "$cf_have_X_LIBS" = no ; then
-	{ echo "$as_me:11944: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+	{ echo "$as_me:11953: 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
@@ -11960,23 +11969,23 @@
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:11963: checking for $ac_header" >&5
+echo "$as_me:11972: 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 11969 "configure"
+#line 11978 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:11973: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:11982: \"$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:11979: \$? = $ac_status" >&5
+  echo "$as_me:11988: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11995,7 +12004,7 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:11998: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:12007: 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
@@ -12010,7 +12019,7 @@
 cf_save_cppflags="${CPPFLAGS}"
 cf_save_ldflags="${LDFLAGS}"
 
-echo "$as_me:12013: checking if you want to use the Xpm library for colored icon" >&5
+echo "$as_me:12022: 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.
@@ -12020,7 +12029,7 @@
 else
   cf_Xpm_library=yes
 fi;
-echo "$as_me:12023: result: $cf_Xpm_library" >&5
+echo "$as_me:12032: result: $cf_Xpm_library" >&5
 echo "${ECHO_T}$cf_Xpm_library" >&6
 
 if test "$cf_Xpm_library" != no ; then
@@ -12028,23 +12037,23 @@
 	CPPFLAGS="$CPPFLAGS -I$withval/include"
 	LDFLAGS="$LDFLAGS -L$withval/lib"
     fi
-    echo "$as_me:12031: checking for X11/xpm.h" >&5
+    echo "$as_me:12040: 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 12037 "configure"
+#line 12046 "configure"
 #include "confdefs.h"
 #include <X11/xpm.h>
 _ACEOF
-if { (eval echo "$as_me:12041: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:12050: \"$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:12047: \$? = $ac_status" >&5
+  echo "$as_me:12056: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12063,11 +12072,11 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:12066: result: $ac_cv_header_X11_xpm_h" >&5
+echo "$as_me:12075: 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:12070: checking for XpmCreatePixmapFromData in -lXpm" >&5
+	echo "$as_me:12079: 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
@@ -12075,7 +12084,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXpm -lX11 $X_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12078 "configure"
+#line 12087 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12094,16 +12103,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12097: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12106: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12100: \$? = $ac_status" >&5
+  echo "$as_me:12109: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12103: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12112: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12106: \$? = $ac_status" >&5
+  echo "$as_me:12115: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xpm_XpmCreatePixmapFromData=yes
 else
@@ -12114,7 +12123,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12117: result: $ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&5
+echo "$as_me:12126: 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
 
@@ -12134,7 +12143,7 @@
 
 fi
 
-echo "$as_me:12137: checking if you want to use the Xinerama extension" >&5
+echo "$as_me:12146: 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.
@@ -12144,24 +12153,24 @@
 else
   cf_with_xinerama=yes
 fi;
-echo "$as_me:12147: result: $cf_with_xinerama" >&5
+echo "$as_me:12156: 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}:12154: testing found package xinerama ..." 1>&5
+echo "${as_me:-configure}:12163: 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}:12160: testing package xinerama CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:12169: 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}:12164: testing package xinerama LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:12173: testing package xinerama LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -12285,7 +12294,7 @@
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
 
-	echo "$as_me:12288: checking for XineramaQueryScreens in -lXinerama" >&5
+	echo "$as_me:12297: 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
@@ -12293,7 +12302,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXinerama  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12296 "configure"
+#line 12305 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12312,16 +12321,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12315: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12324: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12318: \$? = $ac_status" >&5
+  echo "$as_me:12327: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12321: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12330: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12324: \$? = $ac_status" >&5
+  echo "$as_me:12333: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xinerama_XineramaQueryScreens=yes
 else
@@ -12332,7 +12341,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12335: result: $ac_cv_lib_Xinerama_XineramaQueryScreens" >&5
+echo "$as_me:12344: 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
 
@@ -12357,23 +12366,23 @@
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:12360: checking for $ac_header" >&5
+echo "$as_me:12369: 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 12366 "configure"
+#line 12375 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:12370: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:12379: \"$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:12376: \$? = $ac_status" >&5
+  echo "$as_me:12385: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12392,7 +12401,7 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:12395: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:12404: 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
@@ -12410,7 +12419,7 @@
 
 cf_x_athena=${cf_x_athena:-Xaw}
 
-echo "$as_me:12413: checking if you want to link with Xaw 3d library" >&5
+echo "$as_me:12422: 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=
 
@@ -12421,14 +12430,14 @@
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3d
-	echo "$as_me:12424: result: yes" >&5
+	echo "$as_me:12433: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:12427: result: no" >&5
+	echo "$as_me:12436: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:12431: checking if you want to link with Xaw 3d xft library" >&5
+echo "$as_me:12440: 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=
 
@@ -12439,14 +12448,14 @@
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3dxft
-	echo "$as_me:12442: result: yes" >&5
+	echo "$as_me:12451: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:12445: result: no" >&5
+	echo "$as_me:12454: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:12449: checking if you want to link with neXT Athena library" >&5
+echo "$as_me:12458: 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=
 
@@ -12457,14 +12466,14 @@
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=neXtaw
-	echo "$as_me:12460: result: yes" >&5
+	echo "$as_me:12469: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:12463: result: no" >&5
+	echo "$as_me:12472: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:12467: checking if you want to link with Athena-Plus library" >&5
+echo "$as_me:12476: 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=
 
@@ -12475,10 +12484,10 @@
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=XawPlus
-	echo "$as_me:12478: result: yes" >&5
+	echo "$as_me:12487: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:12481: result: no" >&5
+	echo "$as_me:12490: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -12498,17 +12507,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}:12501: testing found package $cf_athena_pkg ..." 1>&5
+echo "${as_me:-configure}:12510: 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}:12507: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:12516: 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}:12511: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:12520: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -12639,20 +12648,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}:12642: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:12651: testing ..trimmed $LIBS ..." 1>&5
 
 			;;
 		esac
 	done
 
-echo "$as_me:12648: checking for usable $cf_x_athena/Xmu package" >&5
+echo "$as_me:12657: 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 12655 "configure"
+#line 12664 "configure"
 #include "confdefs.h"
 
 #include <X11/Xmu/CharSet.h>
@@ -12669,16 +12678,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12672: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12681: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12675: \$? = $ac_status" >&5
+  echo "$as_me:12684: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12678: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12687: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12681: \$? = $ac_status" >&5
+  echo "$as_me:12690: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xaw_compat=yes
 else
@@ -12688,7 +12697,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:12691: result: $cf_cv_xaw_compat" >&5
+echo "$as_me:12700: result: $cf_cv_xaw_compat" >&5
 echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 
 			if test "$cf_cv_xaw_compat" = no
@@ -12700,7 +12709,7 @@
 				(*)
 					test -n "$verbose" && echo "	work around broken package" 1>&6
 
-echo "${as_me:-configure}:12703: testing work around broken package ..." 1>&5
+echo "${as_me:-configure}:12712: testing work around broken package ..." 1>&5
 
 					cf_save_xmu="$LIBS"
 					cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^  *//' -e 's/ .*//'`
@@ -12708,17 +12717,17 @@
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xmu"; then
 	test -n "$verbose" && echo "	found package xmu" 1>&6
 
-echo "${as_me:-configure}:12711: testing found package xmu ..." 1>&5
+echo "${as_me:-configure}:12720: 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}:12717: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:12726: 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}:12721: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:12730: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -12838,12 +12847,12 @@
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:12841: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:12850: 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}:12846: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:12855: testing ...after  $LIBS ..." 1>&5
 
 else
 	cf_pkgconfig_incs=
@@ -12851,12 +12860,12 @@
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:12854: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:12863: 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}:12859: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:12868: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -12867,7 +12876,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}:12870: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:12879: testing ..trimmed $LIBS ..." 1>&5
 
 			;;
 		esac
@@ -12892,17 +12901,17 @@
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "Xext"; then
 	test -n "$verbose" && echo "	found package Xext" 1>&6
 
-echo "${as_me:-configure}:12895: testing found package Xext ..." 1>&5
+echo "${as_me:-configure}:12904: 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}:12901: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:12910: 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}:12905: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:12914: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -13023,7 +13032,7 @@
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
 
-	echo "$as_me:13026: checking for XextCreateExtension in -lXext" >&5
+	echo "$as_me:13035: 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
@@ -13031,7 +13040,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13034 "configure"
+#line 13043 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13050,16 +13059,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13053: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13062: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13056: \$? = $ac_status" >&5
+  echo "$as_me:13065: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13059: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13068: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13062: \$? = $ac_status" >&5
+  echo "$as_me:13071: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
@@ -13070,7 +13079,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13073: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:13082: 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
 
@@ -13106,17 +13115,17 @@
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then
 	test -n "$verbose" && echo "	found package x11" 1>&6
 
-echo "${as_me:-configure}:13109: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:13118: 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}:13115: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:13124: 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}:13119: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:13128: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -13236,24 +13245,24 @@
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:13239: WARNING: unable to find X11 library" >&5
+	{ echo "$as_me:13248: 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}:13246: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:13255: 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}:13252: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:13261: 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}:13256: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:13265: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -13373,24 +13382,24 @@
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:13376: WARNING: unable to find ICE library" >&5
+	{ echo "$as_me:13385: 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}:13383: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:13392: 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}:13389: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:13398: 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}:13393: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:13402: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -13510,24 +13519,24 @@
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:13513: WARNING: unable to find SM library" >&5
+	{ echo "$as_me:13522: 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}:13520: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:13529: 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}:13526: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:13535: 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}:13530: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:13539: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -13647,7 +13656,7 @@
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:13650: WARNING: unable to find Xt library" >&5
+	{ echo "$as_me:13659: WARNING: unable to find Xt library" >&5
 echo "$as_me: WARNING: unable to find Xt library" >&2;}
 fi
 
@@ -13660,17 +13669,17 @@
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then
 	test -n "$verbose" && echo "	found package xt" 1>&6
 
-echo "${as_me:-configure}:13663: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:13672: 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}:13669: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:13678: 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}:13673: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:13682: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -13791,14 +13800,14 @@
 		;;
 	(*)
 # we have an "xt" package, but it may omit Xt's dependency on X11
-echo "$as_me:13794: checking for usable X dependency" >&5
+echo "$as_me:13803: 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 13801 "configure"
+#line 13810 "configure"
 #include "confdefs.h"
 
 #include <X11/Xlib.h>
@@ -13817,16 +13826,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13820: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13829: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13823: \$? = $ac_status" >&5
+  echo "$as_me:13832: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13826: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13835: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13829: \$? = $ac_status" >&5
+  echo "$as_me:13838: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xt_x11_compat=yes
 else
@@ -13836,30 +13845,30 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13839: result: $cf_cv_xt_x11_compat" >&5
+echo "$as_me:13848: 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}:13845: testing work around broken X11 dependency ..." 1>&5
+echo "${as_me:-configure}:13854: 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}:13852: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:13861: 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}:13858: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:13867: 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}:13862: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:13871: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -13982,12 +13991,12 @@
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:13985: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:13994: 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}:13990: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:13999: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -13995,14 +14004,14 @@
 		;;
 	esac
 
-echo "$as_me:13998: checking for usable X Toolkit package" >&5
+echo "$as_me:14007: 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 14005 "configure"
+#line 14014 "configure"
 #include "confdefs.h"
 
 #include <X11/Shell.h>
@@ -14017,16 +14026,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14020: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14029: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14023: \$? = $ac_status" >&5
+  echo "$as_me:14032: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14026: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14035: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14029: \$? = $ac_status" >&5
+  echo "$as_me:14038: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xt_ice_compat=yes
 else
@@ -14036,7 +14045,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:14039: result: $cf_cv_xt_ice_compat" >&5
+echo "$as_me:14048: result: $cf_cv_xt_ice_compat" >&5
 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
 
 	if test "$cf_cv_xt_ice_compat" = no
@@ -14050,22 +14059,22 @@
 			(*)
 				test -n "$verbose" && echo "	work around broken ICE dependency" 1>&6
 
-echo "${as_me:-configure}:14053: testing work around broken ICE dependency ..." 1>&5
+echo "${as_me:-configure}:14062: 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}:14058: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:14067: 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}:14064: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14073: 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}:14068: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14077: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -14184,17 +14193,17 @@
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then
 	test -n "$verbose" && echo "	found package sm" 1>&6
 
-echo "${as_me:-configure}:14187: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:14196: 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}:14193: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14202: 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}:14197: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14206: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -14323,12 +14332,12 @@
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:14326: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:14335: testing ...before $LIBS ..." 1>&5
 
 LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%-lXt %-lXt $X_PRE_LIBS %" -e 's%  % %g'`
 test -n "$verbose" && echo "	...after  $LIBS" 1>&6
 
-echo "${as_me:-configure}:14331: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:14340: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -14348,7 +14357,7 @@
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:14351: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:14360: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -14433,7 +14442,7 @@
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:14436: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:14445: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -14443,7 +14452,7 @@
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:14446: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:14455: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -14453,7 +14462,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}:14456: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:14465: 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"
@@ -14462,7 +14471,7 @@
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14465 "configure"
+#line 14474 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14474,16 +14483,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14477: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14486: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14480: \$? = $ac_status" >&5
+  echo "$as_me:14489: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14483: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14492: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14486: \$? = $ac_status" >&5
+  echo "$as_me:14495: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -14491,12 +14500,12 @@
 cat "conftest.$ac_ext" >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:14494: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:14503: 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}:14499: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:14508: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_cflags"
@@ -14504,13 +14513,13 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
-	echo "$as_me:14507: checking for XOpenDisplay" >&5
+	echo "$as_me:14516: 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 14513 "configure"
+#line 14522 "configure"
 #include "confdefs.h"
 #define XOpenDisplay autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -14541,16 +14550,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14544: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14553: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14547: \$? = $ac_status" >&5
+  echo "$as_me:14556: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14550: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14559: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14553: \$? = $ac_status" >&5
+  echo "$as_me:14562: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_XOpenDisplay=yes
 else
@@ -14560,13 +14569,13 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:14563: result: $ac_cv_func_XOpenDisplay" >&5
+echo "$as_me:14572: 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:14569: checking for XOpenDisplay in -lX11" >&5
+	echo "$as_me:14578: 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
@@ -14574,7 +14583,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14577 "configure"
+#line 14586 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14593,16 +14602,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14596: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14605: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14599: \$? = $ac_status" >&5
+  echo "$as_me:14608: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14602: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14611: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14605: \$? = $ac_status" >&5
+  echo "$as_me:14614: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -14613,7 +14622,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14616: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:14625: 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
 
@@ -14637,13 +14646,13 @@
 
 fi
 
-	echo "$as_me:14640: checking for XtAppInitialize" >&5
+	echo "$as_me:14649: 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 14646 "configure"
+#line 14655 "configure"
 #include "confdefs.h"
 #define XtAppInitialize autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -14674,16 +14683,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14677: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14686: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14680: \$? = $ac_status" >&5
+  echo "$as_me:14689: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14683: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14692: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14686: \$? = $ac_status" >&5
+  echo "$as_me:14695: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_XtAppInitialize=yes
 else
@@ -14693,13 +14702,13 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:14696: result: $ac_cv_func_XtAppInitialize" >&5
+echo "$as_me:14705: 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:14702: checking for XtAppInitialize in -lXt" >&5
+	echo "$as_me:14711: 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
@@ -14707,7 +14716,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14710 "configure"
+#line 14719 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14726,16 +14735,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14729: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14738: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14732: \$? = $ac_status" >&5
+  echo "$as_me:14741: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14735: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14744: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14738: \$? = $ac_status" >&5
+  echo "$as_me:14747: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xt_XtAppInitialize=yes
 else
@@ -14746,7 +14755,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14749: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:14758: 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
 
@@ -14763,7 +14772,7 @@
 fi
 
 if test "$cf_have_X_LIBS" = no ; then
-	{ echo "$as_me:14766: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+	{ echo "$as_me:14775: 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
@@ -14804,14 +14813,14 @@
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}-I$cf_path/include"
 
-			echo "$as_me:14807: checking for $cf_test in $cf_path" >&5
+			echo "$as_me:14816: 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:14810: checking for $cf_test" >&5
+			echo "$as_me:14819: checking for $cf_test" >&5
 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
 		fi
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 14814 "configure"
+#line 14823 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -14825,16 +14834,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14828: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14837: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14831: \$? = $ac_status" >&5
+  echo "$as_me:14840: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14834: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14843: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14837: \$? = $ac_status" >&5
+  echo "$as_me:14846: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -14843,7 +14852,7 @@
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-		echo "$as_me:14846: result: $cf_result" >&5
+		echo "$as_me:14855: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 LIBS="$cf_save_LIBS_CF_X_ATHENA_CPPFLAGS"
@@ -14859,7 +14868,7 @@
 done
 
 if test -z "$cf_x_athena_inc" ; then
-	{ echo "$as_me:14862: WARNING: Unable to find Athena header files" >&5
+	{ echo "$as_me:14871: 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
 
@@ -14924,10 +14933,10 @@
 done
 LIBS="$cf_add_libs"
 
-		echo "$as_me:14927: checking for $cf_test in $cf_libs" >&5
+		echo "$as_me:14936: 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 14930 "configure"
+#line 14939 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -14943,16 +14952,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14946: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14955: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14949: \$? = $ac_status" >&5
+  echo "$as_me:14958: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14952: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14961: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14955: \$? = $ac_status" >&5
+  echo "$as_me:14964: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -14961,7 +14970,7 @@
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:14964: result: $cf_result" >&5
+		echo "$as_me:14973: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 LIBS="$cf_save_LIBS_CF_X_ATHENA_LIBS"
@@ -14978,7 +14987,7 @@
 done
 
 if test -z "$cf_x_athena_lib" ; then
-	{ { echo "$as_me:14981: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+	{ { echo "$as_me:14990: 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
@@ -15010,23 +15019,23 @@
 for ac_header in X11/Xpoll.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:15013: checking for $ac_header" >&5
+echo "$as_me:15022: 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 15019 "configure"
+#line 15028 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:15023: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:15032: \"$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:15029: \$? = $ac_status" >&5
+  echo "$as_me:15038: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15045,7 +15054,7 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:15048: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:15057: 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
@@ -15055,16 +15064,16 @@
 fi
 done
 
-echo "$as_me:15058: checking for declaration of fd_set" >&5
+echo "$as_me:15067: 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}:15064: testing sys/types alone ..." 1>&5
+echo "${as_me:-configure}:15073: testing sys/types alone ..." 1>&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15067 "configure"
+#line 15076 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -15077,26 +15086,26 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15080: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15089: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15083: \$? = $ac_status" >&5
+  echo "$as_me:15092: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15086: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15095: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15089: \$? = $ac_status" >&5
+  echo "$as_me:15098: \$? = $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}:15096: testing X11/Xpoll.h ..." 1>&5
+echo "${as_me:-configure}:15105: testing X11/Xpoll.h ..." 1>&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15099 "configure"
+#line 15108 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_X11_XPOLL_H
@@ -15111,26 +15120,26 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15114: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15123: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15117: \$? = $ac_status" >&5
+  echo "$as_me:15126: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15120: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15129: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15123: \$? = $ac_status" >&5
+  echo "$as_me:15132: \$? = $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}:15130: testing sys/select.h ..." 1>&5
+echo "${as_me:-configure}:15139: testing sys/select.h ..." 1>&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15133 "configure"
+#line 15142 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -15144,16 +15153,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15147: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15156: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15150: \$? = $ac_status" >&5
+  echo "$as_me:15159: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15153: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15162: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15156: \$? = $ac_status" >&5
+  echo "$as_me:15165: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_type_fd_set=sys/select.h
 else
@@ -15167,7 +15176,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:15170: result: $cf_cv_type_fd_set" >&5
+echo "$as_me:15179: 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
 
@@ -15177,7 +15186,7 @@
 
 fi
 
-echo "$as_me:15180: checking for declaration of fd_mask" >&5
+echo "$as_me:15189: 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
@@ -15185,7 +15194,7 @@
 
     if test x$cf_cv_type_fd_set = xX11/Xpoll.h ; then
         cat >"conftest.$ac_ext" <<_ACEOF
-#line 15188 "configure"
+#line 15197 "configure"
 #include "confdefs.h"
 
 #include <X11/Xpoll.h>
@@ -15198,27 +15207,27 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15201: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15210: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15204: \$? = $ac_status" >&5
+  echo "$as_me:15213: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15207: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15216: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15210: \$? = $ac_status" >&5
+  echo "$as_me:15219: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-echo "${as_me:-configure}:15217: testing if we must define CSRG_BASED ..." 1>&5
+echo "${as_me:-configure}:15226: 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 15221 "configure"
+#line 15230 "configure"
 #include "confdefs.h"
 
 #define CSRG_BASED
@@ -15232,16 +15241,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15235: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15244: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15238: \$? = $ac_status" >&5
+  echo "$as_me:15247: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15241: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15250: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15244: \$? = $ac_status" >&5
+  echo "$as_me:15253: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_type_fd_mask=CSRG_BASED
 else
@@ -15256,7 +15265,7 @@
     fi
 
 fi
-echo "$as_me:15259: result: $cf_cv_type_fd_mask" >&5
+echo "$as_me:15268: 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
 
@@ -15266,14 +15275,14 @@
 
 fi
 
-echo "$as_me:15269: checking for IRIX 6.5 baud-rate redefinitions" >&5
+echo "$as_me:15278: 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 15276 "configure"
+#line 15285 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -15292,16 +15301,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15295: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15304: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15298: \$? = $ac_status" >&5
+  echo "$as_me:15307: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15301: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15310: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15304: \$? = $ac_status" >&5
+  echo "$as_me:15313: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_termio_c_ispeed=yes
 
@@ -15313,21 +15322,21 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:15316: result: $cf_cv_termio_c_ispeed" >&5
+echo "$as_me:15325: 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:15323: checking for termios type tcflag_t" >&5
+echo "$as_me:15332: 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 15330 "configure"
+#line 15339 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -15340,16 +15349,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15343: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15352: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15346: \$? = $ac_status" >&5
+  echo "$as_me:15355: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15349: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15358: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15352: \$? = $ac_status" >&5
+  echo "$as_me:15361: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_havetype_tcflag_t=yes
 else
@@ -15360,21 +15369,21 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:15363: result: $cf_cv_havetype_tcflag_t" >&5
+echo "$as_me:15372: 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:15370: checking for termios type speed_t" >&5
+echo "$as_me:15379: 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 15377 "configure"
+#line 15386 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -15387,16 +15396,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15390: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15399: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15393: \$? = $ac_status" >&5
+  echo "$as_me:15402: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15396: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15405: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15399: \$? = $ac_status" >&5
+  echo "$as_me:15408: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_havetype_speed_t=yes
 else
@@ -15407,21 +15416,21 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:15410: result: $cf_cv_havetype_speed_t" >&5
+echo "$as_me:15419: 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:15417: checking for termios type cc_t" >&5
+echo "$as_me:15426: 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 15424 "configure"
+#line 15433 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -15434,16 +15443,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15437: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15446: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15440: \$? = $ac_status" >&5
+  echo "$as_me:15449: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15443: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15452: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15446: \$? = $ac_status" >&5
+  echo "$as_me:15455: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_havetype_cc_t=yes
 else
@@ -15454,7 +15463,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:15457: result: $cf_cv_havetype_cc_t" >&5
+echo "$as_me:15466: 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
@@ -15466,7 +15475,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:15469: checking if we expect to use the Xcursor library" >&5
+echo "$as_me:15478: 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.
@@ -15483,7 +15492,7 @@
 	enable_xcursor=yes
 
 fi;
-echo "$as_me:15486: result: $enable_xcursor" >&5
+echo "$as_me:15495: result: $enable_xcursor" >&5
 echo "${ECHO_T}$enable_xcursor" >&6
 if test "$enable_xcursor" = yes; then
 
@@ -15500,23 +15509,23 @@
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:15503: checking for $ac_header" >&5
+echo "$as_me:15512: 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 15509 "configure"
+#line 15518 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:15513: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:15522: \"$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:15519: \$? = $ac_status" >&5
+  echo "$as_me:15528: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15535,7 +15544,7 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:15538: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:15547: 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
@@ -15565,13 +15574,13 @@
 for ac_func in $cf_func_grantpt
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:15568: checking for $ac_func" >&5
+echo "$as_me:15577: 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 15574 "configure"
+#line 15583 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15602,16 +15611,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15605: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15614: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15608: \$? = $ac_status" >&5
+  echo "$as_me:15617: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15611: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15620: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15614: \$? = $ac_status" >&5
+  echo "$as_me:15623: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -15621,7 +15630,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15624: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:15633: 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
@@ -15633,10 +15642,10 @@
 
 cf_grantpt_opts=
 if test "x$ac_cv_func_grantpt" = "xyes" ; then
-	echo "$as_me:15636: checking if grantpt really works" >&5
+	echo "$as_me:15645: checking if grantpt really works" >&5
 echo $ECHO_N "checking if grantpt really works... $ECHO_C" >&6
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 15639 "configure"
+#line 15648 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -15673,7 +15682,6 @@
 {
 
 	int code = 0;
-	int rc;
 	int pty;
 	int tty;
 	char *slave;
@@ -15686,9 +15694,9 @@
 		failed(9);
 	else if ((pty = posix_openpt(O_RDWR)) < 0)
 		failed(1);
-	else if ((rc = grantpt(pty)) < 0)
+	else if (grantpt(pty) < 0)
 		failed(2);
-	else if ((rc = unlockpt(pty)) < 0)
+	else if (unlockpt(pty) < 0)
 		failed(3);
 	else if ((slave = ptsname(pty)) == 0)
 		failed(4);
@@ -15697,9 +15705,9 @@
 		failed(4);
 #endif
 #if CONFTEST >= 4
-    else if ((rc = tcgetattr(pty, &tio)) < 0)
+    else if (tcgetattr(pty, &tio) < 0)
 		failed(20);
-    else if ((rc = tcsetattr(pty, TCSAFLUSH, &tio)) < 0)
+    else if (tcsetattr(pty, TCSAFLUSH, &tio) < 0)
 		failed(21);
 #endif
 	/* BSD posix_openpt does not treat pty as a terminal until slave is opened.
@@ -15710,26 +15718,26 @@
 #ifdef CONFTEST
 #ifdef I_PUSH
 #if (CONFTEST == 0) || defined(CONFTEST_ptem)
-    else if ((rc = ioctl(tty, I_PUSH, "ptem")) < 0)
+    else if (ioctl(tty, I_PUSH, "ptem") < 0)
 		failed(10);
 #endif
 #if (CONFTEST == 1) || defined(CONFTEST_ldterm)
-    else if ((rc = ioctl(tty, I_PUSH, "ldterm")) < 0)
+    else if (ioctl(tty, I_PUSH, "ldterm") < 0)
 		failed(11);
 #endif
 #if (CONFTEST == 2) || defined(CONFTEST_ttcompat)
-    else if ((rc = ioctl(tty, I_PUSH, "ttcompat")) < 0)
+    else if (ioctl(tty, I_PUSH, "ttcompat") < 0)
 		failed(12);
 #endif
 #endif /* I_PUSH */
 #if CONFTEST >= 5
-    else if ((rc = tcgetattr(tty, &tio)) < 0)
+    else if (tcgetattr(tty, &tio) < 0)
 		failed(30);
-    else if ((rc = tcsetattr(tty, TCSAFLUSH, &tio)) < 0)
+    else if (tcsetattr(tty, TCSAFLUSH, &tio) < 0)
 		failed(31);
 #endif
 #endif /* CONFTEST */
-
+    (void) tty;
 	${cf_cv_main_return:-return}(code);
 
   ;
@@ -15737,23 +15745,23 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15740: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15748: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15743: \$? = $ac_status" >&5
+  echo "$as_me:15751: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15746: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15754: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15749: \$? = $ac_status" >&5
+  echo "$as_me:15757: \$? = $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 15756 "configure"
+#line 15764 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -15789,7 +15797,6 @@
 {
 
 	int code = 0;
-	int rc;
 	int pty;
 	int tty;
 	char *slave;
@@ -15802,9 +15809,9 @@
 		failed(9);
 	else if ((pty = posix_openpt(O_RDWR)) < 0)
 		failed(1);
-	else if ((rc = grantpt(pty)) < 0)
+	else if (grantpt(pty) < 0)
 		failed(2);
-	else if ((rc = unlockpt(pty)) < 0)
+	else if (unlockpt(pty) < 0)
 		failed(3);
 	else if ((slave = ptsname(pty)) == 0)
 		failed(4);
@@ -15813,9 +15820,9 @@
 		failed(4);
 #endif
 #if CONFTEST >= 4
-    else if ((rc = tcgetattr(pty, &tio)) < 0)
+    else if (tcgetattr(pty, &tio) < 0)
 		failed(20);
-    else if ((rc = tcsetattr(pty, TCSAFLUSH, &tio)) < 0)
+    else if (tcsetattr(pty, TCSAFLUSH, &tio) < 0)
 		failed(21);
 #endif
 	/* BSD posix_openpt does not treat pty as a terminal until slave is opened.
@@ -15826,41 +15833,41 @@
 #ifdef CONFTEST
 #ifdef I_PUSH
 #if (CONFTEST == 0) || defined(CONFTEST_ptem)
-    else if ((rc = ioctl(tty, I_PUSH, "ptem")) < 0)
+    else if (ioctl(tty, I_PUSH, "ptem") < 0)
 		failed(10);
 #endif
 #if (CONFTEST == 1) || defined(CONFTEST_ldterm)
-    else if ((rc = ioctl(tty, I_PUSH, "ldterm")) < 0)
+    else if (ioctl(tty, I_PUSH, "ldterm") < 0)
 		failed(11);
 #endif
 #if (CONFTEST == 2) || defined(CONFTEST_ttcompat)
-    else if ((rc = ioctl(tty, I_PUSH, "ttcompat")) < 0)
+    else if (ioctl(tty, I_PUSH, "ttcompat") < 0)
 		failed(12);
 #endif
 #endif /* I_PUSH */
 #if CONFTEST >= 5
-    else if ((rc = tcgetattr(tty, &tio)) < 0)
+    else if (tcgetattr(tty, &tio) < 0)
 		failed(30);
-    else if ((rc = tcsetattr(tty, TCSAFLUSH, &tio)) < 0)
+    else if (tcsetattr(tty, TCSAFLUSH, &tio) < 0)
 		failed(31);
 #endif
 #endif /* CONFTEST */
-
+    (void) tty;
 	${cf_cv_main_return:-return}(code);
 
 }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:15855: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15862: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15858: \$? = $ac_status" >&5
+  echo "$as_me:15865: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:15860: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15867: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15863: \$? = $ac_status" >&5
+  echo "$as_me:15870: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -15879,13 +15886,13 @@
 ac_cv_func_grantpt=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-	echo "$as_me:15882: result: $ac_cv_func_grantpt" >&5
+	echo "$as_me:15889: 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:15888: checking for pty features" >&5
+			echo "$as_me:15895: 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
@@ -15901,15 +15908,15 @@
 				cf_pty_feature=
 				cf_pty_next="`expr $cf_pty_this + 1`"
 
-echo "${as_me:-configure}:15904: testing pty feature test $cf_pty_next:5 ..." 1>&5
+echo "${as_me:-configure}:15911: testing pty feature test $cf_pty_next:5 ..." 1>&5
 
 				if test "$cross_compiling" = yes; then
-  { { echo "$as_me:15907: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:15914: 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 15912 "configure"
+#line 15919 "configure"
 #include "confdefs.h"
 #define CONFTEST $cf_pty_this
 $cf_pty_defines
@@ -15947,7 +15954,6 @@
 {
 
 	int code = 0;
-	int rc;
 	int pty;
 	int tty;
 	char *slave;
@@ -15960,9 +15966,9 @@
 		failed(9);
 	else if ((pty = posix_openpt(O_RDWR)) < 0)
 		failed(1);
-	else if ((rc = grantpt(pty)) < 0)
+	else if (grantpt(pty) < 0)
 		failed(2);
-	else if ((rc = unlockpt(pty)) < 0)
+	else if (unlockpt(pty) < 0)
 		failed(3);
 	else if ((slave = ptsname(pty)) == 0)
 		failed(4);
@@ -15971,9 +15977,9 @@
 		failed(4);
 #endif
 #if CONFTEST >= 4
-    else if ((rc = tcgetattr(pty, &tio)) < 0)
+    else if (tcgetattr(pty, &tio) < 0)
 		failed(20);
-    else if ((rc = tcsetattr(pty, TCSAFLUSH, &tio)) < 0)
+    else if (tcsetattr(pty, TCSAFLUSH, &tio) < 0)
 		failed(21);
 #endif
 	/* BSD posix_openpt does not treat pty as a terminal until slave is opened.
@@ -15984,41 +15990,41 @@
 #ifdef CONFTEST
 #ifdef I_PUSH
 #if (CONFTEST == 0) || defined(CONFTEST_ptem)
-    else if ((rc = ioctl(tty, I_PUSH, "ptem")) < 0)
+    else if (ioctl(tty, I_PUSH, "ptem") < 0)
 		failed(10);
 #endif
 #if (CONFTEST == 1) || defined(CONFTEST_ldterm)
-    else if ((rc = ioctl(tty, I_PUSH, "ldterm")) < 0)
+    else if (ioctl(tty, I_PUSH, "ldterm") < 0)
 		failed(11);
 #endif
 #if (CONFTEST == 2) || defined(CONFTEST_ttcompat)
-    else if ((rc = ioctl(tty, I_PUSH, "ttcompat")) < 0)
+    else if (ioctl(tty, I_PUSH, "ttcompat") < 0)
 		failed(12);
 #endif
 #endif /* I_PUSH */
 #if CONFTEST >= 5
-    else if ((rc = tcgetattr(tty, &tio)) < 0)
+    else if (tcgetattr(tty, &tio) < 0)
 		failed(30);
-    else if ((rc = tcsetattr(tty, TCSAFLUSH, &tio)) < 0)
+    else if (tcsetattr(tty, TCSAFLUSH, &tio) < 0)
 		failed(31);
 #endif
 #endif /* CONFTEST */
-
+    (void) tty;
 	${cf_cv_main_return:-return}(code);
 
 }
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:16013: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16019: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16016: \$? = $ac_status" >&5
+  echo "$as_me:16022: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:16018: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16024: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16021: \$? = $ac_status" >&5
+  echo "$as_me:16027: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 				case $cf_pty_next in
@@ -16050,7 +16056,7 @@
 				case $cf_pty_next in
 				(1|2|3)
 
-echo "${as_me:-configure}:16053: testing skipping remaining streams features $cf_pty_this..2 ..." 1>&5
+echo "${as_me:-configure}:16059: testing skipping remaining streams features $cf_pty_this..2 ..." 1>&5
 
 					cf_pty_next=3
 					;;
@@ -16069,7 +16075,7 @@
 
 				cf_pty_this=$cf_pty_next
 			done
-			echo "$as_me:16072: result: $cf_grantpt_opts" >&5
+			echo "$as_me:16078: result: $cf_grantpt_opts" >&5
 echo "${ECHO_T}$cf_grantpt_opts" >&6
 			cf_grantpt_opts=`echo "$cf_grantpt_opts" | sed -e 's/ isatty//'`
 		fi
@@ -16079,10 +16085,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}:16082: testing prefer posix_openpt over openpty ..." 1>&5
+echo "${as_me:-configure}:16088: testing prefer posix_openpt over openpty ..." 1>&5
 
 elif test "x$disable_openpty" != "xyes" || test -z "$cf_grantpt_opts" ; then
-	echo "$as_me:16085: checking for openpty in -lutil" >&5
+	echo "$as_me:16091: 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
@@ -16090,7 +16096,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16093 "configure"
+#line 16099 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16109,16 +16115,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16112: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16118: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16115: \$? = $ac_status" >&5
+  echo "$as_me:16121: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16118: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16124: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16121: \$? = $ac_status" >&5
+  echo "$as_me:16127: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_util_openpty=yes
 else
@@ -16129,7 +16135,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16132: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:16138: 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
@@ -16152,23 +16158,23 @@
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:16155: checking for $ac_header" >&5
+echo "$as_me:16161: 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 16161 "configure"
+#line 16167 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:16165: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:16171: \"$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:16171: \$? = $ac_status" >&5
+  echo "$as_me:16177: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -16187,7 +16193,7 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:16190: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:16196: 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
@@ -16204,7 +16210,7 @@
 then
 	test -n "$verbose" && echo "	will rely upon grantpt" 1>&6
 
-echo "${as_me:-configure}:16207: testing will rely upon grantpt ..." 1>&5
+echo "${as_me:-configure}:16213: testing will rely upon grantpt ..." 1>&5
 
 cat >>confdefs.h <<\EOF
 #define HAVE_WORKING_GRANTPT 1
@@ -16225,23 +16231,23 @@
 then
 	test -n "$verbose" && echo "	will rely upon BSD-pseudoterminals" 1>&6
 
-echo "${as_me:-configure}:16228: testing will rely upon BSD-pseudoterminals ..." 1>&5
+echo "${as_me:-configure}:16234: testing will rely upon BSD-pseudoterminals ..." 1>&5
 
 else
 	test -n "$verbose" && echo "	will rely upon openpty" 1>&6
 
-echo "${as_me:-configure}:16233: testing will rely upon openpty ..." 1>&5
+echo "${as_me:-configure}:16239: testing will rely upon openpty ..." 1>&5
 
 fi
 
-echo "$as_me:16237: checking if we can use XkbQueryExtension" >&5
+echo "$as_me:16243: 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 16244 "configure"
+#line 16250 "configure"
 #include "confdefs.h"
 
 #include <X11/Xlib.h>
@@ -16270,16 +16276,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16273: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16279: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16276: \$? = $ac_status" >&5
+  echo "$as_me:16282: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16279: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16285: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16282: \$? = $ac_status" >&5
+  echo "$as_me:16288: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 cf_cv_xkb_query_extension=yes
@@ -16294,7 +16300,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16297: result: $cf_cv_xkb_query_extension" >&5
+echo "$as_me:16303: result: $cf_cv_xkb_query_extension" >&5
 echo "${ECHO_T}$cf_cv_xkb_query_extension" >&6
 
 if test $cf_cv_xkb_query_extension = yes
@@ -16303,13 +16309,13 @@
 for ac_func in XkbQueryExtension
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:16306: checking for $ac_func" >&5
+echo "$as_me:16312: 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 16312 "configure"
+#line 16318 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -16340,16 +16346,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16343: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16349: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16346: \$? = $ac_status" >&5
+  echo "$as_me:16352: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16349: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16355: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16352: \$? = $ac_status" >&5
+  echo "$as_me:16358: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -16359,7 +16365,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16362: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:16368: 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
@@ -16371,14 +16377,14 @@
 
 fi
 
-echo "$as_me:16374: checking if we can use XkbKeycodeToKeysym" >&5
+echo "$as_me:16380: 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 16381 "configure"
+#line 16387 "configure"
 #include "confdefs.h"
 
 #include <X11/Xlib.h>
@@ -16396,16 +16402,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16399: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16405: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16402: \$? = $ac_status" >&5
+  echo "$as_me:16408: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16405: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16411: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16408: \$? = $ac_status" >&5
+  echo "$as_me:16414: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 cf_cv_xkb_keycode_to_keysym=yes
@@ -16420,7 +16426,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16423: result: $cf_cv_xkb_keycode_to_keysym" >&5
+echo "$as_me:16429: 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
@@ -16429,13 +16435,13 @@
 for ac_func in XkbKeycodeToKeysym
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:16432: checking for $ac_func" >&5
+echo "$as_me:16438: 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 16438 "configure"
+#line 16444 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -16466,16 +16472,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16469: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16475: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16472: \$? = $ac_status" >&5
+  echo "$as_me:16478: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16475: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16481: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16478: \$? = $ac_status" >&5
+  echo "$as_me:16484: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -16485,7 +16491,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16488: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:16494: 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
@@ -16513,14 +16519,14 @@
 	esac
 done
 
-echo "$as_me:16516: checking for XKB Bell extension" >&5
+echo "$as_me:16522: 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 16523 "configure"
+#line 16529 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -16541,16 +16547,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16544: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16550: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16547: \$? = $ac_status" >&5
+  echo "$as_me:16553: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16550: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16556: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16553: \$? = $ac_status" >&5
+  echo "$as_me:16559: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xkb_bell_ext=yes
 else
@@ -16561,7 +16567,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16564: result: $cf_cv_xkb_bell_ext" >&5
+echo "$as_me:16570: 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
@@ -16575,13 +16581,13 @@
 for ac_func in Xutf8LookupString
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:16578: checking for $ac_func" >&5
+echo "$as_me:16584: 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 16584 "configure"
+#line 16590 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -16612,16 +16618,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16615: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16621: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16618: \$? = $ac_status" >&5
+  echo "$as_me:16624: \$? = $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:16627: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16624: \$? = $ac_status" >&5
+  echo "$as_me:16630: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -16631,7 +16637,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16634: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:16640: 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
@@ -16647,7 +16653,7 @@
 fi
 done
 
-echo "$as_me:16650: checking if you want narrow prototypes for X libraries" >&5
+echo "$as_me:16656: 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
@@ -16673,10 +16679,10 @@
 	enable_narrowproto=$cf_default_narrowproto
 
 fi;
-echo "$as_me:16676: result: $enable_narrowproto" >&5
+echo "$as_me:16682: result: $enable_narrowproto" >&5
 echo "${ECHO_T}$enable_narrowproto" >&6
 
-echo "$as_me:16679: checking if we should use imake to help" >&5
+echo "$as_me:16685: 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.
@@ -16693,7 +16699,7 @@
 	enable_imake=yes
 
 fi;
-echo "$as_me:16696: result: $enable_imake" >&5
+echo "$as_me:16702: result: $enable_imake" >&5
 echo "${ECHO_T}$enable_imake" >&6
 
 if test "$enable_imake" = yes ; then
@@ -16702,7 +16708,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:16705: checking for $ac_word" >&5
+echo "$as_me:16711: 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
@@ -16719,7 +16725,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:16722: found $ac_dir/$ac_word" >&5
+   echo "$as_me:16728: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -16730,10 +16736,10 @@
 IMAKE=$ac_cv_path_IMAKE
 
 if test -n "$IMAKE"; then
-  echo "$as_me:16733: result: $IMAKE" >&5
+  echo "$as_me:16739: result: $IMAKE" >&5
 echo "${ECHO_T}$IMAKE" >&6
 else
-  echo "$as_me:16736: result: no" >&5
+  echo "$as_me:16742: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -16793,7 +16799,7 @@
 	then
 		test -n "$verbose" && echo "	Using $IMAKE $cf_imake_opts" 1>&6
 
-echo "${as_me:-configure}:16796: testing Using $IMAKE $cf_imake_opts ..." 1>&5
+echo "${as_me:-configure}:16802: testing Using $IMAKE $cf_imake_opts ..." 1>&5
 
 	else
 		# sometimes imake doesn't have the config path compiled in.  Find it.
@@ -16811,7 +16817,7 @@
 			esac
 		done
 		if test -z "$cf_config" ; then
-			{ echo "$as_me:16814: WARNING: Could not find imake config-directory" >&5
+			{ echo "$as_me:16820: 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"
@@ -16819,10 +16825,10 @@
 			then
 				test -n "$verbose" && echo "	Using $IMAKE $cf_config" 1>&6
 
-echo "${as_me:-configure}:16822: testing Using $IMAKE $cf_config ..." 1>&5
+echo "${as_me:-configure}:16828: testing Using $IMAKE $cf_config ..." 1>&5
 
 			else
-				{ echo "$as_me:16825: WARNING: Cannot run $IMAKE" >&5
+				{ echo "$as_me:16831: WARNING: Cannot run $IMAKE" >&5
 echo "$as_me: WARNING: Cannot run $IMAKE" >&2;}
 			fi
 		fi
@@ -16866,7 +16872,7 @@
 		else
 		    test -n "$verbose" && echo "	suppressed \"$cf_nostdinc\" and \"$cf_std_incl\"" 1>&6
 
-echo "${as_me:-configure}:16869: testing suppressed \"$cf_nostdinc\" and \"$cf_std_incl\" ..." 1>&5
+echo "${as_me:-configure}:16875: testing suppressed \"$cf_nostdinc\" and \"$cf_std_incl\" ..." 1>&5
 
 		    IMAKE_CFLAGS="$cf_cpp_opts"
 		fi
@@ -16888,11 +16894,11 @@
 
 test -n "$verbose" && echo "	IMAKE_CFLAGS $IMAKE_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:16891: testing IMAKE_CFLAGS $IMAKE_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16897: testing IMAKE_CFLAGS $IMAKE_CFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	IMAKE_LOADFLAGS $IMAKE_LOADFLAGS" 1>&6
 
-echo "${as_me:-configure}:16895: testing IMAKE_LOADFLAGS $IMAKE_LOADFLAGS ..." 1>&5
+echo "${as_me:-configure}:16901: testing IMAKE_LOADFLAGS $IMAKE_LOADFLAGS ..." 1>&5
 
 fi
 
@@ -17001,7 +17007,7 @@
 	IMAKE_LOADFLAGS=
 	test -n "$verbose" && echo "	make fallback definitions" 1>&6
 
-echo "${as_me:-configure}:17004: testing make fallback definitions ..." 1>&5
+echo "${as_me:-configure}:17010: 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,
@@ -17148,7 +17154,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:17151: checking for $ac_word" >&5
+echo "$as_me:17157: 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
@@ -17165,7 +17171,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:17168: found $ac_dir/$ac_word" >&5
+   echo "$as_me:17174: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -17177,10 +17183,10 @@
 GROFF_PATH=$ac_cv_path_GROFF_PATH
 
 if test -n "$GROFF_PATH"; then
-  echo "$as_me:17180: result: $GROFF_PATH" >&5
+  echo "$as_me:17186: result: $GROFF_PATH" >&5
 echo "${ECHO_T}$GROFF_PATH" >&6
 else
-  echo "$as_me:17183: result: no" >&5
+  echo "$as_me:17189: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -17188,7 +17194,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:17191: checking for $ac_word" >&5
+echo "$as_me:17197: 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
@@ -17205,7 +17211,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:17208: found $ac_dir/$ac_word" >&5
+   echo "$as_me:17214: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -17216,10 +17222,10 @@
 NROFF_PATH=$ac_cv_path_NROFF_PATH
 
 if test -n "$NROFF_PATH"; then
-  echo "$as_me:17219: result: $NROFF_PATH" >&5
+  echo "$as_me:17225: result: $NROFF_PATH" >&5
 echo "${ECHO_T}$NROFF_PATH" >&6
 else
-  echo "$as_me:17222: result: no" >&5
+  echo "$as_me:17228: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -17229,7 +17235,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:17232: checking for $ac_word" >&5
+echo "$as_me:17238: 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
@@ -17246,7 +17252,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:17249: found $ac_dir/$ac_word" >&5
+   echo "$as_me:17255: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -17258,10 +17264,10 @@
 TBL_PATH=$ac_cv_path_TBL_PATH
 
 if test -n "$TBL_PATH"; then
-  echo "$as_me:17261: result: $TBL_PATH" >&5
+  echo "$as_me:17267: result: $TBL_PATH" >&5
 echo "${ECHO_T}$TBL_PATH" >&6
 else
-  echo "$as_me:17264: result: no" >&5
+  echo "$as_me:17270: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -17274,7 +17280,7 @@
 	GROFF_NOTE=
 fi
 
-echo "$as_me:17277: checking for fgrep" >&5
+echo "$as_me:17283: 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
@@ -17286,7 +17292,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:17289: checking for $ac_word" >&5
+echo "$as_me:17295: 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
@@ -17303,7 +17309,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:17306: found $ac_dir/$ac_word" >&5
+   echo "$as_me:17312: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -17314,10 +17320,10 @@
 FGREP=$ac_cv_path_FGREP
 
 if test -n "$FGREP"; then
-  echo "$as_me:17317: result: $FGREP" >&5
+  echo "$as_me:17323: result: $FGREP" >&5
 echo "${ECHO_T}$FGREP" >&6
 else
-  echo "$as_me:17320: result: no" >&5
+  echo "$as_me:17326: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -17325,12 +17331,12 @@
 done
 test -n "$FGREP" || FGREP=": "
 
-     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:17328: error: cannot find workable fgrep" >&5
+     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:17334: error: cannot find workable fgrep" >&5
 echo "$as_me: error: cannot find workable fgrep" >&2;}
    { (exit 1); exit 1; }; }
    fi
 fi
-echo "$as_me:17333: result: $ac_cv_path_FGREP" >&5
+echo "$as_me:17339: result: $ac_cv_path_FGREP" >&5
 echo "${ECHO_T}$ac_cv_path_FGREP" >&6
  FGREP="$ac_cv_path_FGREP"
 
@@ -17341,7 +17347,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:17344: checking for $ac_word" >&5
+echo "$as_me:17350: 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
@@ -17358,7 +17364,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:17361: found $ac_dir/$ac_word" >&5
+   echo "$as_me:17367: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -17370,16 +17376,16 @@
 cf_man2html=$ac_cv_path_cf_man2html
 
 if test -n "$cf_man2html"; then
-  echo "$as_me:17373: result: $cf_man2html" >&5
+  echo "$as_me:17379: result: $cf_man2html" >&5
 echo "${ECHO_T}$cf_man2html" >&6
 else
-  echo "$as_me:17376: result: no" >&5
+  echo "$as_me:17382: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 	case "x$cf_man2html" in
 	(x/*)
-		echo "$as_me:17382: checking for the modified Earl Hood script" >&5
+		echo "$as_me:17388: 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
@@ -17388,7 +17394,7 @@
 			cf_man2html=no
 			cf_man2html_ok=no
 		fi
-		echo "$as_me:17391: result: $cf_man2html_ok" >&5
+		echo "$as_me:17397: result: $cf_man2html_ok" >&5
 echo "${ECHO_T}$cf_man2html_ok" >&6
 		;;
 	(*)
@@ -17397,7 +17403,7 @@
 	esac
 esac
 
-echo "$as_me:17400: checking for program to convert manpage to html" >&5
+echo "$as_me:17406: 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.
@@ -17412,11 +17418,11 @@
 
 case $cf_man2html in
 (yes)
-	echo "$as_me:17415: result: man2html" >&5
+	echo "$as_me:17421: 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:17419: checking for $ac_word" >&5
+echo "$as_me:17425: 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
@@ -17433,7 +17439,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:17436: found $ac_dir/$ac_word" >&5
+   echo "$as_me:17442: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -17445,10 +17451,10 @@
 cf_man2html=$ac_cv_path_cf_man2html
 
 if test -n "$cf_man2html"; then
-  echo "$as_me:17448: result: $cf_man2html" >&5
+  echo "$as_me:17454: result: $cf_man2html" >&5
 echo "${ECHO_T}$cf_man2html" >&6
 else
-  echo "$as_me:17451: result: no" >&5
+  echo "$as_me:17457: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -17456,11 +17462,11 @@
 (no|groff|*/groff*)
 	cf_with_groff=yes
 	cf_man2html=$GROFF_PATH
-	echo "$as_me:17459: result: $cf_man2html" >&5
+	echo "$as_me:17465: result: $cf_man2html" >&5
 echo "${ECHO_T}$cf_man2html" >&6
 	;;
 (*)
-	echo "$as_me:17463: result: $cf_man2html" >&5
+	echo "$as_me:17469: result: $cf_man2html" >&5
 echo "${ECHO_T}$cf_man2html" >&6
 	;;
 esac
@@ -17501,12 +17507,12 @@
 	# disable hyphenation if this is groff
 	if test "x$GROFF_PATH" != xno
 	then
-		echo "$as_me:17504: checking if nroff is really groff" >&5
+		echo "$as_me:17510: 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:17509: result: $cf_check_groff" >&5
+		echo "$as_me:17515: result: $cf_check_groff" >&5
 echo "${ECHO_T}$cf_check_groff" >&6
 		test "x$cf_check_groff" = xyes && NROFF_OPTS="-rHY=0"
 	fi
@@ -17537,14 +17543,14 @@
 	cf_man2html=`echo "$cf_man2html" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:17540: error: expected a pathname, not \"$cf_man2html\"" >&5
+	{ { echo "$as_me:17546: 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:17547: checking for $cf_man2html top/bottom margins" >&5
+	echo "$as_me:17553: 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
@@ -17562,10 +17568,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:17565: result: $cf_man2html_top_bot" >&5
+	echo "$as_me:17571: result: $cf_man2html_top_bot" >&5
 echo "${ECHO_T}$cf_man2html_top_bot" >&6
 
-	echo "$as_me:17568: checking for pagesize to use" >&5
+	echo "$as_me:17574: 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
@@ -17590,7 +17596,7 @@
 	test "$cf_man2html_page" -gt 100 && cf_man2html_page=99999
 
 	rm -rf conftest*
-	echo "$as_me:17593: result: $cf_man2html_page" >&5
+	echo "$as_me:17599: result: $cf_man2html_page" >&5
 echo "${ECHO_T}$cf_man2html_page" >&6
 
 	cat >>$MAN2HTML_TEMP <<CF_EOF
@@ -17618,27 +17624,27 @@
 
 	test -n "$verbose" && echo "	removing terminfo flags from IMAKE_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:17621: testing removing terminfo flags from IMAKE_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17627: 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}:17626: testing ...result $IMAKE_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:17632: testing ...result $IMAKE_CFLAGS ..." 1>&5
 
 	test -n "$verbose" && echo "	removing terminfo flags from CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:17630: testing removing terminfo flags from CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17636: 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}:17635: testing ...result $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:17641: testing ...result $CPPFLAGS ..." 1>&5
 
 		;;
 	esac
 fi
 
-echo "$as_me:17641: checking for default terminal-id" >&5
+echo "$as_me:17647: 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.
@@ -17648,7 +17654,7 @@
 else
   default_termid=vt420
 fi;
-echo "$as_me:17651: result: $default_termid" >&5
+echo "$as_me:17657: result: $default_termid" >&5
 echo "${ECHO_T}$default_termid" >&6
 case $default_termid in
 (vt*)	default_termid=`echo $default_termid | sed -e 's/^..//'`
@@ -17659,7 +17665,7 @@
 #define DFT_DECID "$default_termid"
 EOF
 
-echo "$as_me:17662: checking for default terminal-type" >&5
+echo "$as_me:17668: 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.
@@ -17669,7 +17675,7 @@
 else
   default_TERM=xterm
 fi;
-echo "$as_me:17672: result: $default_TERM" >&5
+echo "$as_me:17678: result: $default_TERM" >&5
 echo "${ECHO_T}$default_TERM" >&6
 
 cat >>confdefs.h <<EOF
@@ -17677,7 +17683,7 @@
 EOF
 
 ###############################################################################
-echo "$as_me:17680: checking if backarrow-key should be BS" >&5
+echo "$as_me:17686: 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.
@@ -17695,7 +17701,7 @@
 
 fi;
 
-echo "$as_me:17698: result: $backarrow_is_bs" >&5
+echo "$as_me:17704: result: $backarrow_is_bs" >&5
 echo "${ECHO_T}$backarrow_is_bs" >&6
 case $backarrow_is_bs in
 (yes)
@@ -17716,7 +17722,7 @@
 #define DEF_BACKARO_BS $backarrow_is_bs
 EOF
 
-echo "$as_me:17719: checking if backarrow-key should be treated as erase" >&5
+echo "$as_me:17725: 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.
@@ -17734,7 +17740,7 @@
 
 fi;
 
-echo "$as_me:17737: result: $backarrow_is_erase" >&5
+echo "$as_me:17743: result: $backarrow_is_erase" >&5
 echo "${ECHO_T}$backarrow_is_erase" >&6
 case $backarrow_is_erase in
 (yes)
@@ -17755,7 +17761,7 @@
 #define DEF_BACKARO_ERASE $backarrow_is_erase
 EOF
 
-echo "$as_me:17758: checking for default backspace/DEL setting" >&5
+echo "$as_me:17764: 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.
@@ -17766,7 +17772,7 @@
   delete_is_del=maybe
 fi;
 
-echo "$as_me:17769: result: $delete_is_del" >&5
+echo "$as_me:17775: result: $delete_is_del" >&5
 echo "${ECHO_T}$delete_is_del" >&6
 case $delete_is_del in
 (yes)
@@ -17787,7 +17793,7 @@
 #define DEFDELETE_DEL $delete_is_del
 EOF
 
-echo "$as_me:17790: checking for default pty initial erase setting" >&5
+echo "$as_me:17796: 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.
@@ -17798,7 +17804,7 @@
   initial_erase=False
 fi;
 
-echo "$as_me:17801: result: $initial_erase" >&5
+echo "$as_me:17807: result: $initial_erase" >&5
 echo "${ECHO_T}$initial_erase" >&6
 case $initial_erase in
 (yes)
@@ -17819,7 +17825,7 @@
 #define DEF_INITIAL_ERASE $initial_erase
 EOF
 
-echo "$as_me:17822: checking if alt should send ESC" >&5
+echo "$as_me:17828: 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.
@@ -17837,7 +17843,7 @@
 
 fi;
 
-echo "$as_me:17840: result: $alt_sends_esc" >&5
+echo "$as_me:17846: result: $alt_sends_esc" >&5
 echo "${ECHO_T}$alt_sends_esc" >&6
 case $alt_sends_esc in
 (yes)
@@ -17858,7 +17864,7 @@
 #define DEF_ALT_SENDS_ESC $alt_sends_esc
 EOF
 
-echo "$as_me:17861: checking if meta should send ESC" >&5
+echo "$as_me:17867: 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.
@@ -17876,7 +17882,7 @@
 
 fi;
 
-echo "$as_me:17879: result: $meta_sends_esc" >&5
+echo "$as_me:17885: result: $meta_sends_esc" >&5
 echo "${ECHO_T}$meta_sends_esc" >&6
 case $meta_sends_esc in
 (yes)
@@ -17900,7 +17906,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:17903: checking for $ac_word" >&5
+echo "$as_me:17909: 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
@@ -17915,7 +17921,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:17918: found $ac_dir/$ac_word" >&5
+echo "$as_me:17924: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -17924,10 +17930,10 @@
 fi
 cf_tic_prog=$ac_cv_prog_cf_tic_prog
 if test -n "$cf_tic_prog"; then
-  echo "$as_me:17927: result: $cf_tic_prog" >&5
+  echo "$as_me:17933: result: $cf_tic_prog" >&5
 echo "${ECHO_T}$cf_tic_prog" >&6
 else
-  echo "$as_me:17930: result: no" >&5
+  echo "$as_me:17936: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -17943,7 +17949,7 @@
 			;;
 		esac
 	fi
-	echo "$as_me:17946: checking for private terminfo-directory" >&5
+	echo "$as_me:17952: 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.
@@ -17953,10 +17959,10 @@
 else
   TERMINFO_DIR=${TERMINFO-none}
 fi;
-	echo "$as_me:17956: result: $TERMINFO_DIR" >&5
+	echo "$as_me:17962: result: $TERMINFO_DIR" >&5
 echo "${ECHO_T}$TERMINFO_DIR" >&6
 	if test "$TERMINFO_DIR" = yes ; then
-		{ echo "$as_me:17959: WARNING: no value given" >&5
+		{ echo "$as_me:17965: 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
@@ -17965,7 +17971,7 @@
 #define OWN_TERMINFO_DIR "$TERMINFO_DIR"
 EOF
 
-			echo "$as_me:17968: checking if \$TERMINFO should also be set" >&5
+			echo "$as_me:17974: 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.
@@ -17975,7 +17981,7 @@
 else
   cf_env_terminfo=no
 fi;
-			echo "$as_me:17978: result: $cf_env_terminfo" >&5
+			echo "$as_me:17984: result: $cf_env_terminfo" >&5
 echo "${ECHO_T}$cf_env_terminfo" >&6
 			test $cf_env_terminfo = yes &&
 
@@ -17984,7 +17990,7 @@
 EOF
 
 		else
-			{ echo "$as_me:17987: WARNING: not a directory" >&5
+			{ echo "$as_me:17993: WARNING: not a directory" >&5
 echo "$as_me: WARNING: not a directory" >&2;}
 		fi
 	elif test "$prefix" != NONE ; then
@@ -18008,7 +18014,7 @@
 
 ###############################################################################
 
-echo "$as_me:18011: checking if you want active-icons" >&5
+echo "$as_me:18017: 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.
@@ -18025,7 +18031,7 @@
 	enable_active_icon=yes
 
 fi;
-echo "$as_me:18028: result: $enable_active_icon" >&5
+echo "$as_me:18034: result: $enable_active_icon" >&5
 echo "${ECHO_T}$enable_active_icon" >&6
 if test "$enable_active_icon" = no ; then
 
@@ -18035,7 +18041,7 @@
 
 fi
 
-echo "$as_me:18038: checking if you want ANSI color" >&5
+echo "$as_me:18044: 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.
@@ -18052,7 +18058,7 @@
 	enable_ansi_color=yes
 
 fi;
-echo "$as_me:18055: result: $enable_ansi_color" >&5
+echo "$as_me:18061: result: $enable_ansi_color" >&5
 echo "${ECHO_T}$enable_ansi_color" >&6
 test "$enable_ansi_color" = no &&
 cat >>confdefs.h <<\EOF
@@ -18061,7 +18067,7 @@
 
 if test "$enable_ansi_color" = yes ; then
 
-	echo "$as_me:18064: checking if you want 16 colors like aixterm" >&5
+	echo "$as_me:18070: 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.
@@ -18078,14 +18084,14 @@
 	enable_16_color=yes
 
 fi;
-	echo "$as_me:18081: result: $enable_16_color" >&5
+	echo "$as_me:18087: 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:18088: checking if you want 256 colors" >&5
+	echo "$as_me:18094: 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.
@@ -18102,7 +18108,7 @@
 	enable_256_color=yes
 
 fi;
-	echo "$as_me:18105: result: $enable_256_color" >&5
+	echo "$as_me:18111: result: $enable_256_color" >&5
 echo "${ECHO_T}$enable_256_color" >&6
 
 	if test "$enable_256_color" = yes ; then
@@ -18114,7 +18120,7 @@
 #define OPT_256_COLORS 1
 EOF
 
-		echo "$as_me:18117: checking if you want direct-color support" >&5
+		echo "$as_me:18123: 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.
@@ -18131,7 +18137,7 @@
 	enable_direct_color=yes
 
 fi;
-		echo "$as_me:18134: result: $enable_direct_color" >&5
+		echo "$as_me:18140: result: $enable_direct_color" >&5
 echo "${ECHO_T}$enable_direct_color" >&6
 		if test "$enable_direct_color" = yes ; then
 
@@ -18143,7 +18149,7 @@
 
 	else
 
-		echo "$as_me:18146: checking if you want 88 colors" >&5
+		echo "$as_me:18152: 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.
@@ -18160,7 +18166,7 @@
 	enable_88_color=yes
 
 fi;
-		echo "$as_me:18163: result: $enable_88_color" >&5
+		echo "$as_me:18169: 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"
@@ -18176,7 +18182,7 @@
 
 fi
 
-echo "$as_me:18179: checking if you want blinking cursor" >&5
+echo "$as_me:18185: 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.
@@ -18193,14 +18199,14 @@
 	enable_blink_curs=yes
 
 fi;
-echo "$as_me:18196: result: $enable_blink_curs" >&5
+echo "$as_me:18202: 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:18203: checking if you want to ignore Linux's broken palette-strings" >&5
+echo "$as_me:18209: 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
@@ -18224,7 +18230,7 @@
 	enable_broken_osc=$enableval
 
 fi;
-echo "$as_me:18227: result: $enable_broken_osc" >&5
+echo "$as_me:18233: result: $enable_broken_osc" >&5
 echo "${ECHO_T}$enable_broken_osc" >&6
 if test "$enable_broken_osc" = yes ; then
 
@@ -18240,7 +18246,7 @@
 
 fi
 
-echo "$as_me:18243: checking if you want to allow broken string-terminators" >&5
+echo "$as_me:18249: 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.
@@ -18257,14 +18263,14 @@
 	enable_broken_st=yes
 
 fi;
-echo "$as_me:18260: result: $enable_broken_st" >&5
+echo "$as_me:18266: 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:18267: checking if you want to compile-in icon data" >&5
+echo "$as_me:18273: 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.
@@ -18281,14 +18287,14 @@
 	enable_builtin_xpms=no
 
 fi;
-echo "$as_me:18284: result: $enable_builtin_xpms" >&5
+echo "$as_me:18290: 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:18291: checking if you want printable 128-159" >&5
+echo "$as_me:18297: 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.
@@ -18305,7 +18311,7 @@
 	enable_c1_print=yes
 
 fi;
-echo "$as_me:18308: result: $enable_c1_print" >&5
+echo "$as_me:18314: result: $enable_c1_print" >&5
 echo "${ECHO_T}$enable_c1_print" >&6
 test "$enable_c1_print" = no &&
 cat >>confdefs.h <<\EOF
@@ -18314,7 +18320,7 @@
 
 if test "$enable_ansi_color" = yes ; then
 
-	echo "$as_me:18317: checking if you want bold colors mapped like IBM PC" >&5
+	echo "$as_me:18323: 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.
@@ -18331,14 +18337,14 @@
 	enable_pc_color=yes
 
 fi;
-	echo "$as_me:18334: result: $enable_pc_color" >&5
+	echo "$as_me:18340: 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:18341: checking if you want separate color-classes" >&5
+	echo "$as_me:18347: 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.
@@ -18355,14 +18361,14 @@
 	enable_color_class=yes
 
 fi;
-	echo "$as_me:18358: result: $enable_color_class" >&5
+	echo "$as_me:18364: 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:18365: checking if you want color-mode enabled by default" >&5
+	echo "$as_me:18371: 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.
@@ -18379,7 +18385,7 @@
 	default_colormode=yes
 
 fi;
-	echo "$as_me:18382: result: $default_colormode" >&5
+	echo "$as_me:18388: result: $default_colormode" >&5
 echo "${ECHO_T}$default_colormode" >&6
 	test "$default_colormode" = no &&
 cat >>confdefs.h <<\EOF
@@ -18388,7 +18394,7 @@
 
 fi
 
-echo "$as_me:18391: checking if you want support for color highlighting" >&5
+echo "$as_me:18397: 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.
@@ -18405,14 +18411,14 @@
 	default_highlight=yes
 
 fi;
-echo "$as_me:18408: result: $default_highlight" >&5
+echo "$as_me:18414: 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:18415: checking if you want support for doublesize characters" >&5
+echo "$as_me:18421: 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.
@@ -18429,14 +18435,14 @@
 	enable_doublechars=yes
 
 fi;
-echo "$as_me:18432: result: $enable_doublechars" >&5
+echo "$as_me:18438: 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:18439: checking if you want fallback-support for box characters" >&5
+echo "$as_me:18445: 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.
@@ -18453,14 +18459,14 @@
 	enable_boxchars=yes
 
 fi;
-echo "$as_me:18456: result: $enable_boxchars" >&5
+echo "$as_me:18462: 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:18463: checking if you want to allow spawning new xterms" >&5
+echo "$as_me:18469: 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.
@@ -18477,11 +18483,11 @@
 	enable_exec_xterm=no
 
 fi;
-echo "$as_me:18480: result: $enable_exec_xterm" >&5
+echo "$as_me:18486: result: $enable_exec_xterm" >&5
 echo "${ECHO_T}$enable_exec_xterm" >&6
 if test "$enable_exec_xterm" = yes ; then
 
-echo "$as_me:18484: checking for proc tree with cwd-support" >&5
+echo "$as_me:18490: 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
@@ -18500,11 +18506,11 @@
 done
 
 fi
-echo "$as_me:18503: result: $cf_cv_procfs_cwd" >&5
+echo "$as_me:18509: 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:18507: WARNING: no suitable proc filesystem found" >&5
+		{ echo "$as_me:18513: WARNING: no suitable proc filesystem found" >&5
 echo "$as_me: WARNING: no suitable proc filesystem found" >&2;}
 	else
 
@@ -18522,17 +18528,17 @@
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "Xext"; then
 	test -n "$verbose" && echo "	found package Xext" 1>&6
 
-echo "${as_me:-configure}:18525: testing found package Xext ..." 1>&5
+echo "${as_me:-configure}:18531: 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}:18531: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:18537: 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}:18535: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:18541: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -18653,7 +18659,7 @@
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
 
-	echo "$as_me:18656: checking for XextCreateExtension in -lXext" >&5
+	echo "$as_me:18662: 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
@@ -18661,7 +18667,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18664 "configure"
+#line 18670 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18680,16 +18686,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18683: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18689: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18686: \$? = $ac_status" >&5
+  echo "$as_me:18692: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18689: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18695: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18692: \$? = $ac_status" >&5
+  echo "$as_me:18698: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
@@ -18700,7 +18706,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18703: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:18709: 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
 
@@ -18724,23 +18730,23 @@
 
 fi
 
-echo "$as_me:18727: checking for X11/extensions/Xdbe.h" >&5
+echo "$as_me:18733: 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 18733 "configure"
+#line 18739 "configure"
 #include "confdefs.h"
 #include <X11/extensions/Xdbe.h>
 _ACEOF
-if { (eval echo "$as_me:18737: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:18743: \"$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:18743: \$? = $ac_status" >&5
+  echo "$as_me:18749: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18759,7 +18765,7 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:18762: result: $ac_cv_header_X11_extensions_Xdbe_h" >&5
+echo "$as_me:18768: 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
 
@@ -18767,13 +18773,13 @@
 #define HAVE_X11_EXTENSIONS_XDBE_H 1
 EOF
 
-	echo "$as_me:18770: checking for XdbeSwapBuffers" >&5
+	echo "$as_me:18776: 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 18776 "configure"
+#line 18782 "configure"
 #include "confdefs.h"
 #define XdbeSwapBuffers autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18804,16 +18810,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18807: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18813: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18810: \$? = $ac_status" >&5
+  echo "$as_me:18816: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18813: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18819: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18816: \$? = $ac_status" >&5
+  echo "$as_me:18822: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_XdbeSwapBuffers=yes
 else
@@ -18823,7 +18829,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18826: result: $ac_cv_func_XdbeSwapBuffers" >&5
+echo "$as_me:18832: result: $ac_cv_func_XdbeSwapBuffers" >&5
 echo "${ECHO_T}$ac_cv_func_XdbeSwapBuffers" >&6
 if test "$ac_cv_func_XdbeSwapBuffers" = yes; then
 
@@ -18838,7 +18844,7 @@
 
 double_buffer=False
 if test "$cf_x_ext_double_buffer" = yes ; then
-	echo "$as_me:18841: checking if you want to enable double-buffering in default resources" >&5
+	echo "$as_me:18847: 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.
@@ -18855,7 +18861,7 @@
 	enable_double_bfr=no
 
 fi;
-	echo "$as_me:18858: result: $enable_double_bfr" >&5
+	echo "$as_me:18864: result: $enable_double_bfr" >&5
 echo "${ECHO_T}$enable_double_bfr" >&6
 	if test "$enable_double_bfr" = yes ; then
 
@@ -18867,7 +18873,7 @@
 	fi
 fi
 
-echo "$as_me:18870: checking if you want to use FreeType library" >&5
+echo "$as_me:18876: 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.
@@ -18884,7 +18890,7 @@
 	enable_freetype=yes
 
 fi;
-echo "$as_me:18887: result: $enable_freetype" >&5
+echo "$as_me:18893: result: $enable_freetype" >&5
 echo "${ECHO_T}$enable_freetype" >&6
 if test "$enable_freetype" = yes ; then
 
@@ -18894,7 +18900,7 @@
 FREETYPE_CONFIG=none
 FREETYPE_PARAMS=
 
-echo "$as_me:18897: checking for FreeType configuration script" >&5
+echo "$as_me:18903: 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.
@@ -18906,12 +18912,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:18909: result: $cf_cv_x_freetype_cfgs" >&5
+echo "$as_me:18915: 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:18914: checking if you specified -D/-I options for FreeType" >&5
+	echo "$as_me:18920: 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.
@@ -18921,10 +18927,10 @@
 else
   cf_cv_x_freetype_incs=no
 fi;
-	echo "$as_me:18924: result: $cf_cv_x_freetype_incs" >&5
+	echo "$as_me:18930: result: $cf_cv_x_freetype_incs" >&5
 echo "${ECHO_T}$cf_cv_x_freetype_incs" >&6
 
-	echo "$as_me:18927: checking if you specified -L/-l options for FreeType" >&5
+	echo "$as_me:18933: 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.
@@ -18934,7 +18940,7 @@
 else
   cf_cv_x_freetype_libs=no
 fi;
-	echo "$as_me:18937: result: $cf_cv_x_freetype_libs" >&5
+	echo "$as_me:18943: result: $cf_cv_x_freetype_libs" >&5
 echo "${ECHO_T}$cf_cv_x_freetype_libs" >&6
 	;;
 (auto)
@@ -18944,7 +18950,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:18947: checking for $ac_word" >&5
+echo "$as_me:18953: 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
@@ -18961,7 +18967,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:18964: found $ac_dir/$ac_word" >&5
+   echo "$as_me:18970: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -18973,10 +18979,10 @@
 FREETYPE_CONFIG=$ac_cv_path_FREETYPE_CONFIG
 
 if test -n "$FREETYPE_CONFIG"; then
-  echo "$as_me:18976: result: $FREETYPE_CONFIG" >&5
+  echo "$as_me:18982: result: $FREETYPE_CONFIG" >&5
 echo "${ECHO_T}$FREETYPE_CONFIG" >&6
 else
-  echo "$as_me:18979: result: no" >&5
+  echo "$as_me:18985: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -18986,7 +18992,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:18989: checking for $ac_word" >&5
+echo "$as_me:18995: 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
@@ -19003,7 +19009,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:19006: found $ac_dir/$ac_word" >&5
+   echo "$as_me:19012: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -19015,10 +19021,10 @@
 FREETYPE_OLD_CONFIG=$ac_cv_path_FREETYPE_OLD_CONFIG
 
 if test -n "$FREETYPE_OLD_CONFIG"; then
-  echo "$as_me:19018: result: $FREETYPE_OLD_CONFIG" >&5
+  echo "$as_me:19024: result: $FREETYPE_OLD_CONFIG" >&5
 echo "${ECHO_T}$FREETYPE_OLD_CONFIG" >&6
 else
-  echo "$as_me:19021: result: no" >&5
+  echo "$as_me:19027: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -19033,14 +19039,14 @@
 		FREETYPE_CONFIG=$cf_cv_x_freetype_cfgs
 		FREETYPE_PARAMS=xft
 	else
-		{ echo "$as_me:19036: WARNING: cannot find pkg-config for Xft" >&5
+		{ echo "$as_me:19042: 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:19043: checking for $ac_word" >&5
+echo "$as_me:19049: 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
@@ -19057,7 +19063,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:19060: found $ac_dir/$ac_word" >&5
+   echo "$as_me:19066: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -19069,41 +19075,41 @@
 FREETYPE_XFT_CONFIG=$ac_cv_path_FREETYPE_XFT_CONFIG
 
 if test -n "$FREETYPE_XFT_CONFIG"; then
-  echo "$as_me:19072: result: $FREETYPE_XFT_CONFIG" >&5
+  echo "$as_me:19078: result: $FREETYPE_XFT_CONFIG" >&5
 echo "${ECHO_T}$FREETYPE_XFT_CONFIG" >&6
 else
-  echo "$as_me:19075: result: no" >&5
+  echo "$as_me:19081: 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:19082: WARNING: cannot find config script for Xft" >&5
+		{ echo "$as_me:19088: 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:19089: checking for FreeType config" >&5
+	echo "$as_me:19095: checking for FreeType config" >&5
 echo $ECHO_N "checking for FreeType config... $ECHO_C" >&6
-	echo "$as_me:19091: result: $FREETYPE_CONFIG $FREETYPE_PARAMS" >&5
+	echo "$as_me:19097: 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:19095: checking for $FREETYPE_CONFIG cflags" >&5
+		echo "$as_me:19101: 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:19098: result: $cf_cv_x_freetype_incs" >&5
+		echo "$as_me:19104: 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:19103: checking for $FREETYPE_CONFIG libs" >&5
+		echo "$as_me:19109: 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:19106: result: $cf_cv_x_freetype_libs" >&5
+		echo "$as_me:19112: result: $cf_cv_x_freetype_libs" >&5
 echo "${ECHO_T}$cf_cv_x_freetype_libs" >&6
 	fi
 fi
@@ -19116,7 +19122,7 @@
 	cf_cv_x_freetype_libs=-lXft
 fi
 
-echo "$as_me:19119: checking if we can link with FreeType libraries" >&5
+echo "$as_me:19125: 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"
@@ -19141,7 +19147,7 @@
 CPPFLAGS="$CPPFLAGS $cf_cv_x_freetype_incs"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19144 "configure"
+#line 19150 "configure"
 #include "confdefs.h"
 
 #include <X11/Xlib.h>
@@ -19157,16 +19163,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19160: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19166: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19163: \$? = $ac_status" >&5
+  echo "$as_me:19169: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19166: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19172: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19169: \$? = $ac_status" >&5
+  echo "$as_me:19175: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_found_freetype=yes
 else
@@ -19175,7 +19181,7 @@
 cf_cv_found_freetype=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-echo "$as_me:19178: result: $cf_cv_found_freetype" >&5
+echo "$as_me:19184: result: $cf_cv_found_freetype" >&5
 echo "${ECHO_T}$cf_cv_found_freetype" >&6
 
 LIBS="$cf_save_LIBS"
@@ -19308,13 +19314,13 @@
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:19311: checking for $ac_func" >&5
+echo "$as_me:19317: 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 19317 "configure"
+#line 19323 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -19345,16 +19351,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19348: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19354: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19351: \$? = $ac_status" >&5
+  echo "$as_me:19357: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19354: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19360: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19357: \$? = $ac_status" >&5
+  echo "$as_me:19363: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -19364,7 +19370,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19367: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:19373: 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
@@ -19375,7 +19381,7 @@
 done
 
 else
-	{ echo "$as_me:19378: WARNING: No libraries found for FreeType" >&5
+	{ echo "$as_me:19384: 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
@@ -19383,14 +19389,14 @@
 # FIXME: revisit this if needed
 
 if test "$cf_cv_found_freetype" = yes ; then
-echo "$as_me:19386: checking for usable Xft/fontconfig package" >&5
+echo "$as_me:19392: 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 19393 "configure"
+#line 19399 "configure"
 #include "confdefs.h"
 
 #include <X11/Xft/Xft.h>
@@ -19409,16 +19415,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19412: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19418: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19415: \$? = $ac_status" >&5
+  echo "$as_me:19421: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19418: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19424: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19421: \$? = $ac_status" >&5
+  echo "$as_me:19427: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xft_compat=yes
 else
@@ -19429,7 +19435,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:19432: result: $cf_cv_xft_compat" >&5
+echo "$as_me:19438: result: $cf_cv_xft_compat" >&5
 echo "${ECHO_T}$cf_cv_xft_compat" >&6
 
 if test "$cf_cv_xft_compat" = no
@@ -19441,24 +19447,24 @@
 	(*)
 		test -n "$verbose" && echo "	work around broken package" 1>&6
 
-echo "${as_me:-configure}:19444: testing work around broken package ..." 1>&5
+echo "${as_me:-configure}:19450: 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}:19451: testing found package fontconfig ..." 1>&5
+echo "${as_me:-configure}:19457: 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}:19457: testing package fontconfig CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:19463: 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}:19461: testing package fontconfig LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:19467: testing package fontconfig LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -19676,12 +19682,12 @@
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:19679: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:19685: 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}:19684: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:19690: testing ...after  $LIBS ..." 1>&5
 
 else
 	cf_pkgconfig_incs=
@@ -19689,12 +19695,12 @@
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:19692: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:19698: 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}:19697: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:19703: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -19707,7 +19713,7 @@
 	CPPFLAGS=`echo "$CPPFLAGS" | sed -e s/-DXRENDERFONT//`
 fi
 
-echo "$as_me:19710: checking if you want support for HP-style function keys" >&5
+echo "$as_me:19716: 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.
@@ -19724,7 +19730,7 @@
 	enable_hp_fkeys=no
 
 fi;
-echo "$as_me:19727: result: $enable_hp_fkeys" >&5
+echo "$as_me:19733: result: $enable_hp_fkeys" >&5
 echo "${ECHO_T}$enable_hp_fkeys" >&6
 if test "$enable_hp_fkeys" = yes ; then
 
@@ -19734,7 +19740,7 @@
 
 fi
 
-echo "$as_me:19737: checking if you want support for SCO-style function keys" >&5
+echo "$as_me:19743: 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.
@@ -19751,7 +19757,7 @@
 	enable_sco_fkeys=no
 
 fi;
-echo "$as_me:19754: result: $enable_sco_fkeys" >&5
+echo "$as_me:19760: result: $enable_sco_fkeys" >&5
 echo "${ECHO_T}$enable_sco_fkeys" >&6
 if test "$enable_sco_fkeys" = yes ; then
 
@@ -19761,7 +19767,7 @@
 
 fi
 
-echo "$as_me:19764: checking if you want support for Sun-style function keys" >&5
+echo "$as_me:19770: 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.
@@ -19778,7 +19784,7 @@
 	enable_sun_fkeys=yes
 
 fi;
-echo "$as_me:19781: result: $enable_sun_fkeys" >&5
+echo "$as_me:19787: result: $enable_sun_fkeys" >&5
 echo "${ECHO_T}$enable_sun_fkeys" >&6
 if test "$enable_sun_fkeys" = no ; then
 
@@ -19788,7 +19794,7 @@
 
 fi
 
-echo "$as_me:19791: checking if you want saved-lines stored as a FIFO" >&5
+echo "$as_me:19797: 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.
@@ -19805,7 +19811,7 @@
 	enable_fifo_lines=yes
 
 fi;
-echo "$as_me:19808: result: $enable_fifo_lines" >&5
+echo "$as_me:19814: result: $enable_fifo_lines" >&5
 echo "${ECHO_T}$enable_fifo_lines" >&6
 if test "$enable_fifo_lines" = yes ; then
 
@@ -19815,7 +19821,7 @@
 
 fi
 
-echo "$as_me:19818: checking if you want support for internationalization" >&5
+echo "$as_me:19824: 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.
@@ -19832,7 +19838,7 @@
 	enable_i18n=yes
 
 fi;
-echo "$as_me:19835: result: $enable_i18n" >&5
+echo "$as_me:19841: result: $enable_i18n" >&5
 echo "${ECHO_T}$enable_i18n" >&6
 if test "$enable_i18n" = no ; then
 
@@ -19842,7 +19848,7 @@
 
 fi
 
-echo "$as_me:19845: checking if you want support for initial-erase setup" >&5
+echo "$as_me:19851: 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.
@@ -19859,7 +19865,7 @@
 	enable_ie=yes
 
 fi;
-echo "$as_me:19862: result: $enable_ie" >&5
+echo "$as_me:19868: result: $enable_ie" >&5
 echo "${ECHO_T}$enable_ie" >&6
 if test "$enable_ie" = no ; then
 
@@ -19869,7 +19875,7 @@
 
 fi
 
-echo "$as_me:19872: checking if you want support for input-method" >&5
+echo "$as_me:19878: 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.
@@ -19886,17 +19892,17 @@
 	enable_ximp=$enable_i18n
 
 fi;
-echo "$as_me:19889: result: $enable_ximp" >&5
+echo "$as_me:19895: result: $enable_ximp" >&5
 echo "${ECHO_T}$enable_ximp" >&6
 
-echo "$as_me:19892: checking if X libraries support input-method" >&5
+echo "$as_me:19898: 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 19899 "configure"
+#line 19905 "configure"
 #include "confdefs.h"
 
 #include <X11/IntrinsicP.h>
@@ -19914,7 +19920,7 @@
 	XIM xim;
 	XIMStyles *xim_styles = 0;
 	XIMStyle input_style;
-	Widget w = 0;
+	Widget w = XtCreateWidget("none", (WidgetClass)0, None, (ArgList)0, 0);
 
 	XSetLocaleModifiers("@im=none");
 	xim = XOpenIM(XtDisplay(w), NULL, NULL, NULL);
@@ -19930,16 +19936,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19933: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19939: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19936: \$? = $ac_status" >&5
+  echo "$as_me:19942: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19939: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19945: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19942: \$? = $ac_status" >&5
+  echo "$as_me:19948: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_input_method=yes
 else
@@ -19949,13 +19955,13 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19952: result: $cf_cv_input_method" >&5
+echo "$as_me:19958: 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:19958: WARNING: input-methor relies upon internationalization" >&5
+		{ echo "$as_me:19964: WARNING: input-methor relies upon internationalization" >&5
 echo "$as_me: WARNING: input-methor relies upon internationalization" >&2;}
 		enable_ximp=no
 	fi
@@ -19968,7 +19974,7 @@
 
 fi
 
-echo "$as_me:19971: checking if you want support for load-vt-fonts" >&5
+echo "$as_me:19977: 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.
@@ -19985,7 +19991,7 @@
 	enable_load_vt_fonts=no
 
 fi;
-echo "$as_me:19988: result: $enable_load_vt_fonts" >&5
+echo "$as_me:19994: result: $enable_load_vt_fonts" >&5
 echo "${ECHO_T}$enable_load_vt_fonts" >&6
 if test "$enable_load_vt_fonts" = yes ; then
 
@@ -19995,7 +20001,7 @@
 
 fi
 
-echo "$as_me:19998: checking if you want support for logging" >&5
+echo "$as_me:20004: 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.
@@ -20012,7 +20018,7 @@
 	enable_logging=no
 
 fi;
-echo "$as_me:20015: result: $enable_logging" >&5
+echo "$as_me:20021: result: $enable_logging" >&5
 echo "${ECHO_T}$enable_logging" >&6
 if test "$enable_logging" = yes ; then
 
@@ -20020,7 +20026,7 @@
 #define ALLOWLOGGING 1
 EOF
 
-	echo "$as_me:20023: checking if you want to allow logging via a pipe" >&5
+	echo "$as_me:20029: 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.
@@ -20037,7 +20043,7 @@
 	enable_log_exec=no
 
 fi;
-	echo "$as_me:20040: result: $enable_log_exec" >&5
+	echo "$as_me:20046: result: $enable_log_exec" >&5
 echo "${ECHO_T}$enable_log_exec" >&6
 	if test "$enable_log_exec" = yes ; then
 
@@ -20048,7 +20054,7 @@
 	fi
 fi
 
-echo "$as_me:20051: checking if you want support for iconify/maximize translations" >&5
+echo "$as_me:20057: 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.
@@ -20065,14 +20071,14 @@
 	enable_maximize=yes
 
 fi;
-echo "$as_me:20068: result: $enable_maximize" >&5
+echo "$as_me:20074: 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:20075: checking if you want NumLock to override keyboard tables" >&5
+echo "$as_me:20081: 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.
@@ -20089,14 +20095,14 @@
 	enable_numlock=yes
 
 fi;
-echo "$as_me:20092: result: $enable_numlock" >&5
+echo "$as_me:20098: 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:20099: checking if you want support for get/set of base64 selection data" >&5
+echo "$as_me:20105: 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.
@@ -20113,7 +20119,7 @@
 	enable_paste64=yes
 
 fi;
-echo "$as_me:20116: result: $enable_paste64" >&5
+echo "$as_me:20122: result: $enable_paste64" >&5
 echo "${ECHO_T}$enable_paste64" >&6
 if test "$enable_paste64" = yes ; then
 
@@ -20129,7 +20135,7 @@
 
 fi
 
-echo "$as_me:20132: checking if you want support for pty-handshaking" >&5
+echo "$as_me:20138: 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.
@@ -20146,7 +20152,7 @@
 	enable_pty_handshake=yes
 
 fi;
-echo "$as_me:20149: result: $enable_pty_handshake" >&5
+echo "$as_me:20155: result: $enable_pty_handshake" >&5
 echo "${ECHO_T}$enable_pty_handshake" >&6
 if test "$enable_pty_handshake" = yes ; then
 
@@ -20162,7 +20168,7 @@
 
 fi
 
-echo "$as_me:20165: checking if you want support for mouse in readline applications" >&5
+echo "$as_me:20171: 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.
@@ -20179,7 +20185,7 @@
 	enable_readline_mouse=no
 
 fi;
-echo "$as_me:20182: result: $enable_readline_mouse" >&5
+echo "$as_me:20188: result: $enable_readline_mouse" >&5
 echo "${ECHO_T}$enable_readline_mouse" >&6
 if test "$enable_readline_mouse" = yes ; then
 
@@ -20189,7 +20195,7 @@
 
 fi
 
-echo "$as_me:20192: checking if you want support for regular-expression selections" >&5
+echo "$as_me:20198: 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.
@@ -20206,11 +20212,11 @@
 	enable_regex=yes
 
 fi;
-echo "$as_me:20209: result: $enable_regex" >&5
+echo "$as_me:20215: result: $enable_regex" >&5
 echo "${ECHO_T}$enable_regex" >&6
 if test "$enable_regex" = yes ; then
 
-echo "$as_me:20213: checking if you want to use PCRE2 for regular-expressions" >&5
+echo "$as_me:20219: 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.
@@ -20219,7 +20225,7 @@
 
 fi;
 test -z "$with_pcre2" && with_pcre2=no
-echo "$as_me:20222: result: $with_pcre2" >&5
+echo "$as_me:20228: result: $with_pcre2" >&5
 echo "${ECHO_T}$with_pcre2" >&6
 
 if test "x$with_pcre2" != xno ; then
@@ -20230,17 +20236,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}:20233: testing found package $cf_with_pcre2 ..." 1>&5
+echo "${as_me:-configure}:20239: 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}:20239: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:20245: 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}:20243: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:20249: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -20364,7 +20370,7 @@
 fi
 
 	done
-	cf_with_pcre2_ok=yes || { { echo "$as_me:20367: error: Cannot find PCRE2 library" >&5
+	cf_with_pcre2_ok=yes || { { echo "$as_me:20373: error: Cannot find PCRE2 library" >&5
 echo "$as_me: error: Cannot find PCRE2 library" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -20377,7 +20383,7 @@
 	(*pcre2-posix*|*pcreposix*)
 		;;
 	(*)
-		echo "$as_me:20380: checking for regcomp in -lpcre2-posix" >&5
+		echo "$as_me:20386: 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
@@ -20385,7 +20391,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcre2-posix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20388 "configure"
+#line 20394 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20404,16 +20410,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20407: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20413: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20410: \$? = $ac_status" >&5
+  echo "$as_me:20416: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20413: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20419: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20416: \$? = $ac_status" >&5
+  echo "$as_me:20422: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pcre2_posix_regcomp=yes
 else
@@ -20424,7 +20430,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20427: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
+echo "$as_me:20433: 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
 
@@ -20445,7 +20451,7 @@
 LIBS="$cf_add_libs"
 
 else
-  echo "$as_me:20448: checking for regcomp in -lpcreposix" >&5
+  echo "$as_me:20454: 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
@@ -20453,7 +20459,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcreposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20456 "configure"
+#line 20462 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20472,16 +20478,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20475: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20481: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20478: \$? = $ac_status" >&5
+  echo "$as_me:20484: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20481: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20487: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20484: \$? = $ac_status" >&5
+  echo "$as_me:20490: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pcreposix_regcomp=yes
 else
@@ -20492,7 +20498,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20495: result: $ac_cv_lib_pcreposix_regcomp" >&5
+echo "$as_me:20501: 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
 
@@ -20513,7 +20519,7 @@
 LIBS="$cf_add_libs"
 
 else
-  { { echo "$as_me:20516: error: Cannot find PCRE2 POSIX library" >&5
+  { { echo "$as_me:20522: error: Cannot find PCRE2 POSIX library" >&5
 echo "$as_me: error: Cannot find PCRE2 POSIX library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -20528,23 +20534,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:20531: checking for $ac_header" >&5
+echo "$as_me:20537: 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 20537 "configure"
+#line 20543 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20541: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20547: \"$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:20547: \$? = $ac_status" >&5
+  echo "$as_me:20553: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20563,7 +20569,7 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20566: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:20572: 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
@@ -20577,7 +20583,7 @@
 
 	if test "$with_pcre2" = no ; then
 
-echo "$as_me:20580: checking if you want to use PCRE for regular-expressions" >&5
+echo "$as_me:20586: 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.
@@ -20586,7 +20592,7 @@
 
 fi;
 test -z "$with_pcre" && with_pcre=no
-echo "$as_me:20589: result: $with_pcre" >&5
+echo "$as_me:20595: result: $with_pcre" >&5
 echo "${ECHO_T}$with_pcre" >&6
 
 if test "$with_pcre" != no ; then
@@ -20594,17 +20600,17 @@
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "libpcre"; then
 	test -n "$verbose" && echo "	found package libpcre" 1>&6
 
-echo "${as_me:-configure}:20597: testing found package libpcre ..." 1>&5
+echo "${as_me:-configure}:20603: 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}:20603: testing package libpcre CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:20609: 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}:20607: testing package libpcre LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:20613: testing package libpcre LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -20725,7 +20731,7 @@
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
 
-echo "$as_me:20728: checking for pcre_compile in -lpcre" >&5
+echo "$as_me:20734: 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
@@ -20733,7 +20739,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20736 "configure"
+#line 20742 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20752,16 +20758,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20755: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20761: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20758: \$? = $ac_status" >&5
+  echo "$as_me:20764: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20761: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20767: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20764: \$? = $ac_status" >&5
+  echo "$as_me:20770: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pcre_pcre_compile=yes
 else
@@ -20772,7 +20778,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20775: result: $ac_cv_lib_pcre_pcre_compile" >&5
+echo "$as_me:20781: 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
@@ -20782,7 +20788,7 @@
   LIBS="-lpcre $LIBS"
 
 else
-  { { echo "$as_me:20785: error: Cannot find PCRE library" >&5
+  { { echo "$as_me:20791: error: Cannot find PCRE library" >&5
 echo "$as_me: error: Cannot find PCRE library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -20797,7 +20803,7 @@
 	(*pcreposix*)
 		;;
 	(*)
-		echo "$as_me:20800: checking for pcreposix_regcomp in -lpcreposix" >&5
+		echo "$as_me:20806: 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
@@ -20805,7 +20811,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcreposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20808 "configure"
+#line 20814 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20824,16 +20830,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20827: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20833: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20830: \$? = $ac_status" >&5
+  echo "$as_me:20836: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20833: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20839: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20836: \$? = $ac_status" >&5
+  echo "$as_me:20842: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pcreposix_pcreposix_regcomp=yes
 else
@@ -20844,7 +20850,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20847: result: $ac_cv_lib_pcreposix_pcreposix_regcomp" >&5
+echo "$as_me:20853: 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
 
@@ -20869,7 +20875,7 @@
 LIBS="$cf_add_libs"
 
 else
-  echo "$as_me:20872: checking for regcomp in -lpcreposix" >&5
+  echo "$as_me:20878: 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
@@ -20877,7 +20883,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcreposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20880 "configure"
+#line 20886 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20896,16 +20902,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20899: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20905: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20902: \$? = $ac_status" >&5
+  echo "$as_me:20908: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20905: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20911: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20908: \$? = $ac_status" >&5
+  echo "$as_me:20914: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pcreposix_regcomp=yes
 else
@@ -20916,7 +20922,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20919: result: $ac_cv_lib_pcreposix_regcomp" >&5
+echo "$as_me:20925: 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
 
@@ -20941,7 +20947,7 @@
 LIBS="$cf_add_libs"
 
 else
-  { { echo "$as_me:20944: error: Cannot find PCRE POSIX library" >&5
+  { { echo "$as_me:20950: error: Cannot find PCRE POSIX library" >&5
 echo "$as_me: error: Cannot find PCRE POSIX library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -20959,7 +20965,7 @@
 case "$host_os" in
 (mingw*)
 	# -lsystre -ltre -lintl -liconv
-	echo "$as_me:20962: checking for regcomp in -lsystre" >&5
+	echo "$as_me:20968: 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
@@ -20967,7 +20973,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsystre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20970 "configure"
+#line 20976 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20986,16 +20992,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20989: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20995: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20992: \$? = $ac_status" >&5
+  echo "$as_me:20998: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20995: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21001: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20998: \$? = $ac_status" >&5
+  echo "$as_me:21004: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_systre_regcomp=yes
 else
@@ -21006,11 +21012,11 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21009: result: $ac_cv_lib_systre_regcomp" >&5
+echo "$as_me:21015: 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:21013: checking for libiconv_open in -liconv" >&5
+		echo "$as_me:21019: 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
@@ -21018,7 +21024,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-liconv  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21021 "configure"
+#line 21027 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21037,16 +21043,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21040: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21046: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21043: \$? = $ac_status" >&5
+  echo "$as_me:21049: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21046: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21052: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21049: \$? = $ac_status" >&5
+  echo "$as_me:21055: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_iconv_libiconv_open=yes
 else
@@ -21057,7 +21063,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21060: result: $ac_cv_lib_iconv_libiconv_open" >&5
+echo "$as_me:21066: 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
 
@@ -21079,7 +21085,7 @@
 
 fi
 
-		echo "$as_me:21082: checking for libintl_gettext in -lintl" >&5
+		echo "$as_me:21088: 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
@@ -21087,7 +21093,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21090 "configure"
+#line 21096 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21106,16 +21112,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21109: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21115: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21112: \$? = $ac_status" >&5
+  echo "$as_me:21118: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21115: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21121: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21118: \$? = $ac_status" >&5
+  echo "$as_me:21124: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_intl_libintl_gettext=yes
 else
@@ -21126,7 +21132,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21129: result: $ac_cv_lib_intl_libintl_gettext" >&5
+echo "$as_me:21135: 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
 
@@ -21148,7 +21154,7 @@
 
 fi
 
-		echo "$as_me:21151: checking for tre_regcomp in -ltre" >&5
+		echo "$as_me:21157: 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
@@ -21156,7 +21162,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21159 "configure"
+#line 21165 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21175,16 +21181,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21178: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21184: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21181: \$? = $ac_status" >&5
+  echo "$as_me:21187: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21184: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21190: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21187: \$? = $ac_status" >&5
+  echo "$as_me:21193: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_tre_tre_regcomp=yes
 else
@@ -21195,7 +21201,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21198: result: $ac_cv_lib_tre_tre_regcomp" >&5
+echo "$as_me:21204: 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
 
@@ -21237,7 +21243,7 @@
 
 else
 
-		echo "$as_me:21240: checking for regcomp in -lgnurx" >&5
+		echo "$as_me:21246: 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
@@ -21245,7 +21251,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnurx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21248 "configure"
+#line 21254 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21264,16 +21270,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21267: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21273: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21270: \$? = $ac_status" >&5
+  echo "$as_me:21276: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21273: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21279: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21276: \$? = $ac_status" >&5
+  echo "$as_me:21282: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gnurx_regcomp=yes
 else
@@ -21284,7 +21290,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21287: result: $ac_cv_lib_gnurx_regcomp" >&5
+echo "$as_me:21293: 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
 
@@ -21312,13 +21318,13 @@
 	;;
 (*)
 	cf_regex_libs="regex re"
-	echo "$as_me:21315: checking for regcomp" >&5
+	echo "$as_me:21321: 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 21321 "configure"
+#line 21327 "configure"
 #include "confdefs.h"
 #define regcomp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21349,16 +21355,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21352: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21358: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21355: \$? = $ac_status" >&5
+  echo "$as_me:21361: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21358: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21364: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21361: \$? = $ac_status" >&5
+  echo "$as_me:21367: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_regcomp=yes
 else
@@ -21368,7 +21374,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21371: result: $ac_cv_func_regcomp" >&5
+echo "$as_me:21377: 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
@@ -21377,7 +21383,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:21380: checking for regcomp in -l$cf_regex_lib" >&5
+echo "$as_me:21386: 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
@@ -21385,7 +21391,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_regex_lib  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21388 "configure"
+#line 21394 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21404,16 +21410,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21407: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21413: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21410: \$? = $ac_status" >&5
+  echo "$as_me:21416: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21413: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21419: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21416: \$? = $ac_status" >&5
+  echo "$as_me:21422: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -21424,7 +21430,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21427: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:21433: 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
 
@@ -21456,13 +21462,13 @@
 esac
 
 if test "$cf_regex_func" = no ; then
-	echo "$as_me:21459: checking for compile" >&5
+	echo "$as_me:21465: 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 21465 "configure"
+#line 21471 "configure"
 #include "confdefs.h"
 #define compile autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21493,16 +21499,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21496: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21502: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21499: \$? = $ac_status" >&5
+  echo "$as_me:21505: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21502: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21508: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21505: \$? = $ac_status" >&5
+  echo "$as_me:21511: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_compile=yes
 else
@@ -21512,13 +21518,13 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21515: result: $ac_cv_func_compile" >&5
+echo "$as_me:21521: 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:21521: checking for compile in -lgen" >&5
+		echo "$as_me:21527: 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
@@ -21526,7 +21532,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgen  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21529 "configure"
+#line 21535 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21545,16 +21551,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21548: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21554: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21551: \$? = $ac_status" >&5
+  echo "$as_me:21557: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21554: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21560: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21557: \$? = $ac_status" >&5
+  echo "$as_me:21563: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gen_compile=yes
 else
@@ -21565,7 +21571,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21568: result: $ac_cv_lib_gen_compile" >&5
+echo "$as_me:21574: 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
 
@@ -21593,11 +21599,11 @@
 fi
 
 if test "$cf_regex_func" = no ; then
-	{ echo "$as_me:21596: WARNING: cannot find regular expression library" >&5
+	{ echo "$as_me:21602: WARNING: cannot find regular expression library" >&5
 echo "$as_me: WARNING: cannot find regular expression library" >&2;}
 fi
 
-echo "$as_me:21600: checking for regular-expression headers" >&5
+echo "$as_me:21606: 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
@@ -21609,7 +21615,7 @@
 	for cf_regex_hdr in regexp.h regexpr.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 21612 "configure"
+#line 21618 "configure"
 #include "confdefs.h"
 #include <$cf_regex_hdr>
 int
@@ -21626,16 +21632,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21629: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21635: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21632: \$? = $ac_status" >&5
+  echo "$as_me:21638: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21635: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21641: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21638: \$? = $ac_status" >&5
+  echo "$as_me:21644: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -21652,7 +21658,7 @@
 	for cf_regex_hdr in regex.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 21655 "configure"
+#line 21661 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$cf_regex_hdr>
@@ -21672,16 +21678,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21675: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21681: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21678: \$? = $ac_status" >&5
+  echo "$as_me:21684: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21681: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21687: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21684: \$? = $ac_status" >&5
+  echo "$as_me:21690: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -21697,11 +21703,11 @@
 esac
 
 fi
-echo "$as_me:21700: result: $cf_cv_regex_hdrs" >&5
+echo "$as_me:21706: result: $cf_cv_regex_hdrs" >&5
 echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
 
 case "$cf_cv_regex_hdrs" in
-	(no)		{ echo "$as_me:21704: WARNING: no regular expression header found" >&5
+	(no)		{ echo "$as_me:21710: WARNING: no regular expression header found" >&5
 echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
 	(regex.h)
 cat >>confdefs.h <<\EOF
@@ -21721,7 +21727,7 @@
 esac
 
 			if test "X$cf_cv_regex_hdrs" != "Xregex.h" ; then
-				{ { echo "$as_me:21724: error: Only POSIX, PCRE, or PCRE2 regular expressions are supported" >&5
+				{ { echo "$as_me:21730: 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
@@ -21734,7 +21740,7 @@
 
 fi
 
-echo "$as_me:21737: checking if you want support for right-scrollbar" >&5
+echo "$as_me:21743: 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.
@@ -21751,7 +21757,7 @@
 	enable_rightbar=yes
 
 fi;
-echo "$as_me:21754: result: $enable_rightbar" >&5
+echo "$as_me:21760: result: $enable_rightbar" >&5
 echo "${ECHO_T}$enable_rightbar" >&6
 if test "$enable_rightbar" = yes ; then
 
@@ -21761,7 +21767,7 @@
 
 fi
 
-echo "$as_me:21764: checking if you want check for redundant name-change" >&5
+echo "$as_me:21770: 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.
@@ -21778,14 +21784,14 @@
 	enable_samename=yes
 
 fi;
-echo "$as_me:21781: result: $enable_samename" >&5
+echo "$as_me:21787: 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:21788: checking if you want support for selection-actions" >&5
+echo "$as_me:21794: 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.
@@ -21802,14 +21808,14 @@
 	enable_selection_ops=yes
 
 fi;
-echo "$as_me:21805: result: $enable_selection_ops" >&5
+echo "$as_me:21811: 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:21812: checking if you want support for session management" >&5
+echo "$as_me:21818: 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.
@@ -21826,14 +21832,14 @@
 	enable_session_mgt=yes
 
 fi;
-echo "$as_me:21829: result: $enable_session_mgt" >&5
+echo "$as_me:21835: 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:21836: checking if you want to use termcap function-keys" >&5
+echo "$as_me:21842: 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.
@@ -21850,14 +21856,14 @@
 	enable_tcap_fkeys=yes
 
 fi;
-echo "$as_me:21853: result: $enable_tcap_fkeys" >&5
+echo "$as_me:21859: result: $enable_tcap_fkeys" >&5
 echo "${ECHO_T}$enable_tcap_fkeys" >&6
 test "$enable_tcap_fkeys" = yes &&
 cat >>confdefs.h <<\EOF
 #define OPT_TCAP_FKEYS 1
 EOF
 
-echo "$as_me:21860: checking if you want to use termcap-query/report" >&5
+echo "$as_me:21866: 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.
@@ -21874,14 +21880,14 @@
 	enable_tcap_query=yes
 
 fi;
-echo "$as_me:21877: result: $enable_tcap_query" >&5
+echo "$as_me:21883: result: $enable_tcap_query" >&5
 echo "${ECHO_T}$enable_tcap_query" >&6
 test "$enable_tcap_query" = yes &&
 cat >>confdefs.h <<\EOF
 #define OPT_TCAP_QUERY 1
 EOF
 
-echo "$as_me:21884: checking if you want support for tek4014" >&5
+echo "$as_me:21890: 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.
@@ -21898,7 +21904,7 @@
 	enable_tek4014=yes
 
 fi;
-echo "$as_me:21901: result: $enable_tek4014" >&5
+echo "$as_me:21907: result: $enable_tek4014" >&5
 echo "${ECHO_T}$enable_tek4014" >&6
 if test "$enable_tek4014" = no ; then
 
@@ -21912,7 +21918,7 @@
 	EXTRAOBJS="$EXTRAOBJS TekPrsTbl.o Tekproc.o"
 fi
 
-echo "$as_me:21915: checking if you want pulldown menus with a toolbar" >&5
+echo "$as_me:21921: 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.
@@ -21929,7 +21935,7 @@
 	enable_toolbar=no
 
 fi;
-echo "$as_me:21932: result: $enable_toolbar" >&5
+echo "$as_me:21938: result: $enable_toolbar" >&5
 echo "${ECHO_T}$enable_toolbar" >&6
 if test "$enable_toolbar" = yes ; then
 
@@ -21939,7 +21945,7 @@
 
 fi
 
-echo "$as_me:21942: checking if you want VT52 emulation" >&5
+echo "$as_me:21948: 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.
@@ -21956,14 +21962,14 @@
 	enable_vt52=yes
 
 fi;
-echo "$as_me:21959: result: $enable_vt52" >&5
+echo "$as_me:21965: 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:21966: checking if you want wide-attribute support" >&5
+echo "$as_me:21972: 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.
@@ -21980,16 +21986,16 @@
 	enable_wattr=yes
 
 fi;
-echo "$as_me:21983: result: $enable_wattr" >&5
+echo "$as_me:21989: 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:21987: WARNING: overriding wide-attributes to support direct color" >&5
+	{ echo "$as_me:21993: 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:21992: checking if you want wide-character support" >&5
+echo "$as_me:21998: 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.
@@ -22006,14 +22012,14 @@
 	enable_wchar=yes
 
 fi;
-echo "$as_me:22009: result: $enable_wchar" >&5
+echo "$as_me:22015: 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:22016: checking if you want only 16-bit character support" >&5
+echo "$as_me:22022: 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.
@@ -22030,7 +22036,7 @@
 	enable_16bit_chars=no
 
 fi;
-echo "$as_me:22033: result: $enable_16bit_chars" >&5
+echo "$as_me:22039: result: $enable_16bit_chars" >&5
 echo "${ECHO_T}$enable_16bit_chars" >&6
 
 if test "$enable_16bit_chars" = yes ; then
@@ -22044,7 +22050,7 @@
 
 if test "$enable_wchar" = yes ; then
 
-echo "$as_me:22047: checking if you want to use mini-luit/Latin9 built-in support" >&5
+echo "$as_me:22053: 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.
@@ -22061,7 +22067,7 @@
 	enable_mini_luit=no
 
 fi;
-echo "$as_me:22064: result: $enable_mini_luit" >&5
+echo "$as_me:22070: result: $enable_mini_luit" >&5
 echo "${ECHO_T}$enable_mini_luit" >&6
 if test "$enable_mini_luit" = yes ; then
 
@@ -22071,7 +22077,7 @@
 
 fi
 
-echo "$as_me:22074: checking if you want to use luit" >&5
+echo "$as_me:22080: 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.
@@ -22088,7 +22094,7 @@
 	enable_luit=yes
 
 fi;
-echo "$as_me:22091: result: $enable_luit" >&5
+echo "$as_me:22097: result: $enable_luit" >&5
 echo "${ECHO_T}$enable_luit" >&6
 if test "$enable_luit" = yes ; then
 
@@ -22101,7 +22107,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:22104: checking for $ac_word" >&5
+echo "$as_me:22110: 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
@@ -22118,7 +22124,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:22121: found $ac_dir/$ac_word" >&5
+   echo "$as_me:22127: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -22129,10 +22135,10 @@
 LUIT=$ac_cv_path_LUIT
 
 if test -n "$LUIT"; then
-  echo "$as_me:22132: result: $LUIT" >&5
+  echo "$as_me:22138: result: $LUIT" >&5
 echo "${ECHO_T}$LUIT" >&6
 else
-  echo "$as_me:22135: result: no" >&5
+  echo "$as_me:22141: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -22191,7 +22197,7 @@
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:22194: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:22200: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define LUIT_PATH "$cf_path_prog"
@@ -22215,7 +22221,7 @@
 	EXTRAOBJS="$EXTRAOBJS charclass.o precompose.o wcwidth.o"
 fi
 
-echo "$as_me:22218: checking if you want dynamic-abbreviation support" >&5
+echo "$as_me:22224: 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.
@@ -22232,7 +22238,7 @@
 	enable_dabbrev=no
 
 fi;
-echo "$as_me:22235: result: $enable_dabbrev" >&5
+echo "$as_me:22241: result: $enable_dabbrev" >&5
 echo "${ECHO_T}$enable_dabbrev" >&6
 if test "$enable_dabbrev" = yes ; then
 
@@ -22242,7 +22248,7 @@
 
 fi
 
-echo "$as_me:22245: checking if you want DECterm Locator support" >&5
+echo "$as_me:22251: 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.
@@ -22259,7 +22265,7 @@
 	enable_dec_locator=no
 
 fi;
-echo "$as_me:22262: result: $enable_dec_locator" >&5
+echo "$as_me:22268: result: $enable_dec_locator" >&5
 echo "${ECHO_T}$enable_dec_locator" >&6
 if test "$enable_dec_locator" = yes ; then
 
@@ -22269,7 +22275,7 @@
 
 fi
 
-echo "$as_me:22272: checking if you want XHTML and SVG screen dump support" >&5
+echo "$as_me:22278: 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.
@@ -22286,7 +22292,7 @@
 	enable_screen_dumps=yes
 
 fi;
-echo "$as_me:22289: result: $enable_screen_dumps" >&5
+echo "$as_me:22295: 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"
@@ -22299,7 +22305,7 @@
 
 fi
 
-echo "$as_me:22302: checking if you want ReGIS graphics support" >&5
+echo "$as_me:22308: 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.
@@ -22316,7 +22322,7 @@
 	enable_regis_graphics=no
 
 fi;
-echo "$as_me:22319: result: $enable_regis_graphics" >&5
+echo "$as_me:22325: result: $enable_regis_graphics" >&5
 echo "${ECHO_T}$enable_regis_graphics" >&6
 if test "$enable_regis_graphics" = yes ; then
 
@@ -22328,14 +22334,14 @@
 	EXTRASRCS="$EXTRASRCS graphics_regis.c"
 	EXTRAOBJS="$EXTRAOBJS graphics_regis.o"
 
-echo "$as_me:22331: checking if -lm needed for math functions" >&5
+echo "$as_me:22337: 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 22338 "configure"
+#line 22344 "configure"
 #include "confdefs.h"
 
 	#include <stdio.h>
@@ -22351,16 +22357,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22354: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22360: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22357: \$? = $ac_status" >&5
+  echo "$as_me:22363: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22360: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22366: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22363: \$? = $ac_status" >&5
+  echo "$as_me:22369: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libm=no
 else
@@ -22370,7 +22376,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22373: result: $cf_cv_need_libm" >&5
+echo "$as_me:22379: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 if test "$cf_cv_need_libm" = yes
 then
@@ -22395,7 +22401,7 @@
 
 fi
 
-echo "$as_me:22398: checking if you want sixel graphics support" >&5
+echo "$as_me:22404: 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.
@@ -22412,7 +22418,7 @@
 	enable_sixel_graphics=yes
 
 fi;
-echo "$as_me:22415: result: $enable_sixel_graphics" >&5
+echo "$as_me:22421: result: $enable_sixel_graphics" >&5
 echo "${ECHO_T}$enable_sixel_graphics" >&6
 if test "$enable_sixel_graphics" = yes ; then
 
@@ -22436,7 +22442,7 @@
 	EXTRAOBJS="$EXTRAOBJS graphics.o"
 fi
 
-echo "$as_me:22439: checking if you want sixel screen dump support" >&5
+echo "$as_me:22445: 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.
@@ -22453,7 +22459,7 @@
 	enable_print_graphics=$enable_regis_graphics
 
 fi;
-echo "$as_me:22456: result: $enable_print_graphics" >&5
+echo "$as_me:22462: result: $enable_print_graphics" >&5
 echo "${ECHO_T}$enable_print_graphics" >&6
 if test "$enable_print_graphics" = yes ; then
 
@@ -22463,7 +22469,7 @@
 
 fi
 
-echo "$as_me:22466: checking if you want VT420 rectangle support" >&5
+echo "$as_me:22472: 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.
@@ -22480,7 +22486,7 @@
 	enable_rectangles=yes
 
 fi;
-echo "$as_me:22483: result: $enable_rectangles" >&5
+echo "$as_me:22489: result: $enable_rectangles" >&5
 echo "${ECHO_T}$enable_rectangles" >&6
 if test "$enable_rectangles" = yes ; then
 
@@ -22490,7 +22496,7 @@
 
 fi
 
-echo "$as_me:22493: checking if you want -ziconbeep option" >&5
+echo "$as_me:22499: 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.
@@ -22507,7 +22513,7 @@
 	enable_ziconbeep=yes
 
 fi;
-echo "$as_me:22510: result: $enable_ziconbeep" >&5
+echo "$as_me:22516: result: $enable_ziconbeep" >&5
 echo "${ECHO_T}$enable_ziconbeep" >&6
 test "$enable_ziconbeep" = no &&
 cat >>confdefs.h <<\EOF
@@ -22516,7 +22522,7 @@
 
 ###############################################################################
 
-echo "$as_me:22519: checking if you want debugging traces" >&5
+echo "$as_me:22525: 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.
@@ -22533,7 +22539,7 @@
 	enable_trace=no
 
 fi;
-echo "$as_me:22536: result: $enable_trace" >&5
+echo "$as_me:22542: result: $enable_trace" >&5
 echo "${ECHO_T}$enable_trace" >&6
 if test "$enable_trace" = yes ; then
 
@@ -22545,7 +22551,7 @@
 	EXTRAOBJS="$EXTRAOBJS trace.o"
 fi
 
-echo "$as_me:22548: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:22554: 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.
@@ -22562,7 +22568,7 @@
 else
   with_dmalloc=
 fi;
-echo "$as_me:22565: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:22571: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -22676,23 +22682,23 @@
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:22679: checking for dmalloc.h" >&5
+	echo "$as_me:22685: 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 22685 "configure"
+#line 22691 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:22689: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22695: \"$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:22695: \$? = $ac_status" >&5
+  echo "$as_me:22701: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22711,11 +22717,11 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:22714: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:22720: 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:22718: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:22724: 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
@@ -22723,7 +22729,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22726 "configure"
+#line 22732 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22742,16 +22748,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22745: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22751: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22748: \$? = $ac_status" >&5
+  echo "$as_me:22754: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22751: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22757: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22754: \$? = $ac_status" >&5
+  echo "$as_me:22760: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -22762,7 +22768,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22765: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:22771: 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
@@ -22777,7 +22783,7 @@
 
 fi
 
-echo "$as_me:22780: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:22786: 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.
@@ -22794,7 +22800,7 @@
 else
   with_dbmalloc=
 fi;
-echo "$as_me:22797: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:22803: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -22908,23 +22914,23 @@
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:22911: checking for dbmalloc.h" >&5
+	echo "$as_me:22917: 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 22917 "configure"
+#line 22923 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:22921: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22927: \"$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:22927: \$? = $ac_status" >&5
+  echo "$as_me:22933: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22943,11 +22949,11 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:22946: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:22952: 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:22950: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:22956: 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
@@ -22955,7 +22961,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22958 "configure"
+#line 22964 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22974,16 +22980,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22977: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22983: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22980: \$? = $ac_status" >&5
+  echo "$as_me:22986: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22983: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22989: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22986: \$? = $ac_status" >&5
+  echo "$as_me:22992: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -22994,7 +23000,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22997: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:23003: 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
@@ -23009,7 +23015,7 @@
 
 fi
 
-echo "$as_me:23012: checking if you want to use valgrind for testing" >&5
+echo "$as_me:23018: 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.
@@ -23026,7 +23032,7 @@
 else
   with_valgrind=
 fi;
-echo "$as_me:23029: result: ${with_valgrind:-no}" >&5
+echo "$as_me:23035: result: ${with_valgrind:-no}" >&5
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case ".$with_cflags" in
@@ -23139,18 +23145,18 @@
 	;;
 esac
 
-echo "$as_me:23142: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:23148: 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.
 if test "${enable_leaks+set}" = set; then
   enableval="$enable_leaks"
-  enable_leaks=no
+  enable_leaks=$enableval
 else
   enable_leaks=yes
 fi;
 if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
-echo "$as_me:23153: result: $with_no_leaks" >&5
+echo "$as_me:23159: result: $with_no_leaks" >&5
 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$enable_leaks" = no ; then
@@ -23165,7 +23171,7 @@
 
 fi
 
-echo "$as_me:23168: checking if you want to see long compiling messages" >&5
+echo "$as_me:23174: 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.
@@ -23199,10 +23205,10 @@
 	ECHO_CC=''
 
 fi;
-echo "$as_me:23202: result: $enableval" >&5
+echo "$as_me:23208: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:23205: checking if you want magic cookie emulation" >&5
+echo "$as_me:23211: 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.
@@ -23219,7 +23225,7 @@
 	enable_xmc=no
 
 fi;
-echo "$as_me:23222: result: $enable_xmc" >&5
+echo "$as_me:23228: result: $enable_xmc" >&5
 echo "${ECHO_T}$enable_xmc" >&6
 if test "$enable_xmc" = yes ; then
 
@@ -23234,13 +23240,13 @@
 for ac_func in tigetstr
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:23237: checking for $ac_func" >&5
+echo "$as_me:23243: 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 23243 "configure"
+#line 23249 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23271,16 +23277,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23274: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23280: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23277: \$? = $ac_status" >&5
+  echo "$as_me:23283: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23280: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23286: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23283: \$? = $ac_status" >&5
+  echo "$as_me:23289: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -23290,7 +23296,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23293: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:23299: 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
@@ -23305,13 +23311,13 @@
 for ac_func in use_extended_names
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:23308: checking for $ac_func" >&5
+echo "$as_me:23314: 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 23314 "configure"
+#line 23320 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23342,16 +23348,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23345: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23351: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23348: \$? = $ac_status" >&5
+  echo "$as_me:23354: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23351: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23357: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23354: \$? = $ac_status" >&5
+  echo "$as_me:23360: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -23361,7 +23367,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23364: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:23370: 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
@@ -23373,7 +23379,7 @@
 
 fi
 
-echo "$as_me:23376: checking if you want to use C11 _Noreturn feature" >&5
+echo "$as_me:23382: 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.
@@ -23390,23 +23396,23 @@
 	enable_stdnoreturn=no
 
 fi;
-echo "$as_me:23393: result: $enable_stdnoreturn" >&5
+echo "$as_me:23399: result: $enable_stdnoreturn" >&5
 echo "${ECHO_T}$enable_stdnoreturn" >&6
 
 if test $enable_stdnoreturn = yes; then
-echo "$as_me:23397: checking for C11 _Noreturn feature" >&5
+echo "$as_me:23403: 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 23403 "configure"
+#line 23409 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdnoreturn.h>
-static void giveup(void) { exit(0); }
+static _Noreturn void giveup(void) { exit(0); }
 
 int
 main (void)
@@ -23417,16 +23423,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23420: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23426: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23423: \$? = $ac_status" >&5
+  echo "$as_me:23429: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23426: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23432: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23429: \$? = $ac_status" >&5
+  echo "$as_me:23435: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_c11_noreturn=yes
 else
@@ -23437,14 +23443,15 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:23440: result: $cf_cv_c11_noreturn" >&5
+echo "$as_me:23446: result: $cf_cv_c11_noreturn" >&5
 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
 	cf_cv_c11_noreturn=no,
 fi
 
 if test "$cf_cv_c11_noreturn" = yes; then
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define HAVE_STDNORETURN_H 1
 EOF
 
@@ -23466,7 +23473,7 @@
 	(*-Werror=*)
 		test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:23469: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:23476: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 		cf_temp_flags=
 		for cf_temp_scan in $CFLAGS
@@ -23489,11 +23496,11 @@
 		CFLAGS="$cf_temp_flags"
 		test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:23492: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:23499: testing ... fixed $CFLAGS ..." 1>&5
 
 		test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:23496: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:23503: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		;;
 	esac
@@ -23505,7 +23512,7 @@
 	(*-Werror=*)
 		test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:23508: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:23515: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 		cf_temp_flags=
 		for cf_temp_scan in $CPPFLAGS
@@ -23528,11 +23535,11 @@
 		CPPFLAGS="$cf_temp_flags"
 		test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:23531: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:23538: testing ... fixed $CPPFLAGS ..." 1>&5
 
 		test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:23535: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:23542: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		;;
 	esac
@@ -23544,7 +23551,7 @@
 	(*-Werror=*)
 		test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:23547: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:23554: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 		cf_temp_flags=
 		for cf_temp_scan in $LDFLAGS
@@ -23567,17 +23574,17 @@
 		LDFLAGS="$cf_temp_flags"
 		test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:23570: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:23577: testing ... fixed $LDFLAGS ..." 1>&5
 
 		test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:23574: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:23581: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		;;
 	esac
 fi
 
-echo "$as_me:23580: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:23587: 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.
@@ -23594,7 +23601,7 @@
 	enable_warnings=no
 
 fi;
-echo "$as_me:23597: result: $enable_warnings" >&5
+echo "$as_me:23604: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -23617,10 +23624,10 @@
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:23620: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:23627: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 23623 "${as_me:-configure}"
+#line 23630 "${as_me:-configure}"
 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"
@@ -23669,12 +23676,12 @@
 			;;
 		esac
 
-		if { (eval echo "$as_me:23672: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:23679: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23675: \$? = $ac_status" >&5
+  echo "$as_me:23682: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:23677: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:23684: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -23752,7 +23759,7 @@
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23755 "configure"
+#line 23762 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -23761,32 +23768,32 @@
 int
 main (void)
 {
-String foo = malloc(1); (void)foo
+String foo = malloc(1); free((void*)foo)
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23770: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23777: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23773: \$? = $ac_status" >&5
+  echo "$as_me:23780: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23776: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23783: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23779: \$? = $ac_status" >&5
+  echo "$as_me:23786: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:23782: checking for X11/Xt const-feature" >&5
+echo "$as_me:23789: 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 23789 "configure"
+#line 23796 "configure"
 #include "confdefs.h"
 
 #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
@@ -23803,16 +23810,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23806: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23813: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23809: \$? = $ac_status" >&5
+  echo "$as_me:23816: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23812: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23819: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23815: \$? = $ac_status" >&5
+  echo "$as_me:23822: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -23827,7 +23834,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:23830: result: $cf_cv_const_x_string" >&5
+echo "$as_me:23837: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -23856,7 +23863,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 23859 "${as_me:-configure}"
+#line 23866 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -23872,7 +23879,7 @@
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:23875: checking for $CC warning options..." >&5
+	{ echo "$as_me:23882: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -23888,12 +23895,12 @@
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:23891: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:23898: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23894: \$? = $ac_status" >&5
+  echo "$as_me:23901: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:23896: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:23903: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -23901,7 +23908,7 @@
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:23904: checking for $CC warning options..." >&5
+	{ echo "$as_me:23911: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -23924,12 +23931,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:23927: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:23934: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23930: \$? = $ac_status" >&5
+  echo "$as_me:23937: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:23932: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:23939: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -23937,7 +23944,7 @@
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:23940: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:23947: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -23947,7 +23954,7 @@
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:23950: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:23957: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -24001,7 +24008,7 @@
 	CPPFLAGS=`echo "$CPPFLAGS" | sed -e s/-D$cf_def//`
 done
 
-echo "$as_me:24004: checking if filesystem supports mixed-case filenames" >&5
+echo "$as_me:24011: 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
@@ -24028,7 +24035,7 @@
 fi
 
 fi
-echo "$as_me:24031: result: $cf_cv_mixedcase" >&5
+echo "$as_me:24038: result: $cf_cv_mixedcase" >&5
 echo "${ECHO_T}$cf_cv_mixedcase" >&6
 test "$cf_cv_mixedcase" = yes &&
 cat >>confdefs.h <<\EOF
@@ -24039,7 +24046,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:24042: checking for $ac_word" >&5
+echo "$as_me:24049: 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
@@ -24054,7 +24061,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CTAGS="$ac_prog"
-echo "$as_me:24057: found $ac_dir/$ac_word" >&5
+echo "$as_me:24064: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -24062,10 +24069,10 @@
 fi
 CTAGS=$ac_cv_prog_CTAGS
 if test -n "$CTAGS"; then
-  echo "$as_me:24065: result: $CTAGS" >&5
+  echo "$as_me:24072: result: $CTAGS" >&5
 echo "${ECHO_T}$CTAGS" >&6
 else
-  echo "$as_me:24068: result: no" >&5
+  echo "$as_me:24075: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -24076,7 +24083,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:24079: checking for $ac_word" >&5
+echo "$as_me:24086: 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
@@ -24091,7 +24098,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ETAGS="$ac_prog"
-echo "$as_me:24094: found $ac_dir/$ac_word" >&5
+echo "$as_me:24101: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -24099,10 +24106,10 @@
 fi
 ETAGS=$ac_cv_prog_ETAGS
 if test -n "$ETAGS"; then
-  echo "$as_me:24102: result: $ETAGS" >&5
+  echo "$as_me:24109: result: $ETAGS" >&5
 echo "${ECHO_T}$ETAGS" >&6
 else
-  echo "$as_me:24105: result: no" >&5
+  echo "$as_me:24112: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -24111,7 +24118,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:24114: checking for $ac_word" >&5
+echo "$as_me:24121: 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
@@ -24126,7 +24133,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:24129: found $ac_dir/$ac_word" >&5
+echo "$as_me:24136: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -24135,17 +24142,17 @@
 fi
 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
 if test -n "$MAKE_LOWER_TAGS"; then
-  echo "$as_me:24138: result: $MAKE_LOWER_TAGS" >&5
+  echo "$as_me:24145: result: $MAKE_LOWER_TAGS" >&5
 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
 else
-  echo "$as_me:24141: result: no" >&5
+  echo "$as_me:24148: 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:24148: checking for $ac_word" >&5
+echo "$as_me:24155: 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
@@ -24160,7 +24167,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:24163: found $ac_dir/$ac_word" >&5
+echo "$as_me:24170: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -24169,10 +24176,10 @@
 fi
 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
 if test -n "$MAKE_UPPER_TAGS"; then
-  echo "$as_me:24172: result: $MAKE_UPPER_TAGS" >&5
+  echo "$as_me:24179: result: $MAKE_UPPER_TAGS" >&5
 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
 else
-  echo "$as_me:24175: result: no" >&5
+  echo "$as_me:24182: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -24195,7 +24202,7 @@
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then
-	echo "$as_me:24198: checking for an rpath option" >&5
+	echo "$as_me:24205: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	case "$cf_cv_system_name" in
 	(irix*)
@@ -24226,12 +24233,12 @@
 	(*)
 		;;
 	esac
-	echo "$as_me:24229: result: $LD_RPATH_OPT" >&5
+	echo "$as_me:24236: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 	case "x$LD_RPATH_OPT" in
 	(x-R*)
-		echo "$as_me:24234: checking if we need a space after rpath option" >&5
+		echo "$as_me:24241: 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"
 
@@ -24252,7 +24259,7 @@
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 24255 "configure"
+#line 24262 "configure"
 #include "confdefs.h"
 
 int
@@ -24264,16 +24271,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24267: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24274: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24270: \$? = $ac_status" >&5
+  echo "$as_me:24277: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24273: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24280: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24276: \$? = $ac_status" >&5
+  echo "$as_me:24283: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_space=no
 else
@@ -24283,14 +24290,14 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 		LIBS="$cf_save_LIBS"
-		echo "$as_me:24286: result: $cf_rpath_space" >&5
+		echo "$as_me:24293: 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:24293: checking if rpath-hack should be disabled" >&5
+echo "$as_me:24300: 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.
@@ -24308,22 +24315,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:24311: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:24318: result: $cf_disable_rpath_hack" >&5
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 
 if test "$enable_rpath_hack" = yes ; then
 
-echo "$as_me:24316: checking for updated LDFLAGS" >&5
+echo "$as_me:24323: 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:24319: result: maybe" >&5
+	echo "$as_me:24326: 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:24326: checking for $ac_word" >&5
+echo "$as_me:24333: 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
@@ -24338,7 +24345,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:24341: found $ac_dir/$ac_word" >&5
+echo "$as_me:24348: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -24346,10 +24353,10 @@
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:24349: result: $cf_ldd_prog" >&5
+  echo "$as_me:24356: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:24352: result: no" >&5
+  echo "$as_me:24359: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -24363,7 +24370,7 @@
 		cf_rpath_oops=
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 24366 "configure"
+#line 24373 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24375,16 +24382,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24378: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24385: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24381: \$? = $ac_status" >&5
+  echo "$as_me:24388: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24384: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24391: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24387: \$? = $ac_status" >&5
+  echo "$as_me:24394: \$? = $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`
@@ -24412,7 +24419,7 @@
 					then
 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
 
-echo "${as_me:-configure}:24415: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:24422: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 
 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
 						break
@@ -24424,11 +24431,11 @@
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:24427: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:24434: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:24431: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:24438: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -24465,7 +24472,7 @@
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:24468: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:24475: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -24478,11 +24485,11 @@
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:24481: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:24488: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:24485: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:24492: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -24519,7 +24526,7 @@
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:24522: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:24529: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -24532,14 +24539,14 @@
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:24535: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:24542: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:24539: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:24546: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 else
-	echo "$as_me:24542: result: no" >&5
+	echo "$as_me:24549: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -24634,7 +24641,7 @@
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:24637: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:24644: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -24765,7 +24772,7 @@
 cat >>"$CONFIG_STATUS" <<EOF
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.52.20210105,
+configured by $0, generated by GNU Autoconf 2.52.20210509,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright 2003-2020,2021	Thomas E. Dickey
@@ -24810,7 +24817,7 @@
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:24813: error: ambiguous option: $1
+    { { echo "$as_me:24820: 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;}
@@ -24829,7 +24836,7 @@
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:24832: error: unrecognized option: $1
+  -*) { { echo "$as_me:24839: 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;}
@@ -24848,7 +24855,7 @@
 ## Running config.status.  ##
 ## ----------------------- ##
 
-This file was extended by $as_me 2.52.20210105, executed with
+This file was extended by $as_me 2.52.20210509, executed with
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
   CONFIG_LINKS    = $CONFIG_LINKS
@@ -24868,7 +24875,7 @@
   "df-install" ) CONFIG_FILES="$CONFIG_FILES df-install" ;;
   "minstall" ) CONFIG_FILES="$CONFIG_FILES minstall:minstall.in" ;;
   "xtermcfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS xtermcfg.h:xtermcfg.hin" ;;
-  *) { { echo "$as_me:24871: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:24878: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -25041,6 +25048,7 @@
 s,@ECHO_CC@,$ECHO_CC,;t t
 s,@EXTRA_CFLAGS@,$EXTRA_CFLAGS,;t t
 s,@HAVE_STDNORETURN_H@,$HAVE_STDNORETURN_H,;t t
+s,@STDC_NORETURN@,$STDC_NORETURN,;t t
 s,@CHARPROC_DEPS@,$CHARPROC_DEPS,;t t
 s,@EXTRAHDRS@,$EXTRAHDRS,;t t
 s,@EXTRASRCS@,$EXTRASRCS,;t t
@@ -25185,7 +25193,7 @@
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:25188: creating $ac_file" >&5
+    { echo "$as_me:25196: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -25203,7 +25211,7 @@
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:25206: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:25214: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -25216,7 +25224,7 @@
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:25219: error: cannot find input file: $f" >&5
+           { { echo "$as_me:25227: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -25232,7 +25240,7 @@
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:25235: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:25243: 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;}
@@ -25241,7 +25249,7 @@
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:25244: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:25252: 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;}
@@ -25278,7 +25286,7 @@
             ac_init=`${EGREP-egrep} '[ 	]*'$ac_name'[ 	]*=' "$ac_file"`
             if test -z "$ac_init"; then
               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
-              { echo "$as_me:25281: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:25289: 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;}
@@ -25289,7 +25297,7 @@
     ${EGREP-egrep} -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>$tmp/out
     if test -s $tmp/out; then
       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
-      { echo "$as_me:25292: WARNING: Some variables may not be substituted:
+      { echo "$as_me:25300: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -25338,7 +25346,7 @@
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:25341: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:25349: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -25349,7 +25357,7 @@
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:25352: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:25360: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -25362,7 +25370,7 @@
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:25365: error: cannot find input file: $f" >&5
+           { { echo "$as_me:25373: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -25480,7 +25488,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:25483: $ac_file is unchanged" >&5
+      { echo "$as_me:25491: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
Index: data.c
--- xterm-367+/data.c	2017-12-18 23:38:05.000000000 +0000
+++ xterm-368/data.c	2021-05-27 22:29:26.000000000 +0000
@@ -1,7 +1,7 @@
-/* $XTermId: data.c,v 1.98 2017/12/18 23:38:05 tom Exp $ */
+/* $XTermId: data.c,v 1.100 2021/05/27 22:29:26 tom Exp $ */
 
 /*
- * Copyright 2002-2016,2017 by Thomas E. Dickey
+ * Copyright 2002-2017,2021 by Thomas E. Dickey
  *
  *                         All Rights Reserved
  *
@@ -68,6 +68,7 @@
 #endif
 
 char *ProgramName;
+char *ProgramPath;
 
 Arg ourTopLevelShellArgs[] =
 {
@@ -114,8 +115,11 @@
 
 #if OPT_SESSION_MGT
 int ice_fd = -1;
+char **restart_command;
 #endif
 
+int restart_params = 0;
+
 #ifdef USE_IGNORE_RC
 int ignore_unused;
 #endif
Index: data.h
--- xterm-367+/data.h	2021-03-09 01:08:15.000000000 +0000
+++ xterm-368/data.h	2021-05-27 22:29:12.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: data.h,v 1.139 2021/03/09 01:08:15 tom Exp $ */
+/* $XTermId: data.h,v 1.141 2021/05/27 22:29:12 tom Exp $ */
 
 /*
  * Copyright 2002-2019,2021 by Thomas E. Dickey
@@ -104,7 +104,12 @@
 extern PtySelect X_mask;
 extern PtySelect pty_mask;
 
+#if OPT_SESSION_MGT
 extern int ice_fd;
+extern char **restart_command;
+#endif
+
+extern int restart_params;
 
 extern XtermWidget term;
 
@@ -124,7 +129,8 @@
 #define	XkbBI_MarginBell		10
 #endif
 
-extern char *ProgramName;
+extern char *ProgramName;	/* just the last part of name, maybe alias */
+extern char *ProgramPath;	/* full pathname which can be executed */
 extern Arg ourTopLevelShellArgs[];
 extern Cardinal number_ourTopLevelShellArgs;
 extern Atom wm_delete_window;
Index: fontutils.c
--- xterm-367+/fontutils.c	2021-03-02 00:25:24.000000000 +0000
+++ xterm-368/fontutils.c	2021-06-02 23:49:10.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: fontutils.c,v 1.703 2021/03/02 00:25:24 tom Exp $ */
+/* $XTermId: fontutils.c,v 1.705 2021/06/02 23:49:10 tom Exp $ */
 
 /*
  * Copyright 1998-2020,2021 by Thomas E. Dickey
Index: main.c
--- xterm-367+/main.c	2021-03-21 22:09:06.000000000 +0000
+++ xterm-368/main.c	2021-06-03 21:23:20.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: main.c,v 1.877 2021/03/21 22:09:06 tom Exp $ */
+/* $XTermId: main.c,v 1.881 2021/06/03 21:23:20 tom Exp $ */
 
 /*
  * Copyright 2002-2020,2021 by Thomas E. Dickey
@@ -2221,7 +2221,10 @@
     Xaw3dXftData *xaw3dxft_data;
 #endif
 
-    ProgramName = argv[0];
+    ProgramName = x_strdup(x_basename(argv[0]));
+    ProgramPath = xtermFindShell(argv[0], True);
+    if (ProgramPath != NULL)
+	argv[0] = ProgramPath;
 
 #ifdef HAVE_POSIX_SAVED_IDS
     save_euid = geteuid();
@@ -2269,6 +2272,7 @@
     /* Do these first, since we may not be able to open the display */
     TRACE_OPTS(xtermOptions, optionDescList, XtNumber(optionDescList));
     TRACE_ARGV("Before XtOpenApplication", argv);
+    restart_params = 0;
     if (argc > 1) {
 	XrmOptionDescRec *option_ptr;
 	char *option_value;
@@ -2289,10 +2293,12 @@
 		if (explicit_shname == 0)
 		    exit(0);
 		TRACE(("...explicit shell %s\n", explicit_shname));
+		restart_params = (argc - n);
 	    } else if (!strcmp(option_ptr->option, "-e")) {
 		command_to_exec = (argv + n + 1);
 		if (!command_to_exec[0])
 		    Syntax(argv[n]);
+		restart_params = (argc - n);
 		break;
 	    } else if (!strcmp(option_ptr->option, "-version")) {
 		Version();
@@ -2473,6 +2479,8 @@
 					fallback_resources,
 					sessionShellWidgetClass,
 					NULL, 0);
+	TRACE(("created toplevel widget %p, window %#lx\n",
+	       (void *) toplevel, XtWindow(toplevel)));
 
 	XtGetApplicationResources(toplevel, (XtPointer) &resource,
 				  application_resources,
@@ -2652,6 +2660,8 @@
 						 XtNmenuHeight, menu_high,
 #endif
 						 (XtPointer) 0);
+    TRACE(("created vt100 widget %p, window %#lx\n",
+	   (void *) term, XtWindow(term)));
     decode_keyboard_type(term, &resource);
 
     screen = TScreenOf(term);
Index: menu.c
--- xterm-367+/menu.c	2021-03-21 20:03:03.000000000 +0000
+++ xterm-368/menu.c	2021-06-03 21:23:40.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: menu.c,v 1.365 2021/03/21 20:03:03 tom Exp $ */
+/* $XTermId: menu.c,v 1.367 2021/06/03 21:23:40 tom Exp $ */
 
 /*
  * Copyright 1999-2020,2021 by Thomas E. Dickey
@@ -695,6 +695,8 @@
 				 simpleMenuWidgetClass,
 				 toplevel,
 				 NULL, 0);
+    TRACE(("created popupShell(%s) widget %p, window %#lx\n",
+	   data->internal_name, list->w, XtWindow(list->w)));
 #endif
     if (list->w != 0) {
 	Boolean *unused = unusedEntries(xw, num);
@@ -718,6 +720,8 @@
 							   : smeLineObjectClass),
 							  list->w,
 							  &arg, (Cardinal) 1);
+		TRACE(("created menuEntry[%d] widget %p, window %#lx\n",
+		       n, (void *) entries[n].widget, XtWindow(entries[n].widget)));
 		list->entries++;
 	    }
 	}
@@ -3031,6 +3035,8 @@
 				      *menus,
 				      XtNgeometry, NULL,
 				      (XtPointer) 0);
+    TRACE(("created popupShel widget %p, window %#lx\n",
+	   (void *) shell[n].w, XtWindow(shell[n].w)));
 
     XtAddCallback(shell[n].w, XtNpopupCallback, InitPopup, menu_names[n].internal_name);
     XtVaGetValues(shell[n].w,
@@ -3052,6 +3058,8 @@
 					 XtNmenuName, menu_names[n].internal_name,
 					 XtNlabel, external_name,
 					 (XtPointer) 0);
+    TRACE(("created menuButton[%d] widget %p, window %#lx\n",
+	   n, (void *) shell[n].b, XtWindow(shell[n].b)));
     XtVaGetValues(shell[n].b,
 		  XtNheight, &button_height,
 		  XtNborderWidth, &button_border,
@@ -3085,6 +3093,8 @@
     *forms = XtVaCreateManagedWidget("form",
 				     formWidgetClass, shell,
 				     (XtPointer) 0);
+    TRACE(("created form widget %p, window %#lx\n",
+	   (void *) *forms, XtWindow(*forms)));
     xtermAddInput(*forms);
 
     /*
@@ -3105,6 +3115,8 @@
     } else {
 	*menus = XtCreateWidget("menubar", boxWidgetClass, *forms, args, 5);
     }
+    TRACE(("created menubar widget %p, window %#lx\n",
+	   (void *) *menus, XtWindow(*menus)));
 
     /*
      * The toolbar widget's height is not necessarily known yet.  If the
Index: misc.c
--- xterm-367+/misc.c	2021-03-24 00:27:48.000000000 +0000
+++ xterm-368/misc.c	2021-06-07 23:19:42.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: misc.c,v 1.979 2021/03/24 00:27:48 tom Exp $ */
+/* $XTermId: misc.c,v 1.988 2021/06/07 23:19:42 tom Exp $ */
 
 /*
  * Copyright 1999-2020,2021 by Thomas E. Dickey
@@ -6989,11 +6989,73 @@
 }
 
 #if OPT_SESSION_MGT
+
+#if OPT_TRACE
+static void
+trace_1_SM(const char *tag, String name)
+{
+    Arg args[1];
+    char *buf = 0;
+
+    XtSetArg(args[0], name, &buf);
+    XtGetValues(toplevel, args, 1);
+
+    if (strstr(name, "Path") || strstr(name, "Directory")) {
+	TRACE(("%s %s: %s\n", tag, name, NonNull(buf)));
+    } else if (strstr(name, "Command")) {
+	if (buf != NULL) {
+	    char **vec = (char **) (void *) buf;
+	    int n;
+	    TRACE(("%s %s:\n", tag, name));
+	    for (n = 0; vec[n] != NULL; ++n) {
+		TRACE((" arg[%d] = %s\n", n, vec[n]));
+	    }
+	} else {
+	    TRACE(("%s %s: %p\n", tag, name, buf));
+	}
+    } else {
+	TRACE(("%s %s: %p\n", tag, name, buf));
+    }
+}
+
+static void
+trace_SM_props(void)
+{
+    /* *INDENT-OFF* */
+    static struct { String app, cls; } table[] = {
+	{ XtNcurrentDirectory,	XtCCurrentDirectory },
+	{ XtNdieCallback,	XtNdiscardCommand },
+	{ XtCDiscardCommand,	XtNenvironment },
+	{ XtCEnvironment,	XtNinteractCallback },
+	{ XtNjoinSession,	XtCJoinSession },
+	{ XtNprogramPath,	XtCProgramPath },
+	{ XtNresignCommand,	XtCResignCommand },
+	{ XtNrestartCommand,	XtCRestartCommand },
+	{ XtNrestartStyle,	XtCRestartStyle },
+	{ XtNsaveCallback,	XtNsaveCompleteCallback },
+	{ XtNsessionID,		XtCSessionID },
+	{ XtNshutdownCommand,	XtCShutdownCommand },
+    };
+    /* *INDENT-ON* */
+    Cardinal n;
+    TRACE(("Session properties:\n"));
+    for (n = 0; n < XtNumber(table); ++n) {
+	trace_1_SM("app", table[n].app);
+	trace_1_SM("cls", table[n].cls);
+    }
+}
+#define TRACE_SM_PROPS()	trace_SM_props()
+#else
+#define TRACE_SM_PROPS()	/* nothing */
+#endif
+
 static void
 die_callback(Widget w GCC_UNUSED,
 	     XtPointer client_data GCC_UNUSED,
 	     XtPointer call_data GCC_UNUSED)
 {
+    TRACE(("die_callback %p\n", die_callback));
+    TRACE_SM_PROPS();
     NormalExit();
 }
 
@@ -7003,7 +7065,19 @@
 	      XtPointer call_data)
 {
     XtCheckpointToken token = (XtCheckpointToken) call_data;
-    /* we have nothing to save */
+    TRACE(("save_callback:\n"));
+    TRACE(("... save_type            <-%d\n", token->save_type));
+    TRACE(("... interact_style       <-%d\n", token->interact_style));
+    TRACE(("... shutdown             <-%s\n", BtoS(token->shutdown)));
+    TRACE(("... fast                 <-%s\n", BtoS(token->fast)));
+    TRACE(("... cancel_shutdown      <-%s\n", BtoS(token->cancel_shutdown)));
+    TRACE(("... phase                <-%d\n", token->phase));
+    TRACE(("... interact_dialog_type ->%d\n", token->interact_dialog_type));
+    TRACE(("... request_cancel       ->%s\n", BtoS(token->request_cancel)));
+    TRACE(("... request_next_phase   ->%s\n", BtoS(token->request_next_phase)));
+    TRACE(("... save_success         ->%s\n", BtoS(token->save_success)));
+    xtermUpdateRestartCommand(term);
+    /* we have nothing more to save */
     token->save_success = True;
 }
 
@@ -7029,6 +7103,8 @@
 	TRACE(("Enabling session-management callbacks\n"));
 	XtAddCallback(toplevel, XtNdieCallback, die_callback, NULL);
 	XtAddCallback(toplevel, XtNsaveCallback, save_callback, NULL);
+
+	TRACE_SM_PROPS();
     }
 }
 
@@ -7037,6 +7113,267 @@
 {
     IceRemoveConnectionWatch(icewatch, NULL);
 }
+
+typedef enum {
+    B_ARG = 0,
+    I_ARG,
+    D_ARG,
+    S_ARG
+} ParamType;
+
+#define Barg(name, field) { name, B_ARG, XtOffsetOf(XtermWidgetRec, field) }
+#define Iarg(name, field) { name, I_ARG, XtOffsetOf(XtermWidgetRec, field) }
+#define Darg(name, field) { name, D_ARG, XtOffsetOf(XtermWidgetRec, field) }
+#define Sarg(name, field) { name, S_ARG, XtOffsetOf(XtermWidgetRec, field) }
+
+typedef struct {
+    const char name[30];
+    ParamType type;
+    Cardinal offset;
+} FontParams;
+
+/* *INDENT-OFF* */
+static const FontParams fontParams[] = {
+    Iarg(XtNinitialFont,     screen.menu_font_number),	/* "-fc" */
+    Barg(XtNallowBoldFonts,  screen.allowBoldFonts),	/* menu */
+#if OPT_BOX_CHARS
+    Barg(XtNforceBoxChars,   screen.force_box_chars),	/* "-fbx" */
+    Barg(XtNforcePackedFont, screen.force_packed),	/* menu */
+#endif
+#if OPT_DEC_CHRSET
+    Barg(XtNfontDoublesize,  screen.font_doublesize),	/* menu */
+#endif
+#if OPT_WIDE_CHARS
+    Barg(XtNutf8Fonts,       screen.utf8_fonts),	/* menu */
+#endif
+#if OPT_RENDERFONT
+    Darg(XtNfaceSize,        misc.face_size[0]),	/* "-fs" */
+    Sarg(XtNfaceName,        misc.default_xft.f_n),	/* "-fa" */
+    Sarg(XtNrenderFont,      misc.render_font_s),	/* (resource) */
+#endif
+};
+/* *INDENT-ON* */
+
+#define RESTART_PARAMS (int)(XtNumber(fontParams) * 2)
+#define TypedPtr(type) *(type *)(void *)((char *) xw + parameter->offset)
+
+/*
+ * If no widget is given, no value is used.
+ */
+static char *
+formatFontParam(char *result, XtermWidget xw, const FontParams * parameter)
+{
+    sprintf(result, "%s*%s:", ProgramName, parameter->name);
+    if (xw != None) {
+	char *next = result + strlen(result);
+	switch (parameter->type) {
+	case B_ARG:
+	    sprintf(next, "%s", *(Boolean *) ((char *) xw + parameter->offset)
+		    ? "true"
+		    : "false");
+	    break;
+	case I_ARG:
+	    sprintf(next, "%d", TypedPtr(int));
+	    break;
+	case D_ARG:
+	    sprintf(next, "%.1f", TypedPtr(float));
+	    break;
+	case S_ARG:
+	    strcpy(next, TypedPtr(char *));
+#if OPT_RENDERFONT
+	    if (!strcmp(parameter->name, XtNfaceName)) {
+		if (IsEmpty(next)
+		    && xw->work.render_font) {
+		    strcpy(next, DEFFACENAME_AUTO);
+		}
+	    } else if (!strcmp(parameter->name, XtNrenderFont)) {
+		if (xw->work.render_font == erDefault
+		    && IsEmpty(xw->misc.default_xft.f_n)) {
+		    strcpy(next, "DefaultOff");
+		}
+	    }
+#endif
+	    break;
+	}
+    }
+    return result;
+}
+
+#if OPT_TRACE
+static void
+dumpFontParams(XtermWidget xw)
+{
+    char buffer[1024];
+    Cardinal n;
+
+    TRACE(("FontParams:\n"));
+    for (n = 0; n < XtNumber(fontParams); ++n) {
+	TRACE(("%3d:%s\n", n, formatFontParam(buffer, xw, fontParams + n)));
+    }
+}
+#else
+#define dumpFontParams(xw)	/* nothing */
+#endif
+
+static Boolean
+findFontParams(int argc, char **argv)
+{
+    Boolean result = False;
+
+    if (argc > RESTART_PARAMS && (argc - restart_params) > RESTART_PARAMS) {
+	int n;
+
+	for (n = 0; n < RESTART_PARAMS; ++n) {
+	    int my_index = argc - restart_params - n - 1;
+	    int my_param = (RESTART_PARAMS - n - 1) / 2;
+	    char *actual = argv[my_index];
+	    char expect[1024];
+	    Boolean value = (Boolean) ((n % 2) == 0);
+
+	    result = False;
+	    TRACE(("...index: %d\n", my_index));
+	    TRACE(("...param: %d\n", my_param));
+	    TRACE(("...actual %s\n", actual));
+	    if (IsEmpty(actual))
+		break;
+
+	    if (value) {
+		formatFontParam(expect, None, fontParams + my_param);
+	    } else {
+		strcpy(expect, "-xrm");
+	    }
+
+	    TRACE(("...expect %s\n", expect));
+
+	    if (value) {
+		if (strlen(expect) >= strlen(actual))
+		    break;
+		if (strncmp(expect, actual, strlen(expect)))
+		    break;
+	    } else {
+		if (strcmp(actual, expect))
+		    break;
+	    }
+	    TRACE(("fixme/ok:%d\n", n));
+	    result = True;
+	}
+	TRACE(("findFontParams: %s (tested %d of %d parameters)\n",
+	       BtoS(result), n + 1, RESTART_PARAMS));
+    }
+    return result;
+}
+
+static int
+insertFontParams(XtermWidget xw, int *targetp, Boolean first)
+{
+    int changed = 0;
+    int n;
+    int target = *targetp;
+    char buffer[1024];
+    const char *option = "-xrm";
+
+    for (n = 0; n < (int) XtNumber(fontParams); ++n) {
+	formatFontParam(buffer, xw, fontParams + n);
+	TRACE(("formatted %3d ->%3d:%s\n", n, target, buffer));
+	if (restart_command[target] == NULL)
+	    restart_command[target] = x_strdup(option);
+	++target;
+	if (first) {
+	    restart_command[target] = x_strdup(buffer);
+	    ++changed;
+	} else if (restart_command[target] == NULL
+		   || strcmp(restart_command[target], buffer)) {
+	    free(restart_command[target]);
+	    restart_command[target] = x_strdup(buffer);
+	    ++changed;
+	}
+	++target;
+    }
+    *targetp = target;
+    return changed;
+}
+
+void
+xtermUpdateRestartCommand(XtermWidget xw)
+{
+    if (resource.sessionMgt) {
+	Arg args[1];
+	char **argv = 0;
+
+	XtSetArg(args[0], XtNrestartCommand, &argv);
+	XtGetValues(toplevel, args, 1);
+	if (argv != NULL) {
+	    static int my_params = 0;
+
+	    int changes = 0;
+	    Boolean first = False;
+	    int argc;
+	    int want;
+	    int source, target;
+
+	    TRACE(("xtermUpdateRestartCommand\n"));
+	    dumpFontParams(xw);
+	    for (argc = 0; argv[argc] != NULL; ++argc) {
+		TRACE((" arg[%d] = %s\n", argc, argv[argc]));
+		;
+	    }
+	    want = argc - (restart_params + RESTART_PARAMS);
+
+	    TRACE((" argc:           %d\n", argc));
+	    TRACE((" restart_params: %d\n", restart_params));
+	    TRACE((" want to insert: %d\n", want));
+
+	    /*
+	     * If we already have the font-choice option, do not add it again.
+	     */
+	    if (findFontParams(argc, argv)) {
+		my_params = (want);
+	    } else {
+		first = True;
+		my_params = (argc - restart_params);
+	    }
+	    TRACE((" my_params:      %d\n", my_params));
+
+	    if (my_params > argc) {
+		TRACE((" re-allocate restartCommand\n"));
+		FreeAndNull(restart_command);
+	    }
+
+	    if (restart_command == NULL) {
+		int need = argc + RESTART_PARAMS + 1;
+
+		restart_command = TypeCallocN(char *, need);
+
+		TRACE(("..inserting font-parameters\n"));
+		for (source = target = 0; source < argc; ++source) {
+		    if (source == my_params) {
+			changes += insertFontParams(xw, &target, first);
+			if (!first) {
+			    source += (RESTART_PARAMS - 1);
+			    continue;
+			}
+		    }
+		    if (argv[source] == NULL)
+			break;
+		    restart_command[target++] = x_strdup(argv[source]);
+		}
+		restart_command[target] = NULL;
+	    } else {
+		TRACE(("..replacing font-parameters\n"));
+		target = my_params;
+		changes += insertFontParams(xw, &target, first);
+	    }
+	    if (changes) {
+		TRACE(("..%d parameters changed\n", changes));
+		XtSetArg(args[0], XtNrestartCommand, restart_command);
+		XtSetValues(toplevel, args, 1);
+	    } else {
+		TRACE(("..NO parameters changed\n"));
+	    }
+	}
+	TRACE_SM_PROPS();
+    }
+}
 #endif /* OPT_SESSION_MGT */
 
 Widget
@@ -7205,12 +7542,23 @@
 #ifdef TTYSIZE_STRUCT
     static int last_rows = -1;
     static int last_cols = -1;
+    static int last_high = -1;
+    static int last_wide = -1;
 
-    if (rows != last_rows || cols != last_cols) {
+    TRACE(("update_winsize %dx%d (%dx%d) -> %dx%d (%dx%d)\n",
+	   last_rows, last_cols, last_high, last_wide,
+	   rows, cols, height, width));
+
+    if (rows != last_rows
+	|| cols != last_cols
+	|| last_high != height
+	|| last_wide != width) {
 	TTYSIZE_STRUCT ts;
 
 	last_rows = rows;
 	last_cols = cols;
+	last_high = height;
+	last_wide = width;
 	setup_winsize(ts, rows, cols, height, width);
 	TRACE_RC(code, SET_TTYSIZE(fd, ts));
 	trace_winsize(ts, "from SET_TTYSIZE");
Index: package/debian/changelog
--- xterm-367+/package/debian/changelog	2021-02-22 21:18:59.000000000 +0000
+++ xterm-368/package/debian/changelog	2021-04-28 00:02:52.000000000 +0000
@@ -1,3 +1,9 @@
+xterm-dev (368) unstable; urgency=low
+
+  * maintenance updates
+
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Tue, 27 Apr 2021 20:02:52 -0400
+
 xterm-dev (367) unstable; urgency=low
 
   * maintenance updates
Index: package/freebsd/Makefile
--- xterm-367+/package/freebsd/Makefile	2021-02-22 21:18:59.000000000 +0000
+++ xterm-368/package/freebsd/Makefile	2021-04-28 00:02:52.000000000 +0000
@@ -1,4 +1,4 @@
-# $XTermId: Makefile,v 1.88 2021/02/22 21:18:59 tom Exp $
+# $XTermId: Makefile,v 1.89 2021/04/28 00:02:52 tom Exp $
 # $FreeBSD: head/x11/xterm/Makefile 492827 2019-02-13 06:43:36Z ehaupt $
 
 # This is adapted from the FreeBSD port, installing as "xterm-dev" with
@@ -7,7 +7,7 @@
 # and "make makesum".
 
 PORTNAME=	xterm
-PORTVERSION=	367
+PORTVERSION=	368
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.invisible-island.net/xterm/:src1 \
 		https://invisible-mirror.net/archives/xterm/:src1
Index: package/pkgsrc/Makefile
--- xterm-367+/package/pkgsrc/Makefile	2021-02-22 21:18:59.000000000 +0000
+++ xterm-368/package/pkgsrc/Makefile	2021-04-28 00:02:52.000000000 +0000
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.117 2018/03/12 11:18:00 wiz Exp $
 
-DISTNAME=	xterm-367
+DISTNAME=	xterm-368
 PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.invisible-island.net/xterm/
Index: package/xterm.spec
--- xterm-367+/package/xterm.spec	2021-02-22 21:18:59.000000000 +0000
+++ xterm-368/package/xterm.spec	2021-04-28 00:02:52.000000000 +0000
@@ -1,11 +1,11 @@
-# $XTermId: xterm.spec,v 1.142 2021/02/22 21:18:59 tom Exp $
+# $XTermId: xterm.spec,v 1.143 2021/04/28 00:02:52 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: 367
+Version: 368
 Release: 1
 License: X11
 Group: User Interface/X
Index: ptyx.h
--- xterm-367+/ptyx.h	2021-03-21 22:11:10.000000000 +0000
+++ xterm-368/ptyx.h	2021-06-07 19:29:11.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: ptyx.h,v 1.1030 2021/03/21 22:11:10 tom Exp $ */
+/* $XTermId: ptyx.h,v 1.1032 2021/06/07 19:29:11 tom Exp $ */
 
 /*
  * Copyright 1999-2020,2021 by Thomas E. Dickey
@@ -1946,6 +1946,7 @@
 	erFalse = 0
 	, erTrue
 	, erDefault
+	, erDefaultOff
 	, erLast
 } RenderFont;
 
@@ -2731,6 +2732,7 @@
 #if OPT_SCROLL_LOCK
 	Boolean		allowScrollLock;/* ScrollLock mode		*/
 	Boolean		allowScrollLock0;/* initial ScrollLock mode	*/
+	Boolean		autoScrollLock; /* Auto ScrollLock mode		*/
 	Boolean		scroll_lock;	/* true to keep buffer in view	*/
 	Boolean		scroll_dirty;	/* scrolling makes screen dirty	*/
 #endif
Index: scrollbar.c
--- xterm-367+/scrollbar.c	2021-02-02 00:19:32.000000000 +0000
+++ xterm-368/scrollbar.c	2021-06-06 23:14:52.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: scrollbar.c,v 1.211 2021/02/02 00:19:32 tom Exp $ */
+/* $XTermId: scrollbar.c,v 1.212 2021/06/06 23:14:52 Stelios.Bounanos Exp $ */
 
 /*
  * Copyright 2000-2020,2021 by Thomas E. Dickey
@@ -379,7 +379,9 @@
 
     (void) always;
 #if OPT_SCROLL_LOCK
-    if (screen->allowScrollLock && (screen->scroll_lock && !always)) {
+    if (((screen->allowScrollLock && screen->scroll_lock)
+	 || (screen->autoScrollLock && top < 0))
+	&& !always) {
 	if (screen->scroll_dirty) {
 	    screen->scroll_dirty = False;
 	    ScrnRefresh(xw, 0, 0, MaxRows(screen), MaxCols(screen), False);
Index: util.c
--- xterm-367+/util.c	2021-03-21 21:27:08.000000000 +0000
+++ xterm-368/util.c	2021-06-06 23:14:52.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: util.c,v 1.877 2021/03/21 21:27:08 tom Exp $ */
+/* $XTermId: util.c,v 1.878 2021/06/06 23:14:52 Stelios.Bounanos Exp $ */
 
 /*
  * Copyright 1999-2020,2021 by Thomas E. Dickey
@@ -627,7 +627,8 @@
 	refreshheight = 0;
     } else
 #if OPT_SCROLL_LOCK
-    if (screen->allowScrollLock && screen->scroll_lock) {
+	if ((screen->allowScrollLock && screen->scroll_lock)
+	    || (screen->autoScrollLock && screen->topline < 0)) {
 	refreshheight = 0;
 	screen->scroll_amt = 0;
 	screen->refresh_amt = 0;
Index: version.h
--- xterm-367+/version.h	2021-03-26 22:59:42.000000000 +0000
+++ xterm-368/version.h	2021-06-08 00:41:59.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: version.h,v 1.512 2021/03/26 22:59:42 tom Exp $ */
+/* $XTermId: version.h,v 1.514 2021/06/08 00:41:59 tom Exp $ */
 
 /*
  * Copyright 1998-2020,2021 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   367
-#define XTERM_DATE    2021-03-26
+#define XTERM_PATCH   368
+#define XTERM_DATE    2021-06-07
 
 #ifndef __vendorversion__
 #define __vendorversion__ "XTerm"
Index: xterm.appdata.xml
--- xterm-367+/xterm.appdata.xml	2021-03-26 23:00:37.000000000 +0000
+++ xterm-368/xterm.appdata.xml	2021-06-08 00:42:37.000000000 +0000
@@ -35,7 +35,7 @@
     <keyword>terminal</keyword>
   </keywords>
   <releases>
-    <release version="367" date="2021-03-26"/>
+    <release version="368" date="2021-06-07"/>
   </releases>
   <url type="homepage">https://invisible-island.net/xterm/</url>
   <update_contact>dickey@invisible-island.net</update_contact>
Index: xterm.h
--- xterm-367+/xterm.h	2021-03-21 22:44:36.000000000 +0000
+++ xterm-368/xterm.h	2021-06-06 23:14:40.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: xterm.h,v 1.890 2021/03/21 22:44:36 tom Exp $ */
+/* $XTermId: xterm.h,v 1.893 2021/06/06 23:14:40 Stelios.Bounanos Exp $ */
 
 /*
  * Copyright 1999-2020,2021 by Thomas E. Dickey
@@ -454,6 +454,7 @@
 #define XtNappkeypadDefault	"appkeypadDefault"
 #define XtNassumeAllChars	"assumeAllChars"
 #define XtNautoWrap		"autoWrap"
+#define XtNautoScrollLock	"autoScrollLock"
 #define XtNawaitInput		"awaitInput"
 #define XtNbackarrowKey		"backarrowKey"
 #define XtNbellIsUrgent		"bellIsUrgent"
@@ -668,6 +669,7 @@
 #define XtCAppkeypadDefault	"AppkeypadDefault"
 #define XtCAssumeAllChars	"AssumeAllChars"
 #define XtCAutoWrap		"AutoWrap"
+#define XtCAutoScrollLock	"AutoScrollLock"
 #define XtCAwaitInput		"AwaitInput"
 #define XtCBackarrowKey		"BackarrowKey"
 #define XtCBellIsUrgent		"BellIsUrgent"
@@ -1300,9 +1302,11 @@
 #if OPT_SESSION_MGT
 extern void xtermCloseSession (void);
 extern void xtermOpenSession (void);
+extern void xtermUpdateRestartCommand(XtermWidget /* xw */);
 #else
 #define xtermCloseSession() /* nothing */
 #define xtermOpenSession() /* nothing */
+#define xtermUpdateRestartCommand(xw) /* nothing */
 #endif
 
 #if OPT_WIDE_CHARS
Index: xterm.log.html
--- xterm-367+/xterm.log.html	2021-03-26 23:02:54.000000000 +0000
+++ xterm-368/xterm.log.html	2021-06-08 00:41:48.000000000 +0000
@@ -30,7 +30,7 @@
  * sale, use or other dealings in this Software without prior written        *
  * authorization.                                                            *
  *****************************************************************************
-  $XTermId: xterm.log.html,v 1.2326 2021/03/26 23:02:54 tom Exp $
+  $XTermId: xterm.log.html,v 1.2334 2021/06/08 00:41:48 tom Exp $
   -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
@@ -70,6 +70,8 @@
   CHANGELOG</a>).</p>
 
   <ul>
+    <li><a href="#xterm_368">Patch #368 - 2021/06/07</a></li>
+
     <li><a href="#xterm_367">Patch #367 - 2021/03/26</a></li>
 
     <li><a href="#xterm_366">Patch #366 - 2021/02/10</a></li>
@@ -1012,6 +1014,27 @@
     <li><a href="#xterm_01">Patch #1 - 1996/1/6</a></li>
   </ul>
 
+  <h1><a name="xterm_368" id="xterm_368">Patch #368 -
+  2021/06/07</a></h1>
+
+  <ul>
+    <li>add <code>DefaultOff</code> option to
+    <code>RenderFont</code> resource, as part of the
+    session-management feature.</li>
+
+    <li>add auto-scroll-lock feature (patch by add Stelios
+    Bounanos).</li>
+
+    <li>update the window-size information returned via
+    <code>TIOCGWINSZ</code> when rows/columns are unchanged but the
+    font-size changes (report by Nick Black).</li>
+
+    <li>improve session-management feature by saving/restoring the
+    font settings.</li>
+
+    <li>update config.guess, config.sub</li>
+  </ul>
+
   <h1><a name="xterm_367" id="xterm_367">Patch #367 -
   2021/03/26</a></h1>
 
Index: xterm.man
--- xterm-367+/xterm.man	2021-03-26 23:11:13.000000000 +0000
+++ xterm-368/xterm.man	2021-06-07 21:00:31.000000000 +0000
@@ -1,5 +1,5 @@
 '\" t
-.\" $XTermId: xterm.man,v 1.844 2021/03/26 23:11:13 tom Exp $
+.\" $XTermId: xterm.man,v 1.848 2021/06/07 21:00:31 tom Exp $
 .\"
 .\" Copyright 1996-2020,2021 by Thomas E. Dickey
 .\"
@@ -1628,7 +1628,8 @@
 and is limited to the range 1 through 100.
 .TP 8
 .B "cursorTheme\fP (class\fB CursorTheme\fP)"
-The Xcursor(__miscmansuffix__) library provides a way to 
+The Xcursor(__miscmansuffix__) library
+provides a way to change the pointer shape and size.
 The X11 library uses this library to extend the font- and glyph-cursor
 calls used by applications such as \fI\*n\fP  to substitute external
 files for the built-in \*(``core\*('' cursors provided by X.
@@ -2286,6 +2287,8 @@
 This key is generally unused in keyboard configurations,
 and has not acquired a standard meaning even when it is used in that manner.
 Consequently, users have assigned it for ad hoc purposes.
+.IP
+See also the \fBautoScrollLock\fP resource.
 .TP 8
 .B "allowSendEvents\fP (class\fB AllowSendEvents\fP)"
 Specifies whether or not synthetic key and button events (generated using
@@ -2455,6 +2458,14 @@
 (such as the ISO-10646-1 encoding of Terminus)
 which have incorrect font-metrics.
 .TP 8
+.B "autoScrollLock\fP (class\fB AutoScrollLock\fP)"
+If \*(``true\*('', \fI\*n\fR will maintain its viewport of displayed lines
+whenever displaying scrollback, as if \fBallowScrollLock\fP were enabled
+and the Scroll Lock key had been pressed.
+The default is \*(``false\*(''.
+This feature is only useful if the \fBscrollTtyOutput\fP resource is set to
+\*(``false\*(''.
+.TP 8
 .B "autoWrap\fP (class\fB AutoWrap\fP)"
 Specifies whether or not auto-wraparound should be enabled.
 This is the same as the VT102 DECAWM.
@@ -4811,6 +4822,12 @@
 If the \fBfaceName\fP resource is set,
 then start by using the TrueType font rather than the bitmap font.
 .RE
+.TP 5
+defaultOff
+.br
+Enable the \*(``TrueType Fonts\*(''
+menu entry to allow runtime switching to/from TrueType fonts,
+but allow it to be initially unselected if no \fBfaceName\fP resource was given.
 .RE
 .TP 8
 .B "resizeByPixel\fP (class\fB ResizeByPixel\fP)"
