# vile 9.4e - patch 2004/3/21 - T.Dickey <dickey@invisible-island.net>
# ------------------------------------------------------------------------------
# CHANGES             |   62 +
# MANIFEST            |    2 
# aclocal.m4          |   50 
# builtflt.c          |    4 
# config.guess        |   48 
# config.sub          |   44 
# configure           | 2785 +++++++++++++++++++++++++-------------------------
# configure.in        |    6 
# dirstuff.h          |    4 
# display.c           |   22 
# doc/modes.doc       |   57 -
# estruct.h           |    9 
# exec.c              |    8 
# filters/filters.rc  |   27 
# filters/html.key    |  146 +-
# filters/htmlfilt.l  |    4 
# filters/imakeflt.l  |   70 -
# filters/makelist.sh |    7 
# filters/mk-0th.awk  |    6 
# filters/mk-1st.awk  |    4 
# filters/mk-2nd.awk  |    4 
# filters/txt-filt.l  |    4 
# input.c             |   10 
# isearch.c           |   13 
# main.c              |   23 
# modes.c             |  176 +--
# modetbl             |    4 
# oneliner.c          |    3 
# patchlev.h          |    2 
# revlist             |   60 -
# select.c            |    4 
# statevar.c          |    4 
# vile.hlp            |   59 -
# 33 files changed, 2062 insertions(+), 1669 deletions(-)
# ------------------------------------------------------------------------------
Index: CHANGES
--- vile-9.4d+/CHANGES	2003-12-21 19:16:37.000000000 -0500
+++ vile-9.4e/CHANGES	2004-03-21 18:30:55.000000000 -0500
@@ -1,5 +1,63 @@
 Changes for vile 9.5 (released ??? ??? ?? ????)
 
+ 20040321 (e)
+	> Clark Morgan:
+	+ document set-highlighting macro in vile.hlp
+	+ update/revise some details in doc/modes.doc relating to cmode:
+	  + remove any mention of "set cmode" as a (presently) useful command.
+	  + list "setl [no]{majormode}" as essential majormode features [as
+	    near as I can tell, "setl {majormode}" is the only mechanism
+	    available for a user to explicitly attach a majormode to a buffer]
+	  + update the history of majormodes to reflect the way things were in
+	    the past, but not now.  This is done primarily by changing the
+	    grammatical tense of various sentences.
+ 	> Tom Dickey:
+	+ add mode "ignoresuffix", which tells vile to strip the given pattern
+	  from a filename before matching majormode suffixes against it.
+	+ add mode "showchar", which turns on a field in the modeline that
+	  tells what the character value is at the current editing position.
+	+ modify pregion() to reset the "counted" state on the buffer, to work
+	  around a case on win32, where CRLF_LINES is set, the "p" command's
+	  output did not count the extra byte per line for ^M's.  When saving
+	  [p-lines] to a file, it was truncated.
+	+ modify isMiniEdit() to always return true if miniedit mode is set.
+	  That allows one to use ^Ga to toggle miniedit mode and append to
+	  the buffer shown from a previous command rather than having it
+	  erased (discussion with George Eccles).
+	+ modify mac_tokval() to avoid calling tb_scopy() if the result from
+	  tokval() is the original pointer, fixes an overlapping memcpy warning
+	  from valgrind.
+	+ fix incremental-search's initialization, broken in 9.3l (report by
+	  Richard Mitchell).
+	+ improve COMMENT expression in txt-filt.l to include the lines of
+	  dashes in vile.hlp (report by Clark Morgan).
+	+ fix to avoid putting dummy entries into the list of all modes when
+	  a corresponding short modename does not exist for a given submode of
+	  a majormode.  That was making ":set <tab><tab>" show names such as
+	  "RCSX" and "cppX".
+	+ fix a couple of places reported by gcc -Wundef on OS/2, e.g., the
+	  OPT_WORKING macro.
+	+ modify htmlfilt.l to use caseless comparison for HTML keywords.
+	+ improve configure-script checks for dbmalloc and dmalloc.
+	+ modify preamble pattern for pymode to work with
+		#!/usr/bin/python2.3 -S
+	+ modified [a-z] expression to [\a] in preamble for awkmode, cshmode,
+	  sedmode, shmode, tclmode to allow uppercase options.
+	+ add ".jsp" to jsmode suffixes.
+	+ fix imake filter to handle a case where XCOMM comment contained a
+	  colon; it was highlighted as if it were a makefile target.
+	+ modify name-completion for majormode names used as macro parameters
+	  to use the long name (with "mode" ending) rather than the short
+	  name, for consistency (suggested by Clark Morgan).
+	+ modify filters/*.awk to ensure that space-separated lists for the
+	  --with-builtin-filters, etc., options are handled properly.  Both
+	  comma-separated and space-separated lists are permitted now (report
+	  by Clark Morgan).
+	+ fix missing assignments from 9.4b changes to $builtins and $loadable
+	  variables in configure script, which caused build to fail if explicit
+	  list was given for --with-builtin-filters or --with-loadable-filters
+	  (report by Clark Morgan).
+
  20031220 (d)
  	> Tom Dickey:
 	+ modify pl-filt.c to handle
@@ -30,7 +88,7 @@
 	+ use EXEEXT and OBJEXT in generated makefiles.
 	+ corrected parameter to lookup_filter(); it did not account for the
 	  $filtername symbol, e.g., as used for cshmode to invoke vile-sh-filt.
-	+ corrected ifdef's in cfgopts() used to build xvile's $cfgopts values. 
+	+ corrected ifdef's in cfgopts() used to build xvile's $cfgopts values.
 	  The ifdef's used "#ifdef" rather than "#if", causing all possible
 	  values to be shown (from 9.3e).
 
@@ -57,7 +115,7 @@
 	  schemes.  Loadable filters ran about 50% slower than the builtin
 	  filters, while external filters ran about 5 times slower (ymmv).
 	+ use AC_EXEEXT in configure script.
-	+ modify configure script check for imake's $CFLAGS to ensure that 
+	+ modify configure script check for imake's $CFLAGS to ensure that
 	  imake or xmkmf was found.
 
  20031008 (a)
Index: MANIFEST
--- vile-9.4d+/MANIFEST	2003-12-21 19:25:04.000000000 -0500
+++ vile-9.4e/MANIFEST	2004-03-21 20:42:42.000000000 -0500
@@ -1,4 +1,4 @@
-MANIFEST for vile, version v9_4d
+MANIFEST for vile, version v9_4e
 --------------------------------------------------------------------------------
 MANIFEST                        this file
 CHANGES                         Change-log for VILE
Index: aclocal.m4
Prereq:  1.128 
--- vile-9.4d+/aclocal.m4	2003-11-02 12:13:29.000000000 -0500
+++ vile-9.4e/aclocal.m4	2004-03-19 17:37:07.000000000 -0500
@@ -1,6 +1,6 @@
 dnl vile's local definitions for autoconf.
 dnl
-dnl $Header: /usr/build/vile/vile/RCS/aclocal.m4,v 1.128 2003/11/02 17:13:29 tom Exp $
+dnl $Header: /usr/build/vile/vile/RCS/aclocal.m4,v 1.129 2004/03/19 22:37:07 tom Exp $
 dnl
 dnl ---------------------------------------------------------------------------
 dnl ---------------------------------------------------------------------------
@@ -247,7 +247,7 @@
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CHECK_CACHE version: 7 updated: 2001/12/19 00:50:10
+dnl CF_CHECK_CACHE version: 9 updated: 2004/01/30 15:59:13
 dnl --------------
 dnl Check if we're accidentally using a cache from a different machine.
 dnl Derive the system name, as a check for reusing the autoconf cache.
@@ -256,6 +256,9 @@
 dnl better job than uname).  Normally we'll use AC_CANONICAL_HOST, but allow
 dnl an extra parameter that we may override, e.g., for AC_CANONICAL_SYSTEM
 dnl which is useful in cross-compiles.
+dnl
+dnl Note: we would use $ac_config_sub, but that is one of the places where
+dnl autoconf 2.5x broke compatibility with autoconf 2.13
 AC_DEFUN([CF_CHECK_CACHE],
 [
 if test -f $srcdir/config.guess ; then
@@ -473,12 +476,13 @@
 
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_LIBS version: 22 updated: 2002/10/27 18:21:42
+dnl CF_CURSES_LIBS version: 23 updated: 2003/11/06 19:59:57
 dnl --------------
 dnl Look for the curses libraries.  Older curses implementations may require
 dnl termcap/termlib to be linked as well.  Call CF_CURSES_CPPFLAGS first.
 AC_DEFUN([CF_CURSES_LIBS],[
 
+AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl
 AC_MSG_CHECKING(if we have identified curses libraries)
 AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>],
 	[initscr(); tgoto("?", 0,0)],
@@ -656,7 +660,7 @@
 
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_TERM_H version: 5 updated: 2003/08/20 15:23:08
+dnl CF_CURSES_TERM_H version: 6 updated: 2003/11/06 19:59:57
 dnl ----------------
 dnl SVr4 curses should have term.h as well (where it puts the definitions of
 dnl the low-level interface).  This may not be true in old/broken implementations,
@@ -666,6 +670,7 @@
 [
 AC_CACHE_CHECK(for term.h, cf_cv_term_header,[
 
+AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl
 # If we found <ncurses/curses.h>, look for <ncurses/term.h>, but always look
 # for <term.h> if we do not find the variant.
 for cf_header in \
@@ -1474,7 +1479,7 @@
 	,[$1=no])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_NCURSES_CPPFLAGS version: 16 updated: 2002/12/29 18:30:46
+dnl CF_NCURSES_CPPFLAGS version: 17 updated: 2003/11/06 19:59:57
 dnl -------------------
 dnl Look for the SVr4 curses clone 'ncurses' in the standard places, adjusting
 dnl the CPPFLAGS variable so we can include its header.
@@ -1498,6 +1503,7 @@
 AC_DEFUN([CF_NCURSES_CPPFLAGS],
 [AC_REQUIRE([CF_WITH_CURSES_DIR])
 
+AC_PROVIDE([CF_CURSES_CPPFLAGS])dnl
 cf_ncuhdr_root=ifelse($1,,ncurses,$1)
 
 test -n "$cf_cv_curses_dir" && \
@@ -1638,13 +1644,14 @@
 AC_DEFINE_UNQUOTED($cf_nculib_ROOT)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_NCURSES_VERSION version: 10 updated: 2002/10/27 18:21:42
+dnl CF_NCURSES_VERSION version: 11 updated: 2003/11/06 19:59:57
 dnl ------------------
 dnl Check for the version of ncurses, to aid in reporting bugs, etc.
 dnl Call CF_CURSES_CPPFLAGS first, or CF_NCURSES_CPPFLAGS.  We don't use
 dnl AC_REQUIRE since that does not work with the shell's if/then/else/fi.
 AC_DEFUN([CF_NCURSES_VERSION],
 [
+AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl
 AC_CACHE_CHECK(for ncurses version, cf_cv_ncurses_version,[
 	cf_cv_ncurses_version=no
 	cf_tempfile=out$$
@@ -1773,7 +1780,7 @@
 ifelse([$8], , ,[$8]),
 ifelse([$9], , ,[$9]))])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_PROG_EXT version: 9 updated: 2003/10/18 16:36:22
+dnl CF_PROG_EXT version: 10 updated: 2004/01/03 19:28:18
 dnl -----------
 dnl Compute $PROG_EXT, used for non-Unix ports, such as OS/2 EMX.
 AC_DEFUN([CF_PROG_EXT],
@@ -1781,11 +1788,12 @@
 AC_REQUIRE([CF_CHECK_CACHE])
 case $cf_cv_system_name in
 os2*)
-    # We make sure -Zexe is not used -- it would interfere with @PROG_EXT@
     CFLAGS="$CFLAGS -Zmt"
     CPPFLAGS="$CPPFLAGS -D__ST_MT_ERRNO__"
     CXXFLAGS="$CXXFLAGS -Zmt"
-    LDFLAGS=`echo "$LDFLAGS -Zmt -Zcrtdll" | sed -e "s%-Zexe%%g"`
+    # autoconf's macro sets -Zexe and suffix both, which conflict:w
+    LDFLAGS="$LDFLAGS -Zmt -Zcrtdll"
+    ac_cv_exeext=.exe
     ;;
 esac
 
@@ -2321,33 +2329,37 @@
 	[cf_cv_curses_dir=no])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_DBMALLOC version: 2 updated: 2002/12/29 21:11:45
+dnl CF_WITH_DBMALLOC version: 4 updated: 2004/02/28 05:49:27
 dnl ----------------
-dnl Configure-option for dbmalloc
+dnl Configure-option for dbmalloc.  The optional parameter is used to override
+dnl the updating of $LIBS, e.g., to avoid conflict with subsequent tests.
 AC_DEFUN([CF_WITH_DBMALLOC],[
 AC_MSG_CHECKING(if you want to link with dbmalloc for testing)
 AC_ARG_WITH(dbmalloc,
-	[  --with-dbmalloc         test: use Conor Cahill's dbmalloc library],
+	[  --with-dbmalloc         use Conor Cahill's dbmalloc library],
 	[with_dbmalloc=$withval],
 	[with_dbmalloc=no])
 AC_MSG_RESULT($with_dbmalloc)
-if test $with_dbmalloc = yes ; then
-	AC_CHECK_LIB(dbmalloc,debug_malloc)
+if test "$with_dbmalloc" = yes ; then
+	AC_CHECK_HEADER(dbmalloc.h,
+		[AC_CHECK_LIB(dbmalloc,[debug_malloc]ifelse($1,,[],[,$1]))])
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_DMALLOC version: 2 updated: 2002/12/29 21:11:45
+dnl CF_WITH_DMALLOC version: 4 updated: 2004/02/28 05:49:27
 dnl ---------------
-dnl Configure-option for dmalloc
+dnl Configure-option for dmalloc.  The optional parameter is used to override
+dnl the updating of $LIBS, e.g., to avoid conflict with subsequent tests.
 AC_DEFUN([CF_WITH_DMALLOC],[
 AC_MSG_CHECKING(if you want to link with dmalloc for testing)
 AC_ARG_WITH(dmalloc,
-	[  --with-dmalloc          test: use Gray Watson's dmalloc library],
+	[  --with-dmalloc          use Gray Watson's dmalloc library],
 	[with_dmalloc=$withval],
 	[with_dmalloc=no])
 AC_MSG_RESULT($with_dmalloc)
-if test $with_dmalloc = yes ; then
-	AC_CHECK_LIB(dmalloc,dmalloc_debug)
+if test "$with_dmalloc" = yes ; then
+	AC_CHECK_HEADER(dmalloc.h,
+		[AC_CHECK_LIB(dmalloc,[dmalloc_debug]ifelse($1,,[],[,$1]))])
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
Index: builtflt.c
Prereq:  1.36 
--- vile-9.4d+/builtflt.c	2003-11-12 19:19:58.000000000 -0500
+++ vile-9.4e/builtflt.c	2004-03-17 20:16:08.000000000 -0500
@@ -1,7 +1,7 @@
 /*
  * Main program and I/O for external vile syntax/highlighter programs
  *
- * $Header: /usr/build/vile/vile/RCS/builtflt.c,v 1.36 2003/11/13 00:19:58 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/builtflt.c,v 1.37 2004/03/18 01:16:08 tom Exp $
  *
  */
 
@@ -53,7 +53,7 @@
 
     if (valid_buffer(curbp)
 	&& curbp->majr != 0
-	&& !strcmp(curbp->majr->name, major_name)
+	&& !strcmp(curbp->majr->shortname, major_name)
 	&& (temp = b_val_ptr(curbp, VAL_FILTERNAME)) != 0) {
 	if (!strncmp(temp, prefix, sizeof(prefix) - 1)) {
 	    char *base = temp + sizeof(prefix) - 1;
Index: config.guess
--- vile-9.4d+/config.guess	2003-11-08 15:01:57.000000000 -0500
+++ vile-9.4e/config.guess	2004-02-17 18:47:10.000000000 -0500
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
-timestamp='2003-10-16'
+timestamp='2004-02-16'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -197,12 +197,18 @@
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
 	exit 0 ;;
+    amd64:OpenBSD:*:*)
+	echo x86_64-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     amiga:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
     arc:OpenBSD:*:*)
 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    cats:OpenBSD:*:*)
+	echo arm-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     hp300:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -239,6 +245,15 @@
     *:OpenBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    *:ekkoBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+	exit 0 ;;
+    macppc:MirBSD:*:*)
+	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+	exit 0 ;;
+    *:MirBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+	exit 0 ;;
     alpha:OSF1:*:*)
 	if test $UNAME_RELEASE = "V4.0"; then
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
@@ -311,7 +326,7 @@
 	echo i370-ibm-openedition
 	exit 0 ;;
     *:OS400:*:*)
-        echo powerpc-ibm-os400
+	echo powerpc-ibm-os400
 	exit 0 ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
@@ -405,6 +420,9 @@
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${UNAME_RELEASE}
         exit 0 ;;
+    m68k:machten:*:*)
+	echo m68k-apple-machten${UNAME_RELEASE}
+	exit 0 ;;
     powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
 	exit 0 ;;
@@ -744,14 +762,14 @@
 	exit 0 ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit 0 ;;
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit 0 ;;
     5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit 0 ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -905,7 +923,7 @@
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit 0 ;;
     sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -997,6 +1015,9 @@
     i*86:atheos:*:*)
 	echo ${UNAME_MACHINE}-unknown-atheos
 	exit 0 ;;
+    i*86:syllable:*:*)
+	echo ${UNAME_MACHINE}-pc-syllable
+	exit 0 ;;
     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
@@ -1183,7 +1204,7 @@
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit 0 ;;
-    NSR-[DGKLNPTVWY]:NONSTOP_KERNEL:*:*)
+    NSR-?:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
 	exit 0 ;;
     *:NonStop-UX:*:*)
@@ -1225,7 +1246,10 @@
 	echo pdp10-unknown-its
 	exit 0 ;;
     SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
+	echo mips-sei-seiux${UNAME_RELEASE}
+	exit 0 ;;
+    *:DragonFly:*:*)
+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit 0 ;;
 esac
 
Index: config.sub
--- vile-9.4d+/config.sub	2003-11-08 15:02:14.000000000 -0500
+++ vile-9.4e/config.sub	2004-02-23 15:57:09.000000000 -0500
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
-timestamp='2003-11-03'
+timestamp='2004-02-23'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -283,8 +283,8 @@
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
 	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
+		basic_machine=$basic_machine-pc
+		;;
 	# Object if more than one company name word.
 	*-*-*)
 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
@@ -363,6 +363,9 @@
 		basic_machine=a29k-amd
 		os=-udi
 		;;
+	abacus)
+		basic_machine=abacus-unknown
+		;;
 	adobe68k)
 		basic_machine=m68010-adobe
 		os=-scout
@@ -380,6 +383,9 @@
 	amd64)
 		basic_machine=x86_64-pc
 		;;
+	amd64-*)
+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	amdahl)
 		basic_machine=580-amdahl
 		os=-sysv
@@ -439,12 +445,20 @@
 		basic_machine=j90-cray
 		os=-unicos
 		;;
+	cr16c)
+		basic_machine=cr16c-unknown
+		os=-elf
+		;;
 	crds | unos)
 		basic_machine=m68k-crds
 		;;
 	cris | cris-* | etrax*)
 		basic_machine=cris-axis
 		;;
+	crx)
+		basic_machine=crx-unknown
+		os=-elf
+		;;
 	da30 | da30-*)
 		basic_machine=m68k-da30
 		;;
@@ -1111,8 +1125,8 @@
 if [ x"$os" != x"" ]
 then
 case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
+	# First match some system type aliases
+	# that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
@@ -1140,8 +1154,9 @@
 	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* \
@@ -1152,7 +1167,7 @@
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei*)
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1191,7 +1206,7 @@
 	-opened*)
 		os=-openedition
 		;;
-        -os400*)
+	-os400*)
 		os=-os400
 		;;
 	-wince*)
@@ -1215,6 +1230,9 @@
 	-atheos*)
 		os=-atheos
 		;;
+	-syllable*)
+		os=-syllable
+		;;
 	-386bsd)
 		os=-bsd
 		;;
@@ -1237,7 +1255,7 @@
 	-sinix*)
 		os=-sysv4
 		;;
-        -tpf*)
+	-tpf*)
 		os=-tpf
 		;;
 	-triton*)
@@ -1307,9 +1325,9 @@
 	arm*-semi)
 		os=-aout
 		;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
+	c4x-* | tic4x-*)
+		os=-coff
+		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
Index: configure
--- vile-9.4d+/configure	2003-11-12 19:43:32.000000000 -0500
+++ vile-9.4e/configure	2004-03-19 17:37:15.000000000 -0500
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.203 .
+# From configure.in Revision: 1.204 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20030208.
 #
@@ -712,8 +712,8 @@
   --with-drag-extension   use drag/scrolling extension with Xaw
   --with-exec-macros=N    specify count of numbered macros
   --with-locale           use i18n support for character-types
-  --with-dbmalloc         test: use Conor Cahill's dbmalloc library
-  --with-dmalloc          test: use Gray Watson's dmalloc library
+  --with-dbmalloc         use Conor Cahill's dbmalloc library
+  --with-dmalloc          use Gray Watson's dmalloc library
   --with-purify           test: use Purify
   --with-fakevms          test: use fake VMS I/O module
   --with-no-leaks         test: free permanent memory, analyze leaks
@@ -2608,11 +2608,12 @@
 
 case $cf_cv_system_name in
 os2*)
-    # We make sure -Zexe is not used -- it would interfere with @PROG_EXT@
     CFLAGS="$CFLAGS -Zmt"
     CPPFLAGS="$CPPFLAGS -D__ST_MT_ERRNO__"
     CXXFLAGS="$CXXFLAGS -Zmt"
-    LDFLAGS=`echo "$LDFLAGS -Zmt -Zcrtdll" | sed -e "s%-Zexe%%g"`
+    # autoconf's macro sets -Zexe and suffix both, which conflict:w
+    LDFLAGS="$LDFLAGS -Zmt -Zcrtdll"
+    ac_cv_exeext=.exe
     ;;
 esac
 
@@ -2630,10 +2631,10 @@
 
 ###	checks for UNIX variants that set C preprocessor variables
 
-echo "$as_me:2633: checking for AIX" >&5
+echo "$as_me:2634: checking for AIX" >&5
 echo $ECHO_N "checking for AIX... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 2636 "configure"
+#line 2637 "configure"
 #include "confdefs.h"
 #ifdef _AIX
   yes
@@ -2642,24 +2643,24 @@
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   egrep "yes" >/dev/null 2>&1; then
-  echo "$as_me:2645: result: yes" >&5
+  echo "$as_me:2646: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 cat >>confdefs.h <<\EOF
 #define _ALL_SOURCE 1
 EOF
 
 else
-  echo "$as_me:2652: result: no" >&5
+  echo "$as_me:2653: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 rm -f conftest*
 
-echo "$as_me:2657: checking for POSIXized ISC" >&5
+echo "$as_me:2658: checking for POSIXized ISC" >&5
 echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6
 if test -d /etc/conf/kconfig.d &&
    grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
 then
-  echo "$as_me:2662: result: yes" >&5
+  echo "$as_me:2663: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   ISC=yes # If later tests want to check for ISC.
 
@@ -2673,28 +2674,28 @@
     CC="$CC -Xp"
   fi
 else
-  echo "$as_me:2676: result: no" >&5
+  echo "$as_me:2677: result: no" >&5
 echo "${ECHO_T}no" >&6
   ISC=
 fi
 
-echo "$as_me:2681: checking for minix/config.h" >&5
+echo "$as_me:2682: checking for minix/config.h" >&5
 echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6
 if test "${ac_cv_header_minix_config_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 2687 "configure"
+#line 2688 "configure"
 #include "confdefs.h"
 #include <minix/config.h>
 _ACEOF
