# vile 9.5h - patch 2006/05/22 - Thomas Dickey <dickey@invisible-island.net>
# ------------------------------------------------------------------------------
# CHANGES            |   32 
# MANIFEST           |    2 
# README             |   16 
# aclocal.m4         |  139 +
# bind.c             |   54 
# btree.c            |    4 
# btree.h            |    4 
# buffer.c           |    4 
# config.guess       |   46 
# config.sub         |   34 
# configure          | 3824 ++++++++++++++++++++++++++++-----------------------
# configure.in       |   30 
# display.c          |   21 
# estruct.h          |   19 
# eval.c             |   22 
# exec.c             |   20 
# fences.c           |    8 
# file.c             |   24 
# filec.c            |   18 
# fileio.c           |    9 
# filters/ada-filt.l |    5 
# filters/as-filt.l  |    7 
# filters/asm-filt.l |   11 
# filters/atr2ansi.c |    8 
# filters/atr2html.c |    5 
# filters/atr2text.c |    6 
# filters/au3-filt.l |   15 
# filters/awk-filt.l |    7 
# filters/bas-filt.l |    7 
# filters/bat-filt.l |    7 
# filters/bnf-filt.l |    5 
# filters/c-filt.c   |    5 
# filters/cfg-filt.l |    7 
# filters/css-filt.l |    3 
# filters/cwebfilt.l |    6 
# filters/dcl-filt.l |   11 
# filters/def-filt.l |    5 
# filters/difffilt.l |    3 
# filters/ecl-filt.l |    3 
# filters/esqlfilt.l |    5 
# filters/est-filt.l |    7 
# filters/fdl-filt.l |    7 
# filters/htmlfilt.l |   11 
# filters/imakeflt.l |   11 
# filters/infofilt.l |    5 
# filters/ini-filt.l |    7 
# filters/iss-filt.l |   13 
# filters/key-filt.c |    5 
# filters/latexflt.l |   13 
# filters/lex-filt.l |   21 
# filters/lispfilt.l |    7 
# filters/lua-filt.l |    5 
# filters/m4-filt.c  |   48 
# filters/mailfilt.l |    3 
# filters/makefilt.l |    9 
# filters/midlfilt.l |    5 
# filters/mms-filt.l |    7 
# filters/nr-filt.l  |   11 
# filters/pas-filt.l |    7 
# filters/perlfilt.l |    9 
# filters/php-filt.l |    5 
# filters/pl-filt.c  |    5 
# filters/pot-filt.l |   11 
# filters/ps-filt.l  |    5 
# filters/py-filt.l  |    3 
# filters/py.key     |  163 ++
# filters/rb-filt.l  |    3 
# filters/rc-filt.l  |    5 
# filters/rcs-filt.l |    5 
# filters/rexxfilt.l |    3 
# filters/rpm-filt.l |   15 
# filters/rubyfilt.c |    5 
# filters/sccsfilt.l |   11 
# filters/sed-filt.c |    7 
# filters/sh-filt.l  |   11 
# filters/sml-filt.l |    3 
# filters/spellflt.l |    5 
# filters/sql-filt.l |   21 
# filters/tagsfilt.c |    7 
# filters/tbl-filt.l |    5 
# filters/tc-filt.l  |   11 
# filters/tcl-filt.l |    9 
# filters/texifilt.l |    5 
# filters/ti-filt.l  |    7 
# filters/txt-filt.l |    5 
# filters/unfilter.c |    5 
# filters/vb.key     |   22 
# filters/vilefilt.l |    3 
# filters/vl-filt.l  |    5 
# filters/wbt-filt.l |   11 
# filters/xml-filt.l |    7 
# filters/xresfilt.l |    7 
# filters/xs-filt.l  |    3 
# filters/yaccfilt.l |    7 
# glob.c             |    4 
# history.c          |   14 
# input.c            |   60 
# line.c             |    7 
# macros/modes.rc    |   16 
# main.c             |    9 
# makefile.blc       |   85 -
# map.c              |    8 
# mktbls.c           |   44 
# modes.c            |   42 
# modetbl            |    3 
# ntwinio.c          |   30 
# oneliner.c         |   14 
# patchlev.h         |    2 
# path.c             |   12 
# proto.h            |   27 
# random.c           |    8 
# regexp.c           |   18 
# region.c           |   16 
# revlist            |  260 +--
# search.c           |    4 
# select.c           |   21 
# spawn.c            |    4 
# statevar.c         |    4 
# tags.c             |    8 
# tbuff.c            |   30 
# vile-9.5.spec      |   13 
# vile.1             |    9 
# vile.hlp           |   25 
# vl_regex.h         |    4 
# w32cmd.c           |   30 
# w32misc.c          |   16 
# w32pipe.c          |   16 
# w32reg.c           |    6 
# w32vile.h          |   14 
# word.c             |    6 
# 130 files changed, 3447 insertions(+), 2519 deletions(-)
# ------------------------------------------------------------------------------
Index: CHANGES
--- vile-9.5g+/CHANGES	2006-04-02 17:00:03.000000000 +0000
+++ vile-9.5h/CHANGES	2006-05-21 23:56:30.000000000 +0000
@@ -1,5 +1,37 @@
 Changes for vile 9.6 (released ??? ??? ?? ????)
 
+ 20060521 (h)
+	> Clark Morgan:
+	+ document write-all-buffers command.
+	+ add echo-to-clipboard mode for Win32 hosts:
+	  all text selected with the mouse is automatically
+	  copied to the Windows clipboard. (U)
+ 	> Paul Fox:
+	+ updated contact information in README, vile.1 and vile.hlp
+	> Tom Dickey:
+	+ allow a version number in rbmode (ruby) preamble.
+	+ add check in m4-filt.c for unbalanced quote, show the affected area
+	  as an error.
+	+ add ".ddl" suffix to sqlmode.
+	+ add ".dsr" suffix to vbmode.
+	+ fix makefile.blc, broken in 9.5f cleanup.
+	+ fixes for 64-bit warnings of Visual Studio .NET 2003:
+	  + modify Member_Offset() macro to cast the difference between
+	    addresses to a long rather than casting a pointer to a long.
+	    Use this flavor for Visual C++.
+	  + size_t is not necessarily the same size as unsigned - modify code
+	    to use size_t where it is consistent, otherwise cast as needed.
+	+ updated for python keywords
+	+ modify some lex filters, e.g., sql, to exclude \r in the places that
+	  exclude \n, since \r should not be colored.
+	+ fix for tb_enquote(); a value pointed to memory that had been
+	  reallocated.
+	+ make OBJEXT configure feature work for optional objects such as api.o
+	+ updated configure macros CF_CURSES_CPPFLAGS, CF_CURSES_LIBS,
+	  CF_NCURSES_CPPFLAGS, CF_PATH_SYNTAX, CF_WITH_IMAKE_CFLAGS,
+	  CF_XOPEN_SOURCE.
+	+ update config.guess, config.sub
+
  20060402 (g)
 	> Tom Dickey:
 	+ minor fixes to make most of the lex filters build with "old" lex,
Index: MANIFEST
--- vile-9.5g+/MANIFEST	2006-04-02 18:37:29.000000000 +0000
+++ vile-9.5h/MANIFEST	2006-05-22 00:27:49.000000000 +0000
@@ -1,4 +1,4 @@
-MANIFEST for vile, version v9_5g
+MANIFEST for vile, version v9_5h
 --------------------------------------------------------------------------------
 MANIFEST                        this file
 CHANGES                         Change-log for VILE
Index: README
Prereq:  1.94 
--- vile-9.5g+/README	2006-01-11 21:25:35.000000000 +0000
+++ vile-9.5h/README	2006-05-21 00:29:29.000000000 +0000
@@ -66,11 +66,17 @@
 CDROM's.
 
 ------------------------------------------------------
-Send bug reports to
-	bugs@vile.cx
 
-Requests to be put on the announcement list should go to
-	announce-request@vile.cx
+There is a project mailing list.  You can subscribe to it here:
+    https://savannah.nongnu.org/projects/vile/
+
+To submit bug reports, either subscribe to the list (since
+non-subscribers aren't allowed to post) or use the bug system at
+that same URL.
+
+There is also a project place-holder page at:
+	http://www.vile.cx
+from which you can find most other sites mentioned in this README.
 
 ------------------------------------------------------
 
@@ -1156,5 +1162,5 @@
     + modify vmsbuild.com and descrip.mms to work with IA64.
 
 -------------------------------
-$Header: /usr/build/vile/vile/RCS/README,v 1.94 2006/01/11 21:25:35 tom Exp $
+$Header: /usr/build/vile/vile/RCS/README,v 1.95 2006/05/21 00:29:29 pgf Exp $
 -------------------------------
Index: aclocal.m4
Prereq:  1.158 
--- vile-9.5g+/aclocal.m4	2005-09-05 13:50:29.000000000 +0000
+++ vile-9.5h/aclocal.m4	2006-04-09 13:55:51.000000000 +0000
@@ -1,6 +1,6 @@
 dnl vile's local definitions for autoconf.
 dnl
-dnl $Header: /usr/build/vile/vile/RCS/aclocal.m4,v 1.158 2005/09/05 13:50:29 tom Exp $
+dnl $Header: /usr/build/vile/vile/RCS/aclocal.m4,v 1.160 2006/04/09 13:55:51 tom Exp $
 dnl
 dnl ---------------------------------------------------------------------------
 dnl ---------------------------------------------------------------------------
@@ -505,7 +505,7 @@
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_CPPFLAGS version: 7 updated: 2003/06/06 00:48:41
+dnl CF_CURSES_CPPFLAGS version: 9 updated: 2006/02/04 19:44:43
 dnl ------------------
 dnl Look for the curses headers.
 AC_DEFUN([CF_CURSES_CPPFLAGS],[
@@ -513,7 +513,7 @@
 AC_CACHE_CHECK(for extra include directories,cf_cv_curses_incdir,[
 cf_cv_curses_incdir=no
 case $host_os in #(vi
-hpux10.*|hpux11.*) #(vi
+hpux10.*) #(vi
 	test -d /usr/include/curses_colr && \
 	cf_cv_curses_incdir="-I/usr/include/curses_colr"
 	;;
@@ -526,6 +526,17 @@
 ])
 test "$cf_cv_curses_incdir" != no && CPPFLAGS="$cf_cv_curses_incdir $CPPFLAGS"
 
+CF_CURSES_HEADER
+CF_TERM_HEADER
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_CURSES_HEADER version: 1 updated: 2005/12/31 13:28:25
+dnl ----------------
+dnl Find a "curses" header file, e.g,. "curses.h", or one of the more common
+dnl variations of ncurses' installs.
+dnl
+dnl See also CF_NCURSES_HEADER, which sets the same cache variable.
+AC_DEFUN([CF_CURSES_HEADER],[
 AC_CACHE_CHECK(if we have identified curses headers,cf_cv_ncurses_header,[
 cf_cv_ncurses_header=none
 for cf_header in \
@@ -546,10 +557,9 @@
 
 # cheat, to get the right #define's for HAVE_NCURSES_H, etc.
 AC_CHECK_HEADERS($cf_cv_ncurses_header)
-
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_LIBS version: 23 updated: 2003/11/06 19:59:57
+dnl CF_CURSES_LIBS version: 24 updated: 2006/02/04 19:44:43
 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.
@@ -568,7 +578,7 @@
 freebsd*) #(vi
 	AC_CHECK_LIB(mytinfo,tgoto,[LIBS="-lmytinfo $LIBS"])
 	;;
-hpux10.*|hpux11.*) #(vi
+hpux10.*) #(vi
 	AC_CHECK_LIB(cur_colr,initscr,[
 		LIBS="-lcur_colr $LIBS"
 		ac_cv_func_initscr=yes
@@ -815,6 +825,33 @@
 AC_SUBST(ECHO_CC)
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_ENABLE_NARROWPROTO version: 3 updated: 2006/02/12 17:46:00
+dnl ---------------------
+dnl If this is not set properly, Xaw's scrollbars will not work.
+dnl The so-called "modular" configuration for X.org omits most of the
+dnl configure checks that would be needed to provide compatibility with
+dnl older X builds.  This one breaks things noticeably.
+AC_DEFUN([CF_ENABLE_NARROWPROTO],
+[
+AC_MSG_CHECKING(if you want narrow prototypes for X libraries)
+
+case `$ac_config_guess` in #(vi
+*cygwin*|*freebsd*|*gnu*|*irix5*|*irix6*|*linux-gnu*|*netbsd*|*openbsd*|*qnx*|*sco*|*sgi*) #(vi
+	cf_default_narrowproto=yes
+	;;
+*)
+	cf_default_narrowproto=no
+	;;
+esac
+
+CF_ARG_OPTION(narrowproto,
+	[  --enable-narrowproto    enable narrow prototypes for X libraries],
+	[enable_narrowproto=$enableval],
+	[enable_narrowproto=$cf_default_narrowproto],
+	[$cf_default_narrowproto])
+AC_MSG_RESULT($enable_narrowproto)
+])
+dnl ---------------------------------------------------------------------------
 dnl CF_ERRNO version: 5 updated: 1997/11/30 12:44:39
 dnl --------
 dnl Check if 'errno' is declared in <errno.h>
@@ -1830,7 +1867,7 @@
 	,[$1=no])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_NCURSES_CPPFLAGS version: 17 updated: 2003/11/06 19:59:57
+dnl CF_NCURSES_CPPFLAGS version: 18 updated: 2005/12/31 13:26:39
 dnl -------------------
 dnl Look for the SVr4 curses clone 'ncurses' in the standard places, adjusting
 dnl the CPPFLAGS variable so we can include its header.
@@ -1871,9 +1908,27 @@
 	done
 ])
 
+CF_NCURSES_HEADER
+CF_TERM_HEADER
+
+# some applications need this, but should check for NCURSES_VERSION
+AC_DEFINE(NCURSES)
+
+CF_NCURSES_VERSION
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_NCURSES_HEADER version: 1 updated: 2005/12/31 13:28:37
+dnl -----------------
+dnl Find a "curses" header file, e.g,. "curses.h", or one of the more common
+dnl variations of ncurses' installs.
+dnl
+dnl See also CF_CURSES_HEADER, which sets the same cache variable.
+AC_DEFUN([CF_NCURSES_HEADER],[
+
 if test "$cf_cv_ncurses_h" != no ; then
 	cf_cv_ncurses_header=$cf_cv_ncurses_h
 else
+
 AC_CACHE_CHECK(for $cf_ncuhdr_root include-path, cf_cv_ncurses_h2,[
 	test -n "$verbose" && echo
 	CF_HEADER_PATH(cf_search,$cf_ncuhdr_root)
@@ -1909,7 +1964,7 @@
 
 fi
 
-AC_DEFINE(NCURSES)
+# Set definitions to allow ifdef'ing for ncurses.h
 
 case $cf_cv_ncurses_header in # (vi
 *ncurses.h)
@@ -1926,7 +1981,6 @@
 	;;
 esac
 
-CF_NCURSES_VERSION
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_NCURSES_LIBS version: 12 updated: 2004/04/27 16:26:05
@@ -2093,7 +2147,7 @@
 	AC_SUBST(PATHSEP)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_PATH_SYNTAX version: 9 updated: 2002/09/17 23:03:38
+dnl CF_PATH_SYNTAX version: 10 updated: 2006/01/02 19:36:00
 dnl --------------
 dnl Check the argument to see that it looks like a pathname.  Rewrite it if it
 dnl begins with one of the prefix/exec_prefix variables, and then again if the
@@ -2115,7 +2169,7 @@
     ;;
   esac
   ;; #(vi
-.NONE/*)
+.no|.NONE/*)
   $1=`echo [$]$1 | sed -e s%NONE%$ac_default_prefix%`
   ;;
 *)
@@ -2634,6 +2688,53 @@
 fi
 ])])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_TERM_HEADER version: 1 updated: 2005/12/31 13:26:39
+dnl --------------
+dnl Look for term.h, which is part of X/Open curses.  It defines the interface
+dnl to terminfo database.  Usually it is in the same include-path as curses.h,
+dnl but some packagers change this, breaking various applications.
+AC_DEFUN([CF_TERM_HEADER],[
+AC_CACHE_CHECK(for terminfo header, cf_cv_term_header,[
+case ${cf_cv_ncurses_header} in #(vi
+*/ncurses.h|*/ncursesw.h) #(vi
+	cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[[^.]]*\.h$%term.h%'`
+	;;
+*)
+	cf_term_header=term.h
+	;;
+esac
+
+for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+do
+AC_TRY_COMPILE([#include <stdio.h>
+#include <${cf_cv_ncurses_header-curses.h}>
+#include <$cf_test>
+],[int x = auto_left_margin],[
+	cf_cv_term_header="$cf_test"],[
+	cf_cv_term_header=unknown
+	])
+	test "$cf_cv_term_header" != unknown && break
+done
+])
+
+# Set definitions to allow ifdef'ing to accommodate subdirectories
+
+case $cf_cv_term_header in # (vi
+*term.h)
+	AC_DEFINE(HAVE_TERM_H)
+	;;
+esac
+
+case $cf_cv_term_header in # (vi
+ncurses/term.h) #(vi
+	AC_DEFINE(HAVE_NCURSES_TERM_H)
+	;;
+ncursesw/term.h)
+	AC_DEFINE(HAVE_NCURSESW_TERM_H)
+	;;
+esac
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_TYPE_FD_SET version: 3 updated: 1999/10/16 13:49:00
 dnl --------------
 dnl Check for the declaration of fd_set.  Some platforms declare it in
@@ -2837,12 +2938,13 @@
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_IMAKE_CFLAGS version: 7 updated: 2005/04/05 18:26:15
+dnl CF_WITH_IMAKE_CFLAGS version: 8 updated: 2005/11/02 15:04:41
 dnl --------------------
 dnl xterm and similar programs build more readily when propped up with imake's
 dnl hand-tuned definitions.  If we do not use imake, provide fallbacks for the
 dnl most common definitions that we're not likely to do by autoconf tests.
 AC_DEFUN([CF_WITH_IMAKE_CFLAGS],[
+AC_REQUIRE([CF_ENABLE_NARROWPROTO])
 
 AC_MSG_CHECKING(if we should use imake to help)
 CF_ARG_DISABLE(imake,
@@ -2889,10 +2991,9 @@
 	IMAKE_CFLAGS="-DFUNCPROTO=15 $IMAKE_CFLAGS"
 
 	# If this is not set properly, Xaw's scrollbars will not work
-	case `$ac_config_guess` in
-	*freebsd*|*gnu*|*irix5*|*irix6*|*linux-gnu*|*netbsd*|*openbsd*)
+	if test "$enable_narrowproto" = yes ; then
 		IMAKE_CFLAGS="-DNARROWPROTO=1 $IMAKE_CFLAGS"
-	esac
+	fi
 
 	# Other special definitions:
 	case $host_os in
@@ -2978,10 +3079,11 @@
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_XOPEN_SOURCE version: 22 updated: 2005/08/06 18:06:32
+dnl CF_XOPEN_SOURCE version: 24 updated: 2006/04/02 16:41:09
 dnl ---------------
 dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
-dnl or adapt to the vendor's definitions to get equivalent functionality.
+dnl or adapt to the vendor's definitions to get equivalent functionality,
+dnl without losing the common non-POSIX features.
 dnl
 dnl Parameters:
 dnl	$1 is the nominal value for _XOPEN_SOURCE
@@ -2997,9 +3099,6 @@
 aix[[45]]*) #(vi
 	CPPFLAGS="$CPPFLAGS -D_ALL_SOURCE"
 	;;
-darwin*) #(vi
-	# setting _XOPEN_SOURCE breaks things on Darwin
-	;;
 freebsd*) #(vi
 	# 5.x headers associate
 	#	_XOPEN_SOURCE=600 with _POSIX_C_SOURCE=200112L
Index: bind.c
Prereq:  1.291 
--- vile-9.5g+/bind.c	2005-12-26 00:28:04.000000000 +0000
+++ vile-9.5h/bind.c	2006-05-21 22:34:06.000000000 +0000
@@ -3,7 +3,7 @@
  *
  *	written 11-feb-86 by Daniel Lawrence
  *
- * $Header: /usr/build/vile/vile/RCS/bind.c,v 1.291 2005/12/26 00:28:04 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/bind.c,v 1.296 2006/05/21 22:34:06 tom Exp $
  *
  */
 
@@ -44,7 +44,7 @@
 #endif /* OPT_REBIND */
 
 #if OPT_NAMEBST
-static int kbd_complete_bst(unsigned flags, int c, char *buf, unsigned *pos);
+static int kbd_complete_bst(unsigned flags, int c, char *buf, size_t *pos);
 #else
 #define kbd_complete_bst(params) \
 	kbd_complete(params, \
@@ -341,12 +341,12 @@
 
 static int
 /*ARGSUSED*/
-chr_eol(
-	   const char *buffer GCC_UNUSED,
-	   unsigned cpos GCC_UNUSED,
-	   int c GCC_UNUSED,
-	   int eolchar GCC_UNUSED)
+chr_eol(EOL_ARGS)
 {
+    (void) buffer;
+    (void) cpos;
+    (void) eolchar;
+
     return isSpace(c);
 }
 
@@ -1014,7 +1014,7 @@
 static char *
 to_tabstop(char *buffer)
 {
-    unsigned len = strlen(buffer);
+    size_t len = strlen(buffer);
     unsigned cpos = converted_len(buffer);
     if (cpos & 7 || (len != 0 && !isBlank(buffer[len - 1])))
 	(void) strcat(buffer, "\t");
@@ -1337,12 +1337,12 @@
     if (anchor && *needle == '^') {
 	return strcmp(needle + 1, haystack) ? 0 : 1;
     } else {
-	int nl = strlen(needle);
-	int hl = strlen(haystack);
+	size_t nl = strlen(needle);
+	size_t hl = strlen(haystack);
 	const char *hp = haystack;
 	while (hl >= nl && *hp) {
-	    if (!strncmp(hp, needle, (size_t) nl))
-		return hp - haystack + 1;
+	    if (!strncmp(hp, needle, nl))
+		return (int) (hp - haystack + 1);
 	    hp++;
 	    hl--;
 	}
@@ -1638,7 +1638,7 @@
  * code.
  */
 int
-kcod2escape_seq(int c, char *ptr, int limit)
+kcod2escape_seq(int c, char *ptr, size_t limit)
 {
     char *base = ptr;
 
@@ -1650,7 +1650,7 @@
 
 #if OPT_KEY_MODIFY
 	if (c & mod_KEY) {
-	    int len;
+	    size_t len;
 	    unsigned n;
 	    for (n = 0; n < TABLESIZE(key_modifiers); ++n) {
 		if (c & key_modifiers[n].code) {
@@ -1999,11 +1999,11 @@
 	if (bits == 0 && len > 3 && *(kk + 2) == '-') {
 	    if (*kk == '^') {
 		ch = (UCHAR) (kk[1]);
-		if (isCntrl(cntl_a) && ch == toalpha(cntl_a))
+		if (isCntrl(cntl_a) && ch == (UCHAR) toalpha(cntl_a))
 		    bits = CTLA;
-		if (isCntrl(cntl_x) && ch == toalpha(cntl_x))
+		if (isCntrl(cntl_x) && ch == (UCHAR) toalpha(cntl_x))
 		    bits = CTLX;
-		if (isCntrl(poundc) && ch == toalpha(poundc))
+		if (isCntrl(poundc) && ch == (UCHAR) toalpha(poundc))
 		    bits = SPEC;
 	    } else if (!strncmp(kk, "FN", 2)) {
 		bits = SPEC;
@@ -2041,7 +2041,7 @@
 	char temp[NSTRING];
 
 	while ((s = strchr(kk, '+')) != 0) {
-	    if ((len = (s - kk) + 1) >= (int) sizeof(temp))
+	    if ((len = (UINT) (s - kk) + 1) >= sizeof(temp))
 		break;
 	    if (s == kk || s[1] == '\n' || s[1] == '\0')
 		break;
@@ -2383,7 +2383,7 @@
     const char *last = skip_partial(case_insensitive, buf, len, first, size_entry);
     const char *p;
     size_t maxlen;
-    int slashcol;
+    size_t slashcol;
     int cmpllen;
     int cmplcols;
     int cmplrows;
@@ -2401,19 +2401,19 @@
     slashcol = (int) (pathleaf(buf) - buf);
     if (slashcol != 0) {
 	char b[NLINE];
-	(void) strncpy(b, buf, (size_t) slashcol);
+	(void) strncpy(b, buf, slashcol);
 	(void) strncpy(&b[slashcol], &(THIS_NAME(first))[slashcol],
 		       (len - slashcol));
 	b[slashcol + (len - slashcol)] = EOS;
 	bprintf("Completions prefixed by %s:\n", b);
     }
 
-    cmplcols = term.cols / (maxlen - slashcol + 1);
+    cmplcols = term.cols / (int) (maxlen - slashcol + 1);
 
     if (cmplcols == 0)
 	cmplcols = 1;
 
-    nentries = (int) (last - first) / size_entry;
+    nentries = (int) ((last - first) / size_entry);
     cmplrows = nentries / cmplcols;
     cmpllen = term.cols / cmplcols;
     if (cmplrows * cmplcols < nentries)
@@ -2771,7 +2771,7 @@
  * repeated characters (but they must all be the same).
  */
 static int
-is_shift_cmd(const char *buffer, unsigned cpos)
+is_shift_cmd(const char *buffer, size_t cpos)
 {
     if (buffer != 0) {
 	int c = *buffer;
@@ -2809,7 +2809,7 @@
 #define ismostpunct(c) (isPunct(c) && (c) != '-' && (c) != '_')
 
 int
-eol_command(const char *buffer, unsigned cpos, int c, int eolchar)
+eol_command(EOL_ARGS)
 {
     /*
      * Handle special case of repeated-character implying repeat-count
@@ -2852,7 +2852,7 @@
 	 * ">>>").
 	 */
 	if ((*pos > 1) && is_shift_cmd(buf, *pos)) {
-	    unsigned len = 1;
+	    size_t len = 1;
 	    char tmp[NLINE];
 	    tmp[0] = *buf;
 	    tmp[1] = EOS;
@@ -3070,9 +3070,9 @@
 		    unsigned flags GCC_UNUSED,
 		    int c,	/* TESTC, NAMEC or isreturn() */
 		    char *buf,
-		    unsigned *pos)
+		    size_t *pos)
 {
-    unsigned cpos = *pos;
+    unsigned cpos = (unsigned) *pos;
     int status = FALSE;
     const char **nptr;
 
Index: btree.c
Prereq:  1.22 
--- vile-9.5g+/btree.c	2006-01-10 01:19:19.000000000 +0000
+++ vile-9.5h/btree.c	2006-04-25 20:13:46.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * $Id: btree.c,v 1.22 2006/01/10 01:19:19 tom Exp $
+ * $Id: btree.c,v 1.23 2006/04/25 20:13:46 tom Exp $
  * Copyright 1997-2005 by Thomas E. Dickey
  *
  * Maintains a balanced binary tree (aka AVL tree) of unspecified nodes.  The
@@ -691,7 +691,7 @@
  * the given length 'len'.
  */
 const char **
-btree_parray(BI_TREE * tree, char *name, unsigned len)
+btree_parray(BI_TREE * tree, char *name, size_t len)
 {
     BI_NODE *top;
     const char **nptr = 0;
Index: btree.h
Prereq:  1.4 
--- vile-9.5g+/btree.h	2001-12-21 12:19:24.000000000 +0000
+++ vile-9.5h/btree.h	2006-04-25 20:13:37.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * $Id: btree.h,v 1.4 2001/12/21 12:19:24 tom Exp $
+ * $Id: btree.h,v 1.5 2006/04/25 20:13:37 tom Exp $
  *
  * Interface for btree.c
  */
@@ -42,7 +42,7 @@
 extern	int	 btree_delete(BI_TREE *tree, const char *data);
 extern	int	 btree_freeup(BI_TREE *tree);
 extern	BI_DATA *btree_insert(BI_TREE *tree, BI_DATA *data);
-extern	const char **btree_parray(BI_TREE *tree, char *name, unsigned len);
+extern	const char **btree_parray(BI_TREE *tree, char *name, size_t len);
 extern	BI_NODE *btree_pmatch(BI_NODE *n, const int mode, const char *name);
 extern	void	 btree_printf(BI_TREE *tree);
 extern	BI_DATA *btree_search(BI_TREE *tree, const char *data);
Index: buffer.c
Prereq:  1.298 
--- vile-9.5g+/buffer.c	2005-12-25 22:00:59.000000000 +0000
+++ vile-9.5h/buffer.c	2006-04-25 20:14:32.000000000 +0000
@@ -5,7 +5,7 @@
  * keys. Like everyone else, they set hints
  * for the display system.
  *
- * $Header: /usr/build/vile/vile/RCS/buffer.c,v 1.298 2005/12/25 22:00:59 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/buffer.c,v 1.299 2006/04/25 20:14:32 tom Exp $
  *
  */
 
@@ -766,7 +766,7 @@
 static int
 bname_complete(DONE_ARGS)
 {
-    unsigned cpos = *pos;
+    size_t cpos = *pos;
     int status = FALSE;
     char **nptr;
 
Index: config.guess
--- vile-9.5g+/config.guess	2005-09-24 19:51:40.000000000 +0000
+++ vile-9.5h/config.guess	2005-11-12 10:38:42.000000000 +0000
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2005-09-19'
+timestamp='2005-11-11'
 
 # 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
@@ -214,11 +214,11 @@
 	exit ;;
     alpha:OSF1:*:*)
 	case $UNAME_RELEASE in
-	*4.0)
+	    *4.0)
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 		;;
-	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+	    *5.*)
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 		;;
 	esac
 	# According to Compaq, /usr/sbin/psrinfo has been available on
@@ -290,7 +290,7 @@
 	echo s390-ibm-zvmoe
 	exit ;;
     *:OS400:*:*)
-        echo powerpc-ibm-os400
+	echo powerpc-ibm-os400
 	exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
@@ -745,14 +745,14 @@
 	exit ;;
     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}"
+	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 ;;
     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 ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -773,13 +773,13 @@
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
     i*:windows32*:*)
-    	# uname -m includes "-pc" on this system.
-    	echo ${UNAME_MACHINE}-mingw32
+	# uname -m includes "-pc" on this system.
+	echo ${UNAME_MACHINE}-mingw32
 	exit ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    x86:Interix*:[34]*)
+    x86:Interix*:[345]*)
 	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
 	exit ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
@@ -824,7 +824,7 @@
 	echo crisv32-axis-linux-gnu
 	exit ;;
     frv:Linux:*:*)
-    	echo frv-unknown-linux-gnu
+	echo frv-unknown-linux-gnu
 	exit ;;
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -874,8 +874,8 @@
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     or32:Linux:*:*)
-	echo or32-unknown-linux-gnu
-	exit ;;
+    	echo or32-unknown-linux-gnu
+    	exit ;;
     ppc:Linux:*:*)
 	echo powerpc-unknown-linux-gnu
 	exit ;;
@@ -911,7 +911,7 @@
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit ;;
     sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -1024,7 +1024,7 @@
 	fi
 	exit ;;
     i*86:*:5:[678]*)
-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
@@ -1192,8 +1192,8 @@
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
 	UNAME_PROCESSOR=`uname -p`
 	if test "$UNAME_PROCESSOR" = "x86"; then
-		UNAME_PROCESSOR=i386
-		UNAME_MACHINE=pc
+	    UNAME_PROCESSOR=i386
+	    UNAME_MACHINE=pc
 	fi
 	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
 	exit ;;
@@ -1245,13 +1245,13 @@
 	echo pdp10-unknown-its
 	exit ;;
     SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
+	echo mips-sei-seiux${UNAME_RELEASE}
 	exit ;;
     *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit ;;
     *:*VMS:*:*)
-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 	case "${UNAME_MACHINE}" in
 	    A*) echo alpha-dec-vms ; exit ;;
 	    I*) echo ia64-dec-vms ; exit ;;
Index: config.sub
--- vile-9.5g+/config.sub	2005-09-24 19:51:26.000000000 +0000
+++ vile-9.5h/config.sub	2005-11-13 22:12:32.000000000 +0000
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2005-07-08'
+timestamp='2005-11-13'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -171,6 +171,10 @@
 	-hiux*)
 		os=-hiuxwe2
 		;;
+	-sco6)
+		os=-sco5v6
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
 	-sco5)
 		os=-sco3.2v5
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -187,6 +191,10 @@
 		# Don't forget version if it is 3.2v4 or newer.
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
+	-sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
 	-sco*)
 		os=-sco3.2v2
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -291,8 +299,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
@@ -377,7 +385,7 @@
 		basic_machine=a29k-amd
 		os=-udi
 		;;
-    	abacus)
+	abacus)
 		basic_machine=abacus-unknown
 		;;
 	adobe68k)
@@ -1145,8 +1153,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|'`
@@ -1188,7 +1196,7 @@
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku*)
+	      | -skyos* | haiku*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1227,7 +1235,7 @@
 	-opened*)
 		os=-openedition
 		;;
-        -os400*)
+	-os400*)
 		os=-os400
 		;;
 	-wince*)
@@ -1276,7 +1284,7 @@
 	-sinix*)
 		os=-sysv4
 		;;
-        -tpf*)
+	-tpf*)
 		os=-tpf
 		;;
 	-triton*)
@@ -1349,9 +1357,9 @@
 	arm*-semi)
 		os=-aout
 		;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
+	c4x-* | tic4x-*)
+		os=-coff
+		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
@@ -1401,7 +1409,7 @@
 	*-ibm)
 		os=-aix
 		;;
-    	*-knuth)
+	*-knuth)
 		os=-mmixware
 		;;
 	*-wec)
Index: configure
--- vile-9.5g+/configure	2005-11-23 12:29:01.000000000 +0000
+++ vile-9.5h/configure	2006-04-09 13:55:59.000000000 +0000
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.220 .
+# From configure.in Revision: 1.222 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20030208.
 #
@@ -703,6 +703,7 @@
 			  Athena, Xaw, Xaw3d, neXtaw and ansi.
   --with-scr=value        (same as --with-screen)
   --with-x                use the X Window System
+  --enable-narrowproto    enable narrow prototypes for X libraries
   --disable-imake         disable use of imake for definitions
   --with-Xaw3d            link with Xaw 3d library
   --with-neXtaw           link with neXT Athena library
@@ -916,7 +917,7 @@
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
-    { echo "$as_me:919: loading site script $ac_site_file" >&5
+    { echo "$as_me:920: loading site script $ac_site_file" >&5
 echo "$as_me: loading site script $ac_site_file" >&6;}
     cat "$ac_site_file" >&5
     . "$ac_site_file"
@@ -927,7 +928,7 @@
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { echo "$as_me:930: loading cache $cache_file" >&5
+    { echo "$as_me:931: loading cache $cache_file" >&5
 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . $cache_file;;
@@ -935,7 +936,7 @@
     esac
   fi
 else
-  { echo "$as_me:938: creating cache $cache_file" >&5
+  { echo "$as_me:939: creating cache $cache_file" >&5
 echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -951,21 +952,21 @@
   eval ac_new_val="\$ac_env_${ac_var}_value"
   case $ac_old_set,$ac_new_set in
     set,)
-      { echo "$as_me:954: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { echo "$as_me:955: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { echo "$as_me:958: error: \`$ac_var' was not set in the previous run" >&5
+      { echo "$as_me:959: error: \`$ac_var' was not set in the previous run" >&5
 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-        { echo "$as_me:964: error: \`$ac_var' has changed since the previous run:" >&5
+        { echo "$as_me:965: error: \`$ac_var' has changed since the previous run:" >&5
 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-        { echo "$as_me:966:   former value:  $ac_old_val" >&5
+        { echo "$as_me:967:   former value:  $ac_old_val" >&5
 echo "$as_me:   former value:  $ac_old_val" >&2;}
-        { echo "$as_me:968:   current value: $ac_new_val" >&5
+        { echo "$as_me:969:   current value: $ac_new_val" >&5
 echo "$as_me:   current value: $ac_new_val" >&2;}
         ac_cache_corrupted=:
       fi;;
@@ -984,9 +985,9 @@
   fi
 done
 if $ac_cache_corrupted; then
-  { echo "$as_me:987: error: changes in the environment can compromise the build" >&5
+  { echo "$as_me:988: error: changes in the environment can compromise the build" >&5
 echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:989: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+  { { echo "$as_me:990: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1006,10 +1007,10 @@
 echo "#! $SHELL" >conftest.sh
 echo  "exit 0"   >>conftest.sh
 chmod +x conftest.sh
-if { (echo "$as_me:1009: PATH=\".;.\"; conftest.sh") >&5
+if { (echo "$as_me:1010: PATH=\".;.\"; conftest.sh") >&5
   (PATH=".;."; conftest.sh) 2>&5
   ac_status=$?
-  echo "$as_me:1012: \$? = $ac_status" >&5
+  echo "$as_me:1013: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   ac_path_separator=';'
 else
@@ -1037,7 +1038,7 @@
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:1040: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+  { { echo "$as_me:1041: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1047,11 +1048,11 @@
 
 # Make sure we can run config.sub.
 $ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:1050: error: cannot run $ac_config_sub" >&5
+  { { echo "$as_me:1051: error: cannot run $ac_config_sub" >&5
 echo "$as_me: error: cannot run $ac_config_sub" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:1054: checking build system type" >&5
+echo "$as_me:1055: checking build system type" >&5
 echo $ECHO_N "checking build system type... $ECHO_C" >&6
 if test "${ac_cv_build+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1060,16 +1061,16 @@
 test -z "$ac_cv_build_alias" &&
   ac_cv_build_alias=`$ac_config_guess`
 test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:1063: error: cannot guess build type; you must specify one" >&5
+  { { echo "$as_me:1064: error: cannot guess build type; you must specify one" >&5
 echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    { (exit 1); exit 1; }; }
 ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-  { { echo "$as_me:1067: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+  { { echo "$as_me:1068: error: $ac_config_sub $ac_cv_build_alias failed." >&5
 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:1072: result: $ac_cv_build" >&5
+echo "$as_me:1073: result: $ac_cv_build" >&5
 echo "${ECHO_T}$ac_cv_build" >&6
 build=$ac_cv_build
 build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
@@ -1077,7 +1078,7 @@
 build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 
 if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then
-	echo "$as_me:1080: checking host system type" >&5
+	echo "$as_me:1081: checking host system type" >&5
 echo $ECHO_N "checking host system type... $ECHO_C" >&6
 if test "${ac_cv_host+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1086,12 +1087,12 @@
 test -z "$ac_cv_host_alias" &&
   ac_cv_host_alias=$ac_cv_build_alias
 ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-  { { echo "$as_me:1089: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+  { { echo "$as_me:1090: error: $ac_config_sub $ac_cv_host_alias failed" >&5
 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:1094: result: $ac_cv_host" >&5
+echo "$as_me:1095: result: $ac_cv_host" >&5
 echo "${ECHO_T}$ac_cv_host" >&6
 host=$ac_cv_host
 host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
@@ -1116,13 +1117,13 @@
 fi
 
 test -z "$system_name" && system_name="$cf_cv_system_name"
-test -n "$cf_cv_system_name" && echo "$as_me:1119: result: Configuring for $cf_cv_system_name" >&5
+test -n "$cf_cv_system_name" && echo "$as_me:1120: result: Configuring for $cf_cv_system_name" >&5
 echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6
 
 if test ".$system_name" != ".$cf_cv_system_name" ; then
-	echo "$as_me:1123: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
+	echo "$as_me:1124: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
 echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6
-	{ { echo "$as_me:1125: error: \"Please remove config.cache and try again.\"" >&5
+	{ { echo "$as_me:1126: error: \"Please remove config.cache and try again.\"" >&5
 echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1136,7 +1137,7 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:1139: checking for $ac_word" >&5
+echo "$as_me:1140: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1151,7 +1152,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}gcc"
-echo "$as_me:1154: found $ac_dir/$ac_word" >&5
+echo "$as_me:1155: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1159,10 +1160,10 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1162: result: $CC" >&5
+  echo "$as_me:1163: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1165: result: no" >&5
+  echo "$as_me:1166: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1171,7 +1172,7 @@
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-echo "$as_me:1174: checking for $ac_word" >&5
+echo "$as_me:1175: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1186,7 +1187,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="gcc"
-echo "$as_me:1189: found $ac_dir/$ac_word" >&5
+echo "$as_me:1190: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1194,10 +1195,10 @@
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1197: result: $ac_ct_CC" >&5
+  echo "$as_me:1198: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1200: result: no" >&5
+  echo "$as_me:1201: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1210,7 +1211,7 @@
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:1213: checking for $ac_word" >&5
+echo "$as_me:1214: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1225,7 +1226,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}cc"
-echo "$as_me:1228: found $ac_dir/$ac_word" >&5
+echo "$as_me:1229: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1233,10 +1234,10 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1236: result: $CC" >&5
+  echo "$as_me:1237: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1239: result: no" >&5
+  echo "$as_me:1240: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1245,7 +1246,7 @@
   ac_ct_CC=$CC
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:1248: checking for $ac_word" >&5
+echo "$as_me:1249: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1260,7 +1261,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="cc"
-echo "$as_me:1263: found $ac_dir/$ac_word" >&5
+echo "$as_me:1264: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1268,10 +1269,10 @@
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1271: result: $ac_ct_CC" >&5
+  echo "$as_me:1272: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1274: result: no" >&5
+  echo "$as_me:1275: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1284,7 +1285,7 @@
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:1287: checking for $ac_word" >&5
+echo "$as_me:1288: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1304,7 +1305,7 @@
   continue
 fi
 ac_cv_prog_CC="cc"
-echo "$as_me:1307: found $ac_dir/$ac_word" >&5
+echo "$as_me:1308: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1326,10 +1327,10 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1329: result: $CC" >&5
+  echo "$as_me:1330: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1332: result: no" >&5
+  echo "$as_me:1333: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1340,7 +1341,7 @@
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:1343: checking for $ac_word" >&5
+echo "$as_me:1344: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1355,7 +1356,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-echo "$as_me:1358: found $ac_dir/$ac_word" >&5
+echo "$as_me:1359: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1363,10 +1364,10 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1366: result: $CC" >&5
+  echo "$as_me:1367: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1369: result: no" >&5
+  echo "$as_me:1370: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1379,7 +1380,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:1382: checking for $ac_word" >&5
+echo "$as_me:1383: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1394,7 +1395,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="$ac_prog"
-echo "$as_me:1397: found $ac_dir/$ac_word" >&5
+echo "$as_me:1398: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1402,10 +1403,10 @@
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1405: result: $ac_ct_CC" >&5
+  echo "$as_me:1406: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1408: result: no" >&5
+  echo "$as_me:1409: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1417,32 +1418,32 @@
 
 fi
 
-test -z "$CC" && { { echo "$as_me:1420: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:1421: error: no acceptable cc found in \$PATH" >&5
 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:1425:" \
+echo "$as_me:1426:" \
      "checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:1428: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1429: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1431: \$? = $ac_status" >&5
+  echo "$as_me:1432: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:1433: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1434: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1436: \$? = $ac_status" >&5
+  echo "$as_me:1437: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:1438: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1439: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1441: \$? = $ac_status" >&5
+  echo "$as_me:1442: \$? = $ac_status" >&5
   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 1445 "configure"
+#line 1446 "configure"
 #include "confdefs.h"
 
 int
@@ -1458,13 +1459,13 @@
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-echo "$as_me:1461: checking for C compiler default output" >&5
+echo "$as_me:1462: checking for C compiler default output" >&5
 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:1464: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:1465: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5
   ac_status=$?
-  echo "$as_me:1467: \$? = $ac_status" >&5
+  echo "$as_me:1468: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # Find the output, starting from the most likely.  This scheme is
 # not robust to junk in `.', hence go to wildcards (a.*) only as a last
@@ -1487,34 +1488,34 @@
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:1490: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:1491: error: C compiler cannot create executables" >&5
 echo "$as_me: error: C compiler cannot create executables" >&2;}
    { (exit 77); exit 77; }; }
 fi
 
 ac_exeext=$ac_cv_exeext
-echo "$as_me:1496: result: $ac_file" >&5
+echo "$as_me:1497: result: $ac_file" >&5
 echo "${ECHO_T}$ac_file" >&6
 
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:1501: checking whether the C compiler works" >&5
+echo "$as_me:1502: checking whether the C compiler works" >&5
 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
   if { ac_try='./$ac_file'
-  { (eval echo "$as_me:1507: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1508: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1510: \$? = $ac_status" >&5
+  echo "$as_me:1511: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:1517: error: cannot run C compiled programs.
+	{ { echo "$as_me:1518: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'." >&5
 echo "$as_me: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'." >&2;}
@@ -1522,24 +1523,24 @@
     fi
   fi
 fi
-echo "$as_me:1525: result: yes" >&5
+echo "$as_me:1526: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 rm -f a.out a.exe conftest$ac_cv_exeext
 ac_clean_files=$ac_clean_files_save
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:1532: checking whether we are cross compiling" >&5
+echo "$as_me:1533: checking whether we are cross compiling" >&5
 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:1534: result: $cross_compiling" >&5
+echo "$as_me:1535: result: $cross_compiling" >&5
 echo "${ECHO_T}$cross_compiling" >&6
 
-echo "$as_me:1537: checking for executable suffix" >&5
+echo "$as_me:1538: checking for executable suffix" >&5
 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:1539: \"$ac_link\"") >&5
+if { (eval echo "$as_me:1540: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:1542: \$? = $ac_status" >&5
+  echo "$as_me:1543: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
@@ -1555,25 +1556,25 @@
   esac
 done
 else
-  { { echo "$as_me:1558: error: cannot compute EXEEXT: cannot compile and link" >&5
+  { { echo "$as_me:1559: error: cannot compute EXEEXT: cannot compile and link" >&5
 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest$ac_cv_exeext
-echo "$as_me:1564: result: $ac_cv_exeext" >&5
+echo "$as_me:1565: result: $ac_cv_exeext" >&5
 echo "${ECHO_T}$ac_cv_exeext" >&6
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-echo "$as_me:1570: checking for object suffix" >&5
+echo "$as_me:1571: checking for object suffix" >&5
 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
 if test "${ac_cv_objext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 1576 "configure"
+#line 1577 "configure"
 #include "confdefs.h"
 
 int
@@ -1585,10 +1586,10 @@
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:1588: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1589: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1591: \$? = $ac_status" >&5
+  echo "$as_me:1592: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
   case $ac_file in
@@ -1600,24 +1601,24 @@
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:1603: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:1604: error: cannot compute OBJEXT: cannot compile" >&5
 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-echo "$as_me:1610: result: $ac_cv_objext" >&5
+echo "$as_me:1611: result: $ac_cv_objext" >&5
 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:1614: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:1615: checking whether we are using the GNU C compiler" >&5
 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 1620 "configure"
+#line 1621 "configure"
 #include "confdefs.h"
 
 int
@@ -1632,16 +1633,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1635: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1636: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1638: \$? = $ac_status" >&5
+  echo "$as_me:1639: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1641: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1642: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1644: \$? = $ac_status" >&5
+  echo "$as_me:1645: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_compiler_gnu=yes
 else
@@ -1653,19 +1654,19 @@
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:1656: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:1657: result: $ac_cv_c_compiler_gnu" >&5
 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
 GCC=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 CFLAGS="-g"
-echo "$as_me:1662: checking whether $CC accepts -g" >&5
+echo "$as_me:1663: checking whether $CC accepts -g" >&5
 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 1668 "configure"
+#line 1669 "configure"
 #include "confdefs.h"
 
 int
@@ -1677,16 +1678,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1680: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1681: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1683: \$? = $ac_status" >&5
+  echo "$as_me:1684: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1686: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1687: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1689: \$? = $ac_status" >&5
+  echo "$as_me:1690: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_cc_g=yes
 else
@@ -1696,7 +1697,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:1699: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:1700: result: $ac_cv_prog_cc_g" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
@@ -1723,16 +1724,16 @@
 #endif
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1726: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1727: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1729: \$? = $ac_status" >&5
+  echo "$as_me:1730: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1732: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1733: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1735: \$? = $ac_status" >&5
+  echo "$as_me:1736: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   for ac_declaration in \
    ''\
@@ -1744,7 +1745,7 @@
    'void exit (int);'
 do
   cat >conftest.$ac_ext <<_ACEOF
-#line 1747 "configure"
+#line 1748 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -1757,16 +1758,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1760: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1761: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1763: \$? = $ac_status" >&5
+  echo "$as_me:1764: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1766: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1767: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1769: \$? = $ac_status" >&5
+  echo "$as_me:1770: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -1776,7 +1777,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 1779 "configure"
+#line 1780 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -1788,16 +1789,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1791: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1792: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1794: \$? = $ac_status" >&5
+  echo "$as_me:1795: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1797: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1798: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1800: \$? = $ac_status" >&5
+  echo "$as_me:1801: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -1829,7 +1830,7 @@
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:1832: checking how to run the C preprocessor" >&5
+echo "$as_me:1833: checking how to run the C preprocessor" >&5
 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
@@ -1850,18 +1851,18 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
-#line 1853 "configure"
+#line 1854 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:1858: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:1859: \"$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:1864: \$? = $ac_status" >&5
+  echo "$as_me:1865: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -1884,17 +1885,17 @@
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line 1887 "configure"
+#line 1888 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:1891: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:1892: \"$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:1897: \$? = $ac_status" >&5
+  echo "$as_me:1898: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -1931,7 +1932,7 @@
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:1934: result: $CPP" >&5
+echo "$as_me:1935: result: $CPP" >&5
 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -1941,18 +1942,18 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
-#line 1944 "configure"
+#line 1945 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:1949: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:1950: \"$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:1955: \$? = $ac_status" >&5
+  echo "$as_me:1956: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -1975,17 +1976,17 @@
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line 1978 "configure"
+#line 1979 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:1982: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:1983: \"$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:1988: \$? = $ac_status" >&5
+  echo "$as_me:1989: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2013,7 +2014,7 @@
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:2016: error: C preprocessor \"$CPP\" fails sanity check" >&5
+  { { echo "$as_me:2017: error: C preprocessor \"$CPP\" fails sanity check" >&5
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -2025,14 +2026,14 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 if test $ac_cv_c_compiler_gnu = yes; then
-    echo "$as_me:2028: checking whether $CC needs -traditional" >&5
+    echo "$as_me:2029: checking whether $CC needs -traditional" >&5
 echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6
 if test "${ac_cv_prog_gcc_traditional+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
     ac_pattern="Autoconf.*'x'"
   cat >conftest.$ac_ext <<_ACEOF
-#line 2035 "configure"
+#line 2036 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
 int Autoconf = TIOCGETP;
@@ -2047,7 +2048,7 @@
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat >conftest.$ac_ext <<_ACEOF
-#line 2050 "configure"
+#line 2051 "configure"
 #include "confdefs.h"
 #include <termio.h>
 int Autoconf = TCGETA;
@@ -2060,7 +2061,7 @@
 
   fi
 fi
-echo "$as_me:2063: result: $ac_cv_prog_gcc_traditional" >&5
+echo "$as_me:2064: result: $ac_cv_prog_gcc_traditional" >&5
 echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6
   if test $ac_cv_prog_gcc_traditional = yes; then
     CC="$CC -traditional"
@@ -2069,10 +2070,10 @@
 
 ###	checks for UNIX variants that set C preprocessor variables
 
-echo "$as_me:2072: checking for AIX" >&5
+echo "$as_me:2073: checking for AIX" >&5
 echo $ECHO_N "checking for AIX... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 2075 "configure"
+#line 2076 "configure"
 #include "confdefs.h"
 #ifdef _AIX
   yes
@@ -2081,24 +2082,24 @@
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   egrep "yes" >/dev/null 2>&1; then
-  echo "$as_me:2084: result: yes" >&5
+  echo "$as_me:2085: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 cat >>confdefs.h <<\EOF
 #define _ALL_SOURCE 1
 EOF
 
 else
-  echo "$as_me:2091: result: no" >&5
+  echo "$as_me:2092: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 rm -f conftest*
 
-echo "$as_me:2096: checking for POSIXized ISC" >&5
+echo "$as_me:2097: 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:2101: result: yes" >&5
+  echo "$as_me:2102: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   ISC=yes # If later tests want to check for ISC.
 
@@ -2112,28 +2113,28 @@
     CC="$CC -Xp"
   fi
 else
-  echo "$as_me:2115: result: no" >&5
+  echo "$as_me:2116: result: no" >&5
 echo "${ECHO_T}no" >&6
   ISC=
 fi
 
-echo "$as_me:2120: checking for minix/config.h" >&5
+echo "$as_me:2121: 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 2126 "configure"
+#line 2127 "configure"
 #include "confdefs.h"
 #include <minix/config.h>
 _ACEOF
-if { (eval echo "$as_me:2130: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2131: \"$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:2136: \$? = $ac_status" >&5
+  echo "$as_me:2137: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2152,7 +2153,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:2155: result: $ac_cv_header_minix_config_h" >&5
+echo "$as_me:2156: 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
@@ -2183,12 +2184,12 @@
 if test "$" = yes ; then
 	case $host_os in
 	linux*|gnu*)
-		echo "$as_me:2186: checking if this is really Intel C compiler" >&5
+		echo "$as_me:2187: checking if this is really Intel C compiler" >&5
 echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS -no-gcc"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 2191 "configure"
+#line 2192 "configure"
 #include "confdefs.h"
 
 int
@@ -2205,16 +2206,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2208: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2209: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2211: \$? = $ac_status" >&5
+  echo "$as_me:2212: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2214: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2215: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2217: \$? = $ac_status" >&5
+  echo "$as_me:2218: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
@@ -2225,7 +2226,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 		CFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:2228: result: $INTEL_COMPILER" >&5
+		echo "$as_me:2229: result: $INTEL_COMPILER" >&5
 echo "${ECHO_T}$INTEL_COMPILER" >&6
 		;;
 	esac
@@ -2248,7 +2249,7 @@
 #define PROG_EXT "$PROG_EXT"
 EOF
 
-echo "$as_me:2251: checking for ${CC-cc} option to accept ANSI C" >&5
+echo "$as_me:2252: 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
@@ -2342,7 +2343,7 @@
 fi
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 2345 "configure"
+#line 2346 "configure"
 #include "confdefs.h"
 
 #ifndef CC_HAS_PROTOS
@@ -2363,16 +2364,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2366: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2367: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2369: \$? = $ac_status" >&5
+  echo "$as_me:2370: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2372: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2373: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2375: \$? = $ac_status" >&5
+  echo "$as_me:2376: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ansi_cc="$cf_arg"; break
 else
@@ -2385,7 +2386,7 @@
 CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi
-echo "$as_me:2388: result: $cf_cv_ansi_cc" >&5
+echo "$as_me:2389: result: $cf_cv_ansi_cc" >&5
 echo "${ECHO_T}$cf_cv_ansi_cc" >&6
 
 if test "$cf_cv_ansi_cc" != "no"; then
@@ -2468,7 +2469,7 @@
 fi
 
 if test "$cf_cv_ansi_cc" = "no"; then
-	{ { echo "$as_me:2471: error: Your compiler does not appear to recognize prototypes.
+	{ { echo "$as_me:2472: 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
@@ -2481,7 +2482,7 @@
    { (exit 1); exit 1; }; }
 fi
 
-echo "$as_me:2484: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:2485: 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
@@ -2489,7 +2490,7 @@
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >conftest.$ac_ext <<_ACEOF
-#line 2492 "configure"
+#line 2493 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -2538,16 +2539,16 @@
 do
   CC="$ac_save_CC $ac_arg"
   rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2541: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2542: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2544: \$? = $ac_status" >&5
+  echo "$as_me:2545: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2547: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2548: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2550: \$? = $ac_status" >&5
+  echo "$as_me:2551: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_cc_stdc=$ac_arg
 break
@@ -2564,21 +2565,21 @@
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)
-    echo "$as_me:2567: result: none needed" >&5
+    echo "$as_me:2568: result: none needed" >&5
 echo "${ECHO_T}none needed" >&6 ;;
   *)
-    echo "$as_me:2570: result: $ac_cv_prog_cc_stdc" >&5
+    echo "$as_me:2571: 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:2575: checking for an ANSI C-conforming const" >&5
+echo "$as_me:2576: 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 2581 "configure"
+#line 2582 "configure"
 #include "confdefs.h"
 
 int
@@ -2636,16 +2637,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2639: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2640: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2642: \$? = $ac_status" >&5
+  echo "$as_me:2643: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2645: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2646: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2648: \$? = $ac_status" >&5
+  echo "$as_me:2649: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_const=yes
 else
@@ -2655,7 +2656,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:2658: result: $ac_cv_c_const" >&5
+echo "$as_me:2659: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -2665,14 +2666,14 @@
 
 fi
 
-echo "$as_me:2668: checking if we can initialize unions" >&5
+echo "$as_me:2669: 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 2675 "configure"
+#line 2676 "configure"
 #include "confdefs.h"
 
 int
@@ -2684,16 +2685,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2687: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2688: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2690: \$? = $ac_status" >&5
+  echo "$as_me:2691: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2693: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2694: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2696: \$? = $ac_status" >&5
+  echo "$as_me:2697: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_init_unions=yes
 else
@@ -2704,13 +2705,13 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:2707: result: $cf_cv_init_unions" >&5
+echo "$as_me:2708: 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
 
-echo "$as_me:2713: checking if $CC -U and -D options work together" >&5
+echo "$as_me:2714: checking if $CC -U and -D options work together" >&5
 echo $ECHO_N "checking if $CC -U and -D options work together... $ECHO_C" >&6
 if test "${cf_cv_cc_u_d_options+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2719,7 +2720,7 @@
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	CPPFLAGS="-UU_D_OPTIONS -DU_D_OPTIONS -DD_U_OPTIONS -UD_U_OPTIONS"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 2722 "configure"
+#line 2723 "configure"
 #include "confdefs.h"
 
 int
@@ -2738,16 +2739,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2741: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2742: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2744: \$? = $ac_status" >&5
+  echo "$as_me:2745: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2747: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2748: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2750: \$? = $ac_status" >&5
+  echo "$as_me:2751: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_cc_u_d_options=yes
@@ -2761,7 +2762,7 @@
 	CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi
-echo "$as_me:2764: result: $cf_cv_cc_u_d_options" >&5
+echo "$as_me:2765: result: $cf_cv_cc_u_d_options" >&5
 echo "${ECHO_T}$cf_cv_cc_u_d_options" >&6
 
 cf_XOPEN_SOURCE=500
@@ -2771,9 +2772,6 @@
 aix[45]*) #(vi
 	CPPFLAGS="$CPPFLAGS -D_ALL_SOURCE"
 	;;
-darwin*) #(vi
-	# setting _XOPEN_SOURCE breaks things on Darwin
-	;;
 freebsd*) #(vi
 	# 5.x headers associate
 	#	_XOPEN_SOURCE=600 with _POSIX_C_SOURCE=200112L
@@ -2790,14 +2788,14 @@
 	;;
 linux*|gnu*) #(vi
 
-echo "$as_me:2793: checking if we must define _GNU_SOURCE" >&5
+echo "$as_me:2791: checking if we must define _GNU_SOURCE" >&5
 echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_gnu_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 2800 "configure"
+#line 2798 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -2812,16 +2810,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2815: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2813: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2818: \$? = $ac_status" >&5
+  echo "$as_me:2816: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2821: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2819: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2824: \$? = $ac_status" >&5
+  echo "$as_me:2822: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_gnu_source=no
 else
@@ -2830,7 +2828,7 @@
 cf_save="$CPPFLAGS"
 	 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 2833 "configure"
+#line 2831 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -2845,16 +2843,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2848: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2846: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2851: \$? = $ac_status" >&5
+  echo "$as_me:2849: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2854: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2852: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2857: \$? = $ac_status" >&5
+  echo "$as_me:2855: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_gnu_source=no
 else
@@ -2869,7 +2867,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:2872: result: $cf_cv_gnu_source" >&5
+echo "$as_me:2870: result: $cf_cv_gnu_source" >&5
 echo "${ECHO_T}$cf_cv_gnu_source" >&6
 test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
 
@@ -2896,14 +2894,14 @@
 	CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__"
 	;;
 *)
-	echo "$as_me:2899: checking if we should define _XOPEN_SOURCE" >&5
+	echo "$as_me:2897: checking if we should define _XOPEN_SOURCE" >&5
 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_xopen_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 2906 "configure"
+#line 2904 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -2918,16 +2916,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2921: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2919: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2924: \$? = $ac_status" >&5
+  echo "$as_me:2922: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2927: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2925: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2930: \$? = $ac_status" >&5
+  echo "$as_me:2928: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
@@ -2936,7 +2934,7 @@
 cf_save="$CPPFLAGS"
 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 2939 "configure"
+#line 2937 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -2951,16 +2949,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2954: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2952: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2957: \$? = $ac_status" >&5
+  echo "$as_me:2955: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2960: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2958: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2963: \$? = $ac_status" >&5
+  echo "$as_me:2961: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
@@ -2975,7 +2973,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:2978: result: $cf_cv_xopen_source" >&5
+echo "$as_me:2976: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 	if test "$cf_cv_xopen_source" != no ; then
 
@@ -3009,16 +3007,16 @@
 	sed	-e 's/-[UD]_POSIX_C_SOURCE\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]_POSIX_C_SOURCE\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:3012: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:3010: checking if we should define _POSIX_C_SOURCE" >&5
 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_posix_c_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-echo "(line 3018) testing if the symbol is already defined go no further ..." 1>&5
+echo "(line 3016) testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 3021 "configure"
+#line 3019 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -3033,16 +3031,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3036: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3034: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3039: \$? = $ac_status" >&5
+  echo "$as_me:3037: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3042: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3040: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3045: \$? = $ac_status" >&5
+  echo "$as_me:3043: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -3063,7 +3061,7 @@
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >conftest.$ac_ext <<_ACEOF
-#line 3066 "configure"
+#line 3064 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -3078,16 +3076,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3081: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3079: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3084: \$? = $ac_status" >&5
+  echo "$as_me:3082: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3087: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3085: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3090: \$? = $ac_status" >&5
+  echo "$as_me:3088: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -3098,15 +3096,15 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 	 fi
 
-echo "(line 3101) testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "(line 3099) testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
 
-echo "(line 3106) testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "(line 3104) testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 3109 "configure"
+#line 3107 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -3121,16 +3119,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3124: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3122: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3127: \$? = $ac_status" >&5
+  echo "$as_me:3125: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3130: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3128: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3133: \$? = $ac_status" >&5
+  echo "$as_me:3131: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -3146,7 +3144,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:3149: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:3147: result: $cf_cv_posix_c_source" >&5
 echo "${ECHO_T}$cf_cv_posix_c_source" >&6
 
 if test "$cf_cv_posix_c_source" != no ; then
@@ -3167,7 +3165,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:3170: checking for $ac_word" >&5
+echo "$as_me:3168: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_LEX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3182,7 +3180,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LEX="$ac_prog"
-echo "$as_me:3185: found $ac_dir/$ac_word" >&5
+echo "$as_me:3183: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3190,10 +3188,10 @@
 fi
 LEX=$ac_cv_prog_LEX
 if test -n "$LEX"; then
-  echo "$as_me:3193: result: $LEX" >&5
+  echo "$as_me:3191: result: $LEX" >&5
 echo "${ECHO_T}$LEX" >&6
 else
-  echo "$as_me:3196: result: no" >&5
+  echo "$as_me:3194: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3203,7 +3201,7 @@
 
 if test -z "$LEXLIB"
 then
-  echo "$as_me:3206: checking for yywrap in -lfl" >&5
+  echo "$as_me:3204: checking for yywrap in -lfl" >&5
 echo $ECHO_N "checking for yywrap in -lfl... $ECHO_C" >&6
 if test "${ac_cv_lib_fl_yywrap+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3211,7 +3209,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lfl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3214 "configure"
+#line 3212 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3230,16 +3228,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3233: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3231: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3236: \$? = $ac_status" >&5
+  echo "$as_me:3234: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3239: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3237: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3242: \$? = $ac_status" >&5
+  echo "$as_me:3240: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_fl_yywrap=yes
 else
@@ -3250,12 +3248,12 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3253: result: $ac_cv_lib_fl_yywrap" >&5
+echo "$as_me:3251: result: $ac_cv_lib_fl_yywrap" >&5
 echo "${ECHO_T}$ac_cv_lib_fl_yywrap" >&6
 if test $ac_cv_lib_fl_yywrap = yes; then
   LEXLIB="-lfl"
 else
-  echo "$as_me:3258: checking for yywrap in -ll" >&5
+  echo "$as_me:3256: checking for yywrap in -ll" >&5
 echo $ECHO_N "checking for yywrap in -ll... $ECHO_C" >&6
 if test "${ac_cv_lib_l_yywrap+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3263,7 +3261,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ll  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3266 "configure"
+#line 3264 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3282,16 +3280,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3285: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3283: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3288: \$? = $ac_status" >&5
+  echo "$as_me:3286: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3291: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3289: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3294: \$? = $ac_status" >&5
+  echo "$as_me:3292: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_l_yywrap=yes
 else
@@ -3302,7 +3300,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3305: result: $ac_cv_lib_l_yywrap" >&5
+echo "$as_me:3303: result: $ac_cv_lib_l_yywrap" >&5
 echo "${ECHO_T}$ac_cv_lib_l_yywrap" >&6
 if test $ac_cv_lib_l_yywrap = yes; then
   LEXLIB="-ll"
@@ -3313,7 +3311,7 @@
 fi
 
 if test "x$LEX" != "x:"; then
-  echo "$as_me:3316: checking lex output file root" >&5
+  echo "$as_me:3314: checking lex output file root" >&5
 echo $ECHO_N "checking lex output file root... $ECHO_C" >&6
 if test "${ac_cv_prog_lex_root+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3327,16 +3325,16 @@
 elif test -f lexyy.c; then
   ac_cv_prog_lex_root=lexyy
 else
-  { { echo "$as_me:3330: error: cannot find output from $LEX; giving up" >&5
+  { { echo "$as_me:3328: error: cannot find output from $LEX; giving up" >&5
 echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
    { (exit 1); exit 1; }; }
 fi
 fi
-echo "$as_me:3335: result: $ac_cv_prog_lex_root" >&5
+echo "$as_me:3333: result: $ac_cv_prog_lex_root" >&5
 echo "${ECHO_T}$ac_cv_prog_lex_root" >&6
 LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
 
-echo "$as_me:3339: checking whether yytext is a pointer" >&5
+echo "$as_me:3337: checking whether yytext is a pointer" >&5
 echo $ECHO_N "checking whether yytext is a pointer... $ECHO_C" >&6
 if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3352,16 +3350,16 @@
 `cat $LEX_OUTPUT_ROOT.c`
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3355: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3353: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3358: \$? = $ac_status" >&5
+  echo "$as_me:3356: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3361: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3359: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3364: \$? = $ac_status" >&5
+  echo "$as_me:3362: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_lex_yytext_pointer=yes
 else
@@ -3373,7 +3371,7 @@
 rm -f "${LEX_OUTPUT_ROOT}.c"
 
 fi
-echo "$as_me:3376: result: $ac_cv_prog_lex_yytext_pointer" >&5
+echo "$as_me:3374: result: $ac_cv_prog_lex_yytext_pointer" >&5
 echo "${ECHO_T}$ac_cv_prog_lex_yytext_pointer" >&6
 if test $ac_cv_prog_lex_yytext_pointer = yes; then
 
@@ -3387,7 +3385,7 @@
 
 ###	checks for alternative programs
 
-echo "$as_me:3390: checking for makeflags variable" >&5
+echo "$as_me:3388: checking for makeflags variable" >&5
 echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6
 if test "${cf_cv_makeflags+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3420,7 +3418,7 @@
 	rm -f cf_makeflags.tmp
 
 fi
-echo "$as_me:3423: result: $cf_cv_makeflags" >&5
+echo "$as_me:3421: result: $cf_cv_makeflags" >&5
 echo "${ECHO_T}$cf_cv_makeflags" >&6
 
 # Find a good install program.  We prefer a C program (faster),
@@ -3435,7 +3433,7 @@
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:3438: checking for a BSD compatible install" >&5
+echo "$as_me:3436: checking for a BSD compatible install" >&5
 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
@@ -3484,7 +3482,7 @@
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:3487: result: $INSTALL" >&5
+echo "$as_me:3485: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -3495,7 +3493,7 @@
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-echo "$as_me:3498: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:3496: checking whether ${MAKE-make} sets \${MAKE}" >&5
 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
@@ -3515,11 +3513,11 @@
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:3518: result: yes" >&5
+  echo "$as_me:3516: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:3522: result: no" >&5
+  echo "$as_me:3520: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
@@ -3528,7 +3526,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:3531: checking for $ac_word" >&5
+echo "$as_me:3529: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_AWK+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3543,7 +3541,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AWK="$ac_prog"
-echo "$as_me:3546: found $ac_dir/$ac_word" >&5
+echo "$as_me:3544: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3551,10 +3549,10 @@
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$as_me:3554: result: $AWK" >&5
+  echo "$as_me:3552: result: $AWK" >&5
 echo "${ECHO_T}$AWK" >&6
 else
-  echo "$as_me:3557: result: no" >&5
+  echo "$as_me:3555: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3564,7 +3562,7 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:3567: checking for $ac_word" >&5
+echo "$as_me:3565: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3579,7 +3577,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-echo "$as_me:3582: found $ac_dir/$ac_word" >&5
+echo "$as_me:3580: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3587,10 +3585,10 @@
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:3590: result: $RANLIB" >&5
+  echo "$as_me:3588: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:3593: result: no" >&5
+  echo "$as_me:3591: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3599,7 +3597,7 @@
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:3602: checking for $ac_word" >&5
+echo "$as_me:3600: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3614,7 +3612,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:3617: found $ac_dir/$ac_word" >&5
+echo "$as_me:3615: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3623,10 +3621,10 @@
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:3626: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:3624: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:3629: result: no" >&5
+  echo "$as_me:3627: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3639,10 +3637,10 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-echo "$as_me:3642: checking for archiver (symbol AR)" >&5
+echo "$as_me:3640: checking for archiver (symbol AR)" >&5
 echo $ECHO_N "checking for archiver (symbol AR)... $ECHO_C" >&6
 test -z "$AR" && AR=ar
-echo "$as_me:3645: result: $AR" >&5
+echo "$as_me:3643: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 
 cf_cv_subst_AR=$AR
@@ -3654,10 +3652,10 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-echo "$as_me:3657: checking for archiver options (symbol AR_OPTS)" >&5
+echo "$as_me:3655: checking for archiver options (symbol AR_OPTS)" >&5
 echo $ECHO_N "checking for archiver options (symbol AR_OPTS)... $ECHO_C" >&6
 test -z "$AR_OPTS" && AR_OPTS=rv
-echo "$as_me:3660: result: $AR_OPTS" >&5
+echo "$as_me:3658: result: $AR_OPTS" >&5
 echo "${ECHO_T}$AR_OPTS" >&6
 
 cf_cv_subst_AR_OPTS=$AR_OPTS
@@ -3665,7 +3663,7 @@
 
 AR_OPTS=${cf_cv_subst_AR_OPTS}
 
-echo "$as_me:3668: checking if you want to see long compiling messages" >&5
+echo "$as_me:3666: checking if you want to see long compiling messages" >&5
 echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6
 
 # Check whether --enable-echo or --disable-echo was given.
@@ -3699,7 +3697,7 @@
     ECHO_CC=''
 
 fi;
-echo "$as_me:3702: result: $enableval" >&5
+echo "$as_me:3700: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 	case $cf_cv_system_name in
@@ -3718,7 +3716,7 @@
 BUILTLIBS=
 BUILTSRCS=
 
-echo "$as_me:3721: checking if you wish to build only core functions" >&5
+echo "$as_me:3719: 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.
@@ -3735,7 +3733,7 @@
   DISABLE_EXTS=no
 
 fi;
-echo "$as_me:3738: result: $DISABLE_EXTS" >&5
+echo "$as_me:3736: result: $DISABLE_EXTS" >&5
 echo "${ECHO_T}$DISABLE_EXTS" >&6
 if test "$DISABLE_EXTS" = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -3748,11 +3746,11 @@
 
 	cf_extensions=no
 else
-	EXTRAOBJS="$EXTRAOBJS api.o btree.o history.o isearch.o select.o statevar.o ucrypt.o xterm.o"
+	EXTRAOBJS="$EXTRAOBJS api\$o btree\$o history\$o isearch\$o select\$o statevar\$o ucrypt\$o xterm\$o"
 	cf_extensions=yes
 fi
 
-echo "$as_me:3755: checking if you wish to disable shell/external commands" >&5
+echo "$as_me:3753: 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.
@@ -3769,7 +3767,7 @@
   DISABLE_SHELL=no
 
 fi;
-echo "$as_me:3772: result: $DISABLE_SHELL" >&5
+echo "$as_me:3770: result: $DISABLE_SHELL" >&5
 echo "${ECHO_T}$DISABLE_SHELL" >&6
 if test "$DISABLE_SHELL" = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -3777,11 +3775,11 @@
 EOF
 
 else
-	EXTRAOBJS="$EXTRAOBJS npopen.o spawn.o"
+	EXTRAOBJS="$EXTRAOBJS npopen\$o spawn\$o"
 fi
 
 ###	use option --with-cflags to set default CFLAGS
-echo "$as_me:3784: checking for CFLAGS options" >&5
+echo "$as_me:3782: checking for CFLAGS options" >&5
 echo $ECHO_N "checking for CFLAGS options... $ECHO_C" >&6
 
 # Check whether --with-CFLAGS or --without-CFLAGS was given.
@@ -3805,10 +3803,10 @@
 elif test -z "$CFLAGS" ; then
 	CFLAGS="-O"
 fi
-echo "$as_me:3808: result: $cflags" >&5
+echo "$as_me:3806: result: $cflags" >&5
 echo "${ECHO_T}$cflags" >&6
 
-echo "$as_me:3811: checking if you want to compile-in plugin support" >&5
+echo "$as_me:3809: checking if you want to compile-in plugin support" >&5
 echo $ECHO_N "checking if you want to compile-in plugin support... $ECHO_C" >&6
 
 # Check whether --enable-plugins or --disable-plugins was given.
@@ -3825,10 +3823,10 @@
   with_plugins=no
 
 fi;
-echo "$as_me:3828: result: $with_plugins" >&5
+echo "$as_me:3826: result: $with_plugins" >&5
 echo "${ECHO_T}$with_plugins" >&6
 
-echo "$as_me:3831: checking if you want to build syntax filters" >&5
+echo "$as_me:3829: 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.
@@ -3845,7 +3843,7 @@
   with_filters=yes
 
 fi;
-echo "$as_me:3848: result: $with_filters" >&5
+echo "$as_me:3846: result: $with_filters" >&5
 echo "${ECHO_T}$with_filters" >&6
 
 MAKE_FILTERS=
@@ -3857,7 +3855,7 @@
 : ${VILE_LOADABLE_FILTERS=none}
 : ${VILE_EXTERNAL_FILTERS=all}
 
-echo "$as_me:3860: checking if you want built-in syntax filters" >&5
+echo "$as_me:3858: 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.
@@ -3868,10 +3866,10 @@
   VILE_BUILT_IN_FILTERS=none
 fi;
 test "$VILE_BUILT_IN_FILTERS" = no && VILE_BUILT_IN_FILTERS=none
-echo "$as_me:3871: result: $VILE_BUILT_IN_FILTERS" >&5
+echo "$as_me:3869: result: $VILE_BUILT_IN_FILTERS" >&5
 echo "${ECHO_T}$VILE_BUILT_IN_FILTERS" >&6
 
-echo "$as_me:3874: checking if you want loadable syntax filters" >&5
+echo "$as_me:3872: 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.
@@ -3882,7 +3880,7 @@
   VILE_LOADABLE_FILTERS=none
 fi;
 test "$VILE_LOADABLE_FILTERS" = no && VILE_LOADABLE_FILTERS=none
-echo "$as_me:3885: result: $VILE_LOADABLE_FILTERS" >&5
+echo "$as_me:3883: result: $VILE_LOADABLE_FILTERS" >&5
 echo "${ECHO_T}$VILE_LOADABLE_FILTERS" >&6
 
 # If both "--with-builtin-filters" and "--with-loadable-filters" were given,
@@ -3900,7 +3898,7 @@
 		do
 			if test "$cf_b" = "$cf_l"
 			then
-				{ { echo "$as_me:3903: error: Cannot overlap built-in and loadable filter lists" >&5
+				{ { echo "$as_me:3901: 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
@@ -3943,7 +3941,7 @@
 	test -z "$VILE_EXTERNAL_FILTERS" && VILE_EXTERNAL_FILTERS=none
 fi
 
-echo "$as_me:3946: checking if any filters require flex" >&5
+echo "$as_me:3944: 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"`
@@ -3956,48 +3954,48 @@
 else
 	cf_needflex=no
 fi
-echo "$as_me:3959: result: $cf_needflex" >&5
+echo "$as_me:3957: result: $cf_needflex" >&5
 echo "${ECHO_T}$cf_needflex" >&6
 
 if test "$cf_needflex" = yes ; then
 
 test -z "$LEX" && LEX=lex
-echo "$as_me:3965: checking if $LEX is really flex" >&5
+echo "$as_me:3963: 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:3969: result: yes" >&5
+	echo "$as_me:3967: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-	echo "$as_me:3971: checking version of $LEX" >&5
+	echo "$as_me:3969: 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:3974: result: $LEX_VERSION" >&5
+	echo "$as_me:3972: result: $LEX_VERSION" >&5
 echo "${ECHO_T}$LEX_VERSION" >&6
 else
-	echo "$as_me:3977: result: no" >&5
+	echo "$as_me:3975: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 	if test -z "$LEX_VERSION"
 	then
-		{ { echo "$as_me:3983: error: You need flex to compile builtin filters" >&5
+		{ { echo "$as_me:3981: 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:3988: error: Sorry - your version of flex is too old: $LEX_VERSION" >&5
+		{ { echo "$as_me:3986: 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:3993: error: Sorry - your version of flex is too unstable: $LEX_VERSION" >&5
+		{ { echo "$as_me:3991: 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:4000: error: This version of flex cannot compile builtin filters" >&5
+			{ { echo "$as_me:3998: 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
@@ -4006,7 +4004,7 @@
 
 		elif ( expr $LEX_SUBVERSION \> 4 >/dev/null )
 		then
-			{ { echo "$as_me:4009: error: This version of flex cannot compile builtin filters" >&5
+			{ { echo "$as_me:4007: 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
@@ -4021,7 +4019,7 @@
 	MAKE_FILTERS="#"
 fi
 
-echo "$as_me:4024: checking for library path" >&5
+echo "$as_me:4022: 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.
@@ -4051,11 +4049,11 @@
     ;;
   esac
   ;; #(vi
-.NONE/*)
+.no|.NONE/*)
   cf_src_path=`echo $cf_src_path | sed -e s%NONE%$ac_default_prefix%`
   ;;
 *)
-  { { echo "$as_me:4058: error: expected a pathname, not \"$cf_src_path\"" >&5
+  { { echo "$as_me:4056: 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; }; }
   ;;
@@ -4077,10 +4075,10 @@
 
 eval 'VILE_LIBDIR_PATH="$cf_dst_path"'
 
-echo "$as_me:4080: result: $VILE_LIBDIR_PATH" >&5
+echo "$as_me:4078: result: $VILE_LIBDIR_PATH" >&5
 echo "${ECHO_T}$VILE_LIBDIR_PATH" >&6
 
-echo "$as_me:4083: checking for startup path" >&5
+echo "$as_me:4081: 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.
@@ -4110,11 +4108,11 @@
     ;;
   esac
   ;; #(vi
-.NONE/*)
+.no|.NONE/*)
   cf_src_path=`echo $cf_src_path | sed -e s%NONE%$ac_default_prefix%`
   ;;
 *)
-  { { echo "$as_me:4117: error: expected a pathname, not \"$cf_src_path\"" >&5
+  { { echo "$as_me:4115: 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; }; }
   ;;
@@ -4136,10 +4134,10 @@
 
 eval 'VILE_STARTUP_PATH="$cf_dst_path"'
 
-echo "$as_me:4139: result: $VILE_STARTUP_PATH" >&5
+echo "$as_me:4137: result: $VILE_STARTUP_PATH" >&5
 echo "${ECHO_T}$VILE_STARTUP_PATH" >&6
 
-echo "$as_me:4142: checking if $LEX supports character classes" >&5
+echo "$as_me:4140: checking if $LEX supports character classes" >&5
 echo $ECHO_N "checking if $LEX supports character classes... $ECHO_C" >&6
 cat >conftest.l <<CF_EOF
 IDENT	[[:alpha:]][[:alnum:]]+
@@ -4149,24 +4147,24 @@
 {DATE}	{ ECHO; }
 CF_EOF
 cf_lex_char_classes="$LEX conftest.l 1>&5"
-if { (eval echo "$as_me:4152: \"$cf_lex_char_classes\"") >&5
+if { (eval echo "$as_me:4150: \"$cf_lex_char_classes\"") >&5
   (eval $cf_lex_char_classes) 2>&5
   ac_status=$?
-  echo "$as_me:4155: \$? = $ac_status" >&5
+  echo "$as_me:4153: \$? = $ac_status" >&5
   (exit $ac_status); }; then
 	LEX_CHAR_CLASSES=yes
 else
 	LEX_CHAR_CLASSES=no
 fi
-echo "$as_me:4161: result: $LEX_CHAR_CLASSES" >&5
+echo "$as_me:4159: result: $LEX_CHAR_CLASSES" >&5
 echo "${ECHO_T}$LEX_CHAR_CLASSES" >&6
 rm -f conftest.* $LEX_OUTPUT_ROOT.c
 if test "$LEX_CHAR_CLASSES" != yes ; then
-	{ echo "$as_me:4165: WARNING: Your $LEX program does not support character classes.  Get flex." >&5
+	{ echo "$as_me:4163: WARNING: Your $LEX program does not support character classes.  Get flex." >&5
 echo "$as_me: WARNING: Your $LEX program does not support character classes.  Get flex." >&2;}
 fi
 
-echo "$as_me:4169: checking if $LEX supports states" >&5
+echo "$as_me:4167: 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
@@ -4176,21 +4174,21 @@
 nothing	ECHO;
 CF_EOF
 cf_lex_states="$LEX conftest.l 1>&5"
-if { (eval echo "$as_me:4179: \"$cf_lex_states\"") >&5
+if { (eval echo "$as_me:4177: \"$cf_lex_states\"") >&5
   (eval $cf_lex_states) 2>&5
   ac_status=$?
-  echo "$as_me:4182: \$? = $ac_status" >&5
+  echo "$as_me:4180: \$? = $ac_status" >&5
   (exit $ac_status); }; then
 cf_lex_states=yes
 else
 cf_lex_states=no
 fi
-echo "$as_me:4188: result: $cf_lex_states" >&5
+echo "$as_me:4186: 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:4193: WARNING: Your $LEX program does not support states.  Get flex." >&5
+	{ echo "$as_me:4191: 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
@@ -4201,7 +4199,7 @@
 	LEX_CHAR_CLASSES='sh $(srcdir)/noclass.sh '
 fi
 
-echo "$as_me:4204: checking if you want to use perl as an extension language" >&5
+echo "$as_me:4202: 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.
@@ -4211,16 +4209,16 @@
 else
   with_perl=no
 fi;
-echo "$as_me:4214: result: $with_perl" >&5
+echo "$as_me:4212: result: $with_perl" >&5
 echo "${ECHO_T}$with_perl" >&6
 if test "$with_perl" = yes ; then
 	# find perl binary
-echo "$as_me:4218: checking for perl-5.004" >&5
+echo "$as_me:4216: 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:4223: ...version 5.004 required" >&5
+  echo "configure:4221: ...version 5.004 required" >&5
   # allow user to override
   if test -n "$PERL"; then
     cf_try="$PERL"
@@ -4230,7 +4228,7 @@
 
   cf_version=`echo '[]'|sed -e 's/^./$/'`
   for cf_prog in $cf_try; do
-    echo "configure:4233: trying $cf_prog" >&5
+    echo "configure:4231: 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
@@ -4239,15 +4237,15 @@
 fi
 PERL="$cf_cv_prog_PERL"
 if test -n "$PERL"; then
-  echo "$as_me:4242: result: $PERL" >&5
+  echo "$as_me:4240: result: $PERL" >&5
 echo "${ECHO_T}$PERL" >&6
 else
-  echo "$as_me:4245: result: no" >&5
+  echo "$as_me:4243: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 	if test "$PERL" = no; then
-	    { { echo "$as_me:4250: error: perl not found" >&5
+	    { { echo "$as_me:4248: error: perl not found" >&5
 echo "$as_me: error: perl not found" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -4256,7 +4254,7 @@
 #define OPT_PERL 1
 EOF
 
-	EXTRAOBJS="$EXTRAOBJS perl.o"
+	EXTRAOBJS="$EXTRAOBJS perl\$o"
 	BUILTSRCS="$BUILTSRCS perl.c"
 	LINK_PREFIX=`$PERL -MConfig -e 'print $Config{shrpenv}'`
 	ac_link="$LINK_PREFIX $ac_link"
@@ -4339,7 +4337,7 @@
 
 if test "$cf_check_cflags" != "$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 4342 "configure"
+#line 4340 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -4351,16 +4349,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4354: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4352: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4357: \$? = $ac_status" >&5
+  echo "$as_me:4355: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4360: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4358: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4363: \$? = $ac_status" >&5
+  echo "$as_me:4361: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -4385,13 +4383,13 @@
 # X11 checks will sometimes add to CFLAGS.  We want the state of CFLAGS
 # prior to these checks
 
-echo "$as_me:4388: checking for getpwnam" >&5
+echo "$as_me:4386: 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 4394 "configure"
+#line 4392 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char getpwnam (); below.  */
@@ -4422,16 +4420,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4425: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4423: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4428: \$? = $ac_status" >&5
+  echo "$as_me:4426: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4431: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4429: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4434: \$? = $ac_status" >&5
+  echo "$as_me:4432: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_getpwnam=yes
 else
@@ -4441,13 +4439,13 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4444: result: $ac_cv_func_getpwnam" >&5
+echo "$as_me:4442: 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:4450: checking for getpwnam in -lsun" >&5
+echo "$as_me:4448: 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
@@ -4455,7 +4453,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsun  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 4458 "configure"
+#line 4456 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4474,16 +4472,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4477: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4475: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4480: \$? = $ac_status" >&5
+  echo "$as_me:4478: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4483: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4481: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4486: \$? = $ac_status" >&5
+  echo "$as_me:4484: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_sun_getpwnam=yes
 else
@@ -4494,7 +4492,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4497: result: $ac_cv_lib_sun_getpwnam" >&5
+echo "$as_me:4495: 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
@@ -4512,7 +4510,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:4515: checking for $ac_word" >&5
+echo "$as_me:4513: 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
@@ -4527,7 +4525,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LINT="$ac_prog"
-echo "$as_me:4530: found $ac_dir/$ac_word" >&5
+echo "$as_me:4528: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4535,10 +4533,10 @@
 fi
 LINT=$ac_cv_prog_LINT
 if test -n "$LINT"; then
-  echo "$as_me:4538: result: $LINT" >&5
+  echo "$as_me:4536: result: $LINT" >&5
 echo "${ECHO_T}$LINT" >&6
 else
-  echo "$as_me:4541: result: no" >&5
+  echo "$as_me:4539: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4554,13 +4552,13 @@
 fi
 
 ###	checks for header files
-echo "$as_me:4557: checking for ANSI C header files" >&5
+echo "$as_me:4555: 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 4563 "configure"
+#line 4561 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -4568,13 +4566,13 @@
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:4571: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4569: \"$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:4577: \$? = $ac_status" >&5
+  echo "$as_me:4575: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4596,7 +4594,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 4599 "configure"
+#line 4597 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -4614,7 +4612,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 4617 "configure"
+#line 4615 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -4635,7 +4633,7 @@
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4638 "configure"
+#line 4636 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -4661,15 +4659,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:4664: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4662: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4667: \$? = $ac_status" >&5
+  echo "$as_me:4665: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:4669: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4667: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4672: \$? = $ac_status" >&5
+  echo "$as_me:4670: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -4682,7 +4680,7 @@
 fi
 fi
 fi
-echo "$as_me:4685: result: $ac_cv_header_stdc" >&5
+echo "$as_me:4683: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -4695,13 +4693,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:4698: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:4696: 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 4704 "configure"
+#line 4702 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -4716,16 +4714,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4719: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4717: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4722: \$? = $ac_status" >&5
+  echo "$as_me:4720: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4725: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4723: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4728: \$? = $ac_status" >&5
+  echo "$as_me:4726: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -4735,7 +4733,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4738: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:4736: 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
@@ -4748,7 +4746,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:4751: checking for opendir in -ldir" >&5
+  echo "$as_me:4749: 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
@@ -4756,7 +4754,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 4759 "configure"
+#line 4757 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4775,16 +4773,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4778: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4776: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4781: \$? = $ac_status" >&5
+  echo "$as_me:4779: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4784: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4782: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4787: \$? = $ac_status" >&5
+  echo "$as_me:4785: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -4795,14 +4793,14 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4798: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:4796: 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:4805: checking for opendir in -lx" >&5
+  echo "$as_me:4803: 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
@@ -4810,7 +4808,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 4813 "configure"
+#line 4811 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4829,16 +4827,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4832: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4830: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4835: \$? = $ac_status" >&5
+  echo "$as_me:4833: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4838: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4836: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4841: \$? = $ac_status" >&5
+  echo "$as_me:4839: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -4849,7 +4847,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4852: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:4850: 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"
@@ -4857,13 +4855,13 @@
 
 fi
 
-  echo "$as_me:4860: checking for nl_langinfo and CODESET" >&5
+  echo "$as_me:4858: checking for nl_langinfo and CODESET" >&5
 echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
 if test "${am_cv_langinfo_codeset+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4866 "configure"
+#line 4864 "configure"
 #include "confdefs.h"
 #include <langinfo.h>
 int
@@ -4875,16 +4873,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4878: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4876: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4881: \$? = $ac_status" >&5
+  echo "$as_me:4879: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4884: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4882: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4887: \$? = $ac_status" >&5
+  echo "$as_me:4885: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_langinfo_codeset=yes
 else
@@ -4895,7 +4893,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:4898: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:4896: result: $am_cv_langinfo_codeset" >&5
 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
   if test $am_cv_langinfo_codeset = yes; then
 
@@ -4937,23 +4935,23 @@
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:4940: checking for $ac_header" >&5
+echo "$as_me:4938: 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 4946 "configure"
+#line 4944 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:4950: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4948: \"$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:4956: \$? = $ac_status" >&5
+  echo "$as_me:4954: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4972,7 +4970,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:4975: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:4973: 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
@@ -4983,13 +4981,13 @@
 done
 
 ###	checks for typedefs
-echo "$as_me:4986: checking return type of signal handlers" >&5
+echo "$as_me:4984: 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 4992 "configure"
+#line 4990 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -5011,16 +5009,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5014: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5012: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5017: \$? = $ac_status" >&5
+  echo "$as_me:5015: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5020: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5018: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5023: \$? = $ac_status" >&5
+  echo "$as_me:5021: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_signal=void
 else
@@ -5030,7 +5028,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5033: result: $ac_cv_type_signal" >&5
+echo "$as_me:5031: result: $ac_cv_type_signal" >&5
 echo "${ECHO_T}$ac_cv_type_signal" >&6
 
 cat >>confdefs.h <<EOF
@@ -5059,28 +5057,28 @@
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:5062: checking for $ac_header" >&5
+echo "$as_me:5060: 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 5068 "configure"
+#line 5066 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5074: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5072: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5077: \$? = $ac_status" >&5
+  echo "$as_me:5075: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5080: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5078: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5083: \$? = $ac_status" >&5
+  echo "$as_me:5081: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -5090,7 +5088,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5093: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:5091: 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
@@ -5100,13 +5098,13 @@
 fi
 done
 
-echo "$as_me:5103: checking for size_t" >&5
+echo "$as_me:5101: 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 5109 "configure"
+#line 5107 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -5121,16 +5119,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5124: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5122: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5127: \$? = $ac_status" >&5
+  echo "$as_me:5125: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5130: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5128: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5133: \$? = $ac_status" >&5
+  echo "$as_me:5131: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_size_t=yes
 else
@@ -5140,7 +5138,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5143: result: $ac_cv_type_size_t" >&5
+echo "$as_me:5141: 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
   :
@@ -5152,13 +5150,13 @@
 
 fi
 
-echo "$as_me:5155: checking for uid_t in sys/types.h" >&5
+echo "$as_me:5153: 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 5161 "configure"
+#line 5159 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -5172,7 +5170,7 @@
 rm -f conftest*
 
 fi
-echo "$as_me:5175: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:5173: 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
 
@@ -5186,13 +5184,13 @@
 
 fi
 
-echo "$as_me:5189: checking for pid_t" >&5
+echo "$as_me:5187: 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 5195 "configure"
+#line 5193 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -5207,16 +5205,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5210: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5208: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5213: \$? = $ac_status" >&5
+  echo "$as_me:5211: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5216: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5214: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5219: \$? = $ac_status" >&5
+  echo "$as_me:5217: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -5226,7 +5224,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5229: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:5227: 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
   :
@@ -5238,13 +5236,13 @@
 
 fi
 
-echo "$as_me:5241: checking for time_t" >&5
+echo "$as_me:5239: 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 5247 "configure"
+#line 5245 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -5259,16 +5257,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5262: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5260: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5265: \$? = $ac_status" >&5
+  echo "$as_me:5263: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5268: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5266: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5271: \$? = $ac_status" >&5
+  echo "$as_me:5269: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_time_t=yes
 else
@@ -5278,7 +5276,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5281: result: $ac_cv_type_time_t" >&5
+echo "$as_me:5279: 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
   :
@@ -5292,18 +5290,18 @@
 
 ###	checks for library functions
 if test "$cross_compiling" = no; then
-	echo "$as_me:5295: checking whether setvbuf arguments are reversed" >&5
+	echo "$as_me:5293: 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:5301: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:5299: 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 5306 "configure"
+#line 5304 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 /* If setvbuf has the reversed format, exit 0. */
@@ -5320,15 +5318,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:5323: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5321: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5326: \$? = $ac_status" >&5
+  echo "$as_me:5324: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:5328: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5326: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5331: \$? = $ac_status" >&5
+  echo "$as_me:5329: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_setvbuf_reversed=yes
 else
@@ -5341,7 +5339,7 @@
 fi
 rm -f core core.* *.core
 fi
-echo "$as_me:5344: result: $ac_cv_func_setvbuf_reversed" >&5
+echo "$as_me:5342: 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
 
@@ -5354,13 +5352,13 @@
 fi
 
 ###	checks for structures
-echo "$as_me:5357: checking whether stat file-mode macros are broken" >&5
+echo "$as_me:5355: 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 5363 "configure"
+#line 5361 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -5399,7 +5397,7 @@
 rm -f conftest*
 
 fi
-echo "$as_me:5402: result: $ac_cv_header_stat_broken" >&5
+echo "$as_me:5400: 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
 
@@ -5409,13 +5407,13 @@
 
 fi
 
-echo "$as_me:5412: checking for struct stat.st_blksize" >&5
+echo "$as_me:5410: 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 5418 "configure"
+#line 5416 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -5429,16 +5427,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5432: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5430: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5435: \$? = $ac_status" >&5
+  echo "$as_me:5433: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5438: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5436: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5441: \$? = $ac_status" >&5
+  echo "$as_me:5439: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_member_struct_stat_st_blksize=yes
 else
@@ -5448,7 +5446,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5451: result: $ac_cv_member_struct_stat_st_blksize" >&5
+echo "$as_me:5449: 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
 
@@ -5462,13 +5460,13 @@
 
 fi
 
-echo "$as_me:5465: checking for struct stat.st_blocks" >&5
+echo "$as_me:5463: 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 5471 "configure"
+#line 5469 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -5482,16 +5480,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5485: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5483: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5488: \$? = $ac_status" >&5
+  echo "$as_me:5486: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5491: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5489: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5494: \$? = $ac_status" >&5
+  echo "$as_me:5492: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_member_struct_stat_st_blocks=yes
 else
@@ -5501,7 +5499,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5504: result: $ac_cv_member_struct_stat_st_blocks" >&5
+echo "$as_me:5502: 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
 
@@ -5517,13 +5515,13 @@
   LIBOBJS="$LIBOBJS fileblocks.$ac_objext"
 fi
 
-echo "$as_me:5520: checking for struct stat.st_rdev" >&5
+echo "$as_me:5518: 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 5526 "configure"
+#line 5524 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -5537,16 +5535,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5540: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5538: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5543: \$? = $ac_status" >&5
+  echo "$as_me:5541: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5546: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5544: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5549: \$? = $ac_status" >&5
+  echo "$as_me:5547: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_member_struct_stat_st_rdev=yes
 else
@@ -5556,7 +5554,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5559: result: $ac_cv_member_struct_stat_st_rdev" >&5
+echo "$as_me:5557: 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
 
@@ -5570,13 +5568,13 @@
 
 fi
 
-echo "$as_me:5573: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "$as_me:5571: 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 5579 "configure"
+#line 5577 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <time.h>
@@ -5590,16 +5588,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5593: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5591: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5596: \$? = $ac_status" >&5
+  echo "$as_me:5594: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5599: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5597: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5602: \$? = $ac_status" >&5
+  echo "$as_me:5600: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_struct_tm=time.h
 else
@@ -5609,7 +5607,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5612: result: $ac_cv_struct_tm" >&5
+echo "$as_me:5610: result: $ac_cv_struct_tm" >&5
 echo "${ECHO_T}$ac_cv_struct_tm" >&6
 if test $ac_cv_struct_tm = sys/time.h; then
 
@@ -5619,13 +5617,13 @@
 
 fi
 
-echo "$as_me:5622: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:5620: 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 5628 "configure"
+#line 5626 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -5641,16 +5639,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5644: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5642: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5647: \$? = $ac_status" >&5
+  echo "$as_me:5645: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5650: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5648: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5653: \$? = $ac_status" >&5
+  echo "$as_me:5651: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_header_time=yes
 else
@@ -5660,7 +5658,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5663: result: $ac_cv_header_time" >&5
+echo "$as_me:5661: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -5670,14 +5668,14 @@
 
 fi
 
-echo "$as_me:5673: checking if we can include select.h with time.h" >&5
+echo "$as_me:5671: 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 5680 "configure"
+#line 5678 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -5707,16 +5705,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5710: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5708: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5713: \$? = $ac_status" >&5
+  echo "$as_me:5711: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5716: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5714: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5719: \$? = $ac_status" >&5
+  echo "$as_me:5717: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_select_with_time=yes
 else
@@ -5727,20 +5725,20 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:5730: result: $cf_cv_select_with_time" >&5
+echo "$as_me:5728: 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:5736: checking if we may include sys/resource.h with sys/wait.h" >&5
+echo "$as_me:5734: 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 5743 "configure"
+#line 5741 "configure"
 #include "confdefs.h"
 
 #if defined(HAVE_SYS_TIME_H) && (defined(SELECT_WITH_TIME) || !(defined(HAVE_SELECT_H || defined(HAVE_SYS_SELECT_H))))
@@ -5764,16 +5762,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5767: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5765: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5770: \$? = $ac_status" >&5
+  echo "$as_me:5768: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5773: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5771: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5776: \$? = $ac_status" >&5
+  echo "$as_me:5774: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_resource_with_wait=yes
 else
@@ -5784,7 +5782,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:5787: result: $cf_cv_resource_with_wait" >&5
+echo "$as_me:5785: 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
@@ -5797,23 +5795,23 @@
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:5800: checking for $ac_header" >&5
+echo "$as_me:5798: 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 5806 "configure"
+#line 5804 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:5810: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5808: \"$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:5816: \$? = $ac_status" >&5
+  echo "$as_me:5814: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5832,7 +5830,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:5835: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:5833: 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
@@ -5847,23 +5845,23 @@
 for ac_header in sys/termio.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:5850: checking for $ac_header" >&5
+echo "$as_me:5848: 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 5856 "configure"
+#line 5854 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:5860: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5858: \"$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:5866: \$? = $ac_status" >&5
+  echo "$as_me:5864: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5882,7 +5880,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:5885: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:5883: 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
@@ -5900,10 +5898,10 @@
 	*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:5903: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:5901: 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 5906 "configure"
+#line 5904 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -5915,16 +5913,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5918: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5916: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5921: \$? = $ac_status" >&5
+  echo "$as_me:5919: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5924: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5922: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5927: \$? = $ac_status" >&5
+  echo "$as_me:5925: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   termios_bad=no
 else
@@ -5932,7 +5930,7 @@
 cat conftest.$ac_ext >&5
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 5935 "configure"
+#line 5933 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -5946,16 +5944,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5949: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5947: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5952: \$? = $ac_status" >&5
+  echo "$as_me:5950: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5955: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5953: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5958: \$? = $ac_status" >&5
+  echo "$as_me:5956: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   termios_bad=unknown
 else
@@ -5970,12 +5968,12 @@
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-	echo "$as_me:5973: result: $termios_bad" >&5
+	echo "$as_me:5971: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:5978: checking declaration of size-change" >&5
+echo "$as_me:5976: 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
@@ -5990,7 +5988,7 @@
     CPPFLAGS="$cf_save_CPPFLAGS"
     test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
     cat >conftest.$ac_ext <<_ACEOF
-#line 5993 "configure"
+#line 5991 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -6034,16 +6032,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6037: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6035: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6040: \$? = $ac_status" >&5
+  echo "$as_me:6038: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6043: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6041: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6046: \$? = $ac_status" >&5
+  echo "$as_me:6044: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_sizechange=yes
 else
@@ -6062,7 +6060,7 @@
 done
 
 fi
-echo "$as_me:6065: result: $cf_cv_sizechange" >&5
+echo "$as_me:6063: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 	cat >>confdefs.h <<\EOF
@@ -6079,7 +6077,7 @@
 	esac
 fi
 
-echo "$as_me:6082: checking for file-pointer ready definition" >&5
+echo "$as_me:6080: 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
@@ -6093,7 +6091,7 @@
 	echo "test-compile $definition" 1>&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 6096 "configure"
+#line 6094 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -6108,16 +6106,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6111: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6109: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6114: \$? = $ac_status" >&5
+  echo "$as_me:6112: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6117: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6115: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6120: \$? = $ac_status" >&5
+  echo "$as_me:6118: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   echo "$definition" >conftest.env
 	 break
@@ -6141,21 +6139,21 @@
 test -f conftest.env && cf_cv_fp_isready=`cat conftest.env`
 
 fi
-echo "$as_me:6144: result: $cf_cv_fp_isready" >&5
+echo "$as_me:6142: 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:6151: checking for <wctype.h> and functions" >&5
+echo "$as_me:6149: 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 6158 "configure"
+#line 6156 "configure"
 #include "confdefs.h"
 
 #include <wctype.h>
@@ -6182,16 +6180,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6185: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6183: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6188: \$? = $ac_status" >&5
+  echo "$as_me:6186: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6191: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6189: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6194: \$? = $ac_status" >&5
+  echo "$as_me:6192: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_wctype=yes
 else
@@ -6202,10 +6200,10 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:6205: result: $cf_cv_have_wctype" >&5
+echo "$as_me:6203: 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:6208: checking for library containing wctype" >&5
+	echo "$as_me:6206: 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
@@ -6213,7 +6211,7 @@
   ac_func_search_save_LIBS=$LIBS
 ac_cv_search_wctype=no
 cat >conftest.$ac_ext <<_ACEOF
-#line 6216 "configure"
+#line 6214 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6232,16 +6230,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6235: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6233: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6238: \$? = $ac_status" >&5
+  echo "$as_me:6236: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6241: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6239: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6244: \$? = $ac_status" >&5
+  echo "$as_me:6242: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_search_wctype="none required"
 else
@@ -6253,7 +6251,7 @@
   for ac_lib in w; do
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
     cat >conftest.$ac_ext <<_ACEOF
-#line 6256 "configure"
+#line 6254 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6272,16 +6270,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6275: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6273: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6278: \$? = $ac_status" >&5
+  echo "$as_me:6276: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6281: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6279: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6284: \$? = $ac_status" >&5
+  echo "$as_me:6282: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_search_wctype="-l$ac_lib"
 break
@@ -6294,7 +6292,7 @@
 fi
 LIBS=$ac_func_search_save_LIBS
 fi
-echo "$as_me:6297: result: $ac_cv_search_wctype" >&5
+echo "$as_me:6295: 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"
@@ -6307,7 +6305,7 @@
 fi
 
 ###	checks for system services and user specified options
-echo "$as_me:6310: checking for long file names" >&5
+echo "$as_me:6308: 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
@@ -6346,7 +6344,7 @@
   rm -rf $ac_xdir 2>/dev/null
 done
 fi
-echo "$as_me:6349: result: $ac_cv_sys_long_file_names" >&5
+echo "$as_me:6347: 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
 
@@ -6356,7 +6354,7 @@
 
 fi
 
-echo "$as_me:6359: checking for restartable reads on pipes" >&5
+echo "$as_me:6357: 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
@@ -6366,7 +6364,7 @@
   cf_cv_can_restart_read=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6369 "configure"
+#line 6367 "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
@@ -6413,15 +6411,15 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:6416: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6414: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6419: \$? = $ac_status" >&5
+  echo "$as_me:6417: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:6421: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6419: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6424: \$? = $ac_status" >&5
+  echo "$as_me:6422: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_can_restart_read=yes
 else
@@ -6434,7 +6432,7 @@
 fi
 
 fi
-echo "$as_me:6437: result: $cf_cv_can_restart_read" >&5
+echo "$as_me:6435: 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
@@ -6443,18 +6441,18 @@
 
 		# is a read() of a pipe restartable?
 
-echo "$as_me:6446: checking whether setpgrp takes no argument" >&5
+echo "$as_me:6444: 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:6452: error: cannot check setpgrp if cross compiling" >&5
+  { { echo "$as_me:6450: 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 6457 "configure"
+#line 6455 "configure"
 #include "confdefs.h"
 #if HAVE_UNISTD_H
 # include <unistd.h>
@@ -6471,15 +6469,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:6474: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6472: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6477: \$? = $ac_status" >&5
+  echo "$as_me:6475: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:6479: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6477: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6482: \$? = $ac_status" >&5
+  echo "$as_me:6480: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_setpgrp_void=no
 else
@@ -6491,7 +6489,7 @@
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:6494: result: $ac_cv_func_setpgrp_void" >&5
+echo "$as_me:6492: 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
 
@@ -6501,14 +6499,14 @@
 
 fi
 
-echo "$as_me:6504: checking whether getpgrp takes no argument" >&5
+echo "$as_me:6502: 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 6511 "configure"
+#line 6509 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -6520,16 +6518,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6523: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6521: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6526: \$? = $ac_status" >&5
+  echo "$as_me:6524: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6529: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6527: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6532: \$? = $ac_status" >&5
+  echo "$as_me:6530: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_func_getpgrp_1=yes
 else
@@ -6540,7 +6538,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 # Use it with no arg.
 cat >conftest.$ac_ext <<_ACEOF
-#line 6543 "configure"
+#line 6541 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -6552,16 +6550,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6555: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6553: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6558: \$? = $ac_status" >&5
+  echo "$as_me:6556: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6561: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6559: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6564: \$? = $ac_status" >&5
+  echo "$as_me:6562: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_func_getpgrp_0=yes
 else
@@ -6575,12 +6573,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:6578: error: cannot check getpgrp if cross compiling" >&5
+  { { echo "$as_me:6576: 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 6583 "configure"
+#line 6581 "configure"
 #include "confdefs.h"
 $ac_includes_default
 
@@ -6634,15 +6632,15 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:6637: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6635: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6640: \$? = $ac_status" >&5
+  echo "$as_me:6638: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:6642: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6640: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6645: \$? = $ac_status" >&5
+  echo "$as_me:6643: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_getpgrp_void=yes
 else
@@ -6656,7 +6654,7 @@
 esac # $ac_func_getpgrp_0:$ac_func_getpgrp_1
 
 fi
-echo "$as_me:6659: result: $ac_cv_func_getpgrp_void" >&5
+echo "$as_me:6657: 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
 
@@ -6666,7 +6664,7 @@
 
 fi
 
-echo "$as_me:6669: checking if killpg is needed" >&5
+echo "$as_me:6667: 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
@@ -6676,7 +6674,7 @@
   cf_cv_need_killpg=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6679 "configure"
+#line 6677 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -6701,15 +6699,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:6704: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6702: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6707: \$? = $ac_status" >&5
+  echo "$as_me:6705: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:6709: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6707: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6712: \$? = $ac_status" >&5
+  echo "$as_me:6710: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_killpg=no
 else
@@ -6722,21 +6720,21 @@
 fi
 
 fi
-echo "$as_me:6725: result: $cf_cv_need_killpg" >&5
+echo "$as_me:6723: 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:6732: checking if external errno is declared" >&5
+echo "$as_me:6730: 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 6739 "configure"
+#line 6737 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -6754,16 +6752,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6757: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6755: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6760: \$? = $ac_status" >&5
+  echo "$as_me:6758: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6763: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6761: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6766: \$? = $ac_status" >&5
+  echo "$as_me:6764: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -6774,7 +6772,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:6777: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:6775: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -6789,14 +6787,14 @@
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:6792: checking if external errno exists" >&5
+echo "$as_me:6790: 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 6799 "configure"
+#line 6797 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -6811,16 +6809,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6814: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6812: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6817: \$? = $ac_status" >&5
+  echo "$as_me:6815: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6820: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6818: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6823: \$? = $ac_status" >&5
+  echo "$as_me:6821: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_errno=yes
 else
@@ -6831,7 +6829,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:6834: result: $cf_cv_have_errno" >&5
+echo "$as_me:6832: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -6844,14 +6842,14 @@
 
 fi
 
-echo "$as_me:6847: checking if external sys_nerr is declared" >&5
+echo "$as_me:6845: 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 6854 "configure"
+#line 6852 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -6869,16 +6867,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6872: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6870: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6875: \$? = $ac_status" >&5
+  echo "$as_me:6873: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6878: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6876: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6881: \$? = $ac_status" >&5
+  echo "$as_me:6879: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_nerr=yes
 else
@@ -6889,7 +6887,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:6892: result: $cf_cv_dcl_sys_nerr" >&5
+echo "$as_me:6890: 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
@@ -6904,14 +6902,14 @@
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:6907: checking if external sys_nerr exists" >&5
+echo "$as_me:6905: 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 6914 "configure"
+#line 6912 "configure"
 #include "confdefs.h"
 
 #undef sys_nerr
@@ -6926,16 +6924,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6929: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6927: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6932: \$? = $ac_status" >&5
+  echo "$as_me:6930: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6935: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6933: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6938: \$? = $ac_status" >&5
+  echo "$as_me:6936: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_nerr=yes
 else
@@ -6946,7 +6944,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:6949: result: $cf_cv_have_sys_nerr" >&5
+echo "$as_me:6947: 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
@@ -6959,14 +6957,14 @@
 
 fi
 
-echo "$as_me:6962: checking if external sys_errlist is declared" >&5
+echo "$as_me:6960: 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 6969 "configure"
+#line 6967 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -6984,16 +6982,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6987: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6985: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6990: \$? = $ac_status" >&5
+  echo "$as_me:6988: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6993: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6991: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6996: \$? = $ac_status" >&5
+  echo "$as_me:6994: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_errlist=yes
 else
@@ -7004,7 +7002,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:7007: result: $cf_cv_dcl_sys_errlist" >&5
+echo "$as_me:7005: 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
@@ -7019,14 +7017,14 @@
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:7022: checking if external sys_errlist exists" >&5
+echo "$as_me:7020: 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 7029 "configure"
+#line 7027 "configure"
 #include "confdefs.h"
 
 #undef sys_errlist
@@ -7041,16 +7039,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7044: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7042: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7047: \$? = $ac_status" >&5
+  echo "$as_me:7045: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7050: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7048: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7053: \$? = $ac_status" >&5
+  echo "$as_me:7051: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_errlist=yes
 else
@@ -7061,7 +7059,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:7064: result: $cf_cv_have_sys_errlist" >&5
+echo "$as_me:7062: 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
@@ -7087,7 +7085,7 @@
 #define os_chosen 1
 EOF
 
-echo "$as_me:7090: checking for screen type" >&5
+echo "$as_me:7088: checking for screen type" >&5
 echo $ECHO_N "checking for screen type... $ECHO_C" >&6
 
 # Check whether --with-screen or --without-screen was given.
@@ -7108,14 +7106,14 @@
 if test -z "$screen"; then
 	screen=termcap;
 fi
-echo "$as_me:7111: result: $screen" >&5
+echo "$as_me:7109: 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:7118: checking for X" >&5
+		echo "$as_me:7116: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -7212,17 +7210,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 7215 "configure"
+#line 7213 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:7219: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7217: \"$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:7225: \$? = $ac_status" >&5
+  echo "$as_me:7223: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7255,7 +7253,7 @@
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >conftest.$ac_ext <<_ACEOF
-#line 7258 "configure"
+#line 7256 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -7267,16 +7265,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7270: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7268: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7273: \$? = $ac_status" >&5
+  echo "$as_me:7271: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7276: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7274: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7279: \$? = $ac_status" >&5
+  echo "$as_me:7277: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -7314,7 +7312,7 @@
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:7317: result: $have_x" >&5
+  echo "$as_me:7315: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -7324,7 +7322,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:7327: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:7325: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -7348,11 +7346,11 @@
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:7351: checking whether -R must be followed by a space" >&5
+      echo "$as_me:7349: 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 7355 "configure"
+#line 7353 "configure"
 #include "confdefs.h"
 
 int
@@ -7364,16 +7362,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7367: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7365: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7370: \$? = $ac_status" >&5
+  echo "$as_me:7368: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7373: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7371: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7376: \$? = $ac_status" >&5
+  echo "$as_me:7374: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_nospace=yes
 else
@@ -7383,13 +7381,13 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
       if test $ac_R_nospace = yes; then
-	echo "$as_me:7386: result: no" >&5
+	echo "$as_me:7384: 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 7392 "configure"
+#line 7390 "configure"
 #include "confdefs.h"
 
 int
@@ -7401,16 +7399,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7404: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7402: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7407: \$? = $ac_status" >&5
+  echo "$as_me:7405: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7410: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7408: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7413: \$? = $ac_status" >&5
+  echo "$as_me:7411: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_space=yes
 else
@@ -7420,11 +7418,11 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	if test $ac_R_space = yes; then
-	  echo "$as_me:7423: result: yes" >&5
+	  echo "$as_me:7421: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:7427: result: neither works" >&5
+	  echo "$as_me:7425: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -7444,7 +7442,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 7447 "configure"
+#line 7445 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7463,22 +7461,22 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7466: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7464: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7469: \$? = $ac_status" >&5
+  echo "$as_me:7467: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7472: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7470: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7475: \$? = $ac_status" >&5
+  echo "$as_me:7473: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:7481: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:7479: 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
@@ -7486,7 +7484,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7489 "configure"
+#line 7487 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7505,16 +7503,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7508: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7506: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7511: \$? = $ac_status" >&5
+  echo "$as_me:7509: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7514: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7512: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7517: \$? = $ac_status" >&5
+  echo "$as_me:7515: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -7525,14 +7523,14 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7528: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:7526: 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:7535: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:7533: 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
@@ -7540,7 +7538,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7543 "configure"
+#line 7541 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7559,16 +7557,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7562: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7560: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7565: \$? = $ac_status" >&5
+  echo "$as_me:7563: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7568: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7566: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7571: \$? = $ac_status" >&5
+  echo "$as_me:7569: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -7579,7 +7577,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7582: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:7580: 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"
@@ -7598,13 +7596,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:7601: checking for gethostbyname" >&5
+    echo "$as_me:7599: 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 7607 "configure"
+#line 7605 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname (); below.  */
@@ -7635,16 +7633,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7638: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7636: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7641: \$? = $ac_status" >&5
+  echo "$as_me:7639: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7644: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7642: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7647: \$? = $ac_status" >&5
+  echo "$as_me:7645: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -7654,11 +7652,11 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7657: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:7655: 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:7661: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:7659: 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
@@ -7666,7 +7664,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7669 "configure"
+#line 7667 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7685,16 +7683,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7688: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7686: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7691: \$? = $ac_status" >&5
+  echo "$as_me:7689: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7694: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7692: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7697: \$? = $ac_status" >&5
+  echo "$as_me:7695: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -7705,14 +7703,14 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7708: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:7706: 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:7715: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:7713: 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
@@ -7720,7 +7718,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7723 "configure"
+#line 7721 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7739,16 +7737,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7742: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7740: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7745: \$? = $ac_status" >&5
+  echo "$as_me:7743: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7748: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7746: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7751: \$? = $ac_status" >&5
+  echo "$as_me:7749: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -7759,7 +7757,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7762: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:7760: 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"
@@ -7775,13 +7773,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:7778: checking for connect" >&5
+    echo "$as_me:7776: 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 7784 "configure"
+#line 7782 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect (); below.  */
@@ -7812,16 +7810,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7815: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7813: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7818: \$? = $ac_status" >&5
+  echo "$as_me:7816: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7821: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7819: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7824: \$? = $ac_status" >&5
+  echo "$as_me:7822: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_connect=yes
 else
@@ -7831,11 +7829,11 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7834: result: $ac_cv_func_connect" >&5
+echo "$as_me:7832: 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:7838: checking for connect in -lsocket" >&5
+      echo "$as_me:7836: 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
@@ -7843,7 +7841,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7846 "configure"
+#line 7844 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7862,16 +7860,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7865: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7863: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7868: \$? = $ac_status" >&5
+  echo "$as_me:7866: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7871: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7869: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7874: \$? = $ac_status" >&5
+  echo "$as_me:7872: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -7882,7 +7880,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7885: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:7883: 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"
@@ -7891,13 +7889,13 @@
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:7894: checking for remove" >&5
+    echo "$as_me:7892: 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 7900 "configure"
+#line 7898 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove (); below.  */
@@ -7928,16 +7926,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7931: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7929: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7934: \$? = $ac_status" >&5
+  echo "$as_me:7932: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7937: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7935: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7940: \$? = $ac_status" >&5
+  echo "$as_me:7938: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_remove=yes
 else
@@ -7947,11 +7945,11 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7950: result: $ac_cv_func_remove" >&5
+echo "$as_me:7948: 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:7954: checking for remove in -lposix" >&5
+      echo "$as_me:7952: 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
@@ -7959,7 +7957,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7962 "configure"
+#line 7960 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7978,16 +7976,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7981: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7979: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7984: \$? = $ac_status" >&5
+  echo "$as_me:7982: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7987: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7985: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7990: \$? = $ac_status" >&5
+  echo "$as_me:7988: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -7998,7 +7996,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8001: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:7999: 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"
@@ -8007,13 +8005,13 @@
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:8010: checking for shmat" >&5
+    echo "$as_me:8008: 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 8016 "configure"
+#line 8014 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat (); below.  */
@@ -8044,16 +8042,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8047: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8045: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8050: \$? = $ac_status" >&5
+  echo "$as_me:8048: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8053: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8051: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8056: \$? = $ac_status" >&5
+  echo "$as_me:8054: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -8063,11 +8061,11 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8066: result: $ac_cv_func_shmat" >&5
+echo "$as_me:8064: 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:8070: checking for shmat in -lipc" >&5
+      echo "$as_me:8068: 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
@@ -8075,7 +8073,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8078 "configure"
+#line 8076 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8094,16 +8092,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8097: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8095: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8100: \$? = $ac_status" >&5
+  echo "$as_me:8098: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8103: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8101: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8106: \$? = $ac_status" >&5
+  echo "$as_me:8104: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -8114,7 +8112,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8117: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:8115: 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"
@@ -8132,7 +8130,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:8135: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:8133: 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
@@ -8140,7 +8138,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8143 "configure"
+#line 8141 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8159,16 +8157,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8162: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8160: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8165: \$? = $ac_status" >&5
+  echo "$as_me:8163: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8168: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8166: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8171: \$? = $ac_status" >&5
+  echo "$as_me:8169: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -8179,7 +8177,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8182: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:8180: 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"
@@ -8273,7 +8271,7 @@
 
 if test "$cf_check_cflags" != "$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 8276 "configure"
+#line 8274 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8285,16 +8283,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8288: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8286: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8291: \$? = $ac_status" >&5
+  echo "$as_me:8289: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8294: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8292: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8297: \$? = $ac_status" >&5
+  echo "$as_me:8295: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -8311,13 +8309,13 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:8314: checking for XOpenDisplay" >&5
+echo "$as_me:8312: checking for XOpenDisplay" >&5
 echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6
 if test "${ac_cv_func_XOpenDisplay+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8320 "configure"
+#line 8318 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char XOpenDisplay (); below.  */
@@ -8348,16 +8346,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8351: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8349: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8354: \$? = $ac_status" >&5
+  echo "$as_me:8352: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8357: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8355: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8360: \$? = $ac_status" >&5
+  echo "$as_me:8358: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_XOpenDisplay=yes
 else
@@ -8367,13 +8365,13 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8370: result: $ac_cv_func_XOpenDisplay" >&5
+echo "$as_me:8368: result: $ac_cv_func_XOpenDisplay" >&5
 echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6
 if test $ac_cv_func_XOpenDisplay = yes; then
   :
 else
 
-echo "$as_me:8376: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:8374: 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
@@ -8381,7 +8379,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8384 "configure"
+#line 8382 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8400,16 +8398,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8403: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8401: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8406: \$? = $ac_status" >&5
+  echo "$as_me:8404: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8409: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8407: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8412: \$? = $ac_status" >&5
+  echo "$as_me:8410: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -8420,7 +8418,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8423: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:8421: 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"
@@ -8428,13 +8426,13 @@
 
 fi
 
-echo "$as_me:8431: checking for XtAppInitialize" >&5
+echo "$as_me:8429: checking for XtAppInitialize" >&5
 echo $ECHO_N "checking for XtAppInitialize... $ECHO_C" >&6
 if test "${ac_cv_func_XtAppInitialize+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8437 "configure"
+#line 8435 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char XtAppInitialize (); below.  */
@@ -8465,16 +8463,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8468: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8466: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8471: \$? = $ac_status" >&5
+  echo "$as_me:8469: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8474: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8472: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8477: \$? = $ac_status" >&5
+  echo "$as_me:8475: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_XtAppInitialize=yes
 else
@@ -8484,13 +8482,13 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8487: result: $ac_cv_func_XtAppInitialize" >&5
+echo "$as_me:8485: result: $ac_cv_func_XtAppInitialize" >&5
 echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6
 if test $ac_cv_func_XtAppInitialize = yes; then
   :
 else
 
-echo "$as_me:8493: checking for XtAppInitialize in -lXt" >&5
+echo "$as_me:8491: 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
@@ -8498,7 +8496,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8501 "configure"
+#line 8499 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8517,16 +8515,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8520: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8518: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8523: \$? = $ac_status" >&5
+  echo "$as_me:8521: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8526: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8524: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8529: \$? = $ac_status" >&5
+  echo "$as_me:8527: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xt_XtAppInitialize=yes
 else
@@ -8537,7 +8535,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8540: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:8538: 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
@@ -8551,7 +8549,7 @@
 fi
 
 if test $cf_have_X_LIBS = no ; then
-	{ echo "$as_me:8554: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+	{ echo "$as_me:8552: 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
@@ -8559,7 +8557,36 @@
 to makefile." >&2;}
 fi
 
-echo "$as_me:8562: checking if we should use imake to help" >&5
+echo "$as_me:8560: checking if you want narrow prototypes for X libraries" >&5
+echo $ECHO_N "checking if you want narrow prototypes for X libraries... $ECHO_C" >&6
+
+case `$ac_config_guess` in #(vi
+*cygwin*|*freebsd*|*gnu*|*irix5*|*irix6*|*linux-gnu*|*netbsd*|*openbsd*|*qnx*|*sco*|*sgi*) #(vi
+	cf_default_narrowproto=yes
+	;;
+*)
+	cf_default_narrowproto=no
+	;;
+esac
+
+# Check whether --enable-narrowproto or --disable-narrowproto was given.
+if test "${enable_narrowproto+set}" = set; then
+  enableval="$enable_narrowproto"
+  test "$enableval" != no && enableval=yes
+  if test "$enableval" != "$cf_default_narrowproto" ; then
+    enable_narrowproto=$enableval
+  else
+    enable_narrowproto=$cf_default_narrowproto
+  fi
+else
+  enableval=$cf_default_narrowproto
+  enable_narrowproto=$cf_default_narrowproto
+
+fi;
+echo "$as_me:8586: result: $enable_narrowproto" >&5
+echo "${ECHO_T}$enable_narrowproto" >&6
+
+echo "$as_me:8589: checking if we should use imake to help" >&5
 echo $ECHO_N "checking if we should use imake to help... $ECHO_C" >&6
 
 # Check whether --enable-imake or --disable-imake was given.
@@ -8576,7 +8603,7 @@
   enable_imake=yes
 
 fi;
-echo "$as_me:8579: result: $enable_imake" >&5
+echo "$as_me:8606: result: $enable_imake" >&5
 echo "${ECHO_T}$enable_imake" >&6
 
 if test "$enable_imake" = yes ; then
@@ -8585,7 +8612,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:8588: checking for $ac_word" >&5
+echo "$as_me:8615: 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
@@ -8602,7 +8629,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:8605: found $ac_dir/$ac_word" >&5
+   echo "$as_me:8632: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -8613,10 +8640,10 @@
 IMAKE=$ac_cv_path_IMAKE
 
 if test -n "$IMAKE"; then
-  echo "$as_me:8616: result: $IMAKE" >&5
+  echo "$as_me:8643: result: $IMAKE" >&5
 echo "${ECHO_T}$IMAKE" >&6
 else
-  echo "$as_me:8619: result: no" >&5
+  echo "$as_me:8646: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8689,7 +8716,7 @@
 			esac
 		done
 		if test -z "$cf_config" ; then
-			{ echo "$as_me:8692: WARNING: Could not find imake config-directory" >&5
+			{ echo "$as_me:8719: 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"
@@ -8698,7 +8725,7 @@
 				test -n "$verbose" && echo "	Using $IMAKE $cf_config" 1>&6
 
 			else
-				{ echo "$as_me:8701: WARNING: Cannot run $IMAKE" >&5
+				{ echo "$as_me:8728: WARNING: Cannot run $IMAKE" >&5
 echo "$as_me: WARNING: Cannot run $IMAKE" >&2;}
 			fi
 		fi
@@ -8868,10 +8895,9 @@
 	IMAKE_CFLAGS="-DFUNCPROTO=15 $IMAKE_CFLAGS"
 
 	# If this is not set properly, Xaw's scrollbars will not work
-	case `$ac_config_guess` in
-	*freebsd*|*gnu*|*irix5*|*irix6*|*linux-gnu*|*netbsd*|*openbsd*)
+	if test "$enable_narrowproto" = yes ; then
 		IMAKE_CFLAGS="-DNARROWPROTO=1 $IMAKE_CFLAGS"
-	esac
+	fi
 
 	# Other special definitions:
 	case $host_os in
@@ -9036,7 +9062,7 @@
 
 if test "$cf_check_cflags" != "$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 9039 "configure"
+#line 9065 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9048,16 +9074,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9051: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9077: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9054: \$? = $ac_status" >&5
+  echo "$as_me:9080: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9057: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9083: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9060: \$? = $ac_status" >&5
+  echo "$as_me:9086: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9087,23 +9113,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:9090: checking for $ac_header" >&5
+echo "$as_me:9116: 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 9096 "configure"
+#line 9122 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:9100: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:9126: \"$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:9106: \$? = $ac_status" >&5
+  echo "$as_me:9132: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9122,7 +9148,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:9125: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:9151: 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
@@ -9148,7 +9174,7 @@
 fi
 LDFLAGS="$LDFLAGS $X_LIBS"
 
-echo "$as_me:9151: checking for XmuClientWindow in -lXmu" >&5
+echo "$as_me:9177: 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
@@ -9156,7 +9182,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXmu  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9159 "configure"
+#line 9185 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9175,16 +9201,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9178: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9204: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9181: \$? = $ac_status" >&5
+  echo "$as_me:9207: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9184: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9210: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9187: \$? = $ac_status" >&5
+  echo "$as_me:9213: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xmu_XmuClientWindow=yes
 else
@@ -9195,7 +9221,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9198: result: $ac_cv_lib_Xmu_XmuClientWindow" >&5
+echo "$as_me:9224: 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
@@ -9206,7 +9232,7 @@
 
 fi
 
-echo "$as_me:9209: checking for OlToolkitInitialize in -lXol" >&5
+echo "$as_me:9235: 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
@@ -9214,7 +9240,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXol  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9217 "configure"
+#line 9243 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9233,16 +9259,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9236: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9262: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9239: \$? = $ac_status" >&5
+  echo "$as_me:9265: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9242: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9268: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9245: \$? = $ac_status" >&5
+  echo "$as_me:9271: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xol_OlToolkitInitialize=yes
 else
@@ -9253,17 +9279,17 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9256: result: $ac_cv_lib_Xol_OlToolkitInitialize" >&5
+echo "$as_me:9282: 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:9261: error: Unable to successfully link OpenLook library (-lXol) with test program" >&5
+  { { echo "$as_me:9287: 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
 
-	 	test "$cf_extensions" = no && EXTRAOBJS="$EXTRAOBJS select.o"
+	 	test "$cf_extensions" = no && EXTRAOBJS="$EXTRAOBJS select\$o"
 	;;
 	[mM]otif* | [Xx]m )
 		cat >>confdefs.h <<\EOF
@@ -9273,23 +9299,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:9276: checking for $ac_header" >&5
+echo "$as_me:9302: 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 9282 "configure"
+#line 9308 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:9286: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:9312: \"$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:9292: \$? = $ac_status" >&5
+  echo "$as_me:9318: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9308,7 +9334,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:9311: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:9337: 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
@@ -9318,7 +9344,7 @@
 fi
 done
 
-echo "$as_me:9321: checking for regcmp in -lgen" >&5
+echo "$as_me:9347: 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
@@ -9326,7 +9352,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgen  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9329 "configure"
+#line 9355 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9345,16 +9371,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9348: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9374: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9351: \$? = $ac_status" >&5
+  echo "$as_me:9377: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9354: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9380: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9357: \$? = $ac_status" >&5
+  echo "$as_me:9383: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gen_regcmp=yes
 else
@@ -9365,7 +9391,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9368: result: $ac_cv_lib_gen_regcmp" >&5
+echo "$as_me:9394: 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
@@ -9376,7 +9402,7 @@
 
 fi
 
-echo "$as_me:9379: checking for XmuClientWindow in -lXmu" >&5
+echo "$as_me:9405: 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
@@ -9384,7 +9410,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXmu  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9387 "configure"
+#line 9413 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9403,16 +9429,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9406: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9432: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9409: \$? = $ac_status" >&5
+  echo "$as_me:9435: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9412: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9438: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9415: \$? = $ac_status" >&5
+  echo "$as_me:9441: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xmu_XmuClientWindow=yes
 else
@@ -9423,7 +9449,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9426: result: $ac_cv_lib_Xmu_XmuClientWindow" >&5
+echo "$as_me:9452: 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
@@ -9434,7 +9460,7 @@
 
 fi
 
-echo "$as_me:9437: checking for XpStartDoc in -lXp" >&5
+echo "$as_me:9463: 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
@@ -9442,7 +9468,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXp $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9445 "configure"
+#line 9471 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9461,16 +9487,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9464: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9490: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9467: \$? = $ac_status" >&5
+  echo "$as_me:9493: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9470: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9496: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9473: \$? = $ac_status" >&5
+  echo "$as_me:9499: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xp_XpStartDoc=yes
 else
@@ -9481,7 +9507,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9484: result: $ac_cv_lib_Xp_XpStartDoc" >&5
+echo "$as_me:9510: 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
@@ -9492,7 +9518,7 @@
 
 fi
 
-echo "$as_me:9495: checking for XextCreateExtension in -lXext" >&5
+echo "$as_me:9521: 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
@@ -9500,7 +9526,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9503 "configure"
+#line 9529 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9519,16 +9545,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9522: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9548: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9525: \$? = $ac_status" >&5
+  echo "$as_me:9551: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9528: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9554: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9531: \$? = $ac_status" >&5
+  echo "$as_me:9557: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
@@ -9539,13 +9565,13 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9542: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:9568: 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:9548: checking for XpmCreatePixmapFromXpmImage in -lXpm" >&5
+echo "$as_me:9574: 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
@@ -9553,7 +9579,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXpm $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9556 "configure"
+#line 9582 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9572,16 +9598,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9575: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9601: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9578: \$? = $ac_status" >&5
+  echo "$as_me:9604: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9581: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9607: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9584: \$? = $ac_status" >&5
+  echo "$as_me:9610: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xpm_XpmCreatePixmapFromXpmImage=yes
 else
@@ -9592,13 +9618,13 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9595: result: $ac_cv_lib_Xpm_XpmCreatePixmapFromXpmImage" >&5
+echo "$as_me:9621: 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:9601: checking for XmbTextListToTextProperty in -lXIM" >&5
+echo "$as_me:9627: 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
@@ -9606,7 +9632,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXIM  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9609 "configure"
+#line 9635 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9625,16 +9651,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9628: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9654: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9631: \$? = $ac_status" >&5
+  echo "$as_me:9657: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9634: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9660: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9637: \$? = $ac_status" >&5
+  echo "$as_me:9663: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_XIM_XmbTextListToTextProperty=yes
 else
@@ -9645,7 +9671,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9648: result: $ac_cv_lib_XIM_XmbTextListToTextProperty" >&5
+echo "$as_me:9674: 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
@@ -9655,7 +9681,7 @@
   LIBS="-lXIM $LIBS"
 
 fi
-echo "$as_me:9658: checking for XmProcessTraversal in -lXm" >&5
+echo "$as_me:9684: 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
@@ -9663,7 +9689,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXm $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9666 "configure"
+#line 9692 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9682,16 +9708,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9685: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9711: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9688: \$? = $ac_status" >&5
+  echo "$as_me:9714: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9691: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9717: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9694: \$? = $ac_status" >&5
+  echo "$as_me:9720: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xm_XmProcessTraversal=yes
 else
@@ -9702,18 +9728,18 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9705: result: $ac_cv_lib_Xm_XmProcessTraversal" >&5
+echo "$as_me:9731: 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:9710: error: Unable to successfully link Motif library (-lXm) with test program" >&5
+  { { echo "$as_me:9736: 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
 
-	 	test "$cf_extensions" = yes && EXTRAOBJS="$EXTRAOBJS x11menu.o menu.o"
-	 	test "$cf_extensions" = no && EXTRAOBJS="$EXTRAOBJS select.o"
+	 	test "$cf_extensions" = yes && EXTRAOBJS="$EXTRAOBJS x11menu\$o menu\$o"
+	 	test "$cf_extensions" = no && EXTRAOBJS="$EXTRAOBJS select\$o"
 	;;
 	[Aa]thena* | [Xx]aw* | neXtaw | XawPlus )
 		cat >>confdefs.h <<\EOF
@@ -9728,7 +9754,7 @@
 
 cf_x_athena=${cf_x_athena-Xaw}
 
-echo "$as_me:9731: checking if you want to link with Xaw 3d library" >&5
+echo "$as_me:9757: checking if you want to link with Xaw 3d library" >&5
 echo $ECHO_N "checking if you want to link with Xaw 3d library... $ECHO_C" >&6
 withval=
 
@@ -9739,14 +9765,14 @@
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3d
-	echo "$as_me:9742: result: yes" >&5
+	echo "$as_me:9768: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:9745: result: no" >&5
+	echo "$as_me:9771: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:9749: checking if you want to link with neXT Athena library" >&5
+echo "$as_me:9775: checking if you want to link with neXT Athena library" >&5
 echo $ECHO_N "checking if you want to link with neXT Athena library... $ECHO_C" >&6
 withval=
 
@@ -9757,14 +9783,14 @@
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=neXtaw
-	echo "$as_me:9760: result: yes" >&5
+	echo "$as_me:9786: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:9763: result: no" >&5
+	echo "$as_me:9789: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:9767: checking if you want to link with Athena-Plus library" >&5
+echo "$as_me:9793: checking if you want to link with Athena-Plus library" >&5
 echo $ECHO_N "checking if you want to link with Athena-Plus library... $ECHO_C" >&6
 withval=
 
@@ -9775,14 +9801,14 @@
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=XawPlus
-	echo "$as_me:9778: result: yes" >&5
+	echo "$as_me:9804: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:9781: result: no" >&5
+	echo "$as_me:9807: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:9785: checking for XextCreateExtension in -lXext" >&5
+echo "$as_me:9811: 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
@@ -9790,7 +9816,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9793 "configure"
+#line 9819 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9809,16 +9835,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9812: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9838: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9815: \$? = $ac_status" >&5
+  echo "$as_me:9841: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9818: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9844: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9821: \$? = $ac_status" >&5
+  echo "$as_me:9847: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
@@ -9829,7 +9855,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9832: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:9858: 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"
@@ -9851,14 +9877,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:9854: checking for $cf_test in $cf_path" >&5
+			echo "$as_me:9880: 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:9857: checking for $cf_test" >&5
+			echo "$as_me:9883: checking for $cf_test" >&5
 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
 		fi
 		cat >conftest.$ac_ext <<_ACEOF
-#line 9861 "configure"
+#line 9887 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -9872,16 +9898,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9875: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9901: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9878: \$? = $ac_status" >&5
+  echo "$as_me:9904: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9881: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9907: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9884: \$? = $ac_status" >&5
+  echo "$as_me:9910: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -9890,7 +9916,7 @@
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-		echo "$as_me:9893: result: $cf_result" >&5
+		echo "$as_me:9919: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 		if test "$cf_result" = yes ; then
 			cf_x_athena_include=$cf_path
@@ -9902,7 +9928,7 @@
 done
 
 if test -z "$cf_x_athena_include" ; then
-	{ echo "$as_me:9905: WARNING: Unable to successfully find Athena header files with test program" >&5
+	{ echo "$as_me:9931: 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"
@@ -9927,17 +9953,17 @@
 			cf_test=XawSimpleMenuAddGlobalActions
 			if test $cf_path != default ; then
 				LIBS="-L$cf_path/lib $cf_lib $LIBS"
-				echo "$as_me:9930: checking for $cf_lib in $cf_path" >&5
+				echo "$as_me:9956: 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:9934: checking for $cf_test in $cf_lib" >&5
+				echo "$as_me:9960: 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 9940 "configure"
+#line 9966 "configure"
 #include "confdefs.h"
 
 int
@@ -9949,16 +9975,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9952: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9978: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9955: \$? = $ac_status" >&5
+  echo "$as_me:9981: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9958: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9984: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9961: \$? = $ac_status" >&5
+  echo "$as_me:9987: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -9967,7 +9993,7 @@
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-			echo "$as_me:9970: result: $cf_result" >&5
+			echo "$as_me:9996: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				cf_x_athena_lib="$cf_lib"
@@ -9981,7 +10007,7 @@
 done
 
 if test -z "$cf_x_athena_lib" ; then
-	{ { echo "$as_me:9984: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+	{ { echo "$as_me:10010: 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
@@ -9992,15 +10018,15 @@
 #define $cf_x_athena_LIBS 1
 EOF
 
-	 	test "$cf_extensions" = yes && EXTRAOBJS="$EXTRAOBJS x11menu.o menu.o"
-	 	test "$cf_extensions" = no && EXTRAOBJS="$EXTRAOBJS select.o"
+	 	test "$cf_extensions" = yes && EXTRAOBJS="$EXTRAOBJS x11menu\$o menu\$o"
+	 	test "$cf_extensions" = no && EXTRAOBJS="$EXTRAOBJS select\$o"
 	;;
 	x | X | [Xx][Tt]* | [Xx]11 )
 		cat >>confdefs.h <<\EOF
 #define NO_WIDGETS 1
 EOF
 
-	 	test "$cf_extensions" = no && EXTRAOBJS="$EXTRAOBJS select.o"
+	 	test "$cf_extensions" = no && EXTRAOBJS="$EXTRAOBJS select\$o"
 	;;
 	ansi)
 		SCREEN=ansi
@@ -10017,7 +10043,7 @@
 #define DISP_CURSES 1
 EOF
 
-echo "$as_me:10020: checking for extra include directories" >&5
+echo "$as_me:10046: 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
@@ -10025,7 +10051,7 @@
 
 cf_cv_curses_incdir=no
 case $host_os in #(vi
-hpux10.*|hpux11.*) #(vi
+hpux10.*) #(vi
 	test -d /usr/include/curses_colr && \
 	cf_cv_curses_incdir="-I/usr/include/curses_colr"
 	;;
@@ -10037,11 +10063,11 @@
 esac
 
 fi
-echo "$as_me:10040: result: $cf_cv_curses_incdir" >&5
+echo "$as_me:10066: 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:10044: checking if we have identified curses headers" >&5
+echo "$as_me:10070: 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
@@ -10055,7 +10081,7 @@
 	ncurses/ncurses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 10058 "configure"
+#line 10084 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -10067,16 +10093,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10070: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10096: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10073: \$? = $ac_status" >&5
+  echo "$as_me:10099: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10076: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10102: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10079: \$? = $ac_status" >&5
+  echo "$as_me:10105: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -10087,11 +10113,11 @@
 done
 
 fi
-echo "$as_me:10090: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:10116: 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:10094: error: No curses header-files found" >&5
+	{ { echo "$as_me:10120: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -10101,23 +10127,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:10104: checking for $ac_header" >&5
+echo "$as_me:10130: 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 10110 "configure"
+#line 10136 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:10114: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:10140: \"$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:10120: \$? = $ac_status" >&5
+  echo "$as_me:10146: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -10136,7 +10162,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:10139: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:10165: 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
@@ -10146,7 +10172,94 @@
 fi
 done
 
-echo "$as_me:10149: checking for ncurses version" >&5
+echo "$as_me:10175: checking for terminfo header" >&5
+echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
+if test "${cf_cv_term_header+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+case ${cf_cv_ncurses_header} in #(vi
+*/ncurses.h|*/ncursesw.h) #(vi
+	cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'`
+	;;
+*)
+	cf_term_header=term.h
+	;;
+esac
+
+for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+do
+cat >conftest.$ac_ext <<_ACEOF
+#line 10193 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+#include <${cf_cv_ncurses_header-curses.h}>
+#include <$cf_test>
+
+int
+main ()
+{
+int x = auto_left_margin
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:10208: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:10211: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:10214: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:10217: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+	cf_cv_term_header="$cf_test"
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+
+	cf_cv_term_header=unknown
+
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+	test "$cf_cv_term_header" != unknown && break
+done
+
+fi
+echo "$as_me:10233: result: $cf_cv_term_header" >&5
+echo "${ECHO_T}$cf_cv_term_header" >&6
+
+# Set definitions to allow ifdef'ing to accommodate subdirectories
+
+case $cf_cv_term_header in # (vi
+*term.h)
+	cat >>confdefs.h <<\EOF
+#define HAVE_TERM_H 1
+EOF
+
+	;;
+esac
+
+case $cf_cv_term_header in # (vi
+ncurses/term.h) #(vi
+	cat >>confdefs.h <<\EOF
+#define HAVE_NCURSES_TERM_H 1
+EOF
+
+	;;
+ncursesw/term.h)
+	cat >>confdefs.h <<\EOF
+#define HAVE_NCURSESW_TERM_H 1
+EOF
+
+	;;
+esac
+
+echo "$as_me:10262: 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
@@ -10172,10 +10285,10 @@
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:10175: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:10288: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:10178: \$? = $ac_status" >&5
+  echo "$as_me:10291: \$? = $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%".*%%'`
@@ -10185,7 +10298,7 @@
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10188 "configure"
+#line 10301 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -10210,15 +10323,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:10213: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10326: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10216: \$? = $ac_status" >&5
+  echo "$as_me:10329: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:10218: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10331: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10221: \$? = $ac_status" >&5
+  echo "$as_me:10334: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -10232,16 +10345,16 @@
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:10235: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:10348: 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:10241: checking if we have identified curses libraries" >&5
+echo "$as_me:10354: 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 10244 "configure"
+#line 10357 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -10253,16 +10366,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10256: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10369: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10259: \$? = $ac_status" >&5
+  echo "$as_me:10372: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10262: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10375: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10265: \$? = $ac_status" >&5
+  echo "$as_me:10378: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -10271,13 +10384,13 @@
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:10274: result: $cf_result" >&5
+echo "$as_me:10387: 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:10280: checking for tgoto in -lmytinfo" >&5
+	echo "$as_me:10393: 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
@@ -10285,7 +10398,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10288 "configure"
+#line 10401 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10304,16 +10417,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10307: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10420: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10310: \$? = $ac_status" >&5
+  echo "$as_me:10423: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10313: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10426: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10316: \$? = $ac_status" >&5
+  echo "$as_me:10429: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -10324,15 +10437,15 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10327: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:10440: 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"
 fi
 
 	;;
-hpux10.*|hpux11.*) #(vi
-	echo "$as_me:10335: checking for initscr in -lcur_colr" >&5
+hpux10.*) #(vi
+	echo "$as_me:10448: 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
@@ -10340,7 +10453,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcur_colr  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10343 "configure"
+#line 10456 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10359,16 +10472,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10362: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10475: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10365: \$? = $ac_status" >&5
+  echo "$as_me:10478: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10368: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10481: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10371: \$? = $ac_status" >&5
+  echo "$as_me:10484: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_cur_colr_initscr=yes
 else
@@ -10379,7 +10492,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10382: result: $ac_cv_lib_cur_colr_initscr" >&5
+echo "$as_me:10495: 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
 
@@ -10388,7 +10501,7 @@
 
 else
 
-	echo "$as_me:10391: checking for initscr in -lHcurses" >&5
+	echo "$as_me:10504: 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
@@ -10396,7 +10509,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lHcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10399 "configure"
+#line 10512 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10415,16 +10528,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10418: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10531: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10421: \$? = $ac_status" >&5
+  echo "$as_me:10534: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10424: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10537: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10427: \$? = $ac_status" >&5
+  echo "$as_me:10540: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Hcurses_initscr=yes
 else
@@ -10435,7 +10548,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10438: result: $ac_cv_lib_Hcurses_initscr" >&5
+echo "$as_me:10551: 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
 
@@ -10473,13 +10586,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:10476: checking for tgoto" >&5
+	echo "$as_me:10589: 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 10482 "configure"
+#line 10595 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char tgoto (); below.  */
@@ -10510,16 +10623,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10513: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10626: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10516: \$? = $ac_status" >&5
+  echo "$as_me:10629: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10519: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10632: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10522: \$? = $ac_status" >&5
+  echo "$as_me:10635: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_tgoto=yes
 else
@@ -10529,7 +10642,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10532: result: $ac_cv_func_tgoto" >&5
+echo "$as_me:10645: 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
@@ -10538,7 +10651,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:10541: checking for tgoto in -l$cf_term_lib" >&5
+echo "$as_me:10654: 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
@@ -10546,7 +10659,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_term_lib  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10549 "configure"
+#line 10662 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10565,16 +10678,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10568: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10681: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10571: \$? = $ac_status" >&5
+  echo "$as_me:10684: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10574: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10687: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10577: \$? = $ac_status" >&5
+  echo "$as_me:10690: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -10585,7 +10698,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10588: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:10701: 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
@@ -10600,7 +10713,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:10603: checking for initscr in -l$cf_curs_lib" >&5
+echo "$as_me:10716: 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
@@ -10608,7 +10721,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_curs_lib  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10611 "configure"
+#line 10724 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10627,16 +10740,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10630: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10743: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10633: \$? = $ac_status" >&5
+  echo "$as_me:10746: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10636: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10749: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10639: \$? = $ac_status" >&5
+  echo "$as_me:10752: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -10647,23 +10760,23 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10650: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:10763: 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:10657: error: no curses library found" >&5
+	test $cf_curs_lib = unknown && { { echo "$as_me:10770: 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:10663: checking if we can link with $cf_curs_lib library" >&5
+		echo "$as_me:10776: 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 10666 "configure"
+#line 10779 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -10675,16 +10788,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10678: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10791: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10681: \$? = $ac_status" >&5
+  echo "$as_me:10794: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10684: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10797: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10687: \$? = $ac_status" >&5
+  echo "$as_me:10800: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -10693,18 +10806,18 @@
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-		echo "$as_me:10696: result: $cf_result" >&5
+		echo "$as_me:10809: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
-		test $cf_result = no && { { echo "$as_me:10698: error: Cannot link curses library" >&5
+		test $cf_result = no && { { echo "$as_me:10811: 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:10704: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+		echo "$as_me:10817: 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 10707 "configure"
+#line 10820 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -10716,16 +10829,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10719: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10832: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10722: \$? = $ac_status" >&5
+  echo "$as_me:10835: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10725: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10838: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10728: \$? = $ac_status" >&5
+  echo "$as_me:10841: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=no
 else
@@ -10734,7 +10847,7 @@
 
 			LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
 			cat >conftest.$ac_ext <<_ACEOF
-#line 10737 "configure"
+#line 10850 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -10746,16 +10859,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10749: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10862: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10752: \$? = $ac_status" >&5
+  echo "$as_me:10865: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10755: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10868: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10758: \$? = $ac_status" >&5
+  echo "$as_me:10871: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -10767,7 +10880,7 @@
 
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-		echo "$as_me:10770: result: $cf_result" >&5
+		echo "$as_me:10883: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	fi
 fi
@@ -10800,11 +10913,11 @@
     ;;
   esac
   ;; #(vi
-.NONE/*)
+.no|.NONE/*)
   withval=`echo $withval | sed -e s%NONE%$ac_default_prefix%`
   ;;
 *)
-  { { echo "$as_me:10807: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:10920: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -10821,7 +10934,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:10824: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:10937: 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
@@ -10833,7 +10946,7 @@
 	do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 10836 "configure"
+#line 10949 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -10857,16 +10970,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10860: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10973: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10863: \$? = $ac_status" >&5
+  echo "$as_me:10976: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10866: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10979: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10869: \$? = $ac_status" >&5
+  echo "$as_me:10982: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -10881,13 +10994,14 @@
 	done
 
 fi
-echo "$as_me:10884: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:10997: 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:10890: checking for $cf_ncuhdr_root include-path" >&5
+
+echo "$as_me:11004: 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
@@ -10982,7 +11096,7 @@
 				cf_save_CPPFLAGS="$CPPFLAGS"
 				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 10985 "configure"
+#line 11099 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10994,16 +11108,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10997: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11111: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11000: \$? = $ac_status" >&5
+  echo "$as_me:11114: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11003: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11117: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11006: \$? = $ac_status" >&5
+  echo "$as_me:11120: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11030,7 +11144,7 @@
 		do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 11033 "configure"
+#line 11147 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -11054,16 +11168,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11057: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11171: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11060: \$? = $ac_status" >&5
+  echo "$as_me:11174: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11063: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11177: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11066: \$? = $ac_status" >&5
+  echo "$as_me:11180: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -11084,12 +11198,12 @@
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11087: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11201: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:11092: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:11206: 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%/[^/]*$%%'`
@@ -11111,7 +11225,7 @@
 				cf_save_CPPFLAGS="$CPPFLAGS"
 				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 11114 "configure"
+#line 11228 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11123,16 +11237,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11126: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11240: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11129: \$? = $ac_status" >&5
+  echo "$as_me:11243: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11132: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11246: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11135: \$? = $ac_status" >&5
+  echo "$as_me:11249: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11155,9 +11269,7 @@
 
 fi
 
-cat >>confdefs.h <<\EOF
-#define NCURSES 1
-EOF
+# Set definitions to allow ifdef'ing for ncurses.h
 
 case $cf_cv_ncurses_header in # (vi
 *ncurses.h)
@@ -11183,7 +11295,99 @@
 	;;
 esac
 
-echo "$as_me:11186: checking for ncurses version" >&5
+echo "$as_me:11298: checking for terminfo header" >&5
+echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
+if test "${cf_cv_term_header+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+case ${cf_cv_ncurses_header} in #(vi
+*/ncurses.h|*/ncursesw.h) #(vi
+	cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'`
+	;;
+*)
+	cf_term_header=term.h
+	;;
+esac
+
+for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+do
+cat >conftest.$ac_ext <<_ACEOF
+#line 11316 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+#include <${cf_cv_ncurses_header-curses.h}>
+#include <$cf_test>
+
+int
+main ()
+{
+int x = auto_left_margin
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:11331: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:11334: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:11337: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:11340: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+	cf_cv_term_header="$cf_test"
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+
+	cf_cv_term_header=unknown
+
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+	test "$cf_cv_term_header" != unknown && break
+done
+
+fi
+echo "$as_me:11356: result: $cf_cv_term_header" >&5
+echo "${ECHO_T}$cf_cv_term_header" >&6
+
+# Set definitions to allow ifdef'ing to accommodate subdirectories
+
+case $cf_cv_term_header in # (vi
+*term.h)
+	cat >>confdefs.h <<\EOF
+#define HAVE_TERM_H 1
+EOF
+
+	;;
+esac
+
+case $cf_cv_term_header in # (vi
+ncurses/term.h) #(vi
+	cat >>confdefs.h <<\EOF
+#define HAVE_NCURSES_TERM_H 1
+EOF
+
+	;;
+ncursesw/term.h)
+	cat >>confdefs.h <<\EOF
+#define HAVE_NCURSESW_TERM_H 1
+EOF
+
+	;;
+esac
+
+# some applications need this, but should check for NCURSES_VERSION
+cat >>confdefs.h <<\EOF
+#define NCURSES 1
+EOF
+
+echo "$as_me:11390: 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
@@ -11209,10 +11413,10 @@
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:11212: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:11416: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:11215: \$? = $ac_status" >&5
+  echo "$as_me:11419: \$? = $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%".*%%'`
@@ -11222,7 +11426,7 @@
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11225 "configure"
+#line 11429 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -11247,15 +11451,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:11250: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11454: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11253: \$? = $ac_status" >&5
+  echo "$as_me:11457: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:11255: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11459: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11258: \$? = $ac_status" >&5
+  echo "$as_me:11462: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -11269,7 +11473,7 @@
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:11272: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:11476: 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
@@ -11281,7 +11485,7 @@
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:11284: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:11488: 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
@@ -11289,7 +11493,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 11292 "configure"
+#line 11496 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11308,16 +11512,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11311: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11515: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11314: \$? = $ac_status" >&5
+  echo "$as_me:11518: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11317: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11521: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11320: \$? = $ac_status" >&5
+  echo "$as_me:11524: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -11328,10 +11532,10 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11331: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:11535: 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:11334: checking for initscr in -lgpm" >&5
+  echo "$as_me:11538: 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
@@ -11339,7 +11543,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 11342 "configure"
+#line 11546 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11358,16 +11562,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11361: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11565: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11364: \$? = $ac_status" >&5
+  echo "$as_me:11568: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11367: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11571: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11370: \$? = $ac_status" >&5
+  echo "$as_me:11574: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -11378,7 +11582,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11381: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:11585: 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"
@@ -11393,7 +11597,7 @@
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it's static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:11396: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:11600: 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
@@ -11401,7 +11605,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 11404 "configure"
+#line 11608 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11420,16 +11624,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11423: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11627: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11426: \$? = $ac_status" >&5
+  echo "$as_me:11630: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11429: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11633: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11432: \$? = $ac_status" >&5
+  echo "$as_me:11636: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -11440,7 +11644,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11443: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:11647: 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"
@@ -11459,13 +11663,13 @@
 
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
-	echo "$as_me:11462: checking for initscr" >&5
+	echo "$as_me:11666: 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 11468 "configure"
+#line 11672 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */
@@ -11496,16 +11700,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11499: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11703: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11502: \$? = $ac_status" >&5
+  echo "$as_me:11706: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11505: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11709: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11508: \$? = $ac_status" >&5
+  echo "$as_me:11712: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -11515,18 +11719,18 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:11518: result: $ac_cv_func_initscr" >&5
+echo "$as_me:11722: 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:11525: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:11729: 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 11529 "configure"
+#line 11733 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -11538,25 +11742,25 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11541: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11745: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11544: \$? = $ac_status" >&5
+  echo "$as_me:11748: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11547: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11751: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11550: \$? = $ac_status" >&5
+  echo "$as_me:11754: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:11552: result: yes" >&5
+  echo "$as_me:11756: 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:11559: result: no" >&5
+echo "$as_me:11763: result: no" >&5
 echo "${ECHO_T}no" >&6
 			cf_search=""
 
@@ -11616,11 +11820,11 @@
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:11619: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:11823: 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 11623 "configure"
+#line 11827 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -11632,25 +11836,25 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11635: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11839: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11638: \$? = $ac_status" >&5
+  echo "$as_me:11842: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11641: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11845: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11644: \$? = $ac_status" >&5
+  echo "$as_me:11848: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:11646: result: yes" >&5
+  echo "$as_me:11850: 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:11653: result: no" >&5
+echo "$as_me:11857: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -11665,7 +11869,7 @@
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:11668: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:11872: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -11673,7 +11877,7 @@
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:11676: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:11880: 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
@@ -11683,7 +11887,7 @@
 		fi
 	done
 	cat >conftest.$ac_ext <<_ACEOF
-#line 11686 "configure"
+#line 11890 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -11695,23 +11899,23 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11698: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11902: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11701: \$? = $ac_status" >&5
+  echo "$as_me:11905: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11704: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11908: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11707: \$? = $ac_status" >&5
+  echo "$as_me:11911: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:11709: result: yes" >&5
+  echo "$as_me:11913: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:11714: result: no" >&5
+echo "$as_me:11918: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -11738,7 +11942,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:11741: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:11945: 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
@@ -11750,7 +11954,7 @@
 	do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 11753 "configure"
+#line 11957 "configure"
 #include "confdefs.h"
 
 #define _XOPEN_SOURCE_EXTENDED
@@ -11782,16 +11986,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11785: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11989: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11788: \$? = $ac_status" >&5
+  echo "$as_me:11992: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11791: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11995: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11794: \$? = $ac_status" >&5
+  echo "$as_me:11998: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -11806,13 +12010,14 @@
 	done
 
 fi
-echo "$as_me:11809: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:12013: 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:11815: checking for $cf_ncuhdr_root include-path" >&5
+
+echo "$as_me:12020: 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
@@ -11907,7 +12112,7 @@
 				cf_save_CPPFLAGS="$CPPFLAGS"
 				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 11910 "configure"
+#line 12115 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11919,16 +12124,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11922: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12127: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11925: \$? = $ac_status" >&5
+  echo "$as_me:12130: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11928: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12133: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11931: \$? = $ac_status" >&5
+  echo "$as_me:12136: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11955,13 +12160,9 @@
 		do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 11958 "configure"
+#line 12163 "configure"
 #include "confdefs.h"
 
-#define _XOPEN_SOURCE_EXTENDED
-#undef  HAVE_LIBUTF8_H	/* in case we used CF_UTF8_LIB */
-#define HAVE_LIBUTF8_H	/* to force ncurses' header file to use cchar_t */
-
 #include <$cf_header>
 int
 main ()
@@ -11969,10 +12170,6 @@
 
 #ifdef NCURSES_VERSION
 
-#ifndef WACS_BSSB
-	make an error
-#endif
-
 printf("%s\n", NCURSES_VERSION);
 #else
 #ifdef __NCURSES_H
@@ -11987,16 +12184,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11990: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12187: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11993: \$? = $ac_status" >&5
+  echo "$as_me:12190: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11996: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12193: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11999: \$? = $ac_status" >&5
+  echo "$as_me:12196: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -12017,12 +12214,12 @@
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:12020: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:12217: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:12025: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:12222: 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%/[^/]*$%%'`
@@ -12044,7 +12241,7 @@
 				cf_save_CPPFLAGS="$CPPFLAGS"
 				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 12047 "configure"
+#line 12244 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -12056,16 +12253,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12059: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12256: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12062: \$? = $ac_status" >&5
+  echo "$as_me:12259: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12065: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12262: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12068: \$? = $ac_status" >&5
+  echo "$as_me:12265: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -12088,9 +12285,7 @@
 
 fi
 
-cat >>confdefs.h <<\EOF
-#define NCURSES 1
-EOF
+# Set definitions to allow ifdef'ing for ncurses.h
 
 case $cf_cv_ncurses_header in # (vi
 *ncurses.h)
@@ -12116,7 +12311,99 @@
 	;;
 esac
 
-echo "$as_me:12119: checking for ncurses version" >&5
+echo "$as_me:12314: checking for terminfo header" >&5
+echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
+if test "${cf_cv_term_header+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+case ${cf_cv_ncurses_header} in #(vi
+*/ncurses.h|*/ncursesw.h) #(vi
+	cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'`
+	;;
+*)
+	cf_term_header=term.h
+	;;
+esac
+
+for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+do
+cat >conftest.$ac_ext <<_ACEOF
+#line 12332 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+#include <${cf_cv_ncurses_header-curses.h}>
+#include <$cf_test>
+
+int
+main ()
+{
+int x = auto_left_margin
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:12347: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:12350: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:12353: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:12356: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+	cf_cv_term_header="$cf_test"
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+
+	cf_cv_term_header=unknown
+
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+	test "$cf_cv_term_header" != unknown && break
+done
+
+fi
+echo "$as_me:12372: result: $cf_cv_term_header" >&5
+echo "${ECHO_T}$cf_cv_term_header" >&6
+
+# Set definitions to allow ifdef'ing to accommodate subdirectories
+
+case $cf_cv_term_header in # (vi
+*term.h)
+	cat >>confdefs.h <<\EOF
+#define HAVE_TERM_H 1
+EOF
+
+	;;
+esac
+
+case $cf_cv_term_header in # (vi
+ncurses/term.h) #(vi
+	cat >>confdefs.h <<\EOF
+#define HAVE_NCURSES_TERM_H 1
+EOF
+
+	;;
+ncursesw/term.h)
+	cat >>confdefs.h <<\EOF
+#define HAVE_NCURSESW_TERM_H 1
+EOF
+
+	;;
+esac
+
+# some applications need this, but should check for NCURSES_VERSION
+cat >>confdefs.h <<\EOF
+#define NCURSES 1
+EOF
+
+echo "$as_me:12406: 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
@@ -12142,10 +12429,10 @@
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:12145: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:12432: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:12148: \$? = $ac_status" >&5
+  echo "$as_me:12435: \$? = $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%".*%%'`
@@ -12155,7 +12442,7 @@
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12158 "configure"
+#line 12445 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -12180,15 +12467,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:12183: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12470: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12186: \$? = $ac_status" >&5
+  echo "$as_me:12473: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:12188: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12475: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12191: \$? = $ac_status" >&5
+  echo "$as_me:12478: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -12202,7 +12489,7 @@
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:12205: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:12492: 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
@@ -12214,7 +12501,7 @@
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:12217: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:12504: 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
@@ -12222,7 +12509,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12225 "configure"
+#line 12512 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12241,16 +12528,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12244: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12531: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12247: \$? = $ac_status" >&5
+  echo "$as_me:12534: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12250: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12537: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12253: \$? = $ac_status" >&5
+  echo "$as_me:12540: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -12261,10 +12548,10 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12264: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:12551: 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:12267: checking for initscr in -lgpm" >&5
+  echo "$as_me:12554: 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
@@ -12272,7 +12559,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12275 "configure"
+#line 12562 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12291,16 +12578,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12294: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12581: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12297: \$? = $ac_status" >&5
+  echo "$as_me:12584: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12300: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12587: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12303: \$? = $ac_status" >&5
+  echo "$as_me:12590: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -12311,7 +12598,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12314: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:12601: 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"
@@ -12326,7 +12613,7 @@
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it's static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:12329: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:12616: 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
@@ -12334,7 +12621,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12337 "configure"
+#line 12624 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12353,16 +12640,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12356: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12643: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12359: \$? = $ac_status" >&5
+  echo "$as_me:12646: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12362: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12649: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12365: \$? = $ac_status" >&5
+  echo "$as_me:12652: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -12373,7 +12660,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12376: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:12663: 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"
@@ -12392,13 +12679,13 @@
 
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
-	echo "$as_me:12395: checking for initscr" >&5
+	echo "$as_me:12682: 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 12401 "configure"
+#line 12688 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */
@@ -12429,16 +12716,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12432: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12719: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12435: \$? = $ac_status" >&5
+  echo "$as_me:12722: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12438: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12725: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12441: \$? = $ac_status" >&5
+  echo "$as_me:12728: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -12448,18 +12735,18 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12451: result: $ac_cv_func_initscr" >&5
+echo "$as_me:12738: 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:12458: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:12745: 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 12462 "configure"
+#line 12749 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -12471,25 +12758,25 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12474: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12761: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12477: \$? = $ac_status" >&5
+  echo "$as_me:12764: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12480: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12767: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12483: \$? = $ac_status" >&5
+  echo "$as_me:12770: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:12485: result: yes" >&5
+  echo "$as_me:12772: 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:12492: result: no" >&5
+echo "$as_me:12779: result: no" >&5
 echo "${ECHO_T}no" >&6
 			cf_search=""
 
@@ -12549,11 +12836,11 @@
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:12552: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:12839: 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 12556 "configure"
+#line 12843 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -12565,25 +12852,25 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12568: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12855: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12571: \$? = $ac_status" >&5
+  echo "$as_me:12858: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12574: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12861: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12577: \$? = $ac_status" >&5
+  echo "$as_me:12864: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:12579: result: yes" >&5
+  echo "$as_me:12866: 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:12586: result: no" >&5
+echo "$as_me:12873: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -12598,7 +12885,7 @@
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:12601: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:12888: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -12606,7 +12893,7 @@
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:12609: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:12896: 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
@@ -12616,7 +12903,7 @@
 		fi
 	done
 	cat >conftest.$ac_ext <<_ACEOF
-#line 12619 "configure"
+#line 12906 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -12628,23 +12915,23 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12631: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12918: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12634: \$? = $ac_status" >&5
+  echo "$as_me:12921: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12637: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12924: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12640: \$? = $ac_status" >&5
+  echo "$as_me:12927: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:12642: result: yes" >&5
+  echo "$as_me:12929: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:12647: result: no" >&5
+echo "$as_me:12934: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -12665,7 +12952,7 @@
 #define DISP_TERMCAP 1
 EOF
 
-		echo "$as_me:12668: checking if you want to use ncurses" >&5
+		echo "$as_me:12955: 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.
@@ -12675,7 +12962,7 @@
 else
   withval=no
 fi;
-		echo "$as_me:12678: result: $withval" >&5
+		echo "$as_me:12965: result: $withval" >&5
 echo "${ECHO_T}$withval" >&6
 
 if test "${cf_cv_termlib+set}" = set; then
@@ -12684,7 +12971,7 @@
 
 cf_cv_termlib=none
 cat >conftest.$ac_ext <<_ACEOF
-#line 12687 "configure"
+#line 12974 "configure"
 #include "confdefs.h"
 
 int
@@ -12696,19 +12983,19 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12699: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12986: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12702: \$? = $ac_status" >&5
+  echo "$as_me:12989: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12705: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12992: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12708: \$? = $ac_status" >&5
+  echo "$as_me:12995: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 12711 "configure"
+#line 12998 "configure"
 #include "confdefs.h"
 
 int
@@ -12720,16 +13007,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12723: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13010: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12726: \$? = $ac_status" >&5
+  echo "$as_me:13013: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12729: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13016: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12732: \$? = $ac_status" >&5
+  echo "$as_me:13019: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termlib=terminfo
 else
@@ -12753,7 +13040,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:12756: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:13043: 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
@@ -12765,7 +13052,7 @@
 	do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 12768 "configure"
+#line 13055 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -12789,16 +13076,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12792: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13079: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12795: \$? = $ac_status" >&5
+  echo "$as_me:13082: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12798: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13085: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12801: \$? = $ac_status" >&5
+  echo "$as_me:13088: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -12813,13 +13100,14 @@
 	done
 
 fi
-echo "$as_me:12816: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:13103: 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:12822: checking for $cf_ncuhdr_root include-path" >&5
+
+echo "$as_me:13110: 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
@@ -12914,7 +13202,7 @@
 				cf_save_CPPFLAGS="$CPPFLAGS"
 				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 12917 "configure"
+#line 13205 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -12926,16 +13214,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12929: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13217: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12932: \$? = $ac_status" >&5
+  echo "$as_me:13220: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12935: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13223: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12938: \$? = $ac_status" >&5
+  echo "$as_me:13226: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -12962,7 +13250,7 @@
 		do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 12965 "configure"
+#line 13253 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -12986,16 +13274,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12989: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13277: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12992: \$? = $ac_status" >&5
+  echo "$as_me:13280: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12995: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13283: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12998: \$? = $ac_status" >&5
+  echo "$as_me:13286: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -13016,12 +13304,12 @@
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:13019: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:13307: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:13024: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:13312: 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%/[^/]*$%%'`
@@ -13043,7 +13331,7 @@
 				cf_save_CPPFLAGS="$CPPFLAGS"
 				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 13046 "configure"
+#line 13334 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13055,16 +13343,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13058: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13346: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13061: \$? = $ac_status" >&5
+  echo "$as_me:13349: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13064: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13352: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13067: \$? = $ac_status" >&5
+  echo "$as_me:13355: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -13087,9 +13375,7 @@
 
 fi
 
-cat >>confdefs.h <<\EOF
-#define NCURSES 1
-EOF
+# Set definitions to allow ifdef'ing for ncurses.h
 
 case $cf_cv_ncurses_header in # (vi
 *ncurses.h)
@@ -13115,7 +13401,99 @@
 	;;
 esac
 
-echo "$as_me:13118: checking for ncurses version" >&5
+echo "$as_me:13404: checking for terminfo header" >&5
+echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
+if test "${cf_cv_term_header+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+case ${cf_cv_ncurses_header} in #(vi
+*/ncurses.h|*/ncursesw.h) #(vi
+	cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'`
+	;;
+*)
+	cf_term_header=term.h
+	;;
+esac
+
+for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+do
+cat >conftest.$ac_ext <<_ACEOF
+#line 13422 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+#include <${cf_cv_ncurses_header-curses.h}>
+#include <$cf_test>
+
+int
+main ()
+{
+int x = auto_left_margin
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:13437: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:13440: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:13443: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:13446: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+	cf_cv_term_header="$cf_test"
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+
+	cf_cv_term_header=unknown
+
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+	test "$cf_cv_term_header" != unknown && break
+done
+
+fi
+echo "$as_me:13462: result: $cf_cv_term_header" >&5
+echo "${ECHO_T}$cf_cv_term_header" >&6
+
+# Set definitions to allow ifdef'ing to accommodate subdirectories
+
+case $cf_cv_term_header in # (vi
+*term.h)
+	cat >>confdefs.h <<\EOF
+#define HAVE_TERM_H 1
+EOF
+
+	;;
+esac
+
+case $cf_cv_term_header in # (vi
+ncurses/term.h) #(vi
+	cat >>confdefs.h <<\EOF
+#define HAVE_NCURSES_TERM_H 1
+EOF
+
+	;;
+ncursesw/term.h)
+	cat >>confdefs.h <<\EOF
+#define HAVE_NCURSESW_TERM_H 1
+EOF
+
+	;;
+esac
+
+# some applications need this, but should check for NCURSES_VERSION
+cat >>confdefs.h <<\EOF
+#define NCURSES 1
+EOF
+
+echo "$as_me:13496: 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
@@ -13141,10 +13519,10 @@
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:13144: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:13522: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:13147: \$? = $ac_status" >&5
+  echo "$as_me:13525: \$? = $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%".*%%'`
@@ -13154,7 +13532,7 @@
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13157 "configure"
+#line 13535 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -13179,15 +13557,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:13182: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13560: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13185: \$? = $ac_status" >&5
+  echo "$as_me:13563: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:13187: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13565: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13190: \$? = $ac_status" >&5
+  echo "$as_me:13568: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -13201,7 +13579,7 @@
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:13204: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:13582: 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
@@ -13213,7 +13591,7 @@
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:13216: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:13594: 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
@@ -13221,7 +13599,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 13224 "configure"
+#line 13602 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13240,16 +13618,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13243: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13621: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13246: \$? = $ac_status" >&5
+  echo "$as_me:13624: \$? = $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:13627: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13252: \$? = $ac_status" >&5
+  echo "$as_me:13630: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -13260,10 +13638,10 @@
 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_gpm_Gpm_Open" >&5
+echo "$as_me:13641: 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:13266: checking for initscr in -lgpm" >&5
+  echo "$as_me:13644: 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
@@ -13271,7 +13649,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 13274 "configure"
+#line 13652 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13290,16 +13668,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13293: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13671: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13296: \$? = $ac_status" >&5
+  echo "$as_me:13674: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13299: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13677: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13302: \$? = $ac_status" >&5
+  echo "$as_me:13680: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -13310,7 +13688,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13313: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:13691: 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"
@@ -13325,7 +13703,7 @@
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it's static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:13328: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:13706: 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
@@ -13333,7 +13711,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 13336 "configure"
+#line 13714 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13352,16 +13730,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13355: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13733: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13358: \$? = $ac_status" >&5
+  echo "$as_me:13736: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13361: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13739: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13364: \$? = $ac_status" >&5
+  echo "$as_me:13742: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -13372,7 +13750,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13375: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:13753: 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"
@@ -13391,13 +13769,13 @@
 
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
-	echo "$as_me:13394: checking for initscr" >&5
+	echo "$as_me:13772: 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 13400 "configure"
+#line 13778 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */
@@ -13428,16 +13806,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13431: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13809: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13434: \$? = $ac_status" >&5
+  echo "$as_me:13812: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13437: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13815: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13440: \$? = $ac_status" >&5
+  echo "$as_me:13818: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -13447,18 +13825,18 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:13450: result: $ac_cv_func_initscr" >&5
+echo "$as_me:13828: 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:13457: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:13835: 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 13461 "configure"
+#line 13839 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -13470,25 +13848,25 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13473: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13851: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13476: \$? = $ac_status" >&5
+  echo "$as_me:13854: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13479: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13857: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13482: \$? = $ac_status" >&5
+  echo "$as_me:13860: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:13484: result: yes" >&5
+  echo "$as_me:13862: 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:13491: result: no" >&5
+echo "$as_me:13869: result: no" >&5
 echo "${ECHO_T}no" >&6
 			cf_search=""
 
@@ -13548,11 +13926,11 @@
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:13551: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:13929: 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 13555 "configure"
+#line 13933 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -13564,25 +13942,25 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13567: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13945: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13570: \$? = $ac_status" >&5
+  echo "$as_me:13948: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13573: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13951: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13576: \$? = $ac_status" >&5
+  echo "$as_me:13954: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:13578: result: yes" >&5
+  echo "$as_me:13956: 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:13585: result: no" >&5
+echo "$as_me:13963: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -13597,7 +13975,7 @@
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:13600: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:13978: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -13605,7 +13983,7 @@
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:13608: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:13986: 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
@@ -13615,7 +13993,7 @@
 		fi
 	done
 	cat >conftest.$ac_ext <<_ACEOF
-#line 13618 "configure"
+#line 13996 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -13627,23 +14005,23 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13630: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14008: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13633: \$? = $ac_status" >&5
+  echo "$as_me:14011: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13636: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14014: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13639: \$? = $ac_status" >&5
+  echo "$as_me:14017: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:13641: result: yes" >&5
+  echo "$as_me:14019: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:13646: result: no" >&5
+echo "$as_me:14024: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -13669,10 +14047,10 @@
 	LIBS="-l$cf_lib $cf_save_LIBS"
 	for cf_func in tigetstr tgetstr
 	do
-		echo "$as_me:13672: checking for $cf_func in -l$cf_lib" >&5
+		echo "$as_me:14050: 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 13675 "configure"
+#line 14053 "configure"
 #include "confdefs.h"
 
 int
@@ -13684,16 +14062,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13687: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14065: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13690: \$? = $ac_status" >&5
+  echo "$as_me:14068: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13693: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14071: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13696: \$? = $ac_status" >&5
+  echo "$as_me:14074: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -13702,7 +14080,7 @@
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-		echo "$as_me:13705: result: $cf_result" >&5
+		echo "$as_me:14083: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 		if test "$cf_result" = yes ; then
 			if test "$cf_func" = tigetstr ; then
@@ -13719,7 +14097,7 @@
 fi
 if test "$cf_cv_termlib" = none; then
 	# allow curses library for broken AIX system.
-	echo "$as_me:13722: checking for initscr in -lcurses" >&5
+	echo "$as_me:14100: 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
@@ -13727,7 +14105,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 13730 "configure"
+#line 14108 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13746,16 +14124,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13749: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14127: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13752: \$? = $ac_status" >&5
+  echo "$as_me:14130: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13755: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14133: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13758: \$? = $ac_status" >&5
+  echo "$as_me:14136: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_curses_initscr=yes
 else
@@ -13766,13 +14144,13 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13769: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:14147: 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:13775: checking for tgoto in -ltermcap" >&5
+	echo "$as_me:14153: 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
@@ -13780,7 +14158,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 13783 "configure"
+#line 14161 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13799,16 +14177,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13802: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14180: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13805: \$? = $ac_status" >&5
+  echo "$as_me:14183: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13808: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14186: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13811: \$? = $ac_status" >&5
+  echo "$as_me:14189: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_termcap_tgoto=yes
 else
@@ -13819,7 +14197,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13822: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:14200: 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
@@ -13830,7 +14208,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 if test "$cf_cv_termlib" = none; then
-	{ echo "$as_me:13833: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+	{ echo "$as_me:14211: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
 echo "$as_me: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&2;}
 fi
 
@@ -13850,7 +14228,7 @@
 
 cf_cv_termlib=none
 cat >conftest.$ac_ext <<_ACEOF
-#line 13853 "configure"
+#line 14231 "configure"
 #include "confdefs.h"
 
 int
@@ -13862,19 +14240,19 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13865: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14243: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13868: \$? = $ac_status" >&5
+  echo "$as_me:14246: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13871: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14249: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13874: \$? = $ac_status" >&5
+  echo "$as_me:14252: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 13877 "configure"
+#line 14255 "configure"
 #include "confdefs.h"
 
 int
@@ -13886,16 +14264,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13889: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14267: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13892: \$? = $ac_status" >&5
+  echo "$as_me:14270: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13895: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14273: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13898: \$? = $ac_status" >&5
+  echo "$as_me:14276: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termlib=terminfo
 else
@@ -13919,10 +14297,10 @@
 	LIBS="-l$cf_lib $cf_save_LIBS"
 	for cf_func in tigetstr tgetstr
 	do
-		echo "$as_me:13922: checking for $cf_func in -l$cf_lib" >&5
+		echo "$as_me:14300: 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 13925 "configure"
+#line 14303 "configure"
 #include "confdefs.h"
 
 int
@@ -13934,16 +14312,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13937: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14315: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13940: \$? = $ac_status" >&5
+  echo "$as_me:14318: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13943: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14321: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13946: \$? = $ac_status" >&5
+  echo "$as_me:14324: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -13952,7 +14330,7 @@
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-		echo "$as_me:13955: result: $cf_result" >&5
+		echo "$as_me:14333: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 		if test "$cf_result" = yes ; then
 			if test "$cf_func" = tigetstr ; then
@@ -13969,7 +14347,7 @@
 fi
 if test "$cf_cv_termlib" = none; then
 	# allow curses library for broken AIX system.
-	echo "$as_me:13972: checking for initscr in -lcurses" >&5
+	echo "$as_me:14350: 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
@@ -13977,7 +14355,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 13980 "configure"
+#line 14358 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13996,16 +14374,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13999: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14377: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14002: \$? = $ac_status" >&5
+  echo "$as_me:14380: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14005: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14383: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14008: \$? = $ac_status" >&5
+  echo "$as_me:14386: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_curses_initscr=yes
 else
@@ -14016,13 +14394,13 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14019: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:14397: 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:14025: checking for tgoto in -ltermcap" >&5
+	echo "$as_me:14403: 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
@@ -14030,7 +14408,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 14033 "configure"
+#line 14411 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14049,16 +14427,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14052: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14430: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14055: \$? = $ac_status" >&5
+  echo "$as_me:14433: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14058: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14436: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14061: \$? = $ac_status" >&5
+  echo "$as_me:14439: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_termcap_tgoto=yes
 else
@@ -14069,7 +14447,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14072: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:14450: 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
@@ -14080,7 +14458,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 if test "$cf_cv_termlib" = none; then
-	{ echo "$as_me:14083: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+	{ echo "$as_me:14461: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
 echo "$as_me: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&2;}
 fi
 
@@ -14102,7 +14480,7 @@
 elif test ".$cf_cv_termlib" = .termcap ; then
 	# BSD 'tputs()' may need 'PC' to be set.
 	cat >conftest.$ac_ext <<_ACEOF
-#line 14105 "configure"
+#line 14483 "configure"
 #include "confdefs.h"
 
 int
@@ -14114,16 +14492,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14117: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14495: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14120: \$? = $ac_status" >&5
+  echo "$as_me:14498: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14123: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14501: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14126: \$? = $ac_status" >&5
+  echo "$as_me:14504: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >>confdefs.h <<\EOF
 #define HAVE_EXTERN_TCAP_PC 1
@@ -14142,14 +14520,14 @@
 
 LIBS="$LIBS $X_EXTRA_LIBS"
 
-echo "$as_me:14145: checking for /dev/tty" >&5
+echo "$as_me:14523: 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:14152: result: $cf_result" >&5
+echo "$as_me:14530: 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`
@@ -14162,7 +14540,7 @@
 
 fi
 
-echo "$as_me:14165: checking for crypt function" >&5
+echo "$as_me:14543: 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
@@ -14170,7 +14548,7 @@
 
 cf_cv_crypt_func=
 cat >conftest.$ac_ext <<_ACEOF
-#line 14173 "configure"
+#line 14551 "configure"
 #include "confdefs.h"
 
 int
@@ -14182,16 +14560,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14185: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14563: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14188: \$? = $ac_status" >&5
+  echo "$as_me:14566: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14191: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14569: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14194: \$? = $ac_status" >&5
+  echo "$as_me:14572: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_crypt_func=yes
@@ -14202,7 +14580,7 @@
 	cf_save_LIBS="$LIBS"
 	LIBS="-lcrypt $LIBS"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 14205 "configure"
+#line 14583 "configure"
 #include "confdefs.h"
 
 int
@@ -14214,16 +14592,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14217: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14595: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14220: \$? = $ac_status" >&5
+  echo "$as_me:14598: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14223: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14601: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14226: \$? = $ac_status" >&5
+  echo "$as_me:14604: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 		cf_cv_crypt_func="-lcrypt"
@@ -14240,12 +14618,12 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:14243: result: $cf_cv_crypt_func" >&5
+echo "$as_me:14621: 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:14248: checking if crypt works" >&5
+echo "$as_me:14626: 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
@@ -14256,7 +14634,7 @@
 	cf_cv_crypt_works=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14259 "configure"
+#line 14637 "configure"
 #include "confdefs.h"
 
 #include <string.h>
@@ -14268,15 +14646,15 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:14271: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14649: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14274: \$? = $ac_status" >&5
+  echo "$as_me:14652: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:14276: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14654: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14279: \$? = $ac_status" >&5
+  echo "$as_me:14657: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_crypt_works=yes
@@ -14291,7 +14669,7 @@
 fi
 	LIBS="$cf_save_LIBS"
 fi
-echo "$as_me:14294: result: $cf_cv_crypt_works" >&5
+echo "$as_me:14672: 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
@@ -14304,14 +14682,14 @@
 	fi
 fi
 
-echo "$as_me:14307: checking for declaration of fd_set" >&5
+echo "$as_me:14685: 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 14314 "configure"
+#line 14692 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -14324,16 +14702,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14327: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14705: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14330: \$? = $ac_status" >&5
+  echo "$as_me:14708: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14333: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14711: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14336: \$? = $ac_status" >&5
+  echo "$as_me:14714: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_fd_set=sys/types.h
 else
@@ -14341,7 +14719,7 @@
 cat conftest.$ac_ext >&5
 echo "trying X11/Xpoll.h" 1>&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 14344 "configure"
+#line 14722 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_X11_XPOLL_H
@@ -14356,16 +14734,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14359: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14737: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14362: \$? = $ac_status" >&5
+  echo "$as_me:14740: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14365: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14743: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14368: \$? = $ac_status" >&5
+  echo "$as_me:14746: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_fd_set=X11/Xpoll.h
 else
@@ -14373,7 +14751,7 @@
 cat conftest.$ac_ext >&5
 echo "trying sys/select.h" 1>&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 14376 "configure"
+#line 14754 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -14387,16 +14765,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14390: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14768: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14393: \$? = $ac_status" >&5
+  echo "$as_me:14771: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14396: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14774: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14399: \$? = $ac_status" >&5
+  echo "$as_me:14777: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_fd_set=sys/select.h
 else
@@ -14410,7 +14788,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:14413: result: $cf_cv_type_fd_set" >&5
+echo "$as_me:14791: 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
@@ -14419,14 +14797,14 @@
 
 fi
 
-echo "$as_me:14422: checking for fd_set macros" >&5
+echo "$as_me:14800: 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 14429 "configure"
+#line 14807 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -14455,16 +14833,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14458: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14836: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14461: \$? = $ac_status" >&5
+  echo "$as_me:14839: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14464: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14842: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14467: \$? = $ac_status" >&5
+  echo "$as_me:14845: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_macros_fd_set=yes
 else
@@ -14474,7 +14852,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:14477: result: $cf_cv_macros_fd_set" >&5
+echo "$as_me:14855: 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
@@ -14521,13 +14899,13 @@
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:14524: checking for $ac_func" >&5
+echo "$as_me:14902: 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 14530 "configure"
+#line 14908 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -14558,16 +14936,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14561: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14939: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14564: \$? = $ac_status" >&5
+  echo "$as_me:14942: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14567: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14945: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14570: \$? = $ac_status" >&5
+  echo "$as_me:14948: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -14577,7 +14955,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:14580: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:14958: 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
@@ -14587,14 +14965,14 @@
 fi
 done
 
-echo "$as_me:14590: checking for standard qsort" >&5
+echo "$as_me:14968: 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 14597 "configure"
+#line 14975 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -14612,16 +14990,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14615: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14993: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14618: \$? = $ac_status" >&5
+  echo "$as_me:14996: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14621: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14999: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14624: \$? = $ac_status" >&5
+  echo "$as_me:15002: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ansi_qsort=yes
 else
@@ -14632,7 +15010,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:14635: result: $cf_cv_ansi_qsort" >&5
+echo "$as_me:15013: result: $cf_cv_ansi_qsort" >&5
 echo "${ECHO_T}$cf_cv_ansi_qsort" >&6
 
 if test $cf_cv_ansi_qsort = yes; then
@@ -14647,7 +15025,7 @@
 
 fi
 
-echo "$as_me:14650: checking for working mkstemp" >&5
+echo "$as_me:15028: 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
@@ -14655,13 +15033,13 @@
 
 rm -f conftest*
 if test "$cross_compiling" = yes; then
-  echo "$as_me:14658: checking for mkstemp" >&5
+  echo "$as_me:15036: 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 14664 "configure"
+#line 15042 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char mkstemp (); below.  */
@@ -14692,16 +15070,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14695: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15073: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14698: \$? = $ac_status" >&5
+  echo "$as_me:15076: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14701: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15079: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14704: \$? = $ac_status" >&5
+  echo "$as_me:15082: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_mkstemp=yes
 else
@@ -14711,12 +15089,12 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:14714: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:15092: result: $ac_cv_func_mkstemp" >&5
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14719 "configure"
+#line 15097 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -14754,15 +15132,15 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:14757: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15135: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14760: \$? = $ac_status" >&5
+  echo "$as_me:15138: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:14762: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15140: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14765: \$? = $ac_status" >&5
+  echo "$as_me:15143: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_func_mkstemp=yes
 
@@ -14777,7 +15155,7 @@
 fi
 
 fi
-echo "$as_me:14780: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:15158: 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
@@ -14795,7 +15173,7 @@
 cf_save_cppflags="${CPPFLAGS}"
 cf_save_ldflags="${LDFLAGS}"
 
-echo "$as_me:14798: checking if you want to use the Xpm library for colored icon" >&5
+echo "$as_me:15176: 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.
@@ -14805,7 +15183,7 @@
 else
   cf_Xpm_library=no
 fi;
-echo "$as_me:14808: result: $cf_Xpm_library" >&5
+echo "$as_me:15186: result: $cf_Xpm_library" >&5
 echo "${ECHO_T}$cf_Xpm_library" >&6
 
 if test "$cf_Xpm_library" != no ; then
@@ -14813,23 +15191,23 @@
 	CPPFLAGS="$CPPFLAGS -I$withval/include"
 	LDFLAGS="$LDFLAGS -L$withval/lib"
     fi
-    echo "$as_me:14816: checking for X11/xpm.h" >&5
+    echo "$as_me:15194: 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 14822 "configure"
+#line 15200 "configure"
 #include "confdefs.h"
 #include <X11/xpm.h>
 _ACEOF
-if { (eval echo "$as_me:14826: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:15204: \"$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:14832: \$? = $ac_status" >&5
+  echo "$as_me:15210: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -14848,11 +15226,11 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:14851: result: $ac_cv_header_X11_xpm_h" >&5
+echo "$as_me:15229: 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:14855: checking for XpmCreatePixmapFromData in -lXpm" >&5
+	echo "$as_me:15233: 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
@@ -14860,7 +15238,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXpm -lX11 $X_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 14863 "configure"
+#line 15241 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14879,16 +15257,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14882: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15260: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14885: \$? = $ac_status" >&5
+  echo "$as_me:15263: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14888: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15266: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14891: \$? = $ac_status" >&5
+  echo "$as_me:15269: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xpm_XpmCreatePixmapFromData=yes
 else
@@ -14899,7 +15277,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14902: result: $ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&5
+echo "$as_me:15280: 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
 
@@ -14920,7 +15298,7 @@
 fi
 
 if test -n "$cf_x_athena" ; then
-    echo "$as_me:14923: checking if you want to use Xaw scrollbars rather than our own" >&5
+    echo "$as_me:15301: 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.
@@ -14930,7 +15308,7 @@
 else
   cf_Xaw_scrollbars=no
 fi;
-    echo "$as_me:14933: result: $cf_Xaw_scrollbars" >&5
+    echo "$as_me:15311: result: $cf_Xaw_scrollbars" >&5
 echo "${ECHO_T}$cf_Xaw_scrollbars" >&6
 
     if test "$cf_Xaw_scrollbars" = no ; then
@@ -14947,7 +15325,7 @@
 #define OPT_XAW_SCROLLBARS 1
 EOF
 
-	echo "$as_me:14950: checking if you want to use the drag/scrolling extension with Xaw" >&5
+	echo "$as_me:15328: 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.
@@ -14957,7 +15335,7 @@
 else
   cf_drag_extension=no
 fi;
-	echo "$as_me:14960: result: $cf_drag_extension" >&5
+	echo "$as_me:15338: result: $cf_drag_extension" >&5
 echo "${ECHO_T}$cf_drag_extension" >&6
 	if test "$cf_drag_extension" != "no" ; then
 	    cat >>confdefs.h <<\EOF
@@ -14970,7 +15348,7 @@
 
 fi
 
-echo "$as_me:14973: checking if you want to change the number of exec-macros" >&5
+echo "$as_me:15351: 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.
@@ -14980,13 +15358,13 @@
 else
   cf_exec_macros=no
 fi;
-echo "$as_me:14983: result: $cf_exec_macros" >&5
+echo "$as_me:15361: 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
 EOF
 
-	echo "$as_me:14989: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+	echo "$as_me:15367: checking for _LARGEFILE_SOURCE value needed for large files" >&5
 echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_largefile_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14994,7 +15372,7 @@
   while :; do
   ac_cv_sys_largefile_source=no
   cat >conftest.$ac_ext <<_ACEOF
-#line 14997 "configure"
+#line 15375 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -15006,16 +15384,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15009: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15387: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15012: \$? = $ac_status" >&5
+  echo "$as_me:15390: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15015: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15393: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15018: \$? = $ac_status" >&5
+  echo "$as_me:15396: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -15024,7 +15402,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 15027 "configure"
+#line 15405 "configure"
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
@@ -15037,16 +15415,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15040: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15418: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15043: \$? = $ac_status" >&5
+  echo "$as_me:15421: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15046: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15424: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15049: \$? = $ac_status" >&5
+  echo "$as_me:15427: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_largefile_source=1; break
 else
@@ -15057,7 +15435,7 @@
   break
 done
 fi
-echo "$as_me:15060: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:15438: result: $ac_cv_sys_largefile_source" >&5
 echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
 if test "$ac_cv_sys_largefile_source" != no; then
 
@@ -15071,13 +15449,13 @@
 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
 # in glibc 2.1.3, but that breaks too many other things.
 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-echo "$as_me:15074: checking for fseeko" >&5
+echo "$as_me:15452: checking for fseeko" >&5
 echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
 if test "${ac_cv_func_fseeko+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15080 "configure"
+#line 15458 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -15089,16 +15467,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15092: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15470: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15095: \$? = $ac_status" >&5
+  echo "$as_me:15473: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15098: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15476: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15101: \$? = $ac_status" >&5
+  echo "$as_me:15479: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_fseeko=yes
 else
@@ -15108,7 +15486,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:15111: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:15489: result: $ac_cv_func_fseeko" >&5
 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
 if test $ac_cv_func_fseeko = yes; then
 
@@ -15125,7 +15503,7 @@
 fi;
 if test "$enable_largefile" != no; then
 
-  echo "$as_me:15128: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:15506: checking for special C compiler options needed for large files" >&5
 echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_largefile_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15137,7 +15515,7 @@
      	 # IRIX 6.2 and later do not support large files by default,
      	 # so use the C compiler's -n32 option if that helps.
          cat >conftest.$ac_ext <<_ACEOF
-#line 15140 "configure"
+#line 15518 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -15157,16 +15535,16 @@
 }
 _ACEOF
      	 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15160: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15538: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15163: \$? = $ac_status" >&5
+  echo "$as_me:15541: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15166: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15544: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15169: \$? = $ac_status" >&5
+  echo "$as_me:15547: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -15176,16 +15554,16 @@
 rm -f conftest.$ac_objext
      	 CC="$CC -n32"
      	 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15179: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15557: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15182: \$? = $ac_status" >&5
+  echo "$as_me:15560: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15185: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15563: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15188: \$? = $ac_status" >&5
+  echo "$as_me:15566: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else
@@ -15199,13 +15577,13 @@
        rm -f conftest.$ac_ext
     fi
 fi
-echo "$as_me:15202: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:15580: result: $ac_cv_sys_largefile_CC" >&5
 echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
   if test "$ac_cv_sys_largefile_CC" != no; then
     CC=$CC$ac_cv_sys_largefile_CC
   fi
 
-  echo "$as_me:15208: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:15586: checking for _FILE_OFFSET_BITS value needed for large files" >&5
 echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_file_offset_bits+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15213,7 +15591,7 @@
   while :; do
   ac_cv_sys_file_offset_bits=no
   cat >conftest.$ac_ext <<_ACEOF
-#line 15216 "configure"
+#line 15594 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -15233,16 +15611,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15236: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15614: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15239: \$? = $ac_status" >&5
+  echo "$as_me:15617: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15242: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15620: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15245: \$? = $ac_status" >&5
+  echo "$as_me:15623: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -15251,7 +15629,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 15254 "configure"
+#line 15632 "configure"
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -15272,16 +15650,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15275: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15653: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15278: \$? = $ac_status" >&5
+  echo "$as_me:15656: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15281: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15659: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15284: \$? = $ac_status" >&5
+  echo "$as_me:15662: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else
@@ -15292,7 +15670,7 @@
   break
 done
 fi
-echo "$as_me:15295: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:15673: result: $ac_cv_sys_file_offset_bits" >&5
 echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
 if test "$ac_cv_sys_file_offset_bits" != no; then
 
@@ -15302,7 +15680,7 @@
 
 fi
 rm -f conftest*
-  echo "$as_me:15305: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:15683: checking for _LARGE_FILES value needed for large files" >&5
 echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_large_files+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15310,7 +15688,7 @@
   while :; do
   ac_cv_sys_large_files=no
   cat >conftest.$ac_ext <<_ACEOF
-#line 15313 "configure"
+#line 15691 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -15330,16 +15708,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15333: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15711: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15336: \$? = $ac_status" >&5
+  echo "$as_me:15714: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15339: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15717: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15342: \$? = $ac_status" >&5
+  echo "$as_me:15720: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -15348,7 +15726,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 15351 "configure"
+#line 15729 "configure"
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
@@ -15369,16 +15747,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15372: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15750: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15375: \$? = $ac_status" >&5
+  echo "$as_me:15753: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15378: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15756: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15381: \$? = $ac_status" >&5
+  echo "$as_me:15759: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_large_files=1; break
 else
@@ -15389,7 +15767,7 @@
   break
 done
 fi
-echo "$as_me:15392: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:15770: result: $ac_cv_sys_large_files" >&5
 echo "${ECHO_T}$ac_cv_sys_large_files" >&6
 if test "$ac_cv_sys_large_files" != no; then
 
@@ -15411,14 +15789,14 @@
 	test "$ac_cv_sys_large_files"      != no && CPPFLAGS="$CPPFLAGS -D_LARGE_FILES "
 	test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE "
 
-	echo "$as_me:15414: checking whether to use struct dirent64" >&5
+	echo "$as_me:15792: checking whether to use struct dirent64" >&5
 echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6
 if test "${cf_cv_struct_dirent64+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 15421 "configure"
+#line 15799 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -15439,16 +15817,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15442: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15820: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15445: \$? = $ac_status" >&5
+  echo "$as_me:15823: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15448: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15826: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15451: \$? = $ac_status" >&5
+  echo "$as_me:15829: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_struct_dirent64=yes
 else
@@ -15459,7 +15837,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:15462: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:15840: result: $cf_cv_struct_dirent64" >&5
 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
 	test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF
 #define HAVE_STRUCT_DIRENT64 1
@@ -15468,14 +15846,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:15471: checking for setlocale()" >&5
+echo "$as_me:15849: 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 15478 "configure"
+#line 15856 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int
@@ -15487,16 +15865,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15490: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15868: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15493: \$? = $ac_status" >&5
+  echo "$as_me:15871: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15496: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15874: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15499: \$? = $ac_status" >&5
+  echo "$as_me:15877: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_locale=yes
 else
@@ -15508,7 +15886,7 @@
 
 fi
 
-echo "$as_me:15511: result: $cf_cv_locale" >&5
+echo "$as_me:15889: result: $cf_cv_locale" >&5
 echo "${ECHO_T}$cf_cv_locale" >&6
 test $cf_cv_locale = yes && { cat >>confdefs.h <<\EOF
 #define LOCALE 1
@@ -15516,7 +15894,7 @@
  }
 
 if test $cf_cv_locale = yes ; then
-echo "$as_me:15519: checking if you want to use i18n locale support" >&5
+echo "$as_me:15897: 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.
@@ -15526,7 +15904,7 @@
 else
   cf_locale=yes
 fi;
-echo "$as_me:15529: result: $cf_locale" >&5
+echo "$as_me:15907: result: $cf_locale" >&5
 echo "${ECHO_T}$cf_locale" >&6
 if test "$cf_locale" != no ; then
 	cat >>confdefs.h <<\EOF
@@ -15535,13 +15913,13 @@
 
 	eval 'cf_cv_have_lib_'iconv'=no'
 	cf_libdir=""
-	echo "$as_me:15538: checking for iconv" >&5
+	echo "$as_me:15916: checking for iconv" >&5
 echo $ECHO_N "checking for iconv... $ECHO_C" >&6
 if test "${ac_cv_func_iconv+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15544 "configure"
+#line 15922 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char iconv (); below.  */
@@ -15572,16 +15950,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15575: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15953: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15578: \$? = $ac_status" >&5
+  echo "$as_me:15956: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15581: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15959: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15584: \$? = $ac_status" >&5
+  echo "$as_me:15962: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_iconv=yes
 else
@@ -15591,18 +15969,18 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:15594: result: $ac_cv_func_iconv" >&5
+echo "$as_me:15972: result: $ac_cv_func_iconv" >&5
 echo "${ECHO_T}$ac_cv_func_iconv" >&6
 if test $ac_cv_func_iconv = yes; then
   eval 'cf_cv_have_lib_'iconv'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:15601: checking for iconv in -liconv" >&5
+		echo "$as_me:15979: checking for iconv in -liconv" >&5
 echo $ECHO_N "checking for iconv in -liconv... $ECHO_C" >&6
 		LIBS="-liconv $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 15605 "configure"
+#line 15983 "configure"
 #include "confdefs.h"
 #include <iconv.h>
 int
@@ -15614,25 +15992,25 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15617: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15995: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15620: \$? = $ac_status" >&5
+  echo "$as_me:15998: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15623: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16001: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15626: \$? = $ac_status" >&5
+  echo "$as_me:16004: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:15628: result: yes" >&5
+  echo "$as_me:16006: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'iconv'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:15635: result: no" >&5
+echo "$as_me:16013: result: no" >&5
 echo "${ECHO_T}no" >&6
 			cf_search=""
 
@@ -15692,11 +16070,11 @@
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:15695: checking for -liconv in $cf_libdir" >&5
+				echo "$as_me:16073: checking for -liconv in $cf_libdir" >&5
 echo $ECHO_N "checking for -liconv in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -liconv $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 15699 "configure"
+#line 16077 "configure"
 #include "confdefs.h"
 #include <iconv.h>
 int
@@ -15708,25 +16086,25 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15711: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16089: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15714: \$? = $ac_status" >&5
+  echo "$as_me:16092: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15717: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16095: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15720: \$? = $ac_status" >&5
+  echo "$as_me:16098: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:15722: result: yes" >&5
+  echo "$as_me:16100: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'iconv'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:15729: result: no" >&5
+echo "$as_me:16107: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -15740,7 +16118,7 @@
 
 eval 'cf_found_library=$cf_cv_have_lib_'iconv
 
-echo "$as_me:15743: checking for iconv function library" >&5
+echo "$as_me:16121: checking for iconv function library" >&5
 echo $ECHO_N "checking for iconv function library... $ECHO_C" >&6
 if test "${cf_cv_func_iconv+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15753,11 +16131,11 @@
 	fi
 
 fi
-echo "$as_me:15756: result: $cf_cv_func_iconv" >&5
+echo "$as_me:16134: result: $cf_cv_func_iconv" >&5
 echo "${ECHO_T}$cf_cv_func_iconv" >&6
 
 if test "$cf_cv_func_iconv" != no ; then
-echo "$as_me:15760: checking if you want to use iconv() for locale support" >&5
+echo "$as_me:16138: checking if you want to use iconv() for locale support" >&5
 echo $ECHO_N "checking if you want to use iconv() for locale support... $ECHO_C" >&6
 
 # Check whether --with-iconv or --without-iconv was given.
@@ -15767,7 +16145,7 @@
 else
   cf_func_iconv=yes
 fi;
-echo "$as_me:15770: result: $cf_func_iconv" >&5
+echo "$as_me:16148: result: $cf_func_iconv" >&5
 echo "${ECHO_T}$cf_func_iconv" >&6
 if test "$cf_func_iconv" = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -15782,7 +16160,7 @@
 
 ###	Debugging/development options
 
-echo "$as_me:15785: checking if you want to link with dbmalloc for testing" >&5
+echo "$as_me:16163: 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.
@@ -15792,26 +16170,26 @@
 else
   with_dbmalloc=no
 fi;
-echo "$as_me:15795: result: $with_dbmalloc" >&5
+echo "$as_me:16173: result: $with_dbmalloc" >&5
 echo "${ECHO_T}$with_dbmalloc" >&6
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:15798: checking for dbmalloc.h" >&5
+	echo "$as_me:16176: 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 15804 "configure"
+#line 16182 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:15808: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:16186: \"$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:15814: \$? = $ac_status" >&5
+  echo "$as_me:16192: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15830,11 +16208,11 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:15833: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:16211: 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:15837: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:16215: 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
@@ -15842,7 +16220,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 15845 "configure"
+#line 16223 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15861,16 +16239,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15864: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16242: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15867: \$? = $ac_status" >&5
+  echo "$as_me:16245: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15870: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16248: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15873: \$? = $ac_status" >&5
+  echo "$as_me:16251: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -15881,7 +16259,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15884: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:16262: 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
@@ -15896,7 +16274,7 @@
 
 fi
 
-echo "$as_me:15899: checking if you want to link with dmalloc for testing" >&5
+echo "$as_me:16277: 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.
@@ -15906,26 +16284,26 @@
 else
   with_dmalloc=no
 fi;
-echo "$as_me:15909: result: $with_dmalloc" >&5
+echo "$as_me:16287: result: $with_dmalloc" >&5
 echo "${ECHO_T}$with_dmalloc" >&6
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:15912: checking for dmalloc.h" >&5
+	echo "$as_me:16290: 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 15918 "configure"
+#line 16296 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:15922: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:16300: \"$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:15928: \$? = $ac_status" >&5
+  echo "$as_me:16306: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15944,11 +16322,11 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:15947: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:16325: 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:15951: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:16329: 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
@@ -15956,7 +16334,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 15959 "configure"
+#line 16337 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15975,16 +16353,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15978: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16356: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15981: \$? = $ac_status" >&5
+  echo "$as_me:16359: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15984: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16362: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15987: \$? = $ac_status" >&5
+  echo "$as_me:16365: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -15995,7 +16373,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15998: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:16376: 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
@@ -16030,7 +16408,7 @@
 #define OPT_VMS_PATH 1
 EOF
 
-	 EXTRAOBJS="$EXTRAOBJS fakevms.o vms2unix.o"
+	 EXTRAOBJS="$EXTRAOBJS fakevms\$o vms2unix\$o"
 fi;
 
 # Check whether --with-no-leaks or --without-no-leaks was given.
@@ -16065,21 +16443,21 @@
   with_trace=
 fi;
 
-test -n "${with_trace}${with_no_leaks}" && EXTRAOBJS="$EXTRAOBJS trace.o"
+test -n "${with_trace}${with_no_leaks}" && EXTRAOBJS="$EXTRAOBJS trace\$o"
 
 GCC_VERSION=none
 if test "$GCC" = yes ; then
-	echo "$as_me:16072: checking version of $CC" >&5
+	echo "$as_me:16450: 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/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
-	echo "$as_me:16076: result: $GCC_VERSION" >&5
+	echo "$as_me:16454: result: $GCC_VERSION" >&5
 echo "${ECHO_T}$GCC_VERSION" >&6
 fi
 
 if ( test "$GCC" = yes || test "$GXX" = yes )
 then
-echo "$as_me:16082: checking if you want to check for gcc warnings" >&5
+echo "$as_me:16460: 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.
@@ -16089,7 +16467,7 @@
 else
   cf_opt_with_warnings=no
 fi;
-echo "$as_me:16092: result: $cf_opt_with_warnings" >&5
+echo "$as_me:16470: result: $cf_opt_with_warnings" >&5
 echo "${ECHO_T}$cf_opt_with_warnings" >&6
 if test "$cf_opt_with_warnings" != no ; then
 
@@ -16111,10 +16489,10 @@
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:16114: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:16492: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > conftest.$ac_ext <<EOF
-#line 16117 "configure"
+#line 16495 "configure"
 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"
@@ -16152,12 +16530,12 @@
 EOF
 			;;
 		esac
-		if { (eval echo "$as_me:16155: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:16533: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16158: \$? = $ac_status" >&5
+  echo "$as_me:16536: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-			test -n "$verbose" && echo "$as_me:16160: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:16538: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 		fi
@@ -16173,12 +16551,12 @@
 if test "$GCC" = yes ; then
 	case $host_os in
 	linux*|gnu*)
-		echo "$as_me:16176: checking if this is really Intel C compiler" >&5
+		echo "$as_me:16554: checking if this is really Intel C compiler" >&5
 echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS -no-gcc"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 16181 "configure"
+#line 16559 "configure"
 #include "confdefs.h"
 
 int
@@ -16195,16 +16573,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16198: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16576: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16201: \$? = $ac_status" >&5
+  echo "$as_me:16579: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16204: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16582: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16207: \$? = $ac_status" >&5
+  echo "$as_me:16585: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
@@ -16215,14 +16593,14 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 		CFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:16218: result: $INTEL_COMPILER" >&5
+		echo "$as_me:16596: result: $INTEL_COMPILER" >&5
 echo "${ECHO_T}$INTEL_COMPILER" >&6
 		;;
 	esac
 fi
 
 cat > conftest.$ac_ext <<EOF
-#line 16225 "configure"
+#line 16603 "configure"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 
@@ -16240,7 +16618,7 @@
 # remark #981: operands are evaluated in unspecified order
 # warning #269: invalid format string conversion
 
-	{ echo "$as_me:16243: checking for $CC warning options..." >&5
+	{ echo "$as_me:16621: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="-Wall"
@@ -16257,12 +16635,12 @@
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:16260: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:16638: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16263: \$? = $ac_status" >&5
+  echo "$as_me:16641: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-			test -n "$verbose" && echo "$as_me:16265: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:16643: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -16271,7 +16649,7 @@
 
 elif test "$GCC" = yes
 then
-	{ echo "$as_me:16274: checking for $CC warning options..." >&5
+	{ echo "$as_me:16652: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="-W -Wall"
@@ -16291,12 +16669,12 @@
 		Wundef $cf_warn_CONST
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:16294: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:16672: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16297: \$? = $ac_status" >&5
+  echo "$as_me:16675: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-			test -n "$verbose" && echo "$as_me:16299: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:16677: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case $cf_opt in #(vi
 			Wcast-qual) #(vi
@@ -16346,7 +16724,7 @@
 
 ac_tr_func=`echo "$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-echo "$as_me:16349: checking for missing \"${ac_func}\" extern" >&5
+echo "$as_me:16727: 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
@@ -16355,7 +16733,7 @@
 cf_save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $CHECK_DECL_FLAG"
 cat >conftest.$ac_ext <<_ACEOF
-#line 16358 "configure"
+#line 16736 "configure"
 #include "confdefs.h"
 
 $CHECK_DECL_HDRS
@@ -16377,16 +16755,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16380: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16758: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16383: \$? = $ac_status" >&5
+  echo "$as_me:16761: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16386: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16764: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16389: \$? = $ac_status" >&5
+  echo "$as_me:16767: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval 'cf_cv_func_'${ac_func}'=yes'
 else
@@ -16400,7 +16778,7 @@
 fi
 
 eval 'cf_result=$cf_cv_func_'${ac_func}
-echo "$as_me:16403: result: $cf_result" >&5
+echo "$as_me:16781: 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
@@ -16414,7 +16792,7 @@
 #include <tcap.h>
 "
 
-echo "$as_me:16417: checking for term.h" >&5
+echo "$as_me:16795: 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
@@ -16427,7 +16805,7 @@
 	term.h
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 16430 "configure"
+#line 16808 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -16441,16 +16819,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16444: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16822: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16447: \$? = $ac_status" >&5
+  echo "$as_me:16825: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16450: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16828: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16453: \$? = $ac_status" >&5
+  echo "$as_me:16831: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_term_header=$cf_header
 	 break
@@ -16463,7 +16841,7 @@
 done
 
 fi
-echo "$as_me:16466: result: $cf_cv_term_header" >&5
+echo "$as_me:16844: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 case $cf_cv_term_header in #(vi
@@ -16487,7 +16865,7 @@
 	;;
 esac
 
-echo "$as_me:16490: checking if we should include curses.h or termcap.h" >&5
+echo "$as_me:16868: 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
@@ -16506,7 +16884,7 @@
     test -n "$cf_t_opts" && CPPFLAGS="$CPPFLAGS -D$cf_t_opts"
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 16509 "configure"
+#line 16887 "configure"
 #include "confdefs.h"
 /* $cf_c_opts $cf_t_opts */
 $CHECK_DECL_HDRS
@@ -16519,16 +16897,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16522: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16900: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16525: \$? = $ac_status" >&5
+  echo "$as_me:16903: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16528: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16906: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16531: \$? = $ac_status" >&5
+  echo "$as_me:16909: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   test "$cf_cv_need_curses_h" = no && {
 	     cf_cv_need_curses_h=maybe
@@ -16540,7 +16918,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 16543 "configure"
+#line 16921 "configure"
 #include "confdefs.h"
 
 $CHECK_DECL_HDRS
@@ -16553,16 +16931,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16556: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16934: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16559: \$? = $ac_status" >&5
+  echo "$as_me:16937: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16562: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16940: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16565: \$? = $ac_status" >&5
+  echo "$as_me:16943: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_curses_h=yes
 	 cf_ok_c_opts=$cf_c_opts
@@ -16599,7 +16977,7 @@
 fi
 
 fi
-echo "$as_me:16602: result: $cf_cv_need_curses_h" >&5
+echo "$as_me:16980: result: $cf_cv_need_curses_h" >&5
 echo "${ECHO_T}$cf_cv_need_curses_h" >&6
 
 case $cf_cv_need_curses_h in
@@ -16633,7 +17011,7 @@
 	;;
 esac
 
-echo "$as_me:16636: checking declaration of tputs 3rd param" >&5
+echo "$as_me:17014: 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
@@ -16649,10 +17027,10 @@
 for R in int char; do
 for S in "" const; do
 
-echo "(line 16652) testing loop variables P:$P, Q:$Q, R:$R, S:$S ..." 1>&5
+echo "(line 17030) testing loop variables P:$P, Q:$Q, R:$R, S:$S ..." 1>&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 16655 "configure"
+#line 17033 "configure"
 #include "confdefs.h"
 $CHECK_DECL_HDRS
 int
@@ -16666,16 +17044,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16669: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17047: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16672: \$? = $ac_status" >&5
+  echo "$as_me:17050: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16675: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17053: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16678: \$? = $ac_status" >&5
+  echo "$as_me:17056: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_outchar="$Q OutChar($R)"
 	 cf_cv_found=yes
@@ -16694,7 +17072,7 @@
 done
 
 fi
-echo "$as_me:16697: result: $cf_cv_type_outchar" >&5
+echo "$as_me:17075: result: $cf_cv_type_outchar" >&5
 echo "${ECHO_T}$cf_cv_type_outchar" >&6
 
 case $cf_cv_type_outchar in
@@ -16726,7 +17104,7 @@
 
 ac_tr_func=`echo "$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-echo "$as_me:16729: checking for missing \"${ac_func}\" extern" >&5
+echo "$as_me:17107: 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
@@ -16735,7 +17113,7 @@
 cf_save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $CHECK_DECL_FLAG"
 cat >conftest.$ac_ext <<_ACEOF
-#line 16738 "configure"
+#line 17116 "configure"
 #include "confdefs.h"
 
 $CHECK_DECL_HDRS
@@ -16757,16 +17135,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16760: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17138: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16763: \$? = $ac_status" >&5
+  echo "$as_me:17141: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16766: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17144: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16769: \$? = $ac_status" >&5
+  echo "$as_me:17147: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval 'cf_cv_func_'${ac_func}'=yes'
 else
@@ -16780,7 +17158,7 @@
 fi
 
 eval 'cf_result=$cf_cv_func_'${ac_func}
-echo "$as_me:16783: result: $cf_result" >&5
+echo "$as_me:17161: 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
@@ -16856,7 +17234,7 @@
 
 ac_tr_func=`echo "$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-echo "$as_me:16859: checking for missing \"${ac_func}\" extern" >&5
+echo "$as_me:17237: 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
@@ -16865,7 +17243,7 @@
 cf_save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $CHECK_DECL_FLAG"
 cat >conftest.$ac_ext <<_ACEOF
-#line 16868 "configure"
+#line 17246 "configure"
 #include "confdefs.h"
 
 $CHECK_DECL_HDRS
@@ -16887,16 +17265,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16890: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17268: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16893: \$? = $ac_status" >&5
+  echo "$as_me:17271: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16896: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17274: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16899: \$? = $ac_status" >&5
+  echo "$as_me:17277: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval 'cf_cv_func_'${ac_func}'=yes'
 else
@@ -16910,7 +17288,7 @@
 fi
 
 eval 'cf_result=$cf_cv_func_'${ac_func}
-echo "$as_me:16913: result: $cf_result" >&5
+echo "$as_me:17291: 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
@@ -16930,7 +17308,7 @@
 
 ac_tr_func=`echo "$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-echo "$as_me:16933: checking for missing \"${ac_func}\" extern" >&5
+echo "$as_me:17311: 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
@@ -16939,7 +17317,7 @@
 cf_save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $CHECK_DECL_FLAG"
 cat >conftest.$ac_ext <<_ACEOF
-#line 16942 "configure"
+#line 17320 "configure"
 #include "confdefs.h"
 
 $CHECK_DECL_HDRS
@@ -16961,16 +17339,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16964: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17342: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16967: \$? = $ac_status" >&5
+  echo "$as_me:17345: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16970: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17348: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16973: \$? = $ac_status" >&5
+  echo "$as_me:17351: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval 'cf_cv_func_'${ac_func}'=yes'
 else
@@ -16984,7 +17362,7 @@
 fi
 
 eval 'cf_result=$cf_cv_func_'${ac_func}
-echo "$as_me:16987: result: $cf_result" >&5
+echo "$as_me:17365: 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
@@ -17003,7 +17381,7 @@
 fi
 
 if test "$cf_filter_libs" = yes ; then
-	EXTRAOBJS="$EXTRAOBJS builtflt.o"
+	EXTRAOBJS="$EXTRAOBJS builtflt\$o"
 	CPPFLAGS="-I\$(srcdir)/filters $CPPFLAGS"
 	FILTER_LIBS="-Lfilters -lvlflt"
 	LIBBUILTFLT="${LIB_PREFIX}vlflt.a"
@@ -17035,19 +17413,19 @@
 #define OPT_PLUGIN 1
 EOF
 
-	EXTRAOBJS="$EXTRAOBJS plugin.o"
+	EXTRAOBJS="$EXTRAOBJS plugin\$o"
 fi
 
 if test "$cf_need_libdl" = yes ; then
 
 cf_have_dlsym=no
-echo "$as_me:17044: checking for dlsym" >&5
+echo "$as_me:17422: 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 17050 "configure"
+#line 17428 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dlsym (); below.  */
@@ -17078,16 +17456,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17081: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17459: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17084: \$? = $ac_status" >&5
+  echo "$as_me:17462: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17087: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17465: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17090: \$? = $ac_status" >&5
+  echo "$as_me:17468: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_dlsym=yes
 else
@@ -17097,14 +17475,14 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:17100: result: $ac_cv_func_dlsym" >&5
+echo "$as_me:17478: 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
 
 cf_have_libdl=no
-echo "$as_me:17107: checking for dlsym in -ldl" >&5
+echo "$as_me:17485: 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
@@ -17112,7 +17490,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 17115 "configure"
+#line 17493 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17131,16 +17509,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17134: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17512: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17137: \$? = $ac_status" >&5
+  echo "$as_me:17515: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17140: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17518: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17143: \$? = $ac_status" >&5
+  echo "$as_me:17521: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dl_dlsym=yes
 else
@@ -17151,7 +17529,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17154: result: $ac_cv_lib_dl_dlsym" >&5
+echo "$as_me:17532: 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
 
@@ -17164,10 +17542,10 @@
 if test "$cf_have_dlsym" = yes ; then
 	test "$cf_have_libdl" = yes && LIBS="-ldl $LIBS"
 
-	echo "$as_me:17167: checking whether able to link to dl*() functions" >&5
+	echo "$as_me:17545: checking whether able to link to dl*() functions" >&5
 echo $ECHO_N "checking whether able to link to dl*() functions... $ECHO_C" >&6
 	cat >conftest.$ac_ext <<_ACEOF
-#line 17170 "configure"
+#line 17548 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 int
@@ -17185,16 +17563,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17188: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17566: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17191: \$? = $ac_status" >&5
+  echo "$as_me:17569: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17194: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17572: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17197: \$? = $ac_status" >&5
+  echo "$as_me:17575: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 		cat >>confdefs.h <<\EOF
@@ -17205,15 +17583,15 @@
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-		{ { echo "$as_me:17208: error: Cannot link test program for libdl" >&5
+		{ { echo "$as_me:17586: 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
-	echo "$as_me:17213: result: ok" >&5
+	echo "$as_me:17591: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 else
-	{ { echo "$as_me:17216: error: Cannot find dlsym function" >&5
+	{ { echo "$as_me:17594: error: Cannot find dlsym function" >&5
 echo "$as_me: error: Cannot find dlsym function" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -17228,10 +17606,10 @@
 		cf_opt_rdynamic=no
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="-Wall -rdynamic $CFLAGS"
-		echo "$as_me:17231: checking if gcc has -rdynamic option" >&5
+		echo "$as_me:17609: 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 17234 "configure"
+#line 17612 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -17243,16 +17621,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17246: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17624: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17249: \$? = $ac_status" >&5
+  echo "$as_me:17627: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17252: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17630: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17255: \$? = $ac_status" >&5
+  echo "$as_me:17633: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_opt_rdynamic=yes
 else
@@ -17261,7 +17639,7 @@
 cf_opt_rdynamic=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-		echo "$as_me:17264: result: $cf_opt_rdynamic" >&5
+		echo "$as_me:17642: result: $cf_opt_rdynamic" >&5
 echo "${ECHO_T}$cf_opt_rdynamic" >&6
 		test "$cf_opt_rdynamic" = no && CFLAGS="$cf_save_CFLAGS"
 
@@ -17278,7 +17656,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:17281: checking for $ac_word" >&5
+echo "$as_me:17659: 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
@@ -17293,7 +17671,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:17296: found $ac_dir/$ac_word" >&5
+echo "$as_me:17674: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -17301,10 +17679,10 @@
 fi
 SPELL_PROG=$ac_cv_prog_SPELL_PROG
 if test -n "$SPELL_PROG"; then
-  echo "$as_me:17304: result: $SPELL_PROG" >&5
+  echo "$as_me:17682: result: $SPELL_PROG" >&5
 echo "${ECHO_T}$SPELL_PROG" >&6
 else
-  echo "$as_me:17307: result: no" >&5
+  echo "$as_me:17685: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -17407,7 +17785,7 @@
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:17410: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:17788: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -17583,7 +17961,7 @@
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:17586: error: ambiguous option: $1
+    { { echo "$as_me:17964: 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;}
@@ -17602,7 +17980,7 @@
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:17605: error: unrecognized option: $1
+  -*) { { echo "$as_me:17983: 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;}
@@ -17660,7 +18038,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:17663: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:18041: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -17929,7 +18307,7 @@
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:17932: creating $ac_file" >&5
+    { echo "$as_me:18310: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -17947,7 +18325,7 @@
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:17950: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:18328: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -17960,7 +18338,7 @@
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:17963: error: cannot find input file: $f" >&5
+           { { echo "$as_me:18341: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -18026,7 +18404,7 @@
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:18029: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:18407: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -18037,7 +18415,7 @@
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:18040: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:18418: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -18050,7 +18428,7 @@
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:18053: error: cannot find input file: $f" >&5
+           { { echo "$as_me:18431: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -18108,7 +18486,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:18111: $ac_file is unchanged" >&5
+      { echo "$as_me:18489: $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.221 
--- vile-9.5g+/configure.in	2005-11-23 12:27:59.000000000 +0000
+++ vile-9.5h/configure.in	2006-04-05 13:49:06.000000000 +0000
@@ -1,12 +1,12 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_REVISION($Revision: 1.221 $)
+AC_REVISION($Revision: 1.222 $)
 AC_PREREQ(2.13.20030927)
 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.221 2005/11/23 12:27:59 tom Exp $
+dnl $Header: /usr/build/vile/vile/RCS/configure.in,v 1.222 2006/04/05 13:49:06 tom Exp $
 
 define(MAKELIST, sh $srcdir/filters/makelist.sh $srcdir/filters/genmake.mak)
 
@@ -67,7 +67,7 @@
 	AC_DEFINE(FEWNAMES)
 	cf_extensions=no
 else
-	EXTRAOBJS="$EXTRAOBJS api.o btree.o history.o isearch.o select.o statevar.o ucrypt.o xterm.o"
+	EXTRAOBJS="$EXTRAOBJS api\$o btree\$o history\$o isearch\$o select\$o statevar\$o ucrypt\$o xterm\$o"
 	cf_extensions=yes
 fi
 
@@ -80,7 +80,7 @@
 if test "$DISABLE_SHELL" = yes ; then
 	AC_DEFINE(OPT_SHELL,0)
 else
-	EXTRAOBJS="$EXTRAOBJS npopen.o spawn.o"
+	EXTRAOBJS="$EXTRAOBJS npopen\$o spawn\$o"
 fi
 
 ###	use option --with-cflags to set default CFLAGS
@@ -297,7 +297,7 @@
 	fi
 	perl_lib_path=`$PERL -MConfig -e 'print $Config{privlib}'`
 	AC_DEFINE(OPT_PERL)
-	EXTRAOBJS="$EXTRAOBJS perl.o"
+	EXTRAOBJS="$EXTRAOBJS perl\$o"
 	BUILTSRCS="$BUILTSRCS perl.c"
 	LINK_PREFIX=`$PERL -MConfig -e 'print $Config{shrpenv}'`
 	ac_link="$LINK_PREFIX $ac_link"
@@ -462,13 +462,13 @@
 	[[Oo]]pen* | [[Xx]]ol )
 		AC_DEFINE(OL_WIDGETS)
 		CF_X_OPENLOOK
-	 	test "$cf_extensions" = no && EXTRAOBJS="$EXTRAOBJS select.o"
+	 	test "$cf_extensions" = no && EXTRAOBJS="$EXTRAOBJS select\$o"
 	;;
 	[[mM]]otif* | [[Xx]]m )
 		AC_DEFINE(MOTIF_WIDGETS)
 		CF_X_MOTIF
-	 	test "$cf_extensions" = yes && EXTRAOBJS="$EXTRAOBJS x11menu.o menu.o"
-	 	test "$cf_extensions" = no && EXTRAOBJS="$EXTRAOBJS select.o"
+	 	test "$cf_extensions" = yes && EXTRAOBJS="$EXTRAOBJS x11menu\$o menu\$o"
+	 	test "$cf_extensions" = no && EXTRAOBJS="$EXTRAOBJS select\$o"
 	;;
 	[[Aa]]thena* | [[Xx]]aw* | neXtaw | XawPlus )
 		AC_DEFINE(ATHENA_WIDGETS)
@@ -478,12 +478,12 @@
 			;;
 		esac
 		CF_X_ATHENA
-	 	test "$cf_extensions" = yes && EXTRAOBJS="$EXTRAOBJS x11menu.o menu.o"
-	 	test "$cf_extensions" = no && EXTRAOBJS="$EXTRAOBJS select.o"
+	 	test "$cf_extensions" = yes && EXTRAOBJS="$EXTRAOBJS x11menu\$o menu\$o"
+	 	test "$cf_extensions" = no && EXTRAOBJS="$EXTRAOBJS select\$o"
 	;;
 	x | X | [[Xx]][[Tt]]* | [[Xx]]11 )
 		AC_DEFINE(NO_WIDGETS)
-	 	test "$cf_extensions" = no && EXTRAOBJS="$EXTRAOBJS select.o"
+	 	test "$cf_extensions" = no && EXTRAOBJS="$EXTRAOBJS select\$o"
 	;;
 	ansi)
 		SCREEN=ansi
@@ -710,7 +710,7 @@
 AC_ARG_WITH(fakevms,
 	[  --with-fakevms          test: use fake VMS I/O module],
 	[AC_DEFINE(OPT_VMS_PATH)
-	 EXTRAOBJS="$EXTRAOBJS fakevms.o vms2unix.o"])
+	 EXTRAOBJS="$EXTRAOBJS fakevms\$o vms2unix\$o"])
 
 AC_ARG_WITH(no-leaks,
 	[  --with-no-leaks         test: free permanent memory, analyze leaks],
@@ -729,7 +729,7 @@
 	 with_trace=yes],
 	[with_trace=])
 
-test -n "${with_trace}${with_no_leaks}" && EXTRAOBJS="$EXTRAOBJS trace.o"
+test -n "${with_trace}${with_no_leaks}" && EXTRAOBJS="$EXTRAOBJS trace\$o"
 
 CF_WITH_WARNINGS
 
@@ -851,7 +851,7 @@
 fi
 
 if test "$cf_filter_libs" = yes ; then
-	EXTRAOBJS="$EXTRAOBJS builtflt.o"
+	EXTRAOBJS="$EXTRAOBJS builtflt\$o"
 	CPPFLAGS="-I\$(srcdir)/filters $CPPFLAGS"
 	FILTER_LIBS="-Lfilters -lvlflt"
 	LIBBUILTFLT="${LIB_PREFIX}vlflt.a"
@@ -884,7 +884,7 @@
 	# TODO: how to do with other compilers ? can libtool help ?
 	fi
 	AC_DEFINE(OPT_PLUGIN)
-	EXTRAOBJS="$EXTRAOBJS plugin.o"
+	EXTRAOBJS="$EXTRAOBJS plugin\$o"
 fi
 
 if test "$cf_need_libdl" = yes ; then
Index: display.c
Prereq:  1.416 
--- vile-9.5g+/display.c	2006-03-14 23:54:16.000000000 +0000
+++ vile-9.5h/display.c	2006-04-25 20:18:04.000000000 +0000
@@ -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.416 2006/03/14 23:54:16 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/display.c,v 1.418 2006/04/25 20:18:04 tom Exp $
  *
  */
 
@@ -105,7 +105,7 @@
     int l = 0;
 
     if (s != 0) {
-	int length = strlen(s);
+	int length = (int) strlen(s);
 
 	if (width < 0)
 	    width = length;
@@ -590,11 +590,11 @@
 }
 
 static void
-vtputsn(const char *s, int n)
+vtputsn(const char *s, size_t n)
 {
     int c;
     if (s != 0) {
-	while (n-- > 0 && (c = *s++) != EOS)
+	while (n-- != 0 && (c = *s++) != EOS)
 	    vtputc(c);
     }
 }
@@ -634,7 +634,7 @@
 	char temp[NU_WIDTH + 2];
 
 	vtcol = 0;		/* make sure we always see line numbers */
-	vtputsn(right_num(temp, NU_WIDTH - NU_GUTTER, (int) line),
+	vtputsn(right_num(temp, NU_WIDTH - NU_GUTTER, line),
 		NU_WIDTH - NU_GUTTER);
 	vtputsn("  ", NU_GUTTER);
 	horscroll = skip - vtcol;
@@ -1311,7 +1311,7 @@
 				 : 0),
 		   term.cols);
 	if (my_overlay[0] != EOS) {
-	    int n = term.cols - strlen(my_overlay) - 1;
+	    int n = term.cols - (int) strlen(my_overlay) - 1;
 	    if (n > 0) {
 		(void) memcpy(&vscreen[row]->v_text[n],
 			      my_overlay,
@@ -2888,7 +2888,7 @@
     tb_bappend(result, left_ms, strlen(left_ms));
 
     if (tb_values(*result) != 0 && ((int) tb_length(*result) < term.cols)
-	&& (right_len = strlen(right_ms)) != 0) {
+	&& (right_len = (int) strlen(right_ms)) != 0) {
 	for (n = term.cols - (int) tb_length(*result) - right_len;
 	     n > 0;
 	     n--)
@@ -2917,7 +2917,7 @@
 	col = 80 - left;
 
 	if ((n > 80) && (col >= 0)) {
-	    for (n = tb_length(*result); n < col; n++)
+	    for (n = (int) tb_length(*result); n < col; n++)
 		tb_append(result, lchar);
 	    if ((ss = tb_values(*result)) != 0
 		&& ss[col] == lchar) {
@@ -3039,7 +3039,8 @@
 	vtcol = 0;
     } else
 	n = 0;
-    vtputsn(right_ms + n, term.cols - vtcol);
+    if (term.cols > vtcol)
+	vtputsn(right_ms + n, term.cols - vtcol);
     col = -nu_width(wp);
 #ifdef WMDLINEWRAP
     if (!w_val(wp, WMDLINEWRAP))
@@ -3873,7 +3874,7 @@
 	dfputi(lspputc, number, radix);
 	*lsp = EOS;
     }
-    return (lsp - buf);
+    return (int) (lsp - buf);
 }
 
 /*
Index: estruct.h
Prereq:  1.595 
--- vile-9.5g+/estruct.h	2006-02-14 23:57:49.000000000 +0000
+++ vile-9.5h/estruct.h	2006-05-21 20:58:10.000000000 +0000
@@ -12,7 +12,7 @@
 */
 
 /*
- * $Header: /usr/build/vile/vile/RCS/estruct.h,v 1.595 2006/02/14 23:57:49 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/estruct.h,v 1.597 2006/05/21 20:58:10 tom Exp $
  */
 
 #ifndef _estruct_h
@@ -968,10 +968,10 @@
 # include <os2def.h>
 #else
 # if !defined(WIN32)
-#  define UCHAR unsigned char
-#  define UINT unsigned int
+#  define UCHAR  unsigned char
+#  define UINT   unsigned int
 #  define USHORT unsigned short
-#  define ULONG unsigned long
+#  define ULONG  unsigned long
 # endif
 #endif
 
@@ -1064,8 +1064,8 @@
 
 #define	char2int(c)	((int)(c & 0xff)) /* mask off sign-extension, etc. */
 
-#define	PLURAL(n)	((n) != 1 ? "s" : "")
-#define NONNULL(s)	((s) != 0 ? (s) : "")
+#define	PLURAL(n)	((n) != 1 ? "s" : (char *) "")
+#define NONNULL(s)	((s) != 0 ? (s) : (char *) "")
 #define isEmpty(s)	((s) == 0 || *(s) == EOS)
 
 #define EOS        '\0'
@@ -2467,8 +2467,8 @@
 /*
  * Other useful argument templates
  */
-#define EOL_ARGS  const char * buffer, unsigned cpos, int c, int eolchar
-#define DONE_ARGS KBD_OPTIONS flags, int c, char *buf, unsigned *pos
+#define EOL_ARGS  const char * buffer, size_t cpos, int c, int eolchar
+#define DONE_ARGS KBD_OPTIONS flags, int c, char *buf, size_t *pos
 #define LIST_ARGS int flag, void *ptr
 #define REGN_ARGS void *flagp, int l, int r
 
@@ -2740,11 +2740,13 @@
 #undef GCC_UNUSED
 #endif
 
+#ifndef GCC_PRINTFLIKE
 #ifdef GCC_PRINTF
 #define GCC_PRINTFLIKE(fmt,var) __attribute__((format(printf,fmt,var)))
 #else
 #define GCC_PRINTFLIKE(fmt,var) /*nothing*/
 #endif
+#endif /* GCC_PRINTFLIKE */
 
 #ifndef	GCC_NORETURN
 #define	GCC_NORETURN /* nothing */
@@ -2878,6 +2880,7 @@
 
 /* extra checking if we're tracing */
 #if !OPT_TRACE
+#undef  NDEBUG
 #define NDEBUG			/* turn off assert's */
 #define valid_buffer(bp)        ((bp) != NULL)
 #define valid_window(wp)        ((wp) != NULL)
Index: eval.c
Prereq:  1.351 
--- vile-9.5g+/eval.c	2006-02-16 01:02:34.000000000 +0000
+++ vile-9.5h/eval.c	2006-04-25 20:22:26.000000000 +0000
@@ -2,7 +2,7 @@
  *	eval.c -- function and variable evaluation
  *	original by Daniel Lawrence
  *
- * $Header: /usr/build/vile/vile/RCS/eval.c,v 1.351 2006/02/16 01:02:34 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/eval.c,v 1.353 2006/04/25 20:22:26 tom Exp $
  *
  */
 
@@ -407,7 +407,7 @@
     if (Names != 0) {
 	showall = show_vars_f ? (show_vars_n > 1) : FALSE;
 	/* collect data for state-variables, since some depend on window */
-	for (s = t = 0; Names[s] != 0; s++) {
+	for (s = 0, t = 0; Names[s] != 0; s++) {
 	    if ((vv = get_listvalue(Names[s], showall)) != 0)
 		t += strlen(Names[s]) + strlen(fmt) + strlen(vv);
 	}
@@ -471,7 +471,7 @@
     char downcased[NSTRING];
     int fnum = ILLEGAL_NUM;
     int n;
-    unsigned m;
+    size_t m;
 
     if (name[0] == '&'
 	&& name[1] != EOS) {
@@ -538,14 +538,14 @@
 static void
 translate_string(TBUFF **result, const char *from, const char *to, const char *string)
 {
-    int len_to = strlen(to);
+    int len_to = (int) strlen(to);
     char *s, *t;
 
     if (tb_scopy(result, string) != 0) {
 	if ((s = tb_values(*result)) != 0) {
 	    for (; *s != EOS; ++s) {
 		if ((t = strchr(from, *s)) != 0
-		    && (t - from) < len_to) {
+		    && (int) (t - from) < len_to) {
 		    *s = to[t - from];
 		}
 	    }
@@ -2746,7 +2746,7 @@
 s2offset(const char *s, const char *n)
 {
     size_t len = strlen(s) + 1;
-    UINT off = s2size(n);
+    size_t off = s2size(n);
     if (off > len)
 	off = len;
     if (off == 0)
@@ -2767,7 +2767,7 @@
     if (bp != 0 && label != 0 && *label != EOS) {
 	LINE *glp;
 	size_t len = strlen(label);
-	int need = len + 1;
+	int need = (int) len + 1;
 	int col;
 
 	if (len > 1) {
@@ -2857,9 +2857,9 @@
  * when parsing.
  */
 int
-must_quote_token(const char *values, unsigned last)
+must_quote_token(const char *values, size_t last)
 {
-    unsigned n;
+    size_t n;
 
     if (last != 0 && values != 0) {
 	for (n = 0; n < last; n++) {
@@ -2878,9 +2878,9 @@
  * Appends the buffer, with quotes
  */
 void
-append_quoted_token(TBUFF **dst, const char *values, unsigned last)
+append_quoted_token(TBUFF **dst, const char *values, size_t last)
 {
-    unsigned n;
+    size_t n;
 
     TRACE(("append_quoted_token\n"));
     tb_append(dst, DQUOTE);
Index: exec.c
Prereq:  1.282 
--- vile-9.5g+/exec.c	2006-02-16 01:16:23.000000000 +0000
+++ vile-9.5h/exec.c	2006-05-21 19:24:48.000000000 +0000
@@ -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.282 2006/02/16 01:16:23 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/exec.c,v 1.285 2006/05/21 19:24:48 tom Exp $
  *
  */
 
@@ -81,8 +81,10 @@
 
 /*ARGSUSED*/
 static int
-eol_range(const char *buffer, unsigned cpos, int c, int eolchar GCC_UNUSED)
+eol_range(EOL_ARGS)
 {
+    (void) eolchar;
+
     if (is_edit_char(c))
 	return FALSE;
 
@@ -1628,14 +1630,14 @@
  *	length is the nominal maximum length (*cmdp is null-terminated)
  */
 DIRECTIVE
-dname_to_dirnum(char **cmdpp, int length)
+dname_to_dirnum(char **cmdpp, size_t length)
 {
     DIRECTIVE dirnum = D_UNKNOWN;
-    int n;
+    size_t n;
     int code;
     const char *ptr = (*cmdpp);
 
-    if ((--length > 0)
+    if ((length-- > 1)
 	&& (*ptr++ == DIRECTIVE_CHAR)) {
 	for (n = 0; n < length; n++) {
 	    if (!isAlnum(ptr[n]))
@@ -2036,7 +2038,7 @@
 
 #if ! SMALLER
 static void
-compute_indent(char *cmd, int length, int *indent, int *indstate)
+compute_indent(char *cmd, size_t length, int *indent, int *indstate)
 {
     static BUFFER *save;
 
@@ -2196,7 +2198,7 @@
 	if (lforw(lp) != buf_head(bp)
 	    && linlen != 0
 	    && isEscaped(cmdp + linlen)) {
-	    glue = linlen + (size_t) (cmdp - linebuf) - 1;
+	    glue = (int) (linlen + (cmdp - linebuf) - 1);
 	    continue;
 	}
 	cmdp = skip_space_tab(linebuf);
@@ -2237,7 +2239,7 @@
 
 	if (*cmdp == DIRECTIVE_CHAR) {
 
-	    dirnum = dname_to_dirnum(&cmdp, (int) linlen);
+	    dirnum = dname_to_dirnum(&cmdp, linlen);
 	    if (dirnum == D_UNKNOWN) {
 		mlforce("[Unknown directive \"%s\"]", cmdp);
 		status = FALSE;
@@ -2308,7 +2310,7 @@
 	    /* check if next word is also a directive */
 	    cmdp = skip_space_tab(cmdp);
 	    if (*cmdp == DIRECTIVE_CHAR) {
-		dirnum = dname_to_dirnum(&cmdp, (int) linlen);
+		dirnum = dname_to_dirnum(&cmdp, linlen);
 		if (dirnum == D_UNKNOWN) {
 		    mlforce("[Unknown directive \"%s\"]", cmdp);
 		    status = FALSE;
Index: fences.c
Prereq:  1.83 
--- vile-9.5g+/fences.c	2005-05-15 23:11:09.000000000 +0000
+++ vile-9.5h/fences.c	2006-04-25 20:50:30.000000000 +0000
@@ -9,7 +9,7 @@
  * Extensions for vile by Paul Fox
  * Rewrote to use regular expressions - T.Dickey
  *
- * $Header: /usr/build/vile/vile/RCS/fences.c,v 1.83 2005/05/15 23:11:09 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/fences.c,v 1.84 2006/04/25 20:50:30 tom Exp $
  *
  */
 
@@ -524,7 +524,7 @@
     if (sdir == FORWARD) {
 	size_t off = (size_t) (DOT.o - S_COL(BlkBegin));
 	if (BlkEnd->mlen > off)
-	    forwchar(TRUE, BlkEnd->mlen - off);
+	    forwchar(TRUE, (int) (BlkEnd->mlen - off));
     }
 
     scanboundry(FALSE, DOT, sdir);
@@ -533,9 +533,9 @@
 	if (!doingopcmd || doingsweep) {
 	    sweephack = TRUE;
 	    if (sdir == FORWARD && (BlkEnd->mlen > 1))
-		forwchar(TRUE, BlkEnd->mlen - 1);
+		forwchar(TRUE, (int) (BlkEnd->mlen - 1));
 	} else if (sdir == FORWARD && (BlkEnd->mlen > 1)) {
-	    forwchar(TRUE, BlkEnd->mlen - 0);
+	    forwchar(TRUE, (int) (BlkEnd->mlen - 0));
 	}
 	curwp->w_flag |= WFMOVE;
 	return TRUE;
Index: file.c
Prereq:  1.391 
--- vile-9.5g+/file.c	2006-04-02 17:45:36.000000000 +0000
+++ vile-9.5h/file.c	2006-04-25 22:07:14.000000000 +0000
@@ -5,7 +5,7 @@
  * reading and writing of the disk are
  * in "fileio.c".
  *
- * $Header: /usr/build/vile/vile/RCS/file.c,v 1.391 2006/04/02 17:45:36 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/file.c,v 1.393 2006/04/25 22:07:14 tom Exp $
  */
 
 #include "estruct.h"
@@ -796,8 +796,8 @@
 	}
 	sprintf(strlines, "%d", nline);
 	sprintf(strchars, "%lu", nchar);
-	lines_len = strlen(strlines);
-	chars_len = strlen(strchars);
+	lines_len = (int) strlen(strlines);
+	chars_len = (int) strlen(strchars);
 	outlen = (term.cols - 1) -
 	    (
 		(sizeof(WRITE_FILE_FMT) - 13) +
@@ -880,10 +880,10 @@
 static int
 kifile(char *fname)
 {
-    int i;
     int s;
     int nline;
-    int nbytes;
+    size_t i;
+    size_t nbytes;
 
     TRACE((T_CALLED "kifile(%s)\n", NONNULL(fname)));
 
@@ -1716,7 +1716,7 @@
 slowreadf(BUFFER *bp, int *nlinep)
 {
     int s;
-    int len;
+    size_t len;
 #if OPT_DOSFILES
     int doslines = 0, unixlines = 0;
 #endif
@@ -1746,14 +1746,14 @@
 	 * keep any CR's that we read.
 	 */
 	if (global_b_val(MDDOS)) {
-	    if (len > 0 && fflinebuf[len - 1] == '\r') {
+	    if (len != 0 && fflinebuf[len - 1] == '\r') {
 		doslines++;
 	    } else {
 		unixlines++;
 	    }
 	}
 #endif
-	if (addline(bp, fflinebuf, len) != TRUE) {
+	if (addline(bp, fflinebuf, (int) len) != TRUE) {
 	    s = FIOMEM;
 	    break;
 	}
@@ -2098,7 +2098,7 @@
 	    TBUFF *temp;
 	    if ((temp = encode_attributes(lp, bp, rp)) != 0) {
 		text = tb_values(temp);
-		len = tb_length(temp);
+		len = (int) tb_length(temp);
 	    }
 	    if ((s = ffputline(text, len, ending)) != FIOSUC) {
 		tb_free(&temp);
@@ -2453,7 +2453,7 @@
     LINE *newlp;
     LINE *nextp;
     int status;
-    int nbytes;
+    size_t nbytes;
     int nline;
 
     TRACE((T_CALLED "ifile(fname=%s, belowthisline=%d, haveffp=%p)\n",
@@ -2492,7 +2492,7 @@
     while ((status = ffgetline(&nbytes)) <= FIOSUC) {
 #if OPT_DOSFILES
 	if (b_val(curbp, MDDOS)
-	    && (nbytes > 0)
+	    && (nbytes != 0)
 	    && fflinebuf[nbytes - 1] == '\r')
 	    nbytes--;
 #endif
@@ -2502,7 +2502,7 @@
 	}
 
 	beginDisplay();
-	if (add_line_at(curbp, prevp, fflinebuf, nbytes) != TRUE) {
+	if (add_line_at(curbp, prevp, fflinebuf, (int) nbytes) != TRUE) {
 	    status = FIOMEM;
 	    newlp = 0;
 	} else {
Index: filec.c
Prereq:  1.121 
--- vile-9.5g+/filec.c	2005-01-20 01:58:58.000000000 +0000
+++ vile-9.5h/filec.c	2006-05-21 10:58:58.000000000 +0000
@@ -5,7 +5,7 @@
  * Written by T.E.Dickey for vile (march 1993).
  *
  *
- * $Header: /usr/build/vile/vile/RCS/filec.c,v 1.121 2005/01/20 01:58:58 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/filec.c,v 1.124 2006/05/21 10:58:58 tom Exp $
  *
  */
 
@@ -88,8 +88,8 @@
 static int
 trailing_slash(const char *path)
 {
-    int len = strlen(path);
-    if (len > 0) {
+    size_t len = strlen(path);
+    if (len != 0) {
 #if OPT_VMS_PATH
 	if (is_vms_pathname(path, TRUE))
 	    return TRUE;
@@ -551,7 +551,7 @@
 #endif /* USE_QSORT */
 
 int
-fill_directory_buffer(BUFFER *bp, char *path, int dots GCC_UNUSED)
+fill_directory_buffer(BUFFER *bp, char *path, size_t dots GCC_UNUSED)
 {
     int count = 0;
     char *s;
@@ -831,10 +831,10 @@
     int n;
     LINE *lp;
     char *slashocc;
-    int len = strlen(name);
+    int len = (int) strlen(name);
 
     beginDisplay();
-    if (is_slashc(name[len - 1]))
+    if (len != 0 && is_slashc(name[len - 1]))
 	len++;
 
     (void) bsizes(bp);
@@ -881,7 +881,7 @@
 #endif
 
 static void
-force_output(int c, char *buf, unsigned *pos)
+force_output(int c, char *buf, size_t *pos)
 {
     kbd_putc(c);
     term.flush();
@@ -943,8 +943,8 @@
     } else if (action) {
 	char *s;
 	char path[NFILEN];
-	unsigned oldlen;
-	unsigned newlen;
+	size_t oldlen;
+	size_t newlen;
 
 	/* initialize only on demand */
 	if (MyBuff == 0) {
Index: fileio.c
Prereq:  1.179 
--- vile-9.5g+/fileio.c	2005-05-22 16:28:46.000000000 +0000
+++ vile-9.5h/fileio.c	2006-04-25 21:00:42.000000000 +0000
@@ -2,7 +2,7 @@
  * The routines in this file read and write ASCII files from the disk. All of
  * the knowledge about files are here.
  *
- * $Header: /usr/build/vile/vile/RCS/fileio.c,v 1.179 2005/05/22 16:28:46 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/fileio.c,v 1.181 2006/04/25 21:00:42 tom Exp $
  *
  */
 
@@ -630,7 +630,8 @@
 			: (want - *have));
 
 #if FFREAD_FREAD
-	    got = fread(buf + *have, 1, ask, ffp);
+	    /* size_t may not fit in long, making a sign-extension */
+	    got = (long) fread(buf + *have, 1, ask, ffp);
 #else
 	    got = read(fileno(ffp), buf + *have, ask);
 #endif
@@ -784,7 +785,7 @@
 
 /* "Small" exponential growth - EJK */
 static int
-alloc_linebuf(unsigned needed)
+alloc_linebuf(size_t needed)
 {
     beginDisplay();
     needed += 2;
@@ -816,7 +817,7 @@
  * the 'lenp' parameter.
  */
 int
-ffgetline(int *lenp)
+ffgetline(size_t *lenp)
 {
     int c;
     size_t i;			/* current index into fflinebuf */
Index: filters/ada-filt.l
Prereq:  1.12 
--- vile-9.5g+/filters/ada-filt.l	2005-09-04 21:10:12.000000000 +0000
+++ vile-9.5h/filters/ada-filt.l	2006-05-21 19:49:01.000000000 +0000
@@ -1,6 +1,6 @@
 %{
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/ada-filt.l,v 1.12 2005/09/04 21:10:12 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/ada-filt.l,v 1.14 2006/05/21 19:49:01 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of Ada
  * input text.
@@ -33,13 +33,14 @@
 {QUOTECHAR}		|
 {STRING}		{ WriteToken(String_attr); }
 {NUMBER}		{ WriteToken(Number_attr); }
-"--"[^\n]*		{ WriteToken(Comment_attr); }
+"--"[^\r\n]*		{ WriteToken(Comment_attr); }
 
 %%
 
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/as-filt.l
Prereq:  1.4 
--- vile-9.5g+/filters/as-filt.l	2005-09-04 21:10:12.000000000 +0000
+++ vile-9.5h/filters/as-filt.l	2006-05-21 19:50:19.000000000 +0000
@@ -2,7 +2,7 @@
 
 %{
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/as-filt.l,v 1.4 2005/09/04 21:10:12 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/as-filt.l,v 1.6 2006/05/21 19:50:19 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of assembler files.
  */
@@ -41,7 +41,7 @@
 <NORMAL>"$"		{ WriteToken(Prepro_attr); }
 <NORMAL>{IDENT}		{ WriteToken(ci_keyword_attr(yytext)); }
 <NORMAL>"%"{IDENT}	{ WriteToken(expect_attr(yytext)); }
-<NORMAL>";"[^\n]*	{ WriteToken(Comment_attr); }
+<NORMAL>";"[^\r\n]*	{ WriteToken(Comment_attr); }
 <NORMAL>{INTEGER}	{ WriteToken(Number_attr); }
 
 <NORMAL>"^#.*"		{ WriteToken(Prepro_attr); }
@@ -52,7 +52,7 @@
 
 <QUOTED>\\.		{ flt_bfr_embed(yytext, yyleng, Action_attr); }
 <QUOTED>{FORMAT}	{ flt_bfr_embed(yytext, yyleng, Number_attr); }
-<QUOTED>[^%\n"\\]+	{ flt_bfr_append(yytext, yyleng); }
+<QUOTED>[^%\r\n"\\]+	{ flt_bfr_append(yytext, yyleng); }
 <QUOTED>"%%"		{ flt_bfr_append(yytext, yyleng); }
 <QUOTED>"%"		{ flt_bfr_embed(yytext, yyleng, Error_attr); }
 <QUOTED>[\n]		{ flt_bfr_append(yytext, yyleng); }
@@ -79,6 +79,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/asm-filt.l
Prereq:  1.4 
--- vile-9.5g+/filters/asm-filt.l	2005-09-04 21:10:12.000000000 +0000
+++ vile-9.5h/filters/asm-filt.l	2006-05-21 19:50:19.000000000 +0000
@@ -2,7 +2,7 @@
 
 %{
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/asm-filt.l,v 1.4 2005/09/04 21:10:12 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/asm-filt.l,v 1.6 2006/05/21 19:50:19 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of M$ assembler files.
  */
@@ -24,8 +24,8 @@
 
 %}
 
-SSTRING		\'([^'\n]|'')*\'
-DSTRING		\"([^"\n]|"")*\"
+SSTRING		\'([^'\r\n]|'')*\'
+DSTRING		\"([^"\r\n]|"")*\"
 STRING		{SSTRING}|{DSTRING}
 
 NAME		[[:alnum:]_$?@]
@@ -49,7 +49,7 @@
 			      BEGIN(QUOTE1);
 			  }
 			}
-<NORMAL>";"[^\n]*	{ WriteToken(Comment_attr); }
+<NORMAL>";"[^\r\n]*	{ WriteToken(Comment_attr); }
 
 <NORMAL>{NUMBER}	{ WriteToken(Number_attr); }
 <NORMAL>[[:digit:]]{NUMBER}{NAME}+ {
@@ -57,7 +57,7 @@
 			  WriteToken(Error_attr);
 			}
 <QUOTE1>[<>]		{ WriteToken(Action_attr); }
-<QUOTE1>[^\n<>]*	{ WriteToken(String_attr); }
+<QUOTE1>[^\r\n<>]*	{ WriteToken(String_attr); }
 <QUOTE1>\n		{ ECHO; BEGIN(NORMAL); }
 
 <NORMAL>\\.		|
@@ -68,6 +68,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/atr2ansi.c
Prereq:  1.2 
--- vile-9.5g+/filters/atr2ansi.c	2003-05-07 19:18:16.000000000 +0000
+++ vile-9.5h/filters/atr2ansi.c	2006-05-21 19:42:21.000000000 +0000
@@ -1,7 +1,7 @@
 /*
  * Convert attributed text to ANSI-style escape sequences, allowing color.
  *
- * $Header: /usr/build/vile/vile/filters/RCS/atr2ansi.c,v 1.2 2003/05/07 19:18:16 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/atr2ansi.c,v 1.3 2006/05/21 19:42:21 tom Exp $
  */
 #include <unfilter.h>
 
@@ -12,6 +12,8 @@
 void
 begin_unfilter(FILE *dst GCC_UNUSED)
 {
+    (void) dst;
+
     last_attrib = 0;
 }
 
@@ -40,11 +42,15 @@
 void
 write_unfilter(FILE *dst, int ch, int attrib GCC_UNUSED)
 {
+    (void) attrib;
+
     fputc(ch, dst);
 }
 
 void
 end_unfilter(FILE *dst GCC_UNUSED)
 {
+    (void) dst;
+
     markup_unfilter(dst, 0);
 }
Index: filters/atr2html.c
Prereq:  1.2 
--- vile-9.5g+/filters/atr2html.c	2003-05-07 20:32:30.000000000 +0000
+++ vile-9.5h/filters/atr2html.c	2006-05-21 19:47:02.000000000 +0000
@@ -1,7 +1,7 @@
 /*
  * Convert attributed text to html.
  *
- * $Header: /usr/build/vile/vile/filters/RCS/atr2html.c,v 1.2 2003/05/07 20:32:30 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/atr2html.c,v 1.3 2006/05/21 19:47:02 tom Exp $
  */
 #include <unfilter.h>
 
@@ -55,6 +55,9 @@
 write_unfilter(FILE *dst, int ch, int attrib GCC_UNUSED)
 {
     char *alias = 0;
+
+    (void) attrib;
+
     switch (ch) {
     case '<':
 	alias = "&lt;";
Index: filters/atr2text.c
Prereq:  1.2 
--- vile-9.5g+/filters/atr2text.c	2003-05-07 19:47:34.000000000 +0000
+++ vile-9.5h/filters/atr2text.c	2006-05-21 19:42:45.000000000 +0000
@@ -1,18 +1,21 @@
 /*
  * Convert attributed text to something like nroff output.
  *
- * $Header: /usr/build/vile/vile/filters/RCS/atr2text.c,v 1.2 2003/05/07 19:47:34 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/atr2text.c,v 1.3 2006/05/21 19:42:45 tom Exp $
  */
 #include <unfilter.h>
 
 void
 begin_unfilter(FILE *dst GCC_UNUSED)
 {
+    (void) dst;
 }
 
 void
 markup_unfilter(FILE *dst GCC_UNUSED, int attrib GCC_UNUSED)
 {
+    (void) dst;
+    (void) attrib;
 }
 
 void
@@ -33,4 +36,5 @@
 void
 end_unfilter(FILE *dst GCC_UNUSED)
 {
+    (void) dst;
 }
Index: filters/au3-filt.l
Prereq:  1.4 
--- vile-9.5g+/filters/au3-filt.l	2005-09-04 21:10:12.000000000 +0000
+++ vile-9.5h/filters/au3-filt.l	2006-05-21 19:50:19.000000000 +0000
@@ -2,7 +2,7 @@
 
 %{
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/au3-filt.l,v 1.4 2005/09/04 21:10:12 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/au3-filt.l,v 1.6 2006/05/21 19:50:19 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of AutoIt
  * input text.
@@ -31,15 +31,15 @@
 
 IDENT		([$@])?[[:alpha:]_][[:alnum:]_]*
 
-SSTRING		\'([^'\n]|'')*\'
-DSTRING		\"([^"\n]|"")*\"
+SSTRING		\'([^'\r\n]|'')*\'
+DSTRING		\"([^"\r\n]|"")*\"
 STRING		{SSTRING}|{DSTRING}
 
 NUMBER		{HEX}|{INTEGER}|{REAL}
 
 %%
 
-<NORMAL,IFCMT>^#[^\n]*$		{ char *text = lowercase_of(yytext);
+<NORMAL,IFCMT>^#[^\r\n]*$	{ char *text = lowercase_of(yytext);
 				  WriteToken(Prepro_attr);
 				  if (!strncmp(text, "#comments-start", 15)
 				   || !strncmp(text, "#cs", 3)) {
@@ -56,7 +56,7 @@
 				    BEGIN(NORMAL);
 				  }
 				}
-<IFCMT>^[^\n]*$			{ WriteToken(Comment_attr); }
+<IFCMT>^[^\r\n]*$		{ WriteToken(Comment_attr); }
 <IFCMT>.			{ ECHO; }
 
 <NORMAL>;			{ WriteToken(Comment_attr); BEGIN(COMMENT); }
@@ -74,9 +74,9 @@
 				}
 <NORMAL>{STRING}		{ WriteToken(String_attr); }
 <NORMAL>{NUMBER}		{ WriteToken(Number_attr); }
-<NORMAL>"'"[^\n]*		{ WriteToken(Comment_attr); }
+<NORMAL>"'"[^\r\n]*		{ WriteToken(Comment_attr); }
 
-<COMMENT>[^\n]*			{ WriteToken(Comment_attr); }
+<COMMENT>[^\r\n]*		{ WriteToken(Comment_attr); }
 <COMMENT>[\n]			{ ECHO; BEGIN(NORMAL); }
 
 %%
@@ -84,6 +84,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/awk-filt.l
Prereq:  1.15 
--- vile-9.5g+/filters/awk-filt.l	2005-09-04 21:10:12.000000000 +0000
+++ vile-9.5h/filters/awk-filt.l	2006-05-21 19:50:19.000000000 +0000
@@ -2,7 +2,7 @@
 
 %{
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/awk-filt.l,v 1.15 2005/09/04 21:10:12 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/awk-filt.l,v 1.17 2006/05/21 19:50:19 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of awk
  * input text.
@@ -25,7 +25,7 @@
 
 BLANK		[ \t]*
 
-DSTRING		\"((\\\")|[^"\n])*\"
+DSTRING		\"((\\\")|[^"\r\n])*\"
 
 KEYWORD		[[:alpha:]_][[:alnum:]_]*
 IDENT		\$[[:alnum:]_]+
@@ -34,7 +34,7 @@
 INTEGER		{SIGN}?([[:digit:]]+)
 REAL		{SIGN}?([[:digit:]]*\.[[:digit:]]+)([eE]{SIGN}?[[:digit:]]+)?
 
-PATTERN		"/"(\\.|\[(\\.|.)*\]|[^ \t\n])*"/"
+PATTERN		"/"(\\.|\[(\\.|.)*\]|[^ \t\r\n])*"/"
 
 %%
 
@@ -64,6 +64,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/bas-filt.l
Prereq:  1.10 
--- vile-9.5g+/filters/bas-filt.l	2005-09-05 11:04:44.000000000 +0000
+++ vile-9.5h/filters/bas-filt.l	2006-05-21 19:50:19.000000000 +0000
@@ -2,7 +2,7 @@
 
 %{
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/bas-filt.l,v 1.10 2005/09/05 11:04:44 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/bas-filt.l,v 1.12 2006/05/21 19:50:19 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of Basic
  * input text.
@@ -54,9 +54,9 @@
 <NORMAL>{DATE}			|
 <NORMAL>{STRING}		{ WriteToken(String_attr); }
 <NORMAL>{NUMBER}		{ WriteToken(Number_attr); }
-<NORMAL>"'"[^\n]*		{ WriteToken(Comment_attr); }
+<NORMAL>"'"[^\r\n]*		{ WriteToken(Comment_attr); }
 
-<COMMENT>[^\n]*			{ WriteToken(Comment_attr); }
+<COMMENT>[^\r\n]*		{ WriteToken(Comment_attr); }
 <COMMENT>[\n]			{ ECHO; BEGIN(NORMAL); }
 
 %%
@@ -84,6 +84,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/bat-filt.l
Prereq:  1.22 
--- vile-9.5g+/filters/bat-filt.l	2006-02-14 01:27:10.000000000 +0000
+++ vile-9.5h/filters/bat-filt.l	2006-05-21 19:50:19.000000000 +0000
@@ -3,7 +3,7 @@
 %{
 
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/bat-filt.l,v 1.22 2006/02/14 01:27:10 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/bat-filt.l,v 1.24 2006/05/21 19:50:19 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of DOS (and
  * similar, such as W95, NT) batch file.
@@ -40,7 +40,7 @@
 <INITIAL>^{BLANK}*@		{ WriteToken(Action_attr); }
 <INITIAL>\032			{ WriteToken(Action_attr); }
 
-<ECHOING>[^\n]*			{ WriteToken(String_attr); BEGIN(INITIAL); }
+<ECHOING>[^\r\n]*		{ WriteToken(String_attr); BEGIN(INITIAL); }
 <ECHOING>\n			{ ECHO; BEGIN(INITIAL); }
 
 <INITIAL>=			{ ECHO; setting=0; }
@@ -89,7 +89,7 @@
 <INITIAL>\n			{ ECHO; setting = 0; }
 
 <QUOTED>{IDENT2}		{ flt_bfr_embed(yytext, yyleng, variable_attr(yytext)); }
-<QUOTED>(\\\"|[^\n\"])+		{ flt_bfr_append(yytext, yyleng); }
+<QUOTED>(\\\"|[^\r\n\"])+	{ flt_bfr_append(yytext, yyleng); }
 <QUOTED>(.|\n)			{ flt_bfr_append(yytext, yyleng);
 				  flt_bfr_finish();
 				  BEGIN(INITIAL);
@@ -129,6 +129,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/bnf-filt.l
Prereq:  1.7 
--- vile-9.5g+/filters/bnf-filt.l	2005-09-02 22:18:08.000000000 +0000
+++ vile-9.5h/filters/bnf-filt.l	2006-05-21 19:50:19.000000000 +0000
@@ -1,6 +1,6 @@
 %{
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/bnf-filt.l,v 1.7 2005/09/02 22:18:08 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/bnf-filt.l,v 1.9 2006/05/21 19:50:19 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of BNF syntax.
  */
@@ -29,7 +29,7 @@
 "::="			|
 [<>\[\]{}?|;+*/-]	{ WriteToken(Action_attr); }
 
-"!"[^\n]*		{ WriteToken(Comment_attr); }
+"!"[^\r\n]*		{ WriteToken(Comment_attr); }
 
 {NUMBER}		{ WriteToken(Number_attr); }
 {BSTRING}		{ WriteToken(String_attr); }
@@ -39,6 +39,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/c-filt.c
Prereq:  1.73 
--- vile-9.5g+/filters/c-filt.c	2004-12-10 00:21:07.000000000 +0000
+++ vile-9.5h/filters/c-filt.c	2006-05-21 19:43:05.000000000 +0000
@@ -6,7 +6,7 @@
  *		string literal ("Literal") support --  ben stoltz
  *		factor-out hashing and file I/O - tom dickey
  *
- * $Header: /usr/build/vile/vile/filters/RCS/c-filt.c,v 1.73 2004/12/10 00:21:07 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/c-filt.c,v 1.74 2006/05/21 19:43:05 tom Exp $
  *
  * Usage: refer to vile.hlp and doc/filters.doc .
  *
@@ -438,6 +438,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
@@ -455,6 +456,8 @@
     int was_esc;
     unsigned len;
 
+    (void) input;
+
     Comment_attr = class_attr(NAME_COMMENT);
     Error_attr = class_attr(NAME_ERROR);
     Ident_attr = class_attr(NAME_IDENT);
Index: filters/cfg-filt.l
Prereq:  1.12 
--- vile-9.5g+/filters/cfg-filt.l	2006-04-02 16:49:05.000000000 +0000
+++ vile-9.5h/filters/cfg-filt.l	2006-05-21 19:50:19.000000000 +0000
@@ -1,7 +1,7 @@
 %{
 
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/cfg-filt.l,v 1.12 2006/04/02 16:49:05 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/cfg-filt.l,v 1.14 2006/05/21 19:50:19 tom Exp $
  *
  * Filter to add vile "attribution" sequences to an ordinary Lynx config-file
  */
@@ -31,7 +31,7 @@
 
 %}
 
-COMMENT		^[ \t]*#[^\n]*\n
+COMMENT		^[ \t]*#[^\r\n]*\n
 
 KEYWORD		([[:alpha:]_][[:alnum:]_.]*|[[:upper:]][+/&][[:upper:]])
 
@@ -50,7 +50,7 @@
 
 %%
 
-^\.[^\n]*$	{ WriteToken(String_attr); }
+^\.[^\r\n]*$	{ WriteToken(String_attr); }
 
 {KEYWORD}	{ WriteToken(mixedcase(yytext) ? "" : Keyword_attr); }
 
@@ -68,6 +68,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/css-filt.l
Prereq:  1.12 
--- vile-9.5g+/filters/css-filt.l	2006-04-02 16:49:54.000000000 +0000
+++ vile-9.5h/filters/css-filt.l	2006-05-21 19:50:19.000000000 +0000
@@ -2,7 +2,7 @@
 
 %{
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/css-filt.l,v 1.12 2006/04/02 16:49:54 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/css-filt.l,v 1.13 2006/05/21 19:50:19 tom Exp $
  *
  * Filter to add vile "attribution" sequences to Cascading Style Sheets.
  */
@@ -150,6 +150,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/cwebfilt.l
Prereq:  1.16 
--- vile-9.5g+/filters/cwebfilt.l	2005-09-04 21:10:12.000000000 +0000
+++ vile-9.5h/filters/cwebfilt.l	2006-04-05 14:40:29.000000000 +0000
@@ -2,7 +2,7 @@
 
 %{
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/cwebfilt.l,v 1.16 2005/09/04 21:10:12 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/cwebfilt.l,v 1.17 2006/04/05 14:40:29 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of Cwebx input
  * text.  Also useful for Cweb
@@ -77,8 +77,8 @@
 "/*"			{ WriteToken(Comment_attr);
 			  BEGIN(COMMENT);
 			}
-<COMMENT>[^\*\n]+	{ WriteToken(Comment_attr); }
-<COMMENT>"*"+[^\*/\n]*	{ WriteToken(Comment_attr); }
+<COMMENT>[^\*\r\n]+	{ WriteToken(Comment_attr); }
+<COMMENT>"*"+[^\*/\r\n]*	{ WriteToken(Comment_attr); }
 <COMMENT>"*"+"*/"	{ WriteToken(Comment_attr);
 			  BEGIN(0);
 			}
Index: filters/dcl-filt.l
Prereq:  1.16 
--- vile-9.5g+/filters/dcl-filt.l	2005-09-04 21:10:12.000000000 +0000
+++ vile-9.5h/filters/dcl-filt.l	2006-05-21 19:50:19.000000000 +0000
@@ -3,7 +3,7 @@
 %{
 
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/dcl-filt.l,v 1.16 2005/09/04 21:10:12 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/dcl-filt.l,v 1.18 2006/05/21 19:50:19 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of DCL files.
  *
@@ -53,12 +53,12 @@
 LABELLINE	{LABEL}{BLANK}*:$
 LABELPLUS	{LABEL}{BLANK}*:{BLANK}+
 
-INLINECOMMENT	![^\n]*
-COMMENT		^({BLANK}*)($)?({BLANK}*)(![^\n]*)?
+INLINECOMMENT	![^\r\n]*
+COMMENT		^({BLANK}*)($)?({BLANK}*)(![^\r\n]*)?
 
 NUMBER		([[:digit:]]+)|(%[dD][[:digit:]]+)|(%[oO][0-7]+)|(%[xX][[:xdigit:]]+)
 
-STRING		\"([^"\n]|(""))*\"
+STRING		\"([^"\r\n]|(""))*\"
 
 %%
 
@@ -83,7 +83,7 @@
 
 <NORMAL>[\n]		{ handle_newline(); }
 
-<LITERAL>[^\n]+		{ handle_literal(yytext, yyleng); }
+<LITERAL>[^\r\n]+	{ handle_literal(yytext, yyleng); }
 <LITERAL>[\n]		{ ECHO; }
 
 %%
@@ -145,6 +145,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/def-filt.l
Prereq:  1.7 
--- vile-9.5g+/filters/def-filt.l	2005-09-04 21:10:12.000000000 +0000
+++ vile-9.5h/filters/def-filt.l	2006-05-21 19:50:19.000000000 +0000
@@ -1,6 +1,6 @@
 %{
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/def-filt.l,v 1.7 2005/09/04 21:10:12 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/def-filt.l,v 1.9 2006/05/21 19:50:19 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of M$ linker-definition
  * input text.
@@ -30,13 +30,14 @@
 {IDENT}			{ WriteToken(ci_keyword_attr(yytext)); }
 {STRING}		{ WriteToken(String_attr); }
 {NUMBER}		{ WriteToken(Number_attr); }
-";"[^\n]*		{ WriteToken(Comment_attr); }
+";"[^\r\n]*		{ WriteToken(Comment_attr); }
 
 %%
 
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/difffilt.l
Prereq:  1.6 
--- vile-9.5g+/filters/difffilt.l	2003-05-20 20:38:41.000000000 +0000
+++ vile-9.5h/filters/difffilt.l	2006-05-21 19:50:19.000000000 +0000
@@ -3,7 +3,7 @@
 %{
 
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/difffilt.l,v 1.6 2003/05/20 20:38:41 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/difffilt.l,v 1.7 2006/05/21 19:50:19 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of diff output
  */
@@ -48,6 +48,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/ecl-filt.l
Prereq:  1.5 
--- vile-9.5g+/filters/ecl-filt.l	2005-09-05 11:12:23.000000000 +0000
+++ vile-9.5h/filters/ecl-filt.l	2006-05-21 19:50:19.000000000 +0000
@@ -3,7 +3,7 @@
 %{
 
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/ecl-filt.l,v 1.5 2005/09/05 11:12:23 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/ecl-filt.l,v 1.6 2006/05/21 19:50:19 tom Exp $
  *
  * Filter to add vile "attribution" sequences to Prolog/ECLiPSe code
  *
@@ -55,6 +55,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/esqlfilt.l
Prereq:  1.14 
--- vile-9.5g+/filters/esqlfilt.l	2005-09-04 21:10:12.000000000 +0000
+++ vile-9.5h/filters/esqlfilt.l	2006-05-21 19:50:19.000000000 +0000
@@ -2,7 +2,7 @@
 
 %{
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/esqlfilt.l,v 1.14 2005/09/04 21:10:12 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/esqlfilt.l,v 1.16 2006/05/21 19:50:19 tom Exp $
  *
  * Filter to add vile "attribution" sequences to embedded SQL with C/C++.
  * - T.Dickey
@@ -67,7 +67,7 @@
 <COMMENT>"*"+[^*/]*	{ WriteToken(Comment_attr); }
 <COMMENT>"*"+"/"	{ WriteToken(Comment_attr); BEGIN(my_state); }
 
-<CODE,SQL>"//"[^\n]*	{ WriteToken(Comment_attr); }
+<CODE,SQL>"//"[^\r\n]*	{ WriteToken(Comment_attr); }
 
 <CODE,SQL>{STRINGS}	{ WriteToken(String_attr); }
 
@@ -164,6 +164,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/est-filt.l
Prereq:  1.4 
--- vile-9.5g+/filters/est-filt.l	2005-09-04 21:10:12.000000000 +0000
+++ vile-9.5h/filters/est-filt.l	2006-05-21 19:50:19.000000000 +0000
@@ -2,7 +2,7 @@
 
 %{
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/est-filt.l,v 1.4 2005/09/04 21:10:12 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/est-filt.l,v 1.6 2006/05/21 19:50:19 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of enscript
  * syntax-description files.
@@ -21,7 +21,7 @@
 %}
 
 SSTRING		\'(\\.|[^'\\])*\'
-DSTRING		\"((\\\")|[^"\n])*\"
+DSTRING		\"((\\\")|[^"\r\n])*\"
 
 KEYWORD		[[:alpha:]_][[:alnum:]_]*
 IDENT		\$[[:alnum:]_]+
@@ -37,7 +37,7 @@
 <CODE>"/*"			{ BeginQuote(NOTE, Comment_attr); }
 <NOTE>"*"[^/]			{ flt_bfr_append(yytext, yyleng); }
 <NOTE>\n			{ flt_bfr_append(yytext, yyleng); }
-<NOTE>[^*\n]			{ flt_bfr_append(yytext, yyleng); }
+<NOTE>[^*\r\n]			{ flt_bfr_append(yytext, yyleng); }
 <NOTE>"*/"			{ FinishQuote(CODE); }
 
 <CODE>{KEYWORD}			{ WriteToken(keyword_attr(yytext)); }
@@ -64,6 +64,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/fdl-filt.l
Prereq:  1.10 
--- vile-9.5g+/filters/fdl-filt.l	2005-09-04 21:10:12.000000000 +0000
+++ vile-9.5h/filters/fdl-filt.l	2006-05-21 19:50:19.000000000 +0000
@@ -2,7 +2,7 @@
 
 %{
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/fdl-filt.l,v 1.10 2005/09/04 21:10:12 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/fdl-filt.l,v 1.12 2006/05/21 19:50:19 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of fdl
  * input text.  This treats all of the text area as quoted, except for
@@ -25,7 +25,7 @@
 %}
 
 BLANK		[ \t]*
-REMAINDER	[^\n]*
+REMAINDER	[^\r\n]*
 
 KEYWORD		$[[:alpha:]_][[:alnum:]_]*
 
@@ -47,7 +47,7 @@
 			  BEGIN(INITIAL); }
 
 <TEXT>[_]+		{ WriteToken(Ident2_attr); }
-<TEXT>[^$_\n]+		{ WriteToken(String_attr); }
+<TEXT>[^$_\r\n]+	{ WriteToken(String_attr); }
 
 %%
 
@@ -69,6 +69,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/htmlfilt.l
Prereq:  1.36 
--- vile-9.5g+/filters/htmlfilt.l	2006-02-14 00:58:42.000000000 +0000
+++ vile-9.5h/filters/htmlfilt.l	2006-05-21 19:50:19.000000000 +0000
@@ -2,7 +2,7 @@
 
 %{
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/htmlfilt.l,v 1.36 2006/02/14 00:58:42 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/htmlfilt.l,v 1.38 2006/05/21 19:50:19 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of HTML input
  * text.
@@ -66,8 +66,8 @@
 
 <INITIAL>"<!--"		{ BeginQuote(HTMLNOTE, Comment_attr); }
 <HTMLNOTE>[\n]		{ flt_bfr_append(yytext, yyleng); }
-<HTMLNOTE>[^\n-]+	{ flt_bfr_append(yytext, yyleng); }
-<HTMLNOTE>[-]+[^-\>\n]*	{ flt_bfr_append(yytext, yyleng); }
+<HTMLNOTE>[^\r\n-]+	{ flt_bfr_append(yytext, yyleng); }
+<HTMLNOTE>[-]+[^-\>\r\n]*	{ flt_bfr_append(yytext, yyleng); }
 <HTMLNOTE>[-]+"->"	{ FinishQuote(INITIAL); }
 
 <INITIAL,HTMLCODE>{URI_REF}	|
@@ -86,13 +86,13 @@
 <JS_CODE>{IDENT}	{ WriteToken(keyword_attr(yytext)); }
 <JS_CODE>{STRINGS}	{ WriteToken(String_attr); }
 <JS_CODE>{INTEGER}	{ WriteToken(Number_attr); }
-<JS_CODE>"//"[^\n]*	{ WriteToken(Comment_attr); }
+<JS_CODE>"//"[^\r\n]*	{ WriteToken(Comment_attr); }
 
 <JS_CODE>"<"{SPACE}*(\/)?{IDENT}{SPACE}*">" { may_resume_html(yytext); }
 
 <JS_CODE>"/*"		{ BeginQuote(JS_NOTE, Comment_attr); }
 <JS_NOTE>\n		{ flt_bfr_append(yytext, yyleng); }
-<JS_NOTE>[^*\n]+	{ flt_bfr_append(yytext, yyleng); }
+<JS_NOTE>[^*\r\n]+	{ flt_bfr_append(yytext, yyleng); }
 <JS_NOTE>[*]+[^*/]*	{ flt_bfr_append(yytext, yyleng); }
 <JS_NOTE>[*]+"/"	{ FinishQuote(JS_CODE); }
 
@@ -149,6 +149,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/imakeflt.l
Prereq:  1.14 
--- vile-9.5g+/filters/imakeflt.l	2005-09-05 10:35:35.000000000 +0000
+++ vile-9.5h/filters/imakeflt.l	2006-05-21 19:50:19.000000000 +0000
@@ -6,7 +6,7 @@
 %{
 
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/imakeflt.l,v 1.14 2005/09/05 10:35:35 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/imakeflt.l,v 1.16 2006/05/21 19:50:19 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of Imakefile
  *
@@ -70,7 +70,7 @@
 <NORMAL>\"			{ BeginQuote(QUOTE2, String_attr); }
 
 <NORMAL>"#"			{ BeginQuote(COMMENT, Comment_attr); }
-<COMMENT>(\\.|\\\n|[^\n])*	{ flt_bfr_append(yytext, yyleng); }
+<COMMENT>(\\.|\\\n|[^\r\n])*	{ flt_bfr_append(yytext, yyleng); }
 <COMMENT>\n			{ FinishQuote(NORMAL); }
 
 <QUOTE1,QUOTE2>{MACRO}		{ flt_bfr_embed(yytext, yyleng, Ident2_attr); }
@@ -78,17 +78,17 @@
 				  flt_bfr_embed(yytext, yyleng, Error_attr); }
 <QUOTE1,QUOTE2>\\\n		{ flt_bfr_append(yytext, yyleng); }
 
-<QUOTE1>(\\.|[^\n\'])		{ flt_bfr_append(yytext, yyleng); }
+<QUOTE1>(\\.|[^\r\n\'])		{ flt_bfr_append(yytext, yyleng); }
 <QUOTE1>\'			{ FinishQuote(NORMAL); }
 
-<QUOTE2>(\\.|[^\n\"])		{ flt_bfr_append(yytext, yyleng); }
+<QUOTE2>(\\.|[^\r\n\"])		{ flt_bfr_append(yytext, yyleng); }
 <QUOTE2>\"			{ FinishQuote(NORMAL); }
 
 <QUOTE1,QUOTE2>[\n]		{ missing_quote(yytext, yyleng); }
 
 <NORMAL>\\[/]			{ WriteToken(String_attr); }
 <NORMAL>"/*"			{ BeginQuote(CCOMMENT, Comment_attr); }
-<CCOMMENT>("*"[^/]|\n|[^*\n])*	{ flt_bfr_append(yytext, yyleng); }
+<CCOMMENT>("*"[^/]|\n|[^*\r\n])*	{ flt_bfr_append(yytext, yyleng); }
 <CCOMMENT>"*/"			{ FinishQuote(NORMAL); }
 
 <NORMAL>^{SPACE}*#{SPACE}*{NAME} { if (!preprocessor(yytext, yyleng)) {
@@ -338,6 +338,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/infofilt.l
Prereq:  1.6 
--- vile-9.5g+/filters/infofilt.l	2006-04-02 16:49:54.000000000 +0000
+++ vile-9.5h/filters/infofilt.l	2006-05-21 19:50:19.000000000 +0000
@@ -5,7 +5,7 @@
 %{
 
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/infofilt.l,v 1.6 2006/04/02 16:49:54 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/infofilt.l,v 1.8 2006/05/21 19:50:19 tom Exp $
  *
  * Filter to add vile "attribution" sequences to an info file.
  * (An extension of "text" mode).
@@ -26,7 +26,7 @@
 
 %}
 
-COMMENT		^-[-]+[ \t]+[^\n]+\n
+COMMENT		^-[-]+[ \t]+[^\r\n]+\n
 
 KEYWORD		([[:alpha:]_][[:alnum:]_.]*|[[:upper:]][+/&][[:upper:]])
 
@@ -94,6 +94,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/ini-filt.l
Prereq:  1.4 
--- vile-9.5g+/filters/ini-filt.l	2005-09-04 21:15:43.000000000 +0000
+++ vile-9.5h/filters/ini-filt.l	2006-05-21 19:50:19.000000000 +0000
@@ -2,7 +2,7 @@
 
 %{
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/ini-filt.l,v 1.4 2005/09/04 21:15:43 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/ini-filt.l,v 1.6 2006/05/21 19:50:19 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of M$ ini-definition
  * input text.
@@ -46,8 +46,8 @@
 <NORMAL,VALUE>{NUMBER}	{ WriteToken(Number_attr); }
 <VALUE>[\n]		{ ECHO; BEGIN(NORMAL); }
 
-<NORMAL>"//"[^\n]*	{ WriteToken(Comment_attr); }
-<NORMAL>";"[^\n]*	{ WriteToken(Comment_attr); }
+<NORMAL>"//"[^\r\n]*	{ WriteToken(Comment_attr); }
+<NORMAL>";"[^\r\n]*	{ WriteToken(Comment_attr); }
 
 <NORMAL>"/*"		{ BeginQuote(COMMENT, Comment_attr); }
 <COMMENT>[^*]*		{ flt_bfr_append(yytext, yyleng); }
@@ -59,6 +59,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/iss-filt.l
Prereq:  1.4 
--- vile-9.5g+/filters/iss-filt.l	2005-09-04 21:15:43.000000000 +0000
+++ vile-9.5h/filters/iss-filt.l	2006-05-21 19:50:19.000000000 +0000
@@ -2,7 +2,7 @@
 
 %{
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/iss-filt.l,v 1.4 2005/09/04 21:15:43 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/iss-filt.l,v 1.6 2006/05/21 19:50:19 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of Inno Setup
  * input text.
@@ -24,7 +24,7 @@
 
 IDENT		[[:alpha:]_][[:alnum:]_]*
 
-STRING		\'([^'\n]|(''))*\'
+STRING		\'([^'\r\n]|(''))*\'
 
 HEXADECIMAL	\$[[:xdigit:]_]+
 UNSIGNED	[[:digit:]]+
@@ -57,11 +57,11 @@
 <SETUP,VALUE>{NUMBER}	{ WriteToken(Number_attr); }
 <VALUE>[\n]		{ ECHO; BEGIN(SETUP); }
 
-<SETUP,FLAGS>"//"[^\n]*	{ WriteToken(Comment_attr); }
-<SETUP,FLAGS>^";"[^\n]*	{ WriteToken(Comment_attr); }
+<SETUP,FLAGS>"//"[^\r\n]*	{ WriteToken(Comment_attr); }
+<SETUP,FLAGS>^";"[^\r\n]*	{ WriteToken(Comment_attr); }
 
 <FLAGS>":"{BLANK}*	{ ECHO; BEGIN(OTHER); }
-<OTHER>[^;\n]+		{ WriteToken(String_attr); }
+<OTHER>[^;\r\n]+	{ WriteToken(String_attr); }
 <OTHER>";"		{ ECHO; BEGIN(FLAGS); }
 <OTHER>[\n]		{ ECHO; BEGIN(FLAGS); }
 
@@ -79,7 +79,7 @@
 <CMT_STANDARD>\n	|
 <CMT_STANDARD>.		{ flt_bfr_append(yytext, yyleng); }
 
-<CODE>"//"[^\n]*	{ WriteToken(Comment_attr); /* Delphi */ }
+<CODE>"//"[^\r\n]*	{ WriteToken(Comment_attr); /* Delphi */ }
 
 <CODE>.			{ ECHO; }
 
@@ -88,6 +88,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/key-filt.c
Prereq:  1.19 
--- vile-9.5g+/filters/key-filt.c	2004-12-10 00:26:40.000000000 +0000
+++ vile-9.5h/filters/key-filt.c	2006-05-21 19:47:18.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/key-filt.c,v 1.19 2004/12/10 00:26:40 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/key-filt.c,v 1.20 2006/05/21 19:47:18 tom Exp $
  *
  * Filter to add vile "attribution" sequences to a vile keyword file.  It's
  * done best in C because the delimiters may change as a result of processing
@@ -162,6 +162,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
@@ -172,6 +173,8 @@
 
     char *s, *t;
 
+    (void) input;
+
     /*
      * Unlike most filters, we make a copy of the attributes, since we will be
      * manipulating the class symbol table.
Index: filters/latexflt.l
Prereq:  1.41 
--- vile-9.5g+/filters/latexflt.l	2005-09-05 01:30:55.000000000 +0000
+++ vile-9.5h/filters/latexflt.l	2006-05-21 19:50:19.000000000 +0000
@@ -5,7 +5,7 @@
 
 %{
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/latexflt.l,v 1.41 2005/09/05 01:30:55 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/latexflt.l,v 1.43 2006/05/21 19:50:19 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of TeX or LaTeX
  * input text.
@@ -117,11 +117,11 @@
 			  write_keyword();
 			  pop_state();
 			 }
-<QUOTE_TT>[^\n]*		{ WriteToken(String_attr); }
+<QUOTE_TT>[^\r\n]*		{ WriteToken(String_attr); }
 
 <TEXT>\\"begin{verbatim}"	{ WriteToken(String_attr); push_state(VERBATIM); }
 <VERBATIM>\\"end{verbatim}"	{ WriteToken(String_attr); pop_state(); }
-<VERBATIM>[^\n]*		{ WriteToken(String_attr); }
+<VERBATIM>[^\r\n]*		{ WriteToken(String_attr); }
 
 <TEXT,MATH,MATHC,QUOTED>"|"	{ WriteToken(String_attr);
 			  if (braces != 0)
@@ -131,7 +131,7 @@
 			  else if (FLT_STATE != TEXT)
 			      push_state(QUOTED);
 			}
-<QUOTED>[^|\n]*		{ WriteToken(String_attr); }
+<QUOTED>[^|\r\n]*	{ WriteToken(String_attr); }
 
 \\{NAME}		{ write_keyword(); }
 
@@ -145,7 +145,7 @@
 			  if (braces == 0)
 			      push_state(MATH);
 			}
-<MATH>[^\$\n]+		{ write_text(Math_attr); }
+<MATH>[^\$\r\n]+	{ write_text(Math_attr); }
 <MATH>\$ 		{ write_text(Action_attr); pop_state(); }
 
 <TEXT>\$\$	 	{ WriteToken(Action_attr);
@@ -153,7 +153,7 @@
 			      push_state(MATHC);
 			}
 <MATHC>\\{NONNAME} 	{ flt_puts(yytext, yyleng, Number_attr); }
-<MATHC>[^#%{}\\\$/\n|]+	{ write_text(Math_c_attr); }
+<MATHC>[^#%{}\\\$/\r\n|]+	{ write_text(Math_c_attr); }
 <MATHC>\$\$		{ WriteToken(Action_attr);
 			  if (braces == 0)
 			      pop_state();
@@ -203,6 +203,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/lex-filt.l
Prereq:  1.58 
--- vile-9.5g+/filters/lex-filt.l	2006-01-09 23:41:53.000000000 +0000
+++ vile-9.5h/filters/lex-filt.l	2006-05-21 19:50:19.000000000 +0000
@@ -7,7 +7,7 @@
 
 %{
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/lex-filt.l,v 1.58 2006/01/09 23:41:53 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/lex-filt.l,v 1.60 2006/05/21 19:50:19 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of LEX program.
  */
@@ -58,7 +58,7 @@
 DSTRING		\"(\\.|[^"\\])*\"
 STRINGS		({SSTRING}|{DSTRING})
 
-ESCAPED		(\\[^\n\r])
+ESCAPED		(\\[^\r\n])
 
 UNQUOTED0	([^{}"\\[\][:space:]<>])
 UNQUOTED1	([^{}"\\[\][:space:]])
@@ -67,8 +67,8 @@
 
 CCLASS		("[:"{IDENT}":]")
 
-RANGE0		(\^[^\n\r])
-RANGE1		([^\n\r\]]|{CCLASS}|{ESCAPED})
+RANGE0		(\^[^\r\n])
+RANGE1		([^\r\n\]]|{CCLASS}|{ESCAPED})
 RANGE		("["{RANGE0}?{RANGE1}*"]")
 
 LIMITED		([[:digit:]]+([,][[:digit:]]+)*)
@@ -119,7 +119,7 @@
 			  WriteToken(attr);
 			}
 <STATES>{SPACE}		{ ECHO; }
-<STATES>[^\n[:blank:]]	{ WriteToken(Error_attr);
+<STATES>[^\r\n[:blank:]]	{ WriteToken(Error_attr);
 			  flt_error("Expected newline or blanks");
 			}
 <STATES>[\n]		{ ECHO; set_state(); }
@@ -141,12 +141,12 @@
 			  }
 			  new_state(RULE1);
 			}
-<RULES>"//"[^\n]*	{ WriteToken(Comment_attr); }
+<RULES>"//"[^\r\n]*	{ WriteToken(Comment_attr); }
 <RULES>"/*"		{ PushQuote(COMMENT, Comment_attr); }
 
 <RULE1>{SPACE}+		{ ECHO; new_state(RULEX); }
 <RULEX>{PATTERNS}	{ write_patterns(yytext, yyleng); new_state(RULER); }
-<RULER>[^\n]*		{ WriteToken(Error_attr);
+<RULER>[^\r\n]*		{ WriteToken(Error_attr);
 			  flt_error("Expected newline");
 			}
 <RULER>[\n]		{ ECHO; new_state(RULES); }
@@ -156,7 +156,7 @@
 <ACTIONS>^{STATES}	{ write_states(yytext, yyleng); new_state(ACTION1); }
 <ACTIONS>^{PATTERN}	{ write_patterns(yytext, yyleng); new_state(ACTION2); }
 
-<ACTION0>"//"[^\n]*	{ WriteToken(Comment_attr); }
+<ACTION0>"//"[^\r\n]*	{ WriteToken(Comment_attr); }
 <ACTION0>^{SPACE}+	{ ECHO; }
 <ACTION0>{STATES}	{ write_states(yytext, yyleng); new_state(ACTION1); }
 <ACTION0>"/*"		{ PushQuote(COMMENT, Comment_attr); }
@@ -172,7 +172,7 @@
 <ACTION2>[\n]		{ ECHO; end_action(); }
 
 <ACTION3>{IDENT}	{ WriteToken(keyword_attr(yytext)); new_state(CODE1); }
-<ACTION3>"//"[^\n]*	{ WriteToken(Comment_attr); }
+<ACTION3>"//"[^\r\n]*	{ WriteToken(Comment_attr); }
 <ACTION3>"/*"		{ PushQuote(COMMENT, Comment_attr); }
 <ACTION3>\{		{ ECHO; nesting = 1; new_state(CODE); }
 <ACTION3>[\n]		{ ECHO; end_action(); }
@@ -184,7 +184,7 @@
 <CODE,CODE1>\{		{ ECHO; nesting++; }
 <CODE,CODE1>\}		{ ECHO; if (--nesting <= 0) { nesting = 0; set_rules(); } }
 
-<CODE,CODE1>"//"[^\n]*	{ WriteToken(Comment_attr); }
+<CODE,CODE1>"//"[^\r\n]*	{ WriteToken(Comment_attr); }
 <CODE,CODE1>"/*"	{ PushQuote(COMMENT, Comment_attr); }
 <COMMENT>[^*]*		{ flt_bfr_append(yytext, yyleng); }
 <COMMENT>"*"+[^*/]*	{ flt_bfr_append(yytext, yyleng); }
@@ -396,6 +396,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/lispfilt.l
Prereq:  1.11 
--- vile-9.5g+/filters/lispfilt.l	2005-09-04 20:36:24.000000000 +0000
+++ vile-9.5h/filters/lispfilt.l	2006-05-21 19:50:19.000000000 +0000
@@ -2,7 +2,7 @@
 
 %{
 /*
- * $Id: lispfilt.l,v 1.11 2005/09/04 20:36:24 tom Exp $
+ * $Id: lispfilt.l,v 1.13 2006/05/21 19:50:19 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of lisp code.
  *
@@ -47,7 +47,7 @@
 
 NUMBER		{INTEGER}|{RATIO}|{FLOAT}
 
-COMMENT		;[^\n]*
+COMMENT		;[^\r\n]*
 IDENT		[^[:space:]\"\(\)|]+
 
 LPAREN		\(
@@ -58,7 +58,7 @@
 <NORMAL>#\|		{ BeginQuote(COMMENT, Comment_attr); }
 <COMMENT>\|#		{ FinishQuote(NORMAL); }
 <COMMENT>[\n]		{ flt_bfr_append(yytext, yyleng); }
-<COMMENT>[^\n]		{ flt_bfr_append(yytext, yyleng); }
+<COMMENT>[^\r\n]	{ flt_bfr_append(yytext, yyleng); }
 
 <NORMAL>{COMMENT}	{ WriteToken(Comment_attr); }
 
@@ -95,6 +95,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/lua-filt.l
Prereq:  1.3 
--- vile-9.5g+/filters/lua-filt.l	2006-04-02 15:43:00.000000000 +0000
+++ vile-9.5h/filters/lua-filt.l	2006-05-21 19:50:19.000000000 +0000
@@ -2,7 +2,7 @@
 
 %{
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/lua-filt.l,v 1.3 2006/04/02 15:43:00 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/lua-filt.l,v 1.5 2006/05/21 19:50:19 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of lua
  * input text.
@@ -45,7 +45,7 @@
 <LONG_CMT>[^[=\]]+	{ WriteToken(Comment_attr); }
 <LONG_CMT>.		{ WriteToken(Comment_attr); }
 
-<INITIAL>"--"[^\n]*	{ WriteToken(Comment_attr); }
+<INITIAL>"--"[^\r\n]*	{ WriteToken(Comment_attr); }
 
 <INITIAL>{LONG_L}	{ WriteToken(String_attr); push_state(LONG_STR); long_str = yyleng; }
 <LONG_STR>{LONG_R}	{ WriteToken(String_attr); if (yyleng == long_str) pop_state(); }
@@ -57,6 +57,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/m4-filt.c
Prereq:  1.25 
--- vile-9.5g+/filters/m4-filt.c	2005-01-19 22:07:00.000000000 +0000
+++ vile-9.5h/filters/m4-filt.c	2006-05-21 19:47:35.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/m4-filt.c,v 1.25 2005/01/19 22:07:00 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/m4-filt.c,v 1.27 2006/05/21 19:47:35 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of m4
  * input text.  This is in C rather than LEX because M4's quoting delimiters
@@ -349,27 +349,35 @@
     static unsigned have;
     static unsigned used;
 
-    unsigned c_length = has_endofliteral(s, literal);
-    unsigned need = c_length;
+    char *result = s;
 
-    if (*literal == 0) {
-	if (need > rightquote.used) {
-	    need -= rightquote.used;
+    if (s != 0) {
+	unsigned c_length = has_endofliteral(s, literal);
+	unsigned need = c_length;
+
+	if (*literal == 0) {
+	    if (need > rightquote.used) {
+		need -= rightquote.used;
+		buffer = do_alloc(buffer, used + need + 1, &have);
+		strncpy(buffer + used, s, need);
+		used += need;
+	    }
+	    if (used) {
+		flt_puts(buffer, used, Literal_attr);
+		used = 0;
+	    }
+	    write_quote(rightquote);
+	} else {
 	    buffer = do_alloc(buffer, used + need + 1, &have);
 	    strncpy(buffer + used, s, need);
 	    used += need;
 	}
-	if (used) {
-	    flt_puts(buffer, used, Literal_attr);
-	    used = 0;
-	}
-	write_quote(rightquote);
-    } else {
-	buffer = do_alloc(buffer, used + need + 1, &have);
-	strncpy(buffer + used, s, need);
-	used += need;
+	result += c_length;
+    } else if (used) {
+	flt_puts(buffer, used, Error_attr);
+	used = 0;
     }
-    return s + c_length;
+    return result;
 }
 
 static char *
@@ -401,6 +409,8 @@
     char **args;
     int literal, comment, parens;
 
+    (void) input;
+
     new_quote(&leftquote, class_attr(NAME_L_QUOTE));
     new_quote(&rightquote, class_attr(NAME_R_QUOTE));
     new_quote(&leftcmt, class_attr(NAME_L_CMT));
@@ -433,7 +443,7 @@
 		literal++;
 		s = write_literal(s, &literal);
 	    } else if (isQuote(s, rightquote)) {
-		flt_error("unexpected quote");
+		flt_error("unexpected right-quote");
 		wrong_quote(rightquote);
 		s += rightquote.used;
 		if (--literal > 0)
@@ -463,4 +473,8 @@
 	    }
 	}
     }
+    if (literal) {
+	flt_error("missing right-quote");
+	(void) write_literal(0, &literal);
+    }
 }
Index: filters/mailfilt.l
Prereq:  1.19 
--- vile-9.5g+/filters/mailfilt.l	2006-04-02 16:49:54.000000000 +0000
+++ vile-9.5h/filters/mailfilt.l	2006-05-21 19:50:19.000000000 +0000
@@ -5,7 +5,7 @@
 %{
 
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/mailfilt.l,v 1.19 2006/04/02 16:49:54 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/mailfilt.l,v 1.20 2006/05/21 19:50:19 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of mail
  */
@@ -59,6 +59,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/makefilt.l
Prereq:  1.52 
--- vile-9.5g+/filters/makefilt.l	2005-09-05 01:32:51.000000000 +0000
+++ vile-9.5h/filters/makefilt.l	2006-05-21 19:50:19.000000000 +0000
@@ -6,7 +6,7 @@
 %{
 
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/makefilt.l,v 1.52 2005/09/05 01:32:51 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/makefilt.l,v 1.54 2006/05/21 19:50:19 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of Makefile
  *
@@ -75,7 +75,7 @@
 <NORMAL>\"			{ BeginQuote(QUOTE2, String_attr); }
 
 <NORMAL>"#"			{ BeginQuote(COMMENT, Comment_attr); }
-<COMMENT>(\\.|\\\n|[^\n])*	{ flt_bfr_append(yytext, yyleng); }
+<COMMENT>(\\.|\\\n|[^\r\n])*	{ flt_bfr_append(yytext, yyleng); }
 <COMMENT>\n			{ FinishQuote(NORMAL); }
 
 <QUOTE1,QUOTE2>{MACRO}		{ flt_bfr_embed(yytext, yyleng, Ident2_attr); }
@@ -83,10 +83,10 @@
 				  flt_bfr_embed(yytext, yyleng, Error_attr); }
 <QUOTE1,QUOTE2>\\\n		{ flt_bfr_append(yytext, yyleng); }
 
-<QUOTE1>(\\.|[^\n\'])		{ flt_bfr_append(yytext, yyleng); }
+<QUOTE1>(\\.|[^\r\n\'])		{ flt_bfr_append(yytext, yyleng); }
 <QUOTE1>\'			{ FinishQuote(NORMAL); }
 
-<QUOTE2>(\\.|[^\n\"])		{ flt_bfr_append(yytext, yyleng); }
+<QUOTE2>(\\.|[^\r\n\"])		{ flt_bfr_append(yytext, yyleng); }
 <QUOTE2>\"			{ FinishQuote(NORMAL); }
 
 <QUOTE1,QUOTE2>[\n]		{ missing_quote(yytext, yyleng); }
@@ -271,6 +271,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/midlfilt.l
Prereq:  1.2 
--- vile-9.5g+/filters/midlfilt.l	2005-09-05 00:48:14.000000000 +0000
+++ vile-9.5h/filters/midlfilt.l	2006-05-21 19:50:19.000000000 +0000
@@ -2,7 +2,7 @@
 
 %{
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/midlfilt.l,v 1.2 2005/09/05 00:48:14 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/midlfilt.l,v 1.4 2006/05/21 19:50:19 tom Exp $
  *
  * Filter to add vile "attribution" sequences to MIDL / ODL files.
  * - T.Dickey
@@ -38,7 +38,7 @@
 <COMMENT>"*"+[^*/]*	{ WriteToken(Comment_attr); }
 <COMMENT>"*"+"/"	{ WriteToken(Comment_attr); BEGIN(CODE); }
 
-<CODE>"//"[^\n]*	{ WriteToken(Comment_attr); }
+<CODE>"//"[^\r\n]*	{ WriteToken(Comment_attr); }
 
 <CODE>{STRINGS}		{ WriteToken(String_attr); }
 
@@ -54,6 +54,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/mms-filt.l
Prereq:  1.12 
--- vile-9.5g+/filters/mms-filt.l	2005-09-05 01:37:56.000000000 +0000
+++ vile-9.5h/filters/mms-filt.l	2006-05-21 19:50:19.000000000 +0000
@@ -4,7 +4,7 @@
 %{
 
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/mms-filt.l,v 1.12 2005/09/05 01:37:56 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/mms-filt.l,v 1.14 2006/05/21 19:50:19 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of VMS mms script
  * - T.Dickey
@@ -62,8 +62,8 @@
 IDENT		[$[:alpha:]_][$[:alnum:]_]*
 PARAM		'{IDENT}
 
-INLINECOMMENT	![^\n]*
-COMMENT		"#"[^\n]*
+INLINECOMMENT	![^\r\n]*
+COMMENT		"#"[^\r\n]*
 
 %%
 
@@ -90,6 +90,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/nr-filt.l
Prereq:  1.18 
--- vile-9.5g+/filters/nr-filt.l	2006-01-09 19:04:36.000000000 +0000
+++ vile-9.5h/filters/nr-filt.l	2006-05-21 19:50:19.000000000 +0000
@@ -1,7 +1,7 @@
 %{
 
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/nr-filt.l,v 1.18 2006/01/09 19:04:36 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/nr-filt.l,v 1.20 2006/05/21 19:50:19 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of NROFF
  */
@@ -41,7 +41,7 @@
 
 %}
 
-COMMAND		^(\.[[:blank:]]*[[:alnum:]]+([ \t][^\n]+)?|'\\\"[^\n]+)
+COMMAND		^(\.[[:blank:]]*[[:alnum:]]+([ \t][^\r\n]+)?|'\\\"[^\r\n]+)
 COMMENT		^\.[[:blank:]]*\\\"
 
 ENIT		\\[e *\n\\+-]
@@ -52,18 +52,19 @@
 
 {COMMAND}			{ write_cmd(yytext, yyleng); }
 
-{FONT}([^\\\n]|{ENIT})+(\\f[^PR1]|\n)	{ WriteToken(Action_attr); /* err? */ }
-{FONT}([^\\\n]|{ENIT})+\\f[PR1]	{ write_font(yytext, yyleng); }
+{FONT}([^\\\r\n]|{ENIT})+(\\f[^PR1]|\n)	{ WriteToken(Action_attr); /* err? */ }
+{FONT}([^\\\r\n]|{ENIT})+\\f[PR1]	{ write_font(yytext, yyleng); }
 {ENIT}				{ WriteToken(Ident2_attr); }
 \\[s][+-]?[[:digit:]]+		{ WriteToken(Ident2_attr); }
 
-{COMMENT}[^\n]*			{ WriteToken(Comment_attr); }
+{COMMENT}[^\r\n]*		{ WriteToken(Comment_attr); }
 
 %%
 
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/pas-filt.l
Prereq:  1.3 
--- vile-9.5g+/filters/pas-filt.l	2005-09-04 21:15:43.000000000 +0000
+++ vile-9.5h/filters/pas-filt.l	2006-05-21 19:50:19.000000000 +0000
@@ -2,7 +2,7 @@
 
 %{
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/pas-filt.l,v 1.3 2005/09/04 21:15:43 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/pas-filt.l,v 1.5 2006/05/21 19:50:19 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of Pascal
  * input text.  A few TurboC and Delphi extensions are recognized:
@@ -29,7 +29,7 @@
 IDENT		[[:alpha:]_][[:alnum:]_]*
 
 CHARACTER	"#"{UNSIGNED}
-STRING		\'([^'\n]|(''))*\'
+STRING		\'([^'\r\n]|(''))*\'
 
 NUMBER		{HEXADECIMAL}|{INTEGER}|{REAL}
 
@@ -50,7 +50,7 @@
 <CMT_STANDARD>\n	|
 <CMT_STANDARD>.		{ flt_bfr_append(yytext, yyleng); }
 
-<NORMAL>"//"[^\n]*	{ WriteToken(Comment_attr); /* Delphi */ }
+<NORMAL>"//"[^\r\n]*	{ WriteToken(Comment_attr); /* Delphi */ }
 
 <NORMAL>.		{ ECHO; }
 
@@ -59,6 +59,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/perlfilt.l
Prereq:  1.43 
--- vile-9.5g+/filters/perlfilt.l	2005-09-05 13:38:18.000000000 +0000
+++ vile-9.5h/filters/perlfilt.l	2006-05-21 19:50:19.000000000 +0000
@@ -2,7 +2,7 @@
 
 %{
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/perlfilt.l,v 1.43 2005/09/05 13:38:18 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/perlfilt.l,v 1.45 2006/05/21 19:50:19 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of PERL input
  * text.
@@ -80,11 +80,11 @@
 			    }
 			}
 <HERE>\\.		|
-<HERE>[^\n]		{ flt_bfr_append(yytext, yyleng); }
+<HERE>[^\r\n]		{ flt_bfr_append(yytext, yyleng); }
 <HERE>\n		{ flt_bfr_append(yytext, yyleng); }
 
 <CODE>[!=]"~"{BLANK}	{ WriteToken(""); BEGIN(PATTERN); }
-<PATTERN>[^\n]		{ if (!add_to_pattern(yytext)) { end_pattern(); ECHO; } }
+<PATTERN>[^\r\n]	{ if (!add_to_pattern(yytext)) { end_pattern(); ECHO; } }
 <PATTERN>[\n]		{ end_pattern(); ECHO; }
 
 <CODE>^{BLANK}*#!.*$	{ WriteToken(Preproc_attr); }
@@ -102,7 +102,7 @@
 <CODE>{ESCAPED}		|
 <CODE>{STRINGS}		{ WriteToken(String_attr); }
 
-<IGNORED>[^\n]*		{ WriteToken(Comment_attr); }
+<IGNORED>[^\r\n]*	{ WriteToken(Comment_attr); }
 
 <CODE>\n\n=[[:lower:]].* {
 			    flt_puts("\n\n", 2, "");
@@ -183,6 +183,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/php-filt.l
Prereq:  1.4 
--- vile-9.5g+/filters/php-filt.l	2005-09-04 20:37:43.000000000 +0000
+++ vile-9.5h/filters/php-filt.l	2006-05-21 19:50:19.000000000 +0000
@@ -2,7 +2,7 @@
 
 %{
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/php-filt.l,v 1.4 2005/09/04 20:37:43 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/php-filt.l,v 1.6 2006/05/21 19:50:19 tom Exp $
  *
  * Filter to add vile "attribution" sequences to PHP scripts.
  * - T.Dickey
@@ -48,7 +48,7 @@
 <COMMENT>"*"+[^*/]*	{ WriteToken(Comment_attr); }
 <COMMENT>"*"+"/"	{ WriteToken(Comment_attr); BEGIN(CODE); }
 
-<CODE>"//"[^\n]*	{ WriteToken(Comment_attr); }
+<CODE>"//"[^\r\n]*	{ WriteToken(Comment_attr); }
 
 <CODE>{STRINGS}		{ WriteToken(String_attr); }
 
@@ -59,6 +59,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/pl-filt.c
Prereq:  1.82 
--- vile-9.5g+/filters/pl-filt.c	2005-07-11 22:35:34.000000000 +0000
+++ vile-9.5h/filters/pl-filt.c	2006-05-21 19:47:50.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/pl-filt.c,v 1.82 2005/07/11 22:35:34 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/pl-filt.c,v 1.83 2006/05/21 19:47:50 tom Exp $
  *
  * Filter to add vile "attribution" sequences to perl scripts.  This is a
  * translation into C of an earlier version written for LEX/FLEX.
@@ -1154,6 +1154,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 #define opRightArrow() (had_op != 0 && old_op == had_op - 1 && *old_op == '-' && *had_op == '>')
@@ -1187,6 +1188,8 @@
     unsigned actual = 0;
     unsigned mark_len = 0;
 
+    (void) input;
+
     Action_attr = class_attr(NAME_ACTION);
     Comment_attr = class_attr(NAME_COMMENT);
     Error_attr = class_attr(NAME_ERROR);
Index: filters/pot-filt.l
Prereq:  1.5 
--- vile-9.5g+/filters/pot-filt.l	2006-01-09 20:24:38.000000000 +0000
+++ vile-9.5h/filters/pot-filt.l	2006-05-21 19:50:19.000000000 +0000
@@ -2,7 +2,7 @@
 
 %{
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/pot-filt.l,v 1.5 2006/01/09 20:24:38 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/pot-filt.l,v 1.7 2006/05/21 19:50:19 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of gettext files.
  */
@@ -34,8 +34,8 @@
 %%
 
 <NORMAL>{IDENT}		{ WriteToken(keyword_attr(yytext)); }
-<NORMAL>"#:"[^\n]*	{ WriteToken(Prepro_attr); }
-<NORMAL>"#"[^\n]*	{ WriteToken(Comment_attr); }
+<NORMAL>"#:"[^\r\n]*	{ WriteToken(Prepro_attr); }
+<NORMAL>"#"[^\r\n]*	{ WriteToken(Comment_attr); }
 <NORMAL>{INTEGER}	{ WriteToken(Number_attr); }
 
 <NORMAL>\\.		|
@@ -44,11 +44,11 @@
 
 <QUOTED>\\.		{ flt_bfr_embed(yytext, yyleng, Action_attr); }
 <QUOTED>{FORMAT}	{ flt_bfr_embed(yytext, yyleng, Number_attr); }
-<QUOTED>[^%\n"\\]+	{ flt_bfr_append(yytext, yyleng); }
+<QUOTED>[^%\r\n"\\]+	{ flt_bfr_append(yytext, yyleng); }
 <QUOTED>"%%"		{ flt_bfr_append(yytext, yyleng); }
 <QUOTED>"%"		{ flt_error("unexpected '%%'");
 			  flt_bfr_embed(yytext, yyleng, Error_attr); }
-<QUOTED>[\n]		{ flt_bfr_append(yytext, yyleng); }
+<QUOTED>[\r\n]		{ flt_bfr_append(yytext, yyleng); }
 <QUOTED>"\""		{ FinishQuote(NORMAL); }
 
 %%
@@ -56,6 +56,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/ps-filt.l
Prereq:  1.7 
--- vile-9.5g+/filters/ps-filt.l	2005-09-05 11:03:11.000000000 +0000
+++ vile-9.5h/filters/ps-filt.l	2006-05-21 19:50:19.000000000 +0000
@@ -4,7 +4,7 @@
 
 %{
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/ps-filt.l,v 1.7 2005/09/05 11:03:11 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/ps-filt.l,v 1.9 2006/05/21 19:50:19 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of PostScript
  * files.
@@ -40,7 +40,7 @@
 
 <NORMAL>{IDENT}		{ WriteToken(keyword_attr(yytext)); }
 
-<NORMAL>"%"[^\n]*	{ WriteToken(Comment_attr); }
+<NORMAL>"%"[^\r\n]*	{ WriteToken(Comment_attr); }
 
 <NORMAL>{ACTION}	{ WriteToken(Action_attr); }
 
@@ -67,6 +67,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/py-filt.l
Prereq:  1.12 
--- vile-9.5g+/filters/py-filt.l	2005-09-04 21:15:43.000000000 +0000
+++ vile-9.5h/filters/py-filt.l	2006-05-21 19:50:19.000000000 +0000
@@ -3,7 +3,7 @@
 %{
 
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/py-filt.l,v 1.12 2005/09/04 21:15:43 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/py-filt.l,v 1.13 2006/05/21 19:50:19 tom Exp $
  *
  * Filter to add vile "attribution" sequences to a Python script
  */
@@ -61,6 +61,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/py.key
Prereq:  1.1 
--- vile-9.5g+/filters/py.key	1999-10-11 01:25:51.000000000 +0000
+++ vile-9.5h/filters/py.key	2006-04-05 15:55:37.000000000 +0000
@@ -1,7 +1,7 @@
-: $Id: py.key,v 1.1 1999/10/11 01:25:51 tom Exp $
-Ident:BC4
-access
+: $Id: py.key,v 1.3 2006/04/05 15:55:37 tom Exp $
+: reference: Python in a Nutshell - Alex Martelli - O'Reilly - 2003
 and
+assert
 break
 class
 continue
@@ -28,4 +28,161 @@
 return
 try
 while
+yield
+:
 self:Ident2
+:
+access
+:
+:: built-in types and methods
+.default Ident2
+Ellipsis
+None
+NotImplemented
+__import__
+abs
+apply
+buffer
+callable
+chr
+classmethod
+cmp
+coerce
+compile
+complex
+delattr
+dict
+dir
+divmod
+eval
+execfile
+file
+filter
+float
+getattr
+globals
+hasattr
+hash
+hex
+id
+input
+int
+intern
+isinstance
+issubclass
+iter
+len
+list
+locals
+long
+map
+max
+min
+object
+oct
+open
+ord
+pow
+property
+range
+raw_input
+reduce
+reload
+repr
+round
+setattr
+slice
+staticmethod
+str
+super
+tuple
+type
+unichr
+unicode
+vars
+xrange
+zip
+:
+:: built-in exceptions
+.default Action
+ArithmeticError
+AssertionError
+AttributeError
+DeprecationWarning
+EOFError
+EnvironmentError
+Exception
+FloatingPointError
+IOError
+ImportError
+IndentationError
+IndexError
+KeyError
+KeyboardInterrupt
+LookupError
+MemoryError
+NameError
+NotImplementedError
+OSError
+OverflowError
+OverflowWarning
+ReferenceError
+RuntimeError
+RuntimeWarning
+StandardError
+StopIteration
+SyntaxError
+SyntaxWarning
+SystemError
+SystemExit
+TabError
+TypeError
+UnboundLocalError
+UnicodeError
+UserWarning
+ValueError
+Warning
+WindowsError
+ZeroDivisionError
+:
+: or should these be Ident?
+.default Preproc
+__name__
+__doc__
+__future__
+:
+: classes
+: general-purpose special methods
+__call__
+__cmp__
+__del__
+__delattr__
+__eq__
+__ge__
+__getattr__
+__getattribute__
+__gt__
+__hash__
+__init__
+__le__
+__lt__
+__ne__
+__new__
+__nonzero__
+__repr__
+__setattr__
+__str__
+__unicode__
+:
+: container methods
+__contains__
+__delitem__
+__getitem__
+__iter__
+__len__
+__setitem__
+:
+__slots__
+:
+__class__
+__dict__
Index: filters/rb-filt.l
Prereq:  1.14 
--- vile-9.5g+/filters/rb-filt.l	2005-09-05 01:38:39.000000000 +0000
+++ vile-9.5h/filters/rb-filt.l	2006-05-21 19:50:19.000000000 +0000
@@ -5,7 +5,7 @@
 %{
 
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/rb-filt.l,v 1.14 2005/09/05 01:38:39 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/rb-filt.l,v 1.15 2006/05/21 19:50:19 tom Exp $
  *
  * Filter to add vile "attribution" sequences to a Ruby script
  * based on the Python filter.
@@ -194,6 +194,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/rc-filt.l
Prereq:  1.6 
--- vile-9.5g+/filters/rc-filt.l	2005-09-04 21:15:43.000000000 +0000
+++ vile-9.5h/filters/rc-filt.l	2006-05-21 19:50:19.000000000 +0000
@@ -2,7 +2,7 @@
 
 %{
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/rc-filt.l,v 1.6 2005/09/04 21:15:43 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/rc-filt.l,v 1.8 2006/05/21 19:50:19 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of Windows
  * resource files.
@@ -50,13 +50,14 @@
 {STRING}		{ WriteToken(String_attr); }
 {NUMBER}		{ WriteToken(Number_attr); }
 
-"//"[^\n]*		{ WriteToken(Comment_attr); }
+"//"[^\r\n]*		{ WriteToken(Comment_attr); }
 
 %%
 
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/rcs-filt.l
Prereq:  1.9 
--- vile-9.5g+/filters/rcs-filt.l	2005-09-04 21:15:43.000000000 +0000
+++ vile-9.5h/filters/rcs-filt.l	2006-05-21 19:50:19.000000000 +0000
@@ -3,7 +3,7 @@
 %{
 
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/rcs-filt.l,v 1.9 2005/09/04 21:15:43 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/rcs-filt.l,v 1.11 2006/05/21 19:50:19 tom Exp $
  *
  * Filter to add vile "attribution" sequences to RCS archives.
  */
@@ -30,7 +30,7 @@
 <INITIAL>{NAME}		{ WriteToken(keyword_attr(yytext)); }
 <INITIAL>{NUMBER}	{ WriteToken(Number_attr); }
 <INITIAL>"@"		{ add_to_quoted(yytext, yyleng); BEGIN(QUOTED); }
-<QUOTED>[^@\n]*		{ add_to_quoted(yytext, yyleng); }
+<QUOTED>[^@\r\n]*	{ add_to_quoted(yytext, yyleng); }
 <QUOTED>@		{ add_to_quoted(yytext, yyleng); flush_quoted(); BEGIN(INITIAL); }
 <QUOTED>[\n]		{ flush_quoted(); ECHO; }
 
@@ -107,6 +107,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/rexxfilt.l
Prereq:  1.8 
--- vile-9.5g+/filters/rexxfilt.l	2005-09-04 21:15:43.000000000 +0000
+++ vile-9.5h/filters/rexxfilt.l	2006-05-21 19:50:19.000000000 +0000
@@ -2,7 +2,7 @@
 
 %{
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/rexxfilt.l,v 1.8 2005/09/04 21:15:43 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/rexxfilt.l,v 1.9 2006/05/21 19:50:19 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of REXX source
  * - T.Dickey
@@ -51,6 +51,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/rpm-filt.l
Prereq:  1.11 
--- vile-9.5g+/filters/rpm-filt.l	2005-09-05 14:29:32.000000000 +0000
+++ vile-9.5h/filters/rpm-filt.l	2006-05-21 19:50:19.000000000 +0000
@@ -5,7 +5,7 @@
 
 %{
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/rpm-filt.l,v 1.11 2005/09/05 14:29:32 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/rpm-filt.l,v 1.13 2006/05/21 19:50:19 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of rpm spec-file.
  */
@@ -52,7 +52,7 @@
 
 ACTION		[\.`{}]
 IDENT		[[:alpha:]_]{NAME}*
-QIDENT		({SSTRING}|{DSTRING}|[^ \"'$\t\n])+
+QIDENT		({SSTRING}|{DSTRING}|[^ \"'$\t\r\n])+
 IDENT0		[-]+[[:digit:]]*[[:alpha:]_-]+[[:alnum:]_-]*
 IDENT1		[%$]{NAME}+
 IDENT2		[%$]\{{IDENT}\}
@@ -69,10 +69,10 @@
 
 <NORMAL>{SECTION}	{ begin_section(yytext); }
 
-<TEXT>^"%"[^\n \t]*	{ begin_section(yytext); }
+<TEXT>^"%"[^\r\n \t]*	{ begin_section(yytext); }
 <TEXT>{IDENT1}		|
 <TEXT>{IDENT2}		{ WriteToken(keyword_attr(yytext)); }
-<TEXT>[^%\n]*		{ WriteToken(String_attr); }
+<TEXT>[^%\r\n]*		{ WriteToken(String_attr); }
 <TEXT>\n		{ ECHO; }
 
 <NORMAL>{IDENT0}	|
@@ -80,7 +80,7 @@
 
 <NORMAL>{IDENT}		{ WriteToken(keyword_attr(yytext)); }
 
-<NORMAL>"#"[^\n]*	{ WriteToken(Comment_attr); }
+<NORMAL>"#"[^\r\n]*	{ WriteToken(Comment_attr); }
 
 <NORMAL>^{SPACE}*:	{ color_delimiter(yytext, yyleng, Action_attr); }
 
@@ -138,7 +138,7 @@
 				flt_bfr_append(yytext, yyleng);
 			    }
 			}
-<HEREDOC>[^\n\$]+	{ flt_bfr_append(yytext, yyleng); }
+<HEREDOC>[^\r\n\$]+	{ flt_bfr_append(yytext, yyleng); }
 <HEREDOC>\n		{ flt_bfr_append(yytext, yyleng); }
 <HEREDOC>.		{ flt_bfr_append(yytext, yyleng); }
 
@@ -146,7 +146,7 @@
 <QUOTED>{IDENT1}	|
 <QUOTED>{IDENT2}	{ flt_bfr_embed(yytext, yyleng, meta_variable(yytext)); }
 <QUOTED>{IDENT2L}	{ if (embed_or_append(yytext, yyleng)) push_state(SUBST); }
-<QUOTED>[^\n\\\"$]+	{ flt_bfr_append(yytext, yyleng); }
+<QUOTED>[^\r\n\\\"$]+	{ flt_bfr_append(yytext, yyleng); }
 <QUOTED>[\n$]		{ flt_bfr_append(yytext, yyleng); }
 <QUOTED>\"		{ FinishQuote(NORMAL); pop_state(); }
 
@@ -252,6 +252,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/rubyfilt.c
Prereq:  1.39 
--- vile-9.5g+/filters/rubyfilt.c	2005-10-08 22:49:03.000000000 +0000
+++ vile-9.5h/filters/rubyfilt.c	2006-05-21 19:48:09.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/rubyfilt.c,v 1.39 2005/10/08 22:49:03 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/rubyfilt.c,v 1.40 2006/05/21 19:48:09 tom Exp $
  *
  * Filter to add vile "attribution" sequences to ruby scripts.  This is a
  * translation into C of an earlier version written for LEX/FLEX.
@@ -1003,6 +1003,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
@@ -1026,6 +1027,8 @@
     int quote_here = 0;		/* tokens in here-document are quoted */
     int had_op = 1;		/* true to allow regex */
 
+    (void) input;
+
     Comment_attr = class_attr(NAME_COMMENT);
     Error_attr = class_attr(NAME_ERROR);
     Ident_attr = class_attr(NAME_IDENT);
Index: filters/sccsfilt.l
Prereq:  1.12 
--- vile-9.5g+/filters/sccsfilt.l	2005-09-04 20:58:11.000000000 +0000
+++ vile-9.5h/filters/sccsfilt.l	2006-05-21 19:50:19.000000000 +0000
@@ -3,7 +3,7 @@
 %{
 
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/sccsfilt.l,v 1.12 2005/09/04 20:58:11 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/sccsfilt.l,v 1.14 2006/05/21 19:50:19 tom Exp $
  *
  * Filter to add vile "attribution" sequences to SCCS files.
  */
@@ -23,9 +23,9 @@
 
 %}
 
-MARKED		^\001[^\n]*
+MARKED		^\001[^\r\n]*
 
-EXPANDED	"@(#)"[^\n]*
+EXPANDED	"@(#)"[^\r\n]*
 
 UNEXPANDED	"%"[[:upper:]]"%"
 
@@ -56,16 +56,17 @@
 		    }
 		}
 <INSERT>.		|
-<INSERT>[^%@\n]*	{ WriteToken(Insert_attr); }
+<INSERT>[^%@\r\n]*	{ WriteToken(Insert_attr); }
 
 <DELETE>.		|
-<DELETE>[^%@\n]*	{ WriteToken(Delete_attr); }
+<DELETE>[^%@\r\n]*	{ WriteToken(Delete_attr); }
 
 %%
 
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/sed-filt.c
Prereq:  1.21 
--- vile-9.5g+/filters/sed-filt.c	2005-11-16 20:55:12.000000000 +0000
+++ vile-9.5h/filters/sed-filt.c	2006-05-21 21:01:05.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/sed-filt.c,v 1.21 2005/11/16 20:55:12 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/sed-filt.c,v 1.22 2006/05/21 21:01:05 tom Exp $
  *
  * Filter to add vile "attribution" sequences to sed scripts.
  */
@@ -252,10 +252,11 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
-do_filter(FILE * input GCC_UNUSED)
+do_filter(FILE *input GCC_UNUSED)
 {
     static unsigned used;
     static char *line;
@@ -265,6 +266,8 @@
     int escaped_newline;
     States state = LeadingBlanks;
 
+    (void) input;
+
     Action_attr = class_attr(NAME_ACTION);
     Comment_attr = class_attr(NAME_COMMENT);
     Error_attr = class_attr(NAME_ERROR);
Index: filters/sh-filt.l
Prereq:  1.65 
--- vile-9.5g+/filters/sh-filt.l	2006-02-20 00:45:18.000000000 +0000
+++ vile-9.5h/filters/sh-filt.l	2006-05-21 19:50:19.000000000 +0000
@@ -5,7 +5,7 @@
 
 %{
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/sh-filt.l,v 1.65 2006/02/20 00:45:18 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/sh-filt.l,v 1.67 2006/05/21 19:50:19 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of Shell script.
  */
@@ -65,7 +65,7 @@
 BACKTIC		`
 ACTION		[\.{}]
 IDENT		[[:alpha:]_]{NAME}*
-QIDENT		({SSTRING}|{DSTRING}|[^ \"'$\t\n])+
+QIDENT		({SSTRING}|{DSTRING}|[^ \"'$\t\r\n])+
 IDENT0		[-]+[[:digit:]]*[[:alpha:]_-]+[[:alnum:]_-]*
 IDENT1		\${NAME}+
 IDENT2		\$\{[#]?{IDENT}\}
@@ -81,7 +81,7 @@
 
 <NORMAL>{IDENT}		{ WriteToken(keyword_attr(yytext)); }
 
-<NORMAL>"#"[^\n]*	{ WriteToken(Comment_attr); }
+<NORMAL>"#"[^\r\n]*	{ WriteToken(Comment_attr); }
 
 <NORMAL>^{SPACE}*:	{ color_delimiter(yytext, yyleng, Action_attr); }
 
@@ -149,7 +149,7 @@
 				flt_bfr_append(yytext, yyleng);
 			    }
 			}
-<HEREDOC>[^\n\$]+	{ flt_bfr_append(yytext, yyleng); }
+<HEREDOC>[^\r\n\$]+	{ flt_bfr_append(yytext, yyleng); }
 <HEREDOC>\n		{ flt_bfr_append(yytext, yyleng); }
 <HEREDOC>.		{ flt_bfr_append(yytext, yyleng); }
 
@@ -159,7 +159,7 @@
 <QUOTED>{IDENT1}	|
 <QUOTED>{IDENT2}	{ flt_bfr_embed(yytext, yyleng, Ident_attr); }
 <QUOTED>{IDENT2L}	{ if (embed_or_append(yytext, yyleng)) push_stk(SUBST); }
-<QUOTED>[^`\n\\\"$]+	{ flt_bfr_append(yytext, yyleng); }
+<QUOTED>[^`\r\n\\\"$]+	{ flt_bfr_append(yytext, yyleng); }
 <QUOTED>[\n$]		{ flt_bfr_append(yytext, yyleng); }
 <QUOTED>\"		{ FinishQuote(NORMAL); pop_stk(); }
 
@@ -270,6 +270,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 /*
Index: filters/sml-filt.l
Prereq:  1.5 
--- vile-9.5g+/filters/sml-filt.l	2005-09-04 21:15:43.000000000 +0000
+++ vile-9.5h/filters/sml-filt.l	2006-05-21 19:50:19.000000000 +0000
@@ -2,7 +2,7 @@
 
 %{
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/sml-filt.l,v 1.5 2005/09/04 21:15:43 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/sml-filt.l,v 1.6 2006/05/21 19:50:19 tom Exp $
 
     Filter to add vile "attribution" sequences to selected bits of SML
     input text.
@@ -119,6 +119,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/spellflt.l
Prereq:  1.23 
--- vile-9.5g+/filters/spellflt.l	2005-09-04 21:40:23.000000000 +0000
+++ vile-9.5h/filters/spellflt.l	2006-05-21 19:50:19.000000000 +0000
@@ -1,7 +1,7 @@
 %{
 
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/spellflt.l,v 1.23 2005/09/04 21:40:23 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/spellflt.l,v 1.24 2006/05/21 19:50:19 tom Exp $
  *
  * Filter to add vile "attribution" sequences to misspelled words.
  */
@@ -139,6 +139,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
@@ -156,6 +157,8 @@
     char *attr = class_attr(NAME_ERROR);
     char *prog;
 
+    (void) inputs;
+
     if ((fp = open_tempfile(name)) == 0)
 	return;
 
Index: filters/sql-filt.l
Prereq:  1.28 
--- vile-9.5g+/filters/sql-filt.l	2005-12-23 21:02:45.000000000 +0000
+++ vile-9.5h/filters/sql-filt.l	2006-05-21 19:50:48.000000000 +0000
@@ -3,7 +3,7 @@
 %{
 
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/sql-filt.l,v 1.28 2005/12/23 21:02:45 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/sql-filt.l,v 1.31 2006/05/21 19:50:48 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of SQL script
  * - T.Dickey
@@ -46,8 +46,8 @@
 REAL		{INTEGER}?(\.{INTEGER}([eE]{SIGN}?{INTEGER})?)
 NUMBER		{SIGN}?({INTEGER}|{REAL})({UNITS})?
 
-SSTRING		\'([^\']|\'\')*\'
-DSTRING		\"([^"])*\"
+SSTRING		\'([^\'\n]|\'\')*\'
+DSTRING		\"([^"\n])*\"
 STRING		({SSTRING}|{DSTRING})
 
 IDENT		[%]?[[:alpha:]][[:alnum:]_$#]*
@@ -140,8 +140,8 @@
 			}
 <LEAD,MORE,BODY>{SPACE}	{ ECHO; }
 
-<LEAD,MORE,BODY>--[^\n]* { WriteToken(Comment_attr); new_state(INLINE_CMT); }
-<INLINE_CMT>[^\n]*	{ WriteToken(Comment_attr); }
+<LEAD,MORE,BODY>--[^\r\n]* { WriteToken(Comment_attr); new_state(INLINE_CMT); }
+<INLINE_CMT>[^\r\n]*	{ WriteToken(Comment_attr); }
 <INLINE_CMT>\n		{ ECHO; old_state(); }
 
 <LEAD,MORE,BODY>"/*"	{ WriteToken(Comment_attr);
@@ -152,21 +152,21 @@
 			  WriteToken(Comment_attr);
 			  old_state();
 			}
-<COMMENT0>[^\n]		{ WriteToken(Comment_attr); }
+<COMMENT0>[^\r\n]	{ WriteToken(Comment_attr); }
 <COMMENT0>\n		{
 			  ECHO;
 			  set_state(COMMENT);
 			}
 
-<COMMENT>^[^\n]*"*/"	{ WriteToken(Comment_attr);
+<COMMENT>^[^\r\n]*"*/"	{ WriteToken(Comment_attr);
 			  old_state();
 			}
-<COMMENT>^[^\n]*	{ WriteToken(Comment_attr); }
+<COMMENT>^[^\r\n]*	{ WriteToken(Comment_attr); }
 <COMMENT>\n		{ ECHO; }
 
 <LEAD,MORE>{LABEL}	{ WriteToken(Action_attr); }
 
-<LEAD,MORE>{ACTION}[^=][^\n]* {
+<LEAD,MORE>{ACTION}[^=][^\r\n]* {
 			    WriteToken(Action_attr);
 			    new_state(ONE_LINE);
 			    next_line = LEAD;
@@ -175,7 +175,7 @@
 			    WriteToken(Action_attr);
 			    new_state(SERVER);
 			}
-<ONE_LINE>[^\n]*	{ WriteToken(String_attr);
+<ONE_LINE>[^\r\n]*	{ WriteToken(String_attr);
 			  if (yyleng != 0 && yytext[yyleng - 1] == '-')
 			  	next_line = ONE_LINE;
 			    else
@@ -193,6 +193,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/tagsfilt.c
Prereq:  1.7 
--- vile-9.5g+/filters/tagsfilt.c	2002-05-01 19:43:40.000000000 +0000
+++ vile-9.5h/filters/tagsfilt.c	2006-05-21 21:01:05.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/tagsfilt.c,v 1.7 2002/05/01 19:43:40 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/tagsfilt.c,v 1.8 2006/05/21 21:01:05 tom Exp $
  *
  * Filter to add vile "attribution" sequences to a tags file.  It's done best
  * in C because the file consists only of columns of data that are delimited
@@ -27,16 +27,19 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
-do_filter(FILE * input GCC_UNUSED)
+do_filter(FILE *input GCC_UNUSED)
 {
     static unsigned used;
     static char *line;
 
     char *s, *t;
 
+    (void) input;
+
     Comment_attr = class_attr(NAME_COMMENT);
     Ident_attr = class_attr(NAME_IDENT);
     Ident2_attr = class_attr(NAME_IDENT2);
Index: filters/tbl-filt.l
Prereq:  1.9 
--- vile-9.5g+/filters/tbl-filt.l	2005-09-04 21:15:43.000000000 +0000
+++ vile-9.5h/filters/tbl-filt.l	2006-05-21 19:50:48.000000000 +0000
@@ -3,7 +3,7 @@
 %{
 
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/tbl-filt.l,v 1.9 2005/09/04 21:15:43 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/tbl-filt.l,v 1.11 2006/05/21 19:50:48 tom Exp $
  *
  * Filter to add vile "attribution" sequences to a vile mktbls datafile.
  */
@@ -23,7 +23,7 @@
 
 %}
 
-COMMENT		[ \t]*#[^\n]*\n
+COMMENT		[ \t]*#[^\r\n]*\n
 
 KEYWORD		[[:alpha:]_.][[:alnum:]$_.]*
 
@@ -80,6 +80,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/tc-filt.l
Prereq:  1.22 
--- vile-9.5g+/filters/tc-filt.l	2005-09-04 21:15:43.000000000 +0000
+++ vile-9.5h/filters/tc-filt.l	2006-05-21 19:50:48.000000000 +0000
@@ -3,7 +3,7 @@
 %{
 
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/tc-filt.l,v 1.22 2005/09/04 21:15:43 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/tc-filt.l,v 1.24 2006/05/21 19:50:48 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of termcap
  */
@@ -27,23 +27,23 @@
 
 %}
 
-CAPNAME		[^\.| \t\n:=]+
+CAPNAME		[^\.| \t\r\n:=]+
 DOTNAME		(\.)+{CAPNAME}
 
 ALIAS		[[:alnum:]_\.+-]+
 
 NUMBER		"#"[[:digit:]]+
-STRING		[^#:\\\n](\\[.\n]|[^:\n])*
+STRING		[^#:\\\r\n](\\[.\n]|[^:\r\n])*
 
 %%
 
-^"#"[^\n]*			{ WriteToken(Comment_attr); }
+^"#"[^\r\n]*			{ WriteToken(Comment_attr); }
 \n\n				{ ECHO; BEGIN(INITIAL); }
 
 ^({ALIAS}"|"|(\\\n\t)*)*	{ WriteToken(Ident_attr); BEGIN(DESC); }
 ^{ALIAS}			{ WriteToken(Ident_attr); BEGIN(GAPS); }
 
-<DESC>[^:\n]*			{ WriteToken(Comment_attr); BEGIN(GAPS); }
+<DESC>[^:\r\n]*			{ WriteToken(Comment_attr); BEGIN(GAPS); }
 <GAPS,VALS>(:|:\\\n\t)+		{ commented=0; ECHO; BEGIN(CAPS); }
 <GAPS,CAPS>\n(\t)+		{ flt_error("unexpected whitespace");
 				  WriteToken(Error_attr); }
@@ -116,6 +116,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/tcl-filt.l
Prereq:  1.16 
--- vile-9.5g+/filters/tcl-filt.l	2005-09-05 01:41:49.000000000 +0000
+++ vile-9.5h/filters/tcl-filt.l	2006-05-21 19:50:48.000000000 +0000
@@ -4,7 +4,7 @@
 
 %{
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/tcl-filt.l,v 1.16 2005/09/05 01:41:49 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/tcl-filt.l,v 1.18 2006/05/21 19:50:48 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of TCL/TK script.
  *
@@ -34,8 +34,8 @@
 
 SPACE		[ \t]
 
-SSTRING		\'([^\\'\n]|\\[^'\n])*\'
-DSTRING		\"([^"\n]|\\[^\n])*[\"]?
+SSTRING		\'([^\\'\r\n]|\\[^'\r\n])*\'
+DSTRING		\"([^"\r\n]|\\[^\r\n])*[\"]?
 STRINGS		({SSTRING}|{DSTRING})
 
 ACTION		([\.`]|\\\n)
@@ -66,7 +66,7 @@
 [{}]			{ WriteToken(Braces_attr); }
 {IDENT}			{ WriteToken(keyword_attr(yytext)); BEGIN(ARGS); }
 
-<VERB>"#"([^\n]|\\\n)*$	{ WriteToken(Comment_attr); }
+<VERB>"#"([^\r\n]|\\\n)*$	{ WriteToken(Comment_attr); }
 <ARGS>[;\n]		{ ECHO; BEGIN(VERB); }
 
 {ACTION}		{ WriteToken(Action_attr); }
@@ -90,6 +90,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/texifilt.l
Prereq:  1.4 
--- vile-9.5g+/filters/texifilt.l	2005-09-05 10:59:09.000000000 +0000
+++ vile-9.5h/filters/texifilt.l	2006-05-21 19:50:48.000000000 +0000
@@ -2,7 +2,7 @@
 
 %{
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/texifilt.l,v 1.4 2005/09/05 10:59:09 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/texifilt.l,v 1.6 2006/05/21 19:50:48 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of texinfo input.
  */
@@ -47,7 +47,7 @@
 			  WriteToken2(keyword_attr(yytext + 1), 1);
 			}
 
-<NOTE>[^\n]*		{ WriteToken(Comment_attr); }
+<NOTE>[^\r\n]*		{ WriteToken(Comment_attr); }
 <NOTE>\n		{ ECHO; BEGIN(TEXT); }
 
 <TEXT>{NUMBER}		{ WriteToken(Number_attr); }
@@ -58,6 +58,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/ti-filt.l
Prereq:  1.16 
--- vile-9.5g+/filters/ti-filt.l	2005-09-04 21:15:43.000000000 +0000
+++ vile-9.5h/filters/ti-filt.l	2006-05-21 19:50:48.000000000 +0000
@@ -3,7 +3,7 @@
 %{
 
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/ti-filt.l,v 1.16 2005/09/04 21:15:43 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/ti-filt.l,v 1.18 2006/05/21 19:50:48 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of terminfo
  */
@@ -41,14 +41,14 @@
 
 %%
 
-^"#"[^\n]*			{ WriteToken(Comment_attr); }
+^"#"[^\r\n]*			{ WriteToken(Comment_attr); }
 
 ^{ALIAS}","			{ flt_puts(yytext, yyleng - 1, Ident_attr);
 				  flt_putc(',');
 				  BEGIN(CAPS);
 				}
 ^({ALIAS}"|")+			{ WriteToken(Ident_attr); BEGIN(DESC); }
-<DESC>[^,\n]*			{ WriteToken(Comment_attr); BEGIN(GAPS); }
+<DESC>[^,\r\n]*			{ WriteToken(Comment_attr); BEGIN(GAPS); }
 <GAPS,VALS>({COMMA}|{ESCNL})*	{ commented = 0; ECHO; BEGIN(CAPS); }
 <CAPS>{CAPNAME}			{ WriteToken(check_name(yytext)); BEGIN(VALS); }
 <CAPS>{DOTNAME}			{ WriteToken(Comment_attr); commented = 1; BEGIN(VALS); }
@@ -85,6 +85,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/txt-filt.l
Prereq:  1.21 
--- vile-9.5g+/filters/txt-filt.l	2006-04-02 16:56:19.000000000 +0000
+++ vile-9.5h/filters/txt-filt.l	2006-05-21 19:50:48.000000000 +0000
@@ -5,7 +5,7 @@
 %{
 
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/txt-filt.l,v 1.21 2006/04/02 16:56:19 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/txt-filt.l,v 1.23 2006/05/21 19:50:48 tom Exp $
  *
  * Filter to add vile "attribution" sequences to an ordinary text file
  */
@@ -24,7 +24,7 @@
 
 %}
 
-COMMENT		(^(-[-]+[ \t]+[^\n]+))|([ \t]*-[ \t-]*)\n
+COMMENT		(^(-[-]+[ \t]+[^\r\n]+))|([ \t]*-[ \t-]*)\n
 
 KEYWORD		([[:alpha:]_][[:alnum:]_.]*|[[:upper:]][+/&][[:upper:]])
 
@@ -89,6 +89,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/unfilter.c
Prereq:  1.8 
--- vile-9.5g+/filters/unfilter.c	2005-01-18 23:23:26.000000000 +0000
+++ vile-9.5h/filters/unfilter.c	2006-05-21 19:46:51.000000000 +0000
@@ -1,7 +1,7 @@
 /*
  * Parsing and I/O support for atr2text, etc.
  *
- * $Header: /usr/build/vile/vile/filters/RCS/unfilter.c,v 1.8 2005/01/18 23:23:26 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/unfilter.c,v 1.9 2006/05/21 19:46:51 tom Exp $
  */
 #define CAN_TRACE 0
 #define CAN_VMS_PATH 0
@@ -150,6 +150,9 @@
 int
 main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
 {
+    (void) argc;
+    (void) argv;
+
     unfilter(stdin, stdout);
     exit(GOODEXIT);
 }
Index: filters/vb.key
Prereq:  1.6 
--- vile-9.5g+/filters/vb.key	2005-10-02 23:37:39.000000000 +0000
+++ vile-9.5h/filters/vb.key	2006-04-11 18:57:48.000000000 +0000
@@ -1,4 +1,4 @@
-: $Id: vb.key,v 1.6 2005/10/02 23:37:39 tom Exp $
+: $Id: vb.key,v 1.7 2006/04/11 18:57:48 tom Exp $
 : statements:
 alias
 appactivate
@@ -104,7 +104,7 @@
 cdbl
 cdec
 choose
-chr
+chr:Error
 chrb
 chrw
 cint
@@ -136,7 +136,7 @@
 filedatetime
 filelen
 fix
-format
+format:Error
 freefile
 fv
 getallstrings
@@ -165,7 +165,7 @@
 isobject
 lbound
 lcase
-left
+left:Error
 leftb
 len
 lenb
@@ -173,9 +173,9 @@
 loc
 lof
 log
-ltrim
+ltrim:Error
 max
-mid
+mid:Error
 midb
 min
 minute
@@ -194,10 +194,10 @@
 rate
 replace
 rgb
-right
+right:Error
 rightb
 rnd
-rtrim
+rtrim:Error
 second
 seek
 sgn
@@ -225,7 +225,7 @@
 trim
 typename
 ubound
-ucase
+ucase:Error
 val
 var
 varp
@@ -719,8 +719,8 @@
 nothing
 null
 true
-: obsolete
-.default Error
+: obsolete - no
+: .default Error
 chr$
 format$
 left$
Index: filters/vilefilt.l
Prereq:  1.31 
--- vile-9.5g+/filters/vilefilt.l	2005-09-04 21:15:43.000000000 +0000
+++ vile-9.5h/filters/vilefilt.l	2006-05-21 19:50:48.000000000 +0000
@@ -6,7 +6,7 @@
 %{
 
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/vilefilt.l,v 1.31 2005/09/04 21:15:43 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/vilefilt.l,v 1.32 2006/05/21 19:50:48 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of vile macros
  * - T.Dickey
@@ -137,6 +137,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/vl-filt.l
Prereq:  1.11 
--- vile-9.5g+/filters/vl-filt.l	2005-09-04 23:17:58.000000000 +0000
+++ vile-9.5h/filters/vl-filt.l	2006-05-21 19:50:48.000000000 +0000
@@ -2,7 +2,7 @@
 
 %{
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/vl-filt.l,v 1.11 2005/09/04 23:17:58 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/vl-filt.l,v 1.13 2006/05/21 19:50:48 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of VeriLog
  * program.
@@ -65,7 +65,7 @@
 
 <CODE>{INTEGER}		{ WriteToken(Number_attr); /* '_' should be embedded */ }
 
-<CODE>"//"[^\n]*	{ WriteToken(Comment_attr); }
+<CODE>"//"[^\r\n]*	{ WriteToken(Comment_attr); }
 <CODE>"/*"		{ WriteToken(Comment_attr); BEGIN(COMMENT); }
 <COMMENT>[^*]*		{ WriteToken(Comment_attr); }
 <COMMENT>"*"+[^*/]*	{ WriteToken(Comment_attr); }
@@ -93,6 +93,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/wbt-filt.l
Prereq:  1.3 
--- vile-9.5g+/filters/wbt-filt.l	2005-09-04 21:15:43.000000000 +0000
+++ vile-9.5h/filters/wbt-filt.l	2006-05-21 19:50:48.000000000 +0000
@@ -2,7 +2,7 @@
 
 %{
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/wbt-filt.l,v 1.3 2005/09/04 21:15:43 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/wbt-filt.l,v 1.5 2006/05/21 19:50:48 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of WinBatch script.
  */
@@ -21,9 +21,9 @@
 
 %}
 
-BSTRING		\`([^`\n]|``)*\`
-SSTRING		\'([^'\n]|'')*\'
-DSTRING		\"([^"\n]|"")*\"
+BSTRING		\`([^`\r\n]|``)*\`
+SSTRING		\'([^'\r\n]|'')*\'
+DSTRING		\"([^"\r\n]|"")*\"
 STRING		{DSTRING}|{SSTRING}|{BSTRING}
 
 NAME		[[:alnum:]]
@@ -40,7 +40,7 @@
 <NORMAL>#{IDENT}	{ WriteToken(want_attr(Prepro_attr, yytext)); }
 <NORMAL>"@"{IDENT}	{ WriteToken(want_attr(Number_attr, yytext)); }
 
-<NORMAL>";"[^\n]*	{ WriteToken(Comment_attr); }
+<NORMAL>";"[^\r\n]*	{ WriteToken(Comment_attr); }
 
 <NORMAL>{NUMBER}	{ WriteToken(Number_attr); }
 <NORMAL>[[:digit:]]{NUMBER}{NAME}+ {
@@ -63,6 +63,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/xml-filt.l
Prereq:  1.13 
--- vile-9.5g+/filters/xml-filt.l	2005-09-04 21:15:43.000000000 +0000
+++ vile-9.5h/filters/xml-filt.l	2006-05-21 19:50:48.000000000 +0000
@@ -2,7 +2,7 @@
 
 %{
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/xml-filt.l,v 1.13 2005/09/04 21:15:43 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/xml-filt.l,v 1.15 2006/05/21 19:50:48 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of XML input
  * text.
@@ -81,8 +81,8 @@
 
 <INITIAL,INLINE>"<!--"	{ PushQuote(COMMENT, Comment_attr); }
 <COMMENT>[\n]		|
-<COMMENT>[^\n-]+	|
-<COMMENT>[-]+[^-\>\n]*	{ flt_bfr_append(yytext, yyleng); }
+<COMMENT>[^\r\n-]+	|
+<COMMENT>[-]+[^-\>\r\n]*	{ flt_bfr_append(yytext, yyleng); }
 <COMMENT>[-]+"->"	{ PopQuote(); }
 
 <XMLATTR>"["		{ WriteToken(Action_attr); push_state(INLINE); }
@@ -192,6 +192,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/xresfilt.l
Prereq:  1.16 
--- vile-9.5g+/filters/xresfilt.l	2005-09-04 21:15:43.000000000 +0000
+++ vile-9.5h/filters/xresfilt.l	2006-05-21 19:50:48.000000000 +0000
@@ -3,7 +3,7 @@
 %{
 
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/xresfilt.l,v 1.16 2005/09/04 21:15:43 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/xresfilt.l,v 1.18 2006/05/21 19:50:48 tom Exp $
  *
  * Filter to add vile "attribution" sequences to an X resource file.
  */
@@ -28,7 +28,7 @@
 
 SPACE		[ \t]
 
-COMMENT		![^\n]*\n
+COMMENT		![^\r\n]*\n
 
 SIGN		[-+]
 DECIMAL		[[:digit:]]+
@@ -53,7 +53,7 @@
 
 <RESVALUE>{NUMBER}	{ flt_bfr_embed(yytext, yyleng, Number_attr); }
 <RESVALUE>{KEYWORD}	{ quoted_name(yytext, yyleng); }
-<RESVALUE>![^\\\n]*	{ flt_bfr_embed(yytext, yyleng, Comment_attr); }
+<RESVALUE>![^\\\r\n]*	{ flt_bfr_embed(yytext, yyleng, Comment_attr); }
 <RESVALUE>\\\n		{ flt_bfr_append(yytext, yyleng); }
 <RESVALUE>({ESCAPED}|.)	{ flt_bfr_append(yytext, yyleng); }
 <RESVALUE>\n		{ flt_bfr_finish(); ECHO; BEGIN(NORMAL); }
@@ -123,6 +123,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/xs-filt.l
Prereq:  1.11 
--- vile-9.5g+/filters/xs-filt.l	2005-09-04 21:15:43.000000000 +0000
+++ vile-9.5h/filters/xs-filt.l	2006-05-21 19:50:48.000000000 +0000
@@ -2,7 +2,7 @@
 
 %{
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/xs-filt.l,v 1.11 2005/09/04 21:15:43 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/xs-filt.l,v 1.12 2006/05/21 19:50:48 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of Perl/C
  * extension source
@@ -104,6 +104,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: filters/yaccfilt.l
Prereq:  1.22 
--- vile-9.5g+/filters/yaccfilt.l	2005-09-04 21:15:43.000000000 +0000
+++ vile-9.5h/filters/yaccfilt.l	2006-05-21 19:50:48.000000000 +0000
@@ -2,7 +2,7 @@
 
 %{
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/yaccfilt.l,v 1.22 2005/09/04 21:15:43 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/yaccfilt.l,v 1.24 2006/05/21 19:50:48 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of YACC program.
  */
@@ -40,7 +40,7 @@
 
 SPACE		[ \t]
 
-DIRECTIVE	^%[^ \t\n]+
+DIRECTIVE	^%[^ \t\r\n]+
 
 IDENT		[[:alpha:]_][[:alnum:]_]*
 QIDENT		\$([[:digit:]$]|\<{IDENT}\>)
@@ -51,7 +51,7 @@
 DSTRING		\"(\\.|[^"\\])*\"
 STRINGS		({SSTRING}|{DSTRING})
 
-PATTERN		(\\.|\[(\\.|.)*\]|[^ \t\n])+
+PATTERN		(\\.|\[(\\.|.)*\]|[^ \t\r\n])+
 
 %%
 
@@ -141,6 +141,7 @@
 static void
 init_filter(int before GCC_UNUSED)
 {
+    (void) before;
 }
 
 static void
Index: glob.c
Prereq:  1.87 
--- vile-9.5g+/glob.c	2005-06-03 00:03:29.000000000 +0000
+++ vile-9.5h/glob.c	2006-04-21 00:21:04.000000000 +0000
@@ -13,7 +13,7 @@
  *
  *	modify (ifdef-style) 'expand_leaf()' to allow ellipsis.
  *
- * $Header: /usr/build/vile/vile/RCS/glob.c,v 1.87 2005/06/03 00:03:29 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/glob.c,v 1.88 2006/04/21 00:21:04 tom Exp $
  *
  */
 
@@ -747,7 +747,7 @@
 
 	    (void) strcpy(pattern + j, s);
 	    (void) strcat(pattern, save);
-	    j += strlen(s) - 1;
+	    j += (int) strlen(s) - 1;
 	}
     }
 }
Index: history.c
Prereq:  1.82 
--- vile-9.5g+/history.c	2005-01-20 01:58:52.000000000 +0000
+++ vile-9.5h/history.c	2006-05-21 10:53:43.000000000 +0000
@@ -55,7 +55,7 @@
  *	not (yet) correspond to :-commands.  Before implementing, probably will
  *	have to make TESTC a settable mode.
  *
- * $Header: /usr/build/vile/vile/RCS/history.c,v 1.82 2005/01/20 01:58:52 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/history.c,v 1.84 2006/05/21 10:53:43 tom Exp $
  *
  */
 
@@ -71,7 +71,7 @@
 
 typedef struct {
     TBUFF **buffer;
-    unsigned *position;
+    size_t *position;
     int (*endfunc) (EOL_ARGS);
     int eolchar;
     UINT options;
@@ -219,7 +219,7 @@
 {
     return endOfParm(parm,
 		     lp->l_text,
-		     willGlue() + tb_length(MyText),
+		     willGlue() + (int) tb_length(MyText),
 		     llength(lp));
 }
 
@@ -385,7 +385,7 @@
 {
     if (MyLevel == 1 && cmd != 0 && *cmd != EOS) {
 	TBUFF *temp = 0;
-	unsigned len = tb_length(tb_scopy(&temp, cmd)) - 1;
+	size_t len = tb_length(tb_scopy(&temp, cmd)) - 1;
 
 	TRACE(("hst_remove(%s)\n", cmd));
 	while (*cmd++)
@@ -491,7 +491,7 @@
 	    continue;		/* prefix mismatches */
 
 	if (willGlue()) {	/* avoid conflicts setall/set */
-	    int len = tb_length(MyText);
+	    int len = (int) tb_length(MyText);
 	    if (len > 0
 		&& (len > 1 || !isPunct(tb_values(MyText)[0]))
 		&& llength(lp) > len
@@ -542,7 +542,7 @@
 
     if (src != 0 && srclen != 0) {
 	char *stripped;
-	int offset = tb_length(MyText) + willGlue();
+	int offset = (int) tb_length(MyText) + willGlue();
 	int n = endOfParm(parm, src, offset, srclen) - offset;
 
 	src += offset;
@@ -631,7 +631,7 @@
  */
 int
 edithistory(TBUFF **buffer,
-	    unsigned *position,
+	    size_t *position,
 	    int *given,
 	    UINT options,
 	    int (*endfunc) (EOL_ARGS),
Index: input.c
Prereq:  1.284 
--- vile-9.5g+/input.c	2005-09-26 23:01:43.000000000 +0000
+++ vile-9.5h/input.c	2006-05-21 22:32:27.000000000 +0000
@@ -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.284 2005/09/26 23:01:43 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/input.c,v 1.289 2006/05/21 22:32:27 tom Exp $
  *
  */
 
@@ -122,9 +122,9 @@
 shell_complete(DONE_ARGS)
 {
     int status = FALSE;
-    unsigned len = *pos;
-    int base;
-    int first = 0;
+    size_t len = *pos;
+    size_t base;
+    size_t first = 0;
 
     TRACE(("shell_complete %d:'%s'\n", *pos, buf));
     if (buf != 0) {
@@ -622,11 +622,11 @@
 /* get a string consisting of inclchartype characters from the current
 	position.  if inclchartype is 0, return everything to eol */
 int
-screen_string(char *buf, int bufn, CHARTYPE inclchartype)
+screen_string(char *buf, size_t bufn, CHARTYPE inclchartype)
 {
     static TBUFF *temp;
     int rc;
-    int len;
+    size_t len;
 
     if ((rc = screen2tbuff(&temp, inclchartype)) == TRUE) {
 	if ((len = tb_length(temp)) >= bufn)
@@ -870,11 +870,11 @@
 /* count backslashes so we can tell at any point whether we have the current
  * position escaped by one.
  */
-static UINT
-countBackSlashes(TBUFF *buf, UINT len)
+static size_t
+countBackSlashes(TBUFF *buf, size_t len)
 {
     char *buffer = tb_values(buf);
-    UINT count;
+    size_t count;
 
     if (len && buffer != 0 && isEscaped(buffer + len)) {
 	count = 1;
@@ -924,11 +924,11 @@
 /* expand a single character (only used on interactive input) */
 static int
 expandChar(TBUFF **buf,
-	   unsigned *position,
+	   size_t *position,
 	   int c,
 	   KBD_OPTIONS options)
 {
-    int cpos = *position;
+    int cpos = (int) *position;
     char *cp;
     BUFFER *bp;
     char str[NFILEN];
@@ -1042,11 +1042,11 @@
  * Erases the response from the screen for 'kbd_string()'
  */
 void
-kbd_kill_response(TBUFF *buffer, unsigned *position, int c)
+kbd_kill_response(TBUFF *buffer, size_t *position, int c)
 {
     char *buf = tb_values(buffer);
     TBUFF *tmp = 0;
-    int cpos = *position;
+    int cpos = (int) *position;
     UINT mark = cpos;
 
     if (buf != 0) {
@@ -1083,11 +1083,11 @@
 int
 kbd_show_response(TBUFF **dst,	/* string with escapes */
 		  char *src,	/* string w/o escapes */
-		  unsigned bufn,	/* # of chars we read from 'src[]' */
+		  size_t bufn,	/* # of chars we read from 'src[]' */
 		  int eolchar,
 		  KBD_OPTIONS options)
 {
-    unsigned k;
+    size_t k;
 
     /* add backslash escapes in front of volatile characters */
     tb_init(dst, 0);
@@ -1117,21 +1117,27 @@
     }
     if (vl_echo)
 	kbd_flush();
-    return tb_length(*dst);
+    return (int) tb_length(*dst);
 }
 
 /* check only for eol-character */
 int
 /*ARGSUSED*/
-eol_null(const char *buffer GCC_UNUSED, unsigned cpos GCC_UNUSED, int c, int eolchar)
+eol_null(EOL_ARGS)
 {
+    (void) buffer;
+    (void) cpos;
+
     return (c == eolchar);
 }
 
 int
 /*ARGSUSED*/
-eol_history(const char *buffer GCC_UNUSED, unsigned cpos GCC_UNUSED, int c, int eolchar)
+eol_history(EOL_ARGS)
 {
+    (void) buffer;
+    (void) cpos;
+
     if (isPrint(eolchar) || eolchar == '\r') {
 	if (c == eolchar || (eolchar == '\r' && c == '\n'))
 	    return TRUE;
@@ -1180,7 +1186,7 @@
 int
 kbd_string(const char *prompt,	/* put this out first */
 	   char *extbuf,	/* the caller's (possibly full) buffer */
-	   unsigned bufn,	/* the length of  " */
+	   size_t bufn,		/* the length of  " */
 	   int eolchar,		/* char we can terminate on, in addition to '\n' */
 	   KBD_OPTIONS options,	/* KBD_EXPAND/KBD_QUOTES, etc. */
 	   int (*complete) (DONE_ARGS))		/* handles completion */
@@ -1321,7 +1327,7 @@
 }
 
 static int
-editMinibuffer(TBUFF **buf, unsigned *cpos, int c, int margin, int quoted)
+editMinibuffer(TBUFF **buf, size_t *cpos, int c, int margin, int quoted)
 {
     int edited = FALSE;
     const CMDFUNC *cfp;
@@ -1352,7 +1358,7 @@
 	miniedit = !miniedit;
     } else if ((miniedit || isSpecial(c))
 	       && (cfp != 0) && (cfp->c_flags & MINIBUF) != 0) {
-	int first = *cpos + margin;
+	C_NUM first = (C_NUM) * cpos + margin;
 	int old_clexec = clexec;
 	int old_named = isnamedcmd;
 	int old_margin = b_left_margin(bminip);
@@ -1610,7 +1616,7 @@
 {
     int c;
     int done;
-    unsigned cpos;		/* current position */
+    size_t cpos;		/* current position */
     int status;
     int shell;
     int margin;
@@ -1618,11 +1624,11 @@
     MARK saveMK;		/* FIXME: may be lost by name-completion swbuffer */
 
     int quotef;			/* are we quoting the next char? */
-    UINT backslashes;		/* are we quoting the next expandable char? */
+    size_t backslashes;		/* are we quoting the next expandable char? */
     UINT dontmap = (options & KBD_NOMAP);
     int firstch = TRUE;
     int lastch;
-    unsigned newpos;
+    size_t newpos;
     TBUFF *buf = 0;
     const char *result;
 
@@ -1883,7 +1889,7 @@
 					     tbreserve(&buf), &cpos));
 		    }
 		    firstch = FALSE;
-		    shiftMiniBuffer(cpos + margin);
+		    shiftMiniBuffer((int) (cpos + margin));
 		    continue;
 		}
 	    }
@@ -2152,7 +2158,7 @@
 get_kbd_macro(TBUFF **rp)
 {
     char temp[80];
-    unsigned n, last, len;
+    size_t n, last, len;
 
     *rp = tb_init(rp, EOS);
     if ((last = itb_length(KbdMacro)) != 0) {
@@ -2215,7 +2221,7 @@
 kbd_mac_save(int f GCC_UNUSED, int n GCC_UNUSED)
 {
     TBUFF *p = 0;
-    unsigned j, len;
+    size_t j, len;
 
     ksetup();
     get_kbd_macro(&p);
Index: line.c
Prereq:  1.170 
--- vile-9.5g+/line.c	2005-07-14 00:50:54.000000000 +0000
+++ vile-9.5h/line.c	2006-04-20 00:09:10.000000000 +0000
@@ -10,7 +10,7 @@
  * editing must be being displayed, which means that "b_nwnd" is non zero,
  * which means that the dot and mark values in the buffer headers are nonsense.
  *
- * $Header: /usr/build/vile/vile/RCS/line.c,v 1.170 2005/07/14 00:50:54 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/line.c,v 1.171 2006/04/20 00:09:10 tom Exp $
  *
  */
 
@@ -810,7 +810,8 @@
     LINE *lp1;
     LINE *lp2;
     WINDOW *wp;
-    size_t len, add;
+    C_NUM len;
+    C_NUM add;
 
     lp1 = DOT.l;
     len = llength(lp1);
@@ -837,7 +838,7 @@
     copy_for_undo(DOT.l);
 
     /* no room in line above, make room */
-    if (add > lp1->l_size - len) {
+    if (add > (C_NUM) lp1->l_size - len) {
 	char *ntext;
 	size_t nsize;
 	/* first, create the new image */
Index: macros/modes.rc
Prereq:  1.39 
--- vile-9.5g+/macros/modes.rc	2006-04-02 14:35:31.000000000 +0000
+++ vile-9.5h/macros/modes.rc	2006-05-21 00:44:15.000000000 +0000
@@ -1,4 +1,4 @@
-; $Id: modes.rc,v 1.39 2006/04/02 14:35:31 tom Exp $
+; $Id: modes.rc,v 1.42 2006/05/21 00:44:15 tom Exp $
 ; majormodes in this file are ordered alphabetically for convenience - the
 ; precedence used by vile is strictly alphabetic, counting case.  Use the
 ; before and after qualifiers to override the precedence.
@@ -590,12 +590,14 @@
 	suffixes	'\.py$'
 	comment-prefix '^\s*#'
 	comments   '^\s*#\s\+\s*$'
+	tabstop=8
+	shiftwidth=4
 ~endwith
 
 ; Ruby
 define-mode rb
 ~with define-submode rb
-	pre '^#\s*!\s*\.*\/.*ruby*\>'
+	pre '^#\s*!\s*\.*\/.*ruby[0-9]*\>'
 	suffixes	'\.rb$'
 ~endwith
 
@@ -688,7 +690,7 @@
 define-mode sql
 ~with define-submode sql
 	before "bat"
-	suffixes	'\.sql$'
+	suffixes	'\.\(ddl\|sql\)$'
 	pre '^\s*\(rem\>.*$\|remark\>.*$\|set\s\+echo\s\+\(on\|off\)\?$\)'
 	comment-prefix	'^\s*rem\(ark\)\?'
 	comments	'^\s*rem\(ark\)\?\s*$'
@@ -772,7 +774,7 @@
 define-mode vb
 ~with define-submode vb
 	before		"basic"
-	suffixes	'\.\(bas\|cls\|frm\)$'
+	suffixes	'\.\(bas\|cls\|frm\|dsr\)$'
 	pre		'\(^VERSION\|VB_Name\)'
 	qualifiers=all
 	comment-prefix	"^\\s*'"
@@ -780,6 +782,8 @@
 	dos
 	ignorecase
 	notabinsert
+	tabstop=4
+	shiftwidth=4
 	fence-if	'^\s*if\>'
 	fence-elif	'^\s*elseif\>'
 	fence-else	'^\s*else\>'
@@ -806,12 +810,14 @@
 define-mode vbs
 ~with define-submode vbs
 	before		"basic"
-	suffixes	'\.\(vbs\)$'
+	suffixes	'\.\(vb\|vbs\)$'
 	comment-prefix	"^\\s*'"
 	comments	"^\\s*'\\s\\+\\s*$"
 	dos
 	ignorecase
 	notabinsert
+	tabstop=4
+	shiftwidth=4
 ~endwith
 
 define-mode vlog
Index: main.c
Prereq:  1.549 
--- vile-9.5g+/main.c	2006-01-12 22:37:21.000000000 +0000
+++ vile-9.5h/main.c	2006-05-21 00:22:10.000000000 +0000
@@ -22,7 +22,7 @@
  */
 
 /*
- * $Header: /usr/build/vile/vile/RCS/main.c,v 1.549 2006/01/12 22:37:21 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/main.c,v 1.551 2006/05/21 00:22:10 cmorgan Exp $
  */
 
 #define realdef			/* Make global definitions not external */
@@ -400,8 +400,8 @@
 
 	} else if (*param == '+') {	/* alternate form of -g */
 	    if (*(++param) == '/') {
-		int len = strlen(param);
-		if (len > 0 && param[len - 1] == '/')
+		size_t len = strlen(param);
+		if (len != 0 && param[len - 1] == '/')
 		    param[--len] = EOS;
 		if (len == 0)
 		    print_usage(BADEXIT);
@@ -1129,6 +1129,9 @@
 #ifdef GMDALL_VERSIONS
 	    setINT(GMDALL_VERSIONS, FALSE);
 #endif
+#ifdef GMDCBRD_ECHO
+	    setINT(GMDCBRD_ECHO, TRUE);
+#endif
 #ifdef GMDCD_ON_OPEN
 	    setINT(GMDCD_ON_OPEN, cd_on_open);
 #endif
Index: makefile.blc
Prereq:  1.19 
--- vile-9.5g+/makefile.blc	2006-01-11 00:00:59.000000000 +0000
+++ vile-9.5h/makefile.blc	2006-04-21 13:38:05.000000000 +0000
@@ -1,7 +1,7 @@
 #
 # makefile for vile on WIN32 using Borland C++
 #
-# $Header: /usr/build/vile/vile/RCS/makefile.blc,v 1.19 2006/01/11 00:00:59 tom Exp $
+# $Header: /usr/build/vile/vile/RCS/makefile.blc,v 1.20 2006/04/21 13:38:05 tom Exp $
 #
 # Tested with
 #	Borland C++ 5.5.1
@@ -28,7 +28,7 @@
 RESFILE = $(TARGET).res
 !endif
 
-CFLAGS = -v -tWM -w-par -DWIN32_LEAN_AND_MEAN -Dscrn_chosen $(DISP_DEF)
+CFLAGS = -v -tWM -w-par -DWIN32_LEAN_AND_MEAN -Dscrn_chosen $(DISP_DEF) -I.
 
 # Use
 #	make -Dtrace
@@ -96,8 +96,6 @@
 	brc32 $(RESFILE)
 !endif
 
-$(OBJ):	estruct.h
-
 nebind.h \
 nefkeys.h \
 neexec.h \
@@ -125,27 +123,66 @@
 	- del *.obj
 	- del ne*.h
 
-$(OBJ) :	$(BUILTHDRS)
+VILEHDRS = $(BUILTHDRS) estruct.h
+
+api.obj :	$(VILEHDRS)	api.h
+$(SCREEN).obj :	$(VILEHDRS)	winvile.h pscreen.h patchlev.h
+basic.obj :	$(VILEHDRS)
+bind.obj :	$(VILEHDRS)
+btree.obj :	$(VILEHDRS)	btree.h
+buffer.obj :	$(VILEHDRS)
+csrch.obj :	$(VILEHDRS)
+display.obj :	$(VILEHDRS)	pscreen.h
+eval.obj :	$(VILEHDRS)
+exec.obj :	$(VILEHDRS)
+externs.obj :	$(VILEHDRS)
+fences.obj :	$(VILEHDRS)
+file.obj :	$(VILEHDRS)
+filec.obj :	$(VILEHDRS)	dirstuff.h
+fileio.obj :	$(VILEHDRS)
+finderr.obj :	$(VILEHDRS)
+glob.obj :	$(VILEHDRS)	dirstuff.h
+globals.obj :	$(VILEHDRS)
+history.obj :	$(VILEHDRS)
+input.obj :	$(VILEHDRS)
+insert.obj :	$(VILEHDRS)
+isearch.obj :	$(VILEHDRS)
+itbuff.obj :	$(VILEHDRS)
+line.obj :	$(VILEHDRS)
+main.obj :	$(VILEHDRS)	chgdfunc.h 
+map.obj :	$(VILEHDRS)
+modes.obj :	$(VILEHDRS)	chgdfunc.h 
+msgs.obj :	$(VILEHDRS)
+nullterm.obj :	$(VILEHDRS)
+oneliner.obj :	$(VILEHDRS)
+opers.obj :	$(VILEHDRS)
+path.obj :	$(VILEHDRS)	dirstuff.h
+perl.obj :	$(VILEHDRS)	api.h
+random.obj :	$(VILEHDRS)	dirstuff.h
+regexp.obj :	$(VILEHDRS)
+region.obj :	$(VILEHDRS)
+search.obj :	$(VILEHDRS)
+select.obj :	$(VILEHDRS)
+spawn.obj :	$(VILEHDRS)
+statevar.obj :	$(VILEHDRS)	patchlev.h
+tags.obj :	$(VILEHDRS)	btree.h
+tbuff.obj :	$(VILEHDRS)
+termio.obj :	$(VILEHDRS)
+trace.obj :	$(VILEHDRS)
+ucrypt.obj :	$(VILEHDRS)
+undo.obj :	$(VILEHDRS)
+version.obj :	$(VILEHDRS)	patchlev.h
+w32cbrd.obj :	$(VILEHDRS)
+w32cmd.obj :	$(VILEHDRS)	winvile.h
+w32ole.obj :	$(VILEHDRS)	w32ole.h winviletlb.h w32reg.h
+w32misc.obj :	$(VILEHDRS)
+w32oo.obj :	$(VILEHDRS)	dirstuff.h
+w32pipe.obj :	$(VILEHDRS)
+w32reg.obj :	$(VILEHDRS)	w32reg.h
+window.obj :	$(VILEHDRS)
+word.obj :	$(VILEHDRS)
+wordmov.obj :	$(VILEHDRS)
 
-api.obj :	api.h
-bind.obj :	btree.h
-btree.obj :	btree.h
-display.obj :	pscreen.h
-filec.obj :	dirstuff.h
-glob.obj :	dirstuff.h
-main.obj :	chgdfunc.h 
-modes.obj :	chgdfunc.h 
-ntwinio.obj :	winvile.h pscreen.h patchlev.h
-path.obj :	dirstuff.h
-perl.obj :	api.h
-random.obj :	dirstuff.h
-statevar.obj :	patchlev.h
-tags.obj :	btree.h
-version.obj :	patchlev.h
-w32cmd.obj :	winvile.h
-w32ole.obj :	w32ole.h winviletlb.h w32reg.h
-w32oo.obj :	dirstuff.h
-w32reg.obj :	w32reg.h
 wvwrap.obj :	w32reg.h w32ole.h winviletlb.h
 
 winvile.res :	winvile.rc winvile.h
Index: map.c
Prereq:  1.108 
--- vile-9.5g+/map.c	2005-11-23 01:33:46.000000000 +0000
+++ vile-9.5h/map.c	2006-04-20 09:49:23.000000000 +0000
@@ -3,7 +3,7 @@
  *	Original interface by Otto Lind, 6/3/93
  *	Additional map and map! support by Kevin Buettner, 9/17/94
  *
- * $Header: /usr/build/vile/vile/RCS/map.c,v 1.108 2005/11/23 01:33:46 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/map.c,v 1.109 2006/04/20 09:49:23 tom Exp $
  *
  */
 
@@ -484,7 +484,7 @@
 	/* reverse the lhs */
 	int i;
 	char t;
-	int len = tb_length(kbuf) - 1;
+	int len = tb_length0(kbuf);
 	char *s = tb_values(kbuf);
 	for (i = 0; i < len / 2; i++) {
 	    t = s[len - i - 1];
@@ -526,7 +526,7 @@
 
     reverse_abbr(mpp, bufname, kbuf);
 
-    status = addtomap(mpp, tb_values(kbuf), tb_length(kbuf) - 1,
+    status = addtomap(mpp, tb_values(kbuf), tb_length0(kbuf),
 		      MAPF_USERTIMER | remapflag, -1, tb_values(val));
     relist_mappings(bufname);
     return status;
@@ -551,7 +551,7 @@
 
     reverse_abbr(mpp, bufname, kbuf);
 
-    if (delfrommap(mpp, tb_values(kbuf), tb_length(kbuf) - 1) != TRUE) {
+    if (delfrommap(mpp, tb_values(kbuf), tb_length0(kbuf)) != TRUE) {
 	mlforce("[Sequence not mapped]");
 	return FALSE;
     }
Index: mktbls.c
Prereq:  1.132 
--- vile-9.5g+/mktbls.c	2004-12-03 00:01:22.000000000 +0000
+++ vile-9.5h/mktbls.c	2006-05-21 20:53:14.000000000 +0000
@@ -15,12 +15,24 @@
  * by Tom Dickey, 1993.    -pgf
  *
  *
- * $Header: /usr/build/vile/vile/RCS/mktbls.c,v 1.132 2004/12/03 00:01:22 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/mktbls.c,v 1.135 2006/05/21 20:53:14 tom Exp $
  *
  */
 
-#if defined(__OS2__) && defined(__IBMC__) && (__IBMC__ >= 200)
+/*
+ * gcc (at least through 4.04) allows offsets, but g++ does not.
+ *
+ * Visual C++ warns about cases for 64-bit compiles that do not work with
+ * the default USE_OFFSETS=1, and that works with modern C compilers, but
+ * that does not work with some legacy C compilers, e.g., Solaris.  Since
+ * the Unix compilers mostly follow LP64 model, it is not (yet) necessary
+ * to make a configure script check to distinguish between the two - just
+ * support that USE_OFFSET=2 for Visual C++.
+ */
+#if defined(__GNUG__) || (defined(__OS2__) && defined(__IBMC__) && (__IBMC__ >= 200))
 #define USE_OFFSETS 0
+#elif defined(_MSC_VER)
+#define USE_OFFSETS 2
 #else
 #define USE_OFFSETS 1
 #endif
@@ -419,7 +431,9 @@
 static char *
 PadTo(int col, char *buffer)
 {
-    int any = 0, len = strlen(buffer), now;
+    int any = 0;
+    int len = (int) strlen(buffer);
+    int now;
     char with;
 
     for (;;) {
@@ -497,7 +511,7 @@
 
     for (c = 0; c < MAX_PARSE; c++)
 	vec[c] = "";
-    for (c = strlen(input); c > 0 && isSpace(input[c - 1]); c--)
+    for (c = (int) strlen(input); c > 0 && isSpace(input[c - 1]); c--)
 	input[c - 1] = EOS;
 
     for (n = 0; (c = input[n++]) != EOS;) {
@@ -708,7 +722,7 @@
 Name2Address(char *name, char *type)
 {
     /*  "+ 10" for comfort */
-    unsigned len = strlen(name) + 10;
+    unsigned len = (unsigned) strlen(name) + 10;
     char *base = Alloc(len);
     char *temp;
 
@@ -727,18 +741,20 @@
 static void
 DefineOffset(FILE *fp)
 {
-#if USE_OFFSETS
-    Fprintf(fp,
-	    "#ifndef\tMember_Offset\n\
+    Fprintf(fp, "#ifndef\tMember_Offset\n");
+#if USE_OFFSETS == 2
+    Fprintf(fp, "\
+#define\tMember_Offset(T,M) ((int)(((long)(&(((T*)0)->M) - (char *)0))/\\\n\
+\t\t\t\t ((long)(&(((T*)0)->Q1) - &(((T*)0)->s_MAX)))))\n");
+#elif USE_OFFSETS == 1
+    Fprintf(fp, "\
 #define\tMember_Offset(T,M) ((int)(((long)&(((T*)0)->M))/\\\n\
-\t\t\t\t ((long)&(((T*)0)->Q1) - (long)&(((T*)0)->s_MAX))))\n\
-#endif\n");
+\t\t\t\t ((long)&(((T*)0)->Q1) - (long)&(((T*)0)->s_MAX))))\n");
 #else
-    Fprintf(fp,
-	    "#ifndef\tMember_Offset\n\
-#define\tMember_Offset(T,M) ((vile_ ## M)-1)\n\
-#endif\n");
+    Fprintf(fp, "\
+#define\tMember_Offset(T,M) ((vile_ ## M)-1)\n");
 #endif
+    Fprintf(fp, "#endif\n");
 }
 
 /* generate the index-struct (used for deriving ifdef-able index definitions) */
Index: modes.c
Prereq:  1.314 
--- vile-9.5g+/modes.c	2006-02-15 21:09:04.000000000 +0000
+++ vile-9.5h/modes.c	2006-05-21 19:24:48.000000000 +0000
@@ -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.314 2006/02/15 21:09:04 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/modes.c,v 1.317 2006/05/21 19:24:48 tom Exp $
  *
  */
 
@@ -257,7 +257,7 @@
 /*
  * Returns the formatted length of a string value.
  */
-static int
+static size_t
 size_val(const struct VALNAMES *names, struct VAL *values)
 {
     return strlen(ModeName(names->name))
@@ -896,11 +896,11 @@
 const FSM_CHOICES *
 name_to_choices(const char *name)
 {
-    size_t i;
+    int i;
     const FSM_CHOICES *result = 0;
 
     fsm_idx = -1;
-    for (i = 1; i < TABLESIZE(fsm_tbl); i++) {
+    for (i = 1; i < (int) TABLESIZE(fsm_tbl); i++) {
 	if (strcmp(fsm_tbl[i].mode_name, name) == 0) {
 	    fsm_idx = i;
 	    result = fsm_tbl[i].choices;
@@ -1266,8 +1266,11 @@
 
 int
 /*ARGSUSED*/
-mode_eol(const char *buffer GCC_UNUSED, unsigned cpos GCC_UNUSED, int c, int eolchar)
+mode_eol(EOL_ARGS)
 {
+    (void) buffer;
+    (void) cpos;
+
     return (c == ' ' || c == eolchar);
 }
 
@@ -1949,7 +1952,7 @@
 	break;
     }
     (bp)->b_recordsep_str = recordsep;
-    (bp)->b_recordsep_len = strlen(get_record_sep(bp));
+    (bp)->b_recordsep_len = (int) strlen(get_record_sep(bp));
 }
 
 	/* Change the record separator */
@@ -2200,7 +2203,7 @@
 	} else {
 	    n = 0;
 	}
-	sizeof_my_mode_list = n;
+	sizeof_my_mode_list = (int) n;
     }
     return sizeof_my_mode_list;
 }
@@ -2280,7 +2283,7 @@
 
 /* format the name of a majormode's qualifier */
 static char *
-per_major(char *dst, const char *majr, int code, int brief)
+per_major(char *dst, const char *majr, size_t code, int brief)
 {
     if (brief) {
 	if (!strcmp(m_valnames[code].shortname, "X")) {
@@ -2502,7 +2505,7 @@
 	       my_majormodes[majormodes_order[j]].shortname,
 	       s));
 
-	for (k = count_majormodes() - 1;
+	for (k = (int) count_majormodes() - 1;
 	     k >= 0 && (kk = majormodes_order[k]) >= 0;
 	     k--) {
 	    t = my_majormodes[kk].shortname;
@@ -2656,7 +2659,7 @@
     init_my_mode_list();
 
     (void) per_submode(temp, majr, code, TRUE);
-    return search_mode_list(temp, count_modes(), FALSE) >= 0;
+    return search_mode_list(temp, (int) count_modes(), FALSE) >= 0;
 }
 
 /*
@@ -2669,8 +2672,8 @@
 	size_t j, k;
 	int found;
 
-	TRACE(("insert_per_major %ld %s\n", (long) count, name));
-	if ((found = search_mode_list(name, count, TRUE)) >= 0) {
+	TRACE(("insert_per_major %lu %s\n", (ULONG) count, name));
+	if ((found = search_mode_list(name, (int) count, TRUE)) >= 0) {
 	    char *newname = strmalloc(name);
 
 	    if (newname != 0) {
@@ -2697,7 +2700,7 @@
 	int found;
 	size_t j, k;
 
-	if ((found = search_mode_list(name, count, FALSE)) >= 0) {
+	if ((found = search_mode_list(name, (int) count, FALSE)) >= 0) {
 	    j = found;
 	    if (my_mode_list != all_modes
 		&& !in_all_modes(my_mode_list[j])) {
@@ -3266,10 +3269,10 @@
     }
 }
 
-static int
-extend_mode_list(int increment)
+static size_t
+extend_mode_list(size_t increment)
 {
-    int j, k;
+    size_t j, k;
 
     beginDisplay();
 
@@ -3404,7 +3407,7 @@
     MINORMODE *vals;
 
     if (my_majormodes != 0) {
-	int count = count_majormodes();
+	unsigned count = (unsigned) count_majormodes();
 	if (show_active_majormodes(0))
 	    bputc('\n');
 	for (j = 0; my_majormodes[j].shortname != 0; j++) {
@@ -3415,7 +3418,7 @@
 	    bprintf("--- \"%s\" majormode settings ",
 		    my_majormodes[j].shortname);
 	    bpadc('-', term.cols - 12 - DOT.o);
-	    bprintf("(%d:%d)",
+	    bprintf("(%d:%u)",
 		    find_majormode_order(j) + 1,
 		    count);
 	    bpadc('-', term.cols - DOT.o);
@@ -3665,7 +3668,8 @@
     int status;
     MAJORMODE *ptr;
     VALARGS args;
-    int j, k;
+    int j;
+    size_t k;
     int qualifier = FALSE;
     char temp[NSTRING];
     const char *rp;
Index: modetbl
Prereq:  1.238 
--- vile-9.5g+/modetbl	2006-02-16 00:35:21.000000000 +0000
+++ vile-9.5h/modetbl	2006-05-21 00:22:10.000000000 +0000
@@ -11,7 +11,7 @@
 #
 # The modes are table entries in the BUFFER and WINDOW structures.
 #
-# $Header: /usr/build/vile/vile/RCS/modetbl,v 1.238 2006/02/16 00:35:21 tom Exp $
+# $Header: /usr/build/vile/vile/RCS/modetbl,v 1.239 2006/05/21 00:22:10 cmorgan Exp $
 #
 #
 # Mode-table entries.  Capitalized letters are used for abbreviations.
@@ -25,6 +25,7 @@
 	"cd-on-open"	CD_ON_OPEN	0		OPT_SHELL # set working directory to that containing each newly opened buffer
 	"dirc"		DIRC		0		COMPLETE_DIRS # directory-completion (slow!)
 	"Alt-TabPos"	ALTTABPOS	0		# emacs-style cursor positioning
+	"echo-to-clipboard"	CBRD_ECHO	0	SYS_WINNT
 	"expand-path"	EXPAND_PATH	0		# true iff %/# don't substitute shortened-path
 	"ErrorBells"	ERRORBELLS	0		# audible/visible-bells
 	"flash"		FLASH		0		OPT_FLASH # visible-bell (flash)
Index: ntwinio.c
Prereq:  1.157 
--- vile-9.5g+/ntwinio.c	2006-02-19 18:17:19.000000000 +0000
+++ vile-9.5h/ntwinio.c	2006-04-25 23:13:32.000000000 +0000
@@ -1,7 +1,7 @@
 /*
  * Uses the Win32 screen API.
  *
- * $Header: /usr/build/vile/vile/RCS/ntwinio.c,v 1.157 2006/02/19 18:17:19 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/ntwinio.c,v 1.159 2006/04/25 23:13:32 tom Exp $
  * Written by T.E.Dickey for vile (october 1997).
  * -- improvements by Clark Morgan (see w32cbrd.c, w32pipe.c).
  */
@@ -92,7 +92,7 @@
 static HCURSOR wdwsize_cursor;
 static HMENU vile_menu, popup_menu;
 static LOGFONT vile_logfont;
-static UINT nIDTimer = 0;
+static SETTIMER_RETVAL nIDTimer = 0;
 static int ac_active = FALSE;	/* AutoColor active? */
 static int caret_disabled = TRUE;
 static int caret_exists = 0;
@@ -486,7 +486,7 @@
 }
 
 #if FIXME_POSCHANGING
-static int
+static WINDOW_PROC_RETVAL
 AdjustPosChanging(HWND hwnd, WINDOWPOS * pos)
 {
     if (!(pos->flags & SWP_NOSIZE)) {
@@ -532,7 +532,7 @@
  * Handle WM_SIZING, forcing the screen size to stay in multiples of a
  * character cell.
  */
-static int
+static WINDOW_PROC_RETVAL
 AdjustResizing(HWND hwnd, WPARAM fwSide, RECT * rect)
 {
     int wide = rect->right - rect->left;
@@ -1982,7 +1982,7 @@
     TRACE(("...invoke_popup_menu\n"));
 }
 
-static BOOL CALLBACK
+static DIALOG_PROC_RETVAL CALLBACK
 AboutBoxProc(HWND hDlg, UINT iMsg, WPARAM wParam, LPARAM lParam)
 {
     char buf[512];
@@ -2441,12 +2441,12 @@
  * the borders of the dummy window we're surrounding it with.  That's because
  * the resize-grip itself isn't resizable.
  */
-LONG FAR PASCAL
+WINDOW_PROC_RETVAL FAR PASCAL
 GripWndProc(
 	       HWND hWnd,
 	       UINT message,
 	       WPARAM wParam,
-	       LONG lParam)
+	       LPARAM lParam)
 {
     PAINTSTRUCT ps;
     HBRUSH brush;
@@ -2842,7 +2842,7 @@
 
 	case WM_CHAR:
 	    TRACE(("GETC:CHAR:%#x\n", msg.wParam));
-	    result = msg.wParam;
+	    result = (int) msg.wParam;
 	    /*
 	     * Check for modifieers on control keys such as tab.
 	     */
@@ -3317,12 +3317,12 @@
     quit(FALSE, 1);
 }
 
-LONG FAR PASCAL
+WINDOW_PROC_RETVAL FAR PASCAL
 TextWndProc(
 	       HWND hWnd,
 	       UINT message,
 	       WPARAM wParam,
-	       LONG lParam)
+	       LPARAM lParam)
 {
     RECT rect;
     HDC hDC;
@@ -3362,12 +3362,12 @@
     return (0);
 }
 
-LONG FAR PASCAL
+WINDOW_PROC_RETVAL FAR PASCAL
 MainWndProc(
 	       HWND hWnd,
 	       UINT message,
 	       WPARAM wParam,
-	       LONG lParam)
+	       LPARAM lParam)
 {
     static int resize_pending;	/* a resize, not a move */
     static HWND resize_hwnd;
@@ -3550,7 +3550,7 @@
 
     ZeroMemory(&wc, sizeof(&wc));
     wc.style = CS_VREDRAW | CS_HREDRAW;
-    wc.lpfnWndProc = (WNDPROC) MainWndProc;
+    wc.lpfnWndProc = MainWndProc;
     wc.cbClsExtra = 0;
     wc.cbWndExtra = 0;
     wc.hInstance = hInstance;
@@ -3695,7 +3695,7 @@
 {
     int argc;
     int n;
-    int maxargs = strlen(lpCmdLine) + 1;
+    size_t maxargs = strlen(lpCmdLine) + 1;
     char **argv = typecallocn(char *, maxargs + 10);
     char *ptr, *fontstr;
 #ifdef VILE_OLE
@@ -3724,7 +3724,7 @@
 		TRACE(("argv[%d]:%s\n", argc, argv[argc]));
 		++argc;
 	    }
-	    if (argc + 1 >= maxargs) {
+	    if ((size_t) (argc + 1) >= maxargs) {
 		break;
 	    }
 	    argv[argc] = dst = ptr;
Index: oneliner.c
Prereq:  1.108 
--- vile-9.5g+/oneliner.c	2005-07-13 23:43:54.000000000 +0000
+++ vile-9.5h/oneliner.c	2006-04-20 00:06:27.000000000 +0000
@@ -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.108 2005/07/13 23:43:54 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/oneliner.c,v 1.109 2006/04/20 00:06:27 tom Exp $
  */
 
 #include	"estruct.h"
@@ -379,7 +379,7 @@
 		    (void) update(TRUE);
 		    skipped = TRUE;
 		    /* so we don't match this again */
-		    DOT.o += exp->mlen;
+		    DOT.o += (C_NUM) exp->mlen;
 		    break;
 		case 'q':
 		    mlerase();
@@ -394,7 +394,7 @@
 		yes = TRUE;
 	    }
 	    if (yes) {
-		s = delins(exp, tb_values(replacepat), tb_length(replacepat));
+		s = delins(exp, tb_values(replacepat), (int) tb_length(replacepat));
 		if (s != TRUE)
 		    returnCode(s);
 		if (!again++)
@@ -450,7 +450,7 @@
  */
 
 static char *buf_delins;
-static UINT len_delins;
+static size_t len_delins;
 
 /*
  - delins - perform substitutions after a regexp match
@@ -492,7 +492,7 @@
     (void) memcpy(buf_delins, exp->startp[0], dlength);
     buf_delins[dlength] = EOS;
 
-    if (ldelete(dlength, FALSE) != TRUE) {
+    if (ldelete((L_NUM) dlength, FALSE) != TRUE) {
 	mlforce("[Error while deleting]");
 	return FALSE;
     }
@@ -554,8 +554,8 @@
 	case '&':
 	    if (exp->startp[no] != NULL && exp->endp[no] != NULL) {
 		char *cp = buf_delins;
-		long len = exp->endp[no] - exp->startp[no];
-		long adj = exp->startp[no] - exp->startp[0];
+		long len = (long) (exp->endp[no] - exp->startp[no]);
+		long adj = (long) (exp->startp[no] - exp->startp[0]);
 		cp += (size_t) adj;
 		while ((s == TRUE) && len--) {
 		    c = *cp++;
Index: patchlev.h
--- vile-9.5g+/patchlev.h	2006-03-14 21:36:22.000000000 +0000
+++ vile-9.5h/patchlev.h	2006-04-05 14:01:03.000000000 +0000
@@ -1,3 +1,3 @@
 #define VILE_VERSION "9.5"
 /* set to "" for no patches */
-#define VILE_PATCHLEVEL "g"
+#define VILE_PATCHLEVEL "h"
Index: path.c
Prereq:  1.150 
--- vile-9.5g+/path.c	2005-07-09 15:01:56.000000000 +0000
+++ vile-9.5h/path.c	2006-04-20 00:03:55.000000000 +0000
@@ -2,7 +2,7 @@
  *		The routines in this file handle the conversion of pathname
  *		strings.
  *
- * $Header: /usr/build/vile/vile/RCS/path.c,v 1.150 2005/07/09 15:01:56 Peter.Prymmer Exp $
+ * $Header: /usr/build/vile/vile/RCS/path.c,v 1.151 2006/04/20 00:03:55 tom Exp $
  *
  *
  */
@@ -934,9 +934,9 @@
 
 	/* Canonicalize the system name and share name. */
 	if (next)
-	    len = next - old_file + 1;
+	    len = (int) (next - old_file + 1);
 	else
-	    len = strlen(old_file);
+	    len = (int) strlen(old_file);
 	(void) memcpy(new_file, old_file, len);
 	new_file[len] = EOS;
 	(void) mklower(new_file);
@@ -972,7 +972,7 @@
 	next = strchr(current, SLASHC);
 	if (!next)
 	    next = end;
-	len = next - current;
+	len = (int) (next - current);
 	(void) memcpy(sofar, current, len);
 	sofar[len] = EOS;
 	h = FindFirstFile(new_file, &fd);
@@ -1609,7 +1609,7 @@
 #else
 	(void) strcpy(temp, cwd);
 #endif
-	len = strlen(temp);
+	len = (int) strlen(temp);
 	temp[len++] = SLASHC;
 	(void) vl_strncpy(temp + len, f, sizeof(temp) - len);
 	(void) strcpy(path, temp);
@@ -2227,7 +2227,7 @@
     max_len = max_path_len;
     if (trunc_buf_len - 1 < max_len)	/* "- 1" -> terminating NUL */
 	max_len = trunc_buf_len - 1;
-    path_len = strlen(path);
+    path_len = (int) strlen(path);
     if (path_len <= max_len)
 	strcpy(trunc_buf, path);	/* fits -- no issues */
     else {
Index: proto.h
Prereq:  1.564 
--- vile-9.5g+/proto.h	2006-01-13 01:29:15.000000000 +0000
+++ vile-9.5h/proto.h	2006-05-21 10:52:15.000000000 +0000
@@ -4,7 +4,7 @@
  *
  *   Created: Thu May 14 15:44:40 1992
  *
- * $Header: /usr/build/vile/vile/RCS/proto.h,v 1.564 2006/01/13 01:29:15 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/proto.h,v 1.567 2006/05/21 10:52:15 tom Exp $
  *
  */
 
@@ -136,7 +136,7 @@
 extern int kbd_complete (DONE_ARGS, const char *table, size_t size_entry);
 extern int kbd_engl_stat (const char *prompt, char *buffer, int stated);
 extern int kbd_length (void);
-extern int kcod2escape_seq (int c, char *ptr, int limit);
+extern int kcod2escape_seq (int c, char *ptr, size_t limit);
 extern int no_such_function (const char *fname);
 extern void kbd_erase (void);
 extern void kbd_erase_to_end (int column);
@@ -356,10 +356,10 @@
 extern int mac_literalarg (TBUFF **tok);
 extern int mac_token (TBUFF **tok);
 extern int macroize (TBUFF **p, TBUFF *src, int skip);
-extern int must_quote_token (const char * values, unsigned last);
+extern int must_quote_token (const char * values, size_t last);
 extern int scan_bool (const char *s );
 extern int toktyp (const char *tokn);
-extern void append_quoted_token (TBUFF ** dst, const char * values, unsigned last);
+extern void append_quoted_token (TBUFF ** dst, const char * values, size_t last);
 
 #ifdef const
 #define skip_blanks(s) skip_cblanks(s)
@@ -424,7 +424,7 @@
 #endif
 
 /* exec.c */
-extern DIRECTIVE dname_to_dirnum(char **cmdp, int length);
+extern DIRECTIVE dname_to_dirnum(char **cmdp, size_t length);
 extern int do_source (char *fname, int n, int optional);
 extern int dobuf (BUFFER *bp, int n);
 extern int docmd (char *cline, int execflag, int f, int n);
@@ -483,7 +483,7 @@
 extern int mlreply_file (const char *prompt, TBUFF **buf, UINT flag, char *result);
 
 #if COMPLETE_FILES || COMPLETE_DIRS
-extern int fill_directory_buffer(BUFFER *bp, char *path, int dots);
+extern int fill_directory_buffer(BUFFER *bp, char *path, size_t dots);
 extern int path_completion (DONE_ARGS);
 extern void init_filec(const char *buffer_name);
 #endif
@@ -542,7 +542,7 @@
 
 /* history.c */
 #if OPT_HISTORY
-extern	int	edithistory (TBUFF **buffer, UINT *position, int *given, UINT options, int (*func)(EOL_ARGS), int eolchar);
+extern	int	edithistory (TBUFF **buffer, size_t *position, int *given, UINT options, int (*func)(EOL_ARGS), int eolchar);
 extern	void	hst_append (TBUFF *cmd, int glue, int can_extend);
 extern	void	hst_append_s (char *cmd, int glue, int can_extend);
 extern	void	hst_flush (void);
@@ -578,8 +578,8 @@
 extern int kbd_reply (const char *prompt, TBUFF **extbuf, int (*efunc)(EOL_ARGS), int eolchar, KBD_OPTIONS options, int (*cfunc)(DONE_ARGS));
 extern int kbd_seq (void);
 extern int kbd_seq_nomap (void);
-extern int kbd_show_response (TBUFF **dst, char *src, UINT bufn, int eolchar, KBD_OPTIONS options);
-extern int kbd_string (const char *prompt, char *extbuf, UINT bufn, int eolchar, KBD_OPTIONS options, int (*func)(DONE_ARGS));
+extern int kbd_show_response (TBUFF **dst, char *src, size_t bufn, int eolchar, KBD_OPTIONS options);
+extern int kbd_string (const char *prompt, char *extbuf, size_t bufn, int eolchar, KBD_OPTIONS options, int (*func)(DONE_ARGS));
 extern int kbd_string2 (const char *prompt, TBUFF **result, int eolchar, KBD_OPTIONS options, int (*complete)(DONE_ARGS));
 extern int kbm_started (int macnum, int force);
 extern int keystroke (void);
@@ -598,14 +598,14 @@
 extern int no_completion (DONE_ARGS);
 extern int read_quoted(int count, int verbose);
 extern int screen2tbuff (TBUFF **buf, CHARTYPE inclchartype);
-extern int screen_string (char *buf, int bufn, CHARTYPE inclchartype);
+extern int screen_string (char *buf, size_t bufn, CHARTYPE inclchartype);
 extern int start_kbm (int n, int macnum, ITBUFF *ptr);
 extern int tgetc (int quoted);
 extern int tgetc_avail (void);
 extern void dotcmdstop (void);
 extern void get_kbd_macro(TBUFF **rp);
 extern void incr_dot_kregnum (void);
-extern void kbd_kill_response (TBUFF *buf, UINT *position, int c);
+extern void kbd_kill_response (TBUFF *buf, size_t *position, int c);
 extern void kbd_mac_check(void);
 extern void kbd_pushback (TBUFF *buf, int skip);
 extern void set_end_string (int c);
@@ -1016,7 +1016,7 @@
 extern	int	attributeregion (void);
 extern	int	attributeregion_in_region(REGION *rp, REGIONSHAPE shape,
 					    VIDEO_ATTR vattr, char *hc);
-extern	int	decode_attribute (char *text, int length, int offset, int *countp);
+extern	int	decode_attribute (char *text, size_t length, size_t offset, int *countp);
 extern	int	sel_begin	(void);
 extern	int	sel_extend	(int wiping, int include_dot);
 extern	int	sel_get_leftmark(MARK *result);
@@ -1113,6 +1113,7 @@
 int	tb_next (TBUFF *p);
 int	tb_peek (TBUFF *p);
 size_t	tb_length (TBUFF *p);
+int	tb_length0 (TBUFF *p);
 void	tb_first (TBUFF *p);
 void	tb_free (TBUFF **p);
 void	tb_setlen (TBUFF **p, int n);
@@ -1324,7 +1325,7 @@
 #endif
 
 /* word.c */
-extern int ffgetline (int *lenp);
+extern int ffgetline (size_t *lenp);
 extern int formatregion (void);
 extern int isendviwordf (void);
 extern int isendwordf (void);
Index: random.c
Prereq:  1.291 
--- vile-9.5g+/random.c	2006-02-19 20:53:10.000000000 +0000
+++ vile-9.5h/random.c	2006-04-20 00:02:43.000000000 +0000
@@ -2,7 +2,7 @@
  * This file contains the command processing functions for a number of random
  * commands. There is no functional grouping here, for sure.
  *
- * $Header: /usr/build/vile/vile/RCS/random.c,v 1.291 2006/02/19 20:53:10 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/random.c,v 1.292 2006/04/20 00:02:43 tom Exp $
  *
  */
 
@@ -1400,7 +1400,7 @@
     beginDisplay();
     if ((np = castalloc(char, strlen(fname) + NFILEN)) == NULL) {
 	bp->b_fname = out_of_mem;
-	bp->b_fnlen = strlen(bp->b_fname);
+	bp->b_fnlen = (int) strlen(bp->b_fname);
 	no_memory("ch_fname");
     } else {
 	strcpy(np, fname);
@@ -1409,7 +1409,7 @@
 	if (!isInternalName(np))
 	    (void) lengthen_path(np);
 
-	len = strlen(np) + 1;
+	len = (int) strlen(np) + 1;
 
 	if (bp->b_fname == 0 || strcmp(bp->b_fname, np)) {
 
@@ -1424,7 +1424,7 @@
 	    if (!bp->b_fname) {
 		if ((bp->b_fname = strmalloc(np)) == 0) {
 		    bp->b_fname = out_of_mem;
-		    bp->b_fnlen = strlen(bp->b_fname);
+		    bp->b_fnlen = (int) strlen(bp->b_fname);
 		    no_memory("ch_fname");
 		    (void) free(np);
 		    endofDisplay();
Index: regexp.c
Prereq:  1.117 
--- vile-9.5g+/regexp.c	2006-01-10 01:19:19.000000000 +0000
+++ vile-9.5h/regexp.c	2006-04-20 00:01:45.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * $Header: /usr/build/vile/vile/RCS/regexp.c,v 1.117 2006/01/10 01:19:19 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/regexp.c,v 1.118 2006/04/20 00:01:45 tom Exp $
  *
  * Copyright 2005, Thomas E. Dickey and Paul G. Fox
  *
@@ -609,7 +609,7 @@
 		    len = OPSIZE(scan);
 		}
 	    if (longest) {
-		r->regmust = longest - r->program;
+		r->regmust = (int) (longest - r->program);
 		r->regmlen = len;
 	    }
 	}
@@ -970,7 +970,7 @@
 
     unsigned n;
     for (n = 0; n < sizeof(char_classes) / sizeof(char_classes[0]); n++) {
-	unsigned len = strlen(char_classes[n].name);
+	size_t len = strlen(char_classes[n].name);
 	if (!strncmp(*src, char_classes[n].name, len)) {
 	    *src += len;
 	    return char_classes[n].escape;
@@ -1013,7 +1013,7 @@
 	}
 	++s;
     }
-    return (s - base);
+    return (int) (s - base);
 }
 
 /*
@@ -1426,9 +1426,9 @@
 
     if (OP(scan) == BACK
 	|| OP(scan) == RCOMPLX)
-	offset = scan - val;
+	offset = (int) (scan - val);
     else
-	offset = val - scan;
+	offset = (int) (val - scan);
     SET_NEXT(scan, offset);
 }
 
@@ -1466,7 +1466,7 @@
 static int
 regstrncmp(const char *txt_a,
 	   const char *txt_b,
-	   unsigned len_b,
+	   size_t len_b,
 	   const char *end_a)
 {
     if (end_a == NULL
@@ -1630,7 +1630,7 @@
     }
 
     if (endoff < 0)
-	endoff = stringend - string;
+	endoff = (int) (stringend - string);
 
     endsrch = &string[endoff];
 
@@ -2142,7 +2142,7 @@
 
     switch (OP(p)) {
     case ANY:
-	count = regnomore - scan;
+	count = (int) (regnomore - scan);
 	scan += count;
 	break;
     case EXACTLY:
Index: region.c
Prereq:  1.132 
--- vile-9.5g+/region.c	2005-07-14 00:36:03.000000000 +0000
+++ vile-9.5h/region.c	2006-04-19 23:55:02.000000000 +0000
@@ -3,7 +3,7 @@
  * and mark.  Some functions are commands.  Some functions are just for
  * internal use.
  *
- * $Header: /usr/build/vile/vile/RCS/region.c,v 1.132 2005/07/14 00:36:03 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/region.c,v 1.133 2006/04/19 23:55:02 tom Exp $
  *
  */
 
@@ -290,7 +290,7 @@
     }
     DOT.o = l;
     if (string) {
-	len = strlen(string);
+	len = (int) strlen(string);
 	if (len < r - l)
 	    len = r - l;
     } else {
@@ -422,12 +422,12 @@
  */
 /*ARGSUSED*/
 int
-detabline(void *flagp GCC_UNUSED, int l GCC_UNUSED, int r GCC_UNUSED)
+detabline(void *flagp, int l GCC_UNUSED, int r GCC_UNUSED)
 {
     int s;
     int c;
     int ocol;
-    long leadingonly = (long) flagp;
+    int leadingonly = (flagp != 0);
     LINE *lp = DOT.l;
 
     if (llength(lp) == 0)
@@ -483,10 +483,10 @@
  */
 /*ARGSUSED*/
 int
-entabline(void *flagp GCC_UNUSED, int l GCC_UNUSED, int r GCC_UNUSED)
+entabline(void *flagp, int l GCC_UNUSED, int r GCC_UNUSED)
 {
     int savecol;
-    long leadingonly = (long) flagp;
+    int leadingonly = (flagp != 0);
     LINE *lp = DOT.l;
     C_NUM ocol, ncol;
     C_NUM ooff, noff;
@@ -663,7 +663,7 @@
 	/* so there's nothing beyond the rect, so insert at
 	   most r-l chars of the string, or nothing */
 	if (string) {
-	    len = strlen(string);
+	    len = (int) strlen(string);
 	    if (len > r - l)
 		len = r - l;
 	} else {
@@ -1263,7 +1263,7 @@
 		    regionshape = EXACT;
 		    deltoeol(TRUE, 1);
 		    DOT.o = b_left_margin(curbp);
-		    lstrinsert(tb_values(text), tb_length(text));
+		    lstrinsert(tb_values(text), (int) tb_length(text));
 
 		    forwbline(FALSE, 1);
 		    gotobol(FALSE, 1);
Index: revlist
--- vile-9.5g+/revlist	2006-04-02 18:36:43.000000000 +0000
+++ vile-9.5h/revlist	2006-05-22 00:27:01.000000000 +0000
@@ -1,6 +1,6 @@
-revlist for vile, version v9_5g
+revlist for vile, version v9_5h
 --------------------------------------------------------------------------------
-CHANGES	1.912
+CHANGES	1.921
 CHANGES.R3	1.1
 CHANGES.R4	1.1
 CHANGES.R5	1.1
@@ -10,98 +10,98 @@
 COPYING	1.4
 INSTALL	1.6
 MANIFEST	none
-README	1.94
+README	1.95
 README.PC	1.33
 README.VMS	1.5
-aclocal.m4	1.158
+aclocal.m4	1.160
 ansi.c	1.48
 api.c	1.37
 api.h	1.13
 basic.c	1.124
-bind.c	1.291
+bind.c	1.296
 borland.c	1.36
-btree.c	1.22
-btree.h	1.4
-buffer.c	1.298
+btree.c	1.23
+btree.h	1.5
+buffer.c	1.299
 buglist	1.403
 builtflt.c	1.47
 chgdfunc.h	1.18
 cmdtbl	1.238
-config.guess	1.2
-config.sub	1.2
+config.guess	1.3
+config.sub	1.3
 config_h.in	1.2
-configure	1.3
-configure.in	1.221
+configure	1.4
+configure.in	1.222
 csrch.c	1.32
 curses.c	1.27
 descrip.mms	1.48
 dirstuff.h	1.30
-display.c	1.416
+display.c	1.418
 djhandl.c	1.6
 dumbterm.c	1.21
 edef.h	1.323
-estruct.h	1.595
-eval.c	1.351
-exec.c	1.282
+estruct.h	1.597
+eval.c	1.353
+exec.c	1.285
 externs.c	1.10
-fences.c	1.83
-file.c	1.391
-filec.c	1.121
-fileio.c	1.179
+fences.c	1.84
+file.c	1.393
+filec.c	1.124
+fileio.c	1.181
 finderr.c	1.130
-glob.c	1.87
+glob.c	1.88
 globals.c	1.48
 gppconio.c	1.2
-history.c	1.82
-input.c	1.284
+history.c	1.84
+input.c	1.289
 insert.c	1.143
 install.sh	1.7
 isearch.c	1.60
 itbuff.c	1.25
 lckfiles.c	1.11
-line.c	1.170
-main.c	1.549
-makefile.blc	1.19
+line.c	1.171
+main.c	1.551
+makefile.blc	1.20
 makefile.djg	1.35
 makefile.icc	1.16
 makefile.in	1.202
 makefile.wnt	1.91
-map.c	1.108
+map.c	1.109
 menu.c	1.48
 mkdirs.sh	1.6
 mkprlenv.wnt	1.9
-mktbls.c	1.132
-modes.c	1.314
-modetbl	1.238
+mktbls.c	1.135
+modes.c	1.317
+modetbl	1.239
 msgs.c	1.26
 npopen.c	1.94
 ntconio.c	1.87
-ntwinio.c	1.157
+ntwinio.c	1.159
 nullterm.c	1.3
-oneliner.c	1.108
+oneliner.c	1.109
 opers.c	1.90
 os2keys.h	1.2
 os2pipe.c	1.5
 os2vio.c	1.35
-patchlev.h	1.343
-path.c	1.150
+patchlev.h	1.344
+path.c	1.151
 perl.xs	1.104
 plugin.c	1.1
 plugin.h	1.1
-proto.h	1.564
+proto.h	1.567
 pscreen.h	1.2
 ptypemap	1.7
-random.c	1.291
-regexp.c	1.117
-region.c	1.132
-revlist	v9_5g
-search.c	1.137
-select.c	1.158
+random.c	1.292
+regexp.c	1.118
+region.c	1.133
+revlist	v9_5h
+search.c	1.138
+select.c	1.161
 sinstall.sh	1.1
-spawn.c	1.190
-statevar.c	1.97
-tags.c	1.128
-tbuff.c	1.64
+spawn.c	1.191
+statevar.c	1.98
+tags.c	1.130
+tbuff.c	1.66
 tcap.c	1.170
 tcap.h	1.10
 termio.c	1.211
@@ -111,34 +111,34 @@
 ucrypt.c	1.15
 undo.c	1.88
 version.c	1.59
-vile-9.5.spec	1.8
-vile.1	1.30
-vile.hlp	1.610
+vile-9.5.spec	1.9
+vile.1	1.31
+vile.hlp	1.612
 vile.wmconfig	1.1
 vl_alloc.h	1.1
 vl_ctype.h	1.4
-vl_regex.h	1.3
+vl_regex.h	1.4
 vms2unix.c	1.42
 vmsbuild.com	1.46
 vmspipe.c	1.14
 vmsvt.c	1.63
 w32cbrd.c	1.25
-w32cmd.c	1.36
-w32misc.c	1.46
+w32cmd.c	1.37
+w32misc.c	1.47
 w32ole.cpp	1.25
 w32ole.h	1.6
 w32ole.rc	1.2
 w32oo.cpp	1.7
-w32pipe.c	1.32
-w32reg.c	1.9
+w32pipe.c	1.33
+w32reg.c	1.10
 w32reg.h	1.1
-w32vile.h	1.2
+w32vile.h	1.4
 watch.c	1.5
 window.c	1.106
 winvile.h	1.11
 winvile.odl	1.6
 winvile.rc	1.11
-word.c	1.79
+word.c	1.80
 wordmov.c	1.22
 wvwrap.cpp	1.10
 x11.c	1.285
@@ -158,51 +158,51 @@
 doc/oleauto.doc	1.8
 doc/perl.doc	1.2
 doc/visvile.doc	1.9
-filters/ada-filt.l	1.12
+filters/ada-filt.l	1.14
 filters/ada.key	1.1
-filters/as-filt.l	1.4
+filters/as-filt.l	1.6
 filters/as.key	1.2
 filters/as386.key	1.2
-filters/asm-filt.l	1.4
+filters/asm-filt.l	1.6
 filters/asm.key	1.1
-filters/atr2ansi.c	1.2
-filters/atr2html.c	1.2
-filters/atr2text.c	1.2
-filters/au3-filt.l	1.4
+filters/atr2ansi.c	1.3
+filters/atr2html.c	1.3
+filters/atr2text.c	1.3
+filters/au3-filt.l	1.6
 filters/au3.key	1.4
-filters/awk-filt.l	1.15
+filters/awk-filt.l	1.17
 filters/awk.key	1.2
-filters/bas-filt.l	1.10
+filters/bas-filt.l	1.12
 filters/basic.key	1.4
-filters/bat-filt.l	1.22
+filters/bat-filt.l	1.24
 filters/bat.key	1.4
-filters/bnf-filt.l	1.7
+filters/bnf-filt.l	1.9
 filters/bnf.key	1.1
-filters/c-filt.c	1.73
+filters/c-filt.c	1.74
 filters/c-filt.flx	1.1
 filters/c.key	1.11
-filters/cfg-filt.l	1.12
+filters/cfg-filt.l	1.14
 filters/cpp.key	1.7
 filters/cs.key	1.1
 filters/csh.key	1.1
-filters/css-filt.l	1.12
+filters/css-filt.l	1.13
 filters/css.key	1.5
 filters/cweb.key	1.2
-filters/cwebfilt.l	1.16
-filters/dcl-filt.l	1.16
+filters/cwebfilt.l	1.17
+filters/dcl-filt.l	1.18
 filters/dcl.key	1.5
-filters/def-filt.l	1.7
+filters/def-filt.l	1.9
 filters/def.key	1.1
 filters/diff.key	1.1
-filters/difffilt.l	1.6
-filters/ecl-filt.l	1.5
+filters/difffilt.l	1.7
+filters/ecl-filt.l	1.6
 filters/ecl.key	1.1
 filters/ecrypt.c	1.8
 filters/esql.key	1.3
-filters/esqlfilt.l	1.14
-filters/est-filt.l	1.4
+filters/esqlfilt.l	1.16
+filters/est-filt.l	1.6
 filters/est.key	1.1
-filters/fdl-filt.l	1.10
+filters/fdl-filt.l	1.12
 filters/fdl.key	1.4
 filters/filterio.c	1.28
 filters/filters.c	1.99
@@ -213,29 +213,29 @@
 filters/genmake.c	1.4
 filters/genmake.mak	1.30
 filters/html.key	1.8
-filters/htmlfilt.l	1.36
+filters/htmlfilt.l	1.38
 filters/imake.key	1.4
-filters/imakeflt.l	1.14
-filters/infofilt.l	1.6
-filters/ini-filt.l	1.4
+filters/imakeflt.l	1.16
+filters/infofilt.l	1.8
+filters/ini-filt.l	1.6
 filters/ini.key	1.1
-filters/iss-filt.l	1.4
+filters/iss-filt.l	1.6
 filters/iss.key	1.4
 filters/java.key	1.3
 filters/js.key	1.4
-filters/key-filt.c	1.19
+filters/key-filt.c	1.20
 filters/latex.key	1.2
-filters/latexflt.l	1.41
-filters/lex-filt.l	1.58
+filters/latexflt.l	1.43
+filters/lex-filt.l	1.60
 filters/lex.key	1.8
 filters/lisp.key	1.2
-filters/lispfilt.l	1.11
-filters/lua-filt.l	1.3
+filters/lispfilt.l	1.13
+filters/lua-filt.l	1.5
 filters/lua.key	1.2
-filters/m4-filt.c	1.25
+filters/m4-filt.c	1.27
 filters/m4.key	1.3
 filters/mail.key	1.3
-filters/mailfilt.l	1.19
+filters/mailfilt.l	1.20
 filters/make.key	1.8
 filters/makefile.2nd	1.12
 filters/makefile.djg	1.3
@@ -243,11 +243,11 @@
 filters/makefile.icc	1.3
 filters/makefile.in	1.80
 filters/makefile.wnt	1.32
-filters/makefilt.l	1.52
+filters/makefilt.l	1.54
 filters/makelist.sh	1.5
 filters/manfilt.c	1.36
 filters/midl.key	1.3
-filters/midlfilt.l	1.2
+filters/midlfilt.l	1.4
 filters/mk-0th.awk	1.9
 filters/mk-0th.bat	1.6
 filters/mk-1st.awk	1.12
@@ -255,80 +255,80 @@
 filters/mk-2nd.awk	1.17
 filters/mk-2nd.bat	1.7
 filters/mk-key.awk	1.2
-filters/mms-filt.l	1.12
+filters/mms-filt.l	1.14
 filters/noclass.sh	1.6
-filters/nr-filt.l	1.18
+filters/nr-filt.l	1.20
 filters/nr.key	1.1
 filters/nsis.key	1.4
-filters/pas-filt.l	1.3
+filters/pas-filt.l	1.5
 filters/pas.key	1.4
 filters/pc.key	1.1
 filters/perl.key	1.8
-filters/perlfilt.l	1.43
-filters/php-filt.l	1.4
+filters/perlfilt.l	1.45
+filters/php-filt.l	1.6
 filters/php.key	1.3
-filters/pl-filt.c	1.82
-filters/pot-filt.l	1.5
+filters/pl-filt.c	1.83
+filters/pot-filt.l	1.7
 filters/pot.key	1.1
-filters/ps-filt.l	1.7
+filters/ps-filt.l	1.9
 filters/ps.key	1.2
-filters/py-filt.l	1.12
-filters/py.key	1.1
-filters/rb-filt.l	1.14
+filters/py-filt.l	1.13
+filters/py.key	1.3
+filters/rb-filt.l	1.15
 filters/rb.key	1.4
-filters/rc-filt.l	1.6
+filters/rc-filt.l	1.8
 filters/rc.key	1.2
-filters/rcs-filt.l	1.9
+filters/rcs-filt.l	1.11
 filters/rcs.key	1.1
 filters/rexx.key	1.1
-filters/rexxfilt.l	1.8
-filters/rpm-filt.l	1.11
+filters/rexxfilt.l	1.9
+filters/rpm-filt.l	1.13
 filters/rpm.key	1.3
-filters/rubyfilt.c	1.39
+filters/rubyfilt.c	1.40
 filters/sccs.key	1.1
-filters/sccsfilt.l	1.12
-filters/sed-filt.c	1.21
-filters/sh-filt.l	1.65
+filters/sccsfilt.l	1.14
+filters/sed-filt.c	1.22
+filters/sh-filt.l	1.67
 filters/sh.key	1.4
-filters/sml-filt.l	1.5
+filters/sml-filt.l	1.6
 filters/sml.key	1.1
 filters/spell.rc	1.6
-filters/spellflt.l	1.23
-filters/sql-filt.l	1.28
+filters/spellflt.l	1.24
+filters/sql-filt.l	1.31
 filters/sql.key	1.9
 filters/syntax.key	1.1
 filters/tags.key	1.1
-filters/tagsfilt.c	1.7
-filters/tbl-filt.l	1.9
+filters/tagsfilt.c	1.8
+filters/tbl-filt.l	1.11
 filters/tbl.key	1.1
-filters/tc-filt.l	1.22
+filters/tc-filt.l	1.24
 filters/tc.key	1.2
-filters/tcl-filt.l	1.16
+filters/tcl-filt.l	1.18
 filters/tcl.key	1.10
 filters/tex.key	1.3
 filters/texi.key	1.1
-filters/texifilt.l	1.4
-filters/ti-filt.l	1.16
+filters/texifilt.l	1.6
+filters/ti-filt.l	1.18
 filters/ti.key	1.2
-filters/txt-filt.l	1.21
-filters/unfilter.c	1.8
+filters/txt-filt.l	1.23
+filters/unfilter.c	1.9
 filters/unfilter.h	1.1
-filters/vb.key	1.6
+filters/vb.key	1.7
 filters/vile.key	1.8
-filters/vilefilt.l	1.31
+filters/vilefilt.l	1.32
 filters/vim.key	1.2
-filters/vl-filt.l	1.11
+filters/vl-filt.l	1.13
 filters/vlog.key	1.10
-filters/wbt-filt.l	1.3
+filters/wbt-filt.l	1.5
 filters/wbt.key	1.3
-filters/xml-filt.l	1.13
+filters/xml-filt.l	1.15
 filters/xml.key	1.1
 filters/xres.key	1.2
-filters/xresfilt.l	1.16
-filters/xs-filt.l	1.11
+filters/xresfilt.l	1.18
+filters/xs-filt.l	1.12
 filters/xs.key	1.1
 filters/yacc.key	1.5
-filters/yaccfilt.l	1.22
+filters/yaccfilt.l	1.24
 icons/pumpkin.ico	1.3
 icons/pumpkin.xbm	1.2
 icons/pumpkin.xpm	1.2
@@ -345,7 +345,7 @@
 macros/gnugpg.rc	1.3
 macros/loaderrs.rc	1.1
 macros/manpage.rc	1.21
-macros/modes.rc	1.39
+macros/modes.rc	1.42
 macros/palettes.rc	1.7
 macros/pictmode.rc	1.4
 macros/search.rc	1.3
Index: search.c
Prereq:  1.137 
--- vile-9.5g+/search.c	2005-01-26 23:04:42.000000000 +0000
+++ vile-9.5h/search.c	2006-04-19 23:52:57.000000000 +0000
@@ -3,7 +3,7 @@
  * and backward directions.
  *  heavily modified by Paul Fox, 1990
  *
- * $Header: /usr/build/vile/vile/RCS/search.c,v 1.137 2005/01/26 23:04:42 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/search.c,v 1.138 2006/04/19 23:52:57 tom Exp $
  *
  * original written Aug. 1986 by John M. Gamble, but I (pgf) have since
  * replaced his regex stuff with Henry Spencer's regexp package.
@@ -669,7 +669,7 @@
 		videoattribute = VCOLORATTR(c + 1);
 	}
 	MK.l = DOT.l;
-	MK.o = DOT.o + gregexp->mlen;
+	MK.o = DOT.o + (C_NUM) gregexp->mlen;
 
 	/* provide a location for the next non-overlapping match */
 	nextdot = MK;
Index: select.c
Prereq:  1.158 
--- vile-9.5g+/select.c	2005-07-14 00:07:09.000000000 +0000
+++ vile-9.5h/select.c	2006-05-21 00:22:10.000000000 +0000
@@ -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.158 2005/07/14 00:07:09 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/select.c,v 1.161 2006/05/21 00:22:10 cmorgan Exp $
  *
  */
 
@@ -449,6 +449,11 @@
 	yankregion();
 	haveregion = NULL;
 
+#ifdef GMDCBRD_ECHO
+	if (global_g_val(GMDCBRD_ECHO))
+	    cbrdcpy_unnamed(FALSE, FALSE);
+#endif
+
 	pop_fake_win(save_wp, save_bp);
 
 	regionshape = save_shape;
@@ -1501,13 +1506,13 @@
  * Set videoattribute and hypercmd as side-effects.
  */
 int
-decode_attribute(char *text, int length, int offset, int *countp)
+decode_attribute(char *text, size_t length, size_t offset, int *countp)
 {
     int c;			/* current char during scan */
     int count = 0;
     int found;
 #if OPT_HYPERTEXT
-    int save_offset;
+    size_t save_offset;
 #endif
 
     while (text[offset] == CONTROL_A) {
@@ -1589,7 +1594,7 @@
 	    break;
     }
     *countp = count;
-    return offset;
+    return (int) offset;
 }
 
 /*
@@ -1711,9 +1716,9 @@
 {
     LINE *pastline;
     int skip;
-    int nbytes;
+    size_t nbytes;
+    size_t n;
     int done;
-    int n;
     int result = TRUE;
     int drained = FALSE;
 
@@ -1919,7 +1924,7 @@
 	lap = lp->l_attrs;
 	if (shift > 0) {
 	    int f, t, len;
-	    len = strlen((char *) lap);
+	    len = (int) strlen((char *) lap);
 	    t = len - 1;
 	    if (t > 0) {
 		for (f = t; f >= doto && f > t - shift; f--) {
@@ -2026,7 +2031,7 @@
     last = rp->r_end.o;
 
     if (lp->l_attrs != NULL) {
-	int len = strlen((char *) (lp->l_attrs));
+	int len = (int) strlen((char *) (lp->l_attrs));
 	/* Make sure the line attribute is long enough */
 	if (len < rp->r_end.o) {
 	    last = rp->r_end.o;
Index: spawn.c
Prereq:  1.190 
--- vile-9.5g+/spawn.c	2006-01-12 23:46:38.000000000 +0000
+++ vile-9.5h/spawn.c	2006-04-19 23:51:48.000000000 +0000
@@ -1,7 +1,7 @@
 /*	Spawn:	various DOS access commands
  *		for MicroEMACS
  *
- * $Header: /usr/build/vile/vile/RCS/spawn.c,v 1.190 2006/01/12 23:46:38 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/spawn.c,v 1.191 2006/04/19 23:51:48 tom Exp $
  *
  */
 
@@ -1188,7 +1188,7 @@
 	cp = strrchr(buf, '.');
 	if (cp)
 	    *cp = EOS;		/* trim file suffix */
-	shell_len = strlen(buf);
+	shell_len = (int) strlen(buf);
 	unix_shell = (shell_len >= 2 &&
 		      toLower(buf[shell_len - 2]) == 's' &&
 		      toLower(buf[shell_len - 1]) == 'h');
Index: statevar.c
Prereq:  1.97 
--- vile-9.5g+/statevar.c	2006-02-16 00:28:41.000000000 +0000
+++ vile-9.5h/statevar.c	2006-04-19 23:51:34.000000000 +0000
@@ -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.97 2006/02/16 00:28:41 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/statevar.c,v 1.98 2006/04/19 23:51:34 tom Exp $
  */
 
 #include	"estruct.h"
@@ -216,7 +216,7 @@
 	lgrabtext(rp, type);
 	return TRUE;
     } else if (vp && valid_buffer(curbp)) {
-	return lrepltext(type, vp, strlen(vp));
+	return lrepltext(type, vp, (int) strlen(vp));
     } else {
 	return FALSE;
     }
Index: tags.c
Prereq:  1.128 
--- vile-9.5g+/tags.c	2005-05-27 22:59:14.000000000 +0000
+++ vile-9.5h/tags.c	2006-04-25 20:13:21.000000000 +0000
@@ -5,7 +5,7 @@
  *	the cursor.
  *	written for vile: Copyright (c) 1990, 1995-2003 by Paul Fox
  *
- * $Header: /usr/build/vile/vile/RCS/tags.c,v 1.128 2005/05/27 22:59:14 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/tags.c,v 1.130 2006/04/25 20:13:21 tom Exp $
  *
  */
 #include "estruct.h"
@@ -220,7 +220,7 @@
 
 /* check if the binary-tree is up-to-date.  If not, rebuild it. */
 static const char **
-init_tags_cmpl(char *buf, unsigned cpos)
+init_tags_cmpl(char *buf, size_t cpos)
 {
     int tf_num;
     BUFFER *bp;
@@ -282,7 +282,7 @@
 static int
 tags_completion(DONE_ARGS)
 {
-    unsigned cpos = *pos;
+    size_t cpos = *pos;
     int status = FALSE;
     const char **nptr;
 
@@ -951,7 +951,7 @@
 
     if (taglen == 0) {
 	for (utp = untaghead; utp != 0; utp = utp->u_stklink) {
-	    n = strlen(utp->u_templ);
+	    n = (int) strlen(utp->u_templ);
 	    if (n > taglen)
 		taglen = n;
 	}
Index: tbuff.c
Prereq:  1.64 
--- vile-9.5g+/tbuff.c	2006-02-16 01:00:30.000000000 +0000
+++ vile-9.5h/tbuff.c	2006-04-21 10:55:46.000000000 +0000
@@ -7,7 +7,7 @@
  *	To do:	add 'tb_ins()' and 'tb_del()' to support cursor-level command
  *		editing.
  *
- * $Header: /usr/build/vile/vile/RCS/tbuff.c,v 1.64 2006/02/16 01:00:30 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/tbuff.c,v 1.66 2006/04/21 10:55:46 tom Exp $
  *
  */
 
@@ -484,8 +484,8 @@
 	int escaped = FALSE;
 	UINT delim = CharOf(value[0]);
 	UINT j, k, ch;
-	UINT have = tb_length(*p);
-	UINT used = have;
+	size_t have = tb_length(*p);
+	size_t used = have;
 
 	if (delim == SQUOTE) {
 	    for (j = k = 0; k < have; ++k) {
@@ -536,8 +536,8 @@
 	TRACE2(("...empty\n"));
     } else if (value != error_val && tb_length(*p)) {
 	UINT j;
-	UINT have = tb_length(*p) - 1;
-	UINT need = 2 + have;
+	size_t have = tb_length(*p) - 1;
+	size_t need = 2 + have;
 	int delim;
 
 	/* decide which delimiter we can use */
@@ -560,11 +560,12 @@
 	tb_alloc(p, need + 1);
 	(*p)->tb_used = need + 1;
 
+	value = tb_values(*p);
 	value[need] = EOS;
 	value[need - 1] = (char) delim;
 	for (j = 0; j < have; ++j) {
-	    UINT i = have - j - 1;
-	    UINT k = need - j - 2;
+	    size_t i = have - j - 1;
+	    size_t k = need - j - 2;
 	    UINT ch = CharOf(value[k] = value[i]);
 	    if (delim == DQUOTE && (ch == DQUOTE || ch == BACKSLASH)) {
 		--need;
@@ -619,6 +620,21 @@
 }
 
 /*
+ * returns the length of the data, assuming it is terminated by a trailing null which we
+ * do not want to count.
+ */
+int
+tb_length0(TBUFF *p)
+{
+    int result = (int) tb_length(p);
+
+    /* FIXME: we should have an assertion here */
+    if (result)
+	--result;
+    return result;
+}
+
+/*
  * Set the length of the buffer, increasing it if needed, and accounting for
  * errors.
  */
Index: vile-9.5.spec
Prereq:  1.8 
--- vile-9.5g+/vile-9.5.spec	2006-03-14 21:37:09.000000000 +0000
+++ vile-9.5h/vile-9.5.spec	2006-04-05 13:44:13.000000000 +0000
@@ -1,7 +1,7 @@
 Summary: VILE VI Like Emacs editor
-# $Header: /usr/build/vile/vile/RCS/vile-9.5.spec,v 1.8 2006/03/14 21:37:09 tom Exp $
+# $Header: /usr/build/vile/vile/RCS/vile-9.5.spec,v 1.9 2006/04/05 13:44:13 tom Exp $
 Name: vile
-Version: 9.5g
+Version: 9.5h
 # each patch should update the version
 Release: 1
 Copyright: GPL
@@ -13,8 +13,9 @@
 Patch3: vile-9.5c.patch.gz
 Patch4: vile-9.5d.patch.gz
 Patch5: vile-9.5e.patch.gz
-Patchf: vile-9.5f.patch.gz
-Patchf: vile-9.5g.patch.gz
+Patch6: vile-9.5f.patch.gz
+Patch7: vile-9.5g.patch.gz
+Patch8: vile-9.5h.patch.gz
 # each patch should add itself to this list
 Packager: Thomas Dickey <dickey@invisible-island.net>
 BuildRoot: %{_tmppath}/%{name}-root
@@ -34,6 +35,7 @@
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 # each patch should add itself to this list
 
 %build
@@ -86,6 +88,9 @@
 %changelog
 # each patch should add its ChangeLog entries here
 
+* Wed Apr 05 2006 Thomas Dickey
+- added patch for 9.5h
+
 * Tue Mar 14 2006 Thomas Dickey
 - added patch for 9.5g
 
Index: vile.1
Prereq:  1.30 
--- vile-9.5g+/vile.1	2002-05-07 00:39:42.000000000 +0000
+++ vile-9.5h/vile.1	2006-05-21 00:30:59.000000000 +0000
@@ -1,5 +1,5 @@
 .\" obligatory man page for vile
-.\" $Header: /usr/build/vile/vile/RCS/vile.1,v 1.30 2002/05/07 00:39:42 cmorgan Exp $
+.\" $Header: /usr/build/vile/vile/RCS/vile.1,v 1.31 2006/05/21 00:30:59 pgf Exp $
 .TH VILE 1
 .SH NAME
 vile, xvile \- \fBVI L\fRike \fBE\fRmacs
@@ -58,7 +58,7 @@
 to use
 .I vileinit.rc
 (which is installed)
-as the initialization file. 
+as the initialization file.
 If you do not have a .vilerc,
 .I vile
 will make a short one that sources
@@ -246,4 +246,7 @@
 .SH "BUGS"
 The "\fBVI L\fRike \fBE\fRmacs" joke isn't really funny.  It only
 sounds that way.  :-)   Other suspicious behavior should be reported
-to bugs@vile.cx .
+via the project mailing list, or via the web-based bug reporting
+system.  Both of these are available here:
+.PP
+https://savannah.nongnu.org/projects/vile
Index: vile.hlp
Prereq:  1.610 
--- vile-9.5g+/vile.hlp	2006-02-16 01:26:06.000000000 +0000
+++ vile-9.5h/vile.hlp	2006-05-21 00:31:14.000000000 +0000
@@ -332,6 +332,9 @@
 	will suppress the per-file and "Press return to continue" message.
 	This may be useful when using the command from within a macro.
 
+	The write-all-buffers command attempts to write all buffers whether
+	marked "modified" or not.
+
 	As in vi, ranges of lines specified by line numbers (including '.',
 	'$', and '%' shorthands) or marks may precede these commands.
 	Unlike vi, search patterns cannot be used as line specifiers.
@@ -1477,7 +1480,7 @@
 	for-buffers (fb) specifies whether globbing or regular expressions
 		are used to select buffer names in the for-buffers and
 		kill-buffer commands.  (U)
-		
+
 		The choices are
 			mixed	globbing with special exclusion for internal
 				names, i.e., with square brackets
@@ -1665,7 +1668,7 @@
 		means that the quick method is tried first, and if it fails to
 		allocate the large chunks needed for the buffer, it will retry
 		using the slow (small chunk) method.  Set to "fast" to use
-		only the fast method, and to "slow" for only the slow method. 
+		only the fast method, and to "slow" for only the slow method.
 		(U)
 
 	readonly (ro) Prevent writing a buffer to its associated file.  Unlike
@@ -5874,6 +5877,10 @@
 
 	Modes
 	-----
+	echo-to-clipboard
+			all text selected with the mouse is automatically
+			copied to the Windows clipboard. (U)
+
 	icursor		denotes a string that configures the characteristics
 			of an insertion cursor.
 
@@ -6211,15 +6218,17 @@
 	CDROM's.
 
 
-
 Problems
 --------
-	Send bug reports to
-		bugs@vile.cx
+	Submit bug reports via the project mailing list, or via
+	the web-based bug reporting system.  Both of these are
+	available here:
+		https://savannah.nongnu.org/projects/vile
+
+	Subscribing to the mailing list is also the best way to
+	keep informed of new releases.
 
-	Requests to be put on the announcement list should go to
-		announce-request@vile.cx
 
 Copyright 1995-2005,2006 by Paul Fox, Thomas Dickey, and Kevin Buettner
 --------------------------------------------------------------------
- $Header: /usr/build/vile/vile/RCS/vile.hlp,v 1.610 2006/02/16 01:26:06 tom Exp $
+ $Header: /usr/build/vile/vile/RCS/vile.hlp,v 1.612 2006/05/21 00:31:14 pgf Exp $
Index: vl_regex.h
Prereq:  1.3 
--- vile-9.5g+/vl_regex.h	2005-11-18 19:00:12.000000000 +0000
+++ vile-9.5h/vl_regex.h	2006-04-20 00:00:49.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * $Header: /usr/build/vile/vile/RCS/vl_regex.h,v 1.3 2005/11/18 19:00:12 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/vl_regex.h,v 1.4 2006/04/20 00:00:49 tom Exp $
  *
  * Copyright 2005, Thomas E. Dickey and Paul G. Fox
  *
@@ -51,7 +51,7 @@
 	int regstart;		/* Internal use only. */
 	char reganch;		/* Internal use only. */
 	int regmust;		/* Internal use only. */
-	unsigned regmlen;	/* Internal use only. */
+	size_t regmlen;		/* Internal use only. */
 	size_t size;		/* vile addition -- how big is this */
 	char program[1];	/* Unwarranted chumminess with compiler. */
 } regexp;
Index: w32cmd.c
Prereq:  1.36 
--- vile-9.5g+/w32cmd.c	2006-02-19 18:21:15.000000000 +0000
+++ vile-9.5h/w32cmd.c	2006-04-21 11:56:00.000000000 +0000
@@ -2,7 +2,7 @@
  * w32cmd:  collection of functions that add Win32-specific editor
  *          features (modulo the clipboard interface) to [win]vile.
  *
- * $Header: /usr/build/vile/vile/RCS/w32cmd.c,v 1.36 2006/02/19 18:21:15 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/w32cmd.c,v 1.37 2006/04/21 11:56:00 tom Exp $
  */
 
 #include "estruct.h"
@@ -213,7 +213,7 @@
     nfile = 0;
     for_ever
     {
-        len = strlen(cp);
+        len = (int) strlen(cp);
         if (len == 0)
             break;
         nfile++;
@@ -911,7 +911,7 @@
 
 
 
-static BOOL CALLBACK
+static DIALOG_PROC_RETVAL CALLBACK
 printer_dlg_proc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 {
     switch (msg)
@@ -1264,7 +1264,7 @@
                 printrect.left,
                 printrect.top + pparam->ychar * pparam->ypos++,
                 pparam->buf,
-                strlen(pparam->buf));
+                (int) strlen(pparam->buf));
         if (saw_ff || (++pparam->plines % pparam->mlpp == 0))
         {
             if (! winprint_endpage(pparam))
@@ -1409,7 +1409,7 @@
                     printrect.left,
                     printrect.top + pparam->ychar * pparam->ypos++,
                     pparam->buf,
-                    strlen(pparam->buf));
+                    (int) strlen(pparam->buf));
             if (saw_ff || (++pparam->plines % pparam->mlpp == 0))
             {
                 if (! winprint_endpage(pparam))
@@ -1556,7 +1556,7 @@
                     printrect.left,
                     printrect.top + pparam->ychar * pparam->ypos++,
                     pparam->buf,
-                    strlen(pparam->buf));
+                    (int) strlen(pparam->buf));
             if (saw_ff || (++pparam->plines % pparam->mlpp == 0))
             {
                 eop = TRUE;
@@ -1757,6 +1757,15 @@
 }
 
 
+static HINSTANCE
+GetHinstance(HWND hwnd)
+{
+#if (_MSC_VER >= 1300)
+    return (HINSTANCE) GetWindowLongPtr(hwnd, GWLP_HINSTANCE);
+#else
+    return (HINSTANCE) GetWindowLong(hwnd, GWL_HINSTANCE);
+#endif
+}
 
 /*
  * this feature doesn't support printing by "pages" because vile doesn't
@@ -1992,10 +2001,7 @@
     (void) EnableWindow(hwnd, FALSE);
 
     /* up goes the _modeless_ 'abort printing' dialog box */
-    hDlgCancelPrint = CreateDialog((HINSTANCE) GetWindowLong(
-                                                    hwnd,
-                                                    GWL_HINSTANCE
-                                                             ),
+    hDlgCancelPrint = CreateDialog(GetHinstance(hwnd),
                                    "PrintCancelDlg",
                                    hwnd,
                                    printer_dlg_proc);
@@ -2626,7 +2632,7 @@
                           0,
                           REG_SZ,
                           (const BYTE *) path,
-                          strlen(path) + 1) != ERROR_SUCCESS)
+                          (DWORD) strlen(path) + 1) != ERROR_SUCCESS)
         {
             disp_win32_error(W32_SYS_ERROR, winvile_hwnd());
         }
@@ -2674,7 +2680,7 @@
                               0,
                               REG_SZ,
                               (const BYTE *) *listp,
-                              strlen(*listp) + 1) != ERROR_SUCCESS)
+                              (DWORD) strlen(*listp) + 1) != ERROR_SUCCESS)
             {
                 disp_win32_error(W32_SYS_ERROR, winvile_hwnd());
                 break;
Index: w32misc.c
Prereq:  1.46 
--- vile-9.5g+/w32misc.c	2005-12-21 00:59:05.000000000 +0000
+++ vile-9.5h/w32misc.c	2006-04-21 11:53:40.000000000 +0000
@@ -2,7 +2,7 @@
  * w32misc:  collection of unrelated, common win32 functions used by both
  *           the console and GUI flavors of the editor.
  *
- * $Header: /usr/build/vile/vile/RCS/w32misc.c,v 1.46 2005/12/21 00:59:05 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/w32misc.c,v 1.47 2006/04/21 11:53:40 tom Exp $
  */
 
 #include "estruct.h"
@@ -212,7 +212,7 @@
     char        *out_str, *cp, *shell, *shell_c = "/c";
 
     shell        = get_shell();
-    len          = strlen(shell);
+    len          = (int) strlen(shell);
     bourne_shell = (len >= 2 &&
                     toLower(shell[len - 2]) == 's' &&
                     toLower(shell[len - 1]) == 'h')
@@ -243,7 +243,7 @@
 
         if (prepend_shc)
         {
-            alloc_len = strlen(cmd) + strlen(shell) + SHELL_C_LEN + 1;
+            alloc_len = (int) (strlen(cmd) + strlen(shell) + SHELL_C_LEN + 1);
             if ((out_str = typeallocn(char, alloc_len)) == NULL)
                 return (out_str);
             *allocd_mem = TRUE;
@@ -258,9 +258,9 @@
     }
 
     /* Else apply solutions 1-2 above. */
-    alloc_len = strlen(cmd) * 2; /* worst case -- every cmd byte quoted */
+    alloc_len = (int) strlen(cmd) * 2; /* worst case -- every cmd byte quoted */
     if (prepend_shc)
-        alloc_len += strlen(shell) + SHELL_C_LEN;
+        alloc_len += (int) strlen(shell) + SHELL_C_LEN;
     alloc_len += 3;              /* terminating nul + 2 quote chars     */
     if ((out_str = typeallocn(char, alloc_len)) == NULL)
     {
@@ -349,7 +349,7 @@
         {
             /* wait for shell process to exit */
 
-            (void) cwait(&rc, (int) pi.hProcess, 0);
+            (void) cwait(&rc, (CWAIT_PARAM_TYPE) pi.hProcess, 0);
         }
         (void) CloseHandle(pi.hProcess);
         (void) CloseHandle(pi.hThread);
@@ -695,7 +695,7 @@
         }
         if (! no_shell)
         {
-            (void) cwait(&rc, (int) pi.hProcess, 0);
+            (void) cwait(&rc, (CWAIT_PARAM_TYPE) pi.hProcess, 0);
             restore_signals();
             if (*pressret)
             {
@@ -1035,7 +1035,7 @@
 w32_wdw_title(void)
 {
     static char   *buf;
-    static size_t bufsize;
+    static DWORD  bufsize;
     int           nchars;
 
     if (! buf)
Index: w32pipe.c
Prereq:  1.32 
--- vile-9.5g+/w32pipe.c	2005-01-26 23:19:49.000000000 +0000
+++ vile-9.5h/w32pipe.c	2006-04-21 11:53:40.000000000 +0000
@@ -60,7 +60,7 @@
  *    situation, kill the app by typing ^C (and then please apply for a
  *    QA position with a certain Redmond company).
  *
- * $Header: /usr/build/vile/vile/RCS/w32pipe.c,v 1.32 2005/01/26 23:19:49 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/w32pipe.c,v 1.33 2006/04/21 11:53:40 tom Exp $
  */
 
 #define HAVE_FCNTL_H 1
@@ -360,7 +360,7 @@
         {
             if (! rc)
             {
-                size_t len;
+                unsigned len;
 
                 /*
                  * Shell process failed, put complaint in user's buffer.
@@ -368,7 +368,7 @@
                  * previously failed CreateProcess() call damaged the
                  * handle.
                  */
-                len = lsprintf(buf, SHELL_ERR_MSG, get_shell()) - buf;
+                len = (unsigned) (lsprintf(buf, SHELL_ERR_MSG, get_shell()) - buf);
                 (void) write(rp[2], buf, len);
                 (void) close(rp[2]);   /* in weird state; why not? */
             }
@@ -416,7 +416,7 @@
     (void) fclose(fp);
     if (proc_handle != BAD_PROC_HANDLE)
     {
-        (void) cwait(&term_status, (int) proc_handle, 0);
+        (void) cwait(&term_status, (CWAIT_PARAM_TYPE) proc_handle, 0);
 	TRACE(("...CreateProcess finished waiting in native_npclose\n"));
         (void) CloseHandle(proc_handle);
         proc_handle = BAD_PROC_HANDLE;
@@ -567,7 +567,7 @@
              * suck in shortly.
              */
 
-            len = lsprintf(buf, SHELL_ERR_MSG, get_shell()) - buf;
+            len = (DWORD) (lsprintf(buf, SHELL_ERR_MSG, get_shell()) - buf);
             (void) WriteFile(handles[1], buf, len, &dummy, NULL);
             FlushFileBuffers(handles[1]);
         }
@@ -575,7 +575,7 @@
         {
             /* wait for exec'd process to exit */
 
-            (void) cwait(&term_status, (int) proc_handle, 0);
+            (void) cwait(&term_status, (CWAIT_PARAM_TYPE) proc_handle, 0);
 	    TRACE(("...CreateProcess finished waiting in tmp_inout_popen\n"));
             (void) CloseHandle(proc_handle);
             proc_handle = BAD_PROC_HANDLE;
@@ -658,7 +658,7 @@
         {
             /* now wait for app to exit */
 
-            (void) cwait(&term_status, (int) proc_handle, 0);
+            (void) cwait(&term_status, (CWAIT_PARAM_TYPE) proc_handle, 0);
 	    TRACE(("...CreateProcess finished waiting in npflush\n"));
             (void) CloseHandle(proc_handle);
             proc_handle = BAD_PROC_HANDLE;
@@ -730,7 +730,7 @@
             {
                 /* now wait for app to exit */
 
-                (void) cwait(&term_status, (int) proc_handle, 0);
+                (void) cwait(&term_status, (CWAIT_PARAM_TYPE) proc_handle, 0);
 		TRACE(("...CreateProcess finished waiting in tmp_npclose\n"));
                 (void) CloseHandle(proc_handle);
                 proc_handle = BAD_PROC_HANDLE;
Index: w32reg.c
Prereq:  1.9 
--- vile-9.5g+/w32reg.c	2006-01-05 00:06:00.000000000 +0000
+++ vile-9.5h/w32reg.c	2006-04-19 22:51:01.000000000 +0000
@@ -2,7 +2,7 @@
  * w32reg.c:  Winvile OLE registration code (currently only used for OLE
  *            automation).
  *
- * $Header: /usr/build/vile/vile/RCS/w32reg.c,v 1.9 2006/01/05 00:06:00 cmorgan Exp $
+ * $Header: /usr/build/vile/vile/RCS/w32reg.c,v 1.10 2006/04/19 22:51:01 tom Exp $
  */
 
 #include "estruct.h"
@@ -280,7 +280,7 @@
         strcat((char *) value, " -invisible");
     if (opts->multiple)
         strcat((char *) value, " -multiple");
-    val_len = strlen((char *) value);
+    val_len = (int) strlen((char *) value);
     if (opts->rows)
     {
         val_len += sprintf(((char *) value) + val_len,
@@ -387,7 +387,7 @@
     /* -------------------------- Step 4 --------------------------- */
 
     strcat(key, "\\9\\win32");
-    val_len = strlen(strcpy((char *) value, editor_path));
+    val_len = (int) strlen(strcpy((char *) value, editor_path));
     if ((rc = RegCreateKeyEx(HKEY_CLASSES_ROOT,
                              key,
                              0,
Index: w32vile.h
Prereq:  1.2 
--- vile-9.5g+/w32vile.h	2001-12-24 15:03:20.000000000 +0000
+++ vile-9.5h/w32vile.h	2006-04-25 22:21:20.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * $Header: /usr/build/vile/vile/RCS/w32vile.h,v 1.2 2001/12/24 15:03:20 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/w32vile.h,v 1.4 2006/04/25 22:21:20 tom Exp $
  *
  * Do the pragmas in a separate file to avoid contaminating portable code.
  */
@@ -15,4 +15,16 @@
 
 #include <windows.h>
 
+#if (_MSC_VER >= 1300) && (_MSC_VER < 1400)
+#define CWAIT_PARAM_TYPE   intptr_t
+#define DIALOG_PROC_RETVAL INT_PTR	/* but it still returns TRUE or FALSE */
+#define SETTIMER_RETVAL    UINT_PTR
+#define WINDOW_PROC_RETVAL LRESULT
+#else
+#define CWAIT_PARAM_TYPE   int
+#define DIALOG_PROC_RETVAL BOOL
+#define SETTIMER_RETVAL    UINT
+#define WINDOW_PROC_RETVAL LONG
+#endif
+
 #endif /* W32VILE_H_incl */
Index: word.c
Prereq:  1.79 
--- vile-9.5g+/word.c	2005-07-14 00:02:44.000000000 +0000
+++ vile-9.5h/word.c	2006-04-19 22:40:54.000000000 +0000
@@ -3,7 +3,7 @@
  * paragraph at a time.  There are all sorts of word mode commands.  If I
  * do any sentence mode commands, they are likely to be put in this file.
  *
- * $Header: /usr/build/vile/vile/RCS/word.c,v 1.79 2005/07/14 00:02:44 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/word.c,v 1.80 2006/04/19 22:40:54 tom Exp $
  *
  */
 
@@ -555,7 +555,7 @@
 		    if (c == '?' || c == ':' || c == '!') {
 			sentence = TRUE;
 		    } else if (c == '.') {
-			unsigned len = tb_length(*wp);
+			size_t len = tb_length(*wp);
 			if (len == 4) {
 			    char *ptr = tb_values(*wp);
 			    /*
@@ -576,7 +576,7 @@
 		/* at a word break with a word waiting */
 		/* calculate tentative new length
 		   with word added */
-		newlen = clength + 1 + tb_length(*wp);
+		newlen = (int) (clength + 1 + tb_length(*wp));
 		if (newlen <= fillcolumn) {
 		    /* add word to current line */
 		    if (!firstflag) {