# https://invisible-island.net/archives/xterm/patches/xterm-400.patch.gz
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created  Sun Jun 15 20:53:56 UTC 2025
# ------------------------------------------------------------------------------
# COPYING                                             |   27 
# MANIFEST                                            |    3 
# Tekproc.c                                           |   27 
# aclocal.m4                                          |   49 
# charproc.c                                          |   29 
# configure                                           | 2446 +++++++++---------
# ctlseqs.ms                                          |   64 
# ctlseqs.txt                                         |   20 
# install-sh                                          |   29 
# main.c                                              |   97 
# menu.c                                              |   30 
# menu.h                                              |   32 
# misc.c                                              |    4 
# package/debian/changelog                            |    6 
# package/debian/copyright                            |  309 --
# package/debian/xterm-dev.lintian-overrides          |    7 
# package/freebsd/Makefile                            |    6 
# package/pkgsrc/Makefile                             |    2 
# package/xterm.spec                                  |    4 
# resize.man                                          |    8 
# util.c                                              |   35 
# version.h                                           |    6 
# xcharmouse.h                                        |   47 
# xterm-400/package/debian/xterm-dev.doc-base.ctlseqs |    9 
# xterm.appdata.xml                                   |    2 
# xterm.log.html                                      |   21 
# xterm.man                                           |   34 
# xutf8.c                                             |   20 
# 28 files changed, 1785 insertions(+), 1588 deletions(-)
# ------------------------------------------------------------------------------
Index: COPYING
--- xterm-399+/COPYING	2025-01-03 08:48:24.000000000 +0000
+++ xterm-400/COPYING	2025-06-08 23:02:33.000000000 +0000
@@ -1,9 +1,8 @@
---- $XTermId: COPYING,v 1.8 2025/01/03 08:48:24 tom Exp $
+--- $XTermId: COPYING,v 1.9 2025/06/08 23:02:33 tom Exp $
 -------------------------------------------------------------------------------
 
 Copyright 1996-2024,2025 by Thomas E. Dickey
-
-                        All Rights Reserved
+Copyright 1987, 1988  X Consortium
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the
@@ -29,28 +28,6 @@
 sale, use or other dealings in this Software without prior written
 authorization.
 
-Copyright 1987, 1988  X Consortium
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-
 Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                          All Rights Reserved
Index: MANIFEST
--- xterm-399+/MANIFEST	2025-04-15 20:33:49.000000000 +0000
+++ xterm-400/MANIFEST	2025-06-15 10:21:39.000000000 +0000
@@ -1,4 +1,4 @@
-MANIFEST for xterm, version xterm-399
+MANIFEST for xterm, version xterm-400
 --------------------------------------------------------------------------------
 MANIFEST                        this file
 256colres.h                     resource-definitions for 256-color mode
@@ -154,6 +154,7 @@
 package/debian/prerm            pre-remove script for update-alternatives
 package/debian/rules            build-script
 package/debian/watch            build-script
+package/debian/xterm-dev.doc-base.ctlseqs  register ctlseqs with doc-base
 package/debian/xterm-dev.docs   build-script
 package/debian/xterm-dev.lintian-overrides  ignore useless warnings from lintian
 package/debian/xterm-dev.menu   Debian menu-file for xterm-dev package.
Index: Tekproc.c
--- xterm-399+/Tekproc.c	2025-05-18 20:50:21.000000000 +0000
+++ xterm-400/Tekproc.c	2025-06-08 23:03:23.000000000 +0000
@@ -1,9 +1,8 @@
-/* $XTermId: Tekproc.c,v 1.255 2025/05/18 20:50:21 tom Exp $ */
+/* $XTermId: Tekproc.c,v 1.256 2025/06/08 23:03:23 tom Exp $ */
 
 /*
  * Copyright 2001-2024,2025 by Thomas E. Dickey
- *
- *                         All Rights Reserved
+ * Copyright 1988  X Consortium
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the
@@ -29,28 +28,6 @@
  * sale, use or other dealings in this Software without prior written
  * authorization.
  *
- * Copyright 1988  X Consortium
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation.
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
- * OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name of the X Consortium shall not be
- * used in advertising or otherwise to promote the sale, use or other dealings
- * in this Software without prior written authorization from the X Consortium.
- *
  * Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
  *
  *                         All Rights Reserved
Index: aclocal.m4
--- xterm-399+/aclocal.m4	2025-04-20 21:59:55.000000000 +0000
+++ xterm-400/aclocal.m4	2025-06-14 10:47:49.000000000 +0000
@@ -1,4 +1,4 @@
-dnl $XTermId: aclocal.m4,v 1.540 2025/04/20 21:59:55 tom Exp $
+dnl $XTermId: aclocal.m4,v 1.542 2025/06/14 10:47:49 tom Exp $
 dnl
 dnl ---------------------------------------------------------------------------
 dnl
@@ -210,17 +210,51 @@
 ifelse($2,,LIBS,[$2])="$cf_add_libs"
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_ADD_LIB_AFTER version: 3 updated: 2013/07/09 21:27:22
+dnl CF_ADD_LIB_AFTER version: 4 updated: 2025/06/14 06:46:23
 dnl ----------------
 dnl Add a given library after another, e.g., following the one it satisfies a
 dnl dependency for.
 dnl
 dnl $1 = the first library
 dnl $2 = its dependency
+dnl $3 = variable to update (default $LIBS)
 AC_DEFUN([CF_ADD_LIB_AFTER],[
-CF_VERBOSE(...before $LIBS)
-LIBS=`echo "$LIBS" | sed -e "s/[[ 	]][[ 	]]*/ /g" -e "s%$1 %$1 $2 %" -e 's%  % %g'`
-CF_VERBOSE(...after  $LIBS)
+cf_add_libs="[$]ifelse($3,,LIBS,[$3])"
+CF_VERBOSE(...before $cf_add_libs)
+for cf_add_1lib in $2; do
+	# filter duplicates
+	cf_found_2lib=no
+	for cf_add_2lib in $cf_add_libs; do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
+			cf_found_2lib=yes
+			break
+		fi
+	done
+	# if not a duplicate, find the dependent library
+	if test "$cf_found_2lib" = no
+	then
+		cf_found_2lib=no
+		cf_add_2libs=
+		for cf_add_2lib in $cf_add_libs
+		do
+			test -n "$cf_add_2libs" && cf_add_2libs="$cf_add_2libs "
+			cf_add_2libs="$cf_add_2libs$cf_add_2lib"
+			if test "x$cf_add_2lib" = "x$1"
+			then
+				cf_found_2lib=yes
+				cf_add_2libs="$cf_add_2libs $cf_add_1lib"
+			fi
+		done
+		if test "$cf_found_2lib" = yes
+		then
+			cf_add_libs="$cf_add_2libs"
+		else
+			CF_VERBOSE(...missed $1)
+		fi
+	fi
+done
+CF_VERBOSE(...after  $cf_add_libs)
+ifelse($3,,LIBS,[$3])="$cf_add_libs"
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_APPEND_CFLAGS version: 3 updated: 2021/09/05 17:25:40
@@ -5122,7 +5156,7 @@
 fi # cf_cv_posix_visible
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_X_ATHENA version: 25 updated: 2023/01/11 04:05:23
+dnl CF_X_ATHENA version: 26 updated: 2025/06/14 06:46:23
 dnl -----------
 dnl Check for Xaw (Athena) libraries
 dnl
@@ -5192,8 +5226,6 @@
 			CF_UPPER(cf_x_athena_LIBS,HAVE_LIB_$cf_x_athena)
 			AC_DEFINE_UNQUOTED($cf_x_athena_LIBS)
 
-			CF_TRIM_X_LIBS
-
 AC_CACHE_CHECK(for usable $cf_x_athena/Xmu package,cf_cv_xaw_compat,[
 AC_TRY_LINK([
 $ac_includes_default
@@ -5219,7 +5251,6 @@
 						],[
 							CF_ADD_LIB_AFTER($cf_first_lib,-lXmu)
 						])
-					CF_TRIM_X_LIBS
 					;;
 				esac
 			fi
Index: charproc.c
--- xterm-399+/charproc.c	2025-05-18 20:50:21.000000000 +0000
+++ xterm-400/charproc.c	2025-06-08 23:03:44.000000000 +0000
@@ -1,9 +1,8 @@
-/* $XTermId: charproc.c,v 1.2073 2025/05/18 20:50:21 tom Exp $ */
+/* $XTermId: charproc.c,v 1.2074 2025/06/08 23:03:44 tom Exp $ */
 
 /*
  * Copyright 1999-2024,2025 by Thomas E. Dickey
- *
- *                         All Rights Reserved
+ * Copyright 1988  X Consortium
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the
@@ -28,30 +27,6 @@
  * holders shall not be used in advertising or otherwise to promote the
  * sale, use or other dealings in this Software without prior written
  * authorization.
- *
- *
- * Copyright 1988  X Consortium
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation.
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
- * OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name of the X Consortium shall not be
- * used in advertising or otherwise to promote the sale, use or other dealings
- * in this Software without prior written authorization from the X Consortium.
- *
  */
 /*
  * Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
Index: configure
--- xterm-399+/configure	2025-05-18 22:32:49.000000000 +0000
+++ xterm-400/configure	2025-06-13 23:36:11.000000000 +0000
@@ -12239,14 +12239,51 @@
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
 
-test -n "$verbose" && echo "	...before $LIBS" 1>&6
+cf_add_libs="$LIBS"
+test -n "$verbose" && echo "	...before $cf_add_libs" 1>&6
+
+echo "${as_me:-configure}:12245: testing ...before $cf_add_libs ..." 1>&5
+
+for cf_add_1lib in -lX11; do
+	# filter duplicates
+	cf_found_2lib=no
+	for cf_add_2lib in $cf_add_libs; do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
+			cf_found_2lib=yes
+			break
+		fi
+	done
+	# if not a duplicate, find the dependent library
+	if test "$cf_found_2lib" = no
+	then
+		cf_found_2lib=no
+		cf_add_2libs=
+		for cf_add_2lib in $cf_add_libs
+		do
+			test -n "$cf_add_2libs" && cf_add_2libs="$cf_add_2libs "
+			cf_add_2libs="$cf_add_2libs$cf_add_2lib"
+			if test "x$cf_add_2lib" = "x-lXt"
+			then
+				cf_found_2lib=yes
+				cf_add_2libs="$cf_add_2libs $cf_add_1lib"
+			fi
+		done
+		if test "$cf_found_2lib" = yes
+		then
+			cf_add_libs="$cf_add_2libs"
+		else
+			test -n "$verbose" && echo "	...missed -lXt" 1>&6
 
-echo "${as_me:-configure}:12244: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:12277: testing ...missed -lXt ..." 1>&5
+
+		fi
+	fi
+done
+test -n "$verbose" && echo "	...after  $cf_add_libs" 1>&6
 
-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}:12284: testing ...after  $cf_add_libs ..." 1>&5
 
-echo "${as_me:-configure}:12249: testing ...after  $LIBS ..." 1>&5
+LIBS="$cf_add_libs"
 
 fi
 
@@ -12254,14 +12291,14 @@
 		;;
 	esac
 
-echo "$as_me:12257: checking for usable X Toolkit package" >&5
+echo "$as_me:12294: 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 12264 "configure"
+#line 12301 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12277,16 +12314,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12280: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12317: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12283: \$? = $ac_status" >&5
+  echo "$as_me:12320: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12286: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12323: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12289: \$? = $ac_status" >&5
+  echo "$as_me:12326: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xt_ice_compat=yes
 else
@@ -12296,7 +12333,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:12299: result: $cf_cv_xt_ice_compat" >&5
+echo "$as_me:12336: result: $cf_cv_xt_ice_compat" >&5
 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
 
 	if test "$cf_cv_xt_ice_compat" = no
@@ -12310,22 +12347,22 @@
 			(*)
 				test -n "$verbose" && echo "	work around broken ICE dependency" 1>&6
 
-echo "${as_me:-configure}:12313: testing work around broken ICE dependency ..." 1>&5
+echo "${as_me:-configure}:12350: 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}:12318: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:12355: 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}:12324: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:12361: 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}:12328: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:12365: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 for cf_required in ice
 do
@@ -12458,17 +12495,17 @@
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then
 	test -n "$verbose" && echo "	found package sm" 1>&6
 
-echo "${as_me:-configure}:12461: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:12498: 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}:12467: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:12504: 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}:12471: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:12508: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 for cf_required in sm
 do
@@ -12609,14 +12646,51 @@
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
 
-test -n "$verbose" && echo "	...before $LIBS" 1>&6
+cf_add_libs="$LIBS"
+test -n "$verbose" && echo "	...before $cf_add_libs" 1>&6
 
-echo "${as_me:-configure}:12614: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:12652: testing ...before $cf_add_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
+for cf_add_1lib in $X_PRE_LIBS; do
+	# filter duplicates
+	cf_found_2lib=no
+	for cf_add_2lib in $cf_add_libs; do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
+			cf_found_2lib=yes
+			break
+		fi
+	done
+	# if not a duplicate, find the dependent library
+	if test "$cf_found_2lib" = no
+	then
+		cf_found_2lib=no
+		cf_add_2libs=
+		for cf_add_2lib in $cf_add_libs
+		do
+			test -n "$cf_add_2libs" && cf_add_2libs="$cf_add_2libs "
+			cf_add_2libs="$cf_add_2libs$cf_add_2lib"
+			if test "x$cf_add_2lib" = "x-lXt"
+			then
+				cf_found_2lib=yes
+				cf_add_2libs="$cf_add_2libs $cf_add_1lib"
+			fi
+		done
+		if test "$cf_found_2lib" = yes
+		then
+			cf_add_libs="$cf_add_2libs"
+		else
+			test -n "$verbose" && echo "	...missed -lXt" 1>&6
 
-echo "${as_me:-configure}:12619: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:12684: testing ...missed -lXt ..." 1>&5
+
+		fi
+	fi
+done
+test -n "$verbose" && echo "	...after  $cf_add_libs" 1>&6
+
+echo "${as_me:-configure}:12691: testing ...after  $cf_add_libs ..." 1>&5
+
+LIBS="$cf_add_libs"
 
 fi
 
@@ -12636,7 +12710,7 @@
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:12639: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:12713: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -12721,7 +12795,7 @@
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:12724: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:12798: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -12731,7 +12805,7 @@
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:12734: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:12808: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -12741,7 +12815,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}:12744: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:12818: 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"
@@ -12750,7 +12824,7 @@
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12753 "configure"
+#line 12827 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -12762,16 +12836,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12765: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12839: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12768: \$? = $ac_status" >&5
+  echo "$as_me:12842: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12771: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12845: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12774: \$? = $ac_status" >&5
+  echo "$as_me:12848: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -12779,12 +12853,12 @@
 cat "conftest.$ac_ext" >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:12782: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:12856: 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}:12787: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:12861: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_cflags"
@@ -12792,13 +12866,13 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
-	echo "$as_me:12795: checking for XOpenDisplay" >&5
+	echo "$as_me:12869: 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 12801 "configure"
+#line 12875 "configure"
 #include "confdefs.h"
 #define XOpenDisplay autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -12829,16 +12903,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12832: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12906: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12835: \$? = $ac_status" >&5
+  echo "$as_me:12909: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12838: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12912: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12841: \$? = $ac_status" >&5
+  echo "$as_me:12915: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_XOpenDisplay=yes
 else
@@ -12848,13 +12922,13 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:12851: result: $ac_cv_func_XOpenDisplay" >&5
+echo "$as_me:12925: 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:12857: checking for XOpenDisplay in -lX11" >&5
+	echo "$as_me:12931: 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
@@ -12862,7 +12936,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12865 "configure"
+#line 12939 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12881,16 +12955,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12884: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12958: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12887: \$? = $ac_status" >&5
+  echo "$as_me:12961: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12890: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12964: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12893: \$? = $ac_status" >&5
+  echo "$as_me:12967: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -12901,7 +12975,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12904: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:12978: 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
 
@@ -12925,13 +12999,13 @@
 
 fi
 
-	echo "$as_me:12928: checking for XtAppInitialize" >&5
+	echo "$as_me:13002: 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 12934 "configure"
+#line 13008 "configure"
 #include "confdefs.h"
 #define XtAppInitialize autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -12962,16 +13036,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12965: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13039: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12968: \$? = $ac_status" >&5
+  echo "$as_me:13042: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12971: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13045: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12974: \$? = $ac_status" >&5
+  echo "$as_me:13048: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_XtAppInitialize=yes
 else
@@ -12981,13 +13055,13 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:12984: result: $ac_cv_func_XtAppInitialize" >&5
+echo "$as_me:13058: 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:12990: checking for XtAppInitialize in -lXt" >&5
+	echo "$as_me:13064: 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
@@ -12995,7 +13069,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12998 "configure"
+#line 13072 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13014,16 +13088,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13017: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13091: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13020: \$? = $ac_status" >&5
+  echo "$as_me:13094: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13023: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13097: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13026: \$? = $ac_status" >&5
+  echo "$as_me:13100: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xt_XtAppInitialize=yes
 else
@@ -13034,7 +13108,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13037: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:13111: 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
 
@@ -13051,7 +13125,7 @@
 fi
 
 if test "$cf_have_X_LIBS" = no ; then
-	{ echo "$as_me:13054: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+	{ echo "$as_me:13128: 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
@@ -13070,23 +13144,23 @@
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:13073: checking for $ac_header" >&5
+echo "$as_me:13147: 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 13079 "configure"
+#line 13153 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:13083: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:13157: \"$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:13089: \$? = $ac_status" >&5
+  echo "$as_me:13163: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -13105,7 +13179,7 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:13108: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:13182: 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
@@ -13120,7 +13194,7 @@
 cf_save_cppflags="${CPPFLAGS}"
 cf_save_ldflags="${LDFLAGS}"
 
-echo "$as_me:13123: checking if you want to use the Xpm library for colored icon" >&5
+echo "$as_me:13197: 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.
@@ -13130,7 +13204,7 @@
 else
   cf_Xpm_library=yes
 fi;
-echo "$as_me:13133: result: $cf_Xpm_library" >&5
+echo "$as_me:13207: result: $cf_Xpm_library" >&5
 echo "${ECHO_T}$cf_Xpm_library" >&6
 
 if test "$cf_Xpm_library" != no ; then
@@ -13138,23 +13212,23 @@
 	CPPFLAGS="$CPPFLAGS -I$withval/include"
 	LDFLAGS="$LDFLAGS -L$withval/lib"
     fi
-    echo "$as_me:13141: checking for X11/xpm.h" >&5
+    echo "$as_me:13215: 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 13147 "configure"
+#line 13221 "configure"
 #include "confdefs.h"
 #include <X11/xpm.h>
 _ACEOF
-if { (eval echo "$as_me:13151: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:13225: \"$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:13157: \$? = $ac_status" >&5
+  echo "$as_me:13231: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -13173,11 +13247,11 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:13176: result: $ac_cv_header_X11_xpm_h" >&5
+echo "$as_me:13250: 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:13180: checking for XpmCreatePixmapFromData in -lXpm" >&5
+	echo "$as_me:13254: 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
@@ -13185,7 +13259,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXpm -lX11 $X_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13188 "configure"
+#line 13262 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13204,16 +13278,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13207: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13281: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13210: \$? = $ac_status" >&5
+  echo "$as_me:13284: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13213: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13287: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13216: \$? = $ac_status" >&5
+  echo "$as_me:13290: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xpm_XpmCreatePixmapFromData=yes
 else
@@ -13224,7 +13298,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13227: result: $ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&5
+echo "$as_me:13301: 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
 
@@ -13244,7 +13318,7 @@
 
 fi
 
-echo "$as_me:13247: checking if you want to use the Xinerama extension" >&5
+echo "$as_me:13321: 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.
@@ -13254,24 +13328,24 @@
 else
   cf_with_xinerama=yes
 fi;
-echo "$as_me:13257: result: $cf_with_xinerama" >&5
+echo "$as_me:13331: 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}:13264: testing found package xinerama ..." 1>&5
+echo "${as_me:-configure}:13338: 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}:13270: testing package xinerama CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:13344: 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}:13274: testing package xinerama LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:13348: testing package xinerama LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 for cf_required in xinerama
 do
@@ -13409,7 +13483,7 @@
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
 
-	echo "$as_me:13412: checking for XineramaQueryScreens in -lXinerama" >&5
+	echo "$as_me:13486: 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
@@ -13417,7 +13491,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXinerama  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13420 "configure"
+#line 13494 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13436,16 +13510,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13439: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13513: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13442: \$? = $ac_status" >&5
+  echo "$as_me:13516: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13445: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13519: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13448: \$? = $ac_status" >&5
+  echo "$as_me:13522: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xinerama_XineramaQueryScreens=yes
 else
@@ -13456,7 +13530,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13459: result: $ac_cv_lib_Xinerama_XineramaQueryScreens" >&5
+echo "$as_me:13533: 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
 
@@ -13481,23 +13555,23 @@
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:13484: checking for $ac_header" >&5
+echo "$as_me:13558: 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 13490 "configure"
+#line 13564 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:13494: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:13568: \"$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:13500: \$? = $ac_status" >&5
+  echo "$as_me:13574: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -13516,7 +13590,7 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:13519: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:13593: 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
@@ -13534,7 +13608,7 @@
 
 cf_x_athena=${cf_x_athena:-Xaw}
 
-echo "$as_me:13537: checking if you want to link with Xaw 3d library" >&5
+echo "$as_me:13611: 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=
 
@@ -13545,14 +13619,14 @@
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3d
-	echo "$as_me:13548: result: yes" >&5
+	echo "$as_me:13622: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:13551: result: no" >&5
+	echo "$as_me:13625: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:13555: checking if you want to link with Xaw 3d xft library" >&5
+echo "$as_me:13629: 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=
 
@@ -13563,14 +13637,14 @@
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3dxft
-	echo "$as_me:13566: result: yes" >&5
+	echo "$as_me:13640: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:13569: result: no" >&5
+	echo "$as_me:13643: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:13573: checking if you want to link with neXT Athena library" >&5
+echo "$as_me:13647: 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=
 
@@ -13581,14 +13655,14 @@
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=neXtaw
-	echo "$as_me:13584: result: yes" >&5
+	echo "$as_me:13658: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:13587: result: no" >&5
+	echo "$as_me:13661: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:13591: checking if you want to link with Athena-Plus library" >&5
+echo "$as_me:13665: 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=
 
@@ -13599,10 +13673,10 @@
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=XawPlus
-	echo "$as_me:13602: result: yes" >&5
+	echo "$as_me:13676: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:13605: result: no" >&5
+	echo "$as_me:13679: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -13622,17 +13696,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}:13625: testing found package $cf_athena_pkg ..." 1>&5
+echo "${as_me:-configure}:13699: 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}:13631: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:13705: 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}:13635: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:13709: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 for cf_required in $cf_athena_pkg
 do
@@ -13770,27 +13844,14 @@
 #define $cf_x_athena_LIBS 1
 EOF
 
-	for cf_trim_lib in Xmu Xt X11
-	do
-		case "$LIBS" in
-		(*-l$cf_trim_lib\ *-l$cf_trim_lib*)
-			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}:13780: testing ..trimmed $LIBS ..." 1>&5
-
-			;;
-		esac
-	done
-
-echo "$as_me:13786: checking for usable $cf_x_athena/Xmu package" >&5
+echo "$as_me:13847: 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 13793 "configure"
+#line 13854 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -13808,16 +13869,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13811: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13872: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13814: \$? = $ac_status" >&5
+  echo "$as_me:13875: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13817: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13878: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13820: \$? = $ac_status" >&5
+  echo "$as_me:13881: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xaw_compat=yes
 else
@@ -13827,7 +13888,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:13830: result: $cf_cv_xaw_compat" >&5
+echo "$as_me:13891: result: $cf_cv_xaw_compat" >&5
 echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 
 			if test "$cf_cv_xaw_compat" = no
@@ -13839,7 +13900,7 @@
 				(*)
 					test -n "$verbose" && echo "	work around broken package" 1>&6
 
-echo "${as_me:-configure}:13842: testing work around broken package ..." 1>&5
+echo "${as_me:-configure}:13903: testing work around broken package ..." 1>&5
 
 					cf_save_xmu="$LIBS"
 					cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^  *//' -e 's/ .*//'`
@@ -13847,17 +13908,17 @@
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xmu"; then
 	test -n "$verbose" && echo "	found package xmu" 1>&6
 
-echo "${as_me:-configure}:13850: testing found package xmu ..." 1>&5
+echo "${as_me:-configure}:13911: 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}:13856: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:13917: 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}:13860: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:13921: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 for cf_required in xmu
 do
@@ -13989,42 +14050,103 @@
 
 							LIBS="$cf_save_xmu"
 
-test -n "$verbose" && echo "	...before $LIBS" 1>&6
+cf_add_libs="$LIBS"
+test -n "$verbose" && echo "	...before $cf_add_libs" 1>&6
 
-echo "${as_me:-configure}:13994: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:14056: testing ...before $cf_add_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
+for cf_add_1lib in $cf_pkgconfig_libs; do
+	# filter duplicates
+	cf_found_2lib=no
+	for cf_add_2lib in $cf_add_libs; do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
+			cf_found_2lib=yes
+			break
+		fi
+	done
+	# if not a duplicate, find the dependent library
+	if test "$cf_found_2lib" = no
+	then
+		cf_found_2lib=no
+		cf_add_2libs=
+		for cf_add_2lib in $cf_add_libs
+		do
+			test -n "$cf_add_2libs" && cf_add_2libs="$cf_add_2libs "
+			cf_add_2libs="$cf_add_2libs$cf_add_2lib"
+			if test "x$cf_add_2lib" = "x$cf_first_lib"
+			then
+				cf_found_2lib=yes
+				cf_add_2libs="$cf_add_2libs $cf_add_1lib"
+			fi
+		done
+		if test "$cf_found_2lib" = yes
+		then
+			cf_add_libs="$cf_add_2libs"
+		else
+			test -n "$verbose" && echo "	...missed $cf_first_lib" 1>&6
+
+echo "${as_me:-configure}:14088: testing ...missed $cf_first_lib ..." 1>&5
+
+		fi
+	fi
+done
+test -n "$verbose" && echo "	...after  $cf_add_libs" 1>&6
 
-echo "${as_me:-configure}:13999: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:14095: testing ...after  $cf_add_libs ..." 1>&5
+
+LIBS="$cf_add_libs"
 
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
 
-test -n "$verbose" && echo "	...before $LIBS" 1>&6
+cf_add_libs="$LIBS"
+test -n "$verbose" && echo "	...before $cf_add_libs" 1>&6
 
-echo "${as_me:-configure}:14007: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:14106: testing ...before $cf_add_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
+for cf_add_1lib in -lXmu; do
+	# filter duplicates
+	cf_found_2lib=no
+	for cf_add_2lib in $cf_add_libs; do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
+			cf_found_2lib=yes
+			break
+		fi
+	done
+	# if not a duplicate, find the dependent library
+	if test "$cf_found_2lib" = no
+	then
+		cf_found_2lib=no
+		cf_add_2libs=
+		for cf_add_2lib in $cf_add_libs
+		do
+			test -n "$cf_add_2libs" && cf_add_2libs="$cf_add_2libs "
+			cf_add_2libs="$cf_add_2libs$cf_add_2lib"
+			if test "x$cf_add_2lib" = "x$cf_first_lib"
+			then
+				cf_found_2lib=yes
+				cf_add_2libs="$cf_add_2libs $cf_add_1lib"
+			fi
+		done
+		if test "$cf_found_2lib" = yes
+		then
+			cf_add_libs="$cf_add_2libs"
+		else
+			test -n "$verbose" && echo "	...missed $cf_first_lib" 1>&6
 
-echo "${as_me:-configure}:14012: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:14138: testing ...missed $cf_first_lib ..." 1>&5
 
-fi
+		fi
+	fi
+done
+test -n "$verbose" && echo "	...after  $cf_add_libs" 1>&6
 
-	for cf_trim_lib in Xmu Xt X11
-	do
-		case "$LIBS" in
-		(*-l$cf_trim_lib\ *-l$cf_trim_lib*)
-			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}:14145: testing ...after  $cf_add_libs ..." 1>&5
 
-echo "${as_me:-configure}:14023: testing ..trimmed $LIBS ..." 1>&5
+LIBS="$cf_add_libs"
 
-			;;
-		esac
-	done
+fi
 
 					;;
 				esac
@@ -14045,17 +14167,17 @@
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "Xext"; then
 	test -n "$verbose" && echo "	found package Xext" 1>&6
 
-echo "${as_me:-configure}:14048: testing found package Xext ..." 1>&5
+echo "${as_me:-configure}:14170: 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}:14054: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14176: 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}:14058: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14180: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 for cf_required in Xext
 do
@@ -14190,7 +14312,7 @@
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
 
-	echo "$as_me:14193: checking for XextCreateExtension in -lXext" >&5
+	echo "$as_me:14315: 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
@@ -14198,7 +14320,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14201 "configure"
+#line 14323 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14217,16 +14339,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14220: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14342: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14223: \$? = $ac_status" >&5
+  echo "$as_me:14345: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14226: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14348: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14229: \$? = $ac_status" >&5
+  echo "$as_me:14351: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
@@ -14237,7 +14359,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14240: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:14362: 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
 
@@ -14273,17 +14395,17 @@
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then
 	test -n "$verbose" && echo "	found package x11" 1>&6
 
-echo "${as_me:-configure}:14276: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:14398: 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}:14282: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14404: 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}:14286: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14408: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 for cf_required in x11
 do
@@ -14417,24 +14539,24 @@
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:14420: WARNING: unable to find X11 library" >&5
+	{ echo "$as_me:14542: 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}:14427: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:14549: 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}:14433: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14555: 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}:14437: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14559: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 for cf_required in ice
 do
@@ -14568,24 +14690,24 @@
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:14571: WARNING: unable to find ICE library" >&5
+	{ echo "$as_me:14693: 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}:14578: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:14700: 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}:14584: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14706: 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}:14588: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14710: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 for cf_required in sm
 do
@@ -14719,24 +14841,24 @@
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:14722: WARNING: unable to find SM library" >&5
+	{ echo "$as_me:14844: 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}:14729: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:14851: 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}:14735: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14857: 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}:14739: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14861: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 for cf_required in xt
 do
@@ -14870,7 +14992,7 @@
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:14873: WARNING: unable to find Xt library" >&5
+	{ echo "$as_me:14995: WARNING: unable to find Xt library" >&5
 echo "$as_me: WARNING: unable to find Xt library" >&2;}
 fi
 
@@ -14883,17 +15005,17 @@
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then
 	test -n "$verbose" && echo "	found package xt" 1>&6
 
-echo "${as_me:-configure}:14886: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:15008: 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}:14892: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:15014: 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}:14896: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:15018: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 for cf_required in xt
 do
@@ -15028,14 +15150,14 @@
 		;;
 	(*)
 # we have an "xt" package, but it may omit Xt's dependency on X11
-echo "$as_me:15031: checking for usable X dependency" >&5
+echo "$as_me:15153: 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 15038 "configure"
+#line 15160 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -15055,16 +15177,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15058: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15180: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15061: \$? = $ac_status" >&5
+  echo "$as_me:15183: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15064: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15186: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15067: \$? = $ac_status" >&5
+  echo "$as_me:15189: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xt_x11_compat=yes
 else
@@ -15074,30 +15196,30 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15077: result: $cf_cv_xt_x11_compat" >&5
+echo "$as_me:15199: 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}:15083: testing work around broken X11 dependency ..." 1>&5
+echo "${as_me:-configure}:15205: 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}:15090: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:15212: 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}:15096: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:15218: 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}:15100: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:15222: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 for cf_required in x11
 do
@@ -15232,14 +15354,51 @@
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
 
-test -n "$verbose" && echo "	...before $LIBS" 1>&6
+cf_add_libs="$LIBS"
+test -n "$verbose" && echo "	...before $cf_add_libs" 1>&6
+
+echo "${as_me:-configure}:15360: testing ...before $cf_add_libs ..." 1>&5
+
+for cf_add_1lib in -lX11; do
+	# filter duplicates
+	cf_found_2lib=no
+	for cf_add_2lib in $cf_add_libs; do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
+			cf_found_2lib=yes
+			break
+		fi
+	done
+	# if not a duplicate, find the dependent library
+	if test "$cf_found_2lib" = no
+	then
+		cf_found_2lib=no
+		cf_add_2libs=
+		for cf_add_2lib in $cf_add_libs
+		do
+			test -n "$cf_add_2libs" && cf_add_2libs="$cf_add_2libs "
+			cf_add_2libs="$cf_add_2libs$cf_add_2lib"
+			if test "x$cf_add_2lib" = "x-lXt"
+			then
+				cf_found_2lib=yes
+				cf_add_2libs="$cf_add_2libs $cf_add_1lib"
+			fi
+		done
+		if test "$cf_found_2lib" = yes
+		then
+			cf_add_libs="$cf_add_2libs"
+		else
+			test -n "$verbose" && echo "	...missed -lXt" 1>&6
 
-echo "${as_me:-configure}:15237: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:15392: testing ...missed -lXt ..." 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
+		fi
+	fi
+done
+test -n "$verbose" && echo "	...after  $cf_add_libs" 1>&6
 
-echo "${as_me:-configure}:15242: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:15399: testing ...after  $cf_add_libs ..." 1>&5
+
+LIBS="$cf_add_libs"
 
 fi
 
@@ -15247,14 +15406,14 @@
 		;;
 	esac
 
-echo "$as_me:15250: checking for usable X Toolkit package" >&5
+echo "$as_me:15409: 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 15257 "configure"
+#line 15416 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -15270,16 +15429,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15273: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15432: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15276: \$? = $ac_status" >&5
+  echo "$as_me:15435: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15279: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15438: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15282: \$? = $ac_status" >&5
+  echo "$as_me:15441: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xt_ice_compat=yes
 else
@@ -15289,7 +15448,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15292: result: $cf_cv_xt_ice_compat" >&5
+echo "$as_me:15451: result: $cf_cv_xt_ice_compat" >&5
 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
 
 	if test "$cf_cv_xt_ice_compat" = no
@@ -15303,22 +15462,22 @@
 			(*)
 				test -n "$verbose" && echo "	work around broken ICE dependency" 1>&6
 
-echo "${as_me:-configure}:15306: testing work around broken ICE dependency ..." 1>&5
+echo "${as_me:-configure}:15465: 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}:15311: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:15470: 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}:15317: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:15476: 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}:15321: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:15480: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 for cf_required in ice
 do
@@ -15451,17 +15610,17 @@
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then
 	test -n "$verbose" && echo "	found package sm" 1>&6
 
-echo "${as_me:-configure}:15454: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:15613: 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}:15460: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:15619: 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}:15464: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:15623: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 for cf_required in sm
 do
@@ -15602,14 +15761,51 @@
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
 
-test -n "$verbose" && echo "	...before $LIBS" 1>&6
+cf_add_libs="$LIBS"
+test -n "$verbose" && echo "	...before $cf_add_libs" 1>&6
 
-echo "${as_me:-configure}:15607: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:15767: testing ...before $cf_add_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
+for cf_add_1lib in $X_PRE_LIBS; do
+	# filter duplicates
+	cf_found_2lib=no
+	for cf_add_2lib in $cf_add_libs; do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
+			cf_found_2lib=yes
+			break
+		fi
+	done
+	# if not a duplicate, find the dependent library
+	if test "$cf_found_2lib" = no
+	then
+		cf_found_2lib=no
+		cf_add_2libs=
+		for cf_add_2lib in $cf_add_libs
+		do
+			test -n "$cf_add_2libs" && cf_add_2libs="$cf_add_2libs "
+			cf_add_2libs="$cf_add_2libs$cf_add_2lib"
+			if test "x$cf_add_2lib" = "x-lXt"
+			then
+				cf_found_2lib=yes
+				cf_add_2libs="$cf_add_2libs $cf_add_1lib"
+			fi
+		done
+		if test "$cf_found_2lib" = yes
+		then
+			cf_add_libs="$cf_add_2libs"
+		else
+			test -n "$verbose" && echo "	...missed -lXt" 1>&6
 
-echo "${as_me:-configure}:15612: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:15799: testing ...missed -lXt ..." 1>&5
+
+		fi
+	fi
+done
+test -n "$verbose" && echo "	...after  $cf_add_libs" 1>&6
+
+echo "${as_me:-configure}:15806: testing ...after  $cf_add_libs ..." 1>&5
+
+LIBS="$cf_add_libs"
 
 fi
 
@@ -15629,7 +15825,7 @@
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:15632: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:15828: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -15714,7 +15910,7 @@
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:15717: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:15913: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -15724,7 +15920,7 @@
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:15727: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:15923: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -15734,7 +15930,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}:15737: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:15933: 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"
@@ -15743,7 +15939,7 @@
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15746 "configure"
+#line 15942 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -15755,16 +15951,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15758: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15954: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15761: \$? = $ac_status" >&5
+  echo "$as_me:15957: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15764: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15960: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15767: \$? = $ac_status" >&5
+  echo "$as_me:15963: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -15772,12 +15968,12 @@
 cat "conftest.$ac_ext" >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:15775: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:15971: 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}:15780: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:15976: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_cflags"
@@ -15785,13 +15981,13 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
-	echo "$as_me:15788: checking for XOpenDisplay" >&5
+	echo "$as_me:15984: 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 15794 "configure"
+#line 15990 "configure"
 #include "confdefs.h"
 #define XOpenDisplay autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15822,16 +16018,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15825: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16021: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15828: \$? = $ac_status" >&5
+  echo "$as_me:16024: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15831: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16027: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15834: \$? = $ac_status" >&5
+  echo "$as_me:16030: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_XOpenDisplay=yes
 else
@@ -15841,13 +16037,13 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15844: result: $ac_cv_func_XOpenDisplay" >&5
+echo "$as_me:16040: 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:15850: checking for XOpenDisplay in -lX11" >&5
+	echo "$as_me:16046: 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
@@ -15855,7 +16051,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15858 "configure"
+#line 16054 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15874,16 +16070,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15877: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16073: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15880: \$? = $ac_status" >&5
+  echo "$as_me:16076: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15883: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16079: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15886: \$? = $ac_status" >&5
+  echo "$as_me:16082: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -15894,7 +16090,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15897: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:16093: 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
 
@@ -15918,13 +16114,13 @@
 
 fi
 
-	echo "$as_me:15921: checking for XtAppInitialize" >&5
+	echo "$as_me:16117: 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 15927 "configure"
+#line 16123 "configure"
 #include "confdefs.h"
 #define XtAppInitialize autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15955,16 +16151,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15958: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16154: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15961: \$? = $ac_status" >&5
+  echo "$as_me:16157: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15964: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16160: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15967: \$? = $ac_status" >&5
+  echo "$as_me:16163: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_XtAppInitialize=yes
 else
@@ -15974,13 +16170,13 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15977: result: $ac_cv_func_XtAppInitialize" >&5
+echo "$as_me:16173: 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:15983: checking for XtAppInitialize in -lXt" >&5
+	echo "$as_me:16179: 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
@@ -15988,7 +16184,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15991 "configure"
+#line 16187 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16007,16 +16203,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16010: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16206: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16013: \$? = $ac_status" >&5
+  echo "$as_me:16209: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16016: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16212: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16019: \$? = $ac_status" >&5
+  echo "$as_me:16215: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xt_XtAppInitialize=yes
 else
@@ -16027,7 +16223,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16030: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:16226: 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
 
@@ -16044,7 +16240,7 @@
 fi
 
 if test "$cf_have_X_LIBS" = no ; then
-	{ echo "$as_me:16047: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+	{ echo "$as_me:16243: 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
@@ -16085,14 +16281,14 @@
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}-I$cf_path/include"
 
-			echo "$as_me:16088: checking for $cf_test in $cf_path" >&5
+			echo "$as_me:16284: 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:16091: checking for $cf_test" >&5
+			echo "$as_me:16287: checking for $cf_test" >&5
 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
 		fi
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 16095 "configure"
+#line 16291 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -16106,16 +16302,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16109: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16305: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16112: \$? = $ac_status" >&5
+  echo "$as_me:16308: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16115: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16311: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16118: \$? = $ac_status" >&5
+  echo "$as_me:16314: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -16124,7 +16320,7 @@
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-		echo "$as_me:16127: result: $cf_result" >&5
+		echo "$as_me:16323: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 LIBS="$cf_save_LIBS_CF_X_ATHENA_CPPFLAGS"
@@ -16140,7 +16336,7 @@
 done
 
 if test -z "$cf_x_athena_inc" ; then
-	{ echo "$as_me:16143: WARNING: Unable to find Athena header files" >&5
+	{ echo "$as_me:16339: 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
 
@@ -16205,10 +16401,10 @@
 done
 LIBS="$cf_add_libs"
 
-		echo "$as_me:16208: checking for $cf_test in $cf_libs" >&5
+		echo "$as_me:16404: 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 16211 "configure"
+#line 16407 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -16225,16 +16421,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16228: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16424: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16231: \$? = $ac_status" >&5
+  echo "$as_me:16427: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16234: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16430: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16237: \$? = $ac_status" >&5
+  echo "$as_me:16433: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -16243,7 +16439,7 @@
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:16246: result: $cf_result" >&5
+		echo "$as_me:16442: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 LIBS="$cf_save_LIBS_CF_X_ATHENA_LIBS"
@@ -16260,7 +16456,7 @@
 done
 
 if test -z "$cf_x_athena_lib" ; then
-	{ { echo "$as_me:16263: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+	{ { echo "$as_me:16459: 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
@@ -16292,23 +16488,23 @@
 for ac_header in X11/Xpoll.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:16295: checking for $ac_header" >&5
+echo "$as_me:16491: 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 16301 "configure"
+#line 16497 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:16305: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:16501: \"$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:16311: \$? = $ac_status" >&5
+  echo "$as_me:16507: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -16327,7 +16523,7 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:16330: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:16526: 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
@@ -16337,16 +16533,16 @@
 fi
 done
 
-echo "$as_me:16340: checking for declaration of fd_set" >&5
+echo "$as_me:16536: 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}:16346: testing sys/types alone ..." 1>&5
+echo "${as_me:-configure}:16542: testing sys/types alone ..." 1>&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16349 "configure"
+#line 16545 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -16359,26 +16555,26 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16362: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16558: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16365: \$? = $ac_status" >&5
+  echo "$as_me:16561: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16368: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16564: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16371: \$? = $ac_status" >&5
+  echo "$as_me:16567: \$? = $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}:16378: testing X11/Xpoll.h ..." 1>&5
+echo "${as_me:-configure}:16574: testing X11/Xpoll.h ..." 1>&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16381 "configure"
+#line 16577 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_X11_XPOLL_H
@@ -16393,26 +16589,26 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16396: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16592: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16399: \$? = $ac_status" >&5
+  echo "$as_me:16595: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16402: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16598: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16405: \$? = $ac_status" >&5
+  echo "$as_me:16601: \$? = $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}:16412: testing sys/select.h ..." 1>&5
+echo "${as_me:-configure}:16608: testing sys/select.h ..." 1>&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16415 "configure"
+#line 16611 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -16426,16 +16622,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16429: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16625: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16432: \$? = $ac_status" >&5
+  echo "$as_me:16628: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16435: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16631: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16438: \$? = $ac_status" >&5
+  echo "$as_me:16634: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_type_fd_set=sys/select.h
 else
@@ -16449,7 +16645,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:16452: result: $cf_cv_type_fd_set" >&5
+echo "$as_me:16648: 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
 
@@ -16459,7 +16655,7 @@
 
 fi
 
-echo "$as_me:16462: checking for declaration of fd_mask" >&5
+echo "$as_me:16658: 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
@@ -16467,7 +16663,7 @@
 
     if test x$cf_cv_type_fd_set = xX11/Xpoll.h ; then
         cat >"conftest.$ac_ext" <<_ACEOF
-#line 16470 "configure"
+#line 16666 "configure"
 #include "confdefs.h"
 
 #include <X11/Xpoll.h>
@@ -16480,27 +16676,27 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16483: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16679: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16486: \$? = $ac_status" >&5
+  echo "$as_me:16682: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16489: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16685: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16492: \$? = $ac_status" >&5
+  echo "$as_me:16688: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-echo "${as_me:-configure}:16499: testing if we must define CSRG_BASED ..." 1>&5
+echo "${as_me:-configure}:16695: 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 16503 "configure"
+#line 16699 "configure"
 #include "confdefs.h"
 
 #define CSRG_BASED
@@ -16514,16 +16710,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16517: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16713: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16520: \$? = $ac_status" >&5
+  echo "$as_me:16716: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16523: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16719: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16526: \$? = $ac_status" >&5
+  echo "$as_me:16722: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_type_fd_mask=CSRG_BASED
 else
@@ -16538,7 +16734,7 @@
     fi
 
 fi
-echo "$as_me:16541: result: $cf_cv_type_fd_mask" >&5
+echo "$as_me:16737: 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
 
@@ -16548,14 +16744,14 @@
 
 fi
 
-echo "$as_me:16551: checking for IRIX 6.5 baud-rate redefinitions" >&5
+echo "$as_me:16747: 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 16558 "configure"
+#line 16754 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -16574,16 +16770,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16577: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16773: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16580: \$? = $ac_status" >&5
+  echo "$as_me:16776: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16583: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16779: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16586: \$? = $ac_status" >&5
+  echo "$as_me:16782: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_termio_c_ispeed=yes
 
@@ -16595,21 +16791,21 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16598: result: $cf_cv_termio_c_ispeed" >&5
+echo "$as_me:16794: 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:16605: checking for termios type tcflag_t" >&5
+echo "$as_me:16801: 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 16612 "configure"
+#line 16808 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -16622,16 +16818,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16625: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16821: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16628: \$? = $ac_status" >&5
+  echo "$as_me:16824: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16631: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16827: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16634: \$? = $ac_status" >&5
+  echo "$as_me:16830: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_havetype_tcflag_t=yes
 else
@@ -16642,21 +16838,21 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16645: result: $cf_cv_havetype_tcflag_t" >&5
+echo "$as_me:16841: 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:16652: checking for termios type speed_t" >&5
+echo "$as_me:16848: 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 16659 "configure"
+#line 16855 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -16669,16 +16865,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16672: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16868: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16675: \$? = $ac_status" >&5
+  echo "$as_me:16871: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16678: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16874: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16681: \$? = $ac_status" >&5
+  echo "$as_me:16877: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_havetype_speed_t=yes
 else
@@ -16689,21 +16885,21 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16692: result: $cf_cv_havetype_speed_t" >&5
+echo "$as_me:16888: 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:16699: checking for termios type cc_t" >&5
+echo "$as_me:16895: 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 16706 "configure"
+#line 16902 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -16716,16 +16912,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16719: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16915: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16722: \$? = $ac_status" >&5
+  echo "$as_me:16918: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16725: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16921: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16728: \$? = $ac_status" >&5
+  echo "$as_me:16924: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_havetype_cc_t=yes
 else
@@ -16736,7 +16932,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:16739: result: $cf_cv_havetype_cc_t" >&5
+echo "$as_me:16935: 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
@@ -16748,7 +16944,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:16751: checking if we expect to use the Xcursor library" >&5
+echo "$as_me:16947: 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.
@@ -16765,7 +16961,7 @@
 	enable_xcursor=yes
 
 fi;
-echo "$as_me:16768: result: $enable_xcursor" >&5
+echo "$as_me:16964: result: $enable_xcursor" >&5
 echo "${ECHO_T}$enable_xcursor" >&6
 if test "$enable_xcursor" = yes; then
 
@@ -16782,23 +16978,23 @@
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:16785: checking for $ac_header" >&5
+echo "$as_me:16981: 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 16791 "configure"
+#line 16987 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:16795: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:16991: \"$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:16801: \$? = $ac_status" >&5
+  echo "$as_me:16997: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -16817,7 +17013,7 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:16820: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:17016: 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
@@ -16847,13 +17043,13 @@
 for ac_func in $cf_func_grantpt
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:16850: checking for $ac_func" >&5
+echo "$as_me:17046: 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 16856 "configure"
+#line 17052 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -16884,16 +17080,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16887: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17083: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16890: \$? = $ac_status" >&5
+  echo "$as_me:17086: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16893: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17089: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16896: \$? = $ac_status" >&5
+  echo "$as_me:17092: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -16903,7 +17099,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16906: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:17102: 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
@@ -16915,10 +17111,10 @@
 
 cf_grantpt_opts=
 if test "x$ac_cv_func_grantpt" = "xyes" ; then
-	echo "$as_me:16918: checking if grantpt really works" >&5
+	echo "$as_me:17114: checking if grantpt really works" >&5
 echo $ECHO_N "checking if grantpt really works... $ECHO_C" >&6
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 16921 "configure"
+#line 17117 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -17018,23 +17214,23 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17021: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17217: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17024: \$? = $ac_status" >&5
+  echo "$as_me:17220: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17027: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17223: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17030: \$? = $ac_status" >&5
+  echo "$as_me:17226: \$? = $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 17037 "configure"
+#line 17233 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -17132,15 +17328,15 @@
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:17135: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17331: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17138: \$? = $ac_status" >&5
+  echo "$as_me:17334: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:17140: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17336: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17143: \$? = $ac_status" >&5
+  echo "$as_me:17339: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -17159,13 +17355,13 @@
 ac_cv_func_grantpt=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-	echo "$as_me:17162: result: $ac_cv_func_grantpt" >&5
+	echo "$as_me:17358: 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:17168: checking for pty features" >&5
+			echo "$as_me:17364: 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
@@ -17181,15 +17377,15 @@
 				cf_pty_feature=
 				cf_pty_next="`expr $cf_pty_this + 1`"
 
-echo "${as_me:-configure}:17184: testing pty feature test $cf_pty_next:5 ..." 1>&5
+echo "${as_me:-configure}:17380: testing pty feature test $cf_pty_next:5 ..." 1>&5
 
 				if test "$cross_compiling" = yes; then
-  { { echo "$as_me:17187: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:17383: 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 17192 "configure"
+#line 17388 "configure"
 #include "confdefs.h"
 #define CONFTEST $cf_pty_this
 $cf_pty_defines
@@ -17289,15 +17485,15 @@
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:17292: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17488: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17295: \$? = $ac_status" >&5
+  echo "$as_me:17491: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:17297: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17493: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17300: \$? = $ac_status" >&5
+  echo "$as_me:17496: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 				case $cf_pty_next in
@@ -17329,7 +17525,7 @@
 				case $cf_pty_next in
 				(1|2|3)
 
-echo "${as_me:-configure}:17332: testing skipping remaining streams features $cf_pty_this..2 ..." 1>&5
+echo "${as_me:-configure}:17528: testing skipping remaining streams features $cf_pty_this..2 ..." 1>&5
 
 					cf_pty_next=3
 					;;
@@ -17348,7 +17544,7 @@
 
 				cf_pty_this=$cf_pty_next
 			done
-			echo "$as_me:17351: result: $cf_grantpt_opts" >&5
+			echo "$as_me:17547: result: $cf_grantpt_opts" >&5
 echo "${ECHO_T}$cf_grantpt_opts" >&6
 			cf_grantpt_opts=`echo "$cf_grantpt_opts" | sed -e 's/ isatty//'`
 		fi
@@ -17358,10 +17554,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}:17361: testing prefer posix_openpt over openpty ..." 1>&5
+echo "${as_me:-configure}:17557: testing prefer posix_openpt over openpty ..." 1>&5
 
 elif test "x$disable_openpty" != "xyes" || test -z "$cf_grantpt_opts" ; then
-	echo "$as_me:17364: checking for openpty in -lutil" >&5
+	echo "$as_me:17560: 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
@@ -17369,7 +17565,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17372 "configure"
+#line 17568 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17388,16 +17584,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17391: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17587: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17394: \$? = $ac_status" >&5
+  echo "$as_me:17590: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17397: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17593: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17400: \$? = $ac_status" >&5
+  echo "$as_me:17596: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_util_openpty=yes
 else
@@ -17408,7 +17604,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17411: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:17607: 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
@@ -17431,23 +17627,23 @@
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:17434: checking for $ac_header" >&5
+echo "$as_me:17630: 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 17440 "configure"
+#line 17636 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:17444: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:17640: \"$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:17450: \$? = $ac_status" >&5
+  echo "$as_me:17646: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -17466,7 +17662,7 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:17469: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:17665: 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
@@ -17483,7 +17679,7 @@
 then
 	test -n "$verbose" && echo "	will rely upon grantpt" 1>&6
 
-echo "${as_me:-configure}:17486: testing will rely upon grantpt ..." 1>&5
+echo "${as_me:-configure}:17682: testing will rely upon grantpt ..." 1>&5
 
 cat >>confdefs.h <<\EOF
 #define HAVE_WORKING_GRANTPT 1
@@ -17504,23 +17700,23 @@
 then
 	test -n "$verbose" && echo "	will rely upon BSD-pseudoterminals" 1>&6
 
-echo "${as_me:-configure}:17507: testing will rely upon BSD-pseudoterminals ..." 1>&5
+echo "${as_me:-configure}:17703: testing will rely upon BSD-pseudoterminals ..." 1>&5
 
 else
 	test -n "$verbose" && echo "	will rely upon openpty" 1>&6
 
-echo "${as_me:-configure}:17512: testing will rely upon openpty ..." 1>&5
+echo "${as_me:-configure}:17708: testing will rely upon openpty ..." 1>&5
 
 fi
 
-echo "$as_me:17516: checking if we can use XkbQueryExtension" >&5
+echo "$as_me:17712: 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 17523 "configure"
+#line 17719 "configure"
 #include "confdefs.h"
 
 #include <X11/Xlib.h>
@@ -17549,16 +17745,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17552: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17748: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17555: \$? = $ac_status" >&5
+  echo "$as_me:17751: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17558: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17754: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17561: \$? = $ac_status" >&5
+  echo "$as_me:17757: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 cf_cv_xkb_query_extension=yes
@@ -17573,7 +17769,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17576: result: $cf_cv_xkb_query_extension" >&5
+echo "$as_me:17772: result: $cf_cv_xkb_query_extension" >&5
 echo "${ECHO_T}$cf_cv_xkb_query_extension" >&6
 
 if test $cf_cv_xkb_query_extension = yes
@@ -17582,13 +17778,13 @@
 for ac_func in XkbQueryExtension
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:17585: checking for $ac_func" >&5
+echo "$as_me:17781: 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 17591 "configure"
+#line 17787 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -17619,16 +17815,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17622: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17818: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17625: \$? = $ac_status" >&5
+  echo "$as_me:17821: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17628: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17824: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17631: \$? = $ac_status" >&5
+  echo "$as_me:17827: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -17638,7 +17834,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:17641: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:17837: 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
@@ -17650,14 +17846,14 @@
 
 fi
 
-echo "$as_me:17653: checking if we can use XkbKeycodeToKeysym" >&5
+echo "$as_me:17849: 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 17660 "configure"
+#line 17856 "configure"
 #include "confdefs.h"
 
 #include <X11/Xlib.h>
@@ -17675,16 +17871,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17678: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17874: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17681: \$? = $ac_status" >&5
+  echo "$as_me:17877: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17684: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17880: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17687: \$? = $ac_status" >&5
+  echo "$as_me:17883: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 cf_cv_xkb_keycode_to_keysym=yes
@@ -17699,7 +17895,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17702: result: $cf_cv_xkb_keycode_to_keysym" >&5
+echo "$as_me:17898: 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
@@ -17708,13 +17904,13 @@
 for ac_func in XkbKeycodeToKeysym
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:17711: checking for $ac_func" >&5
+echo "$as_me:17907: 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 17717 "configure"
+#line 17913 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -17745,16 +17941,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17748: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17944: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17751: \$? = $ac_status" >&5
+  echo "$as_me:17947: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17754: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17950: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17757: \$? = $ac_status" >&5
+  echo "$as_me:17953: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -17764,7 +17960,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:17767: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:17963: 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
@@ -17792,14 +17988,14 @@
 	esac
 done
 
-echo "$as_me:17795: checking for XKB Bell extension" >&5
+echo "$as_me:17991: 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 17802 "configure"
+#line 17998 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -17820,16 +18016,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17823: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18019: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17826: \$? = $ac_status" >&5
+  echo "$as_me:18022: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17829: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18025: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17832: \$? = $ac_status" >&5
+  echo "$as_me:18028: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xkb_bell_ext=yes
 else
@@ -17840,7 +18036,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:17843: result: $cf_cv_xkb_bell_ext" >&5
+echo "$as_me:18039: 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
@@ -17854,13 +18050,13 @@
 for ac_func in Xutf8LookupString
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:17857: checking for $ac_func" >&5
+echo "$as_me:18053: 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 17863 "configure"
+#line 18059 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -17891,16 +18087,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17894: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18090: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17897: \$? = $ac_status" >&5
+  echo "$as_me:18093: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17900: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18096: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17903: \$? = $ac_status" >&5
+  echo "$as_me:18099: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -17910,7 +18106,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:17913: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:18109: 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
@@ -17926,7 +18122,7 @@
 fi
 done
 
-echo "$as_me:17929: checking if you want narrow prototypes for X libraries" >&5
+echo "$as_me:18125: 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
@@ -17952,10 +18148,10 @@
 	enable_narrowproto=$cf_default_narrowproto
 
 fi;
-echo "$as_me:17955: result: $enable_narrowproto" >&5
+echo "$as_me:18151: result: $enable_narrowproto" >&5
 echo "${ECHO_T}$enable_narrowproto" >&6
 
-echo "$as_me:17958: checking if we should use imake to help" >&5
+echo "$as_me:18154: 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.
@@ -17972,7 +18168,7 @@
 	enable_imake=no
 
 fi;
-echo "$as_me:17975: result: $enable_imake" >&5
+echo "$as_me:18171: result: $enable_imake" >&5
 echo "${ECHO_T}$enable_imake" >&6
 
 if test "$enable_imake" = yes ; then
@@ -17981,7 +18177,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:17984: checking for $ac_word" >&5
+echo "$as_me:18180: 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
@@ -17998,7 +18194,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:18001: found $ac_dir/$ac_word" >&5
+   echo "$as_me:18197: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -18009,10 +18205,10 @@
 IMAKE=$ac_cv_path_IMAKE
 
 if test -n "$IMAKE"; then
-  echo "$as_me:18012: result: $IMAKE" >&5
+  echo "$as_me:18208: result: $IMAKE" >&5
 echo "${ECHO_T}$IMAKE" >&6
 else
-  echo "$as_me:18015: result: no" >&5
+  echo "$as_me:18211: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -18072,7 +18268,7 @@
 	then
 		test -n "$verbose" && echo "	Using $IMAKE $cf_imake_opts" 1>&6
 
-echo "${as_me:-configure}:18075: testing Using $IMAKE $cf_imake_opts ..." 1>&5
+echo "${as_me:-configure}:18271: testing Using $IMAKE $cf_imake_opts ..." 1>&5
 
 	else
 		# sometimes imake doesn't have the config path compiled in.  Find it.
@@ -18090,7 +18286,7 @@
 			esac
 		done
 		if test -z "$cf_config" ; then
-			{ echo "$as_me:18093: WARNING: Could not find imake config-directory" >&5
+			{ echo "$as_me:18289: 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"
@@ -18098,10 +18294,10 @@
 			then
 				test -n "$verbose" && echo "	Using $IMAKE $cf_config" 1>&6
 
-echo "${as_me:-configure}:18101: testing Using $IMAKE $cf_config ..." 1>&5
+echo "${as_me:-configure}:18297: testing Using $IMAKE $cf_config ..." 1>&5
 
 			else
-				{ echo "$as_me:18104: WARNING: Cannot run $IMAKE" >&5
+				{ echo "$as_me:18300: WARNING: Cannot run $IMAKE" >&5
 echo "$as_me: WARNING: Cannot run $IMAKE" >&2;}
 			fi
 		fi
@@ -18145,7 +18341,7 @@
 		else
 		    test -n "$verbose" && echo "	suppressed \"$cf_nostdinc\" and \"$cf_std_incl\"" 1>&6
 
-echo "${as_me:-configure}:18148: testing suppressed \"$cf_nostdinc\" and \"$cf_std_incl\" ..." 1>&5
+echo "${as_me:-configure}:18344: testing suppressed \"$cf_nostdinc\" and \"$cf_std_incl\" ..." 1>&5
 
 		    IMAKE_CFLAGS="$cf_cpp_opts"
 		fi
@@ -18167,11 +18363,11 @@
 
 test -n "$verbose" && echo "	IMAKE_CFLAGS $IMAKE_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:18170: testing IMAKE_CFLAGS $IMAKE_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:18366: testing IMAKE_CFLAGS $IMAKE_CFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	IMAKE_LOADFLAGS $IMAKE_LOADFLAGS" 1>&6
 
-echo "${as_me:-configure}:18174: testing IMAKE_LOADFLAGS $IMAKE_LOADFLAGS ..." 1>&5
+echo "${as_me:-configure}:18370: testing IMAKE_LOADFLAGS $IMAKE_LOADFLAGS ..." 1>&5
 
 fi
 
@@ -18280,7 +18476,7 @@
 	IMAKE_LOADFLAGS=
 	test -n "$verbose" && echo "	make fallback definitions" 1>&6
 
-echo "${as_me:-configure}:18283: testing make fallback definitions ..." 1>&5
+echo "${as_me:-configure}:18479: 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,
@@ -18444,7 +18640,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:18447: checking for $ac_word" >&5
+echo "$as_me:18643: 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
@@ -18461,7 +18657,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:18464: found $ac_dir/$ac_word" >&5
+   echo "$as_me:18660: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -18473,10 +18669,10 @@
 GROFF_PATH=$ac_cv_path_GROFF_PATH
 
 if test -n "$GROFF_PATH"; then
-  echo "$as_me:18476: result: $GROFF_PATH" >&5
+  echo "$as_me:18672: result: $GROFF_PATH" >&5
 echo "${ECHO_T}$GROFF_PATH" >&6
 else
-  echo "$as_me:18479: result: no" >&5
+  echo "$as_me:18675: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -18484,7 +18680,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:18487: checking for $ac_word" >&5
+echo "$as_me:18683: 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
@@ -18501,7 +18697,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:18504: found $ac_dir/$ac_word" >&5
+   echo "$as_me:18700: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -18512,10 +18708,10 @@
 NROFF_PATH=$ac_cv_path_NROFF_PATH
 
 if test -n "$NROFF_PATH"; then
-  echo "$as_me:18515: result: $NROFF_PATH" >&5
+  echo "$as_me:18711: result: $NROFF_PATH" >&5
 echo "${ECHO_T}$NROFF_PATH" >&6
 else
-  echo "$as_me:18518: result: no" >&5
+  echo "$as_me:18714: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -18525,7 +18721,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:18528: checking for $ac_word" >&5
+echo "$as_me:18724: 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
@@ -18542,7 +18738,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:18545: found $ac_dir/$ac_word" >&5
+   echo "$as_me:18741: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -18554,10 +18750,10 @@
 TBL_PATH=$ac_cv_path_TBL_PATH
 
 if test -n "$TBL_PATH"; then
-  echo "$as_me:18557: result: $TBL_PATH" >&5
+  echo "$as_me:18753: result: $TBL_PATH" >&5
 echo "${ECHO_T}$TBL_PATH" >&6
 else
-  echo "$as_me:18560: result: no" >&5
+  echo "$as_me:18756: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -18570,7 +18766,7 @@
 	GROFF_NOTE=
 fi
 
-echo "$as_me:18573: checking for fgrep" >&5
+echo "$as_me:18769: 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
@@ -18582,7 +18778,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:18585: checking for $ac_word" >&5
+echo "$as_me:18781: 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
@@ -18599,7 +18795,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:18602: found $ac_dir/$ac_word" >&5
+   echo "$as_me:18798: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -18610,10 +18806,10 @@
 FGREP=$ac_cv_path_FGREP
 
 if test -n "$FGREP"; then
-  echo "$as_me:18613: result: $FGREP" >&5
+  echo "$as_me:18809: result: $FGREP" >&5
 echo "${ECHO_T}$FGREP" >&6
 else
-  echo "$as_me:18616: result: no" >&5
+  echo "$as_me:18812: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -18621,12 +18817,12 @@
 done
 test -n "$FGREP" || FGREP=": "
 
-     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:18624: error: cannot find workable fgrep" >&5
+     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:18820: error: cannot find workable fgrep" >&5
 echo "$as_me: error: cannot find workable fgrep" >&2;}
    { (exit 1); exit 1; }; }
    fi
 fi
-echo "$as_me:18629: result: $ac_cv_path_FGREP" >&5
+echo "$as_me:18825: result: $ac_cv_path_FGREP" >&5
 echo "${ECHO_T}$ac_cv_path_FGREP" >&6
  FGREP="$ac_cv_path_FGREP"
 
@@ -18637,7 +18833,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:18640: checking for $ac_word" >&5
+echo "$as_me:18836: 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
@@ -18654,7 +18850,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:18657: found $ac_dir/$ac_word" >&5
+   echo "$as_me:18853: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -18666,16 +18862,16 @@
 cf_man2html=$ac_cv_path_cf_man2html
 
 if test -n "$cf_man2html"; then
-  echo "$as_me:18669: result: $cf_man2html" >&5
+  echo "$as_me:18865: result: $cf_man2html" >&5
 echo "${ECHO_T}$cf_man2html" >&6
 else
-  echo "$as_me:18672: result: no" >&5
+  echo "$as_me:18868: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 	case "x$cf_man2html" in
 	(x/*)
-		echo "$as_me:18678: checking for the modified Earl Hood script" >&5
+		echo "$as_me:18874: 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
@@ -18684,7 +18880,7 @@
 			cf_man2html=no
 			cf_man2html_ok=no
 		fi
-		echo "$as_me:18687: result: $cf_man2html_ok" >&5
+		echo "$as_me:18883: result: $cf_man2html_ok" >&5
 echo "${ECHO_T}$cf_man2html_ok" >&6
 		;;
 	(*)
@@ -18693,7 +18889,7 @@
 	esac
 esac
 
-echo "$as_me:18696: checking for program to convert manpage to html" >&5
+echo "$as_me:18892: 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.
@@ -18708,11 +18904,11 @@
 
 case $cf_man2html in
 (yes)
-	echo "$as_me:18711: result: man2html" >&5
+	echo "$as_me:18907: 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:18715: checking for $ac_word" >&5
+echo "$as_me:18911: 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
@@ -18729,7 +18925,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:18732: found $ac_dir/$ac_word" >&5
+   echo "$as_me:18928: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -18741,10 +18937,10 @@
 cf_man2html=$ac_cv_path_cf_man2html
 
 if test -n "$cf_man2html"; then
-  echo "$as_me:18744: result: $cf_man2html" >&5
+  echo "$as_me:18940: result: $cf_man2html" >&5
 echo "${ECHO_T}$cf_man2html" >&6
 else
-  echo "$as_me:18747: result: no" >&5
+  echo "$as_me:18943: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -18752,11 +18948,11 @@
 (no|groff|*/groff*)
 	cf_with_groff=yes
 	cf_man2html=$GROFF_PATH
-	echo "$as_me:18755: result: $cf_man2html" >&5
+	echo "$as_me:18951: result: $cf_man2html" >&5
 echo "${ECHO_T}$cf_man2html" >&6
 	;;
 (*)
-	echo "$as_me:18759: result: $cf_man2html" >&5
+	echo "$as_me:18955: result: $cf_man2html" >&5
 echo "${ECHO_T}$cf_man2html" >&6
 	;;
 esac
@@ -18797,12 +18993,12 @@
 	# disable hyphenation if this is groff
 	if test "x$GROFF_PATH" != xno
 	then
-		echo "$as_me:18800: checking if nroff is really groff" >&5
+		echo "$as_me:18996: 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:18805: result: $cf_check_groff" >&5
+		echo "$as_me:19001: result: $cf_check_groff" >&5
 echo "${ECHO_T}$cf_check_groff" >&6
 		test "x$cf_check_groff" = xyes && NROFF_OPTS="-rHY=0"
 	fi
@@ -18831,14 +19027,14 @@
 	cf_man2html=`echo "$cf_man2html" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:18834: error: expected a pathname, not \"$cf_man2html\"" >&5
+	{ { echo "$as_me:19030: 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:18841: checking for $cf_man2html top/bottom margins" >&5
+	echo "$as_me:19037: 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
@@ -18856,10 +19052,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:18859: result: $cf_man2html_top_bot" >&5
+	echo "$as_me:19055: result: $cf_man2html_top_bot" >&5
 echo "${ECHO_T}$cf_man2html_top_bot" >&6
 
-	echo "$as_me:18862: checking for pagesize to use" >&5
+	echo "$as_me:19058: 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
@@ -18884,7 +19080,7 @@
 	test "$cf_man2html_page" -gt 100 && cf_man2html_page=99999
 
 	rm -rf conftest*
-	echo "$as_me:18887: result: $cf_man2html_page" >&5
+	echo "$as_me:19083: result: $cf_man2html_page" >&5
 echo "${ECHO_T}$cf_man2html_page" >&6
 
 	cat >>$MAN2HTML_TEMP <<CF_EOF
@@ -18912,27 +19108,27 @@
 
 	test -n "$verbose" && echo "	removing terminfo flags from IMAKE_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:18915: testing removing terminfo flags from IMAKE_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:19111: 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}:18920: testing ...result $IMAKE_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:19116: testing ...result $IMAKE_CFLAGS ..." 1>&5
 
 	test -n "$verbose" && echo "	removing terminfo flags from CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:18924: testing removing terminfo flags from CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:19120: 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}:18929: testing ...result $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:19125: testing ...result $CPPFLAGS ..." 1>&5
 
 		;;
 	esac
 fi
 
-echo "$as_me:18935: checking for default terminal-id" >&5
+echo "$as_me:19131: 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.
@@ -18942,7 +19138,7 @@
 else
   default_termid=vt420
 fi;
-echo "$as_me:18945: result: $default_termid" >&5
+echo "$as_me:19141: result: $default_termid" >&5
 echo "${ECHO_T}$default_termid" >&6
 case $default_termid in
 (vt*)	default_termid=`echo $default_termid | sed -e 's/^..//'`
@@ -18950,7 +19146,7 @@
 ([1-9][0-9][0-9]|[1-9][0-9])
 	;;
 (*)
-	{ { echo "$as_me:18953: error: expected a number, not $default_termid" >&5
+	{ { echo "$as_me:19149: error: expected a number, not $default_termid" >&5
 echo "$as_me: error: expected a number, not $default_termid" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -18960,7 +19156,7 @@
 #define DFT_DECID "$default_termid"
 EOF
 
-echo "$as_me:18963: checking for default terminal-type" >&5
+echo "$as_me:19159: 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.
@@ -18970,7 +19166,7 @@
 else
   default_TERM=xterm
 fi;
-echo "$as_me:18973: result: $default_TERM" >&5
+echo "$as_me:19169: result: $default_TERM" >&5
 echo "${ECHO_T}$default_TERM" >&6
 
 cat >>confdefs.h <<EOF
@@ -18978,7 +19174,7 @@
 EOF
 
 ###############################################################################
-echo "$as_me:18981: checking if backarrow-key should be BS" >&5
+echo "$as_me:19177: 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.
@@ -18996,7 +19192,7 @@
 
 fi;
 
-echo "$as_me:18999: result: $backarrow_is_bs" >&5
+echo "$as_me:19195: result: $backarrow_is_bs" >&5
 echo "${ECHO_T}$backarrow_is_bs" >&6
 case $backarrow_is_bs in
 (yes)
@@ -19017,7 +19213,7 @@
 #define DEF_BACKARO_BS $backarrow_is_bs
 EOF
 
-echo "$as_me:19020: checking if backarrow-key should be treated as erase" >&5
+echo "$as_me:19216: 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.
@@ -19035,7 +19231,7 @@
 
 fi;
 
-echo "$as_me:19038: result: $backarrow_is_erase" >&5
+echo "$as_me:19234: result: $backarrow_is_erase" >&5
 echo "${ECHO_T}$backarrow_is_erase" >&6
 case $backarrow_is_erase in
 (yes)
@@ -19056,7 +19252,7 @@
 #define DEF_BACKARO_ERASE $backarrow_is_erase
 EOF
 
-echo "$as_me:19059: checking for default backspace/DEL setting" >&5
+echo "$as_me:19255: 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.
@@ -19067,7 +19263,7 @@
   delete_is_del=maybe
 fi;
 
-echo "$as_me:19070: result: $delete_is_del" >&5
+echo "$as_me:19266: result: $delete_is_del" >&5
 echo "${ECHO_T}$delete_is_del" >&6
 case $delete_is_del in
 (yes)
@@ -19088,7 +19284,7 @@
 #define DEFDELETE_DEL $delete_is_del
 EOF
 
-echo "$as_me:19091: checking for default pty initial erase setting" >&5
+echo "$as_me:19287: 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.
@@ -19099,7 +19295,7 @@
   initial_erase=False
 fi;
 
-echo "$as_me:19102: result: $initial_erase" >&5
+echo "$as_me:19298: result: $initial_erase" >&5
 echo "${ECHO_T}$initial_erase" >&6
 case $initial_erase in
 (yes)
@@ -19120,7 +19316,7 @@
 #define DEF_INITIAL_ERASE $initial_erase
 EOF
 
-echo "$as_me:19123: checking if alt should send ESC" >&5
+echo "$as_me:19319: 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.
@@ -19138,7 +19334,7 @@
 
 fi;
 
-echo "$as_me:19141: result: $alt_sends_esc" >&5
+echo "$as_me:19337: result: $alt_sends_esc" >&5
 echo "${ECHO_T}$alt_sends_esc" >&6
 case $alt_sends_esc in
 (yes)
@@ -19159,7 +19355,7 @@
 #define DEF_ALT_SENDS_ESC $alt_sends_esc
 EOF
 
-echo "$as_me:19162: checking if meta should send ESC" >&5
+echo "$as_me:19358: 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.
@@ -19177,7 +19373,7 @@
 
 fi;
 
-echo "$as_me:19180: result: $meta_sends_esc" >&5
+echo "$as_me:19376: result: $meta_sends_esc" >&5
 echo "${ECHO_T}$meta_sends_esc" >&6
 case $meta_sends_esc in
 (yes)
@@ -19201,7 +19397,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:19204: checking for $ac_word" >&5
+echo "$as_me:19400: 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
@@ -19216,7 +19412,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:19219: found $ac_dir/$ac_word" >&5
+echo "$as_me:19415: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -19225,10 +19421,10 @@
 fi
 cf_tic_prog=$ac_cv_prog_cf_tic_prog
 if test -n "$cf_tic_prog"; then
-  echo "$as_me:19228: result: $cf_tic_prog" >&5
+  echo "$as_me:19424: result: $cf_tic_prog" >&5
 echo "${ECHO_T}$cf_tic_prog" >&6
 else
-  echo "$as_me:19231: result: no" >&5
+  echo "$as_me:19427: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -19244,7 +19440,7 @@
 			;;
 		esac
 	fi
-	echo "$as_me:19247: checking for private terminfo-directory" >&5
+	echo "$as_me:19443: 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.
@@ -19254,10 +19450,10 @@
 else
   TERMINFO_DIR=${TERMINFO-none}
 fi;
-	echo "$as_me:19257: result: $TERMINFO_DIR" >&5
+	echo "$as_me:19453: result: $TERMINFO_DIR" >&5
 echo "${ECHO_T}$TERMINFO_DIR" >&6
 	if test "$TERMINFO_DIR" = yes ; then
-		{ echo "$as_me:19260: WARNING: no value given" >&5
+		{ echo "$as_me:19456: 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
@@ -19266,7 +19462,7 @@
 #define OWN_TERMINFO_DIR "$TERMINFO_DIR"
 EOF
 
-			echo "$as_me:19269: checking if \$TERMINFO should also be set" >&5
+			echo "$as_me:19465: 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.
@@ -19276,7 +19472,7 @@
 else
   cf_env_terminfo=no
 fi;
-			echo "$as_me:19279: result: $cf_env_terminfo" >&5
+			echo "$as_me:19475: result: $cf_env_terminfo" >&5
 echo "${ECHO_T}$cf_env_terminfo" >&6
 			test $cf_env_terminfo = yes &&
 
@@ -19285,7 +19481,7 @@
 EOF
 
 		else
-			{ echo "$as_me:19288: WARNING: not a directory" >&5
+			{ echo "$as_me:19484: WARNING: not a directory" >&5
 echo "$as_me: WARNING: not a directory" >&2;}
 		fi
 	elif test "$prefix" != NONE ; then
@@ -19309,7 +19505,7 @@
 
 ###############################################################################
 
-echo "$as_me:19312: checking if you want active-icons" >&5
+echo "$as_me:19508: 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.
@@ -19326,7 +19522,7 @@
 	enable_active_icon=yes
 
 fi;
-echo "$as_me:19329: result: $enable_active_icon" >&5
+echo "$as_me:19525: result: $enable_active_icon" >&5
 echo "${ECHO_T}$enable_active_icon" >&6
 if test "$enable_active_icon" = no ; then
 
@@ -19336,7 +19532,7 @@
 
 fi
 
-echo "$as_me:19339: checking if you want ANSI color" >&5
+echo "$as_me:19535: 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.
@@ -19353,7 +19549,7 @@
 	enable_ansi_color=yes
 
 fi;
-echo "$as_me:19356: result: $enable_ansi_color" >&5
+echo "$as_me:19552: result: $enable_ansi_color" >&5
 echo "${ECHO_T}$enable_ansi_color" >&6
 test "$enable_ansi_color" = no &&
 cat >>confdefs.h <<\EOF
@@ -19362,7 +19558,7 @@
 
 if test "$enable_ansi_color" = yes ; then
 
-	echo "$as_me:19365: checking if you want 16 colors like aixterm" >&5
+	echo "$as_me:19561: 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.
@@ -19379,14 +19575,14 @@
 	enable_16_color=yes
 
 fi;
-	echo "$as_me:19382: result: $enable_16_color" >&5
+	echo "$as_me:19578: 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:19389: checking if you want 256 colors" >&5
+	echo "$as_me:19585: 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.
@@ -19403,7 +19599,7 @@
 	enable_256_color=yes
 
 fi;
-	echo "$as_me:19406: result: $enable_256_color" >&5
+	echo "$as_me:19602: result: $enable_256_color" >&5
 echo "${ECHO_T}$enable_256_color" >&6
 
 	if test "$enable_256_color" = yes ; then
@@ -19415,7 +19611,7 @@
 #define OPT_256_COLORS 1
 EOF
 
-		echo "$as_me:19418: checking if you want direct-color support" >&5
+		echo "$as_me:19614: 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.
@@ -19432,7 +19628,7 @@
 	enable_direct_color=yes
 
 fi;
-		echo "$as_me:19435: result: $enable_direct_color" >&5
+		echo "$as_me:19631: result: $enable_direct_color" >&5
 echo "${ECHO_T}$enable_direct_color" >&6
 		if test "$enable_direct_color" = yes ; then
 
@@ -19444,7 +19640,7 @@
 
 	else
 
-		echo "$as_me:19447: checking if you want 88 colors" >&5
+		echo "$as_me:19643: 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.
@@ -19461,7 +19657,7 @@
 	enable_88_color=yes
 
 fi;
-		echo "$as_me:19464: result: $enable_88_color" >&5
+		echo "$as_me:19660: 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"
@@ -19477,7 +19673,7 @@
 
 fi
 
-echo "$as_me:19480: checking if you want blinking cursor" >&5
+echo "$as_me:19676: 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.
@@ -19494,14 +19690,14 @@
 	enable_blink_curs=yes
 
 fi;
-echo "$as_me:19497: result: $enable_blink_curs" >&5
+echo "$as_me:19693: 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:19504: checking if you want support for block-selection" >&5
+echo "$as_me:19700: checking if you want support for block-selection" >&5
 echo $ECHO_N "checking if you want support for block-selection... $ECHO_C" >&6
 
 # Check whether --enable-block-select or --disable-block-select was given.
@@ -19518,7 +19714,7 @@
 	enable_block_select=no
 
 fi;
-echo "$as_me:19521: result: $enable_block_select" >&5
+echo "$as_me:19717: result: $enable_block_select" >&5
 echo "${ECHO_T}$enable_block_select" >&6
 if test "$enable_block_select" = yes ; then
 
@@ -19534,7 +19730,7 @@
 
 fi
 
-echo "$as_me:19537: checking if you want to ignore Linux's broken palette-strings" >&5
+echo "$as_me:19733: 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
@@ -19558,7 +19754,7 @@
 	enable_broken_osc=$enableval
 
 fi;
-echo "$as_me:19561: result: $enable_broken_osc" >&5
+echo "$as_me:19757: result: $enable_broken_osc" >&5
 echo "${ECHO_T}$enable_broken_osc" >&6
 if test "$enable_broken_osc" = yes ; then
 
@@ -19574,7 +19770,7 @@
 
 fi
 
-echo "$as_me:19577: checking if you want to allow broken string-terminators" >&5
+echo "$as_me:19773: 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.
@@ -19591,14 +19787,14 @@
 	enable_broken_st=yes
 
 fi;
-echo "$as_me:19594: result: $enable_broken_st" >&5
+echo "$as_me:19790: 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:19601: checking if you want to compile-in icon data" >&5
+echo "$as_me:19797: 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.
@@ -19615,14 +19811,14 @@
 	enable_builtin_xpms=no
 
 fi;
-echo "$as_me:19618: result: $enable_builtin_xpms" >&5
+echo "$as_me:19814: 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:19625: checking if you want printable 128-159" >&5
+echo "$as_me:19821: 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.
@@ -19639,7 +19835,7 @@
 	enable_c1_print=yes
 
 fi;
-echo "$as_me:19642: result: $enable_c1_print" >&5
+echo "$as_me:19838: result: $enable_c1_print" >&5
 echo "${ECHO_T}$enable_c1_print" >&6
 test "$enable_c1_print" = no &&
 cat >>confdefs.h <<\EOF
@@ -19648,7 +19844,7 @@
 
 if test "$enable_ansi_color" = yes ; then
 
-	echo "$as_me:19651: checking if you want bold colors mapped like IBM PC" >&5
+	echo "$as_me:19847: 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.
@@ -19665,14 +19861,14 @@
 	enable_pc_color=yes
 
 fi;
-	echo "$as_me:19668: result: $enable_pc_color" >&5
+	echo "$as_me:19864: 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:19675: checking if you want separate color-classes" >&5
+	echo "$as_me:19871: 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.
@@ -19689,14 +19885,14 @@
 	enable_color_class=yes
 
 fi;
-	echo "$as_me:19692: result: $enable_color_class" >&5
+	echo "$as_me:19888: 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:19699: checking if you want color-mode enabled by default" >&5
+	echo "$as_me:19895: 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.
@@ -19713,7 +19909,7 @@
 	default_colormode=yes
 
 fi;
-	echo "$as_me:19716: result: $default_colormode" >&5
+	echo "$as_me:19912: result: $default_colormode" >&5
 echo "${ECHO_T}$default_colormode" >&6
 	test "$default_colormode" = no &&
 cat >>confdefs.h <<\EOF
@@ -19722,7 +19918,7 @@
 
 fi
 
-echo "$as_me:19725: checking if you want support for color highlighting" >&5
+echo "$as_me:19921: 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.
@@ -19739,14 +19935,14 @@
 	default_highlight=yes
 
 fi;
-echo "$as_me:19742: result: $default_highlight" >&5
+echo "$as_me:19938: 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:19749: checking if you want support for doublesize characters" >&5
+echo "$as_me:19945: 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.
@@ -19763,14 +19959,14 @@
 	enable_doublechars=yes
 
 fi;
-echo "$as_me:19766: result: $enable_doublechars" >&5
+echo "$as_me:19962: 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:19773: checking if you want fallback-support for box characters" >&5
+echo "$as_me:19969: 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.
@@ -19787,14 +19983,14 @@
 	enable_boxchars=yes
 
 fi;
-echo "$as_me:19790: result: $enable_boxchars" >&5
+echo "$as_me:19986: 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:19797: checking if you want to allow spawning commands to process selections" >&5
+echo "$as_me:19993: checking if you want to allow spawning commands to process selections" >&5
 echo $ECHO_N "checking if you want to allow spawning commands to process selections... $ECHO_C" >&6
 
 # Check whether --enable-exec-selection or --disable-exec-selection was given.
@@ -19811,7 +20007,7 @@
 	enable_exec_selection=yes
 
 fi;
-echo "$as_me:19814: result: $enable_exec_selection" >&5
+echo "$as_me:20010: result: $enable_exec_selection" >&5
 echo "${ECHO_T}$enable_exec_selection" >&6
 if test "$enable_exec_selection" = no ; then
 
@@ -19821,7 +20017,7 @@
 
 fi
 
-echo "$as_me:19824: checking if you want to allow spawning new xterms" >&5
+echo "$as_me:20020: 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.
@@ -19838,11 +20034,11 @@
 	enable_exec_xterm=no
 
 fi;
-echo "$as_me:19841: result: $enable_exec_xterm" >&5
+echo "$as_me:20037: result: $enable_exec_xterm" >&5
 echo "${ECHO_T}$enable_exec_xterm" >&6
 if test "$enable_exec_xterm" = yes ; then
 
-echo "$as_me:19845: checking for proc tree with cwd-support" >&5
+echo "$as_me:20041: 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
@@ -19861,11 +20057,11 @@
 done
 
 fi
-echo "$as_me:19864: result: $cf_cv_procfs_cwd" >&5
+echo "$as_me:20060: 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:19868: WARNING: no suitable proc filesystem found" >&5
+		{ echo "$as_me:20064: WARNING: no suitable proc filesystem found" >&5
 echo "$as_me: WARNING: no suitable proc filesystem found" >&2;}
 	else
 
@@ -19883,17 +20079,17 @@
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "Xext"; then
 	test -n "$verbose" && echo "	found package Xext" 1>&6
 
-echo "${as_me:-configure}:19886: testing found package Xext ..." 1>&5
+echo "${as_me:-configure}:20082: 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}:19892: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:20088: 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}:19896: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:20092: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 for cf_required in Xext
 do
@@ -20028,7 +20224,7 @@
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
 
-	echo "$as_me:20031: checking for XextCreateExtension in -lXext" >&5
+	echo "$as_me:20227: 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
@@ -20036,7 +20232,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20039 "configure"
+#line 20235 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20055,16 +20251,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20058: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20254: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20061: \$? = $ac_status" >&5
+  echo "$as_me:20257: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20064: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20260: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20067: \$? = $ac_status" >&5
+  echo "$as_me:20263: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
@@ -20075,7 +20271,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20078: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:20274: 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
 
@@ -20099,23 +20295,23 @@
 
 fi
 
-echo "$as_me:20102: checking for X11/extensions/Xdbe.h" >&5
+echo "$as_me:20298: 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 20108 "configure"
+#line 20304 "configure"
 #include "confdefs.h"
 #include <X11/extensions/Xdbe.h>
 _ACEOF
-if { (eval echo "$as_me:20112: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:20308: \"$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:20118: \$? = $ac_status" >&5
+  echo "$as_me:20314: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20134,7 +20330,7 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:20137: result: $ac_cv_header_X11_extensions_Xdbe_h" >&5
+echo "$as_me:20333: 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
 
@@ -20142,13 +20338,13 @@
 #define HAVE_X11_EXTENSIONS_XDBE_H 1
 EOF
 
-	echo "$as_me:20145: checking for XdbeSwapBuffers" >&5
+	echo "$as_me:20341: 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 20151 "configure"
+#line 20347 "configure"
 #include "confdefs.h"
 #define XdbeSwapBuffers autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20179,16 +20375,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20182: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20378: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20185: \$? = $ac_status" >&5
+  echo "$as_me:20381: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20188: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20384: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20191: \$? = $ac_status" >&5
+  echo "$as_me:20387: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_XdbeSwapBuffers=yes
 else
@@ -20198,7 +20394,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20201: result: $ac_cv_func_XdbeSwapBuffers" >&5
+echo "$as_me:20397: result: $ac_cv_func_XdbeSwapBuffers" >&5
 echo "${ECHO_T}$ac_cv_func_XdbeSwapBuffers" >&6
 if test "$ac_cv_func_XdbeSwapBuffers" = yes; then
 
@@ -20213,7 +20409,7 @@
 
 double_buffer=False
 if test "$cf_x_ext_double_buffer" = yes ; then
-	echo "$as_me:20216: checking if you want to enable double-buffering in default resources" >&5
+	echo "$as_me:20412: 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.
@@ -20230,7 +20426,7 @@
 	enable_double_bfr=no
 
 fi;
-	echo "$as_me:20233: result: $enable_double_bfr" >&5
+	echo "$as_me:20429: result: $enable_double_bfr" >&5
 echo "${ECHO_T}$enable_double_bfr" >&6
 	if test "$enable_double_bfr" = yes ; then
 
@@ -20242,7 +20438,7 @@
 	fi
 fi
 
-echo "$as_me:20245: checking if you want to use FreeType library" >&5
+echo "$as_me:20441: 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.
@@ -20259,7 +20455,7 @@
 	enable_freetype=yes
 
 fi;
-echo "$as_me:20262: result: $enable_freetype" >&5
+echo "$as_me:20458: result: $enable_freetype" >&5
 echo "${ECHO_T}$enable_freetype" >&6
 if test "$enable_freetype" = yes ; then
 
@@ -20269,7 +20465,7 @@
 FREETYPE_CONFIG=none
 FREETYPE_PARAMS=
 
-echo "$as_me:20272: checking for FreeType configuration script" >&5
+echo "$as_me:20468: 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.
@@ -20281,12 +20477,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:20284: result: $cf_cv_x_freetype_cfgs" >&5
+echo "$as_me:20480: 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:20289: checking if you specified -D/-I options for FreeType" >&5
+	echo "$as_me:20485: 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.
@@ -20296,10 +20492,10 @@
 else
   cf_cv_x_freetype_incs=no
 fi;
-	echo "$as_me:20299: result: $cf_cv_x_freetype_incs" >&5
+	echo "$as_me:20495: result: $cf_cv_x_freetype_incs" >&5
 echo "${ECHO_T}$cf_cv_x_freetype_incs" >&6
 
-	echo "$as_me:20302: checking if you specified -L/-l options for FreeType" >&5
+	echo "$as_me:20498: 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.
@@ -20309,7 +20505,7 @@
 else
   cf_cv_x_freetype_libs=no
 fi;
-	echo "$as_me:20312: result: $cf_cv_x_freetype_libs" >&5
+	echo "$as_me:20508: result: $cf_cv_x_freetype_libs" >&5
 echo "${ECHO_T}$cf_cv_x_freetype_libs" >&6
 	;;
 (auto)
@@ -20319,7 +20515,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:20322: checking for $ac_word" >&5
+echo "$as_me:20518: 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
@@ -20336,7 +20532,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:20339: found $ac_dir/$ac_word" >&5
+   echo "$as_me:20535: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -20348,10 +20544,10 @@
 FREETYPE_CONFIG=$ac_cv_path_FREETYPE_CONFIG
 
 if test -n "$FREETYPE_CONFIG"; then
-  echo "$as_me:20351: result: $FREETYPE_CONFIG" >&5
+  echo "$as_me:20547: result: $FREETYPE_CONFIG" >&5
 echo "${ECHO_T}$FREETYPE_CONFIG" >&6
 else
-  echo "$as_me:20354: result: no" >&5
+  echo "$as_me:20550: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -20360,7 +20556,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:20363: checking for $ac_word" >&5
+echo "$as_me:20559: 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
@@ -20377,7 +20573,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:20380: found $ac_dir/$ac_word" >&5
+   echo "$as_me:20576: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -20389,10 +20585,10 @@
 FREETYPE_OLD_CONFIG=$ac_cv_path_FREETYPE_OLD_CONFIG
 
 if test -n "$FREETYPE_OLD_CONFIG"; then
-  echo "$as_me:20392: result: $FREETYPE_OLD_CONFIG" >&5
+  echo "$as_me:20588: result: $FREETYPE_OLD_CONFIG" >&5
 echo "${ECHO_T}$FREETYPE_OLD_CONFIG" >&6
 else
-  echo "$as_me:20395: result: no" >&5
+  echo "$as_me:20591: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -20407,14 +20603,14 @@
 		FREETYPE_CONFIG=$cf_cv_x_freetype_cfgs
 		FREETYPE_PARAMS=freetype2
 	else
-		{ echo "$as_me:20410: WARNING: cannot find pkg-config for freetype2" >&5
+		{ echo "$as_me:20606: WARNING: cannot find pkg-config for freetype2" >&5
 echo "$as_me: WARNING: cannot find pkg-config for freetype2" >&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:20417: checking for $ac_word" >&5
+echo "$as_me:20613: 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
@@ -20431,7 +20627,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:20434: found $ac_dir/$ac_word" >&5
+   echo "$as_me:20630: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -20443,41 +20639,41 @@
 FREETYPE_XFT_CONFIG=$ac_cv_path_FREETYPE_XFT_CONFIG
 
 if test -n "$FREETYPE_XFT_CONFIG"; then
-  echo "$as_me:20446: result: $FREETYPE_XFT_CONFIG" >&5
+  echo "$as_me:20642: result: $FREETYPE_XFT_CONFIG" >&5
 echo "${ECHO_T}$FREETYPE_XFT_CONFIG" >&6
 else
-  echo "$as_me:20449: result: no" >&5
+  echo "$as_me:20645: 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:20456: WARNING: cannot find config script for freetype2" >&5
+		{ echo "$as_me:20652: WARNING: cannot find config script for freetype2" >&5
 echo "$as_me: WARNING: cannot find config script for freetype2" >&2;}
 	fi
 	;;
 esac
 
 if test "$FREETYPE_CONFIG" != none ; then
-	echo "$as_me:20463: checking for FreeType config" >&5
+	echo "$as_me:20659: checking for FreeType config" >&5
 echo $ECHO_N "checking for FreeType config... $ECHO_C" >&6
-	echo "$as_me:20465: result: $FREETYPE_CONFIG $FREETYPE_PARAMS" >&5
+	echo "$as_me:20661: 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:20469: checking for $FREETYPE_CONFIG cflags" >&5
+		echo "$as_me:20665: 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:20472: result: $cf_cv_x_freetype_incs" >&5
+		echo "$as_me:20668: 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:20477: checking for $FREETYPE_CONFIG libs" >&5
+		echo "$as_me:20673: 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:20480: result: $cf_cv_x_freetype_libs" >&5
+		echo "$as_me:20676: result: $cf_cv_x_freetype_libs" >&5
 echo "${ECHO_T}$cf_cv_x_freetype_libs" >&6
 	fi
 fi
@@ -20490,7 +20686,7 @@
 	cf_cv_x_freetype_libs=-lfreetype2
 fi
 
-echo "$as_me:20493: checking if we can link with FreeType library" >&5
+echo "$as_me:20689: checking if we can link with FreeType library" >&5
 echo $ECHO_N "checking if we can link with FreeType library... $ECHO_C" >&6
 
 cf_save_ft_LIBS="$LIBS"
@@ -20611,7 +20807,7 @@
 fi
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20614 "configure"
+#line 20810 "configure"
 #include "confdefs.h"
 
 #include <ft2build.h>
@@ -20628,16 +20824,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20631: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20827: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20634: \$? = $ac_status" >&5
+  echo "$as_me:20830: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20637: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20833: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20640: \$? = $ac_status" >&5
+  echo "$as_me:20836: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_found_freetype=yes
 else
@@ -20646,11 +20842,11 @@
 cf_cv_found_freetype=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-echo "$as_me:20649: result: $cf_cv_found_freetype" >&5
+echo "$as_me:20845: result: $cf_cv_found_freetype" >&5
 echo "${ECHO_T}$cf_cv_found_freetype" >&6
 
 if test "$cf_cv_found_freetype" = no ; then
-	{ echo "$as_me:20653: WARNING: No libraries found for FreeType" >&5
+	{ echo "$as_me:20849: WARNING: No libraries found for FreeType" >&5
 echo "$as_me: WARNING: No libraries found for FreeType" >&2;}
 	LIBS="$cf_save_ft_LIBS"
 	CPPFLAGS="$cf_save_ft_INCS"
@@ -20665,17 +20861,17 @@
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xft"; then
 	test -n "$verbose" && echo "	found package xft" 1>&6
 
-echo "${as_me:-configure}:20668: testing found package xft ..." 1>&5
+echo "${as_me:-configure}:20864: testing found package xft ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "xft" 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "xft" 2>/dev/null`"
 	test -n "$verbose" && echo "	package xft CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:20674: testing package xft CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:20870: testing package xft CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package xft LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:20678: testing package xft LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:20874: testing package xft LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 for cf_required in xft
 do
@@ -20809,13 +21005,13 @@
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:20812: WARNING: unable to find Xft library with $PKG_CONFIG" >&5
+	{ echo "$as_me:21008: WARNING: unable to find Xft library with $PKG_CONFIG" >&5
 echo "$as_me: WARNING: unable to find Xft library with $PKG_CONFIG" >&2;}
 fi
 
 	if test -z "$cf_pkgconfig_libs"
 	then
-		echo "$as_me:20818: checking for XftNameParse in -lXft" >&5
+		echo "$as_me:21014: checking for XftNameParse in -lXft" >&5
 echo $ECHO_N "checking for XftNameParse in -lXft... $ECHO_C" >&6
 if test "${ac_cv_lib_Xft_XftNameParse+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20823,7 +21019,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXft  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20826 "configure"
+#line 21022 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20842,16 +21038,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20845: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21041: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20848: \$? = $ac_status" >&5
+  echo "$as_me:21044: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20851: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21047: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20854: \$? = $ac_status" >&5
+  echo "$as_me:21050: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xft_XftNameParse=yes
 else
@@ -20862,7 +21058,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20865: result: $ac_cv_lib_Xft_XftNameParse" >&5
+echo "$as_me:21061: result: $ac_cv_lib_Xft_XftNameParse" >&5
 echo "${ECHO_T}$ac_cv_lib_Xft_XftNameParse" >&6
 if test "$ac_cv_lib_Xft_XftNameParse" = yes; then
   LIBS="-lXft $LIBS"
@@ -20870,10 +21066,10 @@
 
 	fi
 
-	echo "$as_me:20873: checking if we can link with Xft and FreeType libraries" >&5
+	echo "$as_me:21069: checking if we can link with Xft and FreeType libraries" >&5
 echo $ECHO_N "checking if we can link with Xft and FreeType libraries... $ECHO_C" >&6
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20876 "configure"
+#line 21072 "configure"
 #include "confdefs.h"
 
 #include <X11/Xlib.h>
@@ -20889,16 +21085,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20892: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21088: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20895: \$? = $ac_status" >&5
+  echo "$as_me:21091: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20898: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21094: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20901: \$? = $ac_status" >&5
+  echo "$as_me:21097: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_found_xft_libraries=yes
 else
@@ -20907,7 +21103,7 @@
 cf_cv_found_xft_libraries=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-	echo "$as_me:20910: result: $cf_cv_found_xft_libraries" >&5
+	echo "$as_me:21106: result: $cf_cv_found_xft_libraries" >&5
 echo "${ECHO_T}$cf_cv_found_xft_libraries" >&6
 
 	if test "$cf_cv_found_xft_libraries" = yes ; then
@@ -20922,13 +21118,13 @@
 			XftDrawSetClipRectangles
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:20925: checking for $ac_func" >&5
+echo "$as_me:21121: 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 20931 "configure"
+#line 21127 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20959,16 +21155,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20962: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21158: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20965: \$? = $ac_status" >&5
+  echo "$as_me:21161: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20968: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21164: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20971: \$? = $ac_status" >&5
+  echo "$as_me:21167: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -20978,7 +21174,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20981: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:21177: 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
@@ -20998,14 +21194,14 @@
 fi
 
 if test "$cf_cv_found_freetype" = yes ; then
-echo "$as_me:21001: checking for usable Xft/fontconfig package" >&5
+echo "$as_me:21197: 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 21008 "configure"
+#line 21204 "configure"
 #include "confdefs.h"
 
 #include <X11/Xlib.h>
@@ -21025,16 +21221,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21028: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21224: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21031: \$? = $ac_status" >&5
+  echo "$as_me:21227: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21034: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21230: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21037: \$? = $ac_status" >&5
+  echo "$as_me:21233: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xft_compat=yes
 else
@@ -21045,7 +21241,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:21048: result: $cf_cv_xft_compat" >&5
+echo "$as_me:21244: result: $cf_cv_xft_compat" >&5
 echo "${ECHO_T}$cf_cv_xft_compat" >&6
 
 if test "$cf_cv_xft_compat" = no
@@ -21057,24 +21253,24 @@
 	(*)
 		test -n "$verbose" && echo "	work around broken package" 1>&6
 
-echo "${as_me:-configure}:21060: testing work around broken package ..." 1>&5
+echo "${as_me:-configure}:21256: 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}:21067: testing found package fontconfig ..." 1>&5
+echo "${as_me:-configure}:21263: 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}:21073: testing package fontconfig CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:21269: 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}:21077: testing package fontconfig LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:21273: testing package fontconfig LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 for cf_required in fontconfig
 do
@@ -21304,27 +21500,101 @@
 
 				LIBS="$cf_save_fontconfig"
 
-test -n "$verbose" && echo "	...before $LIBS" 1>&6
+cf_add_libs="$LIBS"
+test -n "$verbose" && echo "	...before $cf_add_libs" 1>&6
+
+echo "${as_me:-configure}:21506: testing ...before $cf_add_libs ..." 1>&5
 
-echo "${as_me:-configure}:21309: testing ...before $LIBS ..." 1>&5
+for cf_add_1lib in $cf_pkgconfig_libs; do
+	# filter duplicates
+	cf_found_2lib=no
+	for cf_add_2lib in $cf_add_libs; do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
+			cf_found_2lib=yes
+			break
+		fi
+	done
+	# if not a duplicate, find the dependent library
+	if test "$cf_found_2lib" = no
+	then
+		cf_found_2lib=no
+		cf_add_2libs=
+		for cf_add_2lib in $cf_add_libs
+		do
+			test -n "$cf_add_2libs" && cf_add_2libs="$cf_add_2libs "
+			cf_add_2libs="$cf_add_2libs$cf_add_2lib"
+			if test "x$cf_add_2lib" = "x-lXft"
+			then
+				cf_found_2lib=yes
+				cf_add_2libs="$cf_add_2libs $cf_add_1lib"
+			fi
+		done
+		if test "$cf_found_2lib" = yes
+		then
+			cf_add_libs="$cf_add_2libs"
+		else
+			test -n "$verbose" && echo "	...missed -lXft" 1>&6
+
+echo "${as_me:-configure}:21538: testing ...missed -lXft ..." 1>&5
+
+		fi
+	fi
+done
+test -n "$verbose" && echo "	...after  $cf_add_libs" 1>&6
 
-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}:21545: testing ...after  $cf_add_libs ..." 1>&5
 
-echo "${as_me:-configure}:21314: testing ...after  $LIBS ..." 1>&5
+LIBS="$cf_add_libs"
 
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
 
-test -n "$verbose" && echo "	...before $LIBS" 1>&6
+cf_add_libs="$LIBS"
+test -n "$verbose" && echo "	...before $cf_add_libs" 1>&6
 
-echo "${as_me:-configure}:21322: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:21556: testing ...before $cf_add_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
+for cf_add_1lib in -lfontconfig; do
+	# filter duplicates
+	cf_found_2lib=no
+	for cf_add_2lib in $cf_add_libs; do
+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
+			cf_found_2lib=yes
+			break
+		fi
+	done
+	# if not a duplicate, find the dependent library
+	if test "$cf_found_2lib" = no
+	then
+		cf_found_2lib=no
+		cf_add_2libs=
+		for cf_add_2lib in $cf_add_libs
+		do
+			test -n "$cf_add_2libs" && cf_add_2libs="$cf_add_2libs "
+			cf_add_2libs="$cf_add_2libs$cf_add_2lib"
+			if test "x$cf_add_2lib" = "x-lXft"
+			then
+				cf_found_2lib=yes
+				cf_add_2libs="$cf_add_2libs $cf_add_1lib"
+			fi
+		done
+		if test "$cf_found_2lib" = yes
+		then
+			cf_add_libs="$cf_add_2libs"
+		else
+			test -n "$verbose" && echo "	...missed -lXft" 1>&6
+
+echo "${as_me:-configure}:21588: testing ...missed -lXft ..." 1>&5
 
-echo "${as_me:-configure}:21327: testing ...after  $LIBS ..." 1>&5
+		fi
+	fi
+done
+test -n "$verbose" && echo "	...after  $cf_add_libs" 1>&6
+
+echo "${as_me:-configure}:21595: testing ...after  $cf_add_libs ..." 1>&5
+
+LIBS="$cf_add_libs"
 
 fi
 
@@ -21337,7 +21607,7 @@
 	CPPFLAGS=`echo "$CPPFLAGS" | sed -e s/-DXRENDERFONT//`
 fi
 
-echo "$as_me:21340: checking if you want support for HP-style function keys" >&5
+echo "$as_me:21610: 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.
@@ -21354,7 +21624,7 @@
 	enable_hp_fkeys=no
 
 fi;
-echo "$as_me:21357: result: $enable_hp_fkeys" >&5
+echo "$as_me:21627: result: $enable_hp_fkeys" >&5
 echo "${ECHO_T}$enable_hp_fkeys" >&6
 if test "$enable_hp_fkeys" = yes ; then
 
@@ -21364,7 +21634,7 @@
 
 fi
 
-echo "$as_me:21367: checking if you want support for SCO-style function keys" >&5
+echo "$as_me:21637: 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.
@@ -21381,7 +21651,7 @@
 	enable_sco_fkeys=no
 
 fi;
-echo "$as_me:21384: result: $enable_sco_fkeys" >&5
+echo "$as_me:21654: result: $enable_sco_fkeys" >&5
 echo "${ECHO_T}$enable_sco_fkeys" >&6
 if test "$enable_sco_fkeys" = yes ; then
 
@@ -21391,7 +21661,7 @@
 
 fi
 
-echo "$as_me:21394: checking if you want support for Sun-style function keys" >&5
+echo "$as_me:21664: 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.
@@ -21408,7 +21678,7 @@
 	enable_sun_fkeys=yes
 
 fi;
-echo "$as_me:21411: result: $enable_sun_fkeys" >&5
+echo "$as_me:21681: result: $enable_sun_fkeys" >&5
 echo "${ECHO_T}$enable_sun_fkeys" >&6
 if test "$enable_sun_fkeys" = no ; then
 
@@ -21418,7 +21688,7 @@
 
 fi
 
-echo "$as_me:21421: checking if you want saved-lines stored as a FIFO" >&5
+echo "$as_me:21691: 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.
@@ -21435,14 +21705,14 @@
 	enable_fifo_lines=yes
 
 fi;
-echo "$as_me:21438: result: $enable_fifo_lines" >&5
+echo "$as_me:21708: result: $enable_fifo_lines" >&5
 echo "${ECHO_T}$enable_fifo_lines" >&6
 if test "$enable_fifo_lines" != yes ; then
-	{ echo "$as_me:21441: WARNING: this option has been deprecated" >&5
+	{ echo "$as_me:21711: WARNING: this option has been deprecated" >&5
 echo "$as_me: WARNING: this option has been deprecated" >&2;}
 fi
 
-echo "$as_me:21445: checking if you want support for internationalization" >&5
+echo "$as_me:21715: 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.
@@ -21459,7 +21729,7 @@
 	enable_i18n=yes
 
 fi;
-echo "$as_me:21462: result: $enable_i18n" >&5
+echo "$as_me:21732: result: $enable_i18n" >&5
 echo "${ECHO_T}$enable_i18n" >&6
 if test "$enable_i18n" = no ; then
 
@@ -21469,7 +21739,7 @@
 
 fi
 
-echo "$as_me:21472: checking if you want support for initial-erase setup" >&5
+echo "$as_me:21742: 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.
@@ -21486,7 +21756,7 @@
 	enable_ie=yes
 
 fi;
-echo "$as_me:21489: result: $enable_ie" >&5
+echo "$as_me:21759: result: $enable_ie" >&5
 echo "${ECHO_T}$enable_ie" >&6
 if test "$enable_ie" = no ; then
 
@@ -21496,7 +21766,7 @@
 
 fi
 
-echo "$as_me:21499: checking if you want support for input-method" >&5
+echo "$as_me:21769: 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.
@@ -21513,17 +21783,17 @@
 	enable_ximp=$enable_i18n
 
 fi;
-echo "$as_me:21516: result: $enable_ximp" >&5
+echo "$as_me:21786: result: $enable_ximp" >&5
 echo "${ECHO_T}$enable_ximp" >&6
 
-echo "$as_me:21519: checking if X libraries support input-method" >&5
+echo "$as_me:21789: 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 21526 "configure"
+#line 21796 "configure"
 #include "confdefs.h"
 
 #include <X11/IntrinsicP.h>
@@ -21557,16 +21827,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21560: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21830: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21563: \$? = $ac_status" >&5
+  echo "$as_me:21833: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21566: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21836: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21569: \$? = $ac_status" >&5
+  echo "$as_me:21839: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_input_method=yes
 else
@@ -21576,13 +21846,13 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21579: result: $cf_cv_input_method" >&5
+echo "$as_me:21849: 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:21585: WARNING: input-method relies upon internationalization" >&5
+		{ echo "$as_me:21855: WARNING: input-method relies upon internationalization" >&5
 echo "$as_me: WARNING: input-method relies upon internationalization" >&2;}
 		enable_ximp=no
 	fi
@@ -21595,7 +21865,7 @@
 
 fi
 
-echo "$as_me:21598: checking if you want support for load-vt-fonts" >&5
+echo "$as_me:21868: 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.
@@ -21612,7 +21882,7 @@
 	enable_load_vt_fonts=no
 
 fi;
-echo "$as_me:21615: result: $enable_load_vt_fonts" >&5
+echo "$as_me:21885: result: $enable_load_vt_fonts" >&5
 echo "${ECHO_T}$enable_load_vt_fonts" >&6
 if test "$enable_load_vt_fonts" = yes ; then
 
@@ -21622,7 +21892,7 @@
 
 fi
 
-echo "$as_me:21625: checking if you want support for logging" >&5
+echo "$as_me:21895: 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.
@@ -21639,7 +21909,7 @@
 	enable_logging=no
 
 fi;
-echo "$as_me:21642: result: $enable_logging" >&5
+echo "$as_me:21912: result: $enable_logging" >&5
 echo "${ECHO_T}$enable_logging" >&6
 if test "$enable_logging" = yes ; then
 
@@ -21647,7 +21917,7 @@
 #define ALLOWLOGGING 1
 EOF
 
-	echo "$as_me:21650: checking if you want to allow logging via a pipe" >&5
+	echo "$as_me:21920: 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.
@@ -21664,7 +21934,7 @@
 	enable_log_exec=no
 
 fi;
-	echo "$as_me:21667: result: $enable_log_exec" >&5
+	echo "$as_me:21937: result: $enable_log_exec" >&5
 echo "${ECHO_T}$enable_log_exec" >&6
 	if test "$enable_log_exec" = yes ; then
 
@@ -21675,7 +21945,7 @@
 	fi
 fi
 
-echo "$as_me:21678: checking if you want support for iconify/maximize translations" >&5
+echo "$as_me:21948: 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.
@@ -21692,14 +21962,14 @@
 	enable_maximize=yes
 
 fi;
-echo "$as_me:21695: result: $enable_maximize" >&5
+echo "$as_me:21965: 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:21702: checking if you want NumLock to override keyboard tables" >&5
+echo "$as_me:21972: 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.
@@ -21716,14 +21986,14 @@
 	enable_numlock=yes
 
 fi;
-echo "$as_me:21719: result: $enable_numlock" >&5
+echo "$as_me:21989: 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:21726: checking if you want support for get/set of base64 selection data" >&5
+echo "$as_me:21996: 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.
@@ -21740,7 +22010,7 @@
 	enable_paste64=yes
 
 fi;
-echo "$as_me:21743: result: $enable_paste64" >&5
+echo "$as_me:22013: result: $enable_paste64" >&5
 echo "${ECHO_T}$enable_paste64" >&6
 if test "$enable_paste64" = yes ; then
 
@@ -21756,7 +22026,7 @@
 
 fi
 
-echo "$as_me:21759: checking if you want support for pty-handshaking" >&5
+echo "$as_me:22029: 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.
@@ -21773,7 +22043,7 @@
 	enable_pty_handshake=yes
 
 fi;
-echo "$as_me:21776: result: $enable_pty_handshake" >&5
+echo "$as_me:22046: result: $enable_pty_handshake" >&5
 echo "${ECHO_T}$enable_pty_handshake" >&6
 if test "$enable_pty_handshake" = yes ; then
 
@@ -21789,7 +22059,7 @@
 
 fi
 
-echo "$as_me:21792: checking if you want support for mouse in readline applications" >&5
+echo "$as_me:22062: 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.
@@ -21806,7 +22076,7 @@
 	enable_readline_mouse=yes
 
 fi;
-echo "$as_me:21809: result: $enable_readline_mouse" >&5
+echo "$as_me:22079: result: $enable_readline_mouse" >&5
 echo "${ECHO_T}$enable_readline_mouse" >&6
 if test "$enable_readline_mouse" = yes ; then
 
@@ -21816,7 +22086,7 @@
 
 fi
 
-echo "$as_me:21819: checking if you want support for regular-expression selections" >&5
+echo "$as_me:22089: 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.
@@ -21833,11 +22103,11 @@
 	enable_regex=yes
 
 fi;
-echo "$as_me:21836: result: $enable_regex" >&5
+echo "$as_me:22106: result: $enable_regex" >&5
 echo "${ECHO_T}$enable_regex" >&6
 if test "$enable_regex" = yes ; then
 
-echo "$as_me:21840: checking if you want to use PCRE2 for regular-expressions" >&5
+echo "$as_me:22110: 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.
@@ -21846,7 +22116,7 @@
 
 fi;
 test -z "$with_pcre2" && with_pcre2=no
-echo "$as_me:21849: result: $with_pcre2" >&5
+echo "$as_me:22119: result: $with_pcre2" >&5
 echo "${ECHO_T}$with_pcre2" >&6
 
 if test "x$with_pcre2" != xno ; then
@@ -21857,17 +22127,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}:21860: testing found package $cf_with_pcre2 ..." 1>&5
+echo "${as_me:-configure}:22130: 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}:21866: testing package $cf_with_pcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:22136: 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}:21870: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:22140: testing package $cf_with_pcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 for cf_required in $cf_with_pcre2
 do
@@ -22005,7 +22275,7 @@
 fi
 
 	done
-	cf_with_pcre2_ok=yes || { { echo "$as_me:22008: error: Cannot find PCRE2 library" >&5
+	cf_with_pcre2_ok=yes || { { echo "$as_me:22278: error: Cannot find PCRE2 library" >&5
 echo "$as_me: error: Cannot find PCRE2 library" >&2;}
    { (exit 1); exit 1; }; }
 
@@ -22018,7 +22288,7 @@
 	(*pcre2-posix*|*pcreposix*)
 		;;
 	(*)
-		echo "$as_me:22021: checking for regcomp in -lpcre2-posix" >&5
+		echo "$as_me:22291: 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
@@ -22026,7 +22296,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcre2-posix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22029 "configure"
+#line 22299 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22045,16 +22315,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22048: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22318: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22051: \$? = $ac_status" >&5
+  echo "$as_me:22321: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22054: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22324: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22057: \$? = $ac_status" >&5
+  echo "$as_me:22327: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pcre2_posix_regcomp=yes
 else
@@ -22065,7 +22335,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22068: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
+echo "$as_me:22338: 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
 
@@ -22086,7 +22356,7 @@
 LIBS="$cf_add_libs"
 
 else
-  echo "$as_me:22089: checking for regcomp in -lpcreposix" >&5
+  echo "$as_me:22359: 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
@@ -22094,7 +22364,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcreposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22097 "configure"
+#line 22367 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22113,16 +22383,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22116: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22386: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22119: \$? = $ac_status" >&5
+  echo "$as_me:22389: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22122: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22392: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22125: \$? = $ac_status" >&5
+  echo "$as_me:22395: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pcreposix_regcomp=yes
 else
@@ -22133,7 +22403,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22136: result: $ac_cv_lib_pcreposix_regcomp" >&5
+echo "$as_me:22406: 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
 
@@ -22154,7 +22424,7 @@
 LIBS="$cf_add_libs"
 
 else
-  { { echo "$as_me:22157: error: Cannot find PCRE2 POSIX library" >&5
+  { { echo "$as_me:22427: error: Cannot find PCRE2 POSIX library" >&5
 echo "$as_me: error: Cannot find PCRE2 POSIX library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -22169,23 +22439,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:22172: checking for $ac_header" >&5
+echo "$as_me:22442: 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 22178 "configure"
+#line 22448 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22182: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22452: \"$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:22188: \$? = $ac_status" >&5
+  echo "$as_me:22458: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22204,7 +22474,7 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:22207: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:22477: 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
@@ -22217,13 +22487,13 @@
 for ac_func in PCRE2regcomp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:22220: checking for $ac_func" >&5
+echo "$as_me:22490: 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 22226 "configure"
+#line 22496 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22254,16 +22524,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22257: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22527: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22260: \$? = $ac_status" >&5
+  echo "$as_me:22530: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22263: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22533: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22266: \$? = $ac_status" >&5
+  echo "$as_me:22536: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -22273,7 +22543,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22276: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:22546: 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
@@ -22287,7 +22557,7 @@
 
 	if test "$with_pcre2" = no ; then
 
-echo "$as_me:22290: checking if you want to use PCRE for regular-expressions" >&5
+echo "$as_me:22560: 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.
@@ -22296,7 +22566,7 @@
 
 fi;
 test -z "$with_pcre" && with_pcre=no
-echo "$as_me:22299: result: $with_pcre" >&5
+echo "$as_me:22569: result: $with_pcre" >&5
 echo "${ECHO_T}$with_pcre" >&6
 
 if test "$with_pcre" != no ; then
@@ -22304,17 +22574,17 @@
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "libpcre"; then
 	test -n "$verbose" && echo "	found package libpcre" 1>&6
 
-echo "${as_me:-configure}:22307: testing found package libpcre ..." 1>&5
+echo "${as_me:-configure}:22577: 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}:22313: testing package libpcre CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:22583: 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}:22317: testing package libpcre LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:22587: testing package libpcre LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 for cf_required in libpcre
 do
@@ -22449,7 +22719,7 @@
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
 
-echo "$as_me:22452: checking for pcre_compile in -lpcre" >&5
+echo "$as_me:22722: 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
@@ -22457,7 +22727,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22460 "configure"
+#line 22730 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22476,16 +22746,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22479: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22749: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22482: \$? = $ac_status" >&5
+  echo "$as_me:22752: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22485: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22755: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22488: \$? = $ac_status" >&5
+  echo "$as_me:22758: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pcre_pcre_compile=yes
 else
@@ -22496,7 +22766,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22499: result: $ac_cv_lib_pcre_pcre_compile" >&5
+echo "$as_me:22769: 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
@@ -22506,7 +22776,7 @@
   LIBS="-lpcre $LIBS"
 
 else
-  { { echo "$as_me:22509: error: Cannot find PCRE library" >&5
+  { { echo "$as_me:22779: error: Cannot find PCRE library" >&5
 echo "$as_me: error: Cannot find PCRE library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -22521,7 +22791,7 @@
 	(*pcreposix*)
 		;;
 	(*)
-		echo "$as_me:22524: checking for pcreposix_regcomp in -lpcreposix" >&5
+		echo "$as_me:22794: 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
@@ -22529,7 +22799,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcreposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22532 "configure"
+#line 22802 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22548,16 +22818,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22551: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22821: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22554: \$? = $ac_status" >&5
+  echo "$as_me:22824: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22557: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22827: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22560: \$? = $ac_status" >&5
+  echo "$as_me:22830: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pcreposix_pcreposix_regcomp=yes
 else
@@ -22568,7 +22838,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22571: result: $ac_cv_lib_pcreposix_pcreposix_regcomp" >&5
+echo "$as_me:22841: 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
 
@@ -22593,7 +22863,7 @@
 LIBS="$cf_add_libs"
 
 else
-  echo "$as_me:22596: checking for regcomp in -lpcreposix" >&5
+  echo "$as_me:22866: 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
@@ -22601,7 +22871,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcreposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22604 "configure"
+#line 22874 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22620,16 +22890,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22623: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22893: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22626: \$? = $ac_status" >&5
+  echo "$as_me:22896: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22629: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22899: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22632: \$? = $ac_status" >&5
+  echo "$as_me:22902: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pcreposix_regcomp=yes
 else
@@ -22640,7 +22910,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22643: result: $ac_cv_lib_pcreposix_regcomp" >&5
+echo "$as_me:22913: 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
 
@@ -22665,7 +22935,7 @@
 LIBS="$cf_add_libs"
 
 else
-  { { echo "$as_me:22668: error: Cannot find PCRE POSIX library" >&5
+  { { echo "$as_me:22938: error: Cannot find PCRE POSIX library" >&5
 echo "$as_me: error: Cannot find PCRE POSIX library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -22683,7 +22953,7 @@
 case "$host_os" in
 (mingw*)
 	# -lsystre -ltre -lintl -liconv
-	echo "$as_me:22686: checking for regcomp in -lsystre" >&5
+	echo "$as_me:22956: 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
@@ -22691,7 +22961,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsystre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22694 "configure"
+#line 22964 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22710,16 +22980,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22713: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22983: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22716: \$? = $ac_status" >&5
+  echo "$as_me:22986: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22719: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22989: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22722: \$? = $ac_status" >&5
+  echo "$as_me:22992: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_systre_regcomp=yes
 else
@@ -22730,11 +23000,11 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22733: result: $ac_cv_lib_systre_regcomp" >&5
+echo "$as_me:23003: 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:22737: checking for libiconv_open in -liconv" >&5
+		echo "$as_me:23007: 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
@@ -22742,7 +23012,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-liconv  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22745 "configure"
+#line 23015 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22761,16 +23031,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22764: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23034: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22767: \$? = $ac_status" >&5
+  echo "$as_me:23037: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22770: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23040: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22773: \$? = $ac_status" >&5
+  echo "$as_me:23043: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_iconv_libiconv_open=yes
 else
@@ -22781,7 +23051,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22784: result: $ac_cv_lib_iconv_libiconv_open" >&5
+echo "$as_me:23054: 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
 
@@ -22803,7 +23073,7 @@
 
 fi
 
-		echo "$as_me:22806: checking for libintl_gettext in -lintl" >&5
+		echo "$as_me:23076: 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
@@ -22811,7 +23081,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22814 "configure"
+#line 23084 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22830,16 +23100,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22833: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23103: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22836: \$? = $ac_status" >&5
+  echo "$as_me:23106: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22839: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23109: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22842: \$? = $ac_status" >&5
+  echo "$as_me:23112: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_intl_libintl_gettext=yes
 else
@@ -22850,7 +23120,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22853: result: $ac_cv_lib_intl_libintl_gettext" >&5
+echo "$as_me:23123: 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
 
@@ -22872,7 +23142,7 @@
 
 fi
 
-		echo "$as_me:22875: checking for tre_regcomp in -ltre" >&5
+		echo "$as_me:23145: 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
@@ -22880,7 +23150,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltre  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22883 "configure"
+#line 23153 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22899,16 +23169,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22902: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23172: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22905: \$? = $ac_status" >&5
+  echo "$as_me:23175: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22908: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23178: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22911: \$? = $ac_status" >&5
+  echo "$as_me:23181: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_tre_tre_regcomp=yes
 else
@@ -22919,7 +23189,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22922: result: $ac_cv_lib_tre_tre_regcomp" >&5
+echo "$as_me:23192: 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
 
@@ -22961,7 +23231,7 @@
 
 else
 
-		echo "$as_me:22964: checking for regcomp in -lgnurx" >&5
+		echo "$as_me:23234: 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
@@ -22969,7 +23239,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnurx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22972 "configure"
+#line 23242 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22988,16 +23258,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22991: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23261: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22994: \$? = $ac_status" >&5
+  echo "$as_me:23264: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22997: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23267: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23000: \$? = $ac_status" >&5
+  echo "$as_me:23270: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gnurx_regcomp=yes
 else
@@ -23008,7 +23278,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23011: result: $ac_cv_lib_gnurx_regcomp" >&5
+echo "$as_me:23281: 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
 
@@ -23036,13 +23306,13 @@
 	;;
 (*)
 	cf_regex_libs="regex re"
-	echo "$as_me:23039: checking for regcomp" >&5
+	echo "$as_me:23309: 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 23045 "configure"
+#line 23315 "configure"
 #include "confdefs.h"
 #define regcomp autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23073,16 +23343,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23076: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23346: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23079: \$? = $ac_status" >&5
+  echo "$as_me:23349: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23082: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23352: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23085: \$? = $ac_status" >&5
+  echo "$as_me:23355: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_regcomp=yes
 else
@@ -23092,7 +23362,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23095: result: $ac_cv_func_regcomp" >&5
+echo "$as_me:23365: 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
@@ -23101,7 +23371,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:23104: checking for regcomp in -l$cf_regex_lib" >&5
+echo "$as_me:23374: 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
@@ -23109,7 +23379,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_regex_lib  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23112 "configure"
+#line 23382 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23128,16 +23398,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23131: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23401: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23134: \$? = $ac_status" >&5
+  echo "$as_me:23404: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23137: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23407: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23140: \$? = $ac_status" >&5
+  echo "$as_me:23410: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -23148,7 +23418,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23151: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:23421: 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
 
@@ -23180,13 +23450,13 @@
 esac
 
 if test "$cf_regex_func" = no ; then
-	echo "$as_me:23183: checking for compile" >&5
+	echo "$as_me:23453: 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 23189 "configure"
+#line 23459 "configure"
 #include "confdefs.h"
 #define compile autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23217,16 +23487,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23220: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23490: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23223: \$? = $ac_status" >&5
+  echo "$as_me:23493: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23226: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23496: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23229: \$? = $ac_status" >&5
+  echo "$as_me:23499: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_compile=yes
 else
@@ -23236,13 +23506,13 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23239: result: $ac_cv_func_compile" >&5
+echo "$as_me:23509: 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:23245: checking for compile in -lgen" >&5
+		echo "$as_me:23515: 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
@@ -23250,7 +23520,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgen  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23253 "configure"
+#line 23523 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23269,16 +23539,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23272: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23542: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23275: \$? = $ac_status" >&5
+  echo "$as_me:23545: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23278: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23548: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23281: \$? = $ac_status" >&5
+  echo "$as_me:23551: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gen_compile=yes
 else
@@ -23289,7 +23559,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23292: result: $ac_cv_lib_gen_compile" >&5
+echo "$as_me:23562: 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
 
@@ -23317,11 +23587,11 @@
 fi
 
 if test "$cf_regex_func" = no ; then
-	{ echo "$as_me:23320: WARNING: cannot find regular expression library" >&5
+	{ echo "$as_me:23590: WARNING: cannot find regular expression library" >&5
 echo "$as_me: WARNING: cannot find regular expression library" >&2;}
 fi
 
-echo "$as_me:23324: checking for regular-expression headers" >&5
+echo "$as_me:23594: 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
@@ -23333,7 +23603,7 @@
 	for cf_regex_hdr in regexp.h regexpr.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 23336 "configure"
+#line 23606 "configure"
 #include "confdefs.h"
 #include <$cf_regex_hdr>
 int
@@ -23350,16 +23620,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23353: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23623: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23356: \$? = $ac_status" >&5
+  echo "$as_me:23626: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23359: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23629: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23362: \$? = $ac_status" >&5
+  echo "$as_me:23632: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -23376,7 +23646,7 @@
 	for cf_regex_hdr in regex.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 23379 "configure"
+#line 23649 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <stdio.h>
@@ -23397,16 +23667,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23400: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23670: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23403: \$? = $ac_status" >&5
+  echo "$as_me:23673: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23406: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23676: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23409: \$? = $ac_status" >&5
+  echo "$as_me:23679: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_regex_hdrs=$cf_regex_hdr
@@ -23422,11 +23692,11 @@
 esac
 
 fi
-echo "$as_me:23425: result: $cf_cv_regex_hdrs" >&5
+echo "$as_me:23695: result: $cf_cv_regex_hdrs" >&5
 echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
 
 case "$cf_cv_regex_hdrs" in
-	(no)		{ echo "$as_me:23429: WARNING: no regular expression header found" >&5
+	(no)		{ echo "$as_me:23699: WARNING: no regular expression header found" >&5
 echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
 	(regex.h)
 cat >>confdefs.h <<\EOF
@@ -23446,7 +23716,7 @@
 esac
 
 			if test "X$cf_cv_regex_hdrs" != "Xregex.h" ; then
-				{ { echo "$as_me:23449: error: Only POSIX, PCRE, or PCRE2 regular expressions are supported" >&5
+				{ { echo "$as_me:23719: 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
@@ -23459,7 +23729,7 @@
 
 fi
 
-echo "$as_me:23462: checking if you want support for right-scrollbar" >&5
+echo "$as_me:23732: 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.
@@ -23476,7 +23746,7 @@
 	enable_rightbar=yes
 
 fi;
-echo "$as_me:23479: result: $enable_rightbar" >&5
+echo "$as_me:23749: result: $enable_rightbar" >&5
 echo "${ECHO_T}$enable_rightbar" >&6
 if test "$enable_rightbar" = yes ; then
 
@@ -23486,7 +23756,7 @@
 
 fi
 
-echo "$as_me:23489: checking if you want check for redundant name-change" >&5
+echo "$as_me:23759: 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.
@@ -23503,14 +23773,14 @@
 	enable_samename=yes
 
 fi;
-echo "$as_me:23506: result: $enable_samename" >&5
+echo "$as_me:23776: 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:23513: checking if you want support for selection-actions" >&5
+echo "$as_me:23783: 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.
@@ -23527,14 +23797,14 @@
 	enable_selection_ops=yes
 
 fi;
-echo "$as_me:23530: result: $enable_selection_ops" >&5
+echo "$as_me:23800: 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:23537: checking if you want support for session management" >&5
+echo "$as_me:23807: 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.
@@ -23551,14 +23821,14 @@
 	enable_session_mgt=yes
 
 fi;
-echo "$as_me:23554: result: $enable_session_mgt" >&5
+echo "$as_me:23824: 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:23561: checking if you want support for status-line" >&5
+echo "$as_me:23831: checking if you want support for status-line" >&5
 echo $ECHO_N "checking if you want support for status-line... $ECHO_C" >&6
 
 # Check whether --enable-status-line or --disable-status-line was given.
@@ -23575,14 +23845,14 @@
 	enable_status_line=no
 
 fi;
-echo "$as_me:23578: result: $enable_status_line" >&5
+echo "$as_me:23848: result: $enable_status_line" >&5
 echo "${ECHO_T}$enable_status_line" >&6
 test "$enable_status_line" = yes &&
 cat >>confdefs.h <<\EOF
 #define OPT_STATUS_LINE 1
 EOF
 
-echo "$as_me:23585: checking if you want to use termcap function-keys" >&5
+echo "$as_me:23855: 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.
@@ -23599,14 +23869,14 @@
 	enable_tcap_fkeys=yes
 
 fi;
-echo "$as_me:23602: result: $enable_tcap_fkeys" >&5
+echo "$as_me:23872: result: $enable_tcap_fkeys" >&5
 echo "${ECHO_T}$enable_tcap_fkeys" >&6
 test "$enable_tcap_fkeys" = no &&
 cat >>confdefs.h <<\EOF
 #define OPT_TCAP_FKEYS 0
 EOF
 
-echo "$as_me:23609: checking if you want to use termcap-query/report" >&5
+echo "$as_me:23879: 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.
@@ -23623,14 +23893,14 @@
 	enable_tcap_query=yes
 
 fi;
-echo "$as_me:23626: result: $enable_tcap_query" >&5
+echo "$as_me:23896: result: $enable_tcap_query" >&5
 echo "${ECHO_T}$enable_tcap_query" >&6
 test "$enable_tcap_query" = no &&
 cat >>confdefs.h <<\EOF
 #define OPT_TCAP_QUERY 0
 EOF
 
-echo "$as_me:23633: checking if you want support for tek4014" >&5
+echo "$as_me:23903: 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.
@@ -23647,7 +23917,7 @@
 	enable_tek4014=yes
 
 fi;
-echo "$as_me:23650: result: $enable_tek4014" >&5
+echo "$as_me:23920: result: $enable_tek4014" >&5
 echo "${ECHO_T}$enable_tek4014" >&6
 if test "$enable_tek4014" = no ; then
 
@@ -23661,7 +23931,7 @@
 	EXTRAOBJS="$EXTRAOBJS TekPrsTbl.o Tekproc.o"
 fi
 
-echo "$as_me:23664: checking if you want pulldown menus with a toolbar" >&5
+echo "$as_me:23934: 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.
@@ -23678,7 +23948,7 @@
 	enable_toolbar=no
 
 fi;
-echo "$as_me:23681: result: $enable_toolbar" >&5
+echo "$as_me:23951: result: $enable_toolbar" >&5
 echo "${ECHO_T}$enable_toolbar" >&6
 if test "$enable_toolbar" = yes ; then
 
@@ -23688,7 +23958,7 @@
 
 fi
 
-echo "$as_me:23691: checking if you want VT52 emulation" >&5
+echo "$as_me:23961: 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.
@@ -23705,14 +23975,14 @@
 	enable_vt52=yes
 
 fi;
-echo "$as_me:23708: result: $enable_vt52" >&5
+echo "$as_me:23978: 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:23715: checking if you want wide-attribute support" >&5
+echo "$as_me:23985: 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.
@@ -23729,16 +23999,16 @@
 	enable_wattr=yes
 
 fi;
-echo "$as_me:23732: result: $enable_wattr" >&5
+echo "$as_me:24002: 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:23736: WARNING: overriding wide-attributes to support direct color" >&5
+	{ echo "$as_me:24006: 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:23741: checking if you want wide-character support" >&5
+echo "$as_me:24011: 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.
@@ -23755,14 +24025,14 @@
 	enable_wchar=yes
 
 fi;
-echo "$as_me:23758: result: $enable_wchar" >&5
+echo "$as_me:24028: 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:23765: checking if you want only 16-bit character support" >&5
+echo "$as_me:24035: 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.
@@ -23779,7 +24049,7 @@
 	enable_16bit_chars=no
 
 fi;
-echo "$as_me:23782: result: $enable_16bit_chars" >&5
+echo "$as_me:24052: result: $enable_16bit_chars" >&5
 echo "${ECHO_T}$enable_16bit_chars" >&6
 
 if test "$enable_16bit_chars" = yes ; then
@@ -23793,7 +24063,7 @@
 
 if test "$enable_wchar" = yes ; then
 
-echo "$as_me:23796: checking if you want to use mini-luit/Latin9 built-in support" >&5
+echo "$as_me:24066: 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.
@@ -23810,7 +24080,7 @@
 	enable_mini_luit=no
 
 fi;
-echo "$as_me:23813: result: $enable_mini_luit" >&5
+echo "$as_me:24083: result: $enable_mini_luit" >&5
 echo "${ECHO_T}$enable_mini_luit" >&6
 if test "$enable_mini_luit" = yes ; then
 
@@ -23820,7 +24090,7 @@
 
 fi
 
-echo "$as_me:23823: checking if you want to use luit" >&5
+echo "$as_me:24093: 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.
@@ -23837,7 +24107,7 @@
 	enable_luit=yes
 
 fi;
-echo "$as_me:23840: result: $enable_luit" >&5
+echo "$as_me:24110: result: $enable_luit" >&5
 echo "${ECHO_T}$enable_luit" >&6
 if test "$enable_luit" = yes ; then
 
@@ -23850,7 +24120,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:23853: checking for $ac_word" >&5
+echo "$as_me:24123: 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
@@ -23867,7 +24137,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:23870: found $ac_dir/$ac_word" >&5
+   echo "$as_me:24140: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -23878,10 +24148,10 @@
 LUIT=$ac_cv_path_LUIT
 
 if test -n "$LUIT"; then
-  echo "$as_me:23881: result: $LUIT" >&5
+  echo "$as_me:24151: result: $LUIT" >&5
 echo "${ECHO_T}$LUIT" >&6
 else
-  echo "$as_me:23884: result: no" >&5
+  echo "$as_me:24154: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -23938,7 +24208,7 @@
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:23941: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:24211: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define LUIT_PATH "$cf_path_prog"
@@ -23962,7 +24232,7 @@
 	EXTRAOBJS="$EXTRAOBJS charclass.o precompose.o wcwidth.o"
 fi
 
-echo "$as_me:23965: checking if you want dynamic-abbreviation support" >&5
+echo "$as_me:24235: 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.
@@ -23979,7 +24249,7 @@
 	enable_dabbrev=no
 
 fi;
-echo "$as_me:23982: result: $enable_dabbrev" >&5
+echo "$as_me:24252: result: $enable_dabbrev" >&5
 echo "${ECHO_T}$enable_dabbrev" >&6
 if test "$enable_dabbrev" = yes ; then
 
@@ -23989,7 +24259,7 @@
 
 fi
 
-echo "$as_me:23992: checking if you want DECterm Locator support" >&5
+echo "$as_me:24262: 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.
@@ -24006,7 +24276,7 @@
 	enable_dec_locator=no
 
 fi;
-echo "$as_me:24009: result: $enable_dec_locator" >&5
+echo "$as_me:24279: result: $enable_dec_locator" >&5
 echo "${ECHO_T}$enable_dec_locator" >&6
 if test "$enable_dec_locator" = yes ; then
 
@@ -24016,7 +24286,7 @@
 
 fi
 
-echo "$as_me:24019: checking if you want XHTML and SVG screen dump support" >&5
+echo "$as_me:24289: 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.
@@ -24033,7 +24303,7 @@
 	enable_screen_dumps=yes
 
 fi;
-echo "$as_me:24036: result: $enable_screen_dumps" >&5
+echo "$as_me:24306: 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"
@@ -24046,7 +24316,7 @@
 
 fi
 
-echo "$as_me:24049: checking if you want ReGIS graphics support" >&5
+echo "$as_me:24319: 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.
@@ -24063,7 +24333,7 @@
 	enable_regis_graphics=no
 
 fi;
-echo "$as_me:24066: result: $enable_regis_graphics" >&5
+echo "$as_me:24336: result: $enable_regis_graphics" >&5
 echo "${ECHO_T}$enable_regis_graphics" >&6
 if test "$enable_regis_graphics" = yes ; then
 
@@ -24075,14 +24345,14 @@
 	EXTRASRCS="$EXTRASRCS graphics_regis.c"
 	EXTRAOBJS="$EXTRAOBJS graphics_regis.o"
 
-echo "$as_me:24078: checking if -lm needed for math functions" >&5
+echo "$as_me:24348: 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 24085 "configure"
+#line 24355 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -24098,16 +24368,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24101: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24371: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24104: \$? = $ac_status" >&5
+  echo "$as_me:24374: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24107: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24377: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24110: \$? = $ac_status" >&5
+  echo "$as_me:24380: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libm=no
 else
@@ -24117,7 +24387,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24120: result: $cf_cv_need_libm" >&5
+echo "$as_me:24390: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 
 if test "$cf_cv_need_libm" = yes
@@ -24125,14 +24395,14 @@
 
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lm"
-	echo "$as_me:24128: checking if -lm is available for math functions" >&5
+	echo "$as_me:24398: checking if -lm is available for math functions" >&5
 echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6
 if test "${cf_cv_have_libm+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24135 "configure"
+#line 24405 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -24148,16 +24418,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24151: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24421: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24154: \$? = $ac_status" >&5
+  echo "$as_me:24424: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24157: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24427: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24160: \$? = $ac_status" >&5
+  echo "$as_me:24430: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_libm=yes
 else
@@ -24167,7 +24437,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24170: result: $cf_cv_have_libm" >&5
+echo "$as_me:24440: result: $cf_cv_have_libm" >&5
 echo "${ECHO_T}$cf_cv_have_libm" >&6
 	LIBS="$cf_save_LIBS"
 
@@ -24206,7 +24476,7 @@
 
 fi
 
-echo "$as_me:24209: checking if you want sixel graphics support" >&5
+echo "$as_me:24479: 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.
@@ -24223,7 +24493,7 @@
 	enable_sixel_graphics=yes
 
 fi;
-echo "$as_me:24226: result: $enable_sixel_graphics" >&5
+echo "$as_me:24496: result: $enable_sixel_graphics" >&5
 echo "${ECHO_T}$enable_sixel_graphics" >&6
 if test "$enable_sixel_graphics" = yes ; then
 
@@ -24250,7 +24520,7 @@
 	STRINGS_MAX=20000
 fi
 
-echo "$as_me:24253: checking if you want sixel screen dump support" >&5
+echo "$as_me:24523: 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.
@@ -24267,7 +24537,7 @@
 	enable_print_graphics=$enable_regis_graphics
 
 fi;
-echo "$as_me:24270: result: $enable_print_graphics" >&5
+echo "$as_me:24540: result: $enable_print_graphics" >&5
 echo "${ECHO_T}$enable_print_graphics" >&6
 if test "$enable_print_graphics" = yes ; then
 
@@ -24277,7 +24547,7 @@
 
 fi
 
-echo "$as_me:24280: checking if you want VT420 rectangle support" >&5
+echo "$as_me:24550: 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.
@@ -24294,7 +24564,7 @@
 	enable_rectangles=yes
 
 fi;
-echo "$as_me:24297: result: $enable_rectangles" >&5
+echo "$as_me:24567: result: $enable_rectangles" >&5
 echo "${ECHO_T}$enable_rectangles" >&6
 if test "$enable_rectangles" = no ; then
 
@@ -24304,7 +24574,7 @@
 
 fi
 
-echo "$as_me:24307: checking if you want -ziconbeep option" >&5
+echo "$as_me:24577: 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.
@@ -24321,7 +24591,7 @@
 	enable_ziconbeep=yes
 
 fi;
-echo "$as_me:24324: result: $enable_ziconbeep" >&5
+echo "$as_me:24594: result: $enable_ziconbeep" >&5
 echo "${ECHO_T}$enable_ziconbeep" >&6
 test "$enable_ziconbeep" = no &&
 cat >>confdefs.h <<\EOF
@@ -24330,7 +24600,7 @@
 
 ###############################################################################
 
-echo "$as_me:24333: checking if you want debugging traces" >&5
+echo "$as_me:24603: 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.
@@ -24347,7 +24617,7 @@
 	enable_trace=no
 
 fi;
-echo "$as_me:24350: result: $enable_trace" >&5
+echo "$as_me:24620: result: $enable_trace" >&5
 echo "${ECHO_T}$enable_trace" >&6
 if test "$enable_trace" = yes ; then
 
@@ -24359,7 +24629,7 @@
 	EXTRAOBJS="$EXTRAOBJS trace.o"
 fi
 
-echo "$as_me:24362: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:24632: 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.
@@ -24381,7 +24651,7 @@
 else
   with_dmalloc=
 fi;
-echo "$as_me:24384: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:24654: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -24495,23 +24765,23 @@
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:24498: checking for dmalloc.h" >&5
+	echo "$as_me:24768: 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 24504 "configure"
+#line 24774 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:24508: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:24778: \"$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:24514: \$? = $ac_status" >&5
+  echo "$as_me:24784: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -24530,11 +24800,11 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:24533: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:24803: 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:24537: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:24807: 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
@@ -24542,7 +24812,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 24545 "configure"
+#line 24815 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24561,16 +24831,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24564: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24834: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24567: \$? = $ac_status" >&5
+  echo "$as_me:24837: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24570: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24840: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24573: \$? = $ac_status" >&5
+  echo "$as_me:24843: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -24581,7 +24851,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24584: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:24854: 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
@@ -24596,7 +24866,7 @@
 
 fi
 
-echo "$as_me:24599: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:24869: 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.
@@ -24618,7 +24888,7 @@
 else
   with_dbmalloc=
 fi;
-echo "$as_me:24621: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:24891: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -24732,23 +25002,23 @@
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:24735: checking for dbmalloc.h" >&5
+	echo "$as_me:25005: 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 24741 "configure"
+#line 25011 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:24745: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25015: \"$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:24751: \$? = $ac_status" >&5
+  echo "$as_me:25021: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -24767,11 +25037,11 @@
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:24770: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:25040: 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:24774: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:25044: 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
@@ -24779,7 +25049,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 24782 "configure"
+#line 25052 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24798,16 +25068,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24801: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25071: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24804: \$? = $ac_status" >&5
+  echo "$as_me:25074: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24807: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25077: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24810: \$? = $ac_status" >&5
+  echo "$as_me:25080: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -24818,7 +25088,7 @@
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24821: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:25091: 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
@@ -24833,7 +25103,7 @@
 
 fi
 
-echo "$as_me:24836: checking if you want to use valgrind for testing" >&5
+echo "$as_me:25106: 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.
@@ -24855,7 +25125,7 @@
 else
   with_valgrind=
 fi;
-echo "$as_me:24858: result: ${with_valgrind:-no}" >&5
+echo "$as_me:25128: result: ${with_valgrind:-no}" >&5
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case ".$with_cflags" in
@@ -24968,7 +25238,7 @@
 	;;
 esac
 
-echo "$as_me:24971: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:25241: 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.
@@ -24979,7 +25249,7 @@
   enable_leaks=yes
 fi;
 if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
-echo "$as_me:24982: result: $with_no_leaks" >&5
+echo "$as_me:25252: result: $with_no_leaks" >&5
 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$enable_leaks" = no ; then
@@ -24994,7 +25264,7 @@
 
 fi
 
-echo "$as_me:24997: checking if you want to see long compiling messages" >&5
+echo "$as_me:25267: 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.
@@ -25028,10 +25298,10 @@
 	ECHO_CC=''
 
 fi;
-echo "$as_me:25031: result: $enableval" >&5
+echo "$as_me:25301: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:25034: checking if you want magic cookie emulation" >&5
+echo "$as_me:25304: 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.
@@ -25048,7 +25318,7 @@
 	enable_xmc=no
 
 fi;
-echo "$as_me:25051: result: $enable_xmc" >&5
+echo "$as_me:25321: result: $enable_xmc" >&5
 echo "${ECHO_T}$enable_xmc" >&6
 if test "$enable_xmc" = yes ; then
 
@@ -25063,13 +25333,13 @@
 for ac_func in tigetstr
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:25066: checking for $ac_func" >&5
+echo "$as_me:25336: 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 25072 "configure"
+#line 25342 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -25100,16 +25370,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25103: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25373: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25106: \$? = $ac_status" >&5
+  echo "$as_me:25376: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25109: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25379: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25112: \$? = $ac_status" >&5
+  echo "$as_me:25382: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -25119,7 +25389,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:25122: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:25392: 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
@@ -25134,13 +25404,13 @@
 for ac_func in use_extended_names
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:25137: checking for $ac_func" >&5
+echo "$as_me:25407: 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 25143 "configure"
+#line 25413 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -25171,16 +25441,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25174: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25444: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25177: \$? = $ac_status" >&5
+  echo "$as_me:25447: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25180: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25450: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25183: \$? = $ac_status" >&5
+  echo "$as_me:25453: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -25190,7 +25460,7 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:25193: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:25463: 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
@@ -25202,7 +25472,7 @@
 
 fi
 
-echo "$as_me:25205: checking if you want to use C11 _Noreturn feature" >&5
+echo "$as_me:25475: 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.
@@ -25219,17 +25489,17 @@
 	enable_stdnoreturn=no
 
 fi;
-echo "$as_me:25222: result: $enable_stdnoreturn" >&5
+echo "$as_me:25492: result: $enable_stdnoreturn" >&5
 echo "${ECHO_T}$enable_stdnoreturn" >&6
 
 if test $enable_stdnoreturn = yes; then
-echo "$as_me:25226: checking for C11 _Noreturn feature" >&5
+echo "$as_me:25496: 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 25232 "configure"
+#line 25502 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -25245,16 +25515,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25248: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25518: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25251: \$? = $ac_status" >&5
+  echo "$as_me:25521: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25254: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25524: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25257: \$? = $ac_status" >&5
+  echo "$as_me:25527: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_c11_noreturn=yes
 else
@@ -25265,7 +25535,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:25268: result: $cf_cv_c11_noreturn" >&5
+echo "$as_me:25538: result: $cf_cv_c11_noreturn" >&5
 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
 	cf_cv_c11_noreturn=no,
@@ -25321,16 +25591,16 @@
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:25324: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:25594: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:25329: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:25599: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:25333: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:25603: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -25369,16 +25639,16 @@
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:25372: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:25642: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:25377: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:25647: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:25381: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:25651: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -25417,23 +25687,23 @@
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:25420: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:25690: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:25425: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:25695: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:25429: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:25699: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:25436: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:25706: 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.
@@ -25450,7 +25720,7 @@
 	enable_warnings=no
 
 fi;
-echo "$as_me:25453: result: $enable_warnings" >&5
+echo "$as_me:25723: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -25474,7 +25744,7 @@
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 25477 "configure"
+#line 25747 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -25489,26 +25759,26 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25492: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25762: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25495: \$? = $ac_status" >&5
+  echo "$as_me:25765: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25498: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25768: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25501: \$? = $ac_status" >&5
+  echo "$as_me:25771: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:25504: checking for X11/Xt const-feature" >&5
+echo "$as_me:25774: 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 25511 "configure"
+#line 25781 "configure"
 #include "confdefs.h"
 
 #undef  _CONST_X_STRING
@@ -25526,16 +25796,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25529: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25799: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25532: \$? = $ac_status" >&5
+  echo "$as_me:25802: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25535: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25805: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25538: \$? = $ac_status" >&5
+  echo "$as_me:25808: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -25550,7 +25820,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:25553: result: $cf_cv_const_x_string" >&5
+echo "$as_me:25823: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -25579,7 +25849,7 @@
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 25582 "${as_me:-configure}"
+#line 25852 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -25595,7 +25865,7 @@
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:25598: checking for $CC warning options..." >&5
+	{ echo "$as_me:25868: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -25611,12 +25881,12 @@
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:25614: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:25884: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25617: \$? = $ac_status" >&5
+  echo "$as_me:25887: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:25619: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:25889: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -25624,7 +25894,7 @@
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:25627: checking for $CC warning options..." >&5
+	{ echo "$as_me:25897: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -25647,12 +25917,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:25650: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:25920: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25653: \$? = $ac_status" >&5
+  echo "$as_me:25923: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:25655: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:25925: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -25660,7 +25930,7 @@
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:25663: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:25933: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -25670,7 +25940,7 @@
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:25673: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:25943: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -25703,10 +25973,10 @@
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:25706: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:25976: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 25709 "${as_me:-configure}"
+#line 25979 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -25756,12 +26026,12 @@
 			;;
 		esac
 
-		if { (eval echo "$as_me:25759: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:26029: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25762: \$? = $ac_status" >&5
+  echo "$as_me:26032: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:25764: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:26034: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -25859,7 +26129,7 @@
 	CPPFLAGS=`echo "$CPPFLAGS" | sed -e s/-D$cf_def//`
 done
 
-echo "$as_me:25862: checking if filesystem supports mixed-case filenames" >&5
+echo "$as_me:26132: 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
@@ -25886,7 +26156,7 @@
 fi
 
 fi
-echo "$as_me:25889: result: $cf_cv_mixedcase" >&5
+echo "$as_me:26159: result: $cf_cv_mixedcase" >&5
 echo "${ECHO_T}$cf_cv_mixedcase" >&6
 test "$cf_cv_mixedcase" = yes &&
 cat >>confdefs.h <<\EOF
@@ -25897,7 +26167,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:25900: checking for $ac_word" >&5
+echo "$as_me:26170: 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
@@ -25912,7 +26182,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CTAGS="$ac_prog"
-echo "$as_me:25915: found $ac_dir/$ac_word" >&5
+echo "$as_me:26185: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -25920,10 +26190,10 @@
 fi
 CTAGS=$ac_cv_prog_CTAGS
 if test -n "$CTAGS"; then
-  echo "$as_me:25923: result: $CTAGS" >&5
+  echo "$as_me:26193: result: $CTAGS" >&5
 echo "${ECHO_T}$CTAGS" >&6
 else
-  echo "$as_me:25926: result: no" >&5
+  echo "$as_me:26196: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25934,7 +26204,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:25937: checking for $ac_word" >&5
+echo "$as_me:26207: 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
@@ -25949,7 +26219,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ETAGS="$ac_prog"
-echo "$as_me:25952: found $ac_dir/$ac_word" >&5
+echo "$as_me:26222: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -25957,10 +26227,10 @@
 fi
 ETAGS=$ac_cv_prog_ETAGS
 if test -n "$ETAGS"; then
-  echo "$as_me:25960: result: $ETAGS" >&5
+  echo "$as_me:26230: result: $ETAGS" >&5
 echo "${ECHO_T}$ETAGS" >&6
 else
-  echo "$as_me:25963: result: no" >&5
+  echo "$as_me:26233: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25969,7 +26239,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:25972: checking for $ac_word" >&5
+echo "$as_me:26242: 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
@@ -25984,7 +26254,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:25987: found $ac_dir/$ac_word" >&5
+echo "$as_me:26257: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -25993,17 +26263,17 @@
 fi
 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
 if test -n "$MAKE_LOWER_TAGS"; then
-  echo "$as_me:25996: result: $MAKE_LOWER_TAGS" >&5
+  echo "$as_me:26266: result: $MAKE_LOWER_TAGS" >&5
 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
 else
-  echo "$as_me:25999: result: no" >&5
+  echo "$as_me:26269: 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:26006: checking for $ac_word" >&5
+echo "$as_me:26276: 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
@@ -26018,7 +26288,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:26021: found $ac_dir/$ac_word" >&5
+echo "$as_me:26291: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -26027,10 +26297,10 @@
 fi
 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
 if test -n "$MAKE_UPPER_TAGS"; then
-  echo "$as_me:26030: result: $MAKE_UPPER_TAGS" >&5
+  echo "$as_me:26300: result: $MAKE_UPPER_TAGS" >&5
 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
 else
-  echo "$as_me:26033: result: no" >&5
+  echo "$as_me:26303: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -26053,7 +26323,7 @@
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then
-	echo "$as_me:26056: checking for an rpath option" >&5
+	echo "$as_me:26326: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	case "$cf_cv_system_name" in
 	(irix*)
@@ -26084,12 +26354,12 @@
 	(*)
 		;;
 	esac
-	echo "$as_me:26087: result: $LD_RPATH_OPT" >&5
+	echo "$as_me:26357: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 	case "x$LD_RPATH_OPT" in
 	(x-R*)
-		echo "$as_me:26092: checking if we need a space after rpath option" >&5
+		echo "$as_me:26362: 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"
 
@@ -26110,7 +26380,7 @@
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 26113 "configure"
+#line 26383 "configure"
 #include "confdefs.h"
 
 int
@@ -26122,16 +26392,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:26125: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26395: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26128: \$? = $ac_status" >&5
+  echo "$as_me:26398: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:26131: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26401: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26134: \$? = $ac_status" >&5
+  echo "$as_me:26404: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_space=no
 else
@@ -26141,14 +26411,14 @@
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 		LIBS="$cf_save_LIBS"
-		echo "$as_me:26144: result: $cf_rpath_space" >&5
+		echo "$as_me:26414: 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:26151: checking if rpath-hack should be disabled" >&5
+echo "$as_me:26421: 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.
@@ -26166,22 +26436,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:26169: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:26439: result: $cf_disable_rpath_hack" >&5
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 
 if test "$enable_rpath_hack" = yes ; then
 
-echo "$as_me:26174: checking for updated LDFLAGS" >&5
+echo "$as_me:26444: 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:26177: result: maybe" >&5
+	echo "$as_me:26447: 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:26184: checking for $ac_word" >&5
+echo "$as_me:26454: 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
@@ -26196,7 +26466,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:26199: found $ac_dir/$ac_word" >&5
+echo "$as_me:26469: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -26204,10 +26474,10 @@
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:26207: result: $cf_ldd_prog" >&5
+  echo "$as_me:26477: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:26210: result: no" >&5
+  echo "$as_me:26480: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -26221,7 +26491,7 @@
 		cf_rpath_oops=
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26224 "configure"
+#line 26494 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -26233,16 +26503,16 @@
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:26236: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26506: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26239: \$? = $ac_status" >&5
+  echo "$as_me:26509: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:26242: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26512: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26245: \$? = $ac_status" >&5
+  echo "$as_me:26515: \$? = $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`
@@ -26270,7 +26540,7 @@
 					then
 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
 
-echo "${as_me:-configure}:26273: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:26543: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 
 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
 						break
@@ -26282,11 +26552,11 @@
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:26285: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:26555: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:26289: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:26559: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -26323,7 +26593,7 @@
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:26326: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:26596: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -26336,11 +26606,11 @@
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:26339: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:26609: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:26343: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:26613: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -26377,7 +26647,7 @@
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:26380: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:26650: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -26390,14 +26660,14 @@
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:26393: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:26663: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:26397: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:26667: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 else
-	echo "$as_me:26400: result: no" >&5
+	echo "$as_me:26670: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -26492,7 +26762,7 @@
 : "${CONFIG_STATUS=./config.status}"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:26495: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:26765: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -26670,7 +26940,7 @@
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:26673: error: ambiguous option: $1
+    { { echo "$as_me:26943: 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;}
@@ -26689,7 +26959,7 @@
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:26692: error: unrecognized option: $1
+  -*) { { echo "$as_me:26962: 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;}
@@ -26729,7 +26999,7 @@
   "minstall" ) CONFIG_FILES="$CONFIG_FILES minstall:minstall.in" ;;
   "run-tic.sh" ) CONFIG_FILES="$CONFIG_FILES run-tic.sh:run-tic.in" ;;
   "xtermcfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS xtermcfg.h:xtermcfg.hin" ;;
-  *) { { echo "$as_me:26732: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:27002: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -27060,7 +27330,7 @@
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:27063: creating $ac_file" >&5
+    { echo "$as_me:27333: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -27078,7 +27348,7 @@
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:27081: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:27351: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -27091,7 +27361,7 @@
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:27094: error: cannot find input file: $f" >&5
+           { { echo "$as_me:27364: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -27107,7 +27377,7 @@
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:27110: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:27380: 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;}
@@ -27116,7 +27386,7 @@
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:27119: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:27389: 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;}
@@ -27161,7 +27431,7 @@
             ac_init=`$EGREP '[ 	]*'$ac_name'[ 	]*=' "$ac_file"`
             if test -z "$ac_init"; then
               ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'`
-              { echo "$as_me:27164: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:27434: 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;}
@@ -27172,7 +27442,7 @@
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:27175: WARNING: Some variables may not be substituted:
+      { echo "$as_me:27445: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -27221,7 +27491,7 @@
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:27224: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:27494: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -27232,7 +27502,7 @@
       -) echo "$tmp"/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:27235: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:27505: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -27245,7 +27515,7 @@
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:27248: error: cannot find input file: $f" >&5
+           { { echo "$as_me:27518: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -27364,7 +27634,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:27367: $ac_file is unchanged" >&5
+      { echo "$as_me:27637: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
Index: ctlseqs.ms
--- xterm-399+/ctlseqs.ms	2025-03-30 21:12:29.000000000 +0000
+++ xterm-400/ctlseqs.ms	2025-06-08 23:01:30.000000000 +0000
@@ -1,11 +1,8 @@
 .\"#! troff -ms $1		-*- Nroff -*-
-.\" "XTerm Control Sequences" document
-.\" $XTermId: ctlseqs.ms,v 1.736 2025/03/30 21:12:29 tom Exp $
-.\"
-.\"
+.\" $XTermId: ctlseqs.ms,v 1.738 2025/06/08 23:01:30 tom Exp $
+.\" ---------------------------------------------------------------------------
 .\" Copyright 1996-2024,2025 by Thomas E. Dickey
-.\"
-.\"                         All Rights Reserved
+.\" Copyright 1991, 1994 X Consortium
 .\"
 .\" Permission is hereby granted, free of charge, to any person obtaining a
 .\" copy of this software and associated documentation files (the
@@ -30,47 +27,21 @@
 .\" holders shall not be used in advertising or otherwise to promote the
 .\" sale, use or other dealings in this Software without prior written
 .\" authorization.
-.\"
-.\"
-.\" Copyright 1991, 1994 X Consortium
-.\"
-.\" Permission is hereby granted, free of charge, to any person obtaining
-.\" a copy of this software and associated documentation files (the
-.\" "Software"), to deal in the Software without restriction, including
-.\" without limitation the rights to use, copy, modify, merge, publish,
-.\" distribute, sublicense, and/or sell copies of the Software, and to
-.\" permit persons to whom the Software is furnished to do so, subject to
-.\" the following conditions:
-.\"
-.\" The above copyright notice and this permission notice shall be
-.\" included in all copies or substantial portions of the Software.
-.\"
-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-.\" EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-.\" IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
-.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-.\" OTHER DEALINGS IN THE SOFTWARE.
-.\"
-.\" Except as contained in this notice, the name of the X Consortium shall
-.\" not be used in advertising or otherwise to promote the sale, use or
-.\" other dealings in this Software without prior written authorization
-.\" from the X Consortium.
-.\"
+.\" ---------------------------------------------------------------------------
 .\" X Window System is a trademark of X Consortium, Inc.
 .\"
 .\" Originally written by Edward Moy, University of California,
 .\" Berkeley, edmoy@violet.berkeley.edu, for the X.V10R4 xterm.
 .\" The X Consortium staff has since updated it for X11.
 .\" Updated by Thomas E. Dickey for XFree86 3.2 - XFree86 4.3, and afterward.
-.\"
+.\" ---------------------------------------------------------------------------
+.\" "XTerm Control Sequences" document
 .\" Run this file through troff and use the -ms macro package.
 .\"
 .ds XT XTerm
 .ds xt xterm
-.ds LF Patch #398
-.ds RF 2025/03/30
+.ds LF Patch #400
+.ds RF 2025/06/08
 .\"
 .if n .pl 9999v		\" no page breaks in nroff
 .ND
@@ -1061,9 +1032,14 @@
 The string following the \*(``q\*('' is a list of names
 encoded in hexadecimal (2 digits per character)
 separated by \*;
-which correspond to termcap or terminfo key names.
+which correspond to termcap or terminfo
+capability names for special keyboard keys.
+A terminal description will include other capabilities,
+e.g., for cursor movement,
+which are intentionally not part of this interface.
 .br
-A few special features are also recognized, which are not key names:
+A few more terminal capabilities are recognized,
+which are not names of special keys:
 .RS
 .bP
 \fICo\fP for termcap colors (or \fIcolors\fP for terminfo colors),
@@ -1077,6 +1053,16 @@
 since termcap applications cannot use this information.
 .RE
 .sP
+These capabilities fall into two categories:
+.RS
+.bP
+Terminal capabilities which may be dynamically adjusted in \fI\*(xt\fP
+so they do not necessarily match a terminal description.
+.bP
+The name of the terminal description,
+which an application can use to obtain the static set of capabilities.
+.RE
+.sP
 \fI\*(xt\fP responds with
 .br
 \*(Dc\*1\*+\*r\*(Pt\*s\*(ST
Index: ctlseqs.txt
--- xterm-399+/ctlseqs.txt	2025-03-30 21:12:45.000000000 +0000
+++ xterm-400/ctlseqs.txt	2025-06-08 23:01:30.000000000 +0000
@@ -21,7 +21,7 @@
                              Thomas Dickey
                       XFree86 Project (1996-2006)
                     invisible-island.net (2006-2025)
-               updated for XTerm Patch #398 (2025/03/30)
+               updated for XTerm Patch #400 (2025/06/08)
 
 
 
@@ -546,9 +546,12 @@
           Request Termcap/Terminfo String (XTGETTCAP), xterm.  The
           string following the "q" is a list of names encoded in
           hexadecimal (2 digits per character) separated by ; which
-          correspond to termcap or terminfo key names.
-          A few special features are also recognized, which are not key
-          names:
+          correspond to termcap or terminfo capability names for special
+          keyboard keys.  A terminal description will include other
+          capabilities, e.g., for cursor movement, which are
+          intentionally not part of this interface.
+          A few more terminal capabilities are recognized, which are not
+          names of special keys:
 
           o   Co for termcap colors (or colors for terminfo colors), and
 
@@ -558,6 +561,15 @@
               Only a terminfo name is provided, since termcap
               applications cannot use this information.
 
+          These capabilities fall into two categories:
+
+          o   Terminal capabilities which may be dynamically adjusted in
+              xterm so they do not necessarily match a terminal
+              description.
+
+          o   The name of the terminal description, which an application
+              can use to obtain the static set of capabilities.
+
           xterm responds with
           DCS 1 + r Pt ST for valid requests, adding to Pt an = , and
           the value of the corresponding string that xterm would send,
Index: install-sh
--- xterm-399+/install-sh	2020-11-30 16:41:23.000000000 +0000
+++ xterm-400/install-sh	2025-06-08 23:02:33.000000000 +0000
@@ -3,10 +3,18 @@
 
 scriptversion=2020-11-14.01; # UTC
 
+# https://lists.gnu.org/archive/html/automake/2018-09/msg00002.html
+#
+# Originally X11R4 util/scripts/install.sh, the following comments, copyright
+# and license were added by an autoconf developer in 1998 (about nine years
+# later).  I have made a minor change to the wording, i.e., "copyright holders"
+# vs "X Consortium", for reusability -TD
+#
+# -----------------------------------------------------------------------------
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
 # following copyright and license.
-#
+# -----------------------------------------------------------------------------
 # Copyright (C) 1994 X Consortium
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -22,16 +30,15 @@
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name of the X Consortium shall not
-# be used in advertising or otherwise to promote the sale, use or other deal-
-# ings in this Software without prior written authorization from the X Consor-
-# tium.
-#
-#
+# ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name(s) of the above copyright
+# holders shall not be used in advertising or otherwise to promote the sale,
+# use or other dealings in this Software without prior written authorization.
+# -----------------------------------------------------------------------------
 # FSF changes to this file are in the public domain.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
Index: main.c
--- xterm-399+/main.c	2025-03-08 13:03:19.000000000 +0000
+++ xterm-400/main.c	2025-06-08 23:04:16.000000000 +0000
@@ -1,9 +1,8 @@
-/* $XTermId: main.c,v 1.933 2025/03/08 13:03:19 tom Exp $ */
+/* $XTermId: main.c,v 1.939 2025/06/08 23:04:16 tom Exp $ */
 
 /*
  * Copyright 2002-2024,2025 by Thomas E. Dickey
- *
- *                         All Rights Reserved
+ * Copyright 1987, 1988  X Consortium
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the
@@ -28,29 +27,9 @@
  * holders shall not be used in advertising or otherwise to promote the
  * sale, use or other dealings in this Software without prior written
  * authorization.
- *
- * Copyright 1987, 1988  X Consortium
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation.
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
- * OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name of the X Consortium shall not be
- * used in advertising or otherwise to promote the sale, use or other dealings
- * in this Software without prior written authorization from the X Consortium.
- *
+ */
+
+/*
  * Copyright 1987, 1988 by Digital Equipment Corporation, Maynard.
  *
  *                         All Rights Reserved
@@ -3848,6 +3827,49 @@
 }
 
 /*
+ * Malware tampers with the terminal database.  Let's discourage that.
+ */
+static void
+xtermTrimEnvPath(const char *name)
+{
+    if (getuid() == 0) {
+	xtermUnsetenv(name);
+    } else {
+	char *value = getenv(name);
+	if (value != NULL) {
+	    char *copyPath = x_strdup(value);
+	    char *editPath = x_strdup(value);
+	    if (copyPath != NULL && editPath != NULL) {
+		char *source = copyPath;
+		char *item;
+		Bool concat = False;
+		*editPath = '\0';
+		while ((item = strtok(source, ":")) != NULL) {
+		    if (access(item, W_OK) == 0) {
+			TRACE(("found writable item in %s: %s\n", name, item));
+		    } else {
+			if (concat)
+			    strcat(editPath, ":");
+			strcat(editPath, item);
+			concat = True;
+		    }
+		    source = NULL;
+		}
+		if (strcmp(editPath, copyPath)) {
+		    if (*editPath)
+			xtermSetenv(name, editPath);
+		    else
+			xtermUnsetenv(name);
+		} else {
+		    free(editPath);
+		}
+		free(copyPath);
+	    }
+	}
+    }
+}
+
+/*
  * Trim unwanted environment variables:
  *
  * DESKTOP_STARTUP_ID
@@ -3889,22 +3911,35 @@
 	TRIM(0, XCURSOR_PATH),
 	KEEP(0, MC_XDG_OPEN),
 	KEEP(0, TERM_INGRES),
+	TRIM(1, ALACRITTY_),
 	TRIM(1, COLORFGBG),
 	TRIM(1, COLORTERM),
 	TRIM(1, GIO_LAUNCHED_),
+	TRIM(1, GHOSTTY_),
+	TRIM(1, GTK_),
+	TRIM(1, ITERM_),
 	TRIM(1, ITERM2_),
+	TRIM(1, KITTY_),
+	TRIM(1, KONSOLE_),
+	TRIM(1, LC_TERMINAL),
 	TRIM(1, MC_),
 	TRIM(1, MINTTY_),
+	TRIM(1, MOSH_),
 	TRIM(1, PUTTY),
 	TRIM(1, RXVT_),
-	TRIM(1, TERM_),
+	TRIM(1, TERM_),		/* e.g., TERM_PROGRAM */
+	TRIM(1, TERMINAL_),	/* e.g., TERMINAL_NAME */
 	TRIM(1, URXVT_),
 	TRIM(1, VTE_),
+	TRIM(1, WT_SESSION),
+	TRIM(1, WT_PROFILE),
 	TRIM(1, XTERM_),
+	TRIM(1, ZUTTY_),
     };
 #undef TRIM
     /* *INDENT-ON* */
     Cardinal j, k;
+    int trimmed = 0;
 
     for (j = 0; environ[j] != NULL; ++j) {
 	char *equals = strchr(environ[j], '=');
@@ -3922,6 +3957,7 @@
 		    if (table[k].trim &&
 			(my_var = x_strdup(environ[j])) != NULL) {
 			my_var[dstlen] = '\0';
+			trimmed++;
 			xtermUnsetenv(my_var);
 			free(my_var);
 			/* When removing an entry, check the same slot again. */
@@ -3933,6 +3969,7 @@
 	    } else if (dstlen == srclen &&
 		       !strncmp(environ[j], table[k].name, srclen)) {
 		if (table[k].trim) {
+		    trimmed++;
 		    xtermUnsetenv(table[k].name);
 		    /* When removing an entry, check the same slot again. */
 		    if (j != 0)
@@ -3942,6 +3979,12 @@
 	    }
 	}
     }
+    if (trimmed) {
+	TRACE(("%d environment variables trimmed\n", trimmed));
+	xtermTrimEnvPath("TERMINFO");
+	xtermTrimEnvPath("TERMINFO_DIRS");
+	xtermTrimEnvPath("TERMPATH");
+    }
 }
 
 /*
Index: menu.c
--- xterm-399+/menu.c	2024-12-01 19:58:52.000000000 +0000
+++ xterm-400/menu.c	2025-06-08 23:07:32.000000000 +0000
@@ -1,9 +1,8 @@
-/* $XTermId: menu.c,v 1.378 2024/12/01 19:58:52 tom Exp $ */
+/* $XTermId: menu.c,v 1.379 2025/06/08 23:07:32 tom Exp $ */
 
 /*
- * Copyright 1999-2023,2024 by Thomas E. Dickey
- *
- *                         All Rights Reserved
+ * Copyright 1999-2024,2025 by Thomas E. Dickey
+ * Copyright 1989  X Consortium
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the
@@ -28,29 +27,6 @@
  * holders shall not be used in advertising or otherwise to promote the
  * sale, use or other dealings in this Software without prior written
  * authorization.
- *
- *
- * Copyright 1989  X Consortium
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation.
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
- * OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name of the X Consortium shall not be
- * used in advertising or otherwise to promote the sale, use or other dealings
- * in this Software without prior written authorization from the X Consortium.
  */
 
 #include <xterm.h>
Index: menu.h
--- xterm-399+/menu.h	2024-12-01 23:38:29.000000000 +0000
+++ xterm-400/menu.h	2025-06-08 23:07:32.000000000 +0000
@@ -1,9 +1,8 @@
-/* $XTermId: menu.h,v 1.147 2024/12/01 23:38:29 tom Exp $ */
+/* $XTermId: menu.h,v 1.148 2025/06/08 23:07:32 tom Exp $ */
 
 /*
- * Copyright 1999-2021,2024 by Thomas E. Dickey
- *
- *                         All Rights Reserved
+ * Copyright 1999-2024,2025 by Thomas E. Dickey
+ * Copyright 1989  X Consortium
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the
@@ -28,31 +27,6 @@
  * holders shall not be used in advertising or otherwise to promote the
  * sale, use or other dealings in this Software without prior written
  * authorization.
- *
- *
- * Copyright 1989  X Consortium
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation.
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name of the X Consortium shall
- * not be used in advertising or otherwise to promote the sale, use or
- * other dealings in this Software without prior written authorization
- * from the X Consortium.
  */
 
 #ifndef included_menu_h
Index: misc.c
--- xterm-399+/misc.c	2025-04-02 23:09:26.000000000 +0000
+++ xterm-400/misc.c	2025-06-15 18:27:59.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: misc.c,v 1.1112 2025/04/02 23:09:26 tom Exp $ */
+/* $XTermId: misc.c,v 1.1113 2025/06/15 18:27:59 tom Exp $ */
 
 /*
  * Copyright 1999-2024,2025 by Thomas E. Dickey
@@ -5023,7 +5023,7 @@
 		else \
 		    sprintf(reply, ">%d;%dm", ival, \
 			    GET_MOD_FKEYS(field)); \
-		} while (0);
+		} while (0)
 
 		switch (ival) {
 		case modifyKeyboard:
Index: package/debian/changelog
--- xterm-399+/package/debian/changelog	2025-04-15 20:33:49.000000000 +0000
+++ xterm-400/package/debian/changelog	2025-06-01 14:41:00.000000000 +0000
@@ -1,3 +1,9 @@
+xterm-dev (400) unstable; urgency=low
+
+  * maintenance updates
+
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 01 Jun 2025 10:41:00 -0400
+
 xterm-dev (399) unstable; urgency=low
 
   * maintenance updates
Index: package/debian/copyright
--- xterm-399+/package/debian/copyright	2025-01-03 08:49:12.000000000 +0000
+++ xterm-400/package/debian/copyright	2025-06-15 19:41:56.000000000 +0000
@@ -1,223 +1,154 @@
-Upstream source https://invisible-island.net/xterm/xterm.html
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: xterm
+Upstream-Contact: Thomas E. Dickey <dickey@invisible-island.net>
+Source: https://invisible-island.net/xterm/
 
--------------------------------------------------------------------------------
-Except as noted below, all copyrights use the same wording, denoted MIT-X11.
-That is not in Debian's list under /usr/share/licenses.  Here is the common
-wording:
-
-All Rights Reserved
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name(s) of the above copyright
-holders shall not be used in advertising or otherwise to promote the
-sale, use or other dealings in this Software without prior written
-authorization.
-
--------------------------------------------------------------------------------
 Files: * */*
+Copyright: 1996-2024,2025 by Thomas E. Dickey
 License: MIT-X11
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ .
+ Except as contained in this notice, the name(s) of the above copyright
+ holders shall not be used in advertising or otherwise to promote the
+ sale, use or other dealings in this Software without prior written
+ authorization.
+Comment:
+ SPDX refers to this as "X11": https://spdx.org/licenses/X11.html
+ .
+ Debian refers to this as MIT or MIT-X11 and then confuses it with Expat.
+ Expat is not the same as MIT-X11.  MIT-X11 appeared in X11R6 (1995).
+ Expat first appeared a few years later (1998), copying MIT-X11 but omitting
+ the last paragraph.
+ .
+ (date ranges vary, depending on when the respective files were first changed
+ significantly, and run through the most recent change date).
 
-Copyright 1996-2024,2025 by Thomas E. Dickey
-
-(date ranges vary, depending on when the respective files were first changed
-significantly, and run through the most recent change date).
-
--------------------------------------------------------------------------------
 Files: 88colres.pl
+Copyright: 1999-2005,2007 by Thomas E. Dickey
+Copyright: 1999-2000 by Steve Wall
 License: MIT-X11
 
-Copyright 1999-2016,2017 by Thomas E. Dickey
-Copyright 1999-2000 by Steve Wall
-
--------------------------------------------------------------------------------
 Files: vttests/88colors2.pl
+Copyright: 1999-2021,2022 by Thomas E. Dickey
+Copyright: 1999 by Steve Wall
 License: MIT-X11
-
-Copyright 1999-2014,2016 by Thomas E. Dickey
-Copyright 1999 by Steve Wall
-
--------------------------------------------------------------------------------
+ 
 Files: vttests/256colors2.pl
+Copyright: 1999-2020,2022 by Thomas E. Dickey
+Copyright: 2002 by Steve Wall
+Copyright: 1999 by Todd Larason
+License: MIT-X11
+ 
+Files: xcharmouse.h
+Copyright: 1997-2020,2025 by Thomas E. Dickey
+Copyright: 1998 by Jason Bacon
 License: MIT-X11
 
-Copyright 1999-2014,2016 by Thomas E. Dickey
-Copyright 2002 by Steve Wall
-Copyright 1999 by Todd Larason
+Files: xutf8.*
+Copyright: 2001 by Juliusz Chroboczek
+License: MIT-X11
 
--------------------------------------------------------------------------------
-Files: xcharmouse.h
+Files: graphics*.*
+Copyright: 2013-2024,2025 by Thomas E. Dickey
+Copyright: 2013-2022,2023 by Ross Combs
+License: MIT-X11
 
-Copyright 1998 by Jason Bacon <acadix@execpc.com>
+Files: graphics_sixel.c
+Copyright: 2014-2023,2024 by Thomas E. Dickey
+Copyright: 2014-2022,2023 by Ross Combs
+Copyright: 2024 by Benjamin A. Wong
+License: MIT-X11
 
-All Rights Reserved
+Files: html.c svg.c
+Copyright: 2018-2021,2024 Thomas E. Dickey
+Copyright: 2015-2016,2017 Jens Schweikhardt
+License: MIT-X11
 
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of the above listed
-copyright holder(s) not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.
-
-THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
-TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
-LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+Files: Tek*.c VTPrsTbl.c button.c charproc.c cursor.c data.*
+Files: error.h input.c main.* misc.c ptyx.h resize.c screen.c scrollbar.c
+Files: tabs.c util.c
+Copyright: 1987,1988 by Digital Equipment Corporation, Maynard, Massachusetts.
+License: DEC-X11
+ Permission to use, copy, modify, and distribute this software and its
+ documentation for any purpose and without fee is hereby granted,
+ provided that the above copyright notice appear in all copies and that
+ both that copyright notice and this permission notice appear in
+ supporting documentation, and that the name of Digital Equipment
+ Corporation not be used in advertising or publicity pertaining to
+ distribution of the software without specific, written prior permission.
+ .
+ DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+ DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ SOFTWARE.
+Comment:
+ SPDX probably does not have this license.
 
+Files: Tekproc.c charproc.c
+Copyright: 1988  X Consortium
+License: MIT-X11
 
--------------------------------------------------------------------------------
-Files: xutf8.*
+Files: ctlseqs.ms
+Copyright: 1991, 1994 X Consortium
 License: MIT-X11
 
-Copyright (C) 2001 by Juliusz Chroboczek
+Files: main.c
+Copyright: 1987, 1988  X Consortium
+License: MIT-X11
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
--------------------------------------------------------------------------------
-Files: ctlseqs.ms install-sh
-License: MIT-X11
-
-Copyright 1984-1994 X Consortium
-
--------------------------------------------------------------------------------
-Copyright 1987,1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital Equipment
-Corporation not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
--------------------------------------------------------------------------------
-Copyright 1988,1989  X Consortium
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
+Files: resize.man
+Copyright: 1984, 1985 by X Consortium
+License: MIT-X11
 
--------------------------------------------------------------------------------
 Files: koi8rxterm.man uxterm.man
+Copyright: 2001, 2004 Branden Robinson
 License: MIT-X11
 
-Copyright 2001, 2004 Branden Robinson
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-SOFTWARE IN THE PUBLIC INTEREST, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-
--------------------------------------------------------------------------------
 Files: charclass.*
+Copyright: 2000 by Markus Kuhn
+License: MIT-X11
+Comment:
+ Permission to use, copy, modify, and distribute this software
+ for any purpose and without fee is hereby granted. The author
+ disclaims all warranties with regard to this software.
 
-Markus Kuhn -- 2000-07-03
-
-Permission to use, copy, modify, and distribute this software
-for any purpose and without fee is hereby granted. The author
-disclaims all warranties with regard to this software.
-
--------------------------------------------------------------------------------
 Files: wcwidth.c
+Copyright: 2002-2016,2017 by Thomas E. Dickey
+           2007 by Markus Kuhn
+License: MIT-X11
+Comment:
+ Permission to use, copy, modify, and distribute this software
+ for any purpose and without fee is hereby granted. The author
+ disclaims all warranties with regard to this software.
 
-Copyright 2002-2016,2017 by Thomas E. Dickey
-Markus Kuhn -- 2007-05-25
-
-Permission to use, copy, modify, and distribute this software
-for any purpose and without fee is hereby granted. The author
-disclaims all warranties with regard to this software.
-
--------------------------------------------------------------------------------
 Files: config.guess config.sub
 License: GPL-3
+Copyright: 1992-2017 Free Software Foundation, Inc.
+Comment:
+ On Debian systems, see "/usr/share/common-licenses/GPL-3" for details.
 
-	Copyright 1992-2017 Free Software Foundation, Inc.
-
-On Debian systems, see "/usr/share/common-licenses/GPL-3" for details.
-
--------------------------------------------------------------------------------
 Files: configure
 License: GPL-2
-
-	Copyright 1992-2001 Free Software Foundation, Inc.
-
-On Debian systems, see "/usr/share/common-licenses/GPL-2" for details.
-
--------------------------------------------------------------------------------
+Copyright: 1992-2001 Free Software Foundation, Inc.
+Comment:
+ On Debian systems, see "/usr/share/common-licenses/GPL-2" for details.
Index: package/debian/xterm-dev.doc-base.ctlseqs
--- /dev/null	2025-06-15 07:34:30.847999958 +0000
+++ xterm-400/package/debian/xterm-dev.doc-base.ctlseqs	2025-06-15 10:17:56.000000000 +0000
@@ -0,0 +1,9 @@
+Document: xterm-ctlseqs
+Title: Xterm Control Sequences
+Author: Edward Moy, Stephen Gildea, Thomas Dickey
+Abstract: This document describes the terminal control sequences that XTerm
+ recognizes.
+Section: Terminal Emulators
+
+Format: text
+Files: /usr/share/doc/xterm-dev/ctlseqs.txt.gz
Index: package/debian/xterm-dev.lintian-overrides
--- xterm-399+/package/debian/xterm-dev.lintian-overrides	2023-04-02 17:38:17.000000000 +0000
+++ xterm-400/package/debian/xterm-dev.lintian-overrides	2025-06-15 09:46:56.000000000 +0000
@@ -1,7 +1,10 @@
 # Ignore this, but keep in mind:
 #	https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=741573
 #	https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=707851
-xterm-dev: command-in-menu-file-and-desktop-file xterm-dev usr/share/menu/xterm-dev:7
-xterm-dev: command-in-menu-file-and-desktop-file uxterm-dev usr/share/menu/xterm-dev:14
+xterm-dev: command-in-menu-file-and-desktop-file xterm-dev [usr/share/menu/xterm-dev:*]
+xterm-dev: command-in-menu-file-and-desktop-file uxterm-dev [usr/share/menu/xterm-dev:*]
+
+example-incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/doc/xterm-dev/examples/vttests/*.pl]
+example-incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/doc/xterm-dev/examples/vttests/mouse-codes]
 
 # vile: confmode
Index: package/freebsd/Makefile
--- xterm-399+/package/freebsd/Makefile	2025-04-15 20:33:49.000000000 +0000
+++ xterm-400/package/freebsd/Makefile	2025-06-01 18:55:17.000000000 +0000
@@ -1,4 +1,4 @@
-# $XTermId: Makefile,v 1.121 2025/04/15 20:33:49 tom Exp $
+# $XTermId: Makefile,v 1.123 2025/06/01 18:55:17 tom Exp $
 
 # This is adapted from the FreeBSD port, installing as "xterm-dev" with
 # separate resource- and manpage files.
@@ -6,7 +6,7 @@
 # and "make makesum".
 
 PORTNAME=	xterm
-DISTVERSION=	399
+DISTVERSION=	400
 CATEGORIES=	x11
 MASTER_SITES=	https://invisible-island.net/archives/xterm/:src1 \
 		https://invisible-mirror.net/archives/xterm/:src1
@@ -43,7 +43,7 @@
 DABBREV_DESC=	Enable support for dabbrev-expand
 DECTERM_DESC=	Enable DECterm Locator support
 LOGGING_DESC=	Enable logging terminal I/O to a file
-LUIT_DESC=	Use LUIT for locale convertion from/to UTF-8
+LUIT_DESC=	Use LUIT for locale conversion from/to UTF-8
 NEXTAW_DESC=	Link with neXT Athena library
 PCRE2_DESC=	${PCRE_DESC} version 2
 REGIS_DESC=	Enable ReGIS graphics support
Index: package/pkgsrc/Makefile
--- xterm-399+/package/pkgsrc/Makefile	2025-04-15 20:33:49.000000000 +0000
+++ xterm-400/package/pkgsrc/Makefile	2025-06-01 14:41:00.000000000 +0000
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.156 2024/10/27 05:42:46 pin Exp $
 
-DISTNAME=	xterm-399
+DISTNAME=	xterm-400
 CATEGORIES=	x11
 MASTER_SITES=	https://invisible-island.net/archives/xterm/
 EXTRACT_SUFX=	.tgz
Index: package/xterm.spec
--- xterm-399+/package/xterm.spec	2025-04-15 20:33:49.000000000 +0000
+++ xterm-400/package/xterm.spec	2025-06-01 14:41:00.000000000 +0000
@@ -1,11 +1,11 @@
-# $XTermId: xterm.spec,v 1.180 2025/04/15 20:33:49 tom Exp $
+# $XTermId: xterm.spec,v 1.181 2025/06/01 14:41:00 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: 399
+Version: 400
 Release: 1
 License: X11
 Group: User Interface/X
Index: resize.man
--- xterm-399+/resize.man	2024-01-11 22:06:30.000000000 +0000
+++ xterm-400/resize.man	2025-06-08 22:06:51.000000000 +0000
@@ -1,6 +1,6 @@
-.\" $XTermId: resize.man,v 1.40 2024/01/11 22:06:30 tom Exp $
-.\"
-.\" Copyright 1998-2023,2024 by Thomas E. Dickey
+.\" $XTermId: resize.man,v 1.41 2025/06/08 22:06:51 tom Exp $
+.\" ---------------------------------------------------------------------------
+.\" Copyright 1998-2024,2025 by Thomas E. Dickey
 .\"
 .\"                         All Rights Reserved
 .\"
@@ -27,7 +27,7 @@
 .\" holders shall not be used in advertising or otherwise to promote the
 .\" sale, use or other dealings in this Software without prior written
 .\" authorization.
-.\"
+.\" ---------------------------------------------------------------------------
 .\" updated by Thomas E. Dickey for XFree86, 1998-2006.
 .\"
 .ds N Resize
Index: util.c
--- xterm-399+/util.c	2025-05-17 00:41:45.000000000 +0000
+++ xterm-400/util.c	2025-06-10 13:41:16.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: util.c,v 1.958 2025/05/17 00:41:45 tom Exp $ */
+/* $XTermId: util.c,v 1.960 2025/06/10 13:41:16 tom Exp $ */
 
 /*
  * Copyright 1999-2024,2025 by Thomas E. Dickey
@@ -4254,16 +4254,33 @@
 		     * line-drawing character.  Translate it back to our
 		     * box-code if Xft tells us that the glyph is missing.
 		     */
+#define IsDecLineDrawing(ch) \
+	    ((ch != 0) && \
+	    strchr(\
+		"\013"	/* box drawings light up and left             */ \
+	    	"\014"	/* box drawings light down and left           */ \
+		"\015"	/* box drawings light down and right          */ \
+		"\016"	/* box drawings light up and right            */ \
+		"\017"	/* box drawings light vertical and horizontal */ \
+		"\022"	/* box drawings light horizontal              */ \
+		"\025"	/* box drawings light vertical and right      */ \
+		"\026"	/* box drawings light vertical and left       */ \
+		"\027"	/* box drawings light up and horizontal       */ \
+		"\030"	/* box drawings light down and horizontal     */ \
+		"\031",	/* box drawings light vertical                */ \
+		CharOf(ch)) != NULL)
+
 		    if_OPT_WIDE_CHARS(screen, {
 			unsigned part = ucs2dec(screen, ch);
-			if (xtermIsInternalCs(part)) {
-			    if (screen->force_box_chars
-				|| xtermXftMissing(recur.xw,
-						   currData, 0,
-						   XftFp(currData), ch)) {
-				SetMissing("case 2");
-				ch = part;
-			    }
+			if (xtermIsDecGraphic(part)
+			    && IsDecLineDrawing(part)
+			    && screen->force_box_chars) {
+			    SetMissing("case 2");
+			    ch = part;
+			}
+			if (xtermIsDecTechnical(part)) {
+			    SetMissing("case 2a");
+			    ch = part;
 			}
 			if (!missing && xtermXftMissing(recur.xw,
 							currData, 0,
Index: version.h
--- xterm-399+/version.h	2025-05-18 23:47:49.000000000 +0000
+++ xterm-400/version.h	2025-06-15 20:26:03.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: version.h,v 1.577 2025/05/18 23:47:49 tom Exp $ */
+/* $XTermId: version.h,v 1.579 2025/06/15 20:26:03 tom Exp $ */
 
 /*
  * Copyright 1998-2024,2025 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   399
-#define XTERM_DATE    2025-05-18
+#define XTERM_PATCH   400
+#define XTERM_DATE    2025-06-15
 
 #ifndef __vendorversion__
 #define __vendorversion__ "XTerm"
Index: xcharmouse.h
--- xterm-399+/xcharmouse.h	2020-08-03 23:14:06.000000000 +0000
+++ xterm-400/xcharmouse.h	2025-06-15 16:22:31.000000000 +0000
@@ -1,28 +1,33 @@
-/* $XTermId: xcharmouse.h,v 1.19 2020/08/03 23:14:06 tom Exp $ */
+/* $XTermId: xcharmouse.h,v 1.22 2025/06/15 16:22:31 tom Exp $ */
 
 /************************************************************
 
-Copyright 1997-2012,2020 by Thomas E. Dickey
-Copyright 1998 by Jason Bacon <acadix@execpc.com>
+Copyright 1997-2020,2025 by Thomas E. Dickey
+Copyright 1998 by Jason Bacon
 
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of the above listed
-copyright holder(s) not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.
-
-THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
-TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
-LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name(s) of the above copyright
+holders shall not be used in advertising or otherwise to promote the
+sale, use or other dealings in this Software without prior written
+authorization.
 
 ********************************************************/
 
Index: xterm.appdata.xml
--- xterm-399+/xterm.appdata.xml	2025-05-18 23:48:13.000000000 +0000
+++ xterm-400/xterm.appdata.xml	2025-06-15 20:26:24.000000000 +0000
@@ -35,7 +35,7 @@
     <keyword>terminal</keyword>
   </keywords>
   <releases>
-    <release version="399" date="2025-05-18"/>
+    <release version="400" date="2025-06-15"/>
   </releases>
   <url type="homepage">https://invisible-island.net/xterm/</url>
   <update_contact>dickey@invisible-island.net</update_contact>
Index: xterm.log.html
--- xterm-399+/xterm.log.html	2025-05-18 23:49:07.000000000 +0000
+++ xterm-400/xterm.log.html	2025-06-15 20:25:37.000000000 +0000
@@ -30,7 +30,7 @@
  * sale, use or other dealings in this Software without prior written        *
  * authorization.                                                            *
  *****************************************************************************
-  $XTermId: xterm.log.html,v 1.2696 2025/05/18 23:49:07 tom Exp $
+  $XTermId: xterm.log.html,v 1.2702 2025/06/15 20:25:37 tom Exp $
   -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
@@ -70,6 +70,8 @@
   CHANGELOG</a>).</p>
 
   <ul>
+    <li><a href="#xterm_400">Patch #400 - 2025/06/15</a></li>
+
     <li><a href="#xterm_399">Patch #399 - 2025/05/18</a></li>
 
     <li><a href="#xterm_398">Patch #398 - 2025/04/11</a></li>
@@ -1076,6 +1078,23 @@
     <li><a href="#xterm_01">Patch #1 - 1996/1/6</a></li>
   </ul>
 
+  <h1><a name="xterm_400" id="xterm_400">Patch #400 -
+  2025/06/15</a></h1>
+
+  <ul>
+    <li>improve configure check for X libraries to reduce
+    duplicates.</li>
+
+    <li>amend fix for (Debian #1084794 to ensure that
+    non-linedrawing characters are drawn with Xft (report by Robert
+    Ross).</li>
+
+    <li>simplify/consolidate copyright notices where those were
+    redundant.</li>
+
+    <li>update/improve cleanup of environment variables.</li>
+  </ul>
+
   <h1><a name="xterm_399" id="xterm_399">Patch #399 -
   2025/05/18</a></h1>
 
Index: xterm.man
--- xterm-399+/xterm.man	2025-04-01 23:06:38.000000000 +0000
+++ xterm-400/xterm.man	2025-06-08 23:06:20.000000000 +0000
@@ -1,9 +1,8 @@
 '\" t
-.\" $XTermId: xterm.man,v 1.916 2025/04/01 23:06:38 tom Exp $
-.\"
+.\" $XTermId: xterm.man,v 1.918 2025/06/08 23:06:20 tom Exp $
+.\" ---------------------------------------------------------------------------
 .\" Copyright 1996-2024,2025 by Thomas E. Dickey
-.\"
-.\"                         All Rights Reserved
+.\" Copyright 1989  X Consortium
 .\"
 .\" Permission is hereby granted, free of charge, to any person obtaining a
 .\" copy of this software and associated documentation files (the
@@ -28,32 +27,7 @@
 .\" holders shall not be used in advertising or otherwise to promote the
 .\" sale, use or other dealings in this Software without prior written
 .\" authorization.
-.\"
-.\"
-.\" Copyright 1989  X Consortium
-.\"
-.\" Permission to use, copy, modify, distribute, and sell this software and its
-.\" documentation for any purpose is hereby granted without fee, provided that
-.\" the above copyright notice appear in all copies and that both that
-.\" copyright notice and this permission notice appear in supporting
-.\" documentation.
-.\"
-.\" The above copyright notice and this permission notice shall be included
-.\" in all copies or substantial portions of the Software.
-.\"
-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-.\" IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-.\" OTHER DEALINGS IN THE SOFTWARE.
-.\"
-.\" Except as contained in this notice, the name of the X Consortium shall
-.\" not be used in advertising or otherwise to promote the sale, use or
-.\" other dealings in this Software without prior written authorization
-.\" from the X Consortium.
-.\"
+.\" ---------------------------------------------------------------------------
 .\" Updated by Thomas E. Dickey for XFree86, July 1996 - February 2006.
 .\"
 .TH XTERM 1 "__app_date__" "__app_version__" "X Window System"
Index: xutf8.c
--- xterm-399+/xutf8.c	2025-04-06 23:29:27.000000000 +0000
+++ xterm-400/xutf8.c	2025-06-10 17:19:29.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: xutf8.c,v 1.20 2025/04/06 23:29:27 tom Exp $ */
+/* $XTermId: xutf8.c,v 1.21 2025/06/10 17:19:29 tom Exp $ */
 
 /*
  * Copyright 2002-2020,2025 by Thomas E. Dickey
@@ -15,13 +15,17 @@
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
  *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the authors or copyright
+ * holders shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in this Software without prior written authorization. 
  */
 
 #include <xterm.h>