-if { (eval echo "$as_me:2691: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2692: \"$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:2697: \$? = $ac_status" >&5
+  echo "$as_me:2698: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2713,7 +2714,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:2716: result: $ac_cv_header_minix_config_h" >&5
+echo "$as_me:2717: result: $ac_cv_header_minix_config_h" >&5
 echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6
 if test $ac_cv_header_minix_config_h = yes; then
   MINIX=yes
@@ -2739,7 +2740,7 @@
 
 ###	checks for compiler characteristics
 
-echo "$as_me:2742: checking for ${CC-cc} option to accept ANSI C" >&5
+echo "$as_me:2743: checking for ${CC-cc} option to accept ANSI C" >&5
 echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6
 if test "${cf_cv_ansi_cc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2795,7 +2796,7 @@
 fi
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 2798 "configure"
+#line 2799 "configure"
 #include "confdefs.h"
 
 #ifndef CC_HAS_PROTOS
@@ -2816,16 +2817,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2819: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2820: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2822: \$? = $ac_status" >&5
+  echo "$as_me:2823: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2825: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2826: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2828: \$? = $ac_status" >&5
+  echo "$as_me:2829: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ansi_cc="$cf_arg"; break
 else
@@ -2838,7 +2839,7 @@
 CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi
-echo "$as_me:2841: result: $cf_cv_ansi_cc" >&5
+echo "$as_me:2842: result: $cf_cv_ansi_cc" >&5
 echo "${ECHO_T}$cf_cv_ansi_cc" >&6
 
 if test "$cf_cv_ansi_cc" != "no"; then
@@ -2883,7 +2884,7 @@
 fi
 
 if test "$cf_cv_ansi_cc" = "no"; then
-	{ { echo "$as_me:2886: error: Your compiler does not appear to recognize prototypes.
+	{ { echo "$as_me:2887: error: Your compiler does not appear to recognize prototypes.
 You have the following choices:
 	a. adjust your compiler options
 	b. get an up-to-date compiler
@@ -2896,7 +2897,7 @@
    { (exit 1); exit 1; }; }
 fi
 
-echo "$as_me:2899: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:2900: checking for $CC option to accept ANSI C" >&5
 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2904,7 +2905,7 @@
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >conftest.$ac_ext <<_ACEOF
-#line 2907 "configure"
+#line 2908 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -2953,16 +2954,16 @@
 do
   CC="$ac_save_CC $ac_arg"
   rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2956: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2957: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2959: \$? = $ac_status" >&5
+  echo "$as_me:2960: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2962: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2963: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2965: \$? = $ac_status" >&5
+  echo "$as_me:2966: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_cc_stdc=$ac_arg
 break
@@ -2979,21 +2980,21 @@
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)
-    echo "$as_me:2982: result: none needed" >&5
+    echo "$as_me:2983: result: none needed" >&5
 echo "${ECHO_T}none needed" >&6 ;;
   *)
-    echo "$as_me:2985: result: $ac_cv_prog_cc_stdc" >&5
+    echo "$as_me:2986: result: $ac_cv_prog_cc_stdc" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
     CC="$CC $ac_cv_prog_cc_stdc" ;;
 esac
 
-echo "$as_me:2990: checking for an ANSI C-conforming const" >&5
+echo "$as_me:2991: checking for an ANSI C-conforming const" >&5
 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
 if test "${ac_cv_c_const+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 2996 "configure"
+#line 2997 "configure"
 #include "confdefs.h"
 
 int
@@ -3051,16 +3052,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3054: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3055: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3057: \$? = $ac_status" >&5
+  echo "$as_me:3058: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3060: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3061: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3063: \$? = $ac_status" >&5
+  echo "$as_me:3064: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_const=yes
 else
@@ -3070,7 +3071,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:3073: result: $ac_cv_c_const" >&5
+echo "$as_me:3074: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -3080,14 +3081,14 @@
 
 fi
 
-echo "$as_me:3083: checking if we can initialize unions" >&5
+echo "$as_me:3084: checking if we can initialize unions" >&5
 echo $ECHO_N "checking if we can initialize unions... $ECHO_C" >&6
 if test "${cf_cv_init_unions+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 3090 "configure"
+#line 3091 "configure"
 #include "confdefs.h"
 
 int
@@ -3099,16 +3100,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3102: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3103: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3105: \$? = $ac_status" >&5
+  echo "$as_me:3106: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3108: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3109: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3111: \$? = $ac_status" >&5
+  echo "$as_me:3112: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_init_unions=yes
 else
@@ -3119,14 +3120,14 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:3122: result: $cf_cv_init_unions" >&5
+echo "$as_me:3123: result: $cf_cv_init_unions" >&5
 echo "${ECHO_T}$cf_cv_init_unions" >&6
 test $cf_cv_init_unions = no && cat >>confdefs.h <<\EOF
 #define CC_CANNOT_INIT_UNIONS 1
 EOF
 
 ###	options to control how much we build
-echo "$as_me:3129: checking if you wish to build only core functions" >&5
+echo "$as_me:3130: checking if you wish to build only core functions" >&5
 echo $ECHO_N "checking if you wish to build only core functions... $ECHO_C" >&6
 
 # Check whether --enable-extensions or --disable-extensions was given.
@@ -3143,7 +3144,7 @@
   DISABLE_EXTS=no
 
 fi;
-echo "$as_me:3146: result: $DISABLE_EXTS" >&5
+echo "$as_me:3147: result: $DISABLE_EXTS" >&5
 echo "${ECHO_T}$DISABLE_EXTS" >&6
 if test "$DISABLE_EXTS" = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -3160,7 +3161,7 @@
 	cf_extensions=yes
 fi
 
-echo "$as_me:3163: checking if you wish to disable shell/external commands" >&5
+echo "$as_me:3164: checking if you wish to disable shell/external commands" >&5
 echo $ECHO_N "checking if you wish to disable shell/external commands... $ECHO_C" >&6
 
 # Check whether --enable-shell or --disable-shell was given.
@@ -3177,7 +3178,7 @@
   DISABLE_SHELL=no
 
 fi;
-echo "$as_me:3180: result: $DISABLE_SHELL" >&5
+echo "$as_me:3181: result: $DISABLE_SHELL" >&5
 echo "${ECHO_T}$DISABLE_SHELL" >&6
 if test "$DISABLE_SHELL" = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -3189,7 +3190,7 @@
 fi
 
 ###	use option --with-cflags to set default CFLAGS
-echo "$as_me:3192: checking for CFLAGS options" >&5
+echo "$as_me:3193: checking for CFLAGS options" >&5
 echo $ECHO_N "checking for CFLAGS options... $ECHO_C" >&6
 
 # Check whether --with-CFLAGS or --without-CFLAGS was given.
@@ -3213,10 +3214,10 @@
 elif test -z "$CFLAGS" ; then
 	CFLAGS="-O"
 fi
-echo "$as_me:3216: result: $cflags" >&5
+echo "$as_me:3217: result: $cflags" >&5
 echo "${ECHO_T}$cflags" >&6
 
-echo "$as_me:3219: checking if you want to build syntax filters" >&5
+echo "$as_me:3220: checking if you want to build syntax filters" >&5
 echo $ECHO_N "checking if you want to build syntax filters... $ECHO_C" >&6
 
 # Check whether --enable-filters or --disable-filters was given.
@@ -3233,7 +3234,7 @@
   with_filters=yes
 
 fi;
-echo "$as_me:3236: result: $with_filters" >&5
+echo "$as_me:3237: result: $with_filters" >&5
 echo "${ECHO_T}$with_filters" >&6
 
 MAKE_FILTERS=
@@ -3245,7 +3246,7 @@
 : ${VILE_LOADABLE_FILTERS=none}
 : ${VILE_EXTERNAL_FILTERS=all}
 
-echo "$as_me:3248: checking if you want built-in syntax filters" >&5
+echo "$as_me:3249: checking if you want built-in syntax filters" >&5
 echo $ECHO_N "checking if you want built-in syntax filters... $ECHO_C" >&6
 
 # Check whether --with-builtin-filters or --without-builtin-filters was given.
@@ -3256,10 +3257,10 @@
   VILE_BUILT_IN_FILTERS=none
 fi;
 test "$VILE_BUILT_IN_FILTERS" = no && VILE_BUILT_IN_FILTERS=none
-echo "$as_me:3259: result: $VILE_BUILT_IN_FILTERS" >&5
+echo "$as_me:3260: result: $VILE_BUILT_IN_FILTERS" >&5
 echo "${ECHO_T}$VILE_BUILT_IN_FILTERS" >&6
 
-echo "$as_me:3262: checking if you want loadable syntax filters" >&5
+echo "$as_me:3263: checking if you want loadable syntax filters" >&5
 echo $ECHO_N "checking if you want loadable syntax filters... $ECHO_C" >&6
 
 # Check whether --with-loadable-filters or --without-loadable-filters was given.
@@ -3270,7 +3271,7 @@
   VILE_LOADABLE_FILTERS=none
 fi;
 test "$VILE_LOADABLE_FILTERS" = no && VILE_LOADABLE_FILTERS=none
-echo "$as_me:3273: result: $VILE_LOADABLE_FILTERS" >&5
+echo "$as_me:3274: result: $VILE_LOADABLE_FILTERS" >&5
 echo "${ECHO_T}$VILE_LOADABLE_FILTERS" >&6
 
 # If both "--with-builtin-filters" and "--with-loadable-filters" were given,
@@ -3288,7 +3289,7 @@
 		do
 			if test "$cf_b" = "$cf_l"
 			then
-				{ { echo "$as_me:3291: error: Cannot overlap built-in and loadable filter lists" >&5
+				{ { echo "$as_me:3292: error: Cannot overlap built-in and loadable filter lists" >&5
 echo "$as_me: error: Cannot overlap built-in and loadable filter lists" >&2;}
    { (exit 1); exit 1; }; }
 			fi
@@ -3307,6 +3308,8 @@
 	VILE_EXTERNAL_FILTERS=none
 else
 	complete=`sh $srcdir/filters/makelist.sh $srcdir/filters/genmake.mak lc all`
+	builtins=`sh $srcdir/filters/makelist.sh $srcdir/filters/genmake.mak lc "$VILE_BUILT_IN_FILTERS"`
+	loadable=`sh $srcdir/filters/makelist.sh $srcdir/filters/genmake.mak lc "$VILE_LOADABLE_FILTERS"`
 	VILE_EXTERNAL_FILTERS=
 	for cf_a in $complete
 	do
@@ -3329,7 +3332,7 @@
 	test -z "$VILE_EXTERNAL_FILTERS" && VILE_EXTERNAL_FILTERS=none
 fi
 
-echo "$as_me:3332: checking if any filters require flex" >&5
+echo "$as_me:3335: checking if any filters require flex" >&5
 echo $ECHO_N "checking if any filters require flex... $ECHO_C" >&6
 
 builtins=`sh $srcdir/filters/makelist.sh $srcdir/filters/genmake.mak l "$VILE_BUILT_IN_FILTERS"`
@@ -3342,48 +3345,48 @@
 else
 	cf_needflex=no
 fi
-echo "$as_me:3345: result: $cf_needflex" >&5
+echo "$as_me:3348: result: $cf_needflex" >&5
 echo "${ECHO_T}$cf_needflex" >&6
 
 if test "$cf_needflex" = yes ; then
 
 test -z "$LEX" && LEX=lex
-echo "$as_me:3351: checking if $LEX is really flex" >&5
+echo "$as_me:3354: checking if $LEX is really flex" >&5
 echo $ECHO_N "checking if $LEX is really flex... $ECHO_C" >&6
 if ( $LEX '-?' 2>&1 |fgrep flex >/dev/null )
 then
-	echo "$as_me:3355: result: yes" >&5
+	echo "$as_me:3358: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-	echo "$as_me:3357: checking version of $LEX" >&5
+	echo "$as_me:3360: checking version of $LEX" >&5
 echo $ECHO_N "checking version of $LEX... $ECHO_C" >&6
 	LEX_VERSION=`$LEX --version 2>&1 | sed -e 's/^.* //;s/^[^0-9]*//'`
-	echo "$as_me:3360: result: $LEX_VERSION" >&5
+	echo "$as_me:3363: result: $LEX_VERSION" >&5
 echo "${ECHO_T}$LEX_VERSION" >&6
 else
-	echo "$as_me:3363: result: no" >&5
+	echo "$as_me:3366: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 	if test -z "$LEX_VERSION"
 	then
-		{ { echo "$as_me:3369: error: You need flex to compile builtin filters" >&5
+		{ { echo "$as_me:3372: error: You need flex to compile builtin filters" >&5
 echo "$as_me: error: You need flex to compile builtin filters" >&2;}
    { (exit 1); exit 1; }; }
 	elif ( expr $LEX_VERSION \< 2.5 >/dev/null )
 	then
-		{ { echo "$as_me:3374: error: Sorry - your version of flex is too old: $LEX_VERSION" >&5
+		{ { echo "$as_me:3377: error: Sorry - your version of flex is too old: $LEX_VERSION" >&5
 echo "$as_me: error: Sorry - your version of flex is too old: $LEX_VERSION" >&2;}
    { (exit 1); exit 1; }; }
 	elif ( expr $LEX_VERSION \>= 2.6 >/dev/null )
 	then
-		{ { echo "$as_me:3379: error: Sorry - your version of flex is too unstable: $LEX_VERSION" >&5
+		{ { echo "$as_me:3382: error: Sorry - your version of flex is too unstable: $LEX_VERSION" >&5
 echo "$as_me: error: Sorry - your version of flex is too unstable: $LEX_VERSION" >&2;}
    { (exit 1); exit 1; }; }
 	else
 		LEX_SUBVERSION=`echo "$LEX_VERSION" | sed -e 's/^2.5.//'`
 		if test -z "$LEX_SUBVERSION"
 		then
-			{ { echo "$as_me:3386: error: This version of flex cannot compile builtin filters" >&5
+			{ { echo "$as_me:3389: error: This version of flex cannot compile builtin filters" >&5
 echo "$as_me: error: This version of flex cannot compile builtin filters" >&2;}
    { (exit 1); exit 1; }; }
 		elif test $LEX_SUBVERSION = 4a
@@ -3392,7 +3395,7 @@
 
 		elif ( expr $LEX_SUBVERSION \> 4 >/dev/null )
 		then
-			{ { echo "$as_me:3395: error: This version of flex cannot compile builtin filters" >&5
+			{ { echo "$as_me:3398: error: This version of flex cannot compile builtin filters" >&5
 echo "$as_me: error: This version of flex cannot compile builtin filters" >&2;}
    { (exit 1); exit 1; }; }
 		fi
@@ -3407,7 +3410,7 @@
 	MAKE_FILTERS="#"
 fi
 
-echo "$as_me:3410: checking for library path" >&5
+echo "$as_me:3413: checking for library path" >&5
 echo $ECHO_N "checking for library path... $ECHO_C" >&6
 
 # Check whether --with-libdir-path or --without-libdir-path was given.
@@ -3441,7 +3444,7 @@
   cf_src_path=`echo $cf_src_path | sed -e s%NONE%$ac_default_prefix%`
   ;;
 *)
-  { { echo "$as_me:3444: error: expected a pathname, not \"$cf_src_path\"" >&5
+  { { echo "$as_me:3447: error: expected a pathname, not \"$cf_src_path\"" >&5
 echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -3463,10 +3466,10 @@
 
 eval 'VILE_LIBDIR_PATH="$cf_dst_path"'
 
-echo "$as_me:3466: result: $VILE_LIBDIR_PATH" >&5
+echo "$as_me:3469: result: $VILE_LIBDIR_PATH" >&5
 echo "${ECHO_T}$VILE_LIBDIR_PATH" >&6
 
-echo "$as_me:3469: checking for startup path" >&5
+echo "$as_me:3472: checking for startup path" >&5
 echo $ECHO_N "checking for startup path... $ECHO_C" >&6
 
 # Check whether --with-startup-path or --without-startup-path was given.
@@ -3500,7 +3503,7 @@
   cf_src_path=`echo $cf_src_path | sed -e s%NONE%$ac_default_prefix%`
   ;;
 *)
-  { { echo "$as_me:3503: error: expected a pathname, not \"$cf_src_path\"" >&5
+  { { echo "$as_me:3506: error: expected a pathname, not \"$cf_src_path\"" >&5
 echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -3522,10 +3525,10 @@
 
 eval 'VILE_STARTUP_PATH="$cf_dst_path"'
 
-echo "$as_me:3525: result: $VILE_STARTUP_PATH" >&5
+echo "$as_me:3528: result: $VILE_STARTUP_PATH" >&5
 echo "${ECHO_T}$VILE_STARTUP_PATH" >&6
 
-echo "$as_me:3528: checking if $LEX supports states" >&5
+echo "$as_me:3531: checking if $LEX supports states" >&5
 echo $ECHO_N "checking if $LEX supports states... $ECHO_C" >&6
 cat >conftest.l <<CF_EOF
 %s X Y Z
@@ -3535,26 +3538,26 @@
 nothing	ECHO;
 CF_EOF
 cf_lex_states="$LEX conftest.l 1>&5"
-if { (eval echo "$as_me:3538: \"$cf_lex_states\"") >&5
+if { (eval echo "$as_me:3541: \"$cf_lex_states\"") >&5
   (eval $cf_lex_states) 2>&5
   ac_status=$?
-  echo "$as_me:3541: \$? = $ac_status" >&5
+  echo "$as_me:3544: \$? = $ac_status" >&5
   (exit $ac_status); }; then
 cf_lex_states=yes
 else
 cf_lex_states=no
 fi
-echo "$as_me:3547: result: $cf_lex_states" >&5
+echo "$as_me:3550: result: $cf_lex_states" >&5
 echo "${ECHO_T}$cf_lex_states" >&6
 rm -f conftest.* $LEX_OUTPUT_ROOT.c
 MAKE_LEX=
 if test "$cf_lex_states" != yes ; then
-	{ echo "$as_me:3552: WARNING: Your $LEX program does not support states.  Get flex." >&5
+	{ echo "$as_me:3555: WARNING: Your $LEX program does not support states.  Get flex." >&5
 echo "$as_me: WARNING: Your $LEX program does not support states.  Get flex." >&2;}
 	MAKE_LEX="#"
 fi
 
-echo "$as_me:3557: checking if you want to use perl as an extension language" >&5
+echo "$as_me:3560: checking if you want to use perl as an extension language" >&5
 echo $ECHO_N "checking if you want to use perl as an extension language... $ECHO_C" >&6
 
 # Check whether --with-perl or --without-perl was given.
@@ -3564,16 +3567,16 @@
 else
   with_perl=no
 fi;
-echo "$as_me:3567: result: $with_perl" >&5
+echo "$as_me:3570: result: $with_perl" >&5
 echo "${ECHO_T}$with_perl" >&6
 if test "$with_perl" = yes ; then
 	# find perl binary
-echo "$as_me:3571: checking for perl-5.004" >&5
+echo "$as_me:3574: checking for perl-5.004" >&5
 echo $ECHO_N "checking for perl-5.004... $ECHO_C" >&6
 if test "${cf_cv_prog_PERL+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  echo "configure:3576: ...version 5.004 required" >&5
+  echo "configure:3579: ...version 5.004 required" >&5
   # allow user to override
   if test -n "$PERL"; then
     cf_try="$PERL"
@@ -3583,7 +3586,7 @@
 
   cf_version=`echo '[]'|sed -e 's/^./$/'`
   for cf_prog in $cf_try; do
-    echo "configure:3586: trying $cf_prog" >&5
+    echo "configure:3589: trying $cf_prog" >&5
     if ($cf_prog -e 'printf "found version %g\n",'$cf_version';exit('$cf_version'<5.004)') 1>&5 2>&1; then
       cf_cv_prog_PERL=$cf_prog
       break
@@ -3592,15 +3595,15 @@
 fi
 PERL="$cf_cv_prog_PERL"
 if test -n "$PERL"; then
-  echo "$as_me:3595: result: $PERL" >&5
+  echo "$as_me:3598: result: $PERL" >&5
 echo "${ECHO_T}$PERL" >&6
 else
-  echo "$as_me:3598: result: no" >&5
+  echo "$as_me:3601: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 	if test "$PERL" = no; then
-	    { { echo "$as_me:3603: error: perl not found" >&5
+	    { { echo "$as_me:3606: error: perl not found" >&5
 echo "$as_me: error: perl not found" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -3652,7 +3655,7 @@
 
 if test "$cf_check_cflags" != "$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 3655 "configure"
+#line 3658 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -3664,16 +3667,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3667: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3670: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3670: \$? = $ac_status" >&5
+  echo "$as_me:3673: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3673: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3676: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3676: \$? = $ac_status" >&5
+  echo "$as_me:3679: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -3698,13 +3701,13 @@
 # X11 checks will sometimes add to CFLAGS.  We want the state of CFLAGS
 # prior to these checks
 
-echo "$as_me:3701: checking for getpwnam" >&5
+echo "$as_me:3704: checking for getpwnam" >&5
 echo $ECHO_N "checking for getpwnam... $ECHO_C" >&6
 if test "${ac_cv_func_getpwnam+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3707 "configure"
+#line 3710 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char getpwnam (); below.  */
@@ -3735,16 +3738,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3738: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3741: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3741: \$? = $ac_status" >&5
+  echo "$as_me:3744: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3744: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3747: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3747: \$? = $ac_status" >&5
+  echo "$as_me:3750: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_getpwnam=yes
 else
@@ -3754,13 +3757,13 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:3757: result: $ac_cv_func_getpwnam" >&5
+echo "$as_me:3760: result: $ac_cv_func_getpwnam" >&5
 echo "${ECHO_T}$ac_cv_func_getpwnam" >&6
 if test $ac_cv_func_getpwnam = yes; then
   :
 else
 
-echo "$as_me:3763: checking for getpwnam in -lsun" >&5
+echo "$as_me:3766: checking for getpwnam in -lsun" >&5
 echo $ECHO_N "checking for getpwnam in -lsun... $ECHO_C" >&6
 if test "${ac_cv_lib_sun_getpwnam+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3768,7 +3771,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsun  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3771 "configure"
+#line 3774 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3787,16 +3790,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3790: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3793: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3793: \$? = $ac_status" >&5
+  echo "$as_me:3796: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3796: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3799: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3799: \$? = $ac_status" >&5
+  echo "$as_me:3802: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_sun_getpwnam=yes
 else
@@ -3807,7 +3810,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3810: result: $ac_cv_lib_sun_getpwnam" >&5
+echo "$as_me:3813: result: $ac_cv_lib_sun_getpwnam" >&5
 echo "${ECHO_T}$ac_cv_lib_sun_getpwnam" >&6
 if test $ac_cv_lib_sun_getpwnam = yes; then
   cat >>confdefs.h <<EOF
@@ -3825,7 +3828,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:3828: checking for $ac_word" >&5
+echo "$as_me:3831: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_LINT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3840,7 +3843,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LINT="$ac_prog"
-echo "$as_me:3843: found $ac_dir/$ac_word" >&5
+echo "$as_me:3846: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3848,10 +3851,10 @@
 fi
 LINT=$ac_cv_prog_LINT
 if test -n "$LINT"; then
-  echo "$as_me:3851: result: $LINT" >&5
+  echo "$as_me:3854: result: $LINT" >&5
 echo "${ECHO_T}$LINT" >&6
 else
-  echo "$as_me:3854: result: no" >&5
+  echo "$as_me:3857: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3867,13 +3870,13 @@
 fi
 
 ###	checks for header files
-echo "$as_me:3870: checking for ANSI C header files" >&5
+echo "$as_me:3873: checking for ANSI C header files" >&5
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3876 "configure"
+#line 3879 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -3881,13 +3884,13 @@
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:3884: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:3887: \"$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:3890: \$? = $ac_status" >&5
+  echo "$as_me:3893: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3909,7 +3912,7 @@
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 3912 "configure"
+#line 3915 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -3927,7 +3930,7 @@
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 3930 "configure"
+#line 3933 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -3948,7 +3951,7 @@
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3951 "configure"
+#line 3954 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -3974,15 +3977,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:3977: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3980: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3980: \$? = $ac_status" >&5
+  echo "$as_me:3983: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:3982: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3985: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3985: \$? = $ac_status" >&5
+  echo "$as_me:3988: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -3995,7 +3998,7 @@
 fi
 fi
 fi
-echo "$as_me:3998: result: $ac_cv_header_stdc" >&5
+echo "$as_me:4001: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -4008,13 +4011,13 @@
 ac_header_dirent=no
 for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
   as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-echo "$as_me:4011: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:4014: checking for $ac_hdr that defines DIR" >&5
 echo $ECHO_N "checking for $ac_hdr that defines DIR... $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 4017 "configure"
+#line 4020 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -4029,16 +4032,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4032: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4035: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4035: \$? = $ac_status" >&5
+  echo "$as_me:4038: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4038: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4041: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4041: \$? = $ac_status" >&5
+  echo "$as_me:4044: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -4048,7 +4051,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4051: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:4054: 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
@@ -4061,7 +4064,7 @@
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  echo "$as_me:4064: checking for opendir in -ldir" >&5
+  echo "$as_me:4067: checking for opendir in -ldir" >&5
 echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
 if test "${ac_cv_lib_dir_opendir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4069,7 +4072,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 4072 "configure"
+#line 4075 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4088,16 +4091,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4091: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4094: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4094: \$? = $ac_status" >&5
+  echo "$as_me:4097: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4097: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4100: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4100: \$? = $ac_status" >&5
+  echo "$as_me:4103: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -4108,14 +4111,14 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4111: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:4114: result: $ac_cv_lib_dir_opendir" >&5
 echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
 if test $ac_cv_lib_dir_opendir = yes; then
   LIBS="$LIBS -ldir"
 fi
 
 else
-  echo "$as_me:4118: checking for opendir in -lx" >&5
+  echo "$as_me:4121: checking for opendir in -lx" >&5
 echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
 if test "${ac_cv_lib_x_opendir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4123,7 +4126,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 4126 "configure"
+#line 4129 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4142,16 +4145,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4145: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4148: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4148: \$? = $ac_status" >&5
+  echo "$as_me:4151: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4151: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4154: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4154: \$? = $ac_status" >&5
+  echo "$as_me:4157: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -4162,7 +4165,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4165: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:4168: result: $ac_cv_lib_x_opendir" >&5
 echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
 if test $ac_cv_lib_x_opendir = yes; then
   LIBS="$LIBS -lx"
@@ -4201,23 +4204,23 @@
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:4204: checking for $ac_header" >&5
+echo "$as_me:4207: 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 4210 "configure"
+#line 4213 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:4214: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4217: \"$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:4220: \$? = $ac_status" >&5
+  echo "$as_me:4223: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4236,7 +4239,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:4239: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:4242: 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
@@ -4247,13 +4250,13 @@
 done
 
 ###	checks for typedefs
-echo "$as_me:4250: checking return type of signal handlers" >&5
+echo "$as_me:4253: checking return type of signal handlers" >&5
 echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
 if test "${ac_cv_type_signal+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4256 "configure"
+#line 4259 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -4275,16 +4278,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4278: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4281: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4281: \$? = $ac_status" >&5
+  echo "$as_me:4284: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4284: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4287: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4287: \$? = $ac_status" >&5
+  echo "$as_me:4290: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_signal=void
 else
@@ -4294,7 +4297,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4297: result: $ac_cv_type_signal" >&5
+echo "$as_me:4300: result: $ac_cv_type_signal" >&5
 echo "${ECHO_T}$ac_cv_type_signal" >&6
 
 cat >>confdefs.h <<EOF
@@ -4323,28 +4326,28 @@
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:4326: checking for $ac_header" >&5
+echo "$as_me:4329: 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 4332 "configure"
+#line 4335 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4338: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4341: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4341: \$? = $ac_status" >&5
+  echo "$as_me:4344: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4344: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4347: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4347: \$? = $ac_status" >&5
+  echo "$as_me:4350: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -4354,7 +4357,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4357: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:4360: 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
@@ -4364,13 +4367,13 @@
 fi
 done
 
-echo "$as_me:4367: checking for size_t" >&5
+echo "$as_me:4370: checking for size_t" >&5
 echo $ECHO_N "checking for size_t... $ECHO_C" >&6
 if test "${ac_cv_type_size_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4373 "configure"
+#line 4376 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -4385,16 +4388,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4388: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4391: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4391: \$? = $ac_status" >&5
+  echo "$as_me:4394: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4394: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4397: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4397: \$? = $ac_status" >&5
+  echo "$as_me:4400: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_size_t=yes
 else
@@ -4404,7 +4407,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4407: result: $ac_cv_type_size_t" >&5
+echo "$as_me:4410: result: $ac_cv_type_size_t" >&5
 echo "${ECHO_T}$ac_cv_type_size_t" >&6
 if test $ac_cv_type_size_t = yes; then
   :
@@ -4416,13 +4419,13 @@
 
 fi
 
-echo "$as_me:4419: checking for uid_t in sys/types.h" >&5
+echo "$as_me:4422: checking for uid_t in sys/types.h" >&5
 echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6
 if test "${ac_cv_type_uid_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4425 "configure"
+#line 4428 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -4436,7 +4439,7 @@
 rm -f conftest*
 
 fi
-echo "$as_me:4439: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:4442: result: $ac_cv_type_uid_t" >&5
 echo "${ECHO_T}$ac_cv_type_uid_t" >&6
 if test $ac_cv_type_uid_t = no; then
 
@@ -4450,13 +4453,13 @@
 
 fi
 
-echo "$as_me:4453: checking for pid_t" >&5
+echo "$as_me:4456: checking for pid_t" >&5
 echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
 if test "${ac_cv_type_pid_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4459 "configure"
+#line 4462 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -4471,16 +4474,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4474: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4477: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4477: \$? = $ac_status" >&5
+  echo "$as_me:4480: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4480: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4483: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4483: \$? = $ac_status" >&5
+  echo "$as_me:4486: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -4490,7 +4493,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4493: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:4496: result: $ac_cv_type_pid_t" >&5
 echo "${ECHO_T}$ac_cv_type_pid_t" >&6
 if test $ac_cv_type_pid_t = yes; then
   :
@@ -4502,13 +4505,13 @@
 
 fi
 
-echo "$as_me:4505: checking for time_t" >&5
+echo "$as_me:4508: checking for time_t" >&5
 echo $ECHO_N "checking for time_t... $ECHO_C" >&6
 if test "${ac_cv_type_time_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4511 "configure"
+#line 4514 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -4523,16 +4526,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4526: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4529: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4529: \$? = $ac_status" >&5
+  echo "$as_me:4532: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4532: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4535: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4535: \$? = $ac_status" >&5
+  echo "$as_me:4538: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_time_t=yes
 else
@@ -4542,7 +4545,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4545: result: $ac_cv_type_time_t" >&5
+echo "$as_me:4548: result: $ac_cv_type_time_t" >&5
 echo "${ECHO_T}$ac_cv_type_time_t" >&6
 if test $ac_cv_type_time_t = yes; then
   :
@@ -4556,18 +4559,18 @@
 
 ###	checks for library functions
 if test "$cross_compiling" = no; then
-	echo "$as_me:4559: checking whether setvbuf arguments are reversed" >&5
+	echo "$as_me:4562: checking whether setvbuf arguments are reversed" >&5
 echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6
 if test "${ac_cv_func_setvbuf_reversed+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:4565: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:4568: 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 4570 "configure"
+#line 4573 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 /* If setvbuf has the reversed format, exit 0. */
@@ -4584,15 +4587,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:4587: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4590: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4590: \$? = $ac_status" >&5
+  echo "$as_me:4593: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:4592: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4595: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4595: \$? = $ac_status" >&5
+  echo "$as_me:4598: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_setvbuf_reversed=yes
 else
@@ -4605,7 +4608,7 @@
 fi
 rm -f core core.* *.core
 fi
-echo "$as_me:4608: result: $ac_cv_func_setvbuf_reversed" >&5
+echo "$as_me:4611: result: $ac_cv_func_setvbuf_reversed" >&5
 echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6
 if test $ac_cv_func_setvbuf_reversed = yes; then
 
@@ -4618,13 +4621,13 @@
 fi
 
 ###	checks for structures
-echo "$as_me:4621: checking whether stat file-mode macros are broken" >&5
+echo "$as_me:4624: checking whether stat file-mode macros are broken" >&5
 echo $ECHO_N "checking whether stat file-mode macros are broken... $ECHO_C" >&6
 if test "${ac_cv_header_stat_broken+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4627 "configure"
+#line 4630 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -4663,7 +4666,7 @@
 rm -f conftest*
 
 fi
-echo "$as_me:4666: result: $ac_cv_header_stat_broken" >&5
+echo "$as_me:4669: result: $ac_cv_header_stat_broken" >&5
 echo "${ECHO_T}$ac_cv_header_stat_broken" >&6
 if test $ac_cv_header_stat_broken = yes; then
 
@@ -4673,13 +4676,13 @@
 
 fi
 
-echo "$as_me:4676: checking for struct stat.st_blksize" >&5
+echo "$as_me:4679: checking for struct stat.st_blksize" >&5
 echo $ECHO_N "checking for struct stat.st_blksize... $ECHO_C" >&6
 if test "${ac_cv_member_struct_stat_st_blksize+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4682 "configure"
+#line 4685 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -4693,16 +4696,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4696: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4699: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4699: \$? = $ac_status" >&5
+  echo "$as_me:4702: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4702: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4705: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4705: \$? = $ac_status" >&5
+  echo "$as_me:4708: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_member_struct_stat_st_blksize=yes
 else
@@ -4712,7 +4715,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4715: result: $ac_cv_member_struct_stat_st_blksize" >&5
+echo "$as_me:4718: result: $ac_cv_member_struct_stat_st_blksize" >&5
 echo "${ECHO_T}$ac_cv_member_struct_stat_st_blksize" >&6
 if test $ac_cv_member_struct_stat_st_blksize = yes; then
 
@@ -4726,13 +4729,13 @@
 
 fi
 
-echo "$as_me:4729: checking for struct stat.st_blocks" >&5
+echo "$as_me:4732: checking for struct stat.st_blocks" >&5
 echo $ECHO_N "checking for struct stat.st_blocks... $ECHO_C" >&6
 if test "${ac_cv_member_struct_stat_st_blocks+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4735 "configure"
+#line 4738 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -4746,16 +4749,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4749: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4752: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4752: \$? = $ac_status" >&5
+  echo "$as_me:4755: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4755: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4758: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4758: \$? = $ac_status" >&5
+  echo "$as_me:4761: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_member_struct_stat_st_blocks=yes
 else
@@ -4765,7 +4768,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4768: result: $ac_cv_member_struct_stat_st_blocks" >&5
+echo "$as_me:4771: result: $ac_cv_member_struct_stat_st_blocks" >&5
 echo "${ECHO_T}$ac_cv_member_struct_stat_st_blocks" >&6
 if test $ac_cv_member_struct_stat_st_blocks = yes; then
 
@@ -4781,13 +4784,13 @@
   LIBOBJS="$LIBOBJS fileblocks.$ac_objext"
 fi
 
-echo "$as_me:4784: checking for struct stat.st_rdev" >&5
+echo "$as_me:4787: checking for struct stat.st_rdev" >&5
 echo $ECHO_N "checking for struct stat.st_rdev... $ECHO_C" >&6
 if test "${ac_cv_member_struct_stat_st_rdev+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4790 "configure"
+#line 4793 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -4801,16 +4804,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4804: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4807: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4807: \$? = $ac_status" >&5
+  echo "$as_me:4810: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4810: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4813: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4813: \$? = $ac_status" >&5
+  echo "$as_me:4816: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_member_struct_stat_st_rdev=yes
 else
@@ -4820,7 +4823,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4823: result: $ac_cv_member_struct_stat_st_rdev" >&5
+echo "$as_me:4826: result: $ac_cv_member_struct_stat_st_rdev" >&5
 echo "${ECHO_T}$ac_cv_member_struct_stat_st_rdev" >&6
 if test $ac_cv_member_struct_stat_st_rdev = yes; then
 
@@ -4834,13 +4837,13 @@
 
 fi
 
-echo "$as_me:4837: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "$as_me:4840: checking whether struct tm is in sys/time.h or time.h" >&5
 echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6
 if test "${ac_cv_struct_tm+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4843 "configure"
+#line 4846 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <time.h>
@@ -4854,16 +4857,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4857: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4860: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4860: \$? = $ac_status" >&5
+  echo "$as_me:4863: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4863: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4866: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4866: \$? = $ac_status" >&5
+  echo "$as_me:4869: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_struct_tm=time.h
 else
@@ -4873,7 +4876,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4876: result: $ac_cv_struct_tm" >&5
+echo "$as_me:4879: result: $ac_cv_struct_tm" >&5
 echo "${ECHO_T}$ac_cv_struct_tm" >&6
 if test $ac_cv_struct_tm = sys/time.h; then
 
@@ -4883,13 +4886,13 @@
 
 fi
 
-echo "$as_me:4886: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:4889: checking whether time.h and sys/time.h may both be included" >&5
 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
 if test "${ac_cv_header_time+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4892 "configure"
+#line 4895 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -4905,16 +4908,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4908: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4911: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4911: \$? = $ac_status" >&5
+  echo "$as_me:4914: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4914: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4917: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4917: \$? = $ac_status" >&5
+  echo "$as_me:4920: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_header_time=yes
 else
@@ -4924,7 +4927,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4927: result: $ac_cv_header_time" >&5
+echo "$as_me:4930: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -4934,14 +4937,14 @@
 
 fi
 
-echo "$as_me:4937: checking if we can include select.h with time.h" >&5
+echo "$as_me:4940: checking if we can include select.h with time.h" >&5
 echo $ECHO_N "checking if we can include select.h with time.h... $ECHO_C" >&6
 if test "${cf_cv_select_with_time+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 4944 "configure"
+#line 4947 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -4971,16 +4974,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4974: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4977: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4977: \$? = $ac_status" >&5
+  echo "$as_me:4980: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4980: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4983: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4983: \$? = $ac_status" >&5
+  echo "$as_me:4986: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_select_with_time=yes
 else
@@ -4991,20 +4994,20 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:4994: result: $cf_cv_select_with_time" >&5
+echo "$as_me:4997: result: $cf_cv_select_with_time" >&5
 echo "${ECHO_T}$cf_cv_select_with_time" >&6
 test $cf_cv_select_with_time = yes && cat >>confdefs.h <<\EOF
 #define SELECT_WITH_TIME 1
 EOF
 
-echo "$as_me:5000: checking if we may include sys/resource.h with sys/wait.h" >&5
+echo "$as_me:5003: checking if we may include sys/resource.h with sys/wait.h" >&5
 echo $ECHO_N "checking if we may include sys/resource.h with sys/wait.h... $ECHO_C" >&6
 if test "${cf_cv_resource_with_wait+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 5007 "configure"
+#line 5010 "configure"
 #include "confdefs.h"
 
 #if defined(HAVE_SYS_TIME_H) && (defined(SELECT_WITH_TIME) || !(defined(HAVE_SELECT_H || defined(HAVE_SYS_SELECT_H))))
@@ -5028,16 +5031,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5031: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5034: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5034: \$? = $ac_status" >&5
+  echo "$as_me:5037: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5037: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5040: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5040: \$? = $ac_status" >&5
+  echo "$as_me:5043: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_resource_with_wait=yes
 else
@@ -5048,7 +5051,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:5051: result: $cf_cv_resource_with_wait" >&5
+echo "$as_me:5054: result: $cf_cv_resource_with_wait" >&5
 echo "${ECHO_T}$cf_cv_resource_with_wait" >&6
 test $cf_cv_resource_with_wait = yes && cat >>confdefs.h <<\EOF
 #define RESOURCE_WITH_WAIT 1
@@ -5061,23 +5064,23 @@
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:5064: checking for $ac_header" >&5
+echo "$as_me:5067: 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 5070 "configure"
+#line 5073 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:5074: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5077: \"$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:5080: \$? = $ac_status" >&5
+  echo "$as_me:5083: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5096,7 +5099,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:5099: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:5102: 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
@@ -5111,23 +5114,23 @@
 for ac_header in sys/termio.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:5114: checking for $ac_header" >&5
+echo "$as_me:5117: 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 5120 "configure"
+#line 5123 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:5124: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5127: \"$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:5130: \$? = $ac_status" >&5
+  echo "$as_me:5133: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5146,7 +5149,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:5149: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:5152: 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
@@ -5164,10 +5167,10 @@
 	*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:5167: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:5170: checking whether termios.h needs _POSIX_SOURCE" >&5
 echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6
 	cat >conftest.$ac_ext <<_ACEOF
-#line 5170 "configure"
+#line 5173 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -5179,16 +5182,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5182: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5185: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5185: \$? = $ac_status" >&5
+  echo "$as_me:5188: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5188: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5191: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5191: \$? = $ac_status" >&5
+  echo "$as_me:5194: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   termios_bad=no
 else
@@ -5196,7 +5199,7 @@
 cat conftest.$ac_ext >&5
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 5199 "configure"
+#line 5202 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -5210,16 +5213,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5213: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5216: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5216: \$? = $ac_status" >&5
+  echo "$as_me:5219: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5219: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5222: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5222: \$? = $ac_status" >&5
+  echo "$as_me:5225: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   termios_bad=unknown
 else
@@ -5234,12 +5237,12 @@
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-	echo "$as_me:5237: result: $termios_bad" >&5
+	echo "$as_me:5240: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:5242: checking declaration of size-change" >&5
+echo "$as_me:5245: checking declaration of size-change" >&5
 echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6
 if test "${cf_cv_sizechange+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5254,7 +5257,7 @@
     CPPFLAGS="$cf_save_CPPFLAGS"
     test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
     cat >conftest.$ac_ext <<_ACEOF
-#line 5257 "configure"
+#line 5260 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -5298,16 +5301,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5301: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5304: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5304: \$? = $ac_status" >&5
+  echo "$as_me:5307: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5307: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5310: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5310: \$? = $ac_status" >&5
+  echo "$as_me:5313: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_sizechange=yes
 else
@@ -5326,7 +5329,7 @@
 done
 
 fi
-echo "$as_me:5329: result: $cf_cv_sizechange" >&5
+echo "$as_me:5332: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 	cat >>confdefs.h <<\EOF
@@ -5343,7 +5346,7 @@
 	esac
 fi
 
-echo "$as_me:5346: checking for file-pointer ready definition" >&5
+echo "$as_me:5349: checking for file-pointer ready definition" >&5
 echo $ECHO_N "checking for file-pointer ready definition... $ECHO_C" >&6
 if test "${cf_cv_fp_isready+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5357,7 +5360,7 @@
 	echo "test-compile $definition" 1>&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 5360 "configure"
+#line 5363 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -5372,16 +5375,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5375: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5378: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5378: \$? = $ac_status" >&5
+  echo "$as_me:5381: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5381: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5384: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5384: \$? = $ac_status" >&5
+  echo "$as_me:5387: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   echo "$definition" >conftest.env
 	 break
@@ -5405,21 +5408,21 @@
 test -f conftest.env && cf_cv_fp_isready=`cat conftest.env`
 
 fi
-echo "$as_me:5408: result: $cf_cv_fp_isready" >&5
+echo "$as_me:5411: result: $cf_cv_fp_isready" >&5
 echo "${ECHO_T}$cf_cv_fp_isready" >&6
 
 test "$cf_cv_fp_isready" != none && cat >>confdefs.h <<EOF
 #define isready_c(p) $cf_cv_fp_isready
 EOF
 
-echo "$as_me:5415: checking for <wctype.h> and functions" >&5
+echo "$as_me:5418: checking for <wctype.h> and functions" >&5
 echo $ECHO_N "checking for <wctype.h> and functions... $ECHO_C" >&6
 if test "${cf_cv_have_wctype+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 5422 "configure"
+#line 5425 "configure"
 #include "confdefs.h"
 
 #include <wctype.h>
@@ -5446,16 +5449,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5449: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5452: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5452: \$? = $ac_status" >&5
+  echo "$as_me:5455: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5455: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5458: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5458: \$? = $ac_status" >&5
+  echo "$as_me:5461: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_wctype=yes
 else
@@ -5466,10 +5469,10 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:5469: result: $cf_cv_have_wctype" >&5
+echo "$as_me:5472: result: $cf_cv_have_wctype" >&5
 echo "${ECHO_T}$cf_cv_have_wctype" >&6
 if test "$cf_cv_have_wctype" = yes ; then
-	echo "$as_me:5472: checking for library containing wctype" >&5
+	echo "$as_me:5475: checking for library containing wctype" >&5
 echo $ECHO_N "checking for library containing wctype... $ECHO_C" >&6
 if test "${ac_cv_search_wctype+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5477,7 +5480,7 @@
   ac_func_search_save_LIBS=$LIBS
 ac_cv_search_wctype=no
 cat >conftest.$ac_ext <<_ACEOF
-#line 5480 "configure"
+#line 5483 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -5496,16 +5499,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5499: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5502: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5502: \$? = $ac_status" >&5
+  echo "$as_me:5505: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5505: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5508: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5508: \$? = $ac_status" >&5
+  echo "$as_me:5511: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_search_wctype="none required"
 else
@@ -5517,7 +5520,7 @@
   for ac_lib in w; do
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
     cat >conftest.$ac_ext <<_ACEOF
-#line 5520 "configure"
+#line 5523 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -5536,16 +5539,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5539: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5542: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5542: \$? = $ac_status" >&5
+  echo "$as_me:5545: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5545: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5548: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5548: \$? = $ac_status" >&5
+  echo "$as_me:5551: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_search_wctype="-l$ac_lib"
 break
@@ -5558,7 +5561,7 @@
 fi
 LIBS=$ac_func_search_save_LIBS
 fi
-echo "$as_me:5561: result: $ac_cv_search_wctype" >&5
+echo "$as_me:5564: result: $ac_cv_search_wctype" >&5
 echo "${ECHO_T}$ac_cv_search_wctype" >&6
 if test "$ac_cv_search_wctype" != no; then
   test "$ac_cv_search_wctype" = "none required" || LIBS="$ac_cv_search_wctype $LIBS"
@@ -5571,7 +5574,7 @@
 fi
 
 ###	checks for system services and user specified options
-echo "$as_me:5574: checking for long file names" >&5
+echo "$as_me:5577: checking for long file names" >&5
 echo $ECHO_N "checking for long file names... $ECHO_C" >&6
 if test "${ac_cv_sys_long_file_names+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5610,7 +5613,7 @@
   rm -rf $ac_xdir 2>/dev/null
 done
 fi
-echo "$as_me:5613: result: $ac_cv_sys_long_file_names" >&5
+echo "$as_me:5616: result: $ac_cv_sys_long_file_names" >&5
 echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6
 if test $ac_cv_sys_long_file_names = yes; then
 
@@ -5620,7 +5623,7 @@
 
 fi
 
-echo "$as_me:5623: checking for restartable reads on pipes" >&5
+echo "$as_me:5626: checking for restartable reads on pipes" >&5
 echo $ECHO_N "checking for restartable reads on pipes... $ECHO_C" >&6
 if test "${cf_cv_can_restart_read+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5630,7 +5633,7 @@
   cf_cv_can_restart_read=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5633 "configure"
+#line 5636 "configure"
 #include "confdefs.h"
 /* Exit 0 (true) if wait returns something other than -1,
    i.e. the pid of the child, which means that wait was restarted
@@ -5677,15 +5680,15 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:5680: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5683: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5683: \$? = $ac_status" >&5
+  echo "$as_me:5686: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:5685: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5688: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5688: \$? = $ac_status" >&5
+  echo "$as_me:5691: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_can_restart_read=yes
 else
@@ -5698,7 +5701,7 @@
 fi
 
 fi
-echo "$as_me:5701: result: $cf_cv_can_restart_read" >&5
+echo "$as_me:5704: result: $cf_cv_can_restart_read" >&5
 echo "${ECHO_T}$cf_cv_can_restart_read" >&6
 
 test $cf_cv_can_restart_read = yes && cat >>confdefs.h <<\EOF
@@ -5707,18 +5710,18 @@
 
 		# is a read() of a pipe restartable?
 
-echo "$as_me:5710: checking whether setpgrp takes no argument" >&5
+echo "$as_me:5713: checking whether setpgrp takes no argument" >&5
 echo $ECHO_N "checking whether setpgrp takes no argument... $ECHO_C" >&6
 if test "${ac_cv_func_setpgrp_void+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:5716: error: cannot check setpgrp if cross compiling" >&5
+  { { echo "$as_me:5719: error: cannot check setpgrp if cross compiling" >&5
 echo "$as_me: error: cannot check setpgrp if cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5721 "configure"
+#line 5724 "configure"
 #include "confdefs.h"
 #if HAVE_UNISTD_H
 # include <unistd.h>
@@ -5735,15 +5738,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:5738: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5741: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5741: \$? = $ac_status" >&5
+  echo "$as_me:5744: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:5743: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5746: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5746: \$? = $ac_status" >&5
+  echo "$as_me:5749: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_setpgrp_void=no
 else
@@ -5755,7 +5758,7 @@
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:5758: result: $ac_cv_func_setpgrp_void" >&5
+echo "$as_me:5761: result: $ac_cv_func_setpgrp_void" >&5
 echo "${ECHO_T}$ac_cv_func_setpgrp_void" >&6
 if test $ac_cv_func_setpgrp_void = yes; then
 
@@ -5765,14 +5768,14 @@
 
 fi
 
-echo "$as_me:5768: checking whether getpgrp takes no argument" >&5
+echo "$as_me:5771: checking whether getpgrp takes no argument" >&5
 echo $ECHO_N "checking whether getpgrp takes no argument... $ECHO_C" >&6
 if test "${ac_cv_func_getpgrp_void+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   # Use it with a single arg.
 cat >conftest.$ac_ext <<_ACEOF
-#line 5775 "configure"
+#line 5778 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -5784,16 +5787,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5787: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5790: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5790: \$? = $ac_status" >&5
+  echo "$as_me:5793: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5793: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5796: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5796: \$? = $ac_status" >&5
+  echo "$as_me:5799: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_func_getpgrp_1=yes
 else
@@ -5804,7 +5807,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 # Use it with no arg.
 cat >conftest.$ac_ext <<_ACEOF
-#line 5807 "configure"
+#line 5810 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -5816,16 +5819,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5819: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5822: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5822: \$? = $ac_status" >&5
+  echo "$as_me:5825: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5825: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5828: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5828: \$? = $ac_status" >&5
+  echo "$as_me:5831: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_func_getpgrp_0=yes
 else
@@ -5839,12 +5842,12 @@
   yes:no) ac_cv_func_getpgrp_void=yes;;
   no:yes) ac_cv_func_getpgrp_void=false;;
   *) if test "$cross_compiling" = yes; then
-  { { echo "$as_me:5842: error: cannot check getpgrp if cross compiling" >&5
+  { { echo "$as_me:5845: error: cannot check getpgrp if cross compiling" >&5
 echo "$as_me: error: cannot check getpgrp if cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5847 "configure"
+#line 5850 "configure"
 #include "confdefs.h"
 $ac_includes_default
 
@@ -5898,15 +5901,15 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:5901: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5904: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5904: \$? = $ac_status" >&5
+  echo "$as_me:5907: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:5906: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5909: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5909: \$? = $ac_status" >&5
+  echo "$as_me:5912: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_getpgrp_void=yes
 else
@@ -5920,7 +5923,7 @@
 esac # $ac_func_getpgrp_0:$ac_func_getpgrp_1
 
 fi
-echo "$as_me:5923: result: $ac_cv_func_getpgrp_void" >&5
+echo "$as_me:5926: result: $ac_cv_func_getpgrp_void" >&5
 echo "${ECHO_T}$ac_cv_func_getpgrp_void" >&6
 if test $ac_cv_func_getpgrp_void = yes; then
 
@@ -5930,7 +5933,7 @@
 
 fi
 
-echo "$as_me:5933: checking if killpg is needed" >&5
+echo "$as_me:5936: checking if killpg is needed" >&5
 echo $ECHO_N "checking if killpg is needed... $ECHO_C" >&6
 if test "${cf_cv_need_killpg+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5940,7 +5943,7 @@
   cf_cv_need_killpg=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5943 "configure"
+#line 5946 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -5965,15 +5968,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:5968: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5971: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5971: \$? = $ac_status" >&5
+  echo "$as_me:5974: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:5973: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5976: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5976: \$? = $ac_status" >&5
+  echo "$as_me:5979: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_killpg=no
 else
@@ -5986,21 +5989,21 @@
 fi
 
 fi
-echo "$as_me:5989: result: $cf_cv_need_killpg" >&5
+echo "$as_me:5992: result: $cf_cv_need_killpg" >&5
 echo "${ECHO_T}$cf_cv_need_killpg" >&6
 
 test $cf_cv_need_killpg = yes && cat >>confdefs.h <<\EOF
 #define HAVE_KILLPG 1
 EOF
 
-echo "$as_me:5996: checking if external errno is declared" >&5
+echo "$as_me:5999: checking if external errno is declared" >&5
 echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6
 if test "${cf_cv_dcl_errno+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 6003 "configure"
+#line 6006 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -6018,16 +6021,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6021: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6024: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6024: \$? = $ac_status" >&5
+  echo "$as_me:6027: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6027: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6030: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6030: \$? = $ac_status" >&5
+  echo "$as_me:6033: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -6038,7 +6041,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:6041: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:6044: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -6053,14 +6056,14 @@
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:6056: checking if external errno exists" >&5
+echo "$as_me:6059: checking if external errno exists" >&5
 echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6
 if test "${cf_cv_have_errno+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 6063 "configure"
+#line 6066 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -6075,16 +6078,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6078: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6081: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6081: \$? = $ac_status" >&5
+  echo "$as_me:6084: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6084: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6087: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6087: \$? = $ac_status" >&5
+  echo "$as_me:6090: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_errno=yes
 else
@@ -6095,7 +6098,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:6098: result: $cf_cv_have_errno" >&5
+echo "$as_me:6101: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -6108,14 +6111,14 @@
 
 fi
 
-echo "$as_me:6111: checking if external sys_nerr is declared" >&5
+echo "$as_me:6114: checking if external sys_nerr is declared" >&5
 echo $ECHO_N "checking if external sys_nerr is declared... $ECHO_C" >&6
 if test "${cf_cv_dcl_sys_nerr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 6118 "configure"
+#line 6121 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -6133,16 +6136,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6136: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6139: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6139: \$? = $ac_status" >&5
+  echo "$as_me:6142: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6142: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6145: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6145: \$? = $ac_status" >&5
+  echo "$as_me:6148: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_nerr=yes
 else
@@ -6153,7 +6156,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:6156: result: $cf_cv_dcl_sys_nerr" >&5
+echo "$as_me:6159: result: $cf_cv_dcl_sys_nerr" >&5
 echo "${ECHO_T}$cf_cv_dcl_sys_nerr" >&6
 
 if test "$cf_cv_dcl_sys_nerr" = no ; then
@@ -6168,14 +6171,14 @@
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:6171: checking if external sys_nerr exists" >&5
+echo "$as_me:6174: checking if external sys_nerr exists" >&5
 echo $ECHO_N "checking if external sys_nerr exists... $ECHO_C" >&6
 if test "${cf_cv_have_sys_nerr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 6178 "configure"
+#line 6181 "configure"
 #include "confdefs.h"
 
 #undef sys_nerr
@@ -6190,16 +6193,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6193: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6196: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6196: \$? = $ac_status" >&5
+  echo "$as_me:6199: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6199: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6202: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6202: \$? = $ac_status" >&5
+  echo "$as_me:6205: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_nerr=yes
 else
@@ -6210,7 +6213,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:6213: result: $cf_cv_have_sys_nerr" >&5
+echo "$as_me:6216: result: $cf_cv_have_sys_nerr" >&5
 echo "${ECHO_T}$cf_cv_have_sys_nerr" >&6
 
 if test "$cf_cv_have_sys_nerr" = yes ; then
@@ -6223,14 +6226,14 @@
 
 fi
 
-echo "$as_me:6226: checking if external sys_errlist is declared" >&5
+echo "$as_me:6229: checking if external sys_errlist is declared" >&5
 echo $ECHO_N "checking if external sys_errlist is declared... $ECHO_C" >&6
 if test "${cf_cv_dcl_sys_errlist+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 6233 "configure"
+#line 6236 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -6248,16 +6251,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6251: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6254: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6254: \$? = $ac_status" >&5
+  echo "$as_me:6257: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6257: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6260: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6260: \$? = $ac_status" >&5
+  echo "$as_me:6263: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_errlist=yes
 else
@@ -6268,7 +6271,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:6271: result: $cf_cv_dcl_sys_errlist" >&5
+echo "$as_me:6274: result: $cf_cv_dcl_sys_errlist" >&5
 echo "${ECHO_T}$cf_cv_dcl_sys_errlist" >&6
 
 if test "$cf_cv_dcl_sys_errlist" = no ; then
@@ -6283,14 +6286,14 @@
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:6286: checking if external sys_errlist exists" >&5
+echo "$as_me:6289: checking if external sys_errlist exists" >&5
 echo $ECHO_N "checking if external sys_errlist exists... $ECHO_C" >&6
 if test "${cf_cv_have_sys_errlist+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 6293 "configure"
+#line 6296 "configure"
 #include "confdefs.h"
 
 #undef sys_errlist
@@ -6305,16 +6308,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6308: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6311: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6311: \$? = $ac_status" >&5
+  echo "$as_me:6314: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6314: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6317: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6317: \$? = $ac_status" >&5
+  echo "$as_me:6320: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_errlist=yes
 else
@@ -6325,7 +6328,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:6328: result: $cf_cv_have_sys_errlist" >&5
+echo "$as_me:6331: result: $cf_cv_have_sys_errlist" >&5
 echo "${ECHO_T}$cf_cv_have_sys_errlist" >&6
 
 if test "$cf_cv_have_sys_errlist" = yes ; then
@@ -6351,7 +6354,7 @@
 #define os_chosen 1
 EOF
 
-echo "$as_me:6354: checking for screen type" >&5
+echo "$as_me:6357: checking for screen type" >&5
 echo $ECHO_N "checking for screen type... $ECHO_C" >&6
 
 # Check whether --with-screen or --without-screen was given.
@@ -6372,14 +6375,14 @@
 if test -z "$screen"; then
 	screen=termcap;
 fi
-echo "$as_me:6375: result: $screen" >&5
+echo "$as_me:6378: result: $screen" >&5
 echo "${ECHO_T}$screen" >&6
 
 : See if this is any type of xvile configuration:
 case "$screen" in
 	[Oo]pen[Ll]ook | [Mm]otif* | [xX] | [Aa]thena | [xX][atTmMoO]* | [xX]11 | neXtaw | XawPlus )
 		EXTRA_INSTALL_FILES="$EXTRA_INSTALL_FILES \$(INSTALL_X_FILES)"
-		echo "$as_me:6382: checking for X" >&5
+		echo "$as_me:6385: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -6476,17 +6479,17 @@
   # Guess where to find include files, by looking for Intrinsic.h.
   # First, try using that file with no special directory specified.
   cat >conftest.$ac_ext <<_ACEOF
-#line 6479 "configure"
+#line 6482 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:6483: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:6486: \"$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:6489: \$? = $ac_status" >&5
+  echo "$as_me:6492: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6519,7 +6522,7 @@
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >conftest.$ac_ext <<_ACEOF
-#line 6522 "configure"
+#line 6525 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -6531,16 +6534,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6534: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6537: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6537: \$? = $ac_status" >&5
+  echo "$as_me:6540: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6540: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6543: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6543: \$? = $ac_status" >&5
+  echo "$as_me:6546: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -6578,7 +6581,7 @@
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:6581: result: $have_x" >&5
+  echo "$as_me:6584: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -6588,7 +6591,7 @@
   # Update the cache value to reflect the command line values.
   ac_cv_have_x="have_x=yes \
 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  echo "$as_me:6591: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:6594: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -6603,7 +6606,7 @@
 clix*)
 	# FIXME: modify the library lookup in autoconf to
 	# allow _s.a suffix ahead of .a
-	echo "$as_me:6606: checking for open in -lc_s" >&5
+	echo "$as_me:6609: checking for open in -lc_s" >&5
 echo $ECHO_N "checking for open in -lc_s... $ECHO_C" >&6
 if test "${ac_cv_lib_c_s_open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6611,7 +6614,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc_s  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6614 "configure"
+#line 6617 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6630,16 +6633,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6633: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6636: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6636: \$? = $ac_status" >&5
+  echo "$as_me:6639: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6639: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6642: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6642: \$? = $ac_status" >&5
+  echo "$as_me:6645: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_c_s_open=yes
 else
@@ -6650,11 +6653,11 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6653: result: $ac_cv_lib_c_s_open" >&5
+echo "$as_me:6656: result: $ac_cv_lib_c_s_open" >&5
 echo "${ECHO_T}$ac_cv_lib_c_s_open" >&6
 if test $ac_cv_lib_c_s_open = yes; then
   LIBS="-lc_s $LIBS"
-	echo "$as_me:6657: checking for gethostname in -lbsd" >&5
+	echo "$as_me:6660: checking for gethostname in -lbsd" >&5
 echo $ECHO_N "checking for gethostname in -lbsd... $ECHO_C" >&6
 if test "${ac_cv_lib_bsd_gethostname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6662,7 +6665,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6665 "configure"
+#line 6668 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6681,16 +6684,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6684: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6687: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6687: \$? = $ac_status" >&5
+  echo "$as_me:6690: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6690: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6693: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6693: \$? = $ac_status" >&5
+  echo "$as_me:6696: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_bsd_gethostname=yes
 else
@@ -6701,11 +6704,11 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6704: result: $ac_cv_lib_bsd_gethostname" >&5
+echo "$as_me:6707: result: $ac_cv_lib_bsd_gethostname" >&5
 echo "${ECHO_T}$ac_cv_lib_bsd_gethostname" >&6
 if test $ac_cv_lib_bsd_gethostname = yes; then
   LIBS="-lbsd $LIBS"
-	echo "$as_me:6708: checking for gethostname in -lnsl_s" >&5
+	echo "$as_me:6711: checking for gethostname in -lnsl_s" >&5
 echo $ECHO_N "checking for gethostname in -lnsl_s... $ECHO_C" >&6
 if test "${ac_cv_lib_nsl_s_gethostname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6713,7 +6716,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl_s  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6716 "configure"
+#line 6719 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6732,16 +6735,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6735: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6738: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6738: \$? = $ac_status" >&5
+  echo "$as_me:6741: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6741: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6744: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6744: \$? = $ac_status" >&5
+  echo "$as_me:6747: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_s_gethostname=yes
 else
@@ -6752,11 +6755,11 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6755: result: $ac_cv_lib_nsl_s_gethostname" >&5
+echo "$as_me:6758: result: $ac_cv_lib_nsl_s_gethostname" >&5
 echo "${ECHO_T}$ac_cv_lib_nsl_s_gethostname" >&6
 if test $ac_cv_lib_nsl_s_gethostname = yes; then
   LIBS="-lnsl_s $LIBS"
-	echo "$as_me:6759: checking for XOpenDisplay in -lX11_s" >&5
+	echo "$as_me:6762: checking for XOpenDisplay in -lX11_s" >&5
 echo $ECHO_N "checking for XOpenDisplay in -lX11_s... $ECHO_C" >&6
 if test "${ac_cv_lib_X11_s_XOpenDisplay+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6764,7 +6767,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11_s  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6767 "configure"
+#line 6770 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6783,16 +6786,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6786: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6789: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6789: \$? = $ac_status" >&5
+  echo "$as_me:6792: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6792: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6795: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6795: \$? = $ac_status" >&5
+  echo "$as_me:6798: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_s_XOpenDisplay=yes
 else
@@ -6803,11 +6806,11 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6806: result: $ac_cv_lib_X11_s_XOpenDisplay" >&5
+echo "$as_me:6809: result: $ac_cv_lib_X11_s_XOpenDisplay" >&5
 echo "${ECHO_T}$ac_cv_lib_X11_s_XOpenDisplay" >&6
 if test $ac_cv_lib_X11_s_XOpenDisplay = yes; then
   LIBS="-lX11_s $LIBS"
-	echo "$as_me:6810: checking for XtAppInitialize in -lXt_s" >&5
+	echo "$as_me:6813: checking for XtAppInitialize in -lXt_s" >&5
 echo $ECHO_N "checking for XtAppInitialize in -lXt_s... $ECHO_C" >&6
 if test "${ac_cv_lib_Xt_s_XtAppInitialize+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6815,7 +6818,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt_s  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6818 "configure"
+#line 6821 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6834,16 +6837,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6837: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6840: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6840: \$? = $ac_status" >&5
+  echo "$as_me:6843: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6843: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6846: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6846: \$? = $ac_status" >&5
+  echo "$as_me:6849: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xt_s_XtAppInitialize=yes
 else
@@ -6854,7 +6857,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6857: result: $ac_cv_lib_Xt_s_XtAppInitialize" >&5
+echo "$as_me:6860: result: $ac_cv_lib_Xt_s_XtAppInitialize" >&5
 echo "${ECHO_T}$ac_cv_lib_Xt_s_XtAppInitialize" >&6
 if test $ac_cv_lib_Xt_s_XtAppInitialize = yes; then
   LIBS="-lXt_s $LIBS"
@@ -6873,7 +6876,7 @@
 	;;
 *)
 
-echo "$as_me:6876: checking for socket in -lsocket" >&5
+echo "$as_me:6879: checking for socket in -lsocket" >&5
 echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6
 if test "${ac_cv_lib_socket_socket+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6881,7 +6884,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6884 "configure"
+#line 6887 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6900,16 +6903,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6903: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6906: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6906: \$? = $ac_status" >&5
+  echo "$as_me:6909: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6909: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6912: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6912: \$? = $ac_status" >&5
+  echo "$as_me:6915: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_socket=yes
 else
@@ -6920,7 +6923,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6923: result: $ac_cv_lib_socket_socket" >&5
+echo "$as_me:6926: result: $ac_cv_lib_socket_socket" >&5
 echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6
 if test $ac_cv_lib_socket_socket = yes; then
   cat >>confdefs.h <<EOF
@@ -6931,7 +6934,7 @@
 
 fi
 
-echo "$as_me:6934: checking for gethostname in -lnsl" >&5
+echo "$as_me:6937: checking for gethostname in -lnsl" >&5
 echo $ECHO_N "checking for gethostname in -lnsl... $ECHO_C" >&6
 if test "${ac_cv_lib_nsl_gethostname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6939,7 +6942,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6942 "configure"
+#line 6945 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6958,16 +6961,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6961: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6964: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6964: \$? = $ac_status" >&5
+  echo "$as_me:6967: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6967: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6970: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6970: \$? = $ac_status" >&5
+  echo "$as_me:6973: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostname=yes
 else
@@ -6978,7 +6981,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6981: result: $ac_cv_lib_nsl_gethostname" >&5
+echo "$as_me:6984: result: $ac_cv_lib_nsl_gethostname" >&5
 echo "${ECHO_T}$ac_cv_lib_nsl_gethostname" >&6
 if test $ac_cv_lib_nsl_gethostname = yes; then
   cat >>confdefs.h <<EOF
@@ -7013,11 +7016,11 @@
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:7016: checking whether -R must be followed by a space" >&5
+      echo "$as_me:7019: checking whether -R must be followed by a space" >&5
 echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
       ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
       cat >conftest.$ac_ext <<_ACEOF
-#line 7020 "configure"
+#line 7023 "configure"
 #include "confdefs.h"
 
 int
@@ -7029,16 +7032,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7032: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7035: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7035: \$? = $ac_status" >&5
+  echo "$as_me:7038: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7038: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7041: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7041: \$? = $ac_status" >&5
+  echo "$as_me:7044: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_nospace=yes
 else
@@ -7048,13 +7051,13 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
       if test $ac_R_nospace = yes; then
-	echo "$as_me:7051: result: no" >&5
+	echo "$as_me:7054: result: no" >&5
 echo "${ECHO_T}no" >&6
 	X_LIBS="$X_LIBS -R$x_libraries"
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 7057 "configure"
+#line 7060 "configure"
 #include "confdefs.h"
 
 int
@@ -7066,16 +7069,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7069: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7072: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7072: \$? = $ac_status" >&5
+  echo "$as_me:7075: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7075: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7078: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7078: \$? = $ac_status" >&5
+  echo "$as_me:7081: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_space=yes
 else
@@ -7085,11 +7088,11 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	if test $ac_R_space = yes; then
-	  echo "$as_me:7088: result: yes" >&5
+	  echo "$as_me:7091: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:7092: result: neither works" >&5
+	  echo "$as_me:7095: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -7109,7 +7112,7 @@
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
     cat >conftest.$ac_ext <<_ACEOF
-#line 7112 "configure"
+#line 7115 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7128,22 +7131,22 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7131: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7134: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7134: \$? = $ac_status" >&5
+  echo "$as_me:7137: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7137: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7140: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7140: \$? = $ac_status" >&5
+  echo "$as_me:7143: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:7146: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:7149: checking for dnet_ntoa in -ldnet" >&5
 echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
 if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7151,7 +7154,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7154 "configure"
+#line 7157 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7170,16 +7173,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7173: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7176: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7176: \$? = $ac_status" >&5
+  echo "$as_me:7179: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7179: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7182: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7182: \$? = $ac_status" >&5
+  echo "$as_me:7185: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -7190,14 +7193,14 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7193: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:7196: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
 echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
 if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
 fi
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-      echo "$as_me:7200: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:7203: checking for dnet_ntoa in -ldnet_stub" >&5
 echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
 if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7205,7 +7208,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7208 "configure"
+#line 7211 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7224,16 +7227,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7227: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7230: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7230: \$? = $ac_status" >&5
+  echo "$as_me:7233: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7233: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7236: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7236: \$? = $ac_status" >&5
+  echo "$as_me:7239: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -7244,7 +7247,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7247: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:7250: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
 echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
 if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
@@ -7263,13 +7266,13 @@
     # on Irix 5.2, according to T.E. Dickey.
     # The functions gethostbyname, getservbyname, and inet_addr are
     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-    echo "$as_me:7266: checking for gethostbyname" >&5
+    echo "$as_me:7269: checking for gethostbyname" >&5
 echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
 if test "${ac_cv_func_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7272 "configure"
+#line 7275 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname (); below.  */
@@ -7300,16 +7303,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7303: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7306: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7306: \$? = $ac_status" >&5
+  echo "$as_me:7309: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7309: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7312: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7312: \$? = $ac_status" >&5
+  echo "$as_me:7315: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -7319,11 +7322,11 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7322: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:7325: result: $ac_cv_func_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
 
     if test $ac_cv_func_gethostbyname = no; then
-      echo "$as_me:7326: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:7329: checking for gethostbyname in -lnsl" >&5
 echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7331,7 +7334,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7334 "configure"
+#line 7337 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7350,16 +7353,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7353: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7356: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7356: \$? = $ac_status" >&5
+  echo "$as_me:7359: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7359: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7362: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7362: \$? = $ac_status" >&5
+  echo "$as_me:7365: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -7370,14 +7373,14 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7373: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:7376: result: $ac_cv_lib_nsl_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
 if test $ac_cv_lib_nsl_gethostbyname = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
 fi
 
       if test $ac_cv_lib_nsl_gethostbyname = no; then
-        echo "$as_me:7380: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:7383: checking for gethostbyname in -lbsd" >&5
 echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
 if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7385,7 +7388,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7388 "configure"
+#line 7391 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7404,16 +7407,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7407: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7410: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7410: \$? = $ac_status" >&5
+  echo "$as_me:7413: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7413: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7416: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7416: \$? = $ac_status" >&5
+  echo "$as_me:7419: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -7424,7 +7427,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7427: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:7430: result: $ac_cv_lib_bsd_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
 if test $ac_cv_lib_bsd_gethostbyname = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
@@ -7440,13 +7443,13 @@
     # variants that don't use the nameserver (or something).  -lsocket
     # must be given before -lnsl if both are needed.  We assume that
     # if connect needs -lnsl, so does gethostbyname.
-    echo "$as_me:7443: checking for connect" >&5
+    echo "$as_me:7446: checking for connect" >&5
 echo $ECHO_N "checking for connect... $ECHO_C" >&6
 if test "${ac_cv_func_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7449 "configure"
+#line 7452 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect (); below.  */
@@ -7477,16 +7480,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7480: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7483: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7483: \$? = $ac_status" >&5
+  echo "$as_me:7486: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7486: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7489: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7489: \$? = $ac_status" >&5
+  echo "$as_me:7492: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_connect=yes
 else
@@ -7496,11 +7499,11 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7499: result: $ac_cv_func_connect" >&5
+echo "$as_me:7502: result: $ac_cv_func_connect" >&5
 echo "${ECHO_T}$ac_cv_func_connect" >&6
 
     if test $ac_cv_func_connect = no; then
-      echo "$as_me:7503: checking for connect in -lsocket" >&5
+      echo "$as_me:7506: checking for connect in -lsocket" >&5
 echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
 if test "${ac_cv_lib_socket_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7508,7 +7511,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7511 "configure"
+#line 7514 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7527,16 +7530,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7530: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7533: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7533: \$? = $ac_status" >&5
+  echo "$as_me:7536: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7536: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7539: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7539: \$? = $ac_status" >&5
+  echo "$as_me:7542: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -7547,7 +7550,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7550: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:7553: result: $ac_cv_lib_socket_connect" >&5
 echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
 if test $ac_cv_lib_socket_connect = yes; then
   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
@@ -7556,13 +7559,13 @@
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:7559: checking for remove" >&5
+    echo "$as_me:7562: checking for remove" >&5
 echo $ECHO_N "checking for remove... $ECHO_C" >&6
 if test "${ac_cv_func_remove+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7565 "configure"
+#line 7568 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove (); below.  */
@@ -7593,16 +7596,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7596: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7599: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7599: \$? = $ac_status" >&5
+  echo "$as_me:7602: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7602: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7605: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7605: \$? = $ac_status" >&5
+  echo "$as_me:7608: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_remove=yes
 else
@@ -7612,11 +7615,11 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7615: result: $ac_cv_func_remove" >&5
+echo "$as_me:7618: result: $ac_cv_func_remove" >&5
 echo "${ECHO_T}$ac_cv_func_remove" >&6
 
     if test $ac_cv_func_remove = no; then
-      echo "$as_me:7619: checking for remove in -lposix" >&5
+      echo "$as_me:7622: checking for remove in -lposix" >&5
 echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
 if test "${ac_cv_lib_posix_remove+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7624,7 +7627,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7627 "configure"
+#line 7630 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7643,16 +7646,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7646: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7649: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7649: \$? = $ac_status" >&5
+  echo "$as_me:7652: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7652: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7655: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7655: \$? = $ac_status" >&5
+  echo "$as_me:7658: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -7663,7 +7666,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7666: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:7669: result: $ac_cv_lib_posix_remove" >&5
 echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
 if test $ac_cv_lib_posix_remove = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
@@ -7672,13 +7675,13 @@
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:7675: checking for shmat" >&5
+    echo "$as_me:7678: checking for shmat" >&5
 echo $ECHO_N "checking for shmat... $ECHO_C" >&6
 if test "${ac_cv_func_shmat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7681 "configure"
+#line 7684 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat (); below.  */
@@ -7709,16 +7712,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7712: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7715: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7715: \$? = $ac_status" >&5
+  echo "$as_me:7718: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7718: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7721: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7721: \$? = $ac_status" >&5
+  echo "$as_me:7724: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -7728,11 +7731,11 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7731: result: $ac_cv_func_shmat" >&5
+echo "$as_me:7734: result: $ac_cv_func_shmat" >&5
 echo "${ECHO_T}$ac_cv_func_shmat" >&6
 
     if test $ac_cv_func_shmat = no; then
-      echo "$as_me:7735: checking for shmat in -lipc" >&5
+      echo "$as_me:7738: checking for shmat in -lipc" >&5
 echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
 if test "${ac_cv_lib_ipc_shmat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7740,7 +7743,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7743 "configure"
+#line 7746 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7759,16 +7762,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7762: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7765: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7765: \$? = $ac_status" >&5
+  echo "$as_me:7768: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7768: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7771: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7771: \$? = $ac_status" >&5
+  echo "$as_me:7774: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -7779,7 +7782,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7782: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:7785: result: $ac_cv_lib_ipc_shmat" >&5
 echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
 if test $ac_cv_lib_ipc_shmat = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
@@ -7797,7 +7800,7 @@
   # These have to be linked with before -lX11, unlike the other
   # libraries we check for below, so use a different variable.
   # John Interrante, Karl Berry
-  echo "$as_me:7800: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:7803: checking for IceConnectionNumber in -lICE" >&5
 echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
 if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7805,7 +7808,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7808 "configure"
+#line 7811 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7824,16 +7827,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7827: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7830: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7830: \$? = $ac_status" >&5
+  echo "$as_me:7833: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7833: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7836: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7836: \$? = $ac_status" >&5
+  echo "$as_me:7839: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -7844,7 +7847,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7847: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:7850: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
 echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
 if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
@@ -7895,7 +7898,7 @@
 
 if test "$cf_check_cflags" != "$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 7898 "configure"
+#line 7901 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7907,16 +7910,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7910: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7913: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7913: \$? = $ac_status" >&5
+  echo "$as_me:7916: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7916: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7919: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7919: \$? = $ac_status" >&5
+  echo "$as_me:7922: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -7933,7 +7936,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-	echo "$as_me:7936: checking for XOpenDisplay in -lX11" >&5
+	echo "$as_me:7939: 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
@@ -7941,7 +7944,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7944 "configure"
+#line 7947 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7960,16 +7963,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7963: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7966: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7966: \$? = $ac_status" >&5
+  echo "$as_me:7969: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7969: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7972: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7972: \$? = $ac_status" >&5
+  echo "$as_me:7975: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -7980,13 +7983,13 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7983: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:7986: 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
   LIBS="-lX11 $LIBS"
 fi
 
-	echo "$as_me:7989: checking for XtAppInitialize in -lXt" >&5
+	echo "$as_me:7992: 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
@@ -7994,7 +7997,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7997 "configure"
+#line 8000 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8013,16 +8016,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8016: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8019: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8019: \$? = $ac_status" >&5
+  echo "$as_me:8022: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8022: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8025: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8025: \$? = $ac_status" >&5
+  echo "$as_me:8028: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xt_XtAppInitialize=yes
 else
@@ -8033,7 +8036,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8036: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:8039: 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
   cat >>confdefs.h <<\EOF
@@ -8086,7 +8089,7 @@
 
 if test "$cf_check_cflags" != "$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 8089 "configure"
+#line 8092 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8098,16 +8101,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8101: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8104: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8104: \$? = $ac_status" >&5
+  echo "$as_me:8107: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8107: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8110: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8110: \$? = $ac_status" >&5
+  echo "$as_me:8113: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -8127,7 +8130,7 @@
 fi
 
 if test $cf_have_X_LIBS = no ; then
-	{ echo "$as_me:8130: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+	{ echo "$as_me:8133: 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
@@ -8139,7 +8142,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:8142: checking for $ac_word" >&5
+echo "$as_me:8145: 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
@@ -8156,7 +8159,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:8159: found $ac_dir/$ac_word" >&5
+   echo "$as_me:8162: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -8167,10 +8170,10 @@
 IMAKE=$ac_cv_path_IMAKE
 
 if test -n "$IMAKE"; then
-  echo "$as_me:8170: result: $IMAKE" >&5
+  echo "$as_me:8173: result: $IMAKE" >&5
 echo "${ECHO_T}$IMAKE" >&6
 else
-  echo "$as_me:8173: result: no" >&5
+  echo "$as_me:8176: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8220,7 +8223,7 @@
 			esac
 		done
 		if test -z "$cf_config" ; then
-			{ echo "$as_me:8223: WARNING: Could not find imake config-directory" >&5
+			{ echo "$as_me:8226: 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"
@@ -8229,7 +8232,7 @@
 				test -n "$verbose" && echo "	Using $IMAKE $cf_config" 1>&6
 
 			else
-				{ echo "$as_me:8232: WARNING: Cannot run $IMAKE" >&5
+				{ echo "$as_me:8235: WARNING: Cannot run $IMAKE" >&5
 echo "$as_me: WARNING: Cannot run $IMAKE" >&2;}
 			fi
 		fi
@@ -8322,7 +8325,7 @@
 
 if test "$cf_check_cflags" != "$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 8325 "configure"
+#line 8328 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8334,16 +8337,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8337: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8340: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8340: \$? = $ac_status" >&5
+  echo "$as_me:8343: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8343: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8346: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8346: \$? = $ac_status" >&5
+  echo "$as_me:8349: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -8373,23 +8376,23 @@
 for ac_header in X11/IntrinsicI.h X11/Xpoll.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:8376: checking for $ac_header" >&5
+echo "$as_me:8379: 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 8382 "configure"
+#line 8385 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8386: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:8389: \"$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:8392: \$? = $ac_status" >&5
+  echo "$as_me:8395: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8408,7 +8411,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:8411: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:8414: 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
@@ -8434,7 +8437,7 @@
 fi
 LDFLAGS="$LDFLAGS $X_LIBS"
 
-echo "$as_me:8437: checking for XmuClientWindow in -lXmu" >&5
+echo "$as_me:8440: checking for XmuClientWindow in -lXmu" >&5
 echo $ECHO_N "checking for XmuClientWindow in -lXmu... $ECHO_C" >&6
 if test "${ac_cv_lib_Xmu_XmuClientWindow+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8442,7 +8445,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXmu  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8445 "configure"
+#line 8448 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8461,16 +8464,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8464: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8467: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8467: \$? = $ac_status" >&5
+  echo "$as_me:8470: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8470: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8473: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8473: \$? = $ac_status" >&5
+  echo "$as_me:8476: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xmu_XmuClientWindow=yes
 else
@@ -8481,7 +8484,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8484: result: $ac_cv_lib_Xmu_XmuClientWindow" >&5
+echo "$as_me:8487: result: $ac_cv_lib_Xmu_XmuClientWindow" >&5
 echo "${ECHO_T}$ac_cv_lib_Xmu_XmuClientWindow" >&6
 if test $ac_cv_lib_Xmu_XmuClientWindow = yes; then
   cat >>confdefs.h <<EOF
@@ -8492,7 +8495,7 @@
 
 fi
 
-echo "$as_me:8495: checking for OlToolkitInitialize in -lXol" >&5
+echo "$as_me:8498: checking for OlToolkitInitialize in -lXol" >&5
 echo $ECHO_N "checking for OlToolkitInitialize in -lXol... $ECHO_C" >&6
 if test "${ac_cv_lib_Xol_OlToolkitInitialize+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8500,7 +8503,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXol  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8503 "configure"
+#line 8506 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8519,16 +8522,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8522: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8525: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8525: \$? = $ac_status" >&5
+  echo "$as_me:8528: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8528: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8531: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8531: \$? = $ac_status" >&5
+  echo "$as_me:8534: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xol_OlToolkitInitialize=yes
 else
@@ -8539,12 +8542,12 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8542: result: $ac_cv_lib_Xol_OlToolkitInitialize" >&5
+echo "$as_me:8545: result: $ac_cv_lib_Xol_OlToolkitInitialize" >&5
 echo "${ECHO_T}$ac_cv_lib_Xol_OlToolkitInitialize" >&6
 if test $ac_cv_lib_Xol_OlToolkitInitialize = yes; then
   LIBS="-lXol -lm $LIBS"
 else
-  { { echo "$as_me:8547: error: Unable to successfully link OpenLook library (-lXol) with test program" >&5
+  { { echo "$as_me:8550: error: Unable to successfully link OpenLook library (-lXol) with test program" >&5
 echo "$as_me: error: Unable to successfully link OpenLook library (-lXol) with test program" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -8559,23 +8562,23 @@
 for ac_header in X11/IntrinsicI.h Xm/XmP.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:8562: checking for $ac_header" >&5
+echo "$as_me:8565: 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 8568 "configure"
+#line 8571 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8572: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:8575: \"$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:8578: \$? = $ac_status" >&5
+  echo "$as_me:8581: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8594,7 +8597,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:8597: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:8600: 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
@@ -8604,7 +8607,7 @@
 fi
 done
 
-echo "$as_me:8607: checking for regcmp in -lgen" >&5
+echo "$as_me:8610: checking for regcmp in -lgen" >&5
 echo $ECHO_N "checking for regcmp in -lgen... $ECHO_C" >&6
 if test "${ac_cv_lib_gen_regcmp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8612,7 +8615,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgen  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8615 "configure"
+#line 8618 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8631,16 +8634,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8634: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8637: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8637: \$? = $ac_status" >&5
+  echo "$as_me:8640: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8640: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8643: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8643: \$? = $ac_status" >&5
+  echo "$as_me:8646: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gen_regcmp=yes
 else
@@ -8651,7 +8654,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8654: result: $ac_cv_lib_gen_regcmp" >&5
+echo "$as_me:8657: result: $ac_cv_lib_gen_regcmp" >&5
 echo "${ECHO_T}$ac_cv_lib_gen_regcmp" >&6
 if test $ac_cv_lib_gen_regcmp = yes; then
   cat >>confdefs.h <<EOF
@@ -8662,7 +8665,7 @@
 
 fi
 
-echo "$as_me:8665: checking for XmuClientWindow in -lXmu" >&5
+echo "$as_me:8668: checking for XmuClientWindow in -lXmu" >&5
 echo $ECHO_N "checking for XmuClientWindow in -lXmu... $ECHO_C" >&6
 if test "${ac_cv_lib_Xmu_XmuClientWindow+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8670,7 +8673,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXmu  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8673 "configure"
+#line 8676 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8689,16 +8692,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8692: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8695: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8695: \$? = $ac_status" >&5
+  echo "$as_me:8698: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8698: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8701: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8701: \$? = $ac_status" >&5
+  echo "$as_me:8704: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xmu_XmuClientWindow=yes
 else
@@ -8709,7 +8712,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8712: result: $ac_cv_lib_Xmu_XmuClientWindow" >&5
+echo "$as_me:8715: result: $ac_cv_lib_Xmu_XmuClientWindow" >&5
 echo "${ECHO_T}$ac_cv_lib_Xmu_XmuClientWindow" >&6
 if test $ac_cv_lib_Xmu_XmuClientWindow = yes; then
   cat >>confdefs.h <<EOF
@@ -8720,7 +8723,7 @@
 
 fi
 
-echo "$as_me:8723: checking for XpStartDoc in -lXp" >&5
+echo "$as_me:8726: checking for XpStartDoc in -lXp" >&5
 echo $ECHO_N "checking for XpStartDoc in -lXp... $ECHO_C" >&6
 if test "${ac_cv_lib_Xp_XpStartDoc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8728,7 +8731,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXp $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8731 "configure"
+#line 8734 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8747,16 +8750,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8750: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8753: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8753: \$? = $ac_status" >&5
+  echo "$as_me:8756: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8756: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8759: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8759: \$? = $ac_status" >&5
+  echo "$as_me:8762: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xp_XpStartDoc=yes
 else
@@ -8767,7 +8770,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8770: result: $ac_cv_lib_Xp_XpStartDoc" >&5
+echo "$as_me:8773: result: $ac_cv_lib_Xp_XpStartDoc" >&5
 echo "${ECHO_T}$ac_cv_lib_Xp_XpStartDoc" >&6
 if test $ac_cv_lib_Xp_XpStartDoc = yes; then
   cat >>confdefs.h <<EOF
@@ -8778,7 +8781,7 @@
 
 fi
 
-echo "$as_me:8781: checking for XextCreateExtension in -lXext" >&5
+echo "$as_me:8784: 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
@@ -8786,7 +8789,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8789 "configure"
+#line 8792 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8805,16 +8808,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8808: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8811: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8811: \$? = $ac_status" >&5
+  echo "$as_me:8814: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8814: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8817: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8817: \$? = $ac_status" >&5
+  echo "$as_me:8820: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
@@ -8825,13 +8828,13 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8828: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:8831: 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
   LIBS="-lXext $LIBS"
 fi
 
-echo "$as_me:8834: checking for XpmCreatePixmapFromXpmImage in -lXpm" >&5
+echo "$as_me:8837: checking for XpmCreatePixmapFromXpmImage in -lXpm" >&5
 echo $ECHO_N "checking for XpmCreatePixmapFromXpmImage in -lXpm... $ECHO_C" >&6
 if test "${ac_cv_lib_Xpm_XpmCreatePixmapFromXpmImage+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8839,7 +8842,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXpm $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8842 "configure"
+#line 8845 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8858,16 +8861,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8861: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8864: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8864: \$? = $ac_status" >&5
+  echo "$as_me:8867: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8867: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8870: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8870: \$? = $ac_status" >&5
+  echo "$as_me:8873: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xpm_XpmCreatePixmapFromXpmImage=yes
 else
@@ -8878,13 +8881,13 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8881: result: $ac_cv_lib_Xpm_XpmCreatePixmapFromXpmImage" >&5
+echo "$as_me:8884: result: $ac_cv_lib_Xpm_XpmCreatePixmapFromXpmImage" >&5
 echo "${ECHO_T}$ac_cv_lib_Xpm_XpmCreatePixmapFromXpmImage" >&6
 if test $ac_cv_lib_Xpm_XpmCreatePixmapFromXpmImage = yes; then
   LIBS="-lXpm $LIBS"
 fi
 
-echo "$as_me:8887: checking for XmbTextListToTextProperty in -lXIM" >&5
+echo "$as_me:8890: checking for XmbTextListToTextProperty in -lXIM" >&5
 echo $ECHO_N "checking for XmbTextListToTextProperty in -lXIM... $ECHO_C" >&6
 if test "${ac_cv_lib_XIM_XmbTextListToTextProperty+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8892,7 +8895,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXIM  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8895 "configure"
+#line 8898 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8911,16 +8914,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8914: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8917: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8917: \$? = $ac_status" >&5
+  echo "$as_me:8920: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8920: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8923: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8923: \$? = $ac_status" >&5
+  echo "$as_me:8926: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_XIM_XmbTextListToTextProperty=yes
 else
@@ -8931,7 +8934,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8934: result: $ac_cv_lib_XIM_XmbTextListToTextProperty" >&5
+echo "$as_me:8937: result: $ac_cv_lib_XIM_XmbTextListToTextProperty" >&5
 echo "${ECHO_T}$ac_cv_lib_XIM_XmbTextListToTextProperty" >&6
 if test $ac_cv_lib_XIM_XmbTextListToTextProperty = yes; then
   cat >>confdefs.h <<EOF
@@ -8941,7 +8944,7 @@
   LIBS="-lXIM $LIBS"
 
 fi
-echo "$as_me:8944: checking for XmProcessTraversal in -lXm" >&5
+echo "$as_me:8947: checking for XmProcessTraversal in -lXm" >&5
 echo $ECHO_N "checking for XmProcessTraversal in -lXm... $ECHO_C" >&6
 if test "${ac_cv_lib_Xm_XmProcessTraversal+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8949,7 +8952,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXm $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8952 "configure"
+#line 8955 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8968,16 +8971,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8971: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8974: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8974: \$? = $ac_status" >&5
+  echo "$as_me:8977: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8977: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8980: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8980: \$? = $ac_status" >&5
+  echo "$as_me:8983: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xm_XmProcessTraversal=yes
 else
@@ -8988,12 +8991,12 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8991: result: $ac_cv_lib_Xm_XmProcessTraversal" >&5
+echo "$as_me:8994: result: $ac_cv_lib_Xm_XmProcessTraversal" >&5
 echo "${ECHO_T}$ac_cv_lib_Xm_XmProcessTraversal" >&6
 if test $ac_cv_lib_Xm_XmProcessTraversal = yes; then
   LIBS="-lXm $LIBS"
 else
-  { { echo "$as_me:8996: error: Unable to successfully link Motif library (-lXm) with test program" >&5
+  { { echo "$as_me:8999: error: Unable to successfully link Motif library (-lXm) with test program" >&5
 echo "$as_me: error: Unable to successfully link Motif library (-lXm) with test program" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -9032,7 +9035,7 @@
   cf_x_athena=XawPlus
 fi;
 
-echo "$as_me:9035: checking for XextCreateExtension in -lXext" >&5
+echo "$as_me:9038: 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
@@ -9040,7 +9043,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9043 "configure"
+#line 9046 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9059,16 +9062,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9062: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9065: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9065: \$? = $ac_status" >&5
+  echo "$as_me:9068: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9068: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9071: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9071: \$? = $ac_status" >&5
+  echo "$as_me:9074: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
@@ -9079,7 +9082,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9082: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:9085: 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
   LIBS="-lXext $LIBS"
@@ -9101,14 +9104,14 @@
 		cf_test=X11/$cf_x_athena_root/SimpleMenu.h
 		if test $cf_path != default ; then
 			CPPFLAGS="-I$cf_path/include $cf_save"
-			echo "$as_me:9104: checking for $cf_test in $cf_path" >&5
+			echo "$as_me:9107: 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:9107: checking for $cf_test" >&5
+			echo "$as_me:9110: checking for $cf_test" >&5
 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
 		fi
 		cat >conftest.$ac_ext <<_ACEOF
-#line 9111 "configure"
+#line 9114 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -9122,16 +9125,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9125: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9128: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9128: \$? = $ac_status" >&5
+  echo "$as_me:9131: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9131: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9134: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9134: \$? = $ac_status" >&5
+  echo "$as_me:9137: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -9140,7 +9143,7 @@
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-		echo "$as_me:9143: result: $cf_result" >&5
+		echo "$as_me:9146: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 		if test "$cf_result" = yes ; then
 			cf_x_athena_include=$cf_path
@@ -9152,7 +9155,7 @@
 done
 
 if test -z "$cf_x_athena_include" ; then
-	{ echo "$as_me:9155: WARNING: Unable to successfully find Athena header files with test program" >&5
+	{ echo "$as_me:9158: WARNING: Unable to successfully find Athena header files with test program" >&5
 echo "$as_me: WARNING: Unable to successfully find Athena header files with test program" >&2;}
 elif test "$cf_x_athena_include" != default ; then
 	CPPFLAGS="$CPPFLAGS -I$cf_x_athena_include"
@@ -9177,17 +9180,17 @@
 			cf_test=XawSimpleMenuAddGlobalActions
 			if test $cf_path != default ; then
 				LIBS="-L$cf_path/lib $cf_lib $LIBS"
-				echo "$as_me:9180: checking for $cf_lib in $cf_path" >&5
+				echo "$as_me:9183: checking for $cf_lib in $cf_path" >&5
 echo $ECHO_N "checking for $cf_lib in $cf_path... $ECHO_C" >&6
 			else
 				LIBS="$cf_lib $LIBS"
-				echo "$as_me:9184: checking for $cf_test in $cf_lib" >&5
+				echo "$as_me:9187: checking for $cf_test in $cf_lib" >&5
 echo $ECHO_N "checking for $cf_test in $cf_lib... $ECHO_C" >&6
 			fi
 			cf_SAVE="$LIBS"
 			LIBS="$X_PRE_LIBS $LIBS $X_EXTRA_LIBS"
 			cat >conftest.$ac_ext <<_ACEOF
-#line 9190 "configure"
+#line 9193 "configure"
 #include "confdefs.h"
 
 int
@@ -9199,16 +9202,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9202: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9205: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9205: \$? = $ac_status" >&5
+  echo "$as_me:9208: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9208: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9211: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9211: \$? = $ac_status" >&5
+  echo "$as_me:9214: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -9217,7 +9220,7 @@
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-			echo "$as_me:9220: result: $cf_result" >&5
+			echo "$as_me:9223: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				cf_x_athena_lib="$cf_lib"
@@ -9231,7 +9234,7 @@
 done
 
 if test -z "$cf_x_athena_lib" ; then
-	{ { echo "$as_me:9234: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+	{ { echo "$as_me:9237: 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
@@ -9267,7 +9270,7 @@
 #define DISP_CURSES 1
 EOF
 
-echo "$as_me:9270: checking for extra include directories" >&5
+echo "$as_me:9273: checking for extra include directories" >&5
 echo $ECHO_N "checking for extra include directories... $ECHO_C" >&6
 if test "${cf_cv_curses_incdir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9287,11 +9290,11 @@
 esac
 
 fi
-echo "$as_me:9290: result: $cf_cv_curses_incdir" >&5
+echo "$as_me:9293: result: $cf_cv_curses_incdir" >&5
 echo "${ECHO_T}$cf_cv_curses_incdir" >&6
 test "$cf_cv_curses_incdir" != no && CPPFLAGS="$cf_cv_curses_incdir $CPPFLAGS"
 
-echo "$as_me:9294: checking if we have identified curses headers" >&5
+echo "$as_me:9297: checking if we have identified curses headers" >&5
 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
 if test "${cf_cv_ncurses_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9305,7 +9308,7 @@
 	ncurses/ncurses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 9308 "configure"
+#line 9311 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -9317,16 +9320,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9320: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9323: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9323: \$? = $ac_status" >&5
+  echo "$as_me:9326: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9326: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9329: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9329: \$? = $ac_status" >&5
+  echo "$as_me:9332: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -9337,11 +9340,11 @@
 done
 
 fi
-echo "$as_me:9340: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:9343: result: $cf_cv_ncurses_header" >&5
 echo "${ECHO_T}$cf_cv_ncurses_header" >&6
 
 if test "$cf_cv_ncurses_header" = none ; then
-	{ { echo "$as_me:9344: error: No curses header-files found" >&5
+	{ { echo "$as_me:9347: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -9351,23 +9354,23 @@
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:9354: checking for $ac_header" >&5
+echo "$as_me:9357: 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 9360 "configure"
+#line 9363 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:9364: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:9367: \"$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:9370: \$? = $ac_status" >&5
+  echo "$as_me:9373: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9386,7 +9389,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:9389: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:9392: 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
@@ -9396,7 +9399,7 @@
 fi
 done
 
-echo "$as_me:9399: checking for ncurses version" >&5
+echo "$as_me:9402: checking for ncurses version" >&5
 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
 if test "${cf_cv_ncurses_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9422,10 +9425,10 @@
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:9425: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:9428: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:9428: \$? = $ac_status" >&5
+  echo "$as_me:9431: \$? = $ac_status" >&5
   (exit $ac_status); }
 	if test -f conftest.out ; then
 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
@@ -9435,7 +9438,7 @@
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9438 "configure"
+#line 9441 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -9460,15 +9463,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:9463: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9466: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9466: \$? = $ac_status" >&5
+  echo "$as_me:9469: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:9468: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9471: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9471: \$? = $ac_status" >&5
+  echo "$as_me:9474: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -9482,16 +9485,16 @@
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:9485: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:9488: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:9491: checking if we have identified curses libraries" >&5
+echo "$as_me:9494: checking if we have identified curses libraries" >&5
 echo $ECHO_N "checking if we have identified curses libraries... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 9494 "configure"
+#line 9497 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -9503,16 +9506,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9506: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9509: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9509: \$? = $ac_status" >&5
+  echo "$as_me:9512: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9512: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9515: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9515: \$? = $ac_status" >&5
+  echo "$as_me:9518: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -9521,13 +9524,13 @@
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:9524: result: $cf_result" >&5
+echo "$as_me:9527: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 if test "$cf_result" = no ; then
 case $host_os in #(vi
 freebsd*) #(vi
-	echo "$as_me:9530: checking for tgoto in -lmytinfo" >&5
+	echo "$as_me:9533: checking for tgoto in -lmytinfo" >&5
 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9535,7 +9538,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9538 "configure"
+#line 9541 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9554,16 +9557,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9557: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9560: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9560: \$? = $ac_status" >&5
+  echo "$as_me:9563: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9563: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9566: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9566: \$? = $ac_status" >&5
+  echo "$as_me:9569: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -9574,7 +9577,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9577: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:9580: result: $ac_cv_lib_mytinfo_tgoto" >&5
 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
 if test $ac_cv_lib_mytinfo_tgoto = yes; then
   LIBS="-lmytinfo $LIBS"
@@ -9582,7 +9585,7 @@
 
 	;;
 hpux10.*|hpux11.*) #(vi
-	echo "$as_me:9585: checking for initscr in -lcur_colr" >&5
+	echo "$as_me:9588: checking for initscr in -lcur_colr" >&5
 echo $ECHO_N "checking for initscr in -lcur_colr... $ECHO_C" >&6
 if test "${ac_cv_lib_cur_colr_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9590,7 +9593,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcur_colr  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9593 "configure"
+#line 9596 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9609,16 +9612,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9612: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9615: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9615: \$? = $ac_status" >&5
+  echo "$as_me:9618: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9618: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9621: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9621: \$? = $ac_status" >&5
+  echo "$as_me:9624: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_cur_colr_initscr=yes
 else
@@ -9629,7 +9632,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9632: result: $ac_cv_lib_cur_colr_initscr" >&5
+echo "$as_me:9635: result: $ac_cv_lib_cur_colr_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_cur_colr_initscr" >&6
 if test $ac_cv_lib_cur_colr_initscr = yes; then
 
@@ -9638,7 +9641,7 @@
 
 else
 
-	echo "$as_me:9641: checking for initscr in -lHcurses" >&5
+	echo "$as_me:9644: checking for initscr in -lHcurses" >&5
 echo $ECHO_N "checking for initscr in -lHcurses... $ECHO_C" >&6
 if test "${ac_cv_lib_Hcurses_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9646,7 +9649,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lHcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9649 "configure"
+#line 9652 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9665,16 +9668,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9668: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9671: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9671: \$? = $ac_status" >&5
+  echo "$as_me:9674: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9674: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9677: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9677: \$? = $ac_status" >&5
+  echo "$as_me:9680: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Hcurses_initscr=yes
 else
@@ -9685,7 +9688,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9688: result: $ac_cv_lib_Hcurses_initscr" >&5
+echo "$as_me:9691: result: $ac_cv_lib_Hcurses_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_Hcurses_initscr" >&6
 if test $ac_cv_lib_Hcurses_initscr = yes; then
 
@@ -9723,13 +9726,13 @@
 
 	# Check for library containing tgoto.  Do this before curses library
 	# because it may be needed to link the test-case for initscr.
-	echo "$as_me:9726: checking for tgoto" >&5
+	echo "$as_me:9729: checking for tgoto" >&5
 echo $ECHO_N "checking for tgoto... $ECHO_C" >&6
 if test "${ac_cv_func_tgoto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9732 "configure"
+#line 9735 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char tgoto (); below.  */
@@ -9760,16 +9763,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9763: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9766: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9766: \$? = $ac_status" >&5
+  echo "$as_me:9769: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9769: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9772: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9772: \$? = $ac_status" >&5
+  echo "$as_me:9775: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_tgoto=yes
 else
@@ -9779,7 +9782,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9782: result: $ac_cv_func_tgoto" >&5
+echo "$as_me:9785: result: $ac_cv_func_tgoto" >&5
 echo "${ECHO_T}$ac_cv_func_tgoto" >&6
 if test $ac_cv_func_tgoto = yes; then
   cf_term_lib=predefined
@@ -9788,7 +9791,7 @@
 		for cf_term_lib in $cf_check_list termcap termlib unknown
 		do
 			as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh`
-echo "$as_me:9791: checking for tgoto in -l$cf_term_lib" >&5
+echo "$as_me:9794: checking for tgoto in -l$cf_term_lib" >&5
 echo $ECHO_N "checking for tgoto in -l$cf_term_lib... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9796,7 +9799,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_term_lib  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9799 "configure"
+#line 9802 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9815,16 +9818,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9818: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9821: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9821: \$? = $ac_status" >&5
+  echo "$as_me:9824: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9824: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9827: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9827: \$? = $ac_status" >&5
+  echo "$as_me:9830: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -9835,7 +9838,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9838: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:9841: 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
   break
@@ -9850,7 +9853,7 @@
 	for cf_curs_lib in $cf_check_list xcurses jcurses unknown
 	do
 		as_ac_Lib=`echo "ac_cv_lib_$cf_curs_lib''_initscr" | $as_tr_sh`
-echo "$as_me:9853: checking for initscr in -l$cf_curs_lib" >&5
+echo "$as_me:9856: checking for initscr in -l$cf_curs_lib" >&5
 echo $ECHO_N "checking for initscr in -l$cf_curs_lib... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9858,7 +9861,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_curs_lib  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9861 "configure"
+#line 9864 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9877,16 +9880,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9880: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9883: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9883: \$? = $ac_status" >&5
+  echo "$as_me:9886: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9886: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9889: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9889: \$? = $ac_status" >&5
+  echo "$as_me:9892: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -9897,23 +9900,23 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9900: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:9903: 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
   break
 fi
 
 	done
-	test $cf_curs_lib = unknown && { { echo "$as_me:9907: error: no curses library found" >&5
+	test $cf_curs_lib = unknown && { { echo "$as_me:9910: error: no curses library found" >&5
 echo "$as_me: error: no curses library found" >&2;}
    { (exit 1); exit 1; }; }
 
 	LIBS="-l$cf_curs_lib $cf_save_LIBS"
 	if test "$cf_term_lib" = unknown ; then
-		echo "$as_me:9913: checking if we can link with $cf_curs_lib library" >&5
+		echo "$as_me:9916: checking if we can link with $cf_curs_lib library" >&5
 echo $ECHO_N "checking if we can link with $cf_curs_lib library... $ECHO_C" >&6
 		cat >conftest.$ac_ext <<_ACEOF
-#line 9916 "configure"
+#line 9919 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -9925,16 +9928,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9928: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9931: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9931: \$? = $ac_status" >&5
+  echo "$as_me:9934: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9934: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9937: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9937: \$? = $ac_status" >&5
+  echo "$as_me:9940: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -9943,18 +9946,18 @@
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-		echo "$as_me:9946: result: $cf_result" >&5
+		echo "$as_me:9949: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
-		test $cf_result = no && { { echo "$as_me:9948: error: Cannot link curses library" >&5
+		test $cf_result = no && { { echo "$as_me:9951: error: Cannot link curses library" >&5
 echo "$as_me: error: Cannot link curses library" >&2;}
    { (exit 1); exit 1; }; }
 	elif test "$cf_curs_lib" = "$cf_term_lib" ; then
 		:
 	elif test "$cf_term_lib" != predefined ; then
-		echo "$as_me:9954: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+		echo "$as_me:9957: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
 echo $ECHO_N "checking if we need both $cf_curs_lib and $cf_term_lib libraries... $ECHO_C" >&6
 		cat >conftest.$ac_ext <<_ACEOF
-#line 9957 "configure"
+#line 9960 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -9966,16 +9969,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9969: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9972: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9972: \$? = $ac_status" >&5
+  echo "$as_me:9975: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9975: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9978: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9978: \$? = $ac_status" >&5
+  echo "$as_me:9981: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=no
 else
@@ -9984,7 +9987,7 @@
 
 			LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
 			cat >conftest.$ac_ext <<_ACEOF
-#line 9987 "configure"
+#line 9990 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -9996,16 +9999,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9999: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10002: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10002: \$? = $ac_status" >&5
+  echo "$as_me:10005: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10005: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10008: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10008: \$? = $ac_status" >&5
+  echo "$as_me:10011: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -10017,7 +10020,7 @@
 
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-		echo "$as_me:10020: result: $cf_result" >&5
+		echo "$as_me:10023: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	fi
 fi
@@ -10054,7 +10057,7 @@
   withval=`echo $withval | sed -e s%NONE%$ac_default_prefix%`
   ;;
 *)
-  { { echo "$as_me:10057: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:10060: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -10071,7 +10074,7 @@
 test "$cf_cv_curses_dir" != "no" && \
 CPPFLAGS="-I$cf_cv_curses_dir/include -I$cf_cv_curses_dir/include/$cf_ncuhdr_root $CPPFLAGS"
 
-echo "$as_me:10074: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:10077: checking for $cf_ncuhdr_root header in include-path" >&5
 echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10083,7 +10086,7 @@
 	do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 10086 "configure"
+#line 10089 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -10107,16 +10110,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10110: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10113: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10113: \$? = $ac_status" >&5
+  echo "$as_me:10116: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10116: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10119: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10119: \$? = $ac_status" >&5
+  echo "$as_me:10122: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -10131,13 +10134,13 @@
 	done
 
 fi
-echo "$as_me:10134: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:10137: result: $cf_cv_ncurses_h" >&5
 echo "${ECHO_T}$cf_cv_ncurses_h" >&6
 
 if test "$cf_cv_ncurses_h" != no ; then
 	cf_cv_ncurses_header=$cf_cv_ncurses_h
 else
-echo "$as_me:10140: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:10143: checking for $cf_ncuhdr_root include-path" >&5
 echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10232,7 +10235,7 @@
 				cf_save_CPPFLAGS="$CPPFLAGS"
 				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 10235 "configure"
+#line 10238 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10244,16 +10247,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10247: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10250: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10250: \$? = $ac_status" >&5
+  echo "$as_me:10253: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10253: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10256: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10256: \$? = $ac_status" >&5
+  echo "$as_me:10259: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -10280,7 +10283,7 @@
 		do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 10283 "configure"
+#line 10286 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -10304,16 +10307,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10307: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10310: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10310: \$? = $ac_status" >&5
+  echo "$as_me:10313: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10313: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10316: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10316: \$? = $ac_status" >&5
+  echo "$as_me:10319: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -10334,12 +10337,12 @@
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:10337: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:10340: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:10342: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:10345: result: $cf_cv_ncurses_h2" >&5
 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
 
 	cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
@@ -10361,7 +10364,7 @@
 				cf_save_CPPFLAGS="$CPPFLAGS"
 				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 10364 "configure"
+#line 10367 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10373,16 +10376,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10376: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10379: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10379: \$? = $ac_status" >&5
+  echo "$as_me:10382: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10382: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10385: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10385: \$? = $ac_status" >&5
+  echo "$as_me:10388: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -10433,7 +10436,7 @@
 	;;
 esac
 
-echo "$as_me:10436: checking for ncurses version" >&5
+echo "$as_me:10439: checking for ncurses version" >&5
 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
 if test "${cf_cv_ncurses_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10459,10 +10462,10 @@
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:10462: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:10465: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:10465: \$? = $ac_status" >&5
+  echo "$as_me:10468: \$? = $ac_status" >&5
   (exit $ac_status); }
 	if test -f conftest.out ; then
 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
@@ -10472,7 +10475,7 @@
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10475 "configure"
+#line 10478 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -10497,15 +10500,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:10500: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10503: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10503: \$? = $ac_status" >&5
+  echo "$as_me:10506: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:10505: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10508: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10508: \$? = $ac_status" >&5
+  echo "$as_me:10511: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -10519,7 +10522,7 @@
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:10522: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:10525: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF
 #define NCURSES 1
@@ -10531,7 +10534,7 @@
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:10534: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:10537: checking for Gpm_Open in -lgpm" >&5
 echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
 if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10539,7 +10542,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10542 "configure"
+#line 10545 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10558,16 +10561,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10561: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10564: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10564: \$? = $ac_status" >&5
+  echo "$as_me:10567: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10567: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10570: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10570: \$? = $ac_status" >&5
+  echo "$as_me:10573: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -10578,10 +10581,10 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10581: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:10584: result: $ac_cv_lib_gpm_Gpm_Open" >&5
 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
 if test $ac_cv_lib_gpm_Gpm_Open = yes; then
-  echo "$as_me:10584: checking for initscr in -lgpm" >&5
+  echo "$as_me:10587: checking for initscr in -lgpm" >&5
 echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
 if test "${ac_cv_lib_gpm_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10589,7 +10592,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10592 "configure"
+#line 10595 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10608,16 +10611,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10611: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10614: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10614: \$? = $ac_status" >&5
+  echo "$as_me:10617: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10617: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10620: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10620: \$? = $ac_status" >&5
+  echo "$as_me:10623: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -10628,7 +10631,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10631: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:10634: result: $ac_cv_lib_gpm_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
 if test $ac_cv_lib_gpm_initscr = yes; then
   LIBS="$cf_ncurses_SAVE"
@@ -10642,7 +10645,7 @@
 freebsd*)
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it's static).
-	echo "$as_me:10645: checking for tgoto in -lmytinfo" >&5
+	echo "$as_me:10648: checking for tgoto in -lmytinfo" >&5
 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10650,7 +10653,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10653 "configure"
+#line 10656 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10669,16 +10672,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10672: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10675: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10675: \$? = $ac_status" >&5
+  echo "$as_me:10678: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10678: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10681: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10681: \$? = $ac_status" >&5
+  echo "$as_me:10684: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -10689,7 +10692,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10692: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:10695: result: $ac_cv_lib_mytinfo_tgoto" >&5
 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
 if test $ac_cv_lib_mytinfo_tgoto = yes; then
   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
@@ -10707,13 +10710,13 @@
 
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
-	echo "$as_me:10710: checking for initscr" >&5
+	echo "$as_me:10713: checking for initscr" >&5
 echo $ECHO_N "checking for initscr... $ECHO_C" >&6
 if test "${ac_cv_func_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10716 "configure"
+#line 10719 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */
@@ -10744,16 +10747,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10747: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10750: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10750: \$? = $ac_status" >&5
+  echo "$as_me:10753: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10753: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10756: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10756: \$? = $ac_status" >&5
+  echo "$as_me:10759: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -10763,18 +10766,18 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10766: result: $ac_cv_func_initscr" >&5
+echo "$as_me:10769: result: $ac_cv_func_initscr" >&5
 echo "${ECHO_T}$ac_cv_func_initscr" >&6
 if test $ac_cv_func_initscr = yes; then
   eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:10773: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:10776: checking for initscr in -l$cf_nculib_root" >&5
 echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
 		LIBS="-l$cf_nculib_root $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 10777 "configure"
+#line 10780 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -10786,25 +10789,25 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10789: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10792: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10792: \$? = $ac_status" >&5
+  echo "$as_me:10795: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10795: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10798: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10798: \$? = $ac_status" >&5
+  echo "$as_me:10801: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:10800: result: yes" >&5
+  echo "$as_me:10803: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:10807: result: no" >&5
+echo "$as_me:10810: result: no" >&5
 echo "${ECHO_T}no" >&6
 			cf_search=""
 
@@ -10864,11 +10867,11 @@
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:10867: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:10870: checking for -l$cf_nculib_root in $cf_libdir" >&5
 echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 10871 "configure"
+#line 10874 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -10880,25 +10883,25 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10883: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10886: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10886: \$? = $ac_status" >&5
+  echo "$as_me:10889: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10889: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10892: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10892: \$? = $ac_status" >&5
+  echo "$as_me:10895: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:10894: result: yes" >&5
+  echo "$as_me:10897: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:10901: result: no" >&5
+echo "$as_me:10904: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -10913,7 +10916,7 @@
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:10916: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:10919: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -10921,7 +10924,7 @@
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:10924: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:10927: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
 echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
 	cf_ncurses_SAVE="$LIBS"
 	for p in $cf_ncurses_LIBS ; do
@@ -10931,7 +10934,7 @@
 		fi
 	done
 	cat >conftest.$ac_ext <<_ACEOF
-#line 10934 "configure"
+#line 10937 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -10943,23 +10946,23 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10946: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10949: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10949: \$? = $ac_status" >&5
+  echo "$as_me:10952: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10952: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10955: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10955: \$? = $ac_status" >&5
+  echo "$as_me:10958: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:10957: result: yes" >&5
+  echo "$as_me:10960: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:10962: result: no" >&5
+echo "$as_me:10965: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -10986,7 +10989,7 @@
 test "$cf_cv_curses_dir" != "no" && \
 CPPFLAGS="-I$cf_cv_curses_dir/include -I$cf_cv_curses_dir/include/$cf_ncuhdr_root $CPPFLAGS"
 
-echo "$as_me:10989: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:10992: checking for $cf_ncuhdr_root header in include-path" >&5
 echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10998,7 +11001,7 @@
 	do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 11001 "configure"
+#line 11004 "configure"
 #include "confdefs.h"
 
 #define _XOPEN_SOURCE_EXTENDED
@@ -11030,16 +11033,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11033: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11036: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11036: \$? = $ac_status" >&5
+  echo "$as_me:11039: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11039: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11042: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11042: \$? = $ac_status" >&5
+  echo "$as_me:11045: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -11054,13 +11057,13 @@
 	done
 
 fi
-echo "$as_me:11057: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:11060: result: $cf_cv_ncurses_h" >&5
 echo "${ECHO_T}$cf_cv_ncurses_h" >&6
 
 if test "$cf_cv_ncurses_h" != no ; then
 	cf_cv_ncurses_header=$cf_cv_ncurses_h
 else
-echo "$as_me:11063: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:11066: checking for $cf_ncuhdr_root include-path" >&5
 echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11155,7 +11158,7 @@
 				cf_save_CPPFLAGS="$CPPFLAGS"
 				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 11158 "configure"
+#line 11161 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11167,16 +11170,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11170: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11173: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11173: \$? = $ac_status" >&5
+  echo "$as_me:11176: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11176: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11179: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11179: \$? = $ac_status" >&5
+  echo "$as_me:11182: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11203,7 +11206,7 @@
 		do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 11206 "configure"
+#line 11209 "configure"
 #include "confdefs.h"
 
 #define _XOPEN_SOURCE_EXTENDED
@@ -11235,16 +11238,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11238: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11241: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11241: \$? = $ac_status" >&5
+  echo "$as_me:11244: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11244: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11247: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11247: \$? = $ac_status" >&5
+  echo "$as_me:11250: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -11265,12 +11268,12 @@
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11268: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11271: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:11273: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:11276: result: $cf_cv_ncurses_h2" >&5
 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
 
 	cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
@@ -11292,7 +11295,7 @@
 				cf_save_CPPFLAGS="$CPPFLAGS"
 				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 11295 "configure"
+#line 11298 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11304,16 +11307,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11307: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11310: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11310: \$? = $ac_status" >&5
+  echo "$as_me:11313: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11313: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11316: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11316: \$? = $ac_status" >&5
+  echo "$as_me:11319: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11364,7 +11367,7 @@
 	;;
 esac
 
-echo "$as_me:11367: checking for ncurses version" >&5
+echo "$as_me:11370: checking for ncurses version" >&5
 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
 if test "${cf_cv_ncurses_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11390,10 +11393,10 @@
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:11393: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:11396: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:11396: \$? = $ac_status" >&5
+  echo "$as_me:11399: \$? = $ac_status" >&5
   (exit $ac_status); }
 	if test -f conftest.out ; then
 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
@@ -11403,7 +11406,7 @@
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11406 "configure"
+#line 11409 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -11428,15 +11431,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:11431: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11434: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11434: \$? = $ac_status" >&5
+  echo "$as_me:11437: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:11436: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11439: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11439: \$? = $ac_status" >&5
+  echo "$as_me:11442: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -11450,7 +11453,7 @@
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:11453: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:11456: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF
 #define NCURSES 1
@@ -11462,7 +11465,7 @@
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:11465: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:11468: checking for Gpm_Open in -lgpm" >&5
 echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
 if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11470,7 +11473,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 11473 "configure"
+#line 11476 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11489,16 +11492,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11492: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11495: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11495: \$? = $ac_status" >&5
+  echo "$as_me:11498: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11498: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11501: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11501: \$? = $ac_status" >&5
+  echo "$as_me:11504: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -11509,10 +11512,10 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11512: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:11515: result: $ac_cv_lib_gpm_Gpm_Open" >&5
 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
 if test $ac_cv_lib_gpm_Gpm_Open = yes; then
-  echo "$as_me:11515: checking for initscr in -lgpm" >&5
+  echo "$as_me:11518: checking for initscr in -lgpm" >&5
 echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
 if test "${ac_cv_lib_gpm_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11520,7 +11523,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 11523 "configure"
+#line 11526 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11539,16 +11542,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11542: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11545: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11545: \$? = $ac_status" >&5
+  echo "$as_me:11548: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11548: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11551: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11551: \$? = $ac_status" >&5
+  echo "$as_me:11554: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -11559,7 +11562,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11562: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:11565: result: $ac_cv_lib_gpm_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
 if test $ac_cv_lib_gpm_initscr = yes; then
   LIBS="$cf_ncurses_SAVE"
@@ -11573,7 +11576,7 @@
 freebsd*)
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it's static).
-	echo "$as_me:11576: checking for tgoto in -lmytinfo" >&5
+	echo "$as_me:11579: checking for tgoto in -lmytinfo" >&5
 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11581,7 +11584,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 11584 "configure"
+#line 11587 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11600,16 +11603,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11603: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11606: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11606: \$? = $ac_status" >&5
+  echo "$as_me:11609: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11609: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11612: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11612: \$? = $ac_status" >&5
+  echo "$as_me:11615: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -11620,7 +11623,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11623: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:11626: result: $ac_cv_lib_mytinfo_tgoto" >&5
 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
 if test $ac_cv_lib_mytinfo_tgoto = yes; then
   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
@@ -11638,13 +11641,13 @@
 
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
-	echo "$as_me:11641: checking for initscr" >&5
+	echo "$as_me:11644: checking for initscr" >&5
 echo $ECHO_N "checking for initscr... $ECHO_C" >&6
 if test "${ac_cv_func_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11647 "configure"
+#line 11650 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */
@@ -11675,16 +11678,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11678: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11681: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11681: \$? = $ac_status" >&5
+  echo "$as_me:11684: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11684: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11687: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11687: \$? = $ac_status" >&5
+  echo "$as_me:11690: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -11694,18 +11697,18 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:11697: result: $ac_cv_func_initscr" >&5
+echo "$as_me:11700: result: $ac_cv_func_initscr" >&5
 echo "${ECHO_T}$ac_cv_func_initscr" >&6
 if test $ac_cv_func_initscr = yes; then
   eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:11704: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:11707: checking for initscr in -l$cf_nculib_root" >&5
 echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
 		LIBS="-l$cf_nculib_root $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 11708 "configure"
+#line 11711 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -11717,25 +11720,25 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11720: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11723: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11723: \$? = $ac_status" >&5
+  echo "$as_me:11726: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11726: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11729: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11729: \$? = $ac_status" >&5
+  echo "$as_me:11732: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:11731: result: yes" >&5
+  echo "$as_me:11734: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:11738: result: no" >&5
+echo "$as_me:11741: result: no" >&5
 echo "${ECHO_T}no" >&6
 			cf_search=""
 
@@ -11795,11 +11798,11 @@
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:11798: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:11801: checking for -l$cf_nculib_root in $cf_libdir" >&5
 echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 11802 "configure"
+#line 11805 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -11811,25 +11814,25 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11814: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11817: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11817: \$? = $ac_status" >&5
+  echo "$as_me:11820: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11820: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11823: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11823: \$? = $ac_status" >&5
+  echo "$as_me:11826: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:11825: result: yes" >&5
+  echo "$as_me:11828: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:11832: result: no" >&5
+echo "$as_me:11835: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -11844,7 +11847,7 @@
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:11847: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:11850: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -11852,7 +11855,7 @@
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:11855: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:11858: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
 echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
 	cf_ncurses_SAVE="$LIBS"
 	for p in $cf_ncurses_LIBS ; do
@@ -11862,7 +11865,7 @@
 		fi
 	done
 	cat >conftest.$ac_ext <<_ACEOF
-#line 11865 "configure"
+#line 11868 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -11874,23 +11877,23 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11877: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11880: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11880: \$? = $ac_status" >&5
+  echo "$as_me:11883: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11883: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11886: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11886: \$? = $ac_status" >&5
+  echo "$as_me:11889: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:11888: result: yes" >&5
+  echo "$as_me:11891: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:11893: result: no" >&5
+echo "$as_me:11896: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -11911,7 +11914,7 @@
 #define DISP_TERMCAP 1
 EOF
 
-		echo "$as_me:11914: checking if you want to use ncurses" >&5
+		echo "$as_me:11917: checking if you want to use ncurses" >&5
 echo $ECHO_N "checking if you want to use ncurses... $ECHO_C" >&6
 
 # Check whether --with-ncurses or --without-ncurses was given.
@@ -11921,7 +11924,7 @@
 else
   withval=no
 fi;
-		echo "$as_me:11924: result: $withval" >&5
+		echo "$as_me:11927: result: $withval" >&5
 echo "${ECHO_T}$withval" >&6
 
 if test "${cf_cv_termlib+set}" = set; then
@@ -11930,7 +11933,7 @@
 
 cf_cv_termlib=none
 cat >conftest.$ac_ext <<_ACEOF
-#line 11933 "configure"
+#line 11936 "configure"
 #include "confdefs.h"
 
 int
@@ -11942,19 +11945,19 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11945: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11948: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11948: \$? = $ac_status" >&5
+  echo "$as_me:11951: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11951: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11954: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11954: \$? = $ac_status" >&5
+  echo "$as_me:11957: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 11957 "configure"
+#line 11960 "configure"
 #include "confdefs.h"
 
 int
@@ -11966,16 +11969,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11969: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11972: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11972: \$? = $ac_status" >&5
+  echo "$as_me:11975: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11975: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11978: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11978: \$? = $ac_status" >&5
+  echo "$as_me:11981: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termlib=terminfo
 else
@@ -11999,7 +12002,7 @@
 test "$cf_cv_curses_dir" != "no" && \
 CPPFLAGS="-I$cf_cv_curses_dir/include -I$cf_cv_curses_dir/include/$cf_ncuhdr_root $CPPFLAGS"
 
-echo "$as_me:12002: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:12005: checking for $cf_ncuhdr_root header in include-path" >&5
 echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12011,7 +12014,7 @@
 	do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 12014 "configure"
+#line 12017 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -12035,16 +12038,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12038: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12041: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12041: \$? = $ac_status" >&5
+  echo "$as_me:12044: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12044: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12047: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12047: \$? = $ac_status" >&5
+  echo "$as_me:12050: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -12059,13 +12062,13 @@
 	done
 
 fi
-echo "$as_me:12062: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:12065: result: $cf_cv_ncurses_h" >&5
 echo "${ECHO_T}$cf_cv_ncurses_h" >&6
 
 if test "$cf_cv_ncurses_h" != no ; then
 	cf_cv_ncurses_header=$cf_cv_ncurses_h
 else
-echo "$as_me:12068: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:12071: checking for $cf_ncuhdr_root include-path" >&5
 echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12160,7 +12163,7 @@
 				cf_save_CPPFLAGS="$CPPFLAGS"
 				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 12163 "configure"
+#line 12166 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -12172,16 +12175,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12175: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12178: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12178: \$? = $ac_status" >&5
+  echo "$as_me:12181: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12181: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12184: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12184: \$? = $ac_status" >&5
+  echo "$as_me:12187: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -12208,7 +12211,7 @@
 		do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 12211 "configure"
+#line 12214 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -12232,16 +12235,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12235: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12238: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12238: \$? = $ac_status" >&5
+  echo "$as_me:12241: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12241: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12244: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12244: \$? = $ac_status" >&5
+  echo "$as_me:12247: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -12262,12 +12265,12 @@
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:12265: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:12268: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:12270: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:12273: result: $cf_cv_ncurses_h2" >&5
 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
 
 	cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
@@ -12289,7 +12292,7 @@
 				cf_save_CPPFLAGS="$CPPFLAGS"
 				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 12292 "configure"
+#line 12295 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -12301,16 +12304,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12304: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12307: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12307: \$? = $ac_status" >&5
+  echo "$as_me:12310: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12310: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12313: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12313: \$? = $ac_status" >&5
+  echo "$as_me:12316: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -12361,7 +12364,7 @@
 	;;
 esac
 
-echo "$as_me:12364: checking for ncurses version" >&5
+echo "$as_me:12367: checking for ncurses version" >&5
 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
 if test "${cf_cv_ncurses_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12387,10 +12390,10 @@
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:12390: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:12393: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:12393: \$? = $ac_status" >&5
+  echo "$as_me:12396: \$? = $ac_status" >&5
   (exit $ac_status); }
 	if test -f conftest.out ; then
 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
@@ -12400,7 +12403,7 @@
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12403 "configure"
+#line 12406 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -12425,15 +12428,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:12428: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12431: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12431: \$? = $ac_status" >&5
+  echo "$as_me:12434: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:12433: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12436: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12436: \$? = $ac_status" >&5
+  echo "$as_me:12439: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -12447,7 +12450,7 @@
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:12450: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:12453: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF
 #define NCURSES 1
@@ -12459,7 +12462,7 @@
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:12462: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:12465: checking for Gpm_Open in -lgpm" >&5
 echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
 if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12467,7 +12470,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12470 "configure"
+#line 12473 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12486,16 +12489,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12489: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12492: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12492: \$? = $ac_status" >&5
+  echo "$as_me:12495: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12495: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12498: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12498: \$? = $ac_status" >&5
+  echo "$as_me:12501: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -12506,10 +12509,10 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12509: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:12512: result: $ac_cv_lib_gpm_Gpm_Open" >&5
 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
 if test $ac_cv_lib_gpm_Gpm_Open = yes; then
-  echo "$as_me:12512: checking for initscr in -lgpm" >&5
+  echo "$as_me:12515: checking for initscr in -lgpm" >&5
 echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
 if test "${ac_cv_lib_gpm_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12517,7 +12520,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12520 "configure"
+#line 12523 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12536,16 +12539,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12539: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12542: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12542: \$? = $ac_status" >&5
+  echo "$as_me:12545: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12545: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12548: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12548: \$? = $ac_status" >&5
+  echo "$as_me:12551: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -12556,7 +12559,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12559: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:12562: result: $ac_cv_lib_gpm_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
 if test $ac_cv_lib_gpm_initscr = yes; then
   LIBS="$cf_ncurses_SAVE"
@@ -12570,7 +12573,7 @@
 freebsd*)
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it's static).
-	echo "$as_me:12573: checking for tgoto in -lmytinfo" >&5
+	echo "$as_me:12576: checking for tgoto in -lmytinfo" >&5
 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12578,7 +12581,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12581 "configure"
+#line 12584 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12597,16 +12600,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12600: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12603: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12603: \$? = $ac_status" >&5
+  echo "$as_me:12606: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12606: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12609: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12609: \$? = $ac_status" >&5
+  echo "$as_me:12612: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -12617,7 +12620,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12620: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:12623: result: $ac_cv_lib_mytinfo_tgoto" >&5
 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
 if test $ac_cv_lib_mytinfo_tgoto = yes; then
   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
@@ -12635,13 +12638,13 @@
 
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
-	echo "$as_me:12638: checking for initscr" >&5
+	echo "$as_me:12641: checking for initscr" >&5
 echo $ECHO_N "checking for initscr... $ECHO_C" >&6
 if test "${ac_cv_func_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12644 "configure"
+#line 12647 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */
@@ -12672,16 +12675,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12675: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12678: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12678: \$? = $ac_status" >&5
+  echo "$as_me:12681: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12681: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12684: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12684: \$? = $ac_status" >&5
+  echo "$as_me:12687: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -12691,18 +12694,18 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12694: result: $ac_cv_func_initscr" >&5
+echo "$as_me:12697: result: $ac_cv_func_initscr" >&5
 echo "${ECHO_T}$ac_cv_func_initscr" >&6
 if test $ac_cv_func_initscr = yes; then
   eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:12701: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:12704: checking for initscr in -l$cf_nculib_root" >&5
 echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
 		LIBS="-l$cf_nculib_root $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 12705 "configure"
+#line 12708 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -12714,25 +12717,25 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12717: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12720: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12720: \$? = $ac_status" >&5
+  echo "$as_me:12723: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12723: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12726: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12726: \$? = $ac_status" >&5
+  echo "$as_me:12729: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:12728: result: yes" >&5
+  echo "$as_me:12731: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:12735: result: no" >&5
+echo "$as_me:12738: result: no" >&5
 echo "${ECHO_T}no" >&6
 			cf_search=""
 
@@ -12792,11 +12795,11 @@
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:12795: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:12798: checking for -l$cf_nculib_root in $cf_libdir" >&5
 echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 12799 "configure"
+#line 12802 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -12808,25 +12811,25 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12811: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12814: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12814: \$? = $ac_status" >&5
+  echo "$as_me:12817: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12817: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12820: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12820: \$? = $ac_status" >&5
+  echo "$as_me:12823: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:12822: result: yes" >&5
+  echo "$as_me:12825: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:12829: result: no" >&5
+echo "$as_me:12832: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -12841,7 +12844,7 @@
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:12844: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:12847: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -12849,7 +12852,7 @@
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:12852: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:12855: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
 echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
 	cf_ncurses_SAVE="$LIBS"
 	for p in $cf_ncurses_LIBS ; do
@@ -12859,7 +12862,7 @@
 		fi
 	done
 	cat >conftest.$ac_ext <<_ACEOF
-#line 12862 "configure"
+#line 12865 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -12871,23 +12874,23 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12874: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12877: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12877: \$? = $ac_status" >&5
+  echo "$as_me:12880: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12880: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12883: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12883: \$? = $ac_status" >&5
+  echo "$as_me:12886: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:12885: result: yes" >&5
+  echo "$as_me:12888: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:12890: result: no" >&5
+echo "$as_me:12893: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -12913,10 +12916,10 @@
 	LIBS="-l$cf_lib $cf_save_LIBS"
 	for cf_func in tigetstr tgetstr
 	do
-		echo "$as_me:12916: checking for $cf_func in -l$cf_lib" >&5
+		echo "$as_me:12919: checking for $cf_func in -l$cf_lib" >&5
 echo $ECHO_N "checking for $cf_func in -l$cf_lib... $ECHO_C" >&6
 		cat >conftest.$ac_ext <<_ACEOF
-#line 12919 "configure"
+#line 12922 "configure"
 #include "confdefs.h"
 
 int
@@ -12928,16 +12931,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12931: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12934: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12934: \$? = $ac_status" >&5
+  echo "$as_me:12937: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12937: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12940: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12940: \$? = $ac_status" >&5
+  echo "$as_me:12943: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -12946,7 +12949,7 @@
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-		echo "$as_me:12949: result: $cf_result" >&5
+		echo "$as_me:12952: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 		if test "$cf_result" = yes ; then
 			if test "$cf_func" = tigetstr ; then
@@ -12963,7 +12966,7 @@
 fi
 if test "$cf_cv_termlib" = none; then
 	# allow curses library for broken AIX system.
-	echo "$as_me:12966: checking for initscr in -lcurses" >&5
+	echo "$as_me:12969: checking for initscr in -lcurses" >&5
 echo $ECHO_N "checking for initscr in -lcurses... $ECHO_C" >&6
 if test "${ac_cv_lib_curses_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12971,7 +12974,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12974 "configure"
+#line 12977 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12990,16 +12993,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12993: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12996: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12996: \$? = $ac_status" >&5
+  echo "$as_me:12999: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12999: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13002: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13002: \$? = $ac_status" >&5
+  echo "$as_me:13005: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_curses_initscr=yes
 else
@@ -13010,13 +13013,13 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13013: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:13016: result: $ac_cv_lib_curses_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_curses_initscr" >&6
 if test $ac_cv_lib_curses_initscr = yes; then
   LIBS="$LIBS -lcurses" cf_cv_termlib=termcap
 fi
 
-	echo "$as_me:13019: checking for tgoto in -ltermcap" >&5
+	echo "$as_me:13022: checking for tgoto in -ltermcap" >&5
 echo $ECHO_N "checking for tgoto in -ltermcap... $ECHO_C" >&6
 if test "${ac_cv_lib_termcap_tgoto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13024,7 +13027,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 13027 "configure"
+#line 13030 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13043,16 +13046,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13046: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13049: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13049: \$? = $ac_status" >&5
+  echo "$as_me:13052: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13052: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13055: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13055: \$? = $ac_status" >&5
+  echo "$as_me:13058: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_termcap_tgoto=yes
 else
@@ -13063,7 +13066,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13066: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:13069: result: $ac_cv_lib_termcap_tgoto" >&5
 echo "${ECHO_T}$ac_cv_lib_termcap_tgoto" >&6
 if test $ac_cv_lib_termcap_tgoto = yes; then
   LIBS="$LIBS -ltermcap" cf_cv_termlib=termcap
@@ -13074,7 +13077,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 if test "$cf_cv_termlib" = none; then
-	{ echo "$as_me:13077: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+	{ echo "$as_me:13080: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
 echo "$as_me: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&2;}
 fi
 
@@ -13094,7 +13097,7 @@
 
 cf_cv_termlib=none
 cat >conftest.$ac_ext <<_ACEOF
-#line 13097 "configure"
+#line 13100 "configure"
 #include "confdefs.h"
 
 int
@@ -13106,19 +13109,19 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13109: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13112: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13112: \$? = $ac_status" >&5
+  echo "$as_me:13115: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13115: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13118: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13118: \$? = $ac_status" >&5
+  echo "$as_me:13121: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 13121 "configure"
+#line 13124 "configure"
 #include "confdefs.h"
 
 int
@@ -13130,16 +13133,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13133: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13136: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13136: \$? = $ac_status" >&5
+  echo "$as_me:13139: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13139: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13142: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13142: \$? = $ac_status" >&5
+  echo "$as_me:13145: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termlib=terminfo
 else
@@ -13163,10 +13166,10 @@
 	LIBS="-l$cf_lib $cf_save_LIBS"
 	for cf_func in tigetstr tgetstr
 	do
-		echo "$as_me:13166: checking for $cf_func in -l$cf_lib" >&5
+		echo "$as_me:13169: checking for $cf_func in -l$cf_lib" >&5
 echo $ECHO_N "checking for $cf_func in -l$cf_lib... $ECHO_C" >&6
 		cat >conftest.$ac_ext <<_ACEOF
-#line 13169 "configure"
+#line 13172 "configure"
 #include "confdefs.h"
 
 int
@@ -13178,16 +13181,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13181: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13184: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13184: \$? = $ac_status" >&5
+  echo "$as_me:13187: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13187: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13190: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13190: \$? = $ac_status" >&5
+  echo "$as_me:13193: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -13196,7 +13199,7 @@
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-		echo "$as_me:13199: result: $cf_result" >&5
+		echo "$as_me:13202: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 		if test "$cf_result" = yes ; then
 			if test "$cf_func" = tigetstr ; then
@@ -13213,7 +13216,7 @@
 fi
 if test "$cf_cv_termlib" = none; then
 	# allow curses library for broken AIX system.
-	echo "$as_me:13216: checking for initscr in -lcurses" >&5
+	echo "$as_me:13219: checking for initscr in -lcurses" >&5
 echo $ECHO_N "checking for initscr in -lcurses... $ECHO_C" >&6
 if test "${ac_cv_lib_curses_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13221,7 +13224,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 13224 "configure"
+#line 13227 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13240,16 +13243,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13243: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13246: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13246: \$? = $ac_status" >&5
+  echo "$as_me:13249: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13249: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13252: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13252: \$? = $ac_status" >&5
+  echo "$as_me:13255: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_curses_initscr=yes
 else
@@ -13260,13 +13263,13 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13263: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:13266: result: $ac_cv_lib_curses_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_curses_initscr" >&6
 if test $ac_cv_lib_curses_initscr = yes; then
   LIBS="$LIBS -lcurses" cf_cv_termlib=termcap
 fi
 
-	echo "$as_me:13269: checking for tgoto in -ltermcap" >&5
+	echo "$as_me:13272: checking for tgoto in -ltermcap" >&5
 echo $ECHO_N "checking for tgoto in -ltermcap... $ECHO_C" >&6
 if test "${ac_cv_lib_termcap_tgoto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13274,7 +13277,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 13277 "configure"
+#line 13280 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13293,16 +13296,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13296: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13299: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13299: \$? = $ac_status" >&5
+  echo "$as_me:13302: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13302: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13305: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13305: \$? = $ac_status" >&5
+  echo "$as_me:13308: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_termcap_tgoto=yes
 else
@@ -13313,7 +13316,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13316: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:13319: result: $ac_cv_lib_termcap_tgoto" >&5
 echo "${ECHO_T}$ac_cv_lib_termcap_tgoto" >&6
 if test $ac_cv_lib_termcap_tgoto = yes; then
   LIBS="$LIBS -ltermcap" cf_cv_termlib=termcap
@@ -13324,7 +13327,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 if test "$cf_cv_termlib" = none; then
-	{ echo "$as_me:13327: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+	{ echo "$as_me:13330: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
 echo "$as_me: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&2;}
 fi
 
@@ -13346,7 +13349,7 @@
 elif test ".$cf_cv_termlib" = .termcap ; then
 	# BSD 'tputs()' may need 'PC' to be set.
 	cat >conftest.$ac_ext <<_ACEOF
-#line 13349 "configure"
+#line 13352 "configure"
 #include "confdefs.h"
 
 int
@@ -13358,16 +13361,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13361: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13364: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13364: \$? = $ac_status" >&5
+  echo "$as_me:13367: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13367: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13370: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13370: \$? = $ac_status" >&5
+  echo "$as_me:13373: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >>confdefs.h <<\EOF
 #define HAVE_EXTERN_TCAP_PC 1
@@ -13386,14 +13389,14 @@
 
 LIBS="$LIBS $X_EXTRA_LIBS"
 
-echo "$as_me:13389: checking for /dev/tty" >&5
+echo "$as_me:13392: checking for /dev/tty" >&5
 echo $ECHO_N "checking for /dev/tty... $ECHO_C" >&6
 if test -c /dev/tty ; then
 	cf_result=yes
 else
 	cf_result=no
 fi
-echo "$as_me:13396: result: $cf_result" >&5
+echo "$as_me:13399: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 if test "$cf_result" = yes ; then
 	cf_result=`echo /dev/tty | sed -e s%/%_%g`
@@ -13406,7 +13409,7 @@
 
 fi
 
-echo "$as_me:13409: checking for crypt function" >&5
+echo "$as_me:13412: checking for crypt function" >&5
 echo $ECHO_N "checking for crypt function... $ECHO_C" >&6
 if test "${cf_cv_crypt_func+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13414,7 +13417,7 @@
 
 cf_cv_crypt_func=
 cat >conftest.$ac_ext <<_ACEOF
-#line 13417 "configure"
+#line 13420 "configure"
 #include "confdefs.h"
 
 int
@@ -13426,16 +13429,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13429: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13432: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13432: \$? = $ac_status" >&5
+  echo "$as_me:13435: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13435: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13438: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13438: \$? = $ac_status" >&5
+  echo "$as_me:13441: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_crypt_func=yes
@@ -13446,7 +13449,7 @@
 	cf_save_LIBS="$LIBS"
 	LIBS="-lcrypt $LIBS"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 13449 "configure"
+#line 13452 "configure"
 #include "confdefs.h"
 
 int
@@ -13458,16 +13461,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13461: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13464: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13464: \$? = $ac_status" >&5
+  echo "$as_me:13467: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13467: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13470: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13470: \$? = $ac_status" >&5
+  echo "$as_me:13473: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 		cf_cv_crypt_func="-lcrypt"
@@ -13484,12 +13487,12 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:13487: result: $cf_cv_crypt_func" >&5
+echo "$as_me:13490: result: $cf_cv_crypt_func" >&5
 echo "${ECHO_T}$cf_cv_crypt_func" >&6
 if test "$cf_cv_crypt_func" != no ; then
 	cf_save_LIBS="$LIBS"
 	test "$cf_cv_crypt_func" != yes && LIBS="$cf_cv_crypt_func $LIBS"
-echo "$as_me:13492: checking if crypt works" >&5
+echo "$as_me:13495: checking if crypt works" >&5
 echo $ECHO_N "checking if crypt works... $ECHO_C" >&6
 if test "${cf_cv_crypt_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13500,7 +13503,7 @@
 	cf_cv_crypt_works=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13503 "configure"
+#line 13506 "configure"
 #include "confdefs.h"
 
 #include <string.h>
@@ -13512,15 +13515,15 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:13515: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13518: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13518: \$? = $ac_status" >&5
+  echo "$as_me:13521: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:13520: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13523: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13523: \$? = $ac_status" >&5
+  echo "$as_me:13526: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_crypt_works=yes
@@ -13535,7 +13538,7 @@
 fi
 	LIBS="$cf_save_LIBS"
 fi
-echo "$as_me:13538: result: $cf_cv_crypt_works" >&5
+echo "$as_me:13541: result: $cf_cv_crypt_works" >&5
 echo "${ECHO_T}$cf_cv_crypt_works" >&6
 	if test "$cf_cv_crypt_works" != no ; then
 		cat >>confdefs.h <<\EOF
@@ -13548,14 +13551,14 @@
 	fi
 fi
 
-echo "$as_me:13551: checking for declaration of fd_set" >&5
+echo "$as_me:13554: 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 "trying sys/types alone" 1>&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 13558 "configure"
+#line 13561 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -13568,16 +13571,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13571: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13574: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13574: \$? = $ac_status" >&5
+  echo "$as_me:13577: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13577: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13580: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13580: \$? = $ac_status" >&5
+  echo "$as_me:13583: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_fd_set=sys/types.h
 else
@@ -13585,7 +13588,7 @@
 cat conftest.$ac_ext >&5
 echo "trying X11/Xpoll.h" 1>&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 13588 "configure"
+#line 13591 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_X11_XPOLL_H
@@ -13600,16 +13603,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13603: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13606: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13606: \$? = $ac_status" >&5
+  echo "$as_me:13609: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13609: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13612: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13612: \$? = $ac_status" >&5
+  echo "$as_me:13615: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_fd_set=X11/Xpoll.h
 else
@@ -13617,7 +13620,7 @@
 cat conftest.$ac_ext >&5
 echo "trying sys/select.h" 1>&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 13620 "configure"
+#line 13623 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -13631,16 +13634,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13634: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13637: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13637: \$? = $ac_status" >&5
+  echo "$as_me:13640: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13640: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13643: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13643: \$? = $ac_status" >&5
+  echo "$as_me:13646: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_fd_set=sys/select.h
 else
@@ -13654,7 +13657,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:13657: result: $cf_cv_type_fd_set" >&5
+echo "$as_me:13660: 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
 	cat >>confdefs.h <<\EOF
@@ -13663,14 +13666,14 @@
 
 fi
 
-echo "$as_me:13666: checking for fd_set macros" >&5
+echo "$as_me:13669: checking for fd_set macros" >&5
 echo $ECHO_N "checking for fd_set macros... $ECHO_C" >&6
 if test "${cf_cv_macros_fd_set+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 13673 "configure"
+#line 13676 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -13699,16 +13702,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13702: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13705: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13705: \$? = $ac_status" >&5
+  echo "$as_me:13708: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13708: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13711: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13711: \$? = $ac_status" >&5
+  echo "$as_me:13714: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_macros_fd_set=yes
 else
@@ -13718,7 +13721,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:13721: result: $cf_cv_macros_fd_set" >&5
+echo "$as_me:13724: result: $cf_cv_macros_fd_set" >&5
 echo "${ECHO_T}$cf_cv_macros_fd_set" >&6
 test $cf_cv_macros_fd_set = yes && cat >>confdefs.h <<\EOF
 #define HAVE_TYPE_FD_SET 1
@@ -13764,13 +13767,13 @@
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:13767: checking for $ac_func" >&5
+echo "$as_me:13770: 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 13773 "configure"
+#line 13776 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -13801,16 +13804,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13804: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13807: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13807: \$? = $ac_status" >&5
+  echo "$as_me:13810: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13810: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13813: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13813: \$? = $ac_status" >&5
+  echo "$as_me:13816: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -13820,7 +13823,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:13823: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:13826: 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
@@ -13830,14 +13833,14 @@
 fi
 done
 
-echo "$as_me:13833: checking for standard qsort" >&5
+echo "$as_me:13836: checking for standard qsort" >&5
 echo $ECHO_N "checking for standard qsort... $ECHO_C" >&6
 if test "${cf_cv_ansi_qsort+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 13840 "configure"
+#line 13843 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -13855,16 +13858,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13858: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13861: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13861: \$? = $ac_status" >&5
+  echo "$as_me:13864: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13864: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13867: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13867: \$? = $ac_status" >&5
+  echo "$as_me:13870: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ansi_qsort=yes
 else
@@ -13875,7 +13878,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:13878: result: $cf_cv_ansi_qsort" >&5
+echo "$as_me:13881: result: $cf_cv_ansi_qsort" >&5
 echo "${ECHO_T}$cf_cv_ansi_qsort" >&6
 
 if test $cf_cv_ansi_qsort = yes; then
@@ -13890,7 +13893,7 @@
 
 fi
 
-echo "$as_me:13893: checking for working mkstemp" >&5
+echo "$as_me:13896: checking for working mkstemp" >&5
 echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6
 if test "${cf_cv_func_mkstemp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13898,13 +13901,13 @@
 
 rm -f conftest*
 if test "$cross_compiling" = yes; then
-  echo "$as_me:13901: checking for mkstemp" >&5
+  echo "$as_me:13904: checking for mkstemp" >&5
 echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
 if test "${ac_cv_func_mkstemp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13907 "configure"
+#line 13910 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char mkstemp (); below.  */
@@ -13935,16 +13938,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13938: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13941: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13941: \$? = $ac_status" >&5
+  echo "$as_me:13944: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13944: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13947: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13947: \$? = $ac_status" >&5
+  echo "$as_me:13950: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_mkstemp=yes
 else
@@ -13954,12 +13957,12 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:13957: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:13960: result: $ac_cv_func_mkstemp" >&5
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13962 "configure"
+#line 13965 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -13997,15 +14000,15 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:14000: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14003: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14003: \$? = $ac_status" >&5
+  echo "$as_me:14006: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:14005: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14008: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14008: \$? = $ac_status" >&5
+  echo "$as_me:14011: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_func_mkstemp=yes
 
@@ -14020,7 +14023,7 @@
 fi
 
 fi
-echo "$as_me:14023: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:14026: result: $cf_cv_func_mkstemp" >&5
 echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
 if test "$cf_cv_func_mkstemp" = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -14038,7 +14041,7 @@
 cf_save_cppflags="${CPPFLAGS}"
 cf_save_ldflags="${LDFLAGS}"
 
-echo "$as_me:14041: checking if you want to use the Xpm library for colored icon" >&5
+echo "$as_me:14044: 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.
@@ -14048,7 +14051,7 @@
 else
   cf_Xpm_library=no
 fi;
-echo "$as_me:14051: result: $cf_Xpm_library" >&5
+echo "$as_me:14054: result: $cf_Xpm_library" >&5
 echo "${ECHO_T}$cf_Xpm_library" >&6
 
 if test "$cf_Xpm_library" != no ; then
@@ -14056,23 +14059,23 @@
 	CPPFLAGS="$CPPFLAGS -I$withval/include"
 	LDFLAGS="$LDFLAGS -L$withval/lib"
     fi
-    echo "$as_me:14059: checking for X11/xpm.h" >&5
+    echo "$as_me:14062: 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 14065 "configure"
+#line 14068 "configure"
 #include "confdefs.h"
 #include <X11/xpm.h>
 _ACEOF
-if { (eval echo "$as_me:14069: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:14072: \"$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:14075: \$? = $ac_status" >&5
+  echo "$as_me:14078: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -14091,11 +14094,11 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:14094: result: $ac_cv_header_X11_xpm_h" >&5
+echo "$as_me:14097: 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:14098: checking for XpmCreatePixmapFromData in -lXpm" >&5
+	echo "$as_me:14101: 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
@@ -14103,7 +14106,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXpm -lX11 $X_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 14106 "configure"
+#line 14109 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14122,16 +14125,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14125: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14128: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14128: \$? = $ac_status" >&5
+  echo "$as_me:14131: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14131: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14134: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14134: \$? = $ac_status" >&5
+  echo "$as_me:14137: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xpm_XpmCreatePixmapFromData=yes
 else
@@ -14142,7 +14145,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14145: result: $ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&5
+echo "$as_me:14148: 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
 
@@ -14163,7 +14166,7 @@
 fi
 
 if test -n "$cf_x_athena" ; then
-    echo "$as_me:14166: checking if you want to use Xaw scrollbars rather than our own" >&5
+    echo "$as_me:14169: checking if you want to use Xaw scrollbars rather than our own" >&5
 echo $ECHO_N "checking if you want to use Xaw scrollbars rather than our own... $ECHO_C" >&6
 
 # Check whether --with-Xaw-scrollbars or --without-Xaw-scrollbars was given.
@@ -14173,7 +14176,7 @@
 else
   cf_Xaw_scrollbars=no
 fi;
-    echo "$as_me:14176: result: $cf_Xaw_scrollbars" >&5
+    echo "$as_me:14179: result: $cf_Xaw_scrollbars" >&5
 echo "${ECHO_T}$cf_Xaw_scrollbars" >&6
 
     if test "$cf_Xaw_scrollbars" = no ; then
@@ -14190,7 +14193,7 @@
 #define OPT_XAW_SCROLLBARS 1
 EOF
 
-	echo "$as_me:14193: checking if you want to use the drag/scrolling extension with Xaw" >&5
+	echo "$as_me:14196: checking if you want to use the drag/scrolling extension with Xaw" >&5
 echo $ECHO_N "checking if you want to use the drag/scrolling extension with Xaw... $ECHO_C" >&6
 
 # Check whether --with-drag-extension or --without-drag-extension was given.
@@ -14200,7 +14203,7 @@
 else
   cf_drag_extension=no
 fi;
-	echo "$as_me:14203: result: $cf_drag_extension" >&5
+	echo "$as_me:14206: result: $cf_drag_extension" >&5
 echo "${ECHO_T}$cf_drag_extension" >&6
 	if test "$cf_drag_extension" != "no" ; then
 	    cat >>confdefs.h <<\EOF
@@ -14213,7 +14216,7 @@
 
 fi
 
-echo "$as_me:14216: checking if you want to change the number of exec-macros" >&5
+echo "$as_me:14219: checking if you want to change the number of exec-macros" >&5
 echo $ECHO_N "checking if you want to change the number of exec-macros... $ECHO_C" >&6
 
 # Check whether --with-exec-macros or --without-exec-macros was given.
@@ -14223,7 +14226,7 @@
 else
   cf_exec_macros=no
 fi;
-echo "$as_me:14226: result: $cf_exec_macros" >&5
+echo "$as_me:14229: result: $cf_exec_macros" >&5
 echo "${ECHO_T}$cf_exec_macros" >&6
 test "$cf_exec_macros" != no && cat >>confdefs.h <<EOF
 #define OPT_EXEC_MACROS $cf_exec_macros
@@ -14232,14 +14235,14 @@
 # I don't know of a reliable test for working locale, but we can at least check
 # that it is available before offering it as an option.
 
-echo "$as_me:14235: checking for setlocale()" >&5
+echo "$as_me:14238: checking for setlocale()" >&5
 echo $ECHO_N "checking for setlocale()... $ECHO_C" >&6
 if test "${cf_cv_locale+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 14242 "configure"
+#line 14245 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int
@@ -14251,16 +14254,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14254: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14257: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14257: \$? = $ac_status" >&5
+  echo "$as_me:14260: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14260: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14263: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14263: \$? = $ac_status" >&5
+  echo "$as_me:14266: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_locale=yes
 else
@@ -14272,7 +14275,7 @@
 
 fi
 
-echo "$as_me:14275: result: $cf_cv_locale" >&5
+echo "$as_me:14278: result: $cf_cv_locale" >&5
 echo "${ECHO_T}$cf_cv_locale" >&6
 test $cf_cv_locale = yes && { cat >>confdefs.h <<\EOF
 #define LOCALE 1
@@ -14280,7 +14283,7 @@
  }
 
 if test $cf_cv_locale = yes ; then
-echo "$as_me:14283: checking if you want to use i18n locale support" >&5
+echo "$as_me:14286: checking if you want to use i18n locale support" >&5
 echo $ECHO_N "checking if you want to use i18n locale support... $ECHO_C" >&6
 
 # Check whether --with-locale or --without-locale was given.
@@ -14290,7 +14293,7 @@
 else
   cf_locale=yes
 fi;
-echo "$as_me:14293: result: $cf_locale" >&5
+echo "$as_me:14296: result: $cf_locale" >&5
 echo "${ECHO_T}$cf_locale" >&6
 test "$cf_locale" != no && cat >>confdefs.h <<\EOF
 #define OPT_LOCALE 1
@@ -14300,7 +14303,7 @@
 
 ###	Debugging/development options
 
-echo "$as_me:14303: checking if you want to link with dbmalloc for testing" >&5
+echo "$as_me:14306: checking if you want to link with dbmalloc for testing" >&5
 echo $ECHO_N "checking if you want to link with dbmalloc for testing... $ECHO_C" >&6
 
 # Check whether --with-dbmalloc or --without-dbmalloc was given.
@@ -14310,11 +14313,49 @@
 else
   with_dbmalloc=no
 fi;
-echo "$as_me:14313: result: $with_dbmalloc" >&5
+echo "$as_me:14316: result: $with_dbmalloc" >&5
 echo "${ECHO_T}$with_dbmalloc" >&6
-if test $with_dbmalloc = yes ; then
+if test "$with_dbmalloc" = yes ; then
+	echo "$as_me:14319: 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 14325 "configure"
+#include "confdefs.h"
+#include <dbmalloc.h>
+_ACEOF
+if { (eval echo "$as_me:14329: \"$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:14335: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_cv_header_dbmalloc_h=yes
+else
+  echo "$as_me: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  ac_cv_header_dbmalloc_h=no
+fi
+rm -f conftest.err conftest.$ac_ext
+fi
+echo "$as_me:14354: 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:14317: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:14358: 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
@@ -14322,7 +14363,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 14325 "configure"
+#line 14366 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14341,16 +14382,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14344: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14385: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14347: \$? = $ac_status" >&5
+  echo "$as_me:14388: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14350: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14391: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14353: \$? = $ac_status" >&5
+  echo "$as_me:14394: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -14361,7 +14402,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14364: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:14405: 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
@@ -14374,7 +14415,9 @@
 
 fi
 
-echo "$as_me:14377: checking if you want to link with dmalloc for testing" >&5
+fi
+
+echo "$as_me:14420: checking if you want to link with dmalloc for testing" >&5
 echo $ECHO_N "checking if you want to link with dmalloc for testing... $ECHO_C" >&6
 
 # Check whether --with-dmalloc or --without-dmalloc was given.
@@ -14384,11 +14427,49 @@
 else
   with_dmalloc=no
 fi;
-echo "$as_me:14387: result: $with_dmalloc" >&5
+echo "$as_me:14430: result: $with_dmalloc" >&5
 echo "${ECHO_T}$with_dmalloc" >&6
-if test $with_dmalloc = yes ; then
+if test "$with_dmalloc" = yes ; then
+	echo "$as_me:14433: 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 14439 "configure"
+#include "confdefs.h"
+#include <dmalloc.h>
+_ACEOF
+if { (eval echo "$as_me:14443: \"$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:14449: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_cv_header_dmalloc_h=yes
+else
+  echo "$as_me: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  ac_cv_header_dmalloc_h=no
+fi
+rm -f conftest.err conftest.$ac_ext
+fi
+echo "$as_me:14468: 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:14391: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:14472: 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
@@ -14396,7 +14477,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 14399 "configure"
+#line 14480 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14415,16 +14496,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14418: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14499: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14421: \$? = $ac_status" >&5
+  echo "$as_me:14502: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14424: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14505: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14427: \$? = $ac_status" >&5
+  echo "$as_me:14508: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -14435,7 +14516,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14438: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:14519: 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
@@ -14448,6 +14529,8 @@
 
 fi
 
+fi
+
 # Check whether --with-purify or --without-purify was given.
 if test "${with_purify+set}" = set; then
   withval="$with_purify"
@@ -14507,17 +14590,17 @@
 
 GCC_VERSION=none
 if test "$GCC" = yes ; then
-	echo "$as_me:14510: checking version of $CC" >&5
+	echo "$as_me:14593: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	GCC_VERSION="`${CC} --version|sed -e '2,$d' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
-	echo "$as_me:14514: result: $GCC_VERSION" >&5
+	echo "$as_me:14597: result: $GCC_VERSION" >&5
 echo "${ECHO_T}$GCC_VERSION" >&6
 fi
 
 if ( test "$GCC" = yes || test "$GXX" = yes )
 then
-echo "$as_me:14520: checking if you want to check for gcc warnings" >&5
+echo "$as_me:14603: checking if you want to check for gcc warnings" >&5
 echo $ECHO_N "checking if you want to check for gcc warnings... $ECHO_C" >&6
 
 # Check whether --with-warnings or --without-warnings was given.
@@ -14527,7 +14610,7 @@
 else
   cf_opt_with_warnings=no
 fi;
-echo "$as_me:14530: result: $cf_opt_with_warnings" >&5
+echo "$as_me:14613: result: $cf_opt_with_warnings" >&5
 echo "${ECHO_T}$cf_opt_with_warnings" >&6
 if test "$cf_opt_with_warnings" != no ; then
 
@@ -14549,10 +14632,10 @@
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:14552: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:14635: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > conftest.$ac_ext <<EOF
-#line 14555 "configure"
+#line 14638 "configure"
 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"
@@ -14590,12 +14673,12 @@
 EOF
 			;;
 		esac
-		if { (eval echo "$as_me:14593: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:14676: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14596: \$? = $ac_status" >&5
+  echo "$as_me:14679: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-			test -n "$verbose" && echo "$as_me:14598: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:14681: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 		fi
@@ -14609,10 +14692,10 @@
 if test "$GCC" = yes
 then
 	cat > conftest.$ac_ext <<EOF
-#line 14612 "configure"
+#line 14695 "configure"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
-	{ echo "$as_me:14615: checking for $CC warning options..." >&5
+	{ echo "$as_me:14698: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="-W -Wall"
@@ -14632,12 +14715,12 @@
 		Wundef $cf_warn_CONST
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:14635: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:14718: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14638: \$? = $ac_status" >&5
+  echo "$as_me:14721: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-			test -n "$verbose" && echo "$as_me:14640: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:14723: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case $cf_opt in #(vi
 			Wcast-qual) #(vi
@@ -14687,7 +14770,7 @@
 
 ac_tr_func=`echo "$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-echo "$as_me:14690: checking for missing \"${ac_func}\" extern" >&5
+echo "$as_me:14773: checking for missing \"${ac_func}\" extern" >&5
 echo $ECHO_N "checking for missing \"${ac_func}\" extern... $ECHO_C" >&6
 if eval "test \"\${cf_cv_func_${ac_func}+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14696,7 +14779,7 @@
 cf_save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $CHECK_DECL_FLAG"
 cat >conftest.$ac_ext <<_ACEOF
-#line 14699 "configure"
+#line 14782 "configure"
 #include "confdefs.h"
 
 $CHECK_DECL_HDRS
@@ -14718,16 +14801,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14721: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14804: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14724: \$? = $ac_status" >&5
+  echo "$as_me:14807: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14727: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14810: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14730: \$? = $ac_status" >&5
+  echo "$as_me:14813: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval 'cf_cv_func_'${ac_func}'=yes'
 else
@@ -14741,7 +14824,7 @@
 fi
 
 eval 'cf_result=$cf_cv_func_'${ac_func}
-echo "$as_me:14744: result: $cf_result" >&5
+echo "$as_me:14827: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 test $cf_result = yes && cat >>confdefs.h <<EOF
 #define MISSING_EXTERN_${ac_tr_func} 1
@@ -14755,7 +14838,7 @@
 #include <tcap.h>
 "
 
-echo "$as_me:14758: checking for term.h" >&5
+echo "$as_me:14841: checking for term.h" >&5
 echo $ECHO_N "checking for term.h... $ECHO_C" >&6
 if test "${cf_cv_term_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14768,7 +14851,7 @@
 	term.h
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 14771 "configure"
+#line 14854 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -14782,16 +14865,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14785: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14868: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14788: \$? = $ac_status" >&5
+  echo "$as_me:14871: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14791: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14874: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14794: \$? = $ac_status" >&5
+  echo "$as_me:14877: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_term_header=$cf_header
 	 break
@@ -14804,7 +14887,7 @@
 done
 
 fi
-echo "$as_me:14807: result: $cf_cv_term_header" >&5
+echo "$as_me:14890: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 case $cf_cv_term_header in #(vi
@@ -14828,7 +14911,7 @@
 	;;
 esac
 
-echo "$as_me:14831: checking if we should include curses.h or termcap.h" >&5
+echo "$as_me:14914: checking if we should include curses.h or termcap.h" >&5
 echo $ECHO_N "checking if we should include curses.h or termcap.h... $ECHO_C" >&6
 if test "${cf_cv_need_curses_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14847,7 +14930,7 @@
     test -n "$cf_t_opts" && CPPFLAGS="$CPPFLAGS -D$cf_t_opts"
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 14850 "configure"
+#line 14933 "configure"
 #include "confdefs.h"
 /* $cf_c_opts $cf_t_opts */
 $CHECK_DECL_HDRS
@@ -14860,16 +14943,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14863: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14946: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14866: \$? = $ac_status" >&5
+  echo "$as_me:14949: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14869: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14952: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14872: \$? = $ac_status" >&5
+  echo "$as_me:14955: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   test "$cf_cv_need_curses_h" = no && {
 	     cf_cv_need_curses_h=maybe
@@ -14881,7 +14964,7 @@
 cat conftest.$ac_ext >&5
 echo "Recompiling with corrected call (C:$cf_c_opts, T:$cf_t_opts)" >&5
 	cat >conftest.$ac_ext <<_ACEOF
-#line 14884 "configure"
+#line 14967 "configure"
 #include "confdefs.h"
 
 $CHECK_DECL_HDRS
@@ -14894,16 +14977,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14897: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14980: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14900: \$? = $ac_status" >&5
+  echo "$as_me:14983: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14903: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14986: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14906: \$? = $ac_status" >&5
+  echo "$as_me:14989: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_curses_h=yes
 	 cf_ok_c_opts=$cf_c_opts
@@ -14940,7 +15023,7 @@
 fi
 
 fi
-echo "$as_me:14943: result: $cf_cv_need_curses_h" >&5
+echo "$as_me:15026: result: $cf_cv_need_curses_h" >&5
 echo "${ECHO_T}$cf_cv_need_curses_h" >&6
 
 case $cf_cv_need_curses_h in
@@ -14974,7 +15057,7 @@
 	;;
 esac
 
-echo "$as_me:14977: checking declaration of tputs 3rd param" >&5
+echo "$as_me:15060: checking declaration of tputs 3rd param" >&5
 echo $ECHO_N "checking declaration of tputs 3rd param... $ECHO_C" >&6
 if test "${cf_cv_type_outchar+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14990,10 +15073,10 @@
 for R in int char; do
 for S in "" const; do
 
-echo "(line 14993) testing loop variables P:$P, Q:$Q, R:$R, S:$S ..." 1>&5
+echo "(line 15076) testing loop variables P:$P, Q:$Q, R:$R, S:$S ..." 1>&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 14996 "configure"
+#line 15079 "configure"
 #include "confdefs.h"
 $CHECK_DECL_HDRS
 int
@@ -15007,16 +15090,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15010: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15093: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15013: \$? = $ac_status" >&5
+  echo "$as_me:15096: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15016: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15099: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15019: \$? = $ac_status" >&5
+  echo "$as_me:15102: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_outchar="$Q OutChar($R)"
 	 cf_cv_found=yes
@@ -15035,7 +15118,7 @@
 done
 
 fi
-echo "$as_me:15038: result: $cf_cv_type_outchar" >&5
+echo "$as_me:15121: result: $cf_cv_type_outchar" >&5
 echo "${ECHO_T}$cf_cv_type_outchar" >&6
 
 case $cf_cv_type_outchar in
@@ -15067,7 +15150,7 @@
 
 ac_tr_func=`echo "$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-echo "$as_me:15070: checking for missing \"${ac_func}\" extern" >&5
+echo "$as_me:15153: checking for missing \"${ac_func}\" extern" >&5
 echo $ECHO_N "checking for missing \"${ac_func}\" extern... $ECHO_C" >&6
 if eval "test \"\${cf_cv_func_${ac_func}+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15076,7 +15159,7 @@
 cf_save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $CHECK_DECL_FLAG"
 cat >conftest.$ac_ext <<_ACEOF
-#line 15079 "configure"
+#line 15162 "configure"
 #include "confdefs.h"
 
 $CHECK_DECL_HDRS
@@ -15098,16 +15181,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15101: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15184: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15104: \$? = $ac_status" >&5
+  echo "$as_me:15187: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15107: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15190: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15110: \$? = $ac_status" >&5
+  echo "$as_me:15193: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval 'cf_cv_func_'${ac_func}'=yes'
 else
@@ -15121,7 +15204,7 @@
 fi
 
 eval 'cf_result=$cf_cv_func_'${ac_func}
-echo "$as_me:15124: result: $cf_result" >&5
+echo "$as_me:15207: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 test $cf_result = yes && cat >>confdefs.h <<EOF
 #define MISSING_EXTERN_${ac_tr_func} 1
@@ -15195,7 +15278,7 @@
 
 ac_tr_func=`echo "$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-echo "$as_me:15198: checking for missing \"${ac_func}\" extern" >&5
+echo "$as_me:15281: checking for missing \"${ac_func}\" extern" >&5
 echo $ECHO_N "checking for missing \"${ac_func}\" extern... $ECHO_C" >&6
 if eval "test \"\${cf_cv_func_${ac_func}+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15204,7 +15287,7 @@
 cf_save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $CHECK_DECL_FLAG"
 cat >conftest.$ac_ext <<_ACEOF
-#line 15207 "configure"
+#line 15290 "configure"
 #include "confdefs.h"
 
 $CHECK_DECL_HDRS
@@ -15226,16 +15309,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15229: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15312: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15232: \$? = $ac_status" >&5
+  echo "$as_me:15315: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15235: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15318: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15238: \$? = $ac_status" >&5
+  echo "$as_me:15321: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval 'cf_cv_func_'${ac_func}'=yes'
 else
@@ -15249,7 +15332,7 @@
 fi
 
 eval 'cf_result=$cf_cv_func_'${ac_func}
-echo "$as_me:15252: result: $cf_result" >&5
+echo "$as_me:15335: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 test $cf_result = yes && cat >>confdefs.h <<EOF
 #define MISSING_EXTERN_${ac_tr_func} 1
@@ -15269,7 +15352,7 @@
 
 ac_tr_func=`echo "$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-echo "$as_me:15272: checking for missing \"${ac_func}\" extern" >&5
+echo "$as_me:15355: checking for missing \"${ac_func}\" extern" >&5
 echo $ECHO_N "checking for missing \"${ac_func}\" extern... $ECHO_C" >&6
 if eval "test \"\${cf_cv_func_${ac_func}+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15278,7 +15361,7 @@
 cf_save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $CHECK_DECL_FLAG"
 cat >conftest.$ac_ext <<_ACEOF
-#line 15281 "configure"
+#line 15364 "configure"
 #include "confdefs.h"
 
 $CHECK_DECL_HDRS
@@ -15300,16 +15383,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15303: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15386: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15306: \$? = $ac_status" >&5
+  echo "$as_me:15389: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15309: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15392: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15312: \$? = $ac_status" >&5
+  echo "$as_me:15395: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval 'cf_cv_func_'${ac_func}'=yes'
 else
@@ -15323,7 +15406,7 @@
 fi
 
 eval 'cf_result=$cf_cv_func_'${ac_func}
-echo "$as_me:15326: result: $cf_result" >&5
+echo "$as_me:15409: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 test $cf_result = yes && cat >>confdefs.h <<EOF
 #define MISSING_EXTERN_${ac_tr_func} 1
@@ -15361,13 +15444,13 @@
 	cf_have_dlsym=no
 	cf_have_libdl=no
 
-	echo "$as_me:15364: checking for dlsym" >&5
+	echo "$as_me:15447: checking for dlsym" >&5
 echo $ECHO_N "checking for dlsym... $ECHO_C" >&6
 if test "${ac_cv_func_dlsym+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15370 "configure"
+#line 15453 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dlsym (); below.  */
@@ -15398,16 +15481,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15401: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15484: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15404: \$? = $ac_status" >&5
+  echo "$as_me:15487: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15407: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15490: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15410: \$? = $ac_status" >&5
+  echo "$as_me:15493: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_dlsym=yes
 else
@@ -15417,13 +15500,13 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:15420: result: $ac_cv_func_dlsym" >&5
+echo "$as_me:15503: result: $ac_cv_func_dlsym" >&5
 echo "${ECHO_T}$ac_cv_func_dlsym" >&6
 if test $ac_cv_func_dlsym = yes; then
   cf_have_dlsym=yes
 else
 
-		echo "$as_me:15426: checking for dlsym in -ldl" >&5
+		echo "$as_me:15509: checking for dlsym in -ldl" >&5
 echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6
 if test "${ac_cv_lib_dl_dlsym+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15431,7 +15514,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 15434 "configure"
+#line 15517 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15450,16 +15533,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15453: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15536: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15456: \$? = $ac_status" >&5
+  echo "$as_me:15539: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15459: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15542: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15462: \$? = $ac_status" >&5
+  echo "$as_me:15545: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dl_dlsym=yes
 else
@@ -15470,7 +15553,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15473: result: $ac_cv_lib_dl_dlsym" >&5
+echo "$as_me:15556: result: $ac_cv_lib_dl_dlsym" >&5
 echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6
 if test $ac_cv_lib_dl_dlsym = yes; then
 
@@ -15489,10 +15572,10 @@
 			cf_opt_rdynamic=no
 			cf_save_CFLAGS="$CFLAGS"
 			CFLAGS="-Wall -rdynamic $CFLAGS"
-			echo "$as_me:15492: checking if gcc has -rdynamic option" >&5
+			echo "$as_me:15575: checking if gcc has -rdynamic option" >&5
 echo $ECHO_N "checking if gcc has -rdynamic option... $ECHO_C" >&6
 			cat >conftest.$ac_ext <<_ACEOF
-#line 15495 "configure"
+#line 15578 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -15504,16 +15587,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15507: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15590: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15510: \$? = $ac_status" >&5
+  echo "$as_me:15593: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15513: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15596: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15516: \$? = $ac_status" >&5
+  echo "$as_me:15599: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_opt_rdynamic=yes
 else
@@ -15522,7 +15605,7 @@
 cf_opt_rdynamic=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-			echo "$as_me:15525: result: $cf_opt_rdynamic" >&5
+			echo "$as_me:15608: result: $cf_opt_rdynamic" >&5
 echo "${ECHO_T}$cf_opt_rdynamic" >&6
 			test "$cf_opt_rdynamic" = no && CFLAGS="$cf_save_CFLAGS"
 
@@ -15535,7 +15618,7 @@
 		fi
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 15538 "configure"
+#line 15621 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 int
@@ -15553,16 +15636,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15556: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15639: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15559: \$? = $ac_status" >&5
+  echo "$as_me:15642: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15562: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15645: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15565: \$? = $ac_status" >&5
+  echo "$as_me:15648: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 			cat >>confdefs.h <<\EOF
@@ -15573,13 +15656,13 @@
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-			{ { echo "$as_me:15576: error: Cannot link test program for libdl" >&5
+			{ { echo "$as_me:15659: error: Cannot link test program for libdl" >&5
 echo "$as_me: error: Cannot link test program for libdl" >&2;}
    { (exit 1); exit 1; }; }
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	else
-		{ { echo "$as_me:15582: error: Cannot find dlsym function" >&5
+		{ { echo "$as_me:15665: error: Cannot find dlsym function" >&5
 echo "$as_me: error: Cannot find dlsym function" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -15589,7 +15672,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:15592: checking for $ac_word" >&5
+echo "$as_me:15675: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_SPELL_PROG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15604,7 +15687,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_SPELL_PROG="$ac_prog"
-echo "$as_me:15607: found $ac_dir/$ac_word" >&5
+echo "$as_me:15690: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -15612,10 +15695,10 @@
 fi
 SPELL_PROG=$ac_cv_prog_SPELL_PROG
 if test -n "$SPELL_PROG"; then
-  echo "$as_me:15615: result: $SPELL_PROG" >&5
+  echo "$as_me:15698: result: $SPELL_PROG" >&5
 echo "${ECHO_T}$SPELL_PROG" >&6
 else
-  echo "$as_me:15618: result: no" >&5
+  echo "$as_me:15701: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -15718,7 +15801,7 @@
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:15721: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:15804: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -15894,7 +15977,7 @@
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:15897: error: ambiguous option: $1
+    { { echo "$as_me:15980: 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;}
@@ -15913,7 +15996,7 @@
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:15916: error: unrecognized option: $1
+  -*) { { echo "$as_me:15999: 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;}
@@ -15971,7 +16054,7 @@
   "filters/makefile.tmp" ) CONFIG_FILES="$CONFIG_FILES filters/makefile.tmp:filters/makefile.2nd" ;;
   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h:config_h.in" ;;
-  *) { { echo "$as_me:15974: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:16057: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -16236,7 +16319,7 @@
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:16239: creating $ac_file" >&5
+    { echo "$as_me:16322: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -16254,7 +16337,7 @@
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:16257: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:16340: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -16267,7 +16350,7 @@
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:16270: error: cannot find input file: $f" >&5
+           { { echo "$as_me:16353: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -16333,7 +16416,7 @@
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:16336: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:16419: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -16344,7 +16427,7 @@
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:16347: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:16430: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -16357,7 +16440,7 @@
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:16360: error: cannot find input file: $f" >&5
+           { { echo "$as_me:16443: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -16415,7 +16498,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:16418: $ac_file is unchanged" >&5
+      { echo "$as_me:16501: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
Index: configure.in
Prereq:  1.203 
--- vile-9.4d+/configure.in	2003-11-12 18:54:19.000000000 -0500
+++ vile-9.4e/configure.in	2004-03-17 18:50:30.000000000 -0500
@@ -1,12 +1,12 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_REVISION($Revision: 1.203 $)
+AC_REVISION($Revision: 1.204 $)
 AC_PREREQ(2.13.20020210)
 rm -f config.cache
 
 ### Use "configure -with-screen" to override the default configuration, which is
 ### termcap-based on unix systems.
 
-dnl $Header: /usr/build/vile/vile/RCS/configure.in,v 1.203 2003/11/12 23:54:19 tom Exp $
+dnl $Header: /usr/build/vile/vile/RCS/configure.in,v 1.204 2004/03/17 23:50:30 tom Exp $
 
 define(MAKELIST, sh $srcdir/filters/makelist.sh $srcdir/filters/genmake.mak)
 
@@ -169,6 +169,8 @@
 	VILE_EXTERNAL_FILTERS=none
 else
 	complete=`MAKELIST lc all`
+	builtins=`MAKELIST lc "$VILE_BUILT_IN_FILTERS"`
+	loadable=`MAKELIST lc "$VILE_LOADABLE_FILTERS"`
 	VILE_EXTERNAL_FILTERS=
 	for cf_a in $complete
 	do
Index: dirstuff.h
Prereq:  1.24 
--- vile-9.4d+/dirstuff.h	2002-10-09 15:43:50.000000000 -0400
+++ vile-9.4e/dirstuff.h	2004-03-20 06:45:00.000000000 -0500
@@ -4,7 +4,7 @@
  *	Definitions to interface to unix-like DIRECTORY(3) procedures.
  *	Include this after "estruct.h"
  *
- * $Header: /usr/build/vile/vile/RCS/dirstuff.h,v 1.24 2002/10/09 19:43:50 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/dirstuff.h,v 1.25 2004/03/20 11:45:00 tom Exp $
  *
  */
 
@@ -23,7 +23,7 @@
 #define USE_D_NAMLEN 1
 #endif
 
-#if _POSIX_VERSION || defined(HAVE_DIRENT_H) || CC_TURBO || CC_WATCOM || CC_DJGPP || SYS_OS2
+#if (defined(_POSIX_VERSION) && _POSIX_VERSION) || defined(HAVE_DIRENT_H) || CC_TURBO || CC_WATCOM || CC_DJGPP || SYS_OS2
 # if CC_WATCOM || CC_CSETPP
 #   include <direct.h>
 # else
Index: display.c
Prereq:  1.383 
--- vile-9.4d+/display.c	2003-11-12 17:08:56.000000000 -0500
+++ vile-9.4e/display.c	2004-03-21 17:21:11.000000000 -0500
@@ -5,7 +5,7 @@
  * functions use hints that are left in the windows by the commands.
  *
  *
- * $Header: /usr/build/vile/vile/RCS/display.c,v 1.383 2003/11/12 22:08:56 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/display.c,v 1.385 2004/03/21 22:21:11 tom Exp $
  *
  */
 
@@ -2480,7 +2480,7 @@
 	if (b_val(bp, mode)) PutModename("%c%s", name)
 
 #if OPT_MAJORMODE
-#define PutMajormode(bp) if (bp->majr != 0) PutModename("%c%smode", bp->majr->name)
+#define PutMajormode(bp) if (bp->majr != 0) PutModename("%c%s", bp->majr->longname)
 #else
 #define PutMajormode(bp)	/*nothing */
 #endif
@@ -2769,6 +2769,20 @@
 		break;
 
 #endif
+#ifdef WMDSHOWCHAR
+	    case 'C':
+		if (w_val(wp, WMDSHOWCHAR) && !is_empty_buf(wp->w_bufp)) {
+		    int curchar = (is_at_end_of_line(wp->w_dot)
+				   ? '\n'
+				   : char_at(wp->w_dot));
+		    sprintf(temp, "%02X", curchar);
+		    mlfs_prefix(&fs, &ms, lchar);
+		    ms = lsprintf(ms, "%s", temp);
+		    mlfs_suffix(&fs, &ms, lchar);
+		} else
+		    mlfs_skipfix(&fs);
+		break;
+#endif
 	    case 'P':
 		ms = lsprintf(ms, "%d", percentage(wp));
 		break;
@@ -3363,6 +3377,10 @@
 		wp->w_ruler_col = col;
 		wp->w_flag |= WFMODE;
 	    }
+#ifdef WMDSHOWCHAR
+	} else if (w_val(wp, WMDSHOWCHAR)) {
+	    wp->w_flag |= WFMODE;
+#endif
 	} else if (wp->w_flag & WFSTAT) {
 	    wp->w_flag |= WFMODE;
 	}
Index: doc/modes.doc
Prereq:  1.11 
--- vile-9.4d+/doc/modes.doc	2002-10-22 19:52:39.000000000 -0400
+++ vile-9.4e/doc/modes.doc	2004-03-18 15:47:56.000000000 -0500
@@ -8,14 +8,14 @@
 modes in vile.  My goal is to extend the notion of the C mode (cmode)
 to allow runtime definable major modes.
 
-The C mode is a collection of modes that are useful for editing C
-program source:
+Originally, vile supported a C mode that included a collection of modes
+useful for editing C program source:
 
 	c-suffixes
 	c-tabstop
 	c-shiftwidth
 
-as well as builtin functionality:
+as well as this builtin functionality:
 
 	autoindention of C statements taking into account curly braces
 	fence matching for /*...*/ comments and C preprocessor statements
@@ -28,21 +28,20 @@
 initial implementation, I am focusing on the combining of modes,
 providing a structure for the parameterization.
 
-One thing that is not clear to many users (and possibly should be
-changed) is the manner in which the C mode is attached to a buffer. 
-It is currently set as a boolean - if active before a buffer is
-loaded, then vile checks the file suffix to see if it matches the
-c-suffixes mode, and if so, sets the C mode for the buffer.  C mode
-can be explicitly set by a ":setl cmode", and unset by ":setl
+One thing that was not clear to many users was the manner in which the C
+mode was attached to a buffer.  It was set as a boolean - if active before
+a buffer was loaded, then vile checked the file suffix to see if it matched
+the c-suffixes mode, and if so, set the C mode for the buffer.  C mode
+could also be explicitly set by a ":setl cmode", and unset by ":setl
 nocmode".  In the new scheme,
 
 	+ vile will search the list of all active majormodes, first
 	  testing if any match with the majormode's suffixes, then if
 	  any preamble (first line regular expression) matches.
 
-	  The search is in normally alphabetic order, by majormode name. 
+	  The search is in normally alphabetic order, by majormode name.
 	  The first match each, of suffixes and preamble terminate the
-	  search, but a match of preamble overrides a match of suffixes. 
+	  search, but a match of preamble overrides a match of suffixes.
 	  Use "after" and "before" qualifiers to handle special cases.
 
 	  In rare circumstances, both suffixes and preamble are needed to
@@ -74,6 +73,10 @@
 
 	remove-submode {majormode} {minormode}
 
+	setl {majormode}
+
+	setl no{majormode}
+
 The {majormode} is a new symbol.
 
 The {minormode} can be any one of the existing buffer modes, except for
@@ -160,9 +163,6 @@
 	define-majormode c
 	; defines "cmode"
 
-	set cmode
-	; sets the default mode for new buffers
-
 	setl cmode
 	; sets the mode for the current buffer
 
@@ -198,8 +198,20 @@
 
 	define-submode c autoindent
 
-The majormode name is required.  Any number of modes can be modified
-in a single command.
+The majormode name is required.  The names after the majormode name are
+names of buffer modes with a corresponding value.  Any number of modes
+can be specified in a single command, e.g.,
+
+	define-submode c autoindent tabstop=4
+
+For each mode given, vile defines corresponding names by which they can
+be referenced, e.g., "c-autoindent" (from the long mode name
+"autoindent") and "cai" (from the short mode name "ai" for autoindent). 
+The long mode name is always appended with a hyphen, and the short mode
+name is appended without a hyphen.
+
+The term "submode" is used in the command rather than the more natural
+"minor mode" to simplify name-completion.
 
 The following are keywords that aren't minor modes, but are recognized
 solely by the define-submode command:
@@ -233,7 +245,7 @@
 		and options include:
 
 			-k mode
-				The keyword filename, omitting ".keywords". 
+				The keyword filename, omitting ".keywords".
 				For instance, the C filter vile-c-filt is used
 				for C, C++, JavaScript and Java by changing the
 				keyword file.
@@ -256,7 +268,7 @@
 
 	before
 	after
-		A string that tells vile how to rank the majormode. 
+		A string that tells vile how to rank the majormode.
 		Normally vile checks each mode in order by name, but there
 		are special cases where you may want to check one mode
 		before another.  For example, the C++ majormode cppmode
@@ -267,7 +279,7 @@
 	group
 		followed by a name, defines an alternative set of submode
 		values.
-		
+
 		Currently used only for complex fences, this could be applied
 		to simple fences, and (with new flags not yet defined) extend
 		both styles of fences for indentation and formatting.
@@ -276,7 +288,7 @@
 		These are "complex" fences, which are matched one expression
 		per line.  The names are "fence-" followed by any of the
 		following keywords with a regular expression:
-		
+
 			if, elif, else, fi
 
 		Vile searches through all groups of complex fences for a
@@ -322,10 +334,11 @@
 
 Remove the special association of a submode from a majormode.
 
+
 Example
 -------
 
-The builtin C/C++ majormode description is equivalent to
+The original builtin C/C++ majormode description is equivalent to
 
 define-mode c
 ~with define-submode c
@@ -347,5 +360,5 @@
 	define-submode c tabstop=8
 
 -------------------------------
-$Header: /usr/build/vile/vile/doc/RCS/modes.doc,v 1.11 2002/10/22 23:52:39 tom Exp $
+$Header: /usr/build/vile/vile/doc/RCS/modes.doc,v 1.13 2004/03/18 20:47:56 tom Exp $
 -------------------------------
Index: estruct.h
Prereq:  1.539 
--- vile-9.4d+/estruct.h	2003-11-11 20:51:14.000000000 -0500
+++ vile-9.4e/estruct.h	2004-03-20 06:48:24.000000000 -0500
@@ -12,7 +12,7 @@
 */
 
 /*
- * $Header: /usr/build/vile/vile/RCS/estruct.h,v 1.539 2003/11/12 01:51:14 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/estruct.h,v 1.541 2004/03/20 11:48:24 tom Exp $
  */
 
 #ifndef _estruct_h
@@ -551,7 +551,7 @@
 /* the "working..." message -- we must have the alarm() syscall, and
    system calls must be restartable after an interrupt by default or be
    made restartable with sigaction() */
-#define OPT_WORKING (!SMALLER && HAVE_ALARM && HAVE_RESTARTABLE_PIPEREAD)
+#define OPT_WORKING (!SMALLER && defined(HAVE_ALARM) && defined(HAVE_RESTARTABLE_PIPEREAD))
 
 #define OPT_SCROLLBARS (XTOOLKIT | DISP_NTWIN)	/* scrollbars */
 
@@ -1940,13 +1940,14 @@
 } MINORMODE;
 
 typedef struct {
-	char *name;
+	char *shortname;	/* name without "mode" suffix */
+	char *longname;		/* name with "mode" suffix */
 	M_VALUES mm;
 	Q_VALUES mq;
 	MINORMODE *sm;
 } MAJORMODE;
 
-#define is_c_mode(bp) (bp->majr != 0 && !strcmp(bp->majr->name, "c"))
+#define is_c_mode(bp) (bp->majr != 0 && !strcmp(bp->majr->shortname, "c"))
 #define fix_cmode(bp,value)	/* nothing */
 #define for_each_modegroup(bp,n,m,vals) \
 	for (vals = get_submode_vals(bp, n = m); vals != 0; vals = get_submode_valx(bp, m, &n))
Index: exec.c
Prereq:  1.259 
--- vile-9.4d+/exec.c	2003-06-21 10:59:47.000000000 -0400
+++ vile-9.4e/exec.c	2004-03-21 12:25:43.000000000 -0500
@@ -4,7 +4,7 @@
  *	original by Daniel Lawrence, but
  *	much modified since then.  assign no blame to him.  -pgf
  *
- * $Header: /usr/build/vile/vile/RCS/exec.c,v 1.259 2003/06/21 14:59:47 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/exec.c,v 1.260 2004/03/21 17:25:43 tom Exp $
  *
  */
 
@@ -1159,8 +1159,12 @@
 mac_tokval(TBUFF ** tok)
 {
     if (mac_token(tok) != 0) {
+	char *previous = tb_values(*tok);
+	const char *newvalue = tokval(previous);
 	/* evaluate the token */
-	(void) tb_scopy(tok, tokval(tb_values(*tok)));
+	if ((const char *) previous != newvalue) {
+	    (void) tb_scopy(tok, newvalue);
+	}
 	return (tb_values(*tok));
     }
     tb_free(tok);
Index: filters/filters.rc
Prereq:  1.178 
--- vile-9.4d+/filters/filters.rc	2003-11-02 16:11:48.000000000 -0500
+++ vile-9.4e/filters/filters.rc	2004-03-18 19:37:48.000000000 -0500
@@ -1,4 +1,4 @@
-; $Id: filters.rc,v 1.178 2003/11/02 21:11:48 tom Exp $
+; $Id: filters.rc,v 1.180 2004/03/19 00:37:48 tom Exp $
 ; majormodes in this file are ordered alphabetically for convenience - the
 ; precedence used by vile is strictly alphabetic, counting case.
 
@@ -37,7 +37,7 @@
 define-mode awk
 ~with define-submode awk
 	suf '\.awk$'
-	pre '^#!\s*\/.*awk\>\(\s*-[a-z]\+\)*\s*$'
+	pre '^#!\s*\/.*awk\>\(\s*-[\a]\+\)*\s*$'
 	cindent
 	cindent-chars $fences
 	comment-prefix '^\s*#'
@@ -82,7 +82,7 @@
 define-mode csh
 ~with define-submode csh
 	suf '\.\(csh[^/]*\|login\|logout\)$'
-	pre '^#!\s*\/.*csh\>\(\s*-[a-z]\+\)*\s*$'
+	pre '^#!\s*\/.*csh\>\(\s*-[\a]\+\)*\s*$'
 	filtername	'vile-sh-filt -k csh'
 	comment-prefix	'^\s*#'
 	comments	'^\s*#\s*$'
@@ -238,7 +238,7 @@
 
 define-mode js
 ~with define-submode js
-	suf '\.js$'
+	suf '\.\(js\|jsp\)$'
 	filtername 'vile-c-filt -p -k js'
 	cindent
 	cindent-chars &cat ':' $fences
@@ -410,7 +410,7 @@
 ; Python
 define-mode py
 ~with define-submode py
-	pre '^#\s*!\s*\.*\/.*python\>'
+	pre '^\(\(#!\s*\/.*python[\d_.-]*\>\(\s*[-]\+[\a]*\s*\)\?\)\|:\)\s*$'
 	suf '\.py$'
 	comment-prefix '^\s*#'
 	comments   '^\s*#\s\+\s*$'
@@ -476,7 +476,7 @@
 define-mode sed
 ~with define-submode sed
 	suf '\(sed\)$'
-	pre '^#!\s*\/sed\>\(\s*-[a-z]*\s*\)\*\s*$'
+	pre '^#!\s*\/sed\>\(\s*-[\a]*\s*\)\*\s*$'
 	comment-prefix	'^\s*#'
 	comments	'^\s*#\s*$'
 ~endwith
@@ -485,7 +485,7 @@
 define-mode sh
 ~with define-submode sh
 	suf '\(\.\(sh\|ksh\|[^/]*rc\)$\|profile$\|\.bash_[a-z]\+$\)'
-	pre '^\(\(#!\s*\/.*sh\>\(\s*[-]\+[a-z]*\s*\)\?\)\|:\)\s*$'
+	pre '^\(\(#!\s*\/.*sh\>\(\s*[-]\+[\a]*\s*\)\?\)\|:\)\s*$'
 	comment-prefix	'^\s*[:#]'
 	comments	'^\s*[:#]\s*$'
 	fence-if   '^\s*\<if\>'
@@ -558,7 +558,7 @@
 ~with define-submode tcl
 	before "sh"
 	suf '\.\(tcl\|exp\)$'
-	pre '^#!\s*\/.*\(wish\|wishx\|tclsh\|tcl\|expectk\)[0-9.]*\>\(\s*-[a-z]\+\)*\s*$'
+	pre '^#!\s*\/.*\(wish\|wishx\|tclsh\|tcl\|expectk\)[0-9.]*\>\(\s*-[\a]\+\)*\s*$'
 	comment-prefix	'^\s*[:#]'
 	comments	'^\s*[:#]\s*$'
 ~endwith
@@ -732,7 +732,14 @@
 
 store-procedure set-highlighting ma 'Set a majormode and invoke highlighting'
 	; show-variables
-	write-message &cat $1 mode
-	~force setl &cat $1 mode
+	~if &seq 'mode' &right $1 &sub &len $1 3
+		; 9.4e
+		write-message $1
+		~force setl $1
+	~else
+		; pre-9.4e
+		write-message &cat $1 mode
+		~force setl &cat $1 mode
+	~endif
 	HighlightFilter
 ~endm
Index: filters/html.key
Prereq:  1.6 
--- vile-9.4d+/filters/html.key	1999-08-05 18:51:55.000000000 -0400
+++ vile-9.4e/filters/html.key	2004-03-19 18:50:22.000000000 -0500
@@ -1,100 +1,148 @@
-: $Id: html.key,v 1.6 1999/08/05 22:51:55 tom Exp $
+: $Id: html.key,v 1.8 2004/03/19 23:50:22 tom Exp $
+: <!ELEMENT>
 a
-action
-add_date
 address
-align
-alink
-alt
 applet
 area
-b
-background
 base
 basefont
-bgcolor
-big
-blink
+bdo
 blockquote
 body
-border
-bottom
 br
+button
 caption
 center
-cite
-code
-color
-cols
-colspan
+col
+colgroup
 dd
-dfn
+del
 dir
 div
 dl
 dt
-em
+fieldset
 font
 form
-h1
-h2
-h3
-h4
-h5
-h6
+frame
+frameset
 head
-height
 hr
-href
 html
-i
+iframe
 img
 input
+ins
 isindex
-kbd
-left
+label
+legend
 li
 link
 map
 menu
 meta
-method
-middle
-name
-noshade
+noframes
+noscript
+object
 ol
+optgroup
 option
 p
 param
 pre
-rev
-right
-rows
-rowspan
-samp
+q
 select
-size
-small
 span
-src
-strike
-strong
+style
 sub
 sup
 table
+tbody
 td
-text
 textarea
+tfoot
 th
+thead
 title
-top
 tr
+ul
+: <!ENTITY>
+abbr
+acronym
+apl
+b
+checkbox
+cite
+code
+dfn
+dtd
+file
+fixed
+form
+h1
+h2
+h3
+h4
+h5
+h6
+hidden
+html
+i
+ignore
+image
+include
+password
+public
+radio
+reset
+s
+samp
+small
+span
+strike
+strong
+style
+sub
+submit
+sup
+text
 tt
+u
+var
+: other (values)
+action
+add_date
+align
+alink
+alt
+background
+bgcolor
+big
+blink
+border
+bottom
+color
+cols
+colspan
+em
+height
+href
+kbd
+left
+method
+middle
+name
+noshade
+rev
+right
+rows
+rowspan
+size
+src
+top
 type
-ul
 valign
 value
-var
 vlink
 width
 xmp
Index: filters/htmlfilt.l
Prereq:  1.29 
--- vile-9.4d+/filters/htmlfilt.l	2003-05-20 16:38:41.000000000 -0400
+++ vile-9.4e/filters/htmlfilt.l	2004-03-19 18:20:26.000000000 -0500
@@ -2,7 +2,7 @@
 
 %{
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/htmlfilt.l,v 1.29 2003/05/20 20:38:41 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/htmlfilt.l,v 1.30 2004/03/19 23:20:26 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of HTML input
  * text.
@@ -90,7 +90,7 @@
     if (change) {
 	set_symbol_table(filter_def.filter_name);
     }
-    flt_puts(text, strlen(text), keyword_attr(temp));
+    flt_puts(text, strlen(text), ci_keyword_attr(temp));
 
     if (change) {
      	if (ending) {
Index: filters/imakeflt.l
Prereq:  1.9 
--- vile-9.4d+/filters/imakeflt.l	2003-05-23 20:49:25.000000000 -0400
+++ vile-9.4e/filters/imakeflt.l	2004-03-18 19:14:41.000000000 -0500
@@ -3,7 +3,7 @@
 %{
 
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/imakeflt.l,v 1.9 2003/05/24 00:49:25 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/imakeflt.l,v 1.10 2004/03/19 00:14:41 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of Imakefile
  *
@@ -25,7 +25,7 @@
 
 static int preprocessor(char *text, int size);
 static void missing_quote(char *text, int length);
-static void write_delimited(char *text, int size, char *attr);
+static void write_delimited(char *text, int size, char *attr, int first);
 static void write_keyword(char *text, int size, int prepro, int caseless);
 
 %}
@@ -49,9 +49,9 @@
 
 <NORMAL>^{SPACE}*[\.]{NAME}{SPACE}*:[:]? { write_keyword(yytext, yyleng, 0, 0); }
 
-<NORMAL>^({SPACE}*{NAME}{SPACE}*|\\\n)+: { write_delimited(yytext, yyleng, Keyword_attr); }
+<NORMAL>^({SPACE}*{NAME}{SPACE}*|\\\n)+: { write_delimited(yytext, yyleng, Keyword_attr, 1); }
 
-<NORMAL>^{SPACE}*{NAME}{SPACE}*{OPER}	{ write_delimited(yytext, yyleng, Ident2_attr); }
+<NORMAL>^{SPACE}*{NAME}{SPACE}*{OPER}	{ write_delimited(yytext, yyleng, Ident2_attr, 0); }
 
 <NORMAL>{MACRO}			{ WriteToken(Ident2_attr); }
 
@@ -241,25 +241,24 @@
 
     panchor = pwhite = text;
     while (isspace(CharOf(*pwhite))) {
-        pwhite++;
+	pwhite++;
     }
     if (pwhite > panchor)
-        flt_puts(panchor, pwhite - panchor, *gaps);
+	flt_puts(panchor, pwhite - panchor, *gaps);
     panchor = ptoken = pwhite;
     while (*ptoken && (! isspace(CharOf(*ptoken))))
-        ptoken++;
+	ptoken++;
     flt_puts(panchor, ptoken - panchor, *attr);
-    if (isspace(CharOf(*ptoken)))
-    {
-        panchor = ptoken;
-        pwhite  = ptoken + 1;  /* advance beyond initial white space byte */
-        while (isspace(CharOf(*pwhite)))
-            pwhite++;
-        flt_puts(panchor, pwhite - panchor, *gaps);
-        pnxt_unit = pwhite;
+    if (isspace(CharOf(*ptoken))) {
+	panchor = ptoken;
+	pwhite	= ptoken + 1;  /* advance beyond initial white space byte */
+	while (isspace(CharOf(*pwhite)))
+	    pwhite++;
+	flt_puts(panchor, pwhite - panchor, *gaps);
+	pnxt_unit = pwhite;
+    } else {
+	pnxt_unit = ptoken;
     }
-    else
-        pnxt_unit = ptoken;
     return (pnxt_unit);
 }
 
@@ -269,23 +268,44 @@
  *    ([<white>]<token>[<white>]|\\\n)+<single delimiter>
  */
 static void
-write_delimited(char *text, int size, char *attr)
+write_delimited(char *text, int size, char *attr, int first)
 {
     char *cp, delim[2];
     char *gaps = "";
 
+    /*
+     * Workaround for special case of XCOMM line containing a colon.
+     */
+    if (first) {
+	char *temp = skip_blanks(text);
+	char *test = skip_ident(temp);
+	int save = *test;
+	int same;
+
+	*test = '\0';
+	same = (keyword_attr(temp) == Comment_attr);
+	*test = save;
+
+	if ((test - temp == 5) && same) {
+	    BEGIN(COMMENT);	/* BeginQuote(COMMENT) */
+	    flt_bfr_begin(Comment_attr);
+	    flt_bfr_append(text, size);
+	    return;
+	}
+    }
+
     delim[0] = text[size - 1];         /* save the trailing delimiter */
     delim[1] = text[size - 1] = '\0';  /* chop the trailing delimiter */
     cp       = text;
     do
     {
-        if (*cp == '\\' && cp[1] == '\n')
-        {
-            flt_puts(cp, 2, gaps);
-            cp += 2;
-        }
-        else
-            cp = write_delimited_unit(cp, &attr, &gaps);
+	if (*cp == '\\' && cp[1] == '\n')
+	{
+	    flt_puts(cp, 2, gaps);
+	    cp += 2;
+	}
+	else
+	    cp = write_delimited_unit(cp, &attr, &gaps);
     }
     while (*cp);
 
Index: filters/makelist.sh
Prereq:  1.3 
--- vile-9.4d+/filters/makelist.sh	2003-11-02 17:24:50.000000000 -0500
+++ vile-9.4e/filters/makelist.sh	2004-03-17 19:23:12.000000000 -0500
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Header: /usr/build/vile/vile/filters/RCS/makelist.sh,v 1.3 2003/11/02 22:24:50 tom Exp $
+# $Header: /usr/build/vile/vile/filters/RCS/makelist.sh,v 1.4 2004/03/18 00:23:12 tom Exp $
 #
 # Make a list of the names for the specified syntax filters, for the configure
 # script, etc.
@@ -59,10 +59,7 @@
 				done
 				if test "$found" = no ; then
 					echo "no such filter: $j" >&2
-					echo "."
-					exit 1
-				fi
-				if test -n "$key" ; then
+				elif test -n "$key" ; then
 					key="$key
 $j"
 				else
Index: filters/mk-0th.awk
Prereq:  1.7 
--- vile-9.4d+/filters/mk-0th.awk	2003-11-02 17:22:24.000000000 -0500
+++ vile-9.4e/filters/mk-0th.awk	2004-03-17 19:01:17.000000000 -0500
@@ -1,4 +1,4 @@
-# $Header: /usr/build/vile/vile/filters/RCS/mk-0th.awk,v 1.7 2003/11/02 22:22:24 tom Exp $
+# $Header: /usr/build/vile/vile/filters/RCS/mk-0th.awk,v 1.8 2004/03/18 00:01:17 tom Exp $
 # Construct the header file "builtflt.h".
 BEGIN	{
 	    print "/* Generated by filters/mk-0th.awk */"
@@ -11,8 +11,8 @@
 	    # command-line parameters aren't available until we're matching
 	    if (first == 1) {
 		# printf "splitting lists\n";
-		numInt = split(static,listInt,/,/)
-		numExt = split(dynamic,listExt,/,/)
+		numInt = split(static,listInt,/[, ]/)
+		numExt = split(dynamic,listExt,/[, ]/)
 		first = 0;
 	    }
 	    if ( NF >= 2 ) {
Index: filters/mk-1st.awk
Prereq:  1.10 
--- vile-9.4d+/filters/mk-1st.awk	2003-11-05 19:38:29.000000000 -0500
+++ vile-9.4e/filters/mk-1st.awk	2004-03-17 17:57:27.000000000 -0500
@@ -1,4 +1,4 @@
-# $Header: /usr/build/vile/vile/filters/RCS/mk-1st.awk,v 1.10 2003/11/06 00:38:29 tom Exp $
+# $Header: /usr/build/vile/vile/filters/RCS/mk-1st.awk,v 1.11 2004/03/17 22:57:27 tom Exp $
 #
 # Generate makefile lists for vile's external and built-in filters.  We will
 # build each filter only one way (external _or_ built-in).  This script uses
@@ -24,7 +24,7 @@
 	!/^#/ {
 	    # command-line parameters aren't available until we're matching
 	    if (first == 1) {
-		Len = split(list,List,/,/)
+		Len = split(list,List,/[, ]/)
 		if (mode == "loadable") {
 		    suffix = "$(so)";
 		} else {
Index: filters/mk-2nd.awk
Prereq:  1.12 
--- vile-9.4d+/filters/mk-2nd.awk	2003-11-05 19:38:42.000000000 -0500
+++ vile-9.4e/filters/mk-2nd.awk	2004-03-17 18:54:16.000000000 -0500
@@ -1,4 +1,4 @@
-# $Header: /usr/build/vile/vile/filters/RCS/mk-2nd.awk,v 1.12 2003/11/06 00:38:42 tom Exp $
+# $Header: /usr/build/vile/vile/filters/RCS/mk-2nd.awk,v 1.13 2004/03/17 23:54:16 tom Exp $
 #
 # Generate makefile rules for vile's external and built-in filters.  We will
 # build each filter only one way, to avoid conflict with the generated files. 
@@ -13,7 +13,7 @@
 	!/^#/ {
 	    # command-line parameters aren't available until we're matching
 	    if (first == 1) {
-		Len = split(list,List,/,/)
+		Len = split(list,List,/[, ]/)
 		if (mode == "loadable") {
 		    suffix = "$(so)";
 		} else {
Index: filters/txt-filt.l
Prereq:  1.16 
--- vile-9.4d+/filters/txt-filt.l	2003-05-20 16:38:41.000000000 -0400
+++ vile-9.4e/filters/txt-filt.l	2004-03-21 10:08:31.000000000 -0500
@@ -3,7 +3,7 @@
 %{
 
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/txt-filt.l,v 1.16 2003/05/20 20:38:41 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/txt-filt.l,v 1.17 2004/03/21 15:08:31 tom Exp $
  *
  * Filter to add vile "attribution" sequences to an ordinary text file
  */
@@ -22,7 +22,7 @@
 
 %}
 
-COMMENT		^-[-]+[ \t]+[^\n]+\n
+COMMENT		(^(-[-]+[ \t]+[^\n]+))|([ \t]*-[ \t-]*)\n
 
 KEYWORD		([a-zA-Z_][a-zA-Z0-9_.]*|[A-Z][+/&][A-Z])
 
Index: input.c
Prereq:  1.261 
--- vile-9.4d+/input.c	2003-07-27 15:06:52.000000000 -0400
+++ vile-9.4e/input.c	2004-03-21 13:27:20.000000000 -0500
@@ -44,7 +44,7 @@
  *	tgetc_avail()     true if a key is avail from tgetc() or below.
  *	keystroke_avail() true if a key is avail from keystroke() or below.
  *
- * $Header: /usr/build/vile/vile/RCS/input.c,v 1.261 2003/07/27 19:06:52 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/input.c,v 1.262 2004/03/21 18:27:20 tom Exp $
  *
  */
 
@@ -1228,7 +1228,7 @@
     const CMDFUNC *cfp = ((miniedit)
 			  ? CommandKeyBinding(c)
 			  : InsertKeyBinding(c));
-    return ((c == editc) || ((cfp != 0) && isMiniMotion(cfp->c_flags)));
+    return ((c == editc) || miniedit || ((cfp != 0) && isMiniMotion(cfp->c_flags)));
 }
 
 /*
@@ -1379,14 +1379,18 @@
 	edited = editMinibuffer(buf, cpos, fakeKeyCode(&f_forwchar_to_eol),
 				margin, quoted);
 	miniedit = FALSE;
+    } else if (isSpecial(c) || (miniedit && (cfp != 0))) {
 	/*
 	 * Reject other non-motion commands for now.  We haven't a good way to
 	 * update the minibuffer if someone inserts a newline, so we couldn't
 	 * implement insert except as a special case (see above).
 	 */
-    } else if (isSpecial(c) || (miniedit && (cfp != 0))) {
 	kbd_alarm();
     } else {
+	/*
+	 * If it is not a command, drop out of miniedit mode and append the
+	 * character to the buffer.
+	 */
 	LINE *lp = DOT.l;
 	miniedit = FALSE;
 	if (!vl_echo || qpasswd) {
Index: isearch.c
Prereq:  1.58 
--- vile-9.4d+/isearch.c	2003-05-25 19:34:52.000000000 -0400
+++ vile-9.4e/isearch.c	2004-03-21 12:18:05.000000000 -0500
@@ -7,7 +7,7 @@
  *
  * original author: D. R. Banks 9-May-86
  *
- * $Header: /usr/build/vile/vile/RCS/isearch.c,v 1.58 2003/05/25 23:34:52 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/isearch.c,v 1.59 2004/03/21 17:18:05 tom Exp $
  *
  */
 
@@ -80,7 +80,9 @@
 static void
 unget_char(void)
 {
-    cmd_buff->itb_used -= 2;	/* remove Rubout and last char */
+    if (cmd_buff != 0
+	&& cmd_buff->itb_used >= 2)
+	cmd_buff->itb_used -= 2;	/* remove Rubout and last char */
 }
 
 /*
@@ -196,6 +198,8 @@
 	if (status != TRUE)
 	    DOT = curp;
 	c = kcod2key(get_char());	/* Get another character */
+    } else {
+	tb_init(&searchpat, EOS);
     }
     /* Top of the per character loop */
 
@@ -231,7 +235,6 @@
 	    if (status != TRUE)
 		DOT = curp;
 	    c = kcod2key(get_char());	/* Get the next char */
-	    unget_char();
 	    continue;		/* Go continue with the search */
 
 	case '\t':		/* Generically allowed */
@@ -252,8 +255,8 @@
 	    /* Presumably a quasi-normal character comes here */
 
 	default:		/* All other chars */
-	    if (c < ' ') {	/* Is it printable? *//* Nop
-				   * e. */
+	    if (!isPrint(c)) {	/* Is it printable? */
+		/* Nope. */
 		unkeystroke(c);	/* Re-eat the char */
 		return (TRUE);	/* And return the last status */
 	    }
Index: main.c
Prereq:  1.513 
--- vile-9.4d+/main.c	2003-11-12 16:09:39.000000000 -0500
+++ vile-9.4e/main.c	2004-03-21 17:43:36.000000000 -0500
@@ -22,7 +22,7 @@
  */
 
 /*
- * $Header: /usr/build/vile/vile/RCS/main.c,v 1.513 2003/11/12 21:09:39 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/main.c,v 1.515 2004/03/21 22:43:36 tom Exp $
  */
 
 #define realdef			/* Make global definitions not external */
@@ -1014,6 +1014,8 @@
 #define DFT_CSUFFIX "\\.\\(\\([CchisS]\\)\\|CC\\|cc\\|cpp\\|cxx\\|hxx\\|scm\\)$"
 #endif
 
+#define DFT_STRIPSUFFIX "\\(\\.orig\\|~\\)$"
+
 #define DFT_FENCE_CHARS "{}()[]"
 #define DFT_CINDENT_CHARS ":#" DFT_FENCE_CHARS
 
@@ -1225,12 +1227,18 @@
 #ifdef VAL_AUTOCOLOR
 	    setINT(VAL_AUTOCOLOR, 0);	/* auto syntax coloring timeout */
 #endif
-#ifdef VAL_HILITEMATCH
-	    setINT(VAL_HILITEMATCH, 0);		/* no hilite */
+#ifdef VAL_C_SWIDTH
+	    setINT(VAL_C_SWIDTH, 8);	/* C file shiftwidth */
+#endif
+#ifdef VAL_C_TAB
+	    setINT(VAL_C_TAB, 8);	/* C file tab stop */
 #endif
 #ifdef VAL_FENCE_LIMIT
 	    setINT(VAL_FENCE_LIMIT, 10);	/* fences iteration timeout */
 #endif
+#ifdef VAL_HILITEMATCH
+	    setINT(VAL_HILITEMATCH, 0);		/* no hilite */
+#endif
 #ifdef VAL_LOCKER
 	    setTXT(VAL_LOCKER, "");	/* Name locker */
 #endif
@@ -1240,11 +1248,8 @@
 #ifdef VAL_RECORD_LENGTH
 	    setINT(VAL_RECORD_LENGTH, 0);
 #endif
-#ifdef VAL_C_SWIDTH
-	    setINT(VAL_C_SWIDTH, 8);	/* C file shiftwidth */
-#endif
-#ifdef VAL_C_TAB
-	    setINT(VAL_C_TAB, 8);	/* C file tab stop */
+#ifdef VAL_STRIPSUFFIX
+	    setPAT(VAL_STRIPSUFFIX, DFT_STRIPSUFFIX);
 #endif
 	default:
 	    setIntValue(d, 0);
@@ -1312,7 +1317,7 @@
 #endif
 
 #define DFT_MLFORMAT \
-"%-%i%- %b %m:: :%f:is : :%=%F: : :%l:(:,:%c::) :%p::% :%S%-%-%|"
+"%-%i%- %b %m:: :%f:is : :%=%F: : :%l:(:,:%c::) :%p::% :%C:char ::%S%-%-%|"
 
 #define DFT_POSFORMAT \
 "Line %{$curline}d of %{$blines}d,\
Index: modes.c
Prereq:  1.264 
--- vile-9.4d+/modes.c	2003-11-02 20:33:20.000000000 -0500
+++ vile-9.4e/modes.c	2004-03-21 18:59:08.000000000 -0500
@@ -7,7 +7,7 @@
  * Major extensions for vile by Paul Fox, 1991
  * Majormode extensions for vile by T.E.Dickey, 1997
  *
- * $Header: /usr/build/vile/vile/RCS/modes.c,v 1.264 2003/11/03 01:33:20 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/modes.c,v 1.269 2004/03/21 23:59:08 tom Exp $
  *
  */
 
@@ -43,7 +43,8 @@
 
 #if OPT_MAJORMODE
 typedef struct {
-    char *name;			/* copy of MAJORMODE.name */
+    char *shortname;		/* copy of MAJORMODE.shortname */
+    char *longname;		/* copy of MAJORMODE.longname */
     MAJORMODE *data;		/* pointer to actual data */
     int init;			/* predefined during initialization */
     int flag;			/* true when majormode is active/usable */
@@ -480,7 +481,7 @@
     if (local && (localbp->majr != 0)) {
 	bprintf("--- \"%s\" settings, if different than \"%s\" majormode %*P\n",
 		localbp->b_bname,
-		localbp->majr->name,
+		localbp->majr->shortname,
 		term.cols - 1, '-');
 	globl_b_vals = get_sm_vals(localbp->majr);
     } else
@@ -1314,12 +1315,12 @@
 	    if (my_majormodes != 0) {
 		size_t n = strlen(rp);
 
-		for (j = 0; my_majormodes[j].name; j++) {
+		for (j = 0; my_majormodes[j].shortname; j++) {
 		    MAJORMODE_LIST *p = my_majormodes + j;
-		    size_t len = strlen(p->name);
+		    size_t len = strlen(p->shortname);
 
 		    if (n >= len
-			&& !strncmp(rp, p->name, len)
+			&& !strncmp(rp, p->shortname, len)
 			&& (lookup_valnames(rp, p->qual)) >= 0) {
 			args->names = p->qual;
 			args->global = p->data->mm.mv;
@@ -1343,7 +1344,7 @@
 #if OPT_MAJORMODE
 		if (mode_class == 3) {
 		    const char *it = ((bp->majr != 0)
-				      ? bp->majr->name
+				      ? bp->majr->shortname
 				      : "?");
 		    make_global_val(args->local, args->global, 0);
 		    if (global) {
@@ -1370,13 +1371,13 @@
 	int k = 0;
 	size_t n = strlen(rp);
 
-	for (j = 0; my_majormodes[j].name; j++) {
+	for (j = 0; my_majormodes[j].shortname; j++) {
 	    MAJORMODE_LIST *p = my_majormodes + j;
 	    struct VAL *my_vals = get_sm_vals(p->data);
-	    size_t len = strlen(p->name);
+	    size_t len = strlen(p->shortname);
 
 	    if (n >= len
-		&& !strncmp(rp, p->name, len)
+		&& !strncmp(rp, p->shortname, len)
 		&& (k = lookup_valnames(rp + len + (rp[len] == '-'),
 					b_valnames)) >= 0
 		&& is_local_val(my_vals, k)) {
@@ -1384,7 +1385,7 @@
 		if (global == FALSE) {
 		    if (valid_buffer(bp)
 			&& (bp->majr == 0
-			    || strcmp(bp->majr->name, p->name))) {
+			    || strcmp(bp->majr->shortname, p->shortname))) {
 			TRACE(("...not applicable\n"));
 			return FALSE;
 		    }
@@ -2168,7 +2169,11 @@
 per_major(char *dst, const char *majr, int code, int brief)
 {
     if (brief) {
-	(void) lsprintf(dst, "%s%s", majr, m_valnames[code].shortname);
+	if (!strcmp(m_valnames[code].shortname, "X")) {
+	    *dst = EOS;
+	} else {
+	    (void) lsprintf(dst, "%s%s", majr, m_valnames[code].shortname);
+	}
     } else {
 	(void) lsprintf(dst, "%s-%s", majr, m_valnames[code].name);
     }
@@ -2228,7 +2233,7 @@
     size_t n = 0;
 
     if (my_majormodes != 0) {
-	for (n = 0; my_majormodes[n].name != 0; n++)
+	for (n = 0; my_majormodes[n].shortname != 0; n++)
 	    continue;
     }
     return n;
@@ -2241,7 +2246,7 @@
 
     if (mv[m].vp->i != 0) {
 	TRACE(("get_mm_number(%s) %d\n",
-	       my_majormodes[n].name,
+	       my_majormodes[n].shortname,
 	       mv[m].vp->i));
 	return mv[m].vp->i;
     }
@@ -2262,7 +2267,7 @@
 	&& mv[m].vp->r->pat[0] != 0
 	&& mv[m].vp->r->reg != 0) {
 	TRACE(("get_mm_rexp(%s) %s\n",
-	       my_majormodes[n].name,
+	       my_majormodes[n].shortname,
 	       mv[m].vp->r->pat));
 	return mv[m].vp->r->reg;
     }
@@ -2276,7 +2281,7 @@
 
     if (mv[m].vp->p != 0) {
 	TRACE(("get_mm_string(%s) %s\n",
-	       my_majormodes[n].name,
+	       my_majormodes[n].shortname,
 	       mv[m].vp->p));
 	return mv[m].vp->p;
     }
@@ -2309,7 +2314,7 @@
     tb_sappend0(&order, tag);
     for (n = 0; majormodes_order[n] >= 0; n++) {
 	tb_sappend0(&order, " ");
-	tb_sappend0(&order, my_majormodes[majormodes_order[n]].name);
+	tb_sappend0(&order, my_majormodes[majormodes_order[n]].shortname);
     }
     TRACE(("%s\n", tb_values(order)));
 }
@@ -2328,11 +2333,11 @@
 
     TRACE(("put_majormode_before(%d:%s, %s)\n",
 	   j,
-	   my_majormodes[majormodes_order[j]].name,
+	   my_majormodes[majormodes_order[j]].shortname,
 	   s));
 
     for (k = 0; (kk = majormodes_order[k]) >= 0; k++) {
-	t = my_majormodes[kk].name;
+	t = my_majormodes[kk].shortname;
 	if (strcmp(t, s) <= 0
 	    && (found < 0 || strcmp(told, t) < 0)) {
 	    found = k;
@@ -2351,7 +2356,7 @@
 	show_majormode_order("after:");
     } else if (found < 0) {
 	TPRINTF(("cannot put %s before %s (not found)\n",
-		 my_majormodes[majormodes_order[j]].name,
+		 my_majormodes[majormodes_order[j]].shortname,
 		 s));
 	TRACE(("...did not find %s\n", s));
     }
@@ -2370,13 +2375,13 @@
 
     TRACE(("put_majormode_after(%d:%s, %s)\n",
 	   j,
-	   my_majormodes[majormodes_order[j]].name,
+	   my_majormodes[majormodes_order[j]].shortname,
 	   s));
 
     for (k = count_majormodes() - 1;
 	 k >= 0 && (kk = majormodes_order[k]) >= 0;
 	 k--) {
-	t = my_majormodes[kk].name;
+	t = my_majormodes[kk].shortname;
 	if (strcmp(t, s) >= 0
 	    && (found < 0 || strcmp(told, t) > 0)) {
 	    found = k;
@@ -2395,7 +2400,7 @@
 	show_majormode_order("after:");
     } else if (found < 0) {
 	TPRINTF(("cannot put %s after %s (not found)\n",
-		 my_majormodes[majormodes_order[j]].name,
+		 my_majormodes[majormodes_order[j]].shortname,
 		 s));
 	TRACE(("...did not find %s\n", s));
     }
@@ -2529,7 +2534,7 @@
 static size_t
 insert_per_major(size_t count, const char *name)
 {
-    if (name != 0) {
+    if (name != 0 && *name != EOS) {
 	size_t j, k;
 	int found;
 
@@ -2580,8 +2585,8 @@
 {
     size_t n;
     if (my_majormodes != 0) {
-	for (n = 0; my_majormodes[n].name != 0; n++) {
-	    if (!strcmp(name, my_majormodes[n].name))
+	for (n = 0; my_majormodes[n].shortname != 0; n++) {
+	    if (!strcmp(name, my_majormodes[n].shortname))
 		return my_majormodes[n].data;
 	}
     }
@@ -2598,8 +2603,8 @@
 {
     size_t n;
     if (my_majormodes != 0) {
-	for (n = 0; my_majormodes[n].name != 0; n++) {
-	    if (!strcmp(name, my_majormodes[n].name))
+	for (n = 0; my_majormodes[n].shortname != 0; n++) {
+	    if (!strcmp(name, my_majormodes[n].shortname))
 		return my_majormodes + n;
 	}
     }
@@ -2616,8 +2621,8 @@
     int status = FALSE;
 
     if (my_majormodes != 0) {
-	for (n = 0; my_majormodes[n].name != 0; n++) {
-	    if (!strcmp(name, my_majormodes[n].name)) {
+	for (n = 0; my_majormodes[n].shortname != 0; n++) {
+	    if (!strcmp(name, my_majormodes[n].shortname)) {
 		status = my_majormodes[n].init;
 		break;
 	    }
@@ -2640,10 +2645,21 @@
     return status;
 }
 
+/* name-completion for "longname" */
 int
 major_complete(DONE_ARGS)
 {
-    return kbd_complete(PASS_DONE_ARGS, (const char *) &my_majormodes[0],
+    return kbd_complete(PASS_DONE_ARGS,
+			(const char *) &my_majormodes[0].longname,
+			sizeof(my_majormodes[0]));
+}
+
+/* name-completion for "shortname" */
+static int
+short_major_complete(DONE_ARGS)
+{
+    return kbd_complete(PASS_DONE_ARGS,
+			(const char *) &my_majormodes[0].shortname,
 			sizeof(my_majormodes[0]));
 }
 
@@ -2661,7 +2677,7 @@
 			    KBD_NORMAL,		/* FIXME: KBD_MAYBEC if !defining */
 			    (defining || clexec)
 			    ? no_completion
-			    : major_complete)) == TRUE) {
+			    : short_major_complete)) == TRUE) {
 	/* check for legal name (alphanumeric) */
 	if ((status = is_identifier(tb_values(cbuf))) != TRUE) {
 	    mlwarn("[Not an identifier: %s]", tb_values(cbuf));
@@ -2892,8 +2908,8 @@
 
     if (valid_buffer(bp)) {
 	if (bp->majr != 0
-	    && strcmp(bp->majr->name, name) != 0)
-	    (void) detach_mmode(bp, bp->majr->name);
+	    && strcmp(bp->majr->shortname, name) != 0)
+	    (void) detach_mmode(bp, bp->majr->shortname);
 
 	TRACE(("attach_mmode '%s' to '%s'\n", name, bp->b_bname));
 	if ((bp->majr = lookup_mm_data(name)) != 0) {
@@ -2946,8 +2962,8 @@
 
     if (valid_buffer(bp)
 	&& (mp = bp->majr) != 0
-	&& !strcmp(mp->name, name)) {
-	TRACE(("detach_mmode '%s', given '%s'\n", name, mp->name));
+	&& !strcmp(mp->shortname, name)) {
+	TRACE(("detach_mmode '%s', given '%s'\n", name, mp->shortname));
 	/* readjust the buffer's modes */
 	for (n = 0; n < MAX_B_VALUES; n++) {
 	    if (!is_local_b_val(bp, n)
@@ -2986,11 +3002,11 @@
 
     if (ptr != 0) {
 	int init = TRUE;
-	for (j = 0; my_majormodes[j].name != 0; j++) {
+	for (j = 0; my_majormodes[j].shortname != 0; j++) {
 	    if (my_majormodes[j].data == ptr) {
 		init = my_majormodes[j].init;
 		for_each_buffer(bp) {
-		    if (detach_mmode(bp, my_majormodes[j].name)) {
+		    if (detach_mmode(bp, my_majormodes[j].shortname)) {
 			set_winflags(TRUE, WFHARD | WFMODE);
 		    }
 		}
@@ -3009,13 +3025,14 @@
 		    free(TYPECAST(char, my_majormodes[j].subq[k].shortname));
 		}
 		free_sm_vals(ptr);
-		free(ptr->name);
+		free(ptr->shortname);
+		free(ptr->longname);
 		free(TYPECAST(char, ptr));
 		endofDisplay();
 
 		do {
 		    my_majormodes[j] = my_majormodes[j + 1];
-		} while (my_majormodes[j++].name != 0);
+		} while (my_majormodes[j++].shortname != 0);
 		break;
 	    }
 	}
@@ -3190,12 +3207,12 @@
 	int count = count_majormodes();
 	if (show_active_majormodes(0))
 	    bputc('\n');
-	for (j = 0; my_majormodes[j].name != 0; j++) {
+	for (j = 0; my_majormodes[j].shortname != 0; j++) {
 	    if (local)
-		TheMajor = my_majormodes[j].name;
+		TheMajor = my_majormodes[j].shortname;
 	    data = my_majormodes[j].data;
 	    bprintf("--- \"%s\" majormode settings %*P(%d:%d)%*P\n",
-		    my_majormodes[j].name,
+		    my_majormodes[j].shortname,
 		    term.cols - 12, '-',
 		    find_majormode_order(j) + 1,
 		    count,
@@ -3249,10 +3266,11 @@
 }
 
 int
-alloc_mode(const char *name, int predef)
+alloc_mode(const char *shortname, int predef)
 {
     size_t j, k;
     int n;
+    char longname[NSTRING];
     char temp[NSTRING];
 
     if (major_valnames == 0) {
@@ -3268,15 +3286,15 @@
 	endofDisplay();
 	for (j = k++; j != 0; j--) {
 	    major_valnames[j] = major_valnames[j - 1];
-	    if (strcmp(major_valnames[j - 1].shortname, name) < 0) {
+	    if (strcmp(major_valnames[j - 1].shortname, shortname) < 0) {
 		break;
 	    }
 	}
     }
 
-    (void) majorname(temp, name, TRUE);
-    major_valnames[j].name = strmalloc(temp);
-    major_valnames[j].shortname = strmalloc(name);
+    (void) majorname(longname, shortname, TRUE);
+    major_valnames[j].name = strmalloc(longname);
+    major_valnames[j].shortname = strmalloc(shortname);
     major_valnames[j].type = VALTYPE_MAJOR;
     major_valnames[j].side_effect = chgd_major_w;
 
@@ -3299,18 +3317,26 @@
 	endofDisplay();
 	for (j = k++; j != 0; j--) {
 	    my_majormodes[j] = my_majormodes[j - 1];
-	    if (strcmp(my_majormodes[j - 1].name, name) < 0) {
+	    if (strcmp(my_majormodes[j - 1].shortname, shortname) < 0) {
 		break;
 	    }
 	}
     }
 
     beginDisplay();
-    my_majormodes[j].data = typecalloc(MAJORMODE);
-    my_majormodes[j].name = my_majormodes[j].data->name = strmalloc(name);
+
+    my_majormodes[j].shortname = strmalloc(shortname);
+    my_majormodes[j].longname = strmalloc(longname);
+
     my_majormodes[j].init = predef;
     my_majormodes[j].flag = TRUE;
+
+    my_majormodes[j].data = typecalloc(MAJORMODE);
+    my_majormodes[j].data->shortname = my_majormodes[j].shortname;
+    my_majormodes[j].data->longname = my_majormodes[j].longname;
+
     memset(my_majormodes + k, 0, sizeof(*my_majormodes));
+
     endofDisplay();
 
     /* copy array to get types, then overwrite the name-pointers */
@@ -3330,9 +3356,9 @@
     for (k = 0; k < MAX_M_VALUES; k++) {
 	reset_qualifier(m_valnames + k, my_majormodes[j].data->mm.mv + k);
 	my_majormodes[j].qual[k].name =
-	    strmalloc(per_major(temp, name, k, TRUE));
+	    strmalloc(per_major(temp, shortname, k, TRUE));
 	my_majormodes[j].qual[k].shortname =
-	    strmalloc(per_major(temp, name, k, FALSE));
+	    strmalloc(per_major(temp, shortname, k, FALSE));
     }
 
     /*
@@ -3341,11 +3367,11 @@
      */
     if (!predef) {
 	j = extend_mode_list((MAX_M_VALUES + 2) * 2);
-	j = insert_per_major(j, majorname(temp, name, FALSE));
-	j = insert_per_major(j, majorname(temp, name, TRUE));
+	j = insert_per_major(j, majorname(longname, shortname, FALSE));
+	j = insert_per_major(j, majorname(longname, shortname, TRUE));
 	for (n = 0; n < MAX_M_VALUES; n++) {
-	    j = insert_per_major(j, per_major(temp, name, n, TRUE));
-	    j = insert_per_major(j, per_major(temp, name, n, FALSE));
+	    j = insert_per_major(j, per_major(temp, shortname, n, TRUE));
+	    j = insert_per_major(j, per_major(temp, shortname, n, FALSE));
 	}
     }
 
@@ -3519,21 +3545,33 @@
     int result = -1;
 
     if (my_majormodes[n].flag) {
-	regexp *exp = get_mm_rexp(n, MVAL_SUFFIXES);
+	regexp *exp;
 	int savecase = ignorecase;
+	char *fullname = bp->b_fname;
+	TBUFF *savename = 0;
+
 #if OPT_CASELESS || SYS_VMS
 	ignorecase = TRUE;
 #else
 	ignorecase = get_mm_b_val(n, MDIGNCASE);
 #endif
-	if (exp != 0
-	    && regexec(exp, bp->b_fname, (char *) 0, 0, -1)) {
+	if ((exp = b_val_rexp(bp, VAL_STRIPSUFFIX)->reg) != 0
+	    && regexec(exp, fullname, (char *) 0, 0, -1)) {
+	    tb_scopy(&savename, fullname);
+	    strcpy(tb_values(savename) + (exp->startp[0] - fullname),
+		   exp->endp[0]);
+	    fullname = tb_values(savename);
+	}
+
+	if ((exp = get_mm_rexp(n, MVAL_SUFFIXES)) != 0
+	    && regexec(exp, fullname, (char *) 0, 0, -1)) {
 	    TRACE(("test_by_suffix(%s) %s\n",
-		   bp->b_fname,
-		   my_majormodes[n].name));
+		   fullname,
+		   my_majormodes[n].shortname));
 	    result = n;
 	}
 	ignorecase = savecase;
+	tb_free(&savename);
     }
     return result;
 }
@@ -3570,7 +3608,7 @@
 	    && lregexec(exp, lp, 0, llength(lp))) {
 	    TRACE(("test_by_preamble(%s) %s\n",
 		   bp->b_fname,
-		   my_majormodes[n].name));
+		   my_majormodes[n].shortname));
 	    result = n;
 	}
 	ignorecase = savecase;
@@ -3585,7 +3623,7 @@
 	&& get_mm_rexp(n, MVAL_SUFFIXES) != 0
 	&& get_mm_rexp(n, MVAL_PREAMBLE) != 0) {
 	TRACE(("need both suffix/preamble for %s\n",
-	       my_majormodes[n].name));
+	       my_majormodes[n].shortname));
 	return TRUE;
     }
     return FALSE;
@@ -3634,8 +3672,8 @@
 		}
 	    }
 	    if (result >= 0) {
-		TPRINTF(("...inferred majormode %s\n", my_majormodes[result].name));
-		attach_mmode(bp, my_majormodes[result].name);
+		TPRINTF(("...inferred majormode %s\n", my_majormodes[result].shortname));
+		attach_mmode(bp, my_majormodes[result].shortname);
 	    }
 	}
     }
@@ -3724,7 +3762,7 @@
 reset_majormode(int f GCC_UNUSED, int n GCC_UNUSED)
 {
     if (curbp->majr != 0)
-	(void) detach_mmode(curbp, curbp->majr->name);
+	(void) detach_mmode(curbp, curbp->majr->shortname);
     infer_majormode(curbp);
     set_winflags(TRUE, WFMODE);
     return TRUE;
@@ -4267,9 +4305,9 @@
 #endif
 
 #if OPT_MAJORMODE
-    while (my_majormodes != 0 && my_majormodes->name != 0) {
+    while (my_majormodes != 0 && my_majormodes->shortname != 0) {
 	char temp[NSTRING];
-	free_majormode(strcpy(temp, my_majormodes->name));
+	free_majormode(strcpy(temp, my_majormodes->shortname));
     }
     FreeAndNull(my_majormodes);
 
Index: modetbl
Prereq:  1.217 
--- vile-9.4d+/modetbl	2003-03-07 19:45:48.000000000 -0500
+++ vile-9.4e/modetbl	2004-03-21 18:30:38.000000000 -0500
@@ -11,7 +11,7 @@
 #
 # The modes are table entries in the BUFFER and WINDOW structures.
 #
-# $Header: /usr/build/vile/vile/RCS/modetbl,v 1.217 2003/03/08 00:45:48 tom Exp $
+# $Header: /usr/build/vile/vile/RCS/modetbl,v 1.219 2004/03/21 23:30:38 tom Exp $
 #
 #
 # Mode-table entries.  Capitalized letters are used for abbreviations.
@@ -159,6 +159,7 @@
 	"paragraphs"	PARAGRAPHS	0		# delimits a paragraph
 	"sections"	SECTIONS	0		# delimits a section
 	"sentences"	SENTENCES	0		# delimits a sentence
+	"IgnoreSuffix"	STRIPSUFFIX	0		OPT_MAJORMODE # strip pattern before matching majormode suffix
 
 .windows
 bool							# WMD prefix
@@ -167,6 +168,7 @@
 	"HorizScroll"	HORSCROLL	0		# scroll whole screen
 	"LineWrap"	LINEWRAP	chgd_window	OPT_LINEWRAP # wrap lines wider than screen
 	"ruler"		RULER		chgd_status	!SMALLER # display line+col in modeline
+	"ShowChar"	SHOWCHAR	chgd_status	!SMALLER # display line+col in modeline
 	"Unprintable-as-Octal" NONPRINTOCTAL  chgd_window # print non-printing chars in octal
 	"Terse-SELections" TERSELECT	0		OPT_SELECTIONS # don't display extent of selections on message line
 int							# VAL_ prefix
Index: oneliner.c
Prereq:  1.102 
--- vile-9.4d+/oneliner.c	2003-03-17 21:20:27.000000000 -0500
+++ vile-9.4e/oneliner.c	2004-03-21 16:09:31.000000000 -0500
@@ -4,7 +4,7 @@
  *	Copyright (c) 1990, 1995-1999 by Paul Fox, except for delins(), which is
  *	Copyright (c) 1986 by University of Toronto, as noted below.
  *
- * $Header: /usr/build/vile/vile/RCS/oneliner.c,v 1.102 2003/03/18 02:20:27 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/oneliner.c,v 1.103 2004/03/21 21:09:31 tom Exp $
  */
 
 #include	"estruct.h"
@@ -80,6 +80,7 @@
     set_bname(bp, P_LINES_BufName);
     set_rdonly(bp, non_filename(), MDVIEW);
     set_b_val(bp, VAL_TAB, tabstop_val(curbp));
+    b_clr_counted(bp);
 
     for_each_visible_window(wp) {
 	if (wp->w_bufp == bp) {
Index: patchlev.h
--- vile-9.4d+/patchlev.h	2003-11-12 19:42:14.000000000 -0500
+++ vile-9.4e/patchlev.h	2004-03-21 19:43:56.000000000 -0500
@@ -1,2 +1,2 @@
 /* set to "" for no patches */
-#define PATCHLEVEL "d"
+#define PATCHLEVEL "e"
Index: revlist
--- vile-9.4d+/revlist	2003-12-21 19:19:59.000000000 -0500
+++ vile-9.4e/revlist	2004-03-21 20:41:38.000000000 -0500
@@ -1,6 +1,6 @@
-revlist for vile, version v9_4d
+revlist for vile, version v9_4e
 --------------------------------------------------------------------------------
-CHANGES	1.735
+CHANGES	1.738
 CHANGES.R3	1.1
 CHANGES.R4	1.1
 CHANGES.R5	1.1
@@ -13,7 +13,7 @@
 README	1.90
 README.PC	1.31
 README.VMS	1.5
-aclocal.m4	1.128
+aclocal.m4	1.129
 ansi.c	1.44
 api.c	1.34
 api.h	1.12
@@ -24,24 +24,24 @@
 btree.h	1.4
 buffer.c	1.264
 buglist	1.398
-builtflt.c	1.36
+builtflt.c	1.37
 chgdfunc.h	1.16
 cmdtbl	1.228
 config.emx	1.2
 config_h.in	1.2
 configure	none
-configure.in	1.203
+configure.in	1.204
 csrch.c	1.31
 curses.c	1.20
 descrip.mms	1.44
-dirstuff.h	1.24
-display.c	1.383
+dirstuff.h	1.25
+display.c	1.385
 djhandl.c	1.6
 dumbterm.c	1.17
 edef.h	1.313
-estruct.h	1.539
+estruct.h	1.541
 eval.c	1.322
-exec.c	1.259
+exec.c	1.260
 externs.c	1.8
 fences.c	1.82
 file.c	1.351
@@ -53,14 +53,14 @@
 gppconio.c	1.2
 history.c	1.76
 ibmpc.c	1.97
-input.c	1.261
+input.c	1.262
 insert.c	1.141
 install.sh	1.6
-isearch.c	1.58
+isearch.c	1.59
 itbuff.c	1.18
 lckfiles.c	1.11
 line.c	1.160
-main.c	1.513
+main.c	1.515
 makefile.blc	1.17
 makefile.djg	1.32
 makefile.emx	1.5
@@ -74,18 +74,18 @@
 mkdirs.sh	1.5
 mkprlenv.wnt	1.8
 mktbls.c	1.130
-modes.c	1.264
-modetbl	1.217
+modes.c	1.269
+modetbl	1.219
 msgs.c	1.25
 npopen.c	1.89
 ntconio.c	1.76
 ntwinio.c	1.133
-oneliner.c	1.102
+oneliner.c	1.103
 opers.c	1.87
 os2keys.h	1.1
 os2pipe.c	1.5
 os2vio.c	1.29
-patchlev.h	1.308
+patchlev.h	1.309
 path.c	1.135
 perl.xs	1.90
 proto.h	1.522
@@ -94,12 +94,12 @@
 random.c	1.272
 regexp.c	1.108
 region.c	1.127
-revlist	v9_4d
+revlist	v9_4e
 search.c	1.134
-select.c	1.148
+select.c	1.149
 sinstall.sh	1.1
 spawn.c	1.178
-statevar.c	1.77
+statevar.c	1.78
 tags.c	1.120
 tbuff.c	1.44
 tcap.c	1.152
@@ -112,7 +112,7 @@
 version.c	1.55
 vile-9.4.spec	1.5
 vile.1	1.30
-vile.hlp	1.568
+vile.hlp	1.573
 vile.wmconfig	1.1
 vms2unix.c	1.37
 vmsbuild.com	1.39
@@ -148,7 +148,7 @@
 doc/indent.pro	1.4
 doc/macros.doc	1.89
 doc/menus.doc	1.7
-doc/modes.doc	1.11
+doc/modes.doc	1.13
 doc/oleauto.doc	1.7
 doc/perl.doc	1.2
 doc/visvile.doc	1.9
@@ -194,14 +194,14 @@
 filters/filterio.c	1.22
 filters/filters.c	1.89
 filters/filters.h	1.81
-filters/filters.rc	1.178
+filters/filters.rc	1.180
 filters/fltstack.h	1.8
 filters/genmake.c	1.4
 filters/genmake.mak	1.23
-filters/html.key	1.6
-filters/htmlfilt.l	1.29
+filters/html.key	1.8
+filters/htmlfilt.l	1.30
 filters/imake.key	1.4
-filters/imakeflt.l	1.9
+filters/imakeflt.l	1.10
 filters/infofilt.l	1.2
 filters/java.key	1.3
 filters/js.key	1.2
@@ -224,13 +224,13 @@
 filters/makefile.in	1.78
 filters/makefile.wnt	1.30
 filters/makefilt.l	1.49
-filters/makelist.sh	1.3
+filters/makelist.sh	1.4
 filters/manfilt.c	1.35
-filters/mk-0th.awk	1.7
+filters/mk-0th.awk	1.8
 filters/mk-0th.bat	1.6
-filters/mk-1st.awk	1.10
+filters/mk-1st.awk	1.11
 filters/mk-1st.bat	1.6
-filters/mk-2nd.awk	1.12
+filters/mk-2nd.awk	1.13
 filters/mk-2nd.bat	1.6
 filters/mk-key.awk	1.2
 filters/mms-filt.l	1.9
@@ -284,7 +284,7 @@
 filters/texifilt.l	1.2
 filters/ti-filt.l	1.14
 filters/ti.key	1.2
-filters/txt-filt.l	1.16
+filters/txt-filt.l	1.17
 filters/unfilter.c	1.4
 filters/unfilter.h	1.1
 filters/vb.key	1.2
Index: select.c
Prereq:  1.148 
--- vile-9.4d+/select.c	2003-11-11 20:55:45.000000000 -0500
+++ vile-9.4e/select.c	2004-03-17 20:15:46.000000000 -0500
@@ -18,7 +18,7 @@
  * transferring the selection are not dealt with in this file.  Procedures
  * for dealing with the representation are maintained in this file.
  *
- * $Header: /usr/build/vile/vile/RCS/select.c,v 1.148 2003/11/12 01:55:45 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/select.c,v 1.149 2004/03/18 01:15:46 tom Exp $
  *
  */
 
@@ -1803,7 +1803,7 @@
 
 	    if (filtername == 0
 		&& curbp->majr != 0)
-		filtername = curbp->majr->name;
+		filtername = curbp->majr->shortname;
 
 	    if (filtername != 0
 		&& flt_start(filtername)) {
Index: statevar.c
Prereq:  1.77 
--- vile-9.4d+/statevar.c	2003-11-11 20:26:55.000000000 -0500
+++ vile-9.4e/statevar.c	2004-03-17 20:15:55.000000000 -0500
@@ -3,7 +3,7 @@
  *	for getting and setting the values of the vile state variables,
  *	plus helper utility functions.
  *
- * $Header: /usr/build/vile/vile/RCS/statevar.c,v 1.77 2003/11/12 01:26:55 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/statevar.c,v 1.78 2004/03/18 01:15:55 tom Exp $
  */
 
 #include	"estruct.h"
@@ -964,7 +964,7 @@
 var_MAJORMODE(TBUFF ** rp, const char *vp)
 {
     return any_ro_STR(rp, vp, ((valid_buffer(curbp) && curbp->majr != 0)
-			       ? curbp->majr->name
+			       ? curbp->majr->shortname
 			       : ""));
 }
 
Index: vile.hlp
Prereq:  1.568 
--- vile-9.4d+/vile.hlp	2003-08-04 18:46:30.000000000 -0400
+++ vile-9.4e/vile.hlp	2004-03-21 18:33:42.000000000 -0500
@@ -74,6 +74,11 @@
 	you have two windows to the same buffer, and make a change in one,
 	you can undo it in the other.
 
+	vile supports many, many "modes" (aka options), which are
+	eventually explained in the section entitled "Editor modes".  But
+	do note that this help file makes references to modes before the
+	concept is fully described.  It's a chicken and egg problem....
+
 	vile is 8-bit clean, allowing it to be used more easily at non-
 	English speaking sites.  See the section on "8-Bit Operation" for
 	more information.
@@ -1419,6 +1424,9 @@
 	ignorecase (ic) Text searches normally match the pattern exactly.
 		With this set, searches are case-insensitive. (B)
 
+	ignoresuffix (is) Ignore (remove) the given pattern from a filename
+		before matching it for majormode suffixes.  (B)
+
 	implybuffer (ib) Causes vile to create a buffer when you write to a new
 		file, or read from one (e.g., with ":r").  (U)
 
@@ -1619,6 +1627,9 @@
 		commands are used, and it chooses the next column stop for
 		the cursor if a '^T' or '^D' is typed during insert mode. (B)
 
+	showchar (sc) Controls whether the modeline can show the %C formatted
+		character at the current editing position (W).
+
 	showformat (sf) Controls when/whether recordseparator information is
 		shown in the status line.  Values are "always", "differs" to
 		show when the local mode differs from the global, "local" to
@@ -3415,25 +3426,26 @@
 	format specifiers which may appear in the format control strings
 	are as follows:
 
-		%i	insert/overwrite/replace mode indicator, displayed
-			only when in insert, overwrite, or replace mode.
-			When not in one of these modes, the separator
-			character (often "-", "=", or " ") will be displayed.
 		%b	buffer name
+		%c	column number if "ruler" is set
+		%C	character value at current edit-position.
 		%f	file name when not internal buffer and when not the
 			same as the buffer name.
 		%F	internal buffer name
+		%i	insert/overwrite/replace mode indicator, displayed
+			only when in insert, overwrite, or replace mode.
+			When not in one of these modes, the separator
+			character (often "-", "=", or " ") will be displayed.
+		%l	line number to be displayed if "ruler" is set
+		%L	number of lines in buffer, if ruler is set
 		%m	major mode(s), e.g., cmode, view-only, etc.  Displayed
 			in square brackets.
-		%l	line number to be displayed if "ruler" is set
-		%c	column number if "ruler" is set
 		%p	line number as percentage of number of lines if
 			"ruler" is set
 		%P	line number as percentage of number of lines
 		%S	rough position of window with respect to buffer (top,
 			bot, all, emp, mid) when ruler not set (or ruler is
 			set, but buffer is empty).
-		%L	number of lines in buffer, if ruler is set
 		%=	middle separator; should appear at most once in a
 			format string.  This indicates where to separate the
 			left and right hand portions of the mode line with a
@@ -3445,7 +3457,7 @@
 		%:	colon
 		%{name}	any internal mode/variable value, given its name
 
-	Some of the format specifiers (%f, %F, %m, %l, %c, %p, %S, %L) are
+	Some of the format specifiers (%f, %F, %m, %l, %c, %p, %S, %L, %C) are
 	conditionally displayed.  For example "%m" will display the major
 	modes only if there are some major modes set or if the buffer has
 	been modified (which is sort of a major mode).  Similarly, "%F" and
@@ -3466,7 +3478,7 @@
 
 	The default format control string is as follows:
 
-	    "%-%i%- %b %m:: :%f:is : :%=%F: : :%l:(:,:%c::) :%p::% :%S%-%-%|"
+	    "%-%i%- %b %m:: :%f:is : :%=%F: : :%l:(:,:%c::) :%p::% :%C:char ::%S%-%-%|"
 
 	Mode lines for some versions of vile previous to version 4.7 can be
 	obtained with the following format string.  This will remove the
@@ -3894,6 +3906,9 @@
 					 majormode and filter exist for same.
 	    HighlightClear       ^X-Q    Clears the current buffer's color
 					 attributes.
+	    set-highlighting     <none>  Attach a major mode to a buffer
+	    			         and re-color same.  More about
+					 this below.
 
 	For a simple go/no-go test, do:
 
@@ -4041,6 +4056,26 @@
 	- Some users have made the mistake of explicitly specifying
 	  a filter via the filtername mode.  Don't do that.
 
+	Attaching/Forcing a buffer's majormode
+	--------------------------------------
+	For the most part, when vile visits a file, the correct majormode
+	is attached to the file's buffer and appropriate syntax coloring
+	ensues.  But there are times when vile may choose the wrong
+	majormode and/or not specify one at all (the latter case most
+	likely occurs when the file's suffix doesn't match any of the
+	possibilities listed in filters.rc).  The result is either
+	inappropriate or _no_ highlighting.  In this situation, use the
+	"set-highlighting" macro to explicitly specify the desired
+	majormode.
+
+	For example, suppose I'm editing an older copy of a C++ source file
+	called main.cpp, which has been renamed to main.cpp.old .  In this
+	scenario, vile will not attach a majormode to main.cpp.old's
+	buffer and consequently will not color the buffer.  To set the
+	proper majormode and force syntax coloring, simply type:
+
+		:set-highlighting cpp
+
 	Man pages
 	---------
 	It's also possible to syntax color Unix man pages, although the
@@ -4272,7 +4307,7 @@
 	Note 1:  The "d" option specifies that find should restrict its
 	search solely to files of type "d" (i.e., directories).  The "f"
 	option adds a "-follow" operand to the commandline, which directs
-	find to follow symbolic links.  Note that -follow is appropriate 
+	find to follow symbolic links.  Note that -follow is appropriate
 	for the GNU tool chain, SunOS v5.7, and possibly other hosts.
 	Check your local find (1) man page for compatibility.
 
@@ -5549,9 +5584,9 @@
 	Here's a sample .vilerc, to help get you started with the
 	syntax and style of vile macros:
 
+	source vileinit.rc
 	set autoindent
 	set fillcol 75
-	set cmode
 	set c-tabstop 4
 
 	; sitting on a brace, run the C code block through indent
@@ -5770,4 +5805,4 @@
 
 Copyright 1995-2003 by Paul Fox, Thomas Dickey, and Kevin Buettner
 --------------------------------------------------------------------
- $Header: /usr/build/vile/vile/RCS/vile.hlp,v 1.568 2003/08/04 22:46:30 tom Exp $
+ $Header: /usr/build/vile/vile/RCS/vile.hlp,v 1.573 2004/03/21 23:33:42 tom Exp $