# vile 9.4b - 2003/11/2 - T.Dickey <dickey@his.com>
# ------------------------------------------------------------------------------
# CHANGES                       |   26 
# MANIFEST                      |    3 
# aclocal.m4                    |   20 
# builtflt.c                    |   61 
# configure                     | 3354 +++++++++++++++++++++-------------------
# configure.in                  |  225 +-
# estruct.h                     |    8 
# filters/filters.h             |    5 
# filters/filters.rc            |    7 
# filters/latexflt.l            |    5 
# filters/lispfilt.l            |    3 
# filters/makefile.2nd          |   10 
# filters/makefile.in           |    8 
# filters/mk-0th.awk            |   92 -
# filters/mk-1st.awk            |   97 -
# filters/mk-2nd.awk            |  178 +-
# filters/pl-filt.c             |    4 
# makefile.in                   |    5 
# modes.c                       |  139 +
# patchlev.h                    |    2 
# revlist                       |   43 
# vile-9.4.spec                 |    9 
# vile-9.4b/filters/makelist.sh |   80 
# 23 files changed, 2497 insertions(+), 1887 deletions(-)
# ------------------------------------------------------------------------------
Index: CHANGES
--- vile-9.4a+/CHANGES	2003-10-08 20:33:41.000000000 -0400
+++ vile-9.4b/CHANGES	2003-11-02 17:19:48.000000000 -0500
@@ -1,5 +1,31 @@
 Changes for vile 9.5 (released ??? ??? ?? ????)
 
+ 20031102 (b)
+	> Brendan O'Dea:
+	+ add code to support dynamic loading of syntax filters which are
+	  compiled as a shared object.
+ 	> Tom Dickey:
+	+ modify is_ESCAPED() in pl-filt.c to not treat backslash before
+	  double-quote specially.  This fixes man2html, which contains a line
+		  *bs = \"\b";
+	+ modify latexflt.l to recognize strings such as "\def$", which begin
+	  a redefinition of "$".
+	+ remove suffix conflict between latex and tex modes.
+	+ modify check in set_vilemode() so that buffers other than the current
+	  one can be set, provided that they are not scratch buffers.  A
+	  change in 20030630 had suppressed set_vilemode() for buffers other
+	  than the current one, from noting odd error messages when the current
+	  buffer was [Buffer List], which is a scratch buffer and therefore
+	  cannot have a majormode assigned to it.
+	+ add "--with-loadable-filters" option to configure script and modified
+	  related files to integrate Brendan O'Dea's patch for dynamic loading.
+	  Timed filtering of vile's larger source-files to compare the three
+	  schemes.  Loadable filters ran about 50% slower than the builtin
+	  filters, while external filters ran about 5 times slower (ymmv).
+	+ use AC_EXEEXT in configure script.
+	+ modify configure script check for imake's $CFLAGS to ensure that 
+	  imake or xmkmf was found.
+
  20031008 (a)
 	> Daniel L Ashbrook:
 	+ add lispmode, to use vile-lisp-filt.
Index: MANIFEST
--- vile-9.4a+/MANIFEST	2003-10-08 20:50:33.000000000 -0400
+++ vile-9.4b/MANIFEST	2003-11-02 18:19:58.000000000 -0500
@@ -1,4 +1,4 @@
-MANIFEST for vile, version v9_4a
+MANIFEST for vile, version v9_4b
 --------------------------------------------------------------------------------
 MANIFEST                        this file
 CHANGES                         Change-log for VILE
@@ -228,6 +228,7 @@
 filters/makefile.in             makefile for vile filters
 filters/makefile.wnt            makefile for filters with Visual C++
 filters/makefilt.l              makefile syntax filter for vile
+filters/makelist.sh             script to construct a list of filter names
 filters/manfilt.c               manpage-filter
 filters/mk-0th.awk              construct builtflt.h
 filters/mk-0th.bat              generate builtflt.h from genmake.mak
Index: aclocal.m4
Prereq:  1.126 
--- vile-9.4a+/aclocal.m4	2003-09-16 20:46:07.000000000 -0400
+++ vile-9.4b/aclocal.m4	2003-11-02 12:13:29.000000000 -0500
@@ -1,6 +1,6 @@
-dnl Local definitions for autoconf.
+dnl vile's local definitions for autoconf.
 dnl
-dnl $Header: /usr/build/vile/vile/RCS/aclocal.m4,v 1.126 2003/09/17 00:46:07 tom Exp $
+dnl $Header: /usr/build/vile/vile/RCS/aclocal.m4,v 1.128 2003/11/02 17:13:29 tom Exp $
 dnl
 dnl ---------------------------------------------------------------------------
 dnl ---------------------------------------------------------------------------
@@ -1066,7 +1066,7 @@
 test $cf_cv_select_with_time = yes && AC_DEFINE(SELECT_WITH_TIME)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_IMAKE_CFLAGS version: 14 updated: 2003/04/12 15:42:00
+dnl CF_IMAKE_CFLAGS version: 15 updated: 2003/10/11 12:01:23
 dnl ---------------
 dnl Use imake to obtain compiler flags.  We could, in principle, write tests to
 dnl get these, but if imake is properly configured there is no point in doing
@@ -1089,6 +1089,7 @@
 
 # If it's installed properly, imake (or its wrapper, xmkmf) will point to the
 # config directory.
+if test -n "$IMAKE" ; then
 if mkdir conftestdir; then
 	cf_makefile=`cd $srcdir;pwd`/Imakefile
 	CDPATH=; export CDPATH
@@ -1173,6 +1174,7 @@
 	    fi
 	fi
 fi
+fi
 AC_SUBST(IMAKE_CFLAGS)
 AC_SUBST(IMAKE_LOADFLAGS)
 ])dnl
@@ -1771,13 +1773,12 @@
 ifelse([$8], , ,[$8]),
 ifelse([$9], , ,[$9]))])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_PROG_EXT version: 8 updated: 2002/12/21 19:25:52
+dnl CF_PROG_EXT version: 9 updated: 2003/10/18 16:36:22
 dnl -----------
 dnl Compute $PROG_EXT, used for non-Unix ports, such as OS/2 EMX.
 AC_DEFUN([CF_PROG_EXT],
 [
 AC_REQUIRE([CF_CHECK_CACHE])
-PROG_EXT=
 case $cf_cv_system_name in
 os2*)
     # We make sure -Zexe is not used -- it would interfere with @PROG_EXT@
@@ -1785,12 +1786,13 @@
     CPPFLAGS="$CPPFLAGS -D__ST_MT_ERRNO__"
     CXXFLAGS="$CXXFLAGS -Zmt"
     LDFLAGS=`echo "$LDFLAGS -Zmt -Zcrtdll" | sed -e "s%-Zexe%%g"`
-    PROG_EXT=".exe"
-    ;;
-cygwin*)
-    PROG_EXT=".exe"
     ;;
 esac
+
+AC_EXEEXT
+AC_OBJEXT
+
+PROG_EXT="$EXEEXT"
 AC_SUBST(PROG_EXT)
 test -n "$PROG_EXT" && AC_DEFINE_UNQUOTED(PROG_EXT,"$PROG_EXT")
 ])dnl
Index: builtflt.c
Prereq:  1.30 
--- vile-9.4a+/builtflt.c	2003-05-23 20:49:25.000000000 -0400
+++ vile-9.4b/builtflt.c	2003-11-02 14:29:08.000000000 -0500
@@ -1,7 +1,7 @@
 /*
  * Main program and I/O for external vile syntax/highlighter programs
  *
- * $Header: /usr/build/vile/vile/RCS/builtflt.c,v 1.30 2003/05/24 00:49:25 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/builtflt.c,v 1.33 2003/11/02 19:29:08 tom Exp $
  *
  */
 
@@ -14,6 +14,10 @@
 #include "nevars.h"
 #include <stdarg.h>
 
+#ifdef HAVE_LIBDL
+#include <dlfcn.h>
+#endif
+
 static FILTER_DEF *current_filter;
 static MARK mark_in;
 static MARK mark_out;
@@ -147,6 +151,55 @@
 	MK = mark_out;
 }
 
+#ifdef HAVE_LIBDL
+static int
+load_filter(const char *name)
+{
+    char defining[NSTRING];
+    char filename[NFILEN];
+    char leafname[NSTRING];
+    void *obj;
+    FILTER_DEF *def;
+    int found = 0;
+    int tried = 0;
+    const char *cp = libdir_path;
+
+    if (strlen(name) < NSTRING - 30) {
+	sprintf(defining, "define_%s", name);
+	sprintf(leafname, "vile-%s-filt.so", name);
+	while ((cp = parse_pathlist(cp, filename)) != 0) {
+	    if (strlen(filename) + strlen(leafname) + 3 >= sizeof(filename))
+		continue;
+	    pathcat(filename, filename, leafname);
+	    TRACE(("load_filter(%s) %s\n", filename, defining));
+	    ++tried;
+	    if ((obj = dlopen(filename, RTLD_NOW)) != 0) {
+		found = 1;
+		if ((def = dlsym(obj, defining)) == 0) {
+		    dlclose(obj);
+		    mlwarn("[Error: can't reference variable %s from %s (%s)]",
+			   defining, filename, dlerror());
+		    break;
+		} else {
+		    TRACE(("...load_filter\n"));
+		    current_filter->InitFilter = def->InitFilter;
+		    current_filter->DoFilter = def->DoFilter;
+		    current_filter->options = def->options;
+		    current_filter->loaded = 1;
+		    break;
+		}
+	    }
+	}
+
+	if (!found && tried) {
+	    mlwarn("[Error: can't load shared object %s (%s)]",
+		   leafname, dlerror());
+	}
+    }
+    return current_filter->loaded;
+}
+#endif /* HAVE_LIBDL */
+
 /******************************************************************************
  * Public functions                                                           *
  ******************************************************************************/
@@ -339,7 +392,11 @@
 flt_start(char *name)
 {
     TRACE(("flt_start(%s)\n", name));
-    if (flt_lookup(name)) {
+    if (flt_lookup(name)
+#ifdef HAVE_LIBDL
+	&& (current_filter->loaded || load_filter(name))
+#endif
+	) {
 	MARK save_dot;
 	MARK save_mk;
 
Index: configure
--- vile-9.4a+/configure	2003-07-08 21:27:39.000000000 -0400
+++ vile-9.4b/configure	2003-11-02 18:03:27.000000000 -0500
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.190 .
+# From configure.in Revision: 1.199 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20030208.
 #
@@ -683,8 +683,14 @@
   --with-CFLAGS=value     set default for \$CFLAGS
   --with-cflags=value     (same as --with-CFLAGS)
   --disable-filters       do not build syntax filters
-  --with-builtin-filters=XX specify filters to compile built-in vs external
-                          Give an option value to specify only certain filters.
+  --with-builtin-filters=XX specify filters to compile built-in vs external.
+                          Give an option value to specify only certain filters,
+			  i.e., a comma-separated list of filter-names.
+                          The default, if no value is given is 'all'.
+                          The default if the option is not given is 'none'
+  --with-loadable-filters=XX specify filters to dynamially load at runtime.
+                          Give an option value to specify only certain filters,
+			  i.e., a comma-separated list of filter-names.
                           The default, if no value is given is 'all'.
                           The default if the option is not given is 'none'
   --with-libdir-path=LIST specify locations to search for filters, etc. (default: "\$(libdir)/vile")
@@ -906,7 +912,7 @@
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
-    { echo "$as_me:909: loading site script $ac_site_file" >&5
+    { echo "$as_me:915: 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"
@@ -917,7 +923,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:920: loading cache $cache_file" >&5
+    { echo "$as_me:926: loading cache $cache_file" >&5
 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . $cache_file;;
@@ -925,7 +931,7 @@
     esac
   fi
 else
-  { echo "$as_me:928: creating cache $cache_file" >&5
+  { echo "$as_me:934: creating cache $cache_file" >&5
 echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -941,21 +947,21 @@
   eval ac_new_val="\$ac_env_${ac_var}_value"
   case $ac_old_set,$ac_new_set in
     set,)
-      { echo "$as_me:944: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { echo "$as_me:950: 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:948: error: \`$ac_var' was not set in the previous run" >&5
+      { echo "$as_me:954: 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:954: error: \`$ac_var' has changed since the previous run:" >&5
+        { echo "$as_me:960: 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:956:   former value:  $ac_old_val" >&5
+        { echo "$as_me:962:   former value:  $ac_old_val" >&5
 echo "$as_me:   former value:  $ac_old_val" >&2;}
-        { echo "$as_me:958:   current value: $ac_new_val" >&5
+        { echo "$as_me:964:   current value: $ac_new_val" >&5
 echo "$as_me:   current value: $ac_new_val" >&2;}
         ac_cache_corrupted=:
       fi;;
@@ -974,9 +980,9 @@
   fi
 done
 if $ac_cache_corrupted; then
-  { echo "$as_me:977: error: changes in the environment can compromise the build" >&5
+  { echo "$as_me:983: 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:979: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+  { { echo "$as_me:985: 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
@@ -996,10 +1002,10 @@
 echo "#! $SHELL" >conftest.sh
 echo  "exit 0"   >>conftest.sh
 chmod +x conftest.sh
-if { (echo "$as_me:999: PATH=\".;.\"; conftest.sh") >&5
+if { (echo "$as_me:1005: PATH=\".;.\"; conftest.sh") >&5
   (PATH=".;."; conftest.sh) 2>&5
   ac_status=$?
-  echo "$as_me:1002: \$? = $ac_status" >&5
+  echo "$as_me:1008: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   ac_path_separator=';'
 else
@@ -1027,7 +1033,7 @@
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:1030: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+  { { echo "$as_me:1036: 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
@@ -1037,11 +1043,11 @@
 
 # Make sure we can run config.sub.
 $ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:1040: error: cannot run $ac_config_sub" >&5
+  { { echo "$as_me:1046: error: cannot run $ac_config_sub" >&5
 echo "$as_me: error: cannot run $ac_config_sub" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:1044: checking build system type" >&5
+echo "$as_me:1050: 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
@@ -1050,16 +1056,16 @@
 test -z "$ac_cv_build_alias" &&
   ac_cv_build_alias=`$ac_config_guess`
 test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:1053: error: cannot guess build type; you must specify one" >&5
+  { { echo "$as_me:1059: 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:1057: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+  { { echo "$as_me:1063: 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:1062: result: $ac_cv_build" >&5
+echo "$as_me:1068: 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/'`
@@ -1067,7 +1073,7 @@
 build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 
 if test -f $srcdir/config.guess ; then
-	echo "$as_me:1070: checking host system type" >&5
+	echo "$as_me:1076: 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
@@ -1076,12 +1082,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:1079: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+  { { echo "$as_me:1085: 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:1084: result: $ac_cv_host" >&5
+echo "$as_me:1090: 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/'`
@@ -1106,20 +1112,20 @@
 fi
 
 test -z "$system_name" && system_name="$cf_cv_system_name"
-test -n "$cf_cv_system_name" && echo "$as_me:1109: result: Configuring for $cf_cv_system_name" >&5
+test -n "$cf_cv_system_name" && echo "$as_me:1115: 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:1113: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
+	echo "$as_me:1119: 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:1115: error: \"Please remove config.cache and try again.\"" >&5
+	{ { echo "$as_me:1121: 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
 
 ###	checks for alternative programs
 
-echo "$as_me:1122: checking for makeflags variable" >&5
+echo "$as_me:1128: 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
@@ -1152,7 +1158,7 @@
 	rm -f cf_makeflags.tmp
 
 fi
-echo "$as_me:1155: result: $cf_cv_makeflags" >&5
+echo "$as_me:1161: result: $cf_cv_makeflags" >&5
 echo "${ECHO_T}$cf_cv_makeflags" >&6
 
 ac_ext=c
@@ -1163,7 +1169,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:1166: checking for $ac_word" >&5
+echo "$as_me:1172: 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
@@ -1178,7 +1184,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:1181: found $ac_dir/$ac_word" >&5
+echo "$as_me:1187: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1186,10 +1192,10 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1189: result: $CC" >&5
+  echo "$as_me:1195: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1192: result: no" >&5
+  echo "$as_me:1198: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1198,7 +1204,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:1201: checking for $ac_word" >&5
+echo "$as_me:1207: 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
@@ -1213,7 +1219,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:1216: found $ac_dir/$ac_word" >&5
+echo "$as_me:1222: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1221,10 +1227,10 @@
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1224: result: $ac_ct_CC" >&5
+  echo "$as_me:1230: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1227: result: no" >&5
+  echo "$as_me:1233: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1237,7 +1243,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:1240: checking for $ac_word" >&5
+echo "$as_me:1246: 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
@@ -1252,7 +1258,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:1255: found $ac_dir/$ac_word" >&5
+echo "$as_me:1261: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1260,10 +1266,10 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1263: result: $CC" >&5
+  echo "$as_me:1269: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1266: result: no" >&5
+  echo "$as_me:1272: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1272,7 +1278,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:1275: checking for $ac_word" >&5
+echo "$as_me:1281: 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
@@ -1287,7 +1293,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:1290: found $ac_dir/$ac_word" >&5
+echo "$as_me:1296: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1295,10 +1301,10 @@
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1298: result: $ac_ct_CC" >&5
+  echo "$as_me:1304: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1301: result: no" >&5
+  echo "$as_me:1307: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1311,7 +1317,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:1314: checking for $ac_word" >&5
+echo "$as_me:1320: 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
@@ -1331,7 +1337,7 @@
   continue
 fi
 ac_cv_prog_CC="cc"
-echo "$as_me:1334: found $ac_dir/$ac_word" >&5
+echo "$as_me:1340: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1353,10 +1359,10 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1356: result: $CC" >&5
+  echo "$as_me:1362: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1359: result: no" >&5
+  echo "$as_me:1365: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1367,7 +1373,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:1370: checking for $ac_word" >&5
+echo "$as_me:1376: 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
@@ -1382,7 +1388,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:1385: found $ac_dir/$ac_word" >&5
+echo "$as_me:1391: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1390,10 +1396,10 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1393: result: $CC" >&5
+  echo "$as_me:1399: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1396: result: no" >&5
+  echo "$as_me:1402: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1406,7 +1412,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:1409: checking for $ac_word" >&5
+echo "$as_me:1415: 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
@@ -1421,7 +1427,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:1424: found $ac_dir/$ac_word" >&5
+echo "$as_me:1430: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1429,10 +1435,10 @@
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1432: result: $ac_ct_CC" >&5
+  echo "$as_me:1438: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1435: result: no" >&5
+  echo "$as_me:1441: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1444,32 +1450,32 @@
 
 fi
 
-test -z "$CC" && { { echo "$as_me:1447: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:1453: 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:1452:" \
+echo "$as_me:1458:" \
      "checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:1455: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1461: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1458: \$? = $ac_status" >&5
+  echo "$as_me:1464: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:1460: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1466: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1463: \$? = $ac_status" >&5
+  echo "$as_me:1469: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:1465: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1471: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1468: \$? = $ac_status" >&5
+  echo "$as_me:1474: \$? = $ac_status" >&5
   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 1472 "configure"
+#line 1478 "configure"
 #include "confdefs.h"
 
 int
@@ -1485,13 +1491,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:1488: checking for C compiler default output" >&5
+echo "$as_me:1494: 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:1491: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:1497: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5
   ac_status=$?
-  echo "$as_me:1494: \$? = $ac_status" >&5
+  echo "$as_me:1500: \$? = $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
@@ -1514,34 +1520,34 @@
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:1517: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:1523: 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:1523: result: $ac_file" >&5
+echo "$as_me:1529: 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:1528: checking whether the C compiler works" >&5
+echo "$as_me:1534: 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:1534: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1540: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1537: \$? = $ac_status" >&5
+  echo "$as_me:1543: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:1544: error: cannot run C compiled programs.
+	{ { echo "$as_me:1550: 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;}
@@ -1549,24 +1555,24 @@
     fi
   fi
 fi
-echo "$as_me:1552: result: yes" >&5
+echo "$as_me:1558: 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:1559: checking whether we are cross compiling" >&5
+echo "$as_me:1565: checking whether we are cross compiling" >&5
 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:1561: result: $cross_compiling" >&5
+echo "$as_me:1567: result: $cross_compiling" >&5
 echo "${ECHO_T}$cross_compiling" >&6
 
-echo "$as_me:1564: checking for executable suffix" >&5
+echo "$as_me:1570: checking for executable suffix" >&5
 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:1566: \"$ac_link\"") >&5
+if { (eval echo "$as_me:1572: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:1569: \$? = $ac_status" >&5
+  echo "$as_me:1575: \$? = $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
@@ -1582,25 +1588,25 @@
   esac
 done
 else
-  { { echo "$as_me:1585: error: cannot compute EXEEXT: cannot compile and link" >&5
+  { { echo "$as_me:1591: 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:1591: result: $ac_cv_exeext" >&5
+echo "$as_me:1597: 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:1597: checking for object suffix" >&5
+echo "$as_me:1603: 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 1603 "configure"
+#line 1609 "configure"
 #include "confdefs.h"
 
 int
@@ -1612,10 +1618,10 @@
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:1615: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1621: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1618: \$? = $ac_status" >&5
+  echo "$as_me:1624: \$? = $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
@@ -1627,24 +1633,24 @@
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:1630: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:1636: 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:1637: result: $ac_cv_objext" >&5
+echo "$as_me:1643: result: $ac_cv_objext" >&5
 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:1641: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:1647: 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 1647 "configure"
+#line 1653 "configure"
 #include "confdefs.h"
 
 int
@@ -1659,16 +1665,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1662: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1668: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1665: \$? = $ac_status" >&5
+  echo "$as_me:1671: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1668: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1674: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1671: \$? = $ac_status" >&5
+  echo "$as_me:1677: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_compiler_gnu=yes
 else
@@ -1680,19 +1686,19 @@
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:1683: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:1689: 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:1689: checking whether $CC accepts -g" >&5
+echo "$as_me:1695: 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 1695 "configure"
+#line 1701 "configure"
 #include "confdefs.h"
 
 int
@@ -1704,16 +1710,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1707: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1713: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1710: \$? = $ac_status" >&5
+  echo "$as_me:1716: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1713: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1719: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1716: \$? = $ac_status" >&5
+  echo "$as_me:1722: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_cc_g=yes
 else
@@ -1723,7 +1729,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:1726: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:1732: 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
@@ -1750,16 +1756,16 @@
 #endif
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1753: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1759: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1756: \$? = $ac_status" >&5
+  echo "$as_me:1762: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1759: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1765: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1762: \$? = $ac_status" >&5
+  echo "$as_me:1768: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   for ac_declaration in \
    ''\
@@ -1771,7 +1777,7 @@
    'void exit (int);'
 do
   cat >conftest.$ac_ext <<_ACEOF
-#line 1774 "configure"
+#line 1780 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -1784,16 +1790,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1787: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1793: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1790: \$? = $ac_status" >&5
+  echo "$as_me:1796: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1793: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1799: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1796: \$? = $ac_status" >&5
+  echo "$as_me:1802: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -1803,7 +1809,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 1806 "configure"
+#line 1812 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -1815,16 +1821,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1818: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1824: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1821: \$? = $ac_status" >&5
+  echo "$as_me:1827: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1824: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1830: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1827: \$? = $ac_status" >&5
+  echo "$as_me:1833: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -1856,7 +1862,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:1859: checking how to run the C preprocessor" >&5
+echo "$as_me:1865: 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
@@ -1877,18 +1883,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 1880 "configure"
+#line 1886 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:1885: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:1891: \"$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:1891: \$? = $ac_status" >&5
+  echo "$as_me:1897: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -1911,17 +1917,17 @@
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line 1914 "configure"
+#line 1920 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:1918: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:1924: \"$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:1924: \$? = $ac_status" >&5
+  echo "$as_me:1930: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -1958,7 +1964,7 @@
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:1961: result: $CPP" >&5
+echo "$as_me:1967: result: $CPP" >&5
 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -1968,18 +1974,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 1971 "configure"
+#line 1977 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:1976: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:1982: \"$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:1982: \$? = $ac_status" >&5
+  echo "$as_me:1988: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2002,17 +2008,17 @@
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line 2005 "configure"
+#line 2011 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2009: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2015: \"$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:2015: \$? = $ac_status" >&5
+  echo "$as_me:2021: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2040,7 +2046,7 @@
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:2043: error: C preprocessor \"$CPP\" fails sanity check" >&5
+  { { echo "$as_me:2049: error: C preprocessor \"$CPP\" fails sanity check" >&5
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -2052,14 +2058,14 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 if test $ac_cv_c_compiler_gnu = yes; then
-    echo "$as_me:2055: checking whether $CC needs -traditional" >&5
+    echo "$as_me:2061: 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 2062 "configure"
+#line 2068 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
 int Autoconf = TIOCGETP;
@@ -2074,7 +2080,7 @@
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat >conftest.$ac_ext <<_ACEOF
-#line 2077 "configure"
+#line 2083 "configure"
 #include "confdefs.h"
 #include <termio.h>
 int Autoconf = TCGETA;
@@ -2087,7 +2093,7 @@
 
   fi
 fi
-echo "$as_me:2090: result: $ac_cv_prog_gcc_traditional" >&5
+echo "$as_me:2096: 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"
@@ -2106,7 +2112,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:2109: checking for a BSD compatible install" >&5
+echo "$as_me:2115: 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
@@ -2155,7 +2161,7 @@
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:2158: result: $INSTALL" >&5
+echo "$as_me:2164: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -2166,11 +2172,40 @@
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
+echo "$as_me:2175: 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
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.make <<\EOF
+all:
+	@echo 'ac_maketemp="${MAKE}"'
+EOF
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
+if test -n "$ac_maketemp"; then
+  eval ac_cv_prog_make_${ac_make}_set=yes
+else
+  eval ac_cv_prog_make_${ac_make}_set=no
+fi
+rm -f conftest.make
+fi
+if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+  echo "$as_me:2195: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+  SET_MAKE=
+else
+  echo "$as_me:2199: result: no" >&5
+echo "${ECHO_T}no" >&6
+  SET_MAKE="MAKE=${MAKE-make}"
+fi
+
 for ac_prog in mawk gawk nawk awk
 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:2173: checking for $ac_word" >&5
+echo "$as_me:2208: 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
@@ -2185,7 +2220,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AWK="$ac_prog"
-echo "$as_me:2188: found $ac_dir/$ac_word" >&5
+echo "$as_me:2223: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2193,10 +2228,10 @@
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$as_me:2196: result: $AWK" >&5
+  echo "$as_me:2231: result: $AWK" >&5
 echo "${ECHO_T}$AWK" >&6
 else
-  echo "$as_me:2199: result: no" >&5
+  echo "$as_me:2234: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2206,7 +2241,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:2209: checking for $ac_word" >&5
+echo "$as_me:2244: 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
@@ -2221,7 +2256,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:2224: found $ac_dir/$ac_word" >&5
+echo "$as_me:2259: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2229,10 +2264,10 @@
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:2232: result: $RANLIB" >&5
+  echo "$as_me:2267: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:2235: result: no" >&5
+  echo "$as_me:2270: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2241,7 +2276,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:2244: checking for $ac_word" >&5
+echo "$as_me:2279: 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
@@ -2256,7 +2291,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:2259: found $ac_dir/$ac_word" >&5
+echo "$as_me:2294: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2265,10 +2300,10 @@
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:2268: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:2303: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:2271: result: no" >&5
+  echo "$as_me:2306: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2281,7 +2316,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:2284: checking for $ac_word" >&5
+echo "$as_me:2319: 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
@@ -2296,7 +2331,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LEX="$ac_prog"
-echo "$as_me:2299: found $ac_dir/$ac_word" >&5
+echo "$as_me:2334: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2304,10 +2339,10 @@
 fi
 LEX=$ac_cv_prog_LEX
 if test -n "$LEX"; then
-  echo "$as_me:2307: result: $LEX" >&5
+  echo "$as_me:2342: result: $LEX" >&5
 echo "${ECHO_T}$LEX" >&6
 else
-  echo "$as_me:2310: result: no" >&5
+  echo "$as_me:2345: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2317,7 +2352,7 @@
 
 if test -z "$LEXLIB"
 then
-  echo "$as_me:2320: checking for yywrap in -lfl" >&5
+  echo "$as_me:2355: 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
@@ -2325,7 +2360,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lfl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 2328 "configure"
+#line 2363 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -2344,16 +2379,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:2347: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2382: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2350: \$? = $ac_status" >&5
+  echo "$as_me:2385: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:2353: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2388: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2356: \$? = $ac_status" >&5
+  echo "$as_me:2391: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_fl_yywrap=yes
 else
@@ -2364,12 +2399,12 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:2367: result: $ac_cv_lib_fl_yywrap" >&5
+echo "$as_me:2402: 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:2372: checking for yywrap in -ll" >&5
+  echo "$as_me:2407: 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
@@ -2377,7 +2412,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ll  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 2380 "configure"
+#line 2415 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -2396,16 +2431,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:2399: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2434: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2402: \$? = $ac_status" >&5
+  echo "$as_me:2437: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:2405: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2440: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2408: \$? = $ac_status" >&5
+  echo "$as_me:2443: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_l_yywrap=yes
 else
@@ -2416,7 +2451,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:2419: result: $ac_cv_lib_l_yywrap" >&5
+echo "$as_me:2454: 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"
@@ -2427,7 +2462,7 @@
 fi
 
 if test "x$LEX" != "x:"; then
-  echo "$as_me:2430: checking lex output file root" >&5
+  echo "$as_me:2465: 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
@@ -2441,16 +2476,16 @@
 elif test -f lexyy.c; then
   ac_cv_prog_lex_root=lexyy
 else
-  { { echo "$as_me:2444: error: cannot find output from $LEX; giving up" >&5
+  { { echo "$as_me:2479: 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:2449: result: $ac_cv_prog_lex_root" >&5
+echo "$as_me:2484: 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:2453: checking whether yytext is a pointer" >&5
+echo "$as_me:2488: 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
@@ -2466,16 +2501,16 @@
 `cat $LEX_OUTPUT_ROOT.c`
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:2469: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2504: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2472: \$? = $ac_status" >&5
+  echo "$as_me:2507: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:2475: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2510: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2478: \$? = $ac_status" >&5
+  echo "$as_me:2513: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_lex_yytext_pointer=yes
 else
@@ -2487,7 +2522,7 @@
 rm -f "${LEX_OUTPUT_ROOT}.c"
 
 fi
-echo "$as_me:2490: result: $ac_cv_prog_lex_yytext_pointer" >&5
+echo "$as_me:2525: 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
 
@@ -2503,10 +2538,10 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-echo "$as_me:2506: checking for archiver (symbol AR)" >&5
+echo "$as_me:2541: 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:2509: result: $AR" >&5
+echo "$as_me:2544: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 
 cf_cv_subst_AR=$AR
@@ -2518,10 +2553,10 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-echo "$as_me:2521: checking for archiver options (symbol AR_OPTS)" >&5
+echo "$as_me:2556: 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:2524: result: $AR_OPTS" >&5
+echo "$as_me:2559: result: $AR_OPTS" >&5
 echo "${ECHO_T}$AR_OPTS" >&6
 
 cf_cv_subst_AR_OPTS=$AR_OPTS
@@ -2529,7 +2564,7 @@
 
 AR_OPTS=${cf_cv_subst_AR_OPTS}
 
-echo "$as_me:2532: checking if you want to see long compiling messages" >&5
+echo "$as_me:2567: 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.
@@ -2563,7 +2598,7 @@
     ECHO_CC=''
 
 fi;
-echo "$as_me:2566: result: $enableval" >&5
+echo "$as_me:2601: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 	case $cf_cv_system_name in
@@ -2571,7 +2606,6 @@
 	*)	PATHSEP=':'  ;;
 	esac
 
-PROG_EXT=
 case $cf_cv_system_name in
 os2*)
     # We make sure -Zexe is not used -- it would interfere with @PROG_EXT@
@@ -2579,13 +2613,11 @@
     CPPFLAGS="$CPPFLAGS -D__ST_MT_ERRNO__"
     CXXFLAGS="$CXXFLAGS -Zmt"
     LDFLAGS=`echo "$LDFLAGS -Zmt -Zcrtdll" | sed -e "s%-Zexe%%g"`
-    PROG_EXT=".exe"
-    ;;
-cygwin*)
-    PROG_EXT=".exe"
     ;;
 esac
 
+PROG_EXT="$EXEEXT"
+
 test -n "$PROG_EXT" && cat >>confdefs.h <<EOF
 #define PROG_EXT "$PROG_EXT"
 EOF
@@ -2598,10 +2630,10 @@
 
 ###	checks for UNIX variants that set C preprocessor variables
 
-echo "$as_me:2601: checking for AIX" >&5
+echo "$as_me:2633: checking for AIX" >&5
 echo $ECHO_N "checking for AIX... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 2604 "configure"
+#line 2636 "configure"
 #include "confdefs.h"
 #ifdef _AIX
   yes
@@ -2610,24 +2642,24 @@
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   egrep "yes" >/dev/null 2>&1; then
-  echo "$as_me:2613: result: yes" >&5
+  echo "$as_me:2645: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 cat >>confdefs.h <<\EOF
 #define _ALL_SOURCE 1
 EOF
 
 else
-  echo "$as_me:2620: result: no" >&5
+  echo "$as_me:2652: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 rm -f conftest*
 
-echo "$as_me:2625: checking for POSIXized ISC" >&5
+echo "$as_me:2657: 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:2630: result: yes" >&5
+  echo "$as_me:2662: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   ISC=yes # If later tests want to check for ISC.
 
@@ -2641,28 +2673,28 @@
     CC="$CC -Xp"
   fi
 else
-  echo "$as_me:2644: result: no" >&5
+  echo "$as_me:2676: result: no" >&5
 echo "${ECHO_T}no" >&6
   ISC=
 fi
 
-echo "$as_me:2649: checking for minix/config.h" >&5
+echo "$as_me:2681: 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 2655 "configure"
+#line 2687 "configure"
 #include "confdefs.h"
 #include <minix/config.h>
 _ACEOF
-if { (eval echo "$as_me:2659: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2691: \"$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:2665: \$? = $ac_status" >&5
+  echo "$as_me:2697: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2681,7 +2713,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:2684: result: $ac_cv_header_minix_config_h" >&5
+echo "$as_me:2716: 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
@@ -2707,7 +2739,7 @@
 
 ###	checks for compiler characteristics
 
-echo "$as_me:2710: checking for ${CC-cc} option to accept ANSI C" >&5
+echo "$as_me:2742: 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
@@ -2763,7 +2795,7 @@
 fi
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 2766 "configure"
+#line 2798 "configure"
 #include "confdefs.h"
 
 #ifndef CC_HAS_PROTOS
@@ -2784,16 +2816,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2787: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2819: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2790: \$? = $ac_status" >&5
+  echo "$as_me:2822: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2793: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2825: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2796: \$? = $ac_status" >&5
+  echo "$as_me:2828: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ansi_cc="$cf_arg"; break
 else
@@ -2806,7 +2838,7 @@
 CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi
-echo "$as_me:2809: result: $cf_cv_ansi_cc" >&5
+echo "$as_me:2841: result: $cf_cv_ansi_cc" >&5
 echo "${ECHO_T}$cf_cv_ansi_cc" >&6
 
 if test "$cf_cv_ansi_cc" != "no"; then
@@ -2851,7 +2883,7 @@
 fi
 
 if test "$cf_cv_ansi_cc" = "no"; then
-	{ { echo "$as_me:2854: error: Your compiler does not appear to recognize prototypes.
+	{ { echo "$as_me:2886: 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
@@ -2864,7 +2896,7 @@
    { (exit 1); exit 1; }; }
 fi
 
-echo "$as_me:2867: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:2899: 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
@@ -2872,7 +2904,7 @@
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >conftest.$ac_ext <<_ACEOF
-#line 2875 "configure"
+#line 2907 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -2921,16 +2953,16 @@
 do
   CC="$ac_save_CC $ac_arg"
   rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2924: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2956: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2927: \$? = $ac_status" >&5
+  echo "$as_me:2959: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2930: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2962: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2933: \$? = $ac_status" >&5
+  echo "$as_me:2965: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_cc_stdc=$ac_arg
 break
@@ -2947,21 +2979,21 @@
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)
-    echo "$as_me:2950: result: none needed" >&5
+    echo "$as_me:2982: result: none needed" >&5
 echo "${ECHO_T}none needed" >&6 ;;
   *)
-    echo "$as_me:2953: result: $ac_cv_prog_cc_stdc" >&5
+    echo "$as_me:2985: 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:2958: checking for an ANSI C-conforming const" >&5
+echo "$as_me:2990: 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 2964 "configure"
+#line 2996 "configure"
 #include "confdefs.h"
 
 int
@@ -3019,16 +3051,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3022: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3054: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3025: \$? = $ac_status" >&5
+  echo "$as_me:3057: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3028: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3060: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3031: \$? = $ac_status" >&5
+  echo "$as_me:3063: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_const=yes
 else
@@ -3038,7 +3070,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:3041: result: $ac_cv_c_const" >&5
+echo "$as_me:3073: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -3048,14 +3080,14 @@
 
 fi
 
-echo "$as_me:3051: checking if we can initialize unions" >&5
+echo "$as_me:3083: 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 3058 "configure"
+#line 3090 "configure"
 #include "confdefs.h"
 
 int
@@ -3067,16 +3099,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3070: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3102: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3073: \$? = $ac_status" >&5
+  echo "$as_me:3105: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3076: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3108: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3079: \$? = $ac_status" >&5
+  echo "$as_me:3111: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_init_unions=yes
 else
@@ -3087,14 +3119,14 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:3090: result: $cf_cv_init_unions" >&5
+echo "$as_me:3122: result: $cf_cv_init_unions" >&5
 echo "${ECHO_T}$cf_cv_init_unions" >&6
 test $cf_cv_init_unions = no && cat >>confdefs.h <<\EOF
 #define CC_CANNOT_INIT_UNIONS 1
 EOF
 
 ###	options to control how much we build
-echo "$as_me:3097: checking if you wish to build only core functions" >&5
+echo "$as_me:3129: 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.
@@ -3111,7 +3143,7 @@
   DISABLE_EXTS=no
 
 fi;
-echo "$as_me:3114: result: $DISABLE_EXTS" >&5
+echo "$as_me:3146: result: $DISABLE_EXTS" >&5
 echo "${ECHO_T}$DISABLE_EXTS" >&6
 if test "$DISABLE_EXTS" = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -3128,7 +3160,7 @@
 	cf_extensions=yes
 fi
 
-echo "$as_me:3131: checking if you wish to disable shell/external commands" >&5
+echo "$as_me:3163: 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.
@@ -3145,7 +3177,7 @@
   DISABLE_SHELL=no
 
 fi;
-echo "$as_me:3148: result: $DISABLE_SHELL" >&5
+echo "$as_me:3180: result: $DISABLE_SHELL" >&5
 echo "${ECHO_T}$DISABLE_SHELL" >&6
 if test "$DISABLE_SHELL" = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -3157,7 +3189,7 @@
 fi
 
 ###	use option --with-cflags to set default CFLAGS
-echo "$as_me:3160: checking for CFLAGS options" >&5
+echo "$as_me:3192: checking for CFLAGS options" >&5
 echo $ECHO_N "checking for CFLAGS options... $ECHO_C" >&6
 
 # Check whether --with-CFLAGS or --without-CFLAGS was given.
@@ -3181,10 +3213,10 @@
 elif test -z "$CFLAGS" ; then
 	CFLAGS="-O"
 fi
-echo "$as_me:3184: result: $cflags" >&5
+echo "$as_me:3216: result: $cflags" >&5
 echo "${ECHO_T}$cflags" >&6
 
-echo "$as_me:3187: checking if you want to build syntax filters" >&5
+echo "$as_me:3219: 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.
@@ -3201,121 +3233,181 @@
   with_filters=yes
 
 fi;
-echo "$as_me:3204: result: $with_filters" >&5
+echo "$as_me:3236: result: $with_filters" >&5
 echo "${ECHO_T}$with_filters" >&6
 
 MAKE_FILTERS=
 
 if test "$with_filters" = yes ; then
-echo "$as_me:3210: checking if you want built-in syntax filters" >&5
+
+# allow user to preset these environment variables:
+: ${VILE_BUILT_IN_FILTERS=none}
+: ${VILE_LOADABLE_FILTERS=none}
+: ${VILE_EXTERNAL_FILTERS=all}
+
+echo "$as_me:3248: 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.
 if test "${with_builtin_filters+set}" = set; then
   withval="$with_builtin_filters"
-  test "$withval" = yes && withval=all; VILE_BUILTIN_FILTERS="$withval"
+  test "$withval" = yes && withval=all; VILE_BUILT_IN_FILTERS="$withval"
 else
-  VILE_BUILTIN_FILTERS=none
+  VILE_BUILT_IN_FILTERS=none
 fi;
-test -z "$VILE_BUILTIN_FILTERS" && VILE_BUILTIN_FILTERS=none
-test "$VILE_BUILTIN_FILTERS" = no && VILE_BUILTIN_FILTERS=none
-echo "$as_me:3222: result: $VILE_BUILTIN_FILTERS" >&5
-echo "${ECHO_T}$VILE_BUILTIN_FILTERS" >&6
+test "$VILE_BUILT_IN_FILTERS" = no && VILE_BUILT_IN_FILTERS=none
+echo "$as_me:3259: result: $VILE_BUILT_IN_FILTERS" >&5
+echo "${ECHO_T}$VILE_BUILT_IN_FILTERS" >&6
+
+echo "$as_me:3262: checking if you want loadable syntax filters" >&5
+echo $ECHO_N "checking if you want loadable syntax filters... $ECHO_C" >&6
+
+# Check whether --with-loadable-filters or --without-loadable-filters was given.
+if test "${with_loadable_filters+set}" = set; then
+  withval="$with_loadable_filters"
+  test "$withval" = yes && withval=all; VILE_LOADABLE_FILTERS="$withval"
+else
+  VILE_LOADABLE_FILTERS=none
+fi;
+test "$VILE_LOADABLE_FILTERS" = no && VILE_LOADABLE_FILTERS=none
+echo "$as_me:3273: result: $VILE_LOADABLE_FILTERS" >&5
+echo "${ECHO_T}$VILE_LOADABLE_FILTERS" >&6
+
+# If both "--with-builtin-filters" and "--with-loadable-filters" were given,
+# the user must provide an explicit list since we cannot build both at once.
+if test "$VILE_BUILT_IN_FILTERS" != none && test "$VILE_LOADABLE_FILTERS" != none
+then
+	builtins=`sh $srcdir/filters/makelist.sh $srcdir/filters/genmake.mak lc "$VILE_BUILT_IN_FILTERS"`
+	test "$builtins" = "." && exit 1
+	loadable=`sh $srcdir/filters/makelist.sh $srcdir/filters/genmake.mak lc "$VILE_LOADABLE_FILTERS"`
+	test "$loadable" = "." && exit 1
 
-if test "$VILE_BUILTIN_FILTERS" != none ; then
-	echo "$as_me:3226: checking if any filters require flex" >&5
-echo $ECHO_N "checking if any filters require flex... $ECHO_C" >&6
-	cf_save_IFS="$IFS"
-	cf_found=
-	cf_lexed=
-	cf_missed=
-	IFS=",$IFS"
-	for cf_name in $VILE_BUILTIN_FILTERS
+	for cf_b in $builtins
 	do
-		if test "$cf_name" = all ; then
-			cf_lexed=some; cf_found=all
-			break
-		else
-			if (grep "^$cf_name	[	]*[^	]*	[	]*l$" $srcdir/filters/genmake.mak 2>/dev/null >/dev/null )
-			then
-				cf_lexed="$cf_lexed $cf_name"
-				cf_found="$cf_found $cf_name"
-			elif (grep "^$cf_name	[	]*[^	]*	[	]*c$" $srcdir/filters/genmake.mak 2>/dev/null >/dev/null )
+		for cf_l in $loadable
+		do
+			if test "$cf_b" = "$cf_l"
 			then
-				cf_found="$cf_found $cf_name"
+				{ { echo "$as_me:3291: 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
+		done
+	done
+fi
+
+# Anything that is neither a built-in or a loadable filter is an external
+# filter.  We could have 3 options, but resolving inconsistencies would be
+# a lot more work.
+if test "$VILE_BUILT_IN_FILTERS" = none && test "$VILE_LOADABLE_FILTERS" = none
+then
+	VILE_EXTERNAL_FILTERS=all
+elif test "$VILE_BUILT_IN_FILTERS" = all || test "$VILE_LOADABLE_FILTERS" = all
+then
+	VILE_EXTERNAL_FILTERS=none
+else
+	complete=`sh $srcdir/filters/makelist.sh $srcdir/filters/genmake.mak lc all`
+	VILE_EXTERNAL_FILTERS=
+	for cf_a in $complete
+	do
+		found=no
+		for cf_b in $builtins $loadable
+		do
+			if test $cf_b = $cf_a ; then
+				found=yes
+				break
+			fi
+		done
+		if test $found = no ; then
+			if test -z "$VILE_EXTERNAL_FILTERS" ; then
+				VILE_EXTERNAL_FILTERS=$cf_a
 			else
-				cf_missed="$cf_missed $cf_name"
+				VILE_EXTERNAL_FILTERS="$VILE_EXTERNAL_FILTERS,$cf_a"
 			fi
 		fi
 	done
-	IFS="$cf_save_IFS"
-	echo "$as_me:3252: result: $cf_lexed" >&5
-echo "${ECHO_T}$cf_lexed" >&6
+	test -z "$VILE_EXTERNAL_FILTERS" && VILE_EXTERNAL_FILTERS=none
+fi
+
+echo "$as_me:3332: 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"`
+loadable=`sh $srcdir/filters/makelist.sh $srcdir/filters/genmake.mak l "$VILE_LOADABLE_FILTERS"`
+
+if test -n "$builtins" ; then
+	cf_needflex=yes
+elif test -n "$loadable" ; then
+	cf_needflex=yes
+else
+	cf_needflex=no
+fi
+echo "$as_me:3345: result: $cf_needflex" >&5
+echo "${ECHO_T}$cf_needflex" >&6
 
-	VILE_BUILTIN_FILTERS="$cf_found"
-	if test -n "$cf_lexed" ; then
+if test "$cf_needflex" = yes ; then
 
 test -z "$LEX" && LEX=lex
-echo "$as_me:3259: checking if $LEX is really flex" >&5
+echo "$as_me:3351: 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:3263: result: yes" >&5
+	echo "$as_me:3355: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-	echo "$as_me:3265: checking version of $LEX" >&5
+	echo "$as_me:3357: 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:3268: result: $LEX_VERSION" >&5
+	echo "$as_me:3360: result: $LEX_VERSION" >&5
 echo "${ECHO_T}$LEX_VERSION" >&6
 else
-	echo "$as_me:3271: result: no" >&5
+	echo "$as_me:3363: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-		if test -z "$LEX_VERSION"
-		then
-			{ { echo "$as_me:3277: error: You need flex to compile builtin filters" >&5
+	if test -z "$LEX_VERSION"
+	then
+		{ { echo "$as_me:3369: 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:3282: error: Sorry - your version of flex is too old: $LEX_VERSION" >&5
+	elif ( expr $LEX_VERSION \< 2.5 >/dev/null )
+	then
+		{ { echo "$as_me:3374: error: Sorry - your version of flex is too old: $LEX_VERSION" >&5
 echo "$as_me: 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:3287: error: Sorry - your version of flex is too unstable: $LEX_VERSION" >&5
+	elif ( expr $LEX_VERSION \>= 2.6 >/dev/null )
+	then
+		{ { echo "$as_me:3379: error: Sorry - your version of flex is too unstable: $LEX_VERSION" >&5
 echo "$as_me: 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:3294: error: This version of flex cannot compile builtin filters" >&5
+	else
+		LEX_SUBVERSION=`echo "$LEX_VERSION" | sed -e 's/^2.5.//'`
+		if test -z "$LEX_SUBVERSION"
+		then
+			{ { echo "$as_me:3386: error: This version of flex cannot compile builtin filters" >&5
 echo "$as_me: error: This version of flex cannot compile builtin filters" >&2;}
    { (exit 1); exit 1; }; }
-			elif test $LEX_SUBVERSION = 4a
-			then
-				test -n "$verbose" && echo "	good" 1>&6
+		elif test $LEX_SUBVERSION = 4a
+		then
+			test -n "$verbose" && echo "	good" 1>&6
 
-			elif ( expr $LEX_SUBVERSION \> 4 >/dev/null )
-			then
-				{ { echo "$as_me:3303: error: This version of flex cannot compile builtin filters" >&5
+		elif ( expr $LEX_SUBVERSION \> 4 >/dev/null )
+		then
+			{ { echo "$as_me:3395: error: This version of flex cannot compile builtin filters" >&5
 echo "$as_me: error: This version of flex cannot compile builtin filters" >&2;}
    { (exit 1); exit 1; }; }
-			fi
 		fi
 	fi
-	test -n "$cf_missed" && { { echo "$as_me:3309: error: Not all filter names were found: $cf_missed" >&5
-echo "$as_me: error: Not all filter names were found: $cf_missed" >&2;}
-   { (exit 1); exit 1; }; }
 fi
+
+# "--disable-filters" was given.
 else
-	VILE_BUILTIN_FILTERS=none
+	VILE_BUILT_IN_FILTERS=none
+	VILE_LOADABLE_FILTERS=none
+	VILE_EXTERNAL_FILTERS=none
 	MAKE_FILTERS="#"
 fi
 
-echo "$as_me:3318: checking for library path" >&5
+echo "$as_me:3410: 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.
@@ -3349,7 +3441,7 @@
   cf_src_path=`echo $cf_src_path | sed -e s%NONE%$ac_default_prefix%`
   ;;
 *)
-  { { echo "$as_me:3352: error: expected a pathname, not \"$cf_src_path\"" >&5
+  { { echo "$as_me:3444: 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; }; }
   ;;
@@ -3371,10 +3463,10 @@
 
 eval 'VILE_LIBDIR_PATH="$cf_dst_path"'
 
-echo "$as_me:3374: result: $VILE_LIBDIR_PATH" >&5
+echo "$as_me:3466: result: $VILE_LIBDIR_PATH" >&5
 echo "${ECHO_T}$VILE_LIBDIR_PATH" >&6
 
-echo "$as_me:3377: checking for startup path" >&5
+echo "$as_me:3469: 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.
@@ -3408,7 +3500,7 @@
   cf_src_path=`echo $cf_src_path | sed -e s%NONE%$ac_default_prefix%`
   ;;
 *)
-  { { echo "$as_me:3411: error: expected a pathname, not \"$cf_src_path\"" >&5
+  { { echo "$as_me:3503: 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; }; }
   ;;
@@ -3430,10 +3522,10 @@
 
 eval 'VILE_STARTUP_PATH="$cf_dst_path"'
 
-echo "$as_me:3433: result: $VILE_STARTUP_PATH" >&5
+echo "$as_me:3525: result: $VILE_STARTUP_PATH" >&5
 echo "${ECHO_T}$VILE_STARTUP_PATH" >&6
 
-echo "$as_me:3436: checking if $LEX supports states" >&5
+echo "$as_me:3528: 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
@@ -3443,26 +3535,26 @@
 nothing	ECHO;
 CF_EOF
 cf_lex_states="$LEX conftest.l 1>&5"
-if { (eval echo "$as_me:3446: \"$cf_lex_states\"") >&5
+if { (eval echo "$as_me:3538: \"$cf_lex_states\"") >&5
   (eval $cf_lex_states) 2>&5
   ac_status=$?
-  echo "$as_me:3449: \$? = $ac_status" >&5
+  echo "$as_me:3541: \$? = $ac_status" >&5
   (exit $ac_status); }; then
 cf_lex_states=yes
 else
 cf_lex_states=no
 fi
-echo "$as_me:3455: result: $cf_lex_states" >&5
+echo "$as_me:3547: 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:3460: WARNING: Your $LEX program does not support states.  Get flex." >&5
+	{ echo "$as_me:3552: WARNING: Your $LEX program does not support states.  Get flex." >&5
 echo "$as_me: WARNING: Your $LEX program does not support states.  Get flex." >&2;}
 	MAKE_LEX="#"
 fi
 
-echo "$as_me:3465: checking if you want to use perl as an extension language" >&5
+echo "$as_me:3557: 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.
@@ -3472,16 +3564,16 @@
 else
   with_perl=no
 fi;
-echo "$as_me:3475: result: $with_perl" >&5
+echo "$as_me:3567: result: $with_perl" >&5
 echo "${ECHO_T}$with_perl" >&6
 if test "$with_perl" = yes ; then
 	# find perl binary
-echo "$as_me:3479: checking for perl-5.004" >&5
+echo "$as_me:3571: 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:3484: ...version 5.004 required" >&5
+  echo "configure:3576: ...version 5.004 required" >&5
   # allow user to override
   if test -n "$PERL"; then
     cf_try="$PERL"
@@ -3491,7 +3583,7 @@
 
   cf_version=`echo '[]'|sed -e 's/^./$/'`
   for cf_prog in $cf_try; do
-    echo "configure:3494: trying $cf_prog" >&5
+    echo "configure:3586: 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
@@ -3500,15 +3592,15 @@
 fi
 PERL="$cf_cv_prog_PERL"
 if test -n "$PERL"; then
-  echo "$as_me:3503: result: $PERL" >&5
+  echo "$as_me:3595: result: $PERL" >&5
 echo "${ECHO_T}$PERL" >&6
 else
-  echo "$as_me:3506: result: no" >&5
+  echo "$as_me:3598: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 	if test "$PERL" = no; then
-	    { { echo "$as_me:3511: error: perl not found" >&5
+	    { { echo "$as_me:3603: error: perl not found" >&5
 echo "$as_me: error: perl not found" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -3560,7 +3652,7 @@
 
 if test "$cf_check_cflags" != "$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 3563 "configure"
+#line 3655 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -3572,16 +3664,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3575: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3667: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3578: \$? = $ac_status" >&5
+  echo "$as_me:3670: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3581: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3673: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3584: \$? = $ac_status" >&5
+  echo "$as_me:3676: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -3606,13 +3698,13 @@
 # X11 checks will sometimes add to CFLAGS.  We want the state of CFLAGS
 # prior to these checks
 
-echo "$as_me:3609: checking for getpwnam" >&5
+echo "$as_me:3701: 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 3615 "configure"
+#line 3707 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char getpwnam (); below.  */
@@ -3643,16 +3735,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3646: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3738: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3649: \$? = $ac_status" >&5
+  echo "$as_me:3741: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3652: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3744: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3655: \$? = $ac_status" >&5
+  echo "$as_me:3747: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_getpwnam=yes
 else
@@ -3662,13 +3754,13 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:3665: result: $ac_cv_func_getpwnam" >&5
+echo "$as_me:3757: 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:3671: checking for getpwnam in -lsun" >&5
+echo "$as_me:3763: 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
@@ -3676,7 +3768,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsun  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3679 "configure"
+#line 3771 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3695,16 +3787,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3698: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3790: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3701: \$? = $ac_status" >&5
+  echo "$as_me:3793: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3704: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3796: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3707: \$? = $ac_status" >&5
+  echo "$as_me:3799: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_sun_getpwnam=yes
 else
@@ -3715,7 +3807,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3718: result: $ac_cv_lib_sun_getpwnam" >&5
+echo "$as_me:3810: 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
@@ -3733,7 +3825,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:3736: checking for $ac_word" >&5
+echo "$as_me:3828: 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
@@ -3748,7 +3840,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LINT="$ac_prog"
-echo "$as_me:3751: found $ac_dir/$ac_word" >&5
+echo "$as_me:3843: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3756,10 +3848,10 @@
 fi
 LINT=$ac_cv_prog_LINT
 if test -n "$LINT"; then
-  echo "$as_me:3759: result: $LINT" >&5
+  echo "$as_me:3851: result: $LINT" >&5
 echo "${ECHO_T}$LINT" >&6
 else
-  echo "$as_me:3762: result: no" >&5
+  echo "$as_me:3854: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3775,13 +3867,13 @@
 fi
 
 ###	checks for header files
-echo "$as_me:3778: checking for ANSI C header files" >&5
+echo "$as_me:3870: 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 3784 "configure"
+#line 3876 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -3789,13 +3881,13 @@
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:3792: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:3884: \"$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:3798: \$? = $ac_status" >&5
+  echo "$as_me:3890: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3817,7 +3909,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 3820 "configure"
+#line 3912 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -3835,7 +3927,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 3838 "configure"
+#line 3930 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -3856,7 +3948,7 @@
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3859 "configure"
+#line 3951 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -3882,15 +3974,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:3885: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3977: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3888: \$? = $ac_status" >&5
+  echo "$as_me:3980: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:3890: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3982: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3893: \$? = $ac_status" >&5
+  echo "$as_me:3985: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -3903,7 +3995,7 @@
 fi
 fi
 fi
-echo "$as_me:3906: result: $ac_cv_header_stdc" >&5
+echo "$as_me:3998: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -3916,13 +4008,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:3919: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:4011: 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 3925 "configure"
+#line 4017 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -3937,16 +4029,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3940: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4032: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3943: \$? = $ac_status" >&5
+  echo "$as_me:4035: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3946: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4038: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3949: \$? = $ac_status" >&5
+  echo "$as_me:4041: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -3956,7 +4048,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:3959: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:4051: 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
@@ -3969,7 +4061,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:3972: checking for opendir in -ldir" >&5
+  echo "$as_me:4064: 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
@@ -3977,7 +4069,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3980 "configure"
+#line 4072 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3996,16 +4088,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3999: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4091: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4002: \$? = $ac_status" >&5
+  echo "$as_me:4094: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4005: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4097: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4008: \$? = $ac_status" >&5
+  echo "$as_me:4100: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -4016,14 +4108,14 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4019: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:4111: 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:4026: checking for opendir in -lx" >&5
+  echo "$as_me:4118: 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
@@ -4031,7 +4123,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 4034 "configure"
+#line 4126 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4050,16 +4142,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4053: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4145: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4056: \$? = $ac_status" >&5
+  echo "$as_me:4148: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4059: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4151: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4062: \$? = $ac_status" >&5
+  echo "$as_me:4154: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -4070,7 +4162,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4073: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:4165: 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"
@@ -4109,23 +4201,23 @@
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:4112: checking for $ac_header" >&5
+echo "$as_me:4204: 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 4118 "configure"
+#line 4210 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:4122: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4214: \"$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:4128: \$? = $ac_status" >&5
+  echo "$as_me:4220: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4144,7 +4236,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:4147: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:4239: 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
@@ -4155,13 +4247,13 @@
 done
 
 ###	checks for typedefs
-echo "$as_me:4158: checking return type of signal handlers" >&5
+echo "$as_me:4250: 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 4164 "configure"
+#line 4256 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -4183,16 +4275,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4186: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4278: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4189: \$? = $ac_status" >&5
+  echo "$as_me:4281: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4192: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4284: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4195: \$? = $ac_status" >&5
+  echo "$as_me:4287: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_signal=void
 else
@@ -4202,7 +4294,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4205: result: $ac_cv_type_signal" >&5
+echo "$as_me:4297: result: $ac_cv_type_signal" >&5
 echo "${ECHO_T}$ac_cv_type_signal" >&6
 
 cat >>confdefs.h <<EOF
@@ -4231,28 +4323,28 @@
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:4234: checking for $ac_header" >&5
+echo "$as_me:4326: 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 4240 "configure"
+#line 4332 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4246: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4338: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4249: \$? = $ac_status" >&5
+  echo "$as_me:4341: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4252: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4344: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4255: \$? = $ac_status" >&5
+  echo "$as_me:4347: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -4262,7 +4354,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4265: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:4357: 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
@@ -4272,13 +4364,13 @@
 fi
 done
 
-echo "$as_me:4275: checking for size_t" >&5
+echo "$as_me:4367: 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 4281 "configure"
+#line 4373 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -4293,16 +4385,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4296: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4388: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4299: \$? = $ac_status" >&5
+  echo "$as_me:4391: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4302: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4394: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4305: \$? = $ac_status" >&5
+  echo "$as_me:4397: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_size_t=yes
 else
@@ -4312,7 +4404,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4315: result: $ac_cv_type_size_t" >&5
+echo "$as_me:4407: 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
   :
@@ -4324,13 +4416,13 @@
 
 fi
 
-echo "$as_me:4327: checking for uid_t in sys/types.h" >&5
+echo "$as_me:4419: 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 4333 "configure"
+#line 4425 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -4344,7 +4436,7 @@
 rm -f conftest*
 
 fi
-echo "$as_me:4347: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:4439: 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
 
@@ -4358,13 +4450,13 @@
 
 fi
 
-echo "$as_me:4361: checking for pid_t" >&5
+echo "$as_me:4453: 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 4367 "configure"
+#line 4459 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -4379,16 +4471,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4382: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4474: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4385: \$? = $ac_status" >&5
+  echo "$as_me:4477: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4388: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4480: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4391: \$? = $ac_status" >&5
+  echo "$as_me:4483: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -4398,7 +4490,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4401: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:4493: 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
   :
@@ -4410,13 +4502,13 @@
 
 fi
 
-echo "$as_me:4413: checking for time_t" >&5
+echo "$as_me:4505: 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 4419 "configure"
+#line 4511 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -4431,16 +4523,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4434: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4526: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4437: \$? = $ac_status" >&5
+  echo "$as_me:4529: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4440: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4532: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4443: \$? = $ac_status" >&5
+  echo "$as_me:4535: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_time_t=yes
 else
@@ -4450,7 +4542,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4453: result: $ac_cv_type_time_t" >&5
+echo "$as_me:4545: 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
   :
@@ -4464,18 +4556,18 @@
 
 ###	checks for library functions
 if test "$cross_compiling" = no; then
-	echo "$as_me:4467: checking whether setvbuf arguments are reversed" >&5
+	echo "$as_me:4559: 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:4473: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:4565: 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 4478 "configure"
+#line 4570 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 /* If setvbuf has the reversed format, exit 0. */
@@ -4492,15 +4584,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:4495: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4587: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4498: \$? = $ac_status" >&5
+  echo "$as_me:4590: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:4500: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4592: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4503: \$? = $ac_status" >&5
+  echo "$as_me:4595: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_setvbuf_reversed=yes
 else
@@ -4513,7 +4605,7 @@
 fi
 rm -f core core.* *.core
 fi
-echo "$as_me:4516: result: $ac_cv_func_setvbuf_reversed" >&5
+echo "$as_me:4608: 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
 
@@ -4526,13 +4618,13 @@
 fi
 
 ###	checks for structures
-echo "$as_me:4529: checking whether stat file-mode macros are broken" >&5
+echo "$as_me:4621: 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 4535 "configure"
+#line 4627 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -4571,7 +4663,7 @@
 rm -f conftest*
 
 fi
-echo "$as_me:4574: result: $ac_cv_header_stat_broken" >&5
+echo "$as_me:4666: 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
 
@@ -4581,13 +4673,13 @@
 
 fi
 
-echo "$as_me:4584: checking for struct stat.st_blksize" >&5
+echo "$as_me:4676: 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 4590 "configure"
+#line 4682 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -4601,16 +4693,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4604: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4696: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4607: \$? = $ac_status" >&5
+  echo "$as_me:4699: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4610: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4702: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4613: \$? = $ac_status" >&5
+  echo "$as_me:4705: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_member_struct_stat_st_blksize=yes
 else
@@ -4620,7 +4712,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4623: result: $ac_cv_member_struct_stat_st_blksize" >&5
+echo "$as_me:4715: 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
 
@@ -4634,13 +4726,13 @@
 
 fi
 
-echo "$as_me:4637: checking for struct stat.st_blocks" >&5
+echo "$as_me:4729: 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 4643 "configure"
+#line 4735 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -4654,16 +4746,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4657: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4749: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4660: \$? = $ac_status" >&5
+  echo "$as_me:4752: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4663: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4755: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4666: \$? = $ac_status" >&5
+  echo "$as_me:4758: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_member_struct_stat_st_blocks=yes
 else
@@ -4673,7 +4765,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4676: result: $ac_cv_member_struct_stat_st_blocks" >&5
+echo "$as_me:4768: 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
 
@@ -4689,13 +4781,13 @@
   LIBOBJS="$LIBOBJS fileblocks.$ac_objext"
 fi
 
-echo "$as_me:4692: checking for struct stat.st_rdev" >&5
+echo "$as_me:4784: 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 4698 "configure"
+#line 4790 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -4709,16 +4801,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4712: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4804: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4715: \$? = $ac_status" >&5
+  echo "$as_me:4807: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4718: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4810: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4721: \$? = $ac_status" >&5
+  echo "$as_me:4813: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_member_struct_stat_st_rdev=yes
 else
@@ -4728,7 +4820,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4731: result: $ac_cv_member_struct_stat_st_rdev" >&5
+echo "$as_me:4823: 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
 
@@ -4742,13 +4834,13 @@
 
 fi
 
-echo "$as_me:4745: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "$as_me:4837: 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 4751 "configure"
+#line 4843 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <time.h>
@@ -4762,16 +4854,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4765: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4857: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4768: \$? = $ac_status" >&5
+  echo "$as_me:4860: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4771: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4863: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4774: \$? = $ac_status" >&5
+  echo "$as_me:4866: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_struct_tm=time.h
 else
@@ -4781,7 +4873,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4784: result: $ac_cv_struct_tm" >&5
+echo "$as_me:4876: result: $ac_cv_struct_tm" >&5
 echo "${ECHO_T}$ac_cv_struct_tm" >&6
 if test $ac_cv_struct_tm = sys/time.h; then
 
@@ -4791,13 +4883,13 @@
 
 fi
 
-echo "$as_me:4794: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:4886: 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 4800 "configure"
+#line 4892 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -4813,16 +4905,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4816: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4908: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4819: \$? = $ac_status" >&5
+  echo "$as_me:4911: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4822: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4914: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4825: \$? = $ac_status" >&5
+  echo "$as_me:4917: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_header_time=yes
 else
@@ -4832,7 +4924,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4835: result: $ac_cv_header_time" >&5
+echo "$as_me:4927: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -4842,14 +4934,14 @@
 
 fi
 
-echo "$as_me:4845: checking if we can include select.h with time.h" >&5
+echo "$as_me:4937: 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 4852 "configure"
+#line 4944 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -4879,16 +4971,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4882: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4974: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4885: \$? = $ac_status" >&5
+  echo "$as_me:4977: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4888: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4980: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4891: \$? = $ac_status" >&5
+  echo "$as_me:4983: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_select_with_time=yes
 else
@@ -4899,20 +4991,20 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:4902: result: $cf_cv_select_with_time" >&5
+echo "$as_me:4994: 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:4908: checking if we may include sys/resource.h with sys/wait.h" >&5
+echo "$as_me:5000: 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 4915 "configure"
+#line 5007 "configure"
 #include "confdefs.h"
 
 #if defined(HAVE_SYS_TIME_H) && (defined(SELECT_WITH_TIME) || !(defined(HAVE_SELECT_H || defined(HAVE_SYS_SELECT_H))))
@@ -4936,16 +5028,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4939: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5031: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4942: \$? = $ac_status" >&5
+  echo "$as_me:5034: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4945: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5037: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4948: \$? = $ac_status" >&5
+  echo "$as_me:5040: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_resource_with_wait=yes
 else
@@ -4956,7 +5048,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:4959: result: $cf_cv_resource_with_wait" >&5
+echo "$as_me:5051: 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
@@ -4969,23 +5061,23 @@
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:4972: checking for $ac_header" >&5
+echo "$as_me:5064: 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 4978 "configure"
+#line 5070 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:4982: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5074: \"$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:4988: \$? = $ac_status" >&5
+  echo "$as_me:5080: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5004,7 +5096,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:5007: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:5099: 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
@@ -5019,23 +5111,23 @@
 for ac_header in sys/termio.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:5022: checking for $ac_header" >&5
+echo "$as_me:5114: 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 5028 "configure"
+#line 5120 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:5032: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5124: \"$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:5038: \$? = $ac_status" >&5
+  echo "$as_me:5130: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5054,7 +5146,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:5057: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:5149: 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
@@ -5072,10 +5164,10 @@
 	*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:5075: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:5167: 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 5078 "configure"
+#line 5170 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -5087,16 +5179,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5090: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5182: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5093: \$? = $ac_status" >&5
+  echo "$as_me:5185: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5096: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5188: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5099: \$? = $ac_status" >&5
+  echo "$as_me:5191: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   termios_bad=no
 else
@@ -5104,7 +5196,7 @@
 cat conftest.$ac_ext >&5
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 5107 "configure"
+#line 5199 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -5118,16 +5210,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5121: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5213: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5124: \$? = $ac_status" >&5
+  echo "$as_me:5216: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5127: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5219: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5130: \$? = $ac_status" >&5
+  echo "$as_me:5222: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   termios_bad=unknown
 else
@@ -5142,12 +5234,12 @@
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-	echo "$as_me:5145: result: $termios_bad" >&5
+	echo "$as_me:5237: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:5150: checking declaration of size-change" >&5
+echo "$as_me:5242: 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
@@ -5162,7 +5254,7 @@
     CPPFLAGS="$cf_save_CPPFLAGS"
     test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
     cat >conftest.$ac_ext <<_ACEOF
-#line 5165 "configure"
+#line 5257 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -5206,16 +5298,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5209: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5301: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5212: \$? = $ac_status" >&5
+  echo "$as_me:5304: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5215: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5307: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5218: \$? = $ac_status" >&5
+  echo "$as_me:5310: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_sizechange=yes
 else
@@ -5234,7 +5326,7 @@
 done
 
 fi
-echo "$as_me:5237: result: $cf_cv_sizechange" >&5
+echo "$as_me:5329: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 	cat >>confdefs.h <<\EOF
@@ -5251,7 +5343,7 @@
 	esac
 fi
 
-echo "$as_me:5254: checking for file-pointer ready definition" >&5
+echo "$as_me:5346: 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
@@ -5265,7 +5357,7 @@
 	echo "test-compile $definition" 1>&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 5268 "configure"
+#line 5360 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -5280,16 +5372,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5283: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5375: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5286: \$? = $ac_status" >&5
+  echo "$as_me:5378: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5289: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5381: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5292: \$? = $ac_status" >&5
+  echo "$as_me:5384: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   echo "$definition" >conftest.env
 	 break
@@ -5313,21 +5405,21 @@
 test -f conftest.env && cf_cv_fp_isready=`cat conftest.env`
 
 fi
-echo "$as_me:5316: result: $cf_cv_fp_isready" >&5
+echo "$as_me:5408: 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:5323: checking for <wctype.h> and functions" >&5
+echo "$as_me:5415: 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 5330 "configure"
+#line 5422 "configure"
 #include "confdefs.h"
 
 #include <wctype.h>
@@ -5354,16 +5446,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5357: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5449: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5360: \$? = $ac_status" >&5
+  echo "$as_me:5452: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5363: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5455: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5366: \$? = $ac_status" >&5
+  echo "$as_me:5458: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_wctype=yes
 else
@@ -5374,10 +5466,10 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:5377: result: $cf_cv_have_wctype" >&5
+echo "$as_me:5469: 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:5380: checking for library containing wctype" >&5
+	echo "$as_me:5472: 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
@@ -5385,7 +5477,7 @@
   ac_func_search_save_LIBS=$LIBS
 ac_cv_search_wctype=no
 cat >conftest.$ac_ext <<_ACEOF
-#line 5388 "configure"
+#line 5480 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -5404,16 +5496,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5407: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5499: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5410: \$? = $ac_status" >&5
+  echo "$as_me:5502: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5413: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5505: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5416: \$? = $ac_status" >&5
+  echo "$as_me:5508: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_search_wctype="none required"
 else
@@ -5425,7 +5517,7 @@
   for ac_lib in w; do
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
     cat >conftest.$ac_ext <<_ACEOF
-#line 5428 "configure"
+#line 5520 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -5444,16 +5536,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5447: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5539: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5450: \$? = $ac_status" >&5
+  echo "$as_me:5542: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5453: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5545: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5456: \$? = $ac_status" >&5
+  echo "$as_me:5548: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_search_wctype="-l$ac_lib"
 break
@@ -5466,7 +5558,7 @@
 fi
 LIBS=$ac_func_search_save_LIBS
 fi
-echo "$as_me:5469: result: $ac_cv_search_wctype" >&5
+echo "$as_me:5561: 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"
@@ -5479,7 +5571,7 @@
 fi
 
 ###	checks for system services and user specified options
-echo "$as_me:5482: checking for long file names" >&5
+echo "$as_me:5574: 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
@@ -5518,7 +5610,7 @@
   rm -rf $ac_xdir 2>/dev/null
 done
 fi
-echo "$as_me:5521: result: $ac_cv_sys_long_file_names" >&5
+echo "$as_me:5613: 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
 
@@ -5528,7 +5620,7 @@
 
 fi
 
-echo "$as_me:5531: checking for restartable reads on pipes" >&5
+echo "$as_me:5623: 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
@@ -5538,7 +5630,7 @@
   cf_cv_can_restart_read=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5541 "configure"
+#line 5633 "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
@@ -5585,15 +5677,15 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:5588: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5680: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5591: \$? = $ac_status" >&5
+  echo "$as_me:5683: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:5593: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5685: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5596: \$? = $ac_status" >&5
+  echo "$as_me:5688: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_can_restart_read=yes
 else
@@ -5606,7 +5698,7 @@
 fi
 
 fi
-echo "$as_me:5609: result: $cf_cv_can_restart_read" >&5
+echo "$as_me:5701: 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
@@ -5615,18 +5707,18 @@
 
 		# is a read() of a pipe restartable?
 
-echo "$as_me:5618: checking whether setpgrp takes no argument" >&5
+echo "$as_me:5710: 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:5624: error: cannot check setpgrp if cross compiling" >&5
+  { { echo "$as_me:5716: 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 5629 "configure"
+#line 5721 "configure"
 #include "confdefs.h"
 #if HAVE_UNISTD_H
 # include <unistd.h>
@@ -5643,15 +5735,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:5646: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5738: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5649: \$? = $ac_status" >&5
+  echo "$as_me:5741: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:5651: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5743: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5654: \$? = $ac_status" >&5
+  echo "$as_me:5746: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_setpgrp_void=no
 else
@@ -5663,7 +5755,7 @@
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:5666: result: $ac_cv_func_setpgrp_void" >&5
+echo "$as_me:5758: 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
 
@@ -5673,14 +5765,14 @@
 
 fi
 
-echo "$as_me:5676: checking whether getpgrp takes no argument" >&5
+echo "$as_me:5768: 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 5683 "configure"
+#line 5775 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -5692,16 +5784,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5695: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5787: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5698: \$? = $ac_status" >&5
+  echo "$as_me:5790: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5701: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5793: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5704: \$? = $ac_status" >&5
+  echo "$as_me:5796: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_func_getpgrp_1=yes
 else
@@ -5712,7 +5804,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 # Use it with no arg.
 cat >conftest.$ac_ext <<_ACEOF
-#line 5715 "configure"
+#line 5807 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -5724,16 +5816,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5727: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5819: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5730: \$? = $ac_status" >&5
+  echo "$as_me:5822: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5733: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5825: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5736: \$? = $ac_status" >&5
+  echo "$as_me:5828: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_func_getpgrp_0=yes
 else
@@ -5747,12 +5839,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:5750: error: cannot check getpgrp if cross compiling" >&5
+  { { echo "$as_me:5842: 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 5755 "configure"
+#line 5847 "configure"
 #include "confdefs.h"
 $ac_includes_default
 
@@ -5806,15 +5898,15 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:5809: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5901: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5812: \$? = $ac_status" >&5
+  echo "$as_me:5904: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:5814: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5906: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5817: \$? = $ac_status" >&5
+  echo "$as_me:5909: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_getpgrp_void=yes
 else
@@ -5828,7 +5920,7 @@
 esac # $ac_func_getpgrp_0:$ac_func_getpgrp_1
 
 fi
-echo "$as_me:5831: result: $ac_cv_func_getpgrp_void" >&5
+echo "$as_me:5923: 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
 
@@ -5838,7 +5930,7 @@
 
 fi
 
-echo "$as_me:5841: checking if killpg is needed" >&5
+echo "$as_me:5933: 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
@@ -5848,7 +5940,7 @@
   cf_cv_need_killpg=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5851 "configure"
+#line 5943 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -5873,15 +5965,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:5876: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5968: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5879: \$? = $ac_status" >&5
+  echo "$as_me:5971: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:5881: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5973: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5884: \$? = $ac_status" >&5
+  echo "$as_me:5976: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_killpg=no
 else
@@ -5894,21 +5986,21 @@
 fi
 
 fi
-echo "$as_me:5897: result: $cf_cv_need_killpg" >&5
+echo "$as_me:5989: 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:5904: checking if external errno is declared" >&5
+echo "$as_me:5996: 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 5911 "configure"
+#line 6003 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -5926,16 +6018,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5929: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6021: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5932: \$? = $ac_status" >&5
+  echo "$as_me:6024: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5935: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6027: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5938: \$? = $ac_status" >&5
+  echo "$as_me:6030: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -5946,7 +6038,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:5949: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:6041: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -5961,14 +6053,14 @@
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:5964: checking if external errno exists" >&5
+echo "$as_me:6056: 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 5971 "configure"
+#line 6063 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -5983,16 +6075,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5986: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6078: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5989: \$? = $ac_status" >&5
+  echo "$as_me:6081: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5992: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6084: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5995: \$? = $ac_status" >&5
+  echo "$as_me:6087: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_errno=yes
 else
@@ -6003,7 +6095,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:6006: result: $cf_cv_have_errno" >&5
+echo "$as_me:6098: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -6016,14 +6108,14 @@
 
 fi
 
-echo "$as_me:6019: checking if external sys_nerr is declared" >&5
+echo "$as_me:6111: 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 6026 "configure"
+#line 6118 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -6041,16 +6133,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6044: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6136: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6047: \$? = $ac_status" >&5
+  echo "$as_me:6139: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6050: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6142: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6053: \$? = $ac_status" >&5
+  echo "$as_me:6145: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_nerr=yes
 else
@@ -6061,7 +6153,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:6064: result: $cf_cv_dcl_sys_nerr" >&5
+echo "$as_me:6156: 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
@@ -6076,14 +6168,14 @@
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:6079: checking if external sys_nerr exists" >&5
+echo "$as_me:6171: 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 6086 "configure"
+#line 6178 "configure"
 #include "confdefs.h"
 
 #undef sys_nerr
@@ -6098,16 +6190,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6101: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6193: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6104: \$? = $ac_status" >&5
+  echo "$as_me:6196: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6107: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6199: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6110: \$? = $ac_status" >&5
+  echo "$as_me:6202: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_nerr=yes
 else
@@ -6118,7 +6210,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:6121: result: $cf_cv_have_sys_nerr" >&5
+echo "$as_me:6213: 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
@@ -6131,14 +6223,14 @@
 
 fi
 
-echo "$as_me:6134: checking if external sys_errlist is declared" >&5
+echo "$as_me:6226: 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 6141 "configure"
+#line 6233 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -6156,16 +6248,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6159: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6251: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6162: \$? = $ac_status" >&5
+  echo "$as_me:6254: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6165: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6257: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6168: \$? = $ac_status" >&5
+  echo "$as_me:6260: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_errlist=yes
 else
@@ -6176,7 +6268,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:6179: result: $cf_cv_dcl_sys_errlist" >&5
+echo "$as_me:6271: 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
@@ -6191,14 +6283,14 @@
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:6194: checking if external sys_errlist exists" >&5
+echo "$as_me:6286: 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 6201 "configure"
+#line 6293 "configure"
 #include "confdefs.h"
 
 #undef sys_errlist
@@ -6213,16 +6305,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6216: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6308: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6219: \$? = $ac_status" >&5
+  echo "$as_me:6311: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6222: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6314: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6225: \$? = $ac_status" >&5
+  echo "$as_me:6317: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_errlist=yes
 else
@@ -6233,7 +6325,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:6236: result: $cf_cv_have_sys_errlist" >&5
+echo "$as_me:6328: 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
@@ -6259,7 +6351,7 @@
 #define os_chosen 1
 EOF
 
-echo "$as_me:6262: checking for screen type" >&5
+echo "$as_me:6354: checking for screen type" >&5
 echo $ECHO_N "checking for screen type... $ECHO_C" >&6
 
 # Check whether --with-screen or --without-screen was given.
@@ -6280,14 +6372,14 @@
 if test -z "$screen"; then
 	screen=termcap;
 fi
-echo "$as_me:6283: result: $screen" >&5
+echo "$as_me:6375: 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:6290: checking for X" >&5
+		echo "$as_me:6382: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -6384,17 +6476,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 6387 "configure"
+#line 6479 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:6391: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:6483: \"$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:6397: \$? = $ac_status" >&5
+  echo "$as_me:6489: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6427,7 +6519,7 @@
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >conftest.$ac_ext <<_ACEOF
-#line 6430 "configure"
+#line 6522 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -6439,16 +6531,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6442: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6534: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6445: \$? = $ac_status" >&5
+  echo "$as_me:6537: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6448: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6540: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6451: \$? = $ac_status" >&5
+  echo "$as_me:6543: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -6486,7 +6578,7 @@
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:6489: result: $have_x" >&5
+  echo "$as_me:6581: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -6496,7 +6588,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:6499: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:6591: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -6511,7 +6603,7 @@
 clix*)
 	# FIXME: modify the library lookup in autoconf to
 	# allow _s.a suffix ahead of .a
-	echo "$as_me:6514: checking for open in -lc_s" >&5
+	echo "$as_me:6606: checking for open in -lc_s" >&5
 echo $ECHO_N "checking for open in -lc_s... $ECHO_C" >&6
 if test "${ac_cv_lib_c_s_open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6519,7 +6611,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc_s  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6522 "configure"
+#line 6614 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6538,16 +6630,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6541: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6633: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6544: \$? = $ac_status" >&5
+  echo "$as_me:6636: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6547: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6639: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6550: \$? = $ac_status" >&5
+  echo "$as_me:6642: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_c_s_open=yes
 else
@@ -6558,11 +6650,11 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6561: result: $ac_cv_lib_c_s_open" >&5
+echo "$as_me:6653: result: $ac_cv_lib_c_s_open" >&5
 echo "${ECHO_T}$ac_cv_lib_c_s_open" >&6
 if test $ac_cv_lib_c_s_open = yes; then
   LIBS="-lc_s $LIBS"
-	echo "$as_me:6565: checking for gethostname in -lbsd" >&5
+	echo "$as_me:6657: checking for gethostname in -lbsd" >&5
 echo $ECHO_N "checking for gethostname in -lbsd... $ECHO_C" >&6
 if test "${ac_cv_lib_bsd_gethostname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6570,7 +6662,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6573 "configure"
+#line 6665 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6589,16 +6681,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6592: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6684: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6595: \$? = $ac_status" >&5
+  echo "$as_me:6687: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6598: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6690: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6601: \$? = $ac_status" >&5
+  echo "$as_me:6693: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_bsd_gethostname=yes
 else
@@ -6609,11 +6701,11 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6612: result: $ac_cv_lib_bsd_gethostname" >&5
+echo "$as_me:6704: result: $ac_cv_lib_bsd_gethostname" >&5
 echo "${ECHO_T}$ac_cv_lib_bsd_gethostname" >&6
 if test $ac_cv_lib_bsd_gethostname = yes; then
   LIBS="-lbsd $LIBS"
-	echo "$as_me:6616: checking for gethostname in -lnsl_s" >&5
+	echo "$as_me:6708: checking for gethostname in -lnsl_s" >&5
 echo $ECHO_N "checking for gethostname in -lnsl_s... $ECHO_C" >&6
 if test "${ac_cv_lib_nsl_s_gethostname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6621,7 +6713,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl_s  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6624 "configure"
+#line 6716 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6640,16 +6732,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6643: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6735: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6646: \$? = $ac_status" >&5
+  echo "$as_me:6738: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6649: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6741: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6652: \$? = $ac_status" >&5
+  echo "$as_me:6744: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_s_gethostname=yes
 else
@@ -6660,11 +6752,11 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6663: result: $ac_cv_lib_nsl_s_gethostname" >&5
+echo "$as_me:6755: result: $ac_cv_lib_nsl_s_gethostname" >&5
 echo "${ECHO_T}$ac_cv_lib_nsl_s_gethostname" >&6
 if test $ac_cv_lib_nsl_s_gethostname = yes; then
   LIBS="-lnsl_s $LIBS"
-	echo "$as_me:6667: checking for XOpenDisplay in -lX11_s" >&5
+	echo "$as_me:6759: checking for XOpenDisplay in -lX11_s" >&5
 echo $ECHO_N "checking for XOpenDisplay in -lX11_s... $ECHO_C" >&6
 if test "${ac_cv_lib_X11_s_XOpenDisplay+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6672,7 +6764,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11_s  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6675 "configure"
+#line 6767 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6691,16 +6783,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6694: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6786: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6697: \$? = $ac_status" >&5
+  echo "$as_me:6789: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6700: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6792: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6703: \$? = $ac_status" >&5
+  echo "$as_me:6795: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_s_XOpenDisplay=yes
 else
@@ -6711,11 +6803,11 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6714: result: $ac_cv_lib_X11_s_XOpenDisplay" >&5
+echo "$as_me:6806: result: $ac_cv_lib_X11_s_XOpenDisplay" >&5
 echo "${ECHO_T}$ac_cv_lib_X11_s_XOpenDisplay" >&6
 if test $ac_cv_lib_X11_s_XOpenDisplay = yes; then
   LIBS="-lX11_s $LIBS"
-	echo "$as_me:6718: checking for XtAppInitialize in -lXt_s" >&5
+	echo "$as_me:6810: checking for XtAppInitialize in -lXt_s" >&5
 echo $ECHO_N "checking for XtAppInitialize in -lXt_s... $ECHO_C" >&6
 if test "${ac_cv_lib_Xt_s_XtAppInitialize+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6723,7 +6815,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt_s  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6726 "configure"
+#line 6818 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6742,16 +6834,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6745: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6837: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6748: \$? = $ac_status" >&5
+  echo "$as_me:6840: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6751: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6843: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6754: \$? = $ac_status" >&5
+  echo "$as_me:6846: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xt_s_XtAppInitialize=yes
 else
@@ -6762,7 +6854,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6765: result: $ac_cv_lib_Xt_s_XtAppInitialize" >&5
+echo "$as_me:6857: result: $ac_cv_lib_Xt_s_XtAppInitialize" >&5
 echo "${ECHO_T}$ac_cv_lib_Xt_s_XtAppInitialize" >&6
 if test $ac_cv_lib_Xt_s_XtAppInitialize = yes; then
   LIBS="-lXt_s $LIBS"
@@ -6781,7 +6873,7 @@
 	;;
 *)
 
-echo "$as_me:6784: checking for socket in -lsocket" >&5
+echo "$as_me:6876: checking for socket in -lsocket" >&5
 echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6
 if test "${ac_cv_lib_socket_socket+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6789,7 +6881,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6792 "configure"
+#line 6884 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6808,16 +6900,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6811: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6903: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6814: \$? = $ac_status" >&5
+  echo "$as_me:6906: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6817: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6909: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6820: \$? = $ac_status" >&5
+  echo "$as_me:6912: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_socket=yes
 else
@@ -6828,7 +6920,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6831: result: $ac_cv_lib_socket_socket" >&5
+echo "$as_me:6923: result: $ac_cv_lib_socket_socket" >&5
 echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6
 if test $ac_cv_lib_socket_socket = yes; then
   cat >>confdefs.h <<EOF
@@ -6839,7 +6931,7 @@
 
 fi
 
-echo "$as_me:6842: checking for gethostname in -lnsl" >&5
+echo "$as_me:6934: checking for gethostname in -lnsl" >&5
 echo $ECHO_N "checking for gethostname in -lnsl... $ECHO_C" >&6
 if test "${ac_cv_lib_nsl_gethostname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6847,7 +6939,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6850 "configure"
+#line 6942 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6866,16 +6958,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6869: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6961: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6872: \$? = $ac_status" >&5
+  echo "$as_me:6964: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6875: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6967: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6878: \$? = $ac_status" >&5
+  echo "$as_me:6970: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostname=yes
 else
@@ -6886,7 +6978,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6889: result: $ac_cv_lib_nsl_gethostname" >&5
+echo "$as_me:6981: result: $ac_cv_lib_nsl_gethostname" >&5
 echo "${ECHO_T}$ac_cv_lib_nsl_gethostname" >&6
 if test $ac_cv_lib_nsl_gethostname = yes; then
   cat >>confdefs.h <<EOF
@@ -6921,11 +7013,11 @@
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:6924: checking whether -R must be followed by a space" >&5
+      echo "$as_me:7016: 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 6928 "configure"
+#line 7020 "configure"
 #include "confdefs.h"
 
 int
@@ -6937,16 +7029,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6940: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7032: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6943: \$? = $ac_status" >&5
+  echo "$as_me:7035: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6946: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7038: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6949: \$? = $ac_status" >&5
+  echo "$as_me:7041: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_nospace=yes
 else
@@ -6956,13 +7048,13 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
       if test $ac_R_nospace = yes; then
-	echo "$as_me:6959: result: no" >&5
+	echo "$as_me:7051: 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 6965 "configure"
+#line 7057 "configure"
 #include "confdefs.h"
 
 int
@@ -6974,16 +7066,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6977: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7069: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6980: \$? = $ac_status" >&5
+  echo "$as_me:7072: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6983: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7075: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6986: \$? = $ac_status" >&5
+  echo "$as_me:7078: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_space=yes
 else
@@ -6993,11 +7085,11 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	if test $ac_R_space = yes; then
-	  echo "$as_me:6996: result: yes" >&5
+	  echo "$as_me:7088: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:7000: result: neither works" >&5
+	  echo "$as_me:7092: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -7017,7 +7109,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 7020 "configure"
+#line 7112 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7036,22 +7128,22 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7039: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7131: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7042: \$? = $ac_status" >&5
+  echo "$as_me:7134: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7045: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7137: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7048: \$? = $ac_status" >&5
+  echo "$as_me:7140: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:7054: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:7146: 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
@@ -7059,7 +7151,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7062 "configure"
+#line 7154 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7078,16 +7170,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7081: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7173: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7084: \$? = $ac_status" >&5
+  echo "$as_me:7176: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7087: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7179: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7090: \$? = $ac_status" >&5
+  echo "$as_me:7182: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -7098,14 +7190,14 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7101: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:7193: 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:7108: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:7200: 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
@@ -7113,7 +7205,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7116 "configure"
+#line 7208 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7132,16 +7224,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7135: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7227: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7138: \$? = $ac_status" >&5
+  echo "$as_me:7230: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7141: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7233: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7144: \$? = $ac_status" >&5
+  echo "$as_me:7236: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -7152,7 +7244,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7155: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:7247: 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"
@@ -7171,13 +7263,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:7174: checking for gethostbyname" >&5
+    echo "$as_me:7266: 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 7180 "configure"
+#line 7272 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname (); below.  */
@@ -7208,16 +7300,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7211: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7303: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7214: \$? = $ac_status" >&5
+  echo "$as_me:7306: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7217: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7309: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7220: \$? = $ac_status" >&5
+  echo "$as_me:7312: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -7227,11 +7319,11 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7230: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:7322: 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:7234: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:7326: 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
@@ -7239,7 +7331,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7242 "configure"
+#line 7334 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7258,16 +7350,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7261: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7353: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7264: \$? = $ac_status" >&5
+  echo "$as_me:7356: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7267: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7359: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7270: \$? = $ac_status" >&5
+  echo "$as_me:7362: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -7278,14 +7370,14 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7281: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:7373: 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:7288: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:7380: 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
@@ -7293,7 +7385,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7296 "configure"
+#line 7388 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7312,16 +7404,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7315: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7407: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7318: \$? = $ac_status" >&5
+  echo "$as_me:7410: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7321: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7413: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7324: \$? = $ac_status" >&5
+  echo "$as_me:7416: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -7332,7 +7424,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7335: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:7427: 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"
@@ -7348,13 +7440,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:7351: checking for connect" >&5
+    echo "$as_me:7443: 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 7357 "configure"
+#line 7449 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect (); below.  */
@@ -7385,16 +7477,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7388: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7480: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7391: \$? = $ac_status" >&5
+  echo "$as_me:7483: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7394: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7486: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7397: \$? = $ac_status" >&5
+  echo "$as_me:7489: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_connect=yes
 else
@@ -7404,11 +7496,11 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7407: result: $ac_cv_func_connect" >&5
+echo "$as_me:7499: 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:7411: checking for connect in -lsocket" >&5
+      echo "$as_me:7503: 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
@@ -7416,7 +7508,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7419 "configure"
+#line 7511 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7435,16 +7527,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7438: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7530: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7441: \$? = $ac_status" >&5
+  echo "$as_me:7533: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7444: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7536: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7447: \$? = $ac_status" >&5
+  echo "$as_me:7539: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -7455,7 +7547,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7458: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:7550: 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"
@@ -7464,13 +7556,13 @@
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:7467: checking for remove" >&5
+    echo "$as_me:7559: 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 7473 "configure"
+#line 7565 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove (); below.  */
@@ -7501,16 +7593,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7504: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7596: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7507: \$? = $ac_status" >&5
+  echo "$as_me:7599: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7510: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7602: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7513: \$? = $ac_status" >&5
+  echo "$as_me:7605: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_remove=yes
 else
@@ -7520,11 +7612,11 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7523: result: $ac_cv_func_remove" >&5
+echo "$as_me:7615: 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:7527: checking for remove in -lposix" >&5
+      echo "$as_me:7619: 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
@@ -7532,7 +7624,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7535 "configure"
+#line 7627 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7551,16 +7643,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7554: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7646: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7557: \$? = $ac_status" >&5
+  echo "$as_me:7649: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7560: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7652: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7563: \$? = $ac_status" >&5
+  echo "$as_me:7655: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -7571,7 +7663,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7574: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:7666: 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"
@@ -7580,13 +7672,13 @@
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:7583: checking for shmat" >&5
+    echo "$as_me:7675: 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 7589 "configure"
+#line 7681 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat (); below.  */
@@ -7617,16 +7709,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7620: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7712: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7623: \$? = $ac_status" >&5
+  echo "$as_me:7715: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7626: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7718: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7629: \$? = $ac_status" >&5
+  echo "$as_me:7721: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -7636,11 +7728,11 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7639: result: $ac_cv_func_shmat" >&5
+echo "$as_me:7731: 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:7643: checking for shmat in -lipc" >&5
+      echo "$as_me:7735: 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
@@ -7648,7 +7740,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7651 "configure"
+#line 7743 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7667,16 +7759,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7670: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7762: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7673: \$? = $ac_status" >&5
+  echo "$as_me:7765: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7676: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7768: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7679: \$? = $ac_status" >&5
+  echo "$as_me:7771: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -7687,7 +7779,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7690: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:7782: 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"
@@ -7705,7 +7797,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:7708: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:7800: 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
@@ -7713,7 +7805,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7716 "configure"
+#line 7808 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7732,16 +7824,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7735: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7827: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7738: \$? = $ac_status" >&5
+  echo "$as_me:7830: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7741: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7833: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7744: \$? = $ac_status" >&5
+  echo "$as_me:7836: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -7752,7 +7844,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7755: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:7847: 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"
@@ -7803,7 +7895,7 @@
 
 if test "$cf_check_cflags" != "$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 7806 "configure"
+#line 7898 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7815,16 +7907,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7818: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7910: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7821: \$? = $ac_status" >&5
+  echo "$as_me:7913: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7824: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7916: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7827: \$? = $ac_status" >&5
+  echo "$as_me:7919: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -7841,7 +7933,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-	echo "$as_me:7844: checking for XOpenDisplay in -lX11" >&5
+	echo "$as_me:7936: 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
@@ -7849,7 +7941,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7852 "configure"
+#line 7944 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7868,16 +7960,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7871: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7963: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7874: \$? = $ac_status" >&5
+  echo "$as_me:7966: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7877: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7969: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7880: \$? = $ac_status" >&5
+  echo "$as_me:7972: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -7888,13 +7980,13 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7891: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:7983: result: $ac_cv_lib_X11_XOpenDisplay" >&5
 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
 if test $ac_cv_lib_X11_XOpenDisplay = yes; then
   LIBS="-lX11 $LIBS"
 fi
 
-	echo "$as_me:7897: checking for XtAppInitialize in -lXt" >&5
+	echo "$as_me:7989: 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
@@ -7902,7 +7994,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7905 "configure"
+#line 7997 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7921,16 +8013,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7924: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8016: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7927: \$? = $ac_status" >&5
+  echo "$as_me:8019: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7930: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8022: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7933: \$? = $ac_status" >&5
+  echo "$as_me:8025: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xt_XtAppInitialize=yes
 else
@@ -7941,7 +8033,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7944: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:8036: 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
@@ -7994,7 +8086,7 @@
 
 if test "$cf_check_cflags" != "$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 7997 "configure"
+#line 8089 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8006,16 +8098,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8009: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8101: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8012: \$? = $ac_status" >&5
+  echo "$as_me:8104: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8015: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8107: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8018: \$? = $ac_status" >&5
+  echo "$as_me:8110: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -8035,7 +8127,7 @@
 fi
 
 if test $cf_have_X_LIBS = no ; then
-	{ echo "$as_me:8038: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+	{ echo "$as_me:8130: 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
@@ -8047,7 +8139,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:8050: checking for $ac_word" >&5
+echo "$as_me:8142: 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
@@ -8064,7 +8156,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:8067: found $ac_dir/$ac_word" >&5
+   echo "$as_me:8159: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -8075,10 +8167,10 @@
 IMAKE=$ac_cv_path_IMAKE
 
 if test -n "$IMAKE"; then
-  echo "$as_me:8078: result: $IMAKE" >&5
+  echo "$as_me:8170: result: $IMAKE" >&5
 echo "${ECHO_T}$IMAKE" >&6
 else
-  echo "$as_me:8081: result: no" >&5
+  echo "$as_me:8173: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8096,6 +8188,7 @@
 
 # If it's installed properly, imake (or its wrapper, xmkmf) will point to the
 # config directory.
+if test -n "$IMAKE" ; then
 if mkdir conftestdir; then
 	cf_makefile=`cd $srcdir;pwd`/Imakefile
 	CDPATH=; export CDPATH
@@ -8127,7 +8220,7 @@
 			esac
 		done
 		if test -z "$cf_config" ; then
-			{ echo "$as_me:8130: WARNING: Could not find imake config-directory" >&5
+			{ echo "$as_me:8223: 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"
@@ -8136,7 +8229,7 @@
 				test -n "$verbose" && echo "	Using $IMAKE $cf_config" 1>&6
 
 			else
-				{ echo "$as_me:8139: WARNING: Cannot run $IMAKE" >&5
+				{ echo "$as_me:8232: WARNING: Cannot run $IMAKE" >&5
 echo "$as_me: WARNING: Cannot run $IMAKE" >&2;}
 			fi
 		fi
@@ -8185,6 +8278,7 @@
 	    fi
 	fi
 fi
+fi
 
 		X_CFLAGS="$X_CFLAGS $IMAKE_CFLAGS"
 		LDFLAGS="$LDFLAGS $X_LIBS"
@@ -8228,7 +8322,7 @@
 
 if test "$cf_check_cflags" != "$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 8231 "configure"
+#line 8325 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8240,16 +8334,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8243: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8337: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8246: \$? = $ac_status" >&5
+  echo "$as_me:8340: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8249: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8343: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8252: \$? = $ac_status" >&5
+  echo "$as_me:8346: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -8279,23 +8373,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:8282: checking for $ac_header" >&5
+echo "$as_me:8376: 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 8288 "configure"
+#line 8382 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8292: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:8386: \"$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:8298: \$? = $ac_status" >&5
+  echo "$as_me:8392: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8314,7 +8408,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:8317: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:8411: 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
@@ -8340,7 +8434,7 @@
 fi
 LDFLAGS="$LDFLAGS $X_LIBS"
 
-echo "$as_me:8343: checking for XmuClientWindow in -lXmu" >&5
+echo "$as_me:8437: 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
@@ -8348,7 +8442,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXmu  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8351 "configure"
+#line 8445 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8367,16 +8461,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8370: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8464: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8373: \$? = $ac_status" >&5
+  echo "$as_me:8467: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8376: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8470: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8379: \$? = $ac_status" >&5
+  echo "$as_me:8473: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xmu_XmuClientWindow=yes
 else
@@ -8387,7 +8481,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8390: result: $ac_cv_lib_Xmu_XmuClientWindow" >&5
+echo "$as_me:8484: 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
@@ -8398,7 +8492,7 @@
 
 fi
 
-echo "$as_me:8401: checking for OlToolkitInitialize in -lXol" >&5
+echo "$as_me:8495: 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
@@ -8406,7 +8500,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXol  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8409 "configure"
+#line 8503 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8425,16 +8519,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8428: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8522: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8431: \$? = $ac_status" >&5
+  echo "$as_me:8525: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8434: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8528: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8437: \$? = $ac_status" >&5
+  echo "$as_me:8531: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xol_OlToolkitInitialize=yes
 else
@@ -8445,12 +8539,12 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8448: result: $ac_cv_lib_Xol_OlToolkitInitialize" >&5
+echo "$as_me:8542: 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:8453: error: Unable to successfully link OpenLook library (-lXol) with test program" >&5
+  { { echo "$as_me:8547: 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
@@ -8465,23 +8559,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:8468: checking for $ac_header" >&5
+echo "$as_me:8562: 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 8474 "configure"
+#line 8568 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8478: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:8572: \"$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:8484: \$? = $ac_status" >&5
+  echo "$as_me:8578: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8500,7 +8594,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:8503: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:8597: 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
@@ -8510,7 +8604,7 @@
 fi
 done
 
-echo "$as_me:8513: checking for regcmp in -lgen" >&5
+echo "$as_me:8607: 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
@@ -8518,7 +8612,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgen  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8521 "configure"
+#line 8615 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8537,16 +8631,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8540: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8634: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8543: \$? = $ac_status" >&5
+  echo "$as_me:8637: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8546: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8640: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8549: \$? = $ac_status" >&5
+  echo "$as_me:8643: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gen_regcmp=yes
 else
@@ -8557,7 +8651,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8560: result: $ac_cv_lib_gen_regcmp" >&5
+echo "$as_me:8654: 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
@@ -8568,7 +8662,7 @@
 
 fi
 
-echo "$as_me:8571: checking for XmuClientWindow in -lXmu" >&5
+echo "$as_me:8665: 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
@@ -8576,7 +8670,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXmu  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8579 "configure"
+#line 8673 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8595,16 +8689,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8598: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8692: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8601: \$? = $ac_status" >&5
+  echo "$as_me:8695: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8604: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8698: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8607: \$? = $ac_status" >&5
+  echo "$as_me:8701: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xmu_XmuClientWindow=yes
 else
@@ -8615,7 +8709,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8618: result: $ac_cv_lib_Xmu_XmuClientWindow" >&5
+echo "$as_me:8712: 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
@@ -8626,7 +8720,7 @@
 
 fi
 
-echo "$as_me:8629: checking for XpStartDoc in -lXp" >&5
+echo "$as_me:8723: 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
@@ -8634,7 +8728,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXp $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8637 "configure"
+#line 8731 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8653,16 +8747,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8656: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8750: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8659: \$? = $ac_status" >&5
+  echo "$as_me:8753: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8662: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8756: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8665: \$? = $ac_status" >&5
+  echo "$as_me:8759: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xp_XpStartDoc=yes
 else
@@ -8673,7 +8767,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8676: result: $ac_cv_lib_Xp_XpStartDoc" >&5
+echo "$as_me:8770: 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
@@ -8684,7 +8778,7 @@
 
 fi
 
-echo "$as_me:8687: checking for XextCreateExtension in -lXext" >&5
+echo "$as_me:8781: 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
@@ -8692,7 +8786,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8695 "configure"
+#line 8789 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8711,16 +8805,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8714: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8808: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8717: \$? = $ac_status" >&5
+  echo "$as_me:8811: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8720: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8814: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8723: \$? = $ac_status" >&5
+  echo "$as_me:8817: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
@@ -8731,13 +8825,13 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8734: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:8828: 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:8740: checking for XpmCreatePixmapFromXpmImage in -lXpm" >&5
+echo "$as_me:8834: 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
@@ -8745,7 +8839,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXpm $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8748 "configure"
+#line 8842 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8764,16 +8858,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8767: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8861: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8770: \$? = $ac_status" >&5
+  echo "$as_me:8864: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8773: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8867: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8776: \$? = $ac_status" >&5
+  echo "$as_me:8870: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xpm_XpmCreatePixmapFromXpmImage=yes
 else
@@ -8784,13 +8878,13 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8787: result: $ac_cv_lib_Xpm_XpmCreatePixmapFromXpmImage" >&5
+echo "$as_me:8881: 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:8793: checking for XmbTextListToTextProperty in -lXIM" >&5
+echo "$as_me:8887: 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
@@ -8798,7 +8892,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXIM  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8801 "configure"
+#line 8895 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8817,16 +8911,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8820: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8914: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8823: \$? = $ac_status" >&5
+  echo "$as_me:8917: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8826: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8920: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8829: \$? = $ac_status" >&5
+  echo "$as_me:8923: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_XIM_XmbTextListToTextProperty=yes
 else
@@ -8837,7 +8931,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8840: result: $ac_cv_lib_XIM_XmbTextListToTextProperty" >&5
+echo "$as_me:8934: 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
@@ -8847,7 +8941,7 @@
   LIBS="-lXIM $LIBS"
 
 fi
-echo "$as_me:8850: checking for XmProcessTraversal in -lXm" >&5
+echo "$as_me:8944: 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
@@ -8855,7 +8949,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXm $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8858 "configure"
+#line 8952 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8874,16 +8968,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8877: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8971: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8880: \$? = $ac_status" >&5
+  echo "$as_me:8974: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8883: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8977: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8886: \$? = $ac_status" >&5
+  echo "$as_me:8980: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xm_XmProcessTraversal=yes
 else
@@ -8894,12 +8988,12 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8897: result: $ac_cv_lib_Xm_XmProcessTraversal" >&5
+echo "$as_me:8991: 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:8902: error: Unable to successfully link Motif library (-lXm) with test program" >&5
+  { { echo "$as_me:8996: 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
@@ -8938,7 +9032,7 @@
   cf_x_athena=XawPlus
 fi;
 
-echo "$as_me:8941: checking for XextCreateExtension in -lXext" >&5
+echo "$as_me:9035: 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
@@ -8946,7 +9040,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8949 "configure"
+#line 9043 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8965,16 +9059,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8968: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9062: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8971: \$? = $ac_status" >&5
+  echo "$as_me:9065: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8974: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9068: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8977: \$? = $ac_status" >&5
+  echo "$as_me:9071: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
@@ -8985,7 +9079,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8988: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:9082: 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"
@@ -9007,14 +9101,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:9010: checking for $cf_test in $cf_path" >&5
+			echo "$as_me:9104: 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:9013: checking for $cf_test" >&5
+			echo "$as_me:9107: checking for $cf_test" >&5
 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
 		fi
 		cat >conftest.$ac_ext <<_ACEOF
-#line 9017 "configure"
+#line 9111 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -9028,16 +9122,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9031: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9125: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9034: \$? = $ac_status" >&5
+  echo "$as_me:9128: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9037: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9131: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9040: \$? = $ac_status" >&5
+  echo "$as_me:9134: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -9046,7 +9140,7 @@
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-		echo "$as_me:9049: result: $cf_result" >&5
+		echo "$as_me:9143: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 		if test "$cf_result" = yes ; then
 			cf_x_athena_include=$cf_path
@@ -9058,7 +9152,7 @@
 done
 
 if test -z "$cf_x_athena_include" ; then
-	{ echo "$as_me:9061: WARNING: Unable to successfully find Athena header files with test program" >&5
+	{ echo "$as_me:9155: 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"
@@ -9083,17 +9177,17 @@
 			cf_test=XawSimpleMenuAddGlobalActions
 			if test $cf_path != default ; then
 				LIBS="-L$cf_path/lib $cf_lib $LIBS"
-				echo "$as_me:9086: checking for $cf_lib in $cf_path" >&5
+				echo "$as_me:9180: 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:9090: checking for $cf_test in $cf_lib" >&5
+				echo "$as_me:9184: 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 9096 "configure"
+#line 9190 "configure"
 #include "confdefs.h"
 
 int
@@ -9105,16 +9199,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9108: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9202: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9111: \$? = $ac_status" >&5
+  echo "$as_me:9205: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9114: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9208: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9117: \$? = $ac_status" >&5
+  echo "$as_me:9211: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -9123,7 +9217,7 @@
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-			echo "$as_me:9126: result: $cf_result" >&5
+			echo "$as_me:9220: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				cf_x_athena_lib="$cf_lib"
@@ -9137,7 +9231,7 @@
 done
 
 if test -z "$cf_x_athena_lib" ; then
-	{ { echo "$as_me:9140: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+	{ { echo "$as_me:9234: 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
@@ -9173,7 +9267,7 @@
 #define DISP_CURSES 1
 EOF
 
-echo "$as_me:9176: checking for extra include directories" >&5
+echo "$as_me:9270: 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
@@ -9193,11 +9287,11 @@
 esac
 
 fi
-echo "$as_me:9196: result: $cf_cv_curses_incdir" >&5
+echo "$as_me:9290: result: $cf_cv_curses_incdir" >&5
 echo "${ECHO_T}$cf_cv_curses_incdir" >&6
-test "$cf_cv_curses_incdir" != no && CPPFLAGS="$CPPFLAGS $cf_cv_curses_incdir"
+test "$cf_cv_curses_incdir" != no && CPPFLAGS="$cf_cv_curses_incdir $CPPFLAGS"
 
-echo "$as_me:9200: checking if we have identified curses headers" >&5
+echo "$as_me:9294: 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
@@ -9211,7 +9305,7 @@
 	ncurses/ncurses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 9214 "configure"
+#line 9308 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -9223,16 +9317,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9226: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9320: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9229: \$? = $ac_status" >&5
+  echo "$as_me:9323: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9232: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9326: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9235: \$? = $ac_status" >&5
+  echo "$as_me:9329: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -9243,11 +9337,11 @@
 done
 
 fi
-echo "$as_me:9246: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:9340: 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:9250: error: No curses header-files found" >&5
+	{ { echo "$as_me:9344: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -9257,23 +9351,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:9260: checking for $ac_header" >&5
+echo "$as_me:9354: 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 9266 "configure"
+#line 9360 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:9270: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:9364: \"$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:9276: \$? = $ac_status" >&5
+  echo "$as_me:9370: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9292,7 +9386,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:9295: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:9389: 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
@@ -9302,7 +9396,7 @@
 fi
 done
 
-echo "$as_me:9305: checking for ncurses version" >&5
+echo "$as_me:9399: 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
@@ -9328,10 +9422,10 @@
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:9331: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:9425: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:9334: \$? = $ac_status" >&5
+  echo "$as_me:9428: \$? = $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%".*%%'`
@@ -9341,7 +9435,7 @@
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9344 "configure"
+#line 9438 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -9366,15 +9460,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:9369: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9463: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9372: \$? = $ac_status" >&5
+  echo "$as_me:9466: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:9374: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9468: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9377: \$? = $ac_status" >&5
+  echo "$as_me:9471: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -9388,16 +9482,16 @@
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:9391: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:9485: 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:9397: checking if we have identified curses libraries" >&5
+echo "$as_me:9491: 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 9400 "configure"
+#line 9494 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -9409,16 +9503,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9412: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9506: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9415: \$? = $ac_status" >&5
+  echo "$as_me:9509: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9418: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9512: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9421: \$? = $ac_status" >&5
+  echo "$as_me:9515: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -9427,13 +9521,13 @@
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:9430: result: $cf_result" >&5
+echo "$as_me:9524: 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:9436: checking for tgoto in -lmytinfo" >&5
+	echo "$as_me:9530: 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
@@ -9441,7 +9535,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9444 "configure"
+#line 9538 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9460,16 +9554,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9463: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9557: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9466: \$? = $ac_status" >&5
+  echo "$as_me:9560: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9469: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9563: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9472: \$? = $ac_status" >&5
+  echo "$as_me:9566: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -9480,7 +9574,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9483: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:9577: 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"
@@ -9488,7 +9582,7 @@
 
 	;;
 hpux10.*|hpux11.*) #(vi
-	echo "$as_me:9491: checking for initscr in -lcur_colr" >&5
+	echo "$as_me:9585: 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
@@ -9496,7 +9590,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcur_colr  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9499 "configure"
+#line 9593 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9515,16 +9609,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9518: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9612: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9521: \$? = $ac_status" >&5
+  echo "$as_me:9615: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9524: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9618: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9527: \$? = $ac_status" >&5
+  echo "$as_me:9621: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_cur_colr_initscr=yes
 else
@@ -9535,7 +9629,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9538: result: $ac_cv_lib_cur_colr_initscr" >&5
+echo "$as_me:9632: 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
 
@@ -9544,7 +9638,7 @@
 
 else
 
-	echo "$as_me:9547: checking for initscr in -lHcurses" >&5
+	echo "$as_me:9641: 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
@@ -9552,7 +9646,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lHcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9555 "configure"
+#line 9649 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9571,16 +9665,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9574: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9668: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9577: \$? = $ac_status" >&5
+  echo "$as_me:9671: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9580: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9674: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9583: \$? = $ac_status" >&5
+  echo "$as_me:9677: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Hcurses_initscr=yes
 else
@@ -9591,7 +9685,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9594: result: $ac_cv_lib_Hcurses_initscr" >&5
+echo "$as_me:9688: 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
 
@@ -9629,13 +9723,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:9632: checking for tgoto" >&5
+	echo "$as_me:9726: 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 9638 "configure"
+#line 9732 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char tgoto (); below.  */
@@ -9666,16 +9760,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9669: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9763: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9672: \$? = $ac_status" >&5
+  echo "$as_me:9766: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9675: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9769: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9678: \$? = $ac_status" >&5
+  echo "$as_me:9772: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_tgoto=yes
 else
@@ -9685,7 +9779,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9688: result: $ac_cv_func_tgoto" >&5
+echo "$as_me:9782: 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
@@ -9694,7 +9788,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:9697: checking for tgoto in -l$cf_term_lib" >&5
+echo "$as_me:9791: 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
@@ -9702,7 +9796,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_term_lib  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9705 "configure"
+#line 9799 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9721,16 +9815,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9724: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9818: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9727: \$? = $ac_status" >&5
+  echo "$as_me:9821: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9730: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9824: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9733: \$? = $ac_status" >&5
+  echo "$as_me:9827: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -9741,7 +9835,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9744: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:9838: 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
@@ -9756,7 +9850,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:9759: checking for initscr in -l$cf_curs_lib" >&5
+echo "$as_me:9853: 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
@@ -9764,7 +9858,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_curs_lib  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9767 "configure"
+#line 9861 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9783,16 +9877,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9786: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9880: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9789: \$? = $ac_status" >&5
+  echo "$as_me:9883: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9792: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9886: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9795: \$? = $ac_status" >&5
+  echo "$as_me:9889: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -9803,23 +9897,23 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9806: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:9900: 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:9813: error: no curses library found" >&5
+	test $cf_curs_lib = unknown && { { echo "$as_me:9907: 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:9819: checking if we can link with $cf_curs_lib library" >&5
+		echo "$as_me:9913: 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 9822 "configure"
+#line 9916 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -9831,16 +9925,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9834: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9928: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9837: \$? = $ac_status" >&5
+  echo "$as_me:9931: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9840: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9934: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9843: \$? = $ac_status" >&5
+  echo "$as_me:9937: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -9849,18 +9943,18 @@
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-		echo "$as_me:9852: result: $cf_result" >&5
+		echo "$as_me:9946: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
-		test $cf_result = no && { { echo "$as_me:9854: error: Cannot link curses library" >&5
+		test $cf_result = no && { { echo "$as_me:9948: 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:9860: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+		echo "$as_me:9954: 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 9863 "configure"
+#line 9957 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -9872,16 +9966,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9875: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9969: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9878: \$? = $ac_status" >&5
+  echo "$as_me:9972: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9881: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9975: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9884: \$? = $ac_status" >&5
+  echo "$as_me:9978: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=no
 else
@@ -9890,7 +9984,7 @@
 
 			LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
 			cat >conftest.$ac_ext <<_ACEOF
-#line 9893 "configure"
+#line 9987 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -9902,16 +9996,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9905: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9999: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9908: \$? = $ac_status" >&5
+  echo "$as_me:10002: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9911: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10005: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9914: \$? = $ac_status" >&5
+  echo "$as_me:10008: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -9923,7 +10017,7 @@
 
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-		echo "$as_me:9926: result: $cf_result" >&5
+		echo "$as_me:10020: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	fi
 fi
@@ -9960,7 +10054,7 @@
   withval=`echo $withval | sed -e s%NONE%$ac_default_prefix%`
   ;;
 *)
-  { { echo "$as_me:9963: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:10057: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -9977,7 +10071,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:9980: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:10074: 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
@@ -9989,7 +10083,7 @@
 	do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 9992 "configure"
+#line 10086 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -10013,16 +10107,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10016: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10110: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10019: \$? = $ac_status" >&5
+  echo "$as_me:10113: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10022: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10116: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10025: \$? = $ac_status" >&5
+  echo "$as_me:10119: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -10037,13 +10131,13 @@
 	done
 
 fi
-echo "$as_me:10040: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:10134: 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:10046: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:10140: 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
@@ -10138,7 +10232,7 @@
 				cf_save_CPPFLAGS="$CPPFLAGS"
 				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 10141 "configure"
+#line 10235 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10150,16 +10244,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10153: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10247: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10156: \$? = $ac_status" >&5
+  echo "$as_me:10250: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10159: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10253: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10162: \$? = $ac_status" >&5
+  echo "$as_me:10256: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -10186,7 +10280,7 @@
 		do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 10189 "configure"
+#line 10283 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -10210,16 +10304,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10213: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10307: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10216: \$? = $ac_status" >&5
+  echo "$as_me:10310: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10219: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10313: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10222: \$? = $ac_status" >&5
+  echo "$as_me:10316: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -10240,12 +10334,12 @@
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:10243: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:10337: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:10248: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:10342: 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%/[^/]*$%%'`
@@ -10267,7 +10361,7 @@
 				cf_save_CPPFLAGS="$CPPFLAGS"
 				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 10270 "configure"
+#line 10364 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10279,16 +10373,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10282: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10376: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10285: \$? = $ac_status" >&5
+  echo "$as_me:10379: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10288: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10382: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10291: \$? = $ac_status" >&5
+  echo "$as_me:10385: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -10339,7 +10433,7 @@
 	;;
 esac
 
-echo "$as_me:10342: checking for ncurses version" >&5
+echo "$as_me:10436: 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
@@ -10365,10 +10459,10 @@
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:10368: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:10462: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:10371: \$? = $ac_status" >&5
+  echo "$as_me:10465: \$? = $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%".*%%'`
@@ -10378,7 +10472,7 @@
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10381 "configure"
+#line 10475 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -10403,15 +10497,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:10406: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10500: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10409: \$? = $ac_status" >&5
+  echo "$as_me:10503: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:10411: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10505: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10414: \$? = $ac_status" >&5
+  echo "$as_me:10508: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -10425,7 +10519,7 @@
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:10428: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:10522: 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
@@ -10437,7 +10531,7 @@
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:10440: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:10534: 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
@@ -10445,7 +10539,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10448 "configure"
+#line 10542 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10464,16 +10558,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10467: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10561: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10470: \$? = $ac_status" >&5
+  echo "$as_me:10564: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10473: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10567: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10476: \$? = $ac_status" >&5
+  echo "$as_me:10570: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -10484,10 +10578,10 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10487: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:10581: 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:10490: checking for initscr in -lgpm" >&5
+  echo "$as_me:10584: 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
@@ -10495,7 +10589,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10498 "configure"
+#line 10592 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10514,16 +10608,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10517: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10611: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10520: \$? = $ac_status" >&5
+  echo "$as_me:10614: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10523: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10617: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10526: \$? = $ac_status" >&5
+  echo "$as_me:10620: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -10534,7 +10628,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10537: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:10631: 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"
@@ -10548,7 +10642,7 @@
 freebsd*)
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it's static).
-	echo "$as_me:10551: checking for tgoto in -lmytinfo" >&5
+	echo "$as_me:10645: 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
@@ -10556,7 +10650,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10559 "configure"
+#line 10653 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10575,16 +10669,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10578: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10672: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10581: \$? = $ac_status" >&5
+  echo "$as_me:10675: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10584: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10678: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10587: \$? = $ac_status" >&5
+  echo "$as_me:10681: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -10595,7 +10689,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10598: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:10692: 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"
@@ -10613,13 +10707,13 @@
 
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
-	echo "$as_me:10616: checking for initscr" >&5
+	echo "$as_me:10710: 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 10622 "configure"
+#line 10716 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */
@@ -10650,16 +10744,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10653: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10747: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10656: \$? = $ac_status" >&5
+  echo "$as_me:10750: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10659: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10753: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10662: \$? = $ac_status" >&5
+  echo "$as_me:10756: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -10669,18 +10763,18 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10672: result: $ac_cv_func_initscr" >&5
+echo "$as_me:10766: 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:10679: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:10773: 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 10683 "configure"
+#line 10777 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -10692,25 +10786,25 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10695: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10789: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10698: \$? = $ac_status" >&5
+  echo "$as_me:10792: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10701: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10795: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10704: \$? = $ac_status" >&5
+  echo "$as_me:10798: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:10706: result: yes" >&5
+  echo "$as_me:10800: 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:10713: result: no" >&5
+echo "$as_me:10807: result: no" >&5
 echo "${ECHO_T}no" >&6
 			cf_search=""
 
@@ -10770,11 +10864,11 @@
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:10773: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:10867: 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 10777 "configure"
+#line 10871 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -10786,25 +10880,25 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10789: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10883: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10792: \$? = $ac_status" >&5
+  echo "$as_me:10886: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10795: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10889: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10798: \$? = $ac_status" >&5
+  echo "$as_me:10892: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:10800: result: yes" >&5
+  echo "$as_me:10894: 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:10807: result: no" >&5
+echo "$as_me:10901: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -10819,7 +10913,7 @@
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:10822: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:10916: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -10827,7 +10921,7 @@
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:10830: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:10924: 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
@@ -10837,7 +10931,7 @@
 		fi
 	done
 	cat >conftest.$ac_ext <<_ACEOF
-#line 10840 "configure"
+#line 10934 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -10849,23 +10943,23 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10852: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10946: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10855: \$? = $ac_status" >&5
+  echo "$as_me:10949: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10858: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10952: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10861: \$? = $ac_status" >&5
+  echo "$as_me:10955: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:10863: result: yes" >&5
+  echo "$as_me:10957: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:10868: result: no" >&5
+echo "$as_me:10962: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -10892,7 +10986,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:10895: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:10989: 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
@@ -10904,7 +10998,7 @@
 	do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 10907 "configure"
+#line 11001 "configure"
 #include "confdefs.h"
 
 #define _XOPEN_SOURCE_EXTENDED
@@ -10936,16 +11030,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10939: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11033: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10942: \$? = $ac_status" >&5
+  echo "$as_me:11036: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10945: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11039: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10948: \$? = $ac_status" >&5
+  echo "$as_me:11042: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -10960,13 +11054,13 @@
 	done
 
 fi
-echo "$as_me:10963: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:11057: 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:10969: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:11063: 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
@@ -11061,7 +11155,7 @@
 				cf_save_CPPFLAGS="$CPPFLAGS"
 				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 11064 "configure"
+#line 11158 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11073,16 +11167,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11076: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11170: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11079: \$? = $ac_status" >&5
+  echo "$as_me:11173: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11082: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11176: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11085: \$? = $ac_status" >&5
+  echo "$as_me:11179: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11109,7 +11203,7 @@
 		do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 11112 "configure"
+#line 11206 "configure"
 #include "confdefs.h"
 
 #define _XOPEN_SOURCE_EXTENDED
@@ -11141,16 +11235,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11144: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11238: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11147: \$? = $ac_status" >&5
+  echo "$as_me:11241: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11150: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11244: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11153: \$? = $ac_status" >&5
+  echo "$as_me:11247: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -11171,12 +11265,12 @@
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11174: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11268: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:11179: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:11273: 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%/[^/]*$%%'`
@@ -11198,7 +11292,7 @@
 				cf_save_CPPFLAGS="$CPPFLAGS"
 				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 11201 "configure"
+#line 11295 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11210,16 +11304,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11213: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11307: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11216: \$? = $ac_status" >&5
+  echo "$as_me:11310: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11219: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11313: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11222: \$? = $ac_status" >&5
+  echo "$as_me:11316: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11270,7 +11364,7 @@
 	;;
 esac
 
-echo "$as_me:11273: checking for ncurses version" >&5
+echo "$as_me:11367: 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
@@ -11296,10 +11390,10 @@
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:11299: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:11393: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:11302: \$? = $ac_status" >&5
+  echo "$as_me:11396: \$? = $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%".*%%'`
@@ -11309,7 +11403,7 @@
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11312 "configure"
+#line 11406 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -11334,15 +11428,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:11337: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11431: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11340: \$? = $ac_status" >&5
+  echo "$as_me:11434: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:11342: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11436: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11345: \$? = $ac_status" >&5
+  echo "$as_me:11439: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -11356,7 +11450,7 @@
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:11359: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:11453: 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
@@ -11368,7 +11462,7 @@
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:11371: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:11465: 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
@@ -11376,7 +11470,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 11379 "configure"
+#line 11473 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11395,16 +11489,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11398: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11492: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11401: \$? = $ac_status" >&5
+  echo "$as_me:11495: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11404: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11498: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11407: \$? = $ac_status" >&5
+  echo "$as_me:11501: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -11415,10 +11509,10 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11418: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:11512: 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:11421: checking for initscr in -lgpm" >&5
+  echo "$as_me:11515: 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
@@ -11426,7 +11520,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 11429 "configure"
+#line 11523 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11445,16 +11539,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11448: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11542: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11451: \$? = $ac_status" >&5
+  echo "$as_me:11545: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11454: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11548: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11457: \$? = $ac_status" >&5
+  echo "$as_me:11551: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -11465,7 +11559,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11468: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:11562: 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"
@@ -11479,7 +11573,7 @@
 freebsd*)
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it's static).
-	echo "$as_me:11482: checking for tgoto in -lmytinfo" >&5
+	echo "$as_me:11576: 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
@@ -11487,7 +11581,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 11490 "configure"
+#line 11584 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11506,16 +11600,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11509: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11603: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11512: \$? = $ac_status" >&5
+  echo "$as_me:11606: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11515: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11609: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11518: \$? = $ac_status" >&5
+  echo "$as_me:11612: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -11526,7 +11620,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11529: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:11623: 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"
@@ -11544,13 +11638,13 @@
 
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
-	echo "$as_me:11547: checking for initscr" >&5
+	echo "$as_me:11641: 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 11553 "configure"
+#line 11647 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */
@@ -11581,16 +11675,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11584: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11678: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11587: \$? = $ac_status" >&5
+  echo "$as_me:11681: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11590: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11684: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11593: \$? = $ac_status" >&5
+  echo "$as_me:11687: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -11600,18 +11694,18 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:11603: result: $ac_cv_func_initscr" >&5
+echo "$as_me:11697: 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:11610: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:11704: 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 11614 "configure"
+#line 11708 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -11623,25 +11717,25 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11626: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11720: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11629: \$? = $ac_status" >&5
+  echo "$as_me:11723: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11632: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11726: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11635: \$? = $ac_status" >&5
+  echo "$as_me:11729: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:11637: result: yes" >&5
+  echo "$as_me:11731: 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:11644: result: no" >&5
+echo "$as_me:11738: result: no" >&5
 echo "${ECHO_T}no" >&6
 			cf_search=""
 
@@ -11701,11 +11795,11 @@
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:11704: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:11798: 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 11708 "configure"
+#line 11802 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -11717,25 +11811,25 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11720: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11814: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11723: \$? = $ac_status" >&5
+  echo "$as_me:11817: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11726: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11820: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11729: \$? = $ac_status" >&5
+  echo "$as_me:11823: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:11731: result: yes" >&5
+  echo "$as_me:11825: 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:11738: result: no" >&5
+echo "$as_me:11832: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -11750,7 +11844,7 @@
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:11753: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:11847: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -11758,7 +11852,7 @@
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:11761: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:11855: 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
@@ -11768,7 +11862,7 @@
 		fi
 	done
 	cat >conftest.$ac_ext <<_ACEOF
-#line 11771 "configure"
+#line 11865 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -11780,23 +11874,23 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11783: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11877: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11786: \$? = $ac_status" >&5
+  echo "$as_me:11880: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11789: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11883: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11792: \$? = $ac_status" >&5
+  echo "$as_me:11886: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:11794: result: yes" >&5
+  echo "$as_me:11888: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:11799: result: no" >&5
+echo "$as_me:11893: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -11817,7 +11911,7 @@
 #define DISP_TERMCAP 1
 EOF
 
-		echo "$as_me:11820: checking if you want to use ncurses" >&5
+		echo "$as_me:11914: 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.
@@ -11827,7 +11921,7 @@
 else
   withval=no
 fi;
-		echo "$as_me:11830: result: $withval" >&5
+		echo "$as_me:11924: result: $withval" >&5
 echo "${ECHO_T}$withval" >&6
 
 if test "${cf_cv_termlib+set}" = set; then
@@ -11836,7 +11930,7 @@
 
 cf_cv_termlib=none
 cat >conftest.$ac_ext <<_ACEOF
-#line 11839 "configure"
+#line 11933 "configure"
 #include "confdefs.h"
 
 int
@@ -11848,19 +11942,19 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11851: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11945: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11854: \$? = $ac_status" >&5
+  echo "$as_me:11948: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11857: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11951: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11860: \$? = $ac_status" >&5
+  echo "$as_me:11954: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 11863 "configure"
+#line 11957 "configure"
 #include "confdefs.h"
 
 int
@@ -11872,16 +11966,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11875: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11969: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11878: \$? = $ac_status" >&5
+  echo "$as_me:11972: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11881: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11975: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11884: \$? = $ac_status" >&5
+  echo "$as_me:11978: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termlib=terminfo
 else
@@ -11905,7 +11999,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:11908: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:12002: 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
@@ -11917,7 +12011,7 @@
 	do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 11920 "configure"
+#line 12014 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -11941,16 +12035,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11944: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12038: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11947: \$? = $ac_status" >&5
+  echo "$as_me:12041: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11950: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12044: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11953: \$? = $ac_status" >&5
+  echo "$as_me:12047: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -11965,13 +12059,13 @@
 	done
 
 fi
-echo "$as_me:11968: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:12062: 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:11974: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:12068: 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
@@ -12066,7 +12160,7 @@
 				cf_save_CPPFLAGS="$CPPFLAGS"
 				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 12069 "configure"
+#line 12163 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -12078,16 +12172,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12081: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12175: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12084: \$? = $ac_status" >&5
+  echo "$as_me:12178: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12087: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12181: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12090: \$? = $ac_status" >&5
+  echo "$as_me:12184: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -12114,7 +12208,7 @@
 		do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 12117 "configure"
+#line 12211 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -12138,16 +12232,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12141: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12235: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12144: \$? = $ac_status" >&5
+  echo "$as_me:12238: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12147: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12241: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12150: \$? = $ac_status" >&5
+  echo "$as_me:12244: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -12168,12 +12262,12 @@
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:12171: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:12265: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:12176: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:12270: 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%/[^/]*$%%'`
@@ -12195,7 +12289,7 @@
 				cf_save_CPPFLAGS="$CPPFLAGS"
 				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 12198 "configure"
+#line 12292 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -12207,16 +12301,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12210: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12304: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12213: \$? = $ac_status" >&5
+  echo "$as_me:12307: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12216: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12310: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12219: \$? = $ac_status" >&5
+  echo "$as_me:12313: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -12267,7 +12361,7 @@
 	;;
 esac
 
-echo "$as_me:12270: checking for ncurses version" >&5
+echo "$as_me:12364: 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
@@ -12293,10 +12387,10 @@
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:12296: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:12390: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:12299: \$? = $ac_status" >&5
+  echo "$as_me:12393: \$? = $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%".*%%'`
@@ -12306,7 +12400,7 @@
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12309 "configure"
+#line 12403 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -12331,15 +12425,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:12334: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12428: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12337: \$? = $ac_status" >&5
+  echo "$as_me:12431: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:12339: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12433: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12342: \$? = $ac_status" >&5
+  echo "$as_me:12436: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -12353,7 +12447,7 @@
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:12356: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:12450: 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
@@ -12365,7 +12459,7 @@
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:12368: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:12462: 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
@@ -12373,7 +12467,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12376 "configure"
+#line 12470 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12392,16 +12486,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12395: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12489: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12398: \$? = $ac_status" >&5
+  echo "$as_me:12492: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12401: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12495: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12404: \$? = $ac_status" >&5
+  echo "$as_me:12498: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -12412,10 +12506,10 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12415: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:12509: 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:12418: checking for initscr in -lgpm" >&5
+  echo "$as_me:12512: 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
@@ -12423,7 +12517,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12426 "configure"
+#line 12520 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12442,16 +12536,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12445: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12539: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12448: \$? = $ac_status" >&5
+  echo "$as_me:12542: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12451: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12545: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12454: \$? = $ac_status" >&5
+  echo "$as_me:12548: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -12462,7 +12556,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12465: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:12559: 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"
@@ -12476,7 +12570,7 @@
 freebsd*)
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it's static).
-	echo "$as_me:12479: checking for tgoto in -lmytinfo" >&5
+	echo "$as_me:12573: 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
@@ -12484,7 +12578,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12487 "configure"
+#line 12581 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12503,16 +12597,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12506: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12600: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12509: \$? = $ac_status" >&5
+  echo "$as_me:12603: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12512: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12606: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12515: \$? = $ac_status" >&5
+  echo "$as_me:12609: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -12523,7 +12617,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12526: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:12620: 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"
@@ -12541,13 +12635,13 @@
 
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
-	echo "$as_me:12544: checking for initscr" >&5
+	echo "$as_me:12638: 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 12550 "configure"
+#line 12644 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */
@@ -12578,16 +12672,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12581: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12675: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12584: \$? = $ac_status" >&5
+  echo "$as_me:12678: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12587: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12681: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12590: \$? = $ac_status" >&5
+  echo "$as_me:12684: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -12597,18 +12691,18 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12600: result: $ac_cv_func_initscr" >&5
+echo "$as_me:12694: 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:12607: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:12701: 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 12611 "configure"
+#line 12705 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -12620,25 +12714,25 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12623: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12717: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12626: \$? = $ac_status" >&5
+  echo "$as_me:12720: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12629: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12723: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12632: \$? = $ac_status" >&5
+  echo "$as_me:12726: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:12634: result: yes" >&5
+  echo "$as_me:12728: 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:12641: result: no" >&5
+echo "$as_me:12735: result: no" >&5
 echo "${ECHO_T}no" >&6
 			cf_search=""
 
@@ -12698,11 +12792,11 @@
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:12701: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:12795: 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 12705 "configure"
+#line 12799 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -12714,25 +12808,25 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12717: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12811: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12720: \$? = $ac_status" >&5
+  echo "$as_me:12814: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12723: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12817: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12726: \$? = $ac_status" >&5
+  echo "$as_me:12820: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:12728: result: yes" >&5
+  echo "$as_me:12822: 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:12735: result: no" >&5
+echo "$as_me:12829: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -12747,7 +12841,7 @@
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:12750: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:12844: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -12755,7 +12849,7 @@
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:12758: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:12852: 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
@@ -12765,7 +12859,7 @@
 		fi
 	done
 	cat >conftest.$ac_ext <<_ACEOF
-#line 12768 "configure"
+#line 12862 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -12777,23 +12871,23 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12780: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12874: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12783: \$? = $ac_status" >&5
+  echo "$as_me:12877: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12786: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12880: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12789: \$? = $ac_status" >&5
+  echo "$as_me:12883: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:12791: result: yes" >&5
+  echo "$as_me:12885: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:12796: result: no" >&5
+echo "$as_me:12890: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -12819,10 +12913,10 @@
 	LIBS="-l$cf_lib $cf_save_LIBS"
 	for cf_func in tigetstr tgetstr
 	do
-		echo "$as_me:12822: checking for $cf_func in -l$cf_lib" >&5
+		echo "$as_me:12916: 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 12825 "configure"
+#line 12919 "configure"
 #include "confdefs.h"
 
 int
@@ -12834,16 +12928,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12837: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12931: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12840: \$? = $ac_status" >&5
+  echo "$as_me:12934: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12843: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12937: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12846: \$? = $ac_status" >&5
+  echo "$as_me:12940: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -12852,7 +12946,7 @@
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-		echo "$as_me:12855: result: $cf_result" >&5
+		echo "$as_me:12949: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 		if test "$cf_result" = yes ; then
 			if test "$cf_func" = tigetstr ; then
@@ -12869,7 +12963,7 @@
 fi
 if test "$cf_cv_termlib" = none; then
 	# allow curses library for broken AIX system.
-	echo "$as_me:12872: checking for initscr in -lcurses" >&5
+	echo "$as_me:12966: 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
@@ -12877,7 +12971,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12880 "configure"
+#line 12974 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12896,16 +12990,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12899: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12993: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12902: \$? = $ac_status" >&5
+  echo "$as_me:12996: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12905: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12999: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12908: \$? = $ac_status" >&5
+  echo "$as_me:13002: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_curses_initscr=yes
 else
@@ -12916,13 +13010,13 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12919: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:13013: 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:12925: checking for tgoto in -ltermcap" >&5
+	echo "$as_me:13019: 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
@@ -12930,7 +13024,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12933 "configure"
+#line 13027 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12949,16 +13043,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12952: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13046: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12955: \$? = $ac_status" >&5
+  echo "$as_me:13049: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12958: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13052: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12961: \$? = $ac_status" >&5
+  echo "$as_me:13055: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_termcap_tgoto=yes
 else
@@ -12969,7 +13063,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12972: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:13066: 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
@@ -12980,7 +13074,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 if test "$cf_cv_termlib" = none; then
-	{ echo "$as_me:12983: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+	{ echo "$as_me:13077: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
 echo "$as_me: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&2;}
 fi
 
@@ -13000,7 +13094,7 @@
 
 cf_cv_termlib=none
 cat >conftest.$ac_ext <<_ACEOF
-#line 13003 "configure"
+#line 13097 "configure"
 #include "confdefs.h"
 
 int
@@ -13012,19 +13106,19 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13015: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13109: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13018: \$? = $ac_status" >&5
+  echo "$as_me:13112: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13021: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13115: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13024: \$? = $ac_status" >&5
+  echo "$as_me:13118: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 13027 "configure"
+#line 13121 "configure"
 #include "confdefs.h"
 
 int
@@ -13036,16 +13130,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13039: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13133: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13042: \$? = $ac_status" >&5
+  echo "$as_me:13136: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13045: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13139: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13048: \$? = $ac_status" >&5
+  echo "$as_me:13142: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termlib=terminfo
 else
@@ -13069,10 +13163,10 @@
 	LIBS="-l$cf_lib $cf_save_LIBS"
 	for cf_func in tigetstr tgetstr
 	do
-		echo "$as_me:13072: checking for $cf_func in -l$cf_lib" >&5
+		echo "$as_me:13166: 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 13075 "configure"
+#line 13169 "configure"
 #include "confdefs.h"
 
 int
@@ -13084,16 +13178,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13087: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13181: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13090: \$? = $ac_status" >&5
+  echo "$as_me:13184: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13093: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13187: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13096: \$? = $ac_status" >&5
+  echo "$as_me:13190: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -13102,7 +13196,7 @@
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-		echo "$as_me:13105: result: $cf_result" >&5
+		echo "$as_me:13199: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 		if test "$cf_result" = yes ; then
 			if test "$cf_func" = tigetstr ; then
@@ -13119,7 +13213,7 @@
 fi
 if test "$cf_cv_termlib" = none; then
 	# allow curses library for broken AIX system.
-	echo "$as_me:13122: checking for initscr in -lcurses" >&5
+	echo "$as_me:13216: 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
@@ -13127,7 +13221,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 13130 "configure"
+#line 13224 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13146,16 +13240,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13149: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13243: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13152: \$? = $ac_status" >&5
+  echo "$as_me:13246: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13155: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13249: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13158: \$? = $ac_status" >&5
+  echo "$as_me:13252: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_curses_initscr=yes
 else
@@ -13166,13 +13260,13 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13169: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:13263: 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:13175: checking for tgoto in -ltermcap" >&5
+	echo "$as_me:13269: 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
@@ -13180,7 +13274,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 13183 "configure"
+#line 13277 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13199,16 +13293,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13202: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13296: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13205: \$? = $ac_status" >&5
+  echo "$as_me:13299: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13208: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13302: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13211: \$? = $ac_status" >&5
+  echo "$as_me:13305: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_termcap_tgoto=yes
 else
@@ -13219,7 +13313,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13222: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:13316: 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
@@ -13230,7 +13324,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 if test "$cf_cv_termlib" = none; then
-	{ echo "$as_me:13233: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+	{ echo "$as_me:13327: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
 echo "$as_me: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&2;}
 fi
 
@@ -13252,7 +13346,7 @@
 elif test ".$cf_cv_termlib" = .termcap ; then
 	# BSD 'tputs()' may need 'PC' to be set.
 	cat >conftest.$ac_ext <<_ACEOF
-#line 13255 "configure"
+#line 13349 "configure"
 #include "confdefs.h"
 
 int
@@ -13264,16 +13358,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13267: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13361: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13270: \$? = $ac_status" >&5
+  echo "$as_me:13364: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13273: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13367: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13276: \$? = $ac_status" >&5
+  echo "$as_me:13370: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >>confdefs.h <<\EOF
 #define HAVE_EXTERN_TCAP_PC 1
@@ -13292,14 +13386,14 @@
 
 LIBS="$LIBS $X_EXTRA_LIBS"
 
-echo "$as_me:13295: checking for /dev/tty" >&5
+echo "$as_me:13389: 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:13302: result: $cf_result" >&5
+echo "$as_me:13396: 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`
@@ -13312,7 +13406,7 @@
 
 fi
 
-echo "$as_me:13315: checking for crypt function" >&5
+echo "$as_me:13409: 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
@@ -13320,7 +13414,7 @@
 
 cf_cv_crypt_func=
 cat >conftest.$ac_ext <<_ACEOF
-#line 13323 "configure"
+#line 13417 "configure"
 #include "confdefs.h"
 
 int
@@ -13332,16 +13426,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13335: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13429: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13338: \$? = $ac_status" >&5
+  echo "$as_me:13432: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13341: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13435: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13344: \$? = $ac_status" >&5
+  echo "$as_me:13438: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_crypt_func=yes
@@ -13352,7 +13446,7 @@
 	cf_save_LIBS="$LIBS"
 	LIBS="-lcrypt $LIBS"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 13355 "configure"
+#line 13449 "configure"
 #include "confdefs.h"
 
 int
@@ -13364,16 +13458,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13367: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13461: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13370: \$? = $ac_status" >&5
+  echo "$as_me:13464: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13373: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13467: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13376: \$? = $ac_status" >&5
+  echo "$as_me:13470: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 		cf_cv_crypt_func="-lcrypt"
@@ -13390,12 +13484,12 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:13393: result: $cf_cv_crypt_func" >&5
+echo "$as_me:13487: 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:13398: checking if crypt works" >&5
+echo "$as_me:13492: 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
@@ -13406,7 +13500,7 @@
 	cf_cv_crypt_works=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13409 "configure"
+#line 13503 "configure"
 #include "confdefs.h"
 
 #include <string.h>
@@ -13418,15 +13512,15 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:13421: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13515: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13424: \$? = $ac_status" >&5
+  echo "$as_me:13518: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:13426: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13520: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13429: \$? = $ac_status" >&5
+  echo "$as_me:13523: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_crypt_works=yes
@@ -13441,7 +13535,7 @@
 fi
 	LIBS="$cf_save_LIBS"
 fi
-echo "$as_me:13444: result: $cf_cv_crypt_works" >&5
+echo "$as_me:13538: 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
@@ -13454,14 +13548,14 @@
 	fi
 fi
 
-echo "$as_me:13457: checking for declaration of fd_set" >&5
+echo "$as_me:13551: 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 13464 "configure"
+#line 13558 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -13474,16 +13568,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13477: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13571: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13480: \$? = $ac_status" >&5
+  echo "$as_me:13574: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13483: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13577: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13486: \$? = $ac_status" >&5
+  echo "$as_me:13580: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_fd_set=sys/types.h
 else
@@ -13491,7 +13585,7 @@
 cat conftest.$ac_ext >&5
 echo "trying X11/Xpoll.h" 1>&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 13494 "configure"
+#line 13588 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_X11_XPOLL_H
@@ -13506,16 +13600,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13509: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13603: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13512: \$? = $ac_status" >&5
+  echo "$as_me:13606: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13515: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13609: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13518: \$? = $ac_status" >&5
+  echo "$as_me:13612: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_fd_set=X11/Xpoll.h
 else
@@ -13523,7 +13617,7 @@
 cat conftest.$ac_ext >&5
 echo "trying sys/select.h" 1>&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 13526 "configure"
+#line 13620 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -13537,16 +13631,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13540: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13634: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13543: \$? = $ac_status" >&5
+  echo "$as_me:13637: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13546: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13640: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13549: \$? = $ac_status" >&5
+  echo "$as_me:13643: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_fd_set=sys/select.h
 else
@@ -13560,7 +13654,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:13563: result: $cf_cv_type_fd_set" >&5
+echo "$as_me:13657: 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
@@ -13569,14 +13663,14 @@
 
 fi
 
-echo "$as_me:13572: checking for fd_set macros" >&5
+echo "$as_me:13666: 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 13579 "configure"
+#line 13673 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -13605,16 +13699,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13608: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13702: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13611: \$? = $ac_status" >&5
+  echo "$as_me:13705: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13614: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13708: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13617: \$? = $ac_status" >&5
+  echo "$as_me:13711: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_macros_fd_set=yes
 else
@@ -13624,7 +13718,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:13627: result: $cf_cv_macros_fd_set" >&5
+echo "$as_me:13721: 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
@@ -13670,13 +13764,13 @@
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:13673: checking for $ac_func" >&5
+echo "$as_me:13767: 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 13679 "configure"
+#line 13773 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -13707,16 +13801,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13710: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13804: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13713: \$? = $ac_status" >&5
+  echo "$as_me:13807: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13716: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13810: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13719: \$? = $ac_status" >&5
+  echo "$as_me:13813: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -13726,7 +13820,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:13729: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:13823: 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
@@ -13736,14 +13830,14 @@
 fi
 done
 
-echo "$as_me:13739: checking for standard qsort" >&5
+echo "$as_me:13833: 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 13746 "configure"
+#line 13840 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -13761,16 +13855,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13764: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13858: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13767: \$? = $ac_status" >&5
+  echo "$as_me:13861: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13770: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13864: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13773: \$? = $ac_status" >&5
+  echo "$as_me:13867: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ansi_qsort=yes
 else
@@ -13781,7 +13875,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:13784: result: $cf_cv_ansi_qsort" >&5
+echo "$as_me:13878: result: $cf_cv_ansi_qsort" >&5
 echo "${ECHO_T}$cf_cv_ansi_qsort" >&6
 
 if test $cf_cv_ansi_qsort = yes; then
@@ -13796,7 +13890,7 @@
 
 fi
 
-echo "$as_me:13799: checking for working mkstemp" >&5
+echo "$as_me:13893: 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
@@ -13804,13 +13898,13 @@
 
 rm -f conftest*
 if test "$cross_compiling" = yes; then
-  echo "$as_me:13807: checking for mkstemp" >&5
+  echo "$as_me:13901: 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 13813 "configure"
+#line 13907 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char mkstemp (); below.  */
@@ -13841,16 +13935,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13844: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13938: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13847: \$? = $ac_status" >&5
+  echo "$as_me:13941: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13850: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13944: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13853: \$? = $ac_status" >&5
+  echo "$as_me:13947: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_mkstemp=yes
 else
@@ -13860,12 +13954,12 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:13863: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:13957: result: $ac_cv_func_mkstemp" >&5
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13868 "configure"
+#line 13962 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -13903,15 +13997,15 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:13906: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14000: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13909: \$? = $ac_status" >&5
+  echo "$as_me:14003: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:13911: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14005: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13914: \$? = $ac_status" >&5
+  echo "$as_me:14008: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_func_mkstemp=yes
 
@@ -13926,7 +14020,7 @@
 fi
 
 fi
-echo "$as_me:13929: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:14023: 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
@@ -13944,7 +14038,7 @@
 cf_save_cppflags="${CPPFLAGS}"
 cf_save_ldflags="${LDFLAGS}"
 
-echo "$as_me:13947: checking if you want to use the Xpm library for colored icon" >&5
+echo "$as_me:14041: 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.
@@ -13954,7 +14048,7 @@
 else
   cf_Xpm_library=no
 fi;
-echo "$as_me:13957: result: $cf_Xpm_library" >&5
+echo "$as_me:14051: result: $cf_Xpm_library" >&5
 echo "${ECHO_T}$cf_Xpm_library" >&6
 
 if test "$cf_Xpm_library" != no ; then
@@ -13962,23 +14056,23 @@
 	CPPFLAGS="$CPPFLAGS -I$withval/include"
 	LDFLAGS="$LDFLAGS -L$withval/lib"
     fi
-    echo "$as_me:13965: checking for X11/xpm.h" >&5
+    echo "$as_me:14059: 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 13971 "configure"
+#line 14065 "configure"
 #include "confdefs.h"
 #include <X11/xpm.h>
 _ACEOF
-if { (eval echo "$as_me:13975: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:14069: \"$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:13981: \$? = $ac_status" >&5
+  echo "$as_me:14075: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -13997,11 +14091,11 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:14000: result: $ac_cv_header_X11_xpm_h" >&5
+echo "$as_me:14094: 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:14004: checking for XpmCreatePixmapFromData in -lXpm" >&5
+	echo "$as_me:14098: 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
@@ -14009,7 +14103,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXpm -lX11 $X_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 14012 "configure"
+#line 14106 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14028,16 +14122,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14031: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14125: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14034: \$? = $ac_status" >&5
+  echo "$as_me:14128: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14037: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14131: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14040: \$? = $ac_status" >&5
+  echo "$as_me:14134: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xpm_XpmCreatePixmapFromData=yes
 else
@@ -14048,7 +14142,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14051: result: $ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&5
+echo "$as_me:14145: 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
 
@@ -14069,7 +14163,7 @@
 fi
 
 if test -n "$cf_x_athena" ; then
-    echo "$as_me:14072: checking if you want to use Xaw scrollbars rather than our own" >&5
+    echo "$as_me:14166: 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.
@@ -14079,7 +14173,7 @@
 else
   cf_Xaw_scrollbars=no
 fi;
-    echo "$as_me:14082: result: $cf_Xaw_scrollbars" >&5
+    echo "$as_me:14176: result: $cf_Xaw_scrollbars" >&5
 echo "${ECHO_T}$cf_Xaw_scrollbars" >&6
 
     if test "$cf_Xaw_scrollbars" = no ; then
@@ -14096,7 +14190,7 @@
 #define OPT_XAW_SCROLLBARS 1
 EOF
 
-	echo "$as_me:14099: checking if you want to use the drag/scrolling extension with Xaw" >&5
+	echo "$as_me:14193: 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.
@@ -14106,7 +14200,7 @@
 else
   cf_drag_extension=no
 fi;
-	echo "$as_me:14109: result: $cf_drag_extension" >&5
+	echo "$as_me:14203: result: $cf_drag_extension" >&5
 echo "${ECHO_T}$cf_drag_extension" >&6
 	if test "$cf_drag_extension" != "no" ; then
 	    cat >>confdefs.h <<\EOF
@@ -14119,7 +14213,7 @@
 
 fi
 
-echo "$as_me:14122: checking if you want to change the number of exec-macros" >&5
+echo "$as_me:14216: 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.
@@ -14129,7 +14223,7 @@
 else
   cf_exec_macros=no
 fi;
-echo "$as_me:14132: result: $cf_exec_macros" >&5
+echo "$as_me:14226: 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
@@ -14138,14 +14232,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:14141: checking for setlocale()" >&5
+echo "$as_me:14235: 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 14148 "configure"
+#line 14242 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int
@@ -14157,16 +14251,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14160: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14254: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14163: \$? = $ac_status" >&5
+  echo "$as_me:14257: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14166: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14260: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14169: \$? = $ac_status" >&5
+  echo "$as_me:14263: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_locale=yes
 else
@@ -14178,7 +14272,7 @@
 
 fi
 
-echo "$as_me:14181: result: $cf_cv_locale" >&5
+echo "$as_me:14275: result: $cf_cv_locale" >&5
 echo "${ECHO_T}$cf_cv_locale" >&6
 test $cf_cv_locale = yes && { cat >>confdefs.h <<\EOF
 #define LOCALE 1
@@ -14186,7 +14280,7 @@
  }
 
 if test $cf_cv_locale = yes ; then
-echo "$as_me:14189: checking if you want to use i18n locale support" >&5
+echo "$as_me:14283: 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.
@@ -14196,7 +14290,7 @@
 else
   cf_locale=yes
 fi;
-echo "$as_me:14199: result: $cf_locale" >&5
+echo "$as_me:14293: result: $cf_locale" >&5
 echo "${ECHO_T}$cf_locale" >&6
 test "$cf_locale" != no && cat >>confdefs.h <<\EOF
 #define OPT_LOCALE 1
@@ -14206,7 +14300,7 @@
 
 ###	Debugging/development options
 
-echo "$as_me:14209: checking if you want to link with dbmalloc for testing" >&5
+echo "$as_me:14303: 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.
@@ -14216,11 +14310,11 @@
 else
   with_dbmalloc=no
 fi;
-echo "$as_me:14219: result: $with_dbmalloc" >&5
+echo "$as_me:14313: result: $with_dbmalloc" >&5
 echo "${ECHO_T}$with_dbmalloc" >&6
 if test $with_dbmalloc = yes ; then
 
-echo "$as_me:14223: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:14317: 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
@@ -14228,7 +14322,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 14231 "configure"
+#line 14325 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14247,16 +14341,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14250: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14344: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14253: \$? = $ac_status" >&5
+  echo "$as_me:14347: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14256: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14350: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14259: \$? = $ac_status" >&5
+  echo "$as_me:14353: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -14267,7 +14361,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14270: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:14364: 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
@@ -14280,7 +14374,7 @@
 
 fi
 
-echo "$as_me:14283: checking if you want to link with dmalloc for testing" >&5
+echo "$as_me:14377: 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.
@@ -14290,11 +14384,11 @@
 else
   with_dmalloc=no
 fi;
-echo "$as_me:14293: result: $with_dmalloc" >&5
+echo "$as_me:14387: result: $with_dmalloc" >&5
 echo "${ECHO_T}$with_dmalloc" >&6
 if test $with_dmalloc = yes ; then
 
-echo "$as_me:14297: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:14391: 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
@@ -14302,7 +14396,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 14305 "configure"
+#line 14399 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14321,16 +14415,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14324: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14418: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14327: \$? = $ac_status" >&5
+  echo "$as_me:14421: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14330: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14424: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14333: \$? = $ac_status" >&5
+  echo "$as_me:14427: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -14341,7 +14435,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14344: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:14438: 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
@@ -14413,17 +14507,17 @@
 
 GCC_VERSION=none
 if test "$GCC" = yes ; then
-	echo "$as_me:14416: checking version of $CC" >&5
+	echo "$as_me:14510: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
-	GCC_VERSION="`${CC} --version|head -1 | sed -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
+	GCC_VERSION="`${CC} --version|sed -e '2,$d' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
-	echo "$as_me:14420: result: $GCC_VERSION" >&5
+	echo "$as_me:14514: result: $GCC_VERSION" >&5
 echo "${ECHO_T}$GCC_VERSION" >&6
 fi
 
 if ( test "$GCC" = yes || test "$GXX" = yes )
 then
-echo "$as_me:14426: checking if you want to check for gcc warnings" >&5
+echo "$as_me:14520: 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.
@@ -14433,7 +14527,7 @@
 else
   cf_opt_with_warnings=no
 fi;
-echo "$as_me:14436: result: $cf_opt_with_warnings" >&5
+echo "$as_me:14530: result: $cf_opt_with_warnings" >&5
 echo "${ECHO_T}$cf_opt_with_warnings" >&6
 if test "$cf_opt_with_warnings" != no ; then
 
@@ -14455,10 +14549,10 @@
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:14458: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:14552: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > conftest.$ac_ext <<EOF
-#line 14461 "configure"
+#line 14555 "configure"
 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"
@@ -14496,12 +14590,12 @@
 EOF
 			;;
 		esac
-		if { (eval echo "$as_me:14499: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:14593: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14502: \$? = $ac_status" >&5
+  echo "$as_me:14596: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-			test -n "$verbose" && echo "$as_me:14504: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:14598: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 		fi
@@ -14512,13 +14606,13 @@
 rm -rf conftest*
 fi
 
-if ( test "$GCC" = yes || test "$GXX" = yes )
+if test "$GCC" = yes
 then
 	cat > conftest.$ac_ext <<EOF
-#line 14518 "configure"
+#line 14612 "configure"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
-	{ echo "$as_me:14521: checking for $CC warning options..." >&5
+	{ echo "$as_me:14615: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="-W -Wall"
@@ -14538,12 +14632,12 @@
 		Wundef $cf_warn_CONST
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:14541: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:14635: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14544: \$? = $ac_status" >&5
+  echo "$as_me:14638: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-			test -n "$verbose" && echo "$as_me:14546: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:14640: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case $cf_opt in #(vi
 			Wcast-qual) #(vi
@@ -14593,7 +14687,7 @@
 
 ac_tr_func=`echo "$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-echo "$as_me:14596: checking for missing \"${ac_func}\" extern" >&5
+echo "$as_me:14690: 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
@@ -14602,7 +14696,7 @@
 cf_save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $CHECK_DECL_FLAG"
 cat >conftest.$ac_ext <<_ACEOF
-#line 14605 "configure"
+#line 14699 "configure"
 #include "confdefs.h"
 
 $CHECK_DECL_HDRS
@@ -14624,16 +14718,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14627: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14721: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14630: \$? = $ac_status" >&5
+  echo "$as_me:14724: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14633: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14727: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14636: \$? = $ac_status" >&5
+  echo "$as_me:14730: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval 'cf_cv_func_'${ac_func}'=yes'
 else
@@ -14647,7 +14741,7 @@
 fi
 
 eval 'cf_result=$cf_cv_func_'${ac_func}
-echo "$as_me:14650: result: $cf_result" >&5
+echo "$as_me:14744: 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
@@ -14661,18 +14755,20 @@
 #include <tcap.h>
 "
 
-echo "$as_me:14664: checking for term.h" >&5
+echo "$as_me:14758: 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
 else
 
+# If we found <ncurses/curses.h>, look for <ncurses/term.h>, but always look
+# for <term.h> if we do not find the variant.
 for cf_header in \
-	ncurses/term.h \
+	`echo ${cf_cv_ncurses_header-curses.h} | sed -e 's%/.*%/%'`term.h \
 	term.h
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 14675 "configure"
+#line 14771 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -14686,18 +14782,19 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14689: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14785: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14692: \$? = $ac_status" >&5
+  echo "$as_me:14788: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14695: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14791: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14698: \$? = $ac_status" >&5
+  echo "$as_me:14794: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_term_header=$cf_header
+	 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
@@ -14707,7 +14804,7 @@
 done
 
 fi
-echo "$as_me:14710: result: $cf_cv_term_header" >&5
+echo "$as_me:14807: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 case $cf_cv_term_header in #(vi
@@ -14723,9 +14820,15 @@
 EOF
 
 	;;
+ncursesw/term.h)
+	cat >>confdefs.h <<\EOF
+#define HAVE_NCURSESW_TERM_H 1
+EOF
+
+	;;
 esac
 
-echo "$as_me:14728: checking if we should include curses.h or termcap.h" >&5
+echo "$as_me:14831: 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
@@ -14744,7 +14847,7 @@
     test -n "$cf_t_opts" && CPPFLAGS="$CPPFLAGS -D$cf_t_opts"
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 14747 "configure"
+#line 14850 "configure"
 #include "confdefs.h"
 /* $cf_c_opts $cf_t_opts */
 $CHECK_DECL_HDRS
@@ -14757,16 +14860,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14760: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14863: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14763: \$? = $ac_status" >&5
+  echo "$as_me:14866: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14766: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14869: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14769: \$? = $ac_status" >&5
+  echo "$as_me:14872: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   test "$cf_cv_need_curses_h" = no && {
 	     cf_cv_need_curses_h=maybe
@@ -14778,7 +14881,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 14781 "configure"
+#line 14884 "configure"
 #include "confdefs.h"
 
 $CHECK_DECL_HDRS
@@ -14791,16 +14894,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14794: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14897: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14797: \$? = $ac_status" >&5
+  echo "$as_me:14900: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14800: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14903: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14803: \$? = $ac_status" >&5
+  echo "$as_me:14906: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_curses_h=yes
 	 cf_ok_c_opts=$cf_c_opts
@@ -14837,7 +14940,7 @@
 fi
 
 fi
-echo "$as_me:14840: result: $cf_cv_need_curses_h" >&5
+echo "$as_me:14943: result: $cf_cv_need_curses_h" >&5
 echo "${ECHO_T}$cf_cv_need_curses_h" >&6
 
 case $cf_cv_need_curses_h in
@@ -14871,7 +14974,7 @@
 	;;
 esac
 
-echo "$as_me:14874: checking declaration of tputs 3rd param" >&5
+echo "$as_me:14977: 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
@@ -14887,10 +14990,10 @@
 for R in int char; do
 for S in "" const; do
 
-echo "(line 14890) testing loop variables P:$P, Q:$Q, R:$R, S:$S ..." 1>&5
+echo "(line 14993) testing loop variables P:$P, Q:$Q, R:$R, S:$S ..." 1>&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 14893 "configure"
+#line 14996 "configure"
 #include "confdefs.h"
 $CHECK_DECL_HDRS
 int
@@ -14904,16 +15007,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14907: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15010: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14910: \$? = $ac_status" >&5
+  echo "$as_me:15013: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14913: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15016: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14916: \$? = $ac_status" >&5
+  echo "$as_me:15019: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_outchar="$Q OutChar($R)"
 	 cf_cv_found=yes
@@ -14932,7 +15035,7 @@
 done
 
 fi
-echo "$as_me:14935: result: $cf_cv_type_outchar" >&5
+echo "$as_me:15038: result: $cf_cv_type_outchar" >&5
 echo "${ECHO_T}$cf_cv_type_outchar" >&6
 
 case $cf_cv_type_outchar in
@@ -14964,7 +15067,7 @@
 
 ac_tr_func=`echo "$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-echo "$as_me:14967: checking for missing \"${ac_func}\" extern" >&5
+echo "$as_me:15070: 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
@@ -14973,7 +15076,7 @@
 cf_save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $CHECK_DECL_FLAG"
 cat >conftest.$ac_ext <<_ACEOF
-#line 14976 "configure"
+#line 15079 "configure"
 #include "confdefs.h"
 
 $CHECK_DECL_HDRS
@@ -14995,16 +15098,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14998: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15101: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15001: \$? = $ac_status" >&5
+  echo "$as_me:15104: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15004: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15107: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15007: \$? = $ac_status" >&5
+  echo "$as_me:15110: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval 'cf_cv_func_'${ac_func}'=yes'
 else
@@ -15018,7 +15121,7 @@
 fi
 
 eval 'cf_result=$cf_cv_func_'${ac_func}
-echo "$as_me:15021: result: $cf_result" >&5
+echo "$as_me:15124: 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
@@ -15092,7 +15195,7 @@
 
 ac_tr_func=`echo "$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-echo "$as_me:15095: checking for missing \"${ac_func}\" extern" >&5
+echo "$as_me:15198: 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
@@ -15101,7 +15204,7 @@
 cf_save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $CHECK_DECL_FLAG"
 cat >conftest.$ac_ext <<_ACEOF
-#line 15104 "configure"
+#line 15207 "configure"
 #include "confdefs.h"
 
 $CHECK_DECL_HDRS
@@ -15123,16 +15226,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15126: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15229: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15129: \$? = $ac_status" >&5
+  echo "$as_me:15232: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15132: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15235: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15135: \$? = $ac_status" >&5
+  echo "$as_me:15238: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval 'cf_cv_func_'${ac_func}'=yes'
 else
@@ -15146,7 +15249,7 @@
 fi
 
 eval 'cf_result=$cf_cv_func_'${ac_func}
-echo "$as_me:15149: result: $cf_result" >&5
+echo "$as_me:15252: 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
@@ -15166,7 +15269,7 @@
 
 ac_tr_func=`echo "$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-echo "$as_me:15169: checking for missing \"${ac_func}\" extern" >&5
+echo "$as_me:15272: 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
@@ -15175,7 +15278,7 @@
 cf_save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $CHECK_DECL_FLAG"
 cat >conftest.$ac_ext <<_ACEOF
-#line 15178 "configure"
+#line 15281 "configure"
 #include "confdefs.h"
 
 $CHECK_DECL_HDRS
@@ -15197,16 +15300,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15200: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15303: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15203: \$? = $ac_status" >&5
+  echo "$as_me:15306: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15206: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15309: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15209: \$? = $ac_status" >&5
+  echo "$as_me:15312: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval 'cf_cv_func_'${ac_func}'=yes'
 else
@@ -15220,7 +15323,7 @@
 fi
 
 eval 'cf_result=$cf_cv_func_'${ac_func}
-echo "$as_me:15223: result: $cf_result" >&5
+echo "$as_me:15326: 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
@@ -15230,7 +15333,15 @@
 
 fi
 
-if test "$VILE_BUILTIN_FILTERS" != none ; then
+if test "$VILE_BUILT_IN_FILTERS" != none ; then
+	cf_filter_libs=yes
+elif test "$VILE_LOADABLE_FILTERS" != none ; then
+	cf_filter_libs=yes
+else
+	cf_filter_libs=no
+fi
+
+if test "$cf_filter_libs" = yes ; then
 	EXTRAOBJS="$EXTRAOBJS builtflt.o"
 	CFLAGS="-I\$(srcdir)/filters $CFLAGS"
 	FILTER_LIBS="-Lfilters -lvlflt"
@@ -15240,13 +15351,124 @@
 #define OPT_FILTER 1
 EOF
 
+else
+	BUILTLIBS=
+	FILTER_LIBS=
+	LIBBUILTFLT=
+fi
+
+if test "$VILE_LOADABLE_FILTERS" != none ; then
+	echo "$as_me:15361: 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
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line 15369 "configure"
+#include "confdefs.h"
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char dlsym ();
+int
+main ()
+{
+dlsym ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:15388: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:15391: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:15394: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:15397: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_dl_dlsym=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_dl_dlsym=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:15408: 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
+
+		LIBS="-ldl $LIBS"
+		test "$GCC" = yes && CFLAGS="-rdynamic $CFLAGS"
+	cat >conftest.$ac_ext <<_ACEOF
+#line 15415 "configure"
+#include "confdefs.h"
+#include <dlfcn.h>
+int
+main ()
+{
+
+		void *obj;
+		if ((obj = dlopen("filename", RTLD_NOW)) != 0) {
+			if (dlsym(obj, "symbolname") == 0) {
+			dlclose(obj);
+			}
+		}
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:15433: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:15436: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:15439: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:15442: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+		cat >>confdefs.h <<\EOF
+#define HAVE_LIBDL 1
+EOF
+
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+
+		{ { echo "$as_me:15453: error: Cannot link test program for libdl" >&5
+echo "$as_me: error: Cannot link test program for libdl" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+
+else
+  { { echo "$as_me:15460: error: Cannot find libdl" >&5
+echo "$as_me: error: Cannot find libdl" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
 fi
 
 for ac_prog in ispell spell
 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:15249: checking for $ac_word" >&5
+echo "$as_me:15471: 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
@@ -15261,7 +15483,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:15264: found $ac_dir/$ac_word" >&5
+echo "$as_me:15486: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -15269,10 +15491,10 @@
 fi
 SPELL_PROG=$ac_cv_prog_SPELL_PROG
 if test -n "$SPELL_PROG"; then
-  echo "$as_me:15272: result: $SPELL_PROG" >&5
+  echo "$as_me:15494: result: $SPELL_PROG" >&5
 echo "${ECHO_T}$SPELL_PROG" >&6
 else
-  echo "$as_me:15275: result: no" >&5
+  echo "$as_me:15497: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -15375,7 +15597,7 @@
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:15378: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:15600: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -15551,7 +15773,7 @@
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:15554: error: ambiguous option: $1
+    { { echo "$as_me:15776: 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;}
@@ -15570,7 +15792,7 @@
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:15573: error: unrecognized option: $1
+  -*) { { echo "$as_me:15795: 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;}
@@ -15611,7 +15833,9 @@
 ECHO_CC='$ECHO_CC'
 MAKE_LEX='$MAKE_LEX'
 AWK="$AWK"
-VILE_BUILTIN_FILTERS='$VILE_BUILTIN_FILTERS'
+VILE_BUILT_IN_FILTERS='$VILE_BUILT_IN_FILTERS'
+VILE_LOADABLE_FILTERS='$VILE_LOADABLE_FILTERS'
+VILE_EXTERNAL_FILTERS='$VILE_EXTERNAL_FILTERS'
 }
 
 EOF
@@ -15626,7 +15850,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:15629: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:15853: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -15728,6 +15952,7 @@
 s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
 s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
 s,@INSTALL_DATA@,$INSTALL_DATA,;t t
+s,@SET_MAKE@,$SET_MAKE,;t t
 s,@AWK@,$AWK,;t t
 s,@RANLIB@,$RANLIB,;t t
 s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
@@ -15745,7 +15970,8 @@
 s,@PROG_EXT@,$PROG_EXT,;t t
 s,@LIB_PREFIX@,$LIB_PREFIX,;t t
 s,@MAKE_FILTERS@,$MAKE_FILTERS,;t t
-s,@VILE_BUILTIN_FILTERS@,$VILE_BUILTIN_FILTERS,;t t
+s,@VILE_BUILT_IN_FILTERS@,$VILE_BUILT_IN_FILTERS,;t t
+s,@VILE_LOADABLE_FILTERS@,$VILE_LOADABLE_FILTERS,;t t
 s,@VILE_LIBDIR_PATH@,$VILE_LIBDIR_PATH,;t t
 s,@VILE_STARTUP_PATH@,$VILE_STARTUP_PATH,;t t
 s,@MAKE_LEX@,$MAKE_LEX,;t t
@@ -15887,7 +16113,7 @@
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:15890: creating $ac_file" >&5
+    { echo "$as_me:16116: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -15905,7 +16131,7 @@
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:15908: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:16134: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -15918,7 +16144,7 @@
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:15921: error: cannot find input file: $f" >&5
+           { { echo "$as_me:16147: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -15984,7 +16210,7 @@
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:15987: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:16213: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -15995,7 +16221,7 @@
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:15998: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:16224: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -16008,7 +16234,7 @@
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:16011: error: cannot find input file: $f" >&5
+           { { echo "$as_me:16237: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -16066,7 +16292,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:16069: $ac_file is unchanged" >&5
+      { echo "$as_me:16295: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -16118,7 +16344,6 @@
 
   case $ac_dest in
     default ) {
-echo "Checking for built-in filters: $VILE_BUILTIN_FILTERS"
 test -n "$ac_top_srcdir" && top_srcdir="$ac_top_srcdir"
 if test "$top_srcdir" = ".."
 then
@@ -16127,8 +16352,14 @@
 	cf_srcdir=`echo $top_srcdir |sed -e 's%^../%%'`
 fi
 
-$AWK -f $cf_srcdir/filters/mk-1st.awk <$cf_srcdir/filters/genmake.mak mode=built-in list="$VILE_BUILTIN_FILTERS" >>filters/makefile
-$AWK -f $cf_srcdir/filters/mk-1st.awk <$cf_srcdir/filters/genmake.mak mode=external list="$VILE_BUILTIN_FILTERS" >>filters/makefile
+echo "Checking for built-in filters: $VILE_BUILT_IN_FILTERS"
+$AWK -f $cf_srcdir/filters/mk-1st.awk <$cf_srcdir/filters/genmake.mak mode=built-in list="$VILE_BUILT_IN_FILTERS" >>filters/makefile
+
+echo "Checking for external filters: $VILE_EXTERNAL_FILTERS"
+$AWK -f $cf_srcdir/filters/mk-1st.awk <$cf_srcdir/filters/genmake.mak mode=external list="$VILE_EXTERNAL_FILTERS" >>filters/makefile
+
+echo "Checking for loadable filters: $VILE_LOADABLE_FILTERS"
+$AWK -f $cf_srcdir/filters/mk-1st.awk <$cf_srcdir/filters/genmake.mak mode=loadable list="$VILE_LOADABLE_FILTERS" >>filters/makefile
 
 cat   filters/makefile.tmp >>filters/makefile
 rm -f filters/makefile.tmp
@@ -16142,8 +16373,9 @@
 	;;
 esac
 
-$AWK -f $cf_srcdir/filters/mk-2nd.awk <$cf_srcdir/filters/genmake.mak from=$cf_SRCDIR/filters linking="$ECHO_LD" compiling="$RULE_CC" show="$ECHO_CC" mode=built-in list="$VILE_BUILTIN_FILTERS" >>filters/makefile
-$AWK -f $cf_srcdir/filters/mk-2nd.awk <$cf_srcdir/filters/genmake.mak from=$cf_SRCDIR/filters linking="$ECHO_LD" compiling="$RULE_CC" show="$ECHO_CC" mode=external list="$VILE_BUILTIN_FILTERS" >>filters/makefile
+$AWK -f $cf_srcdir/filters/mk-2nd.awk <$cf_srcdir/filters/genmake.mak from=$cf_SRCDIR/filters linking="$ECHO_LD" compiling="$RULE_CC" show="$ECHO_CC" mode=built-in list="$VILE_BUILT_IN_FILTERS" >>filters/makefile
+$AWK -f $cf_srcdir/filters/mk-2nd.awk <$cf_srcdir/filters/genmake.mak from=$cf_SRCDIR/filters linking="$ECHO_LD" compiling="$RULE_CC" show="$ECHO_CC" mode=external list="$VILE_EXTERNAL_FILTERS" >>filters/makefile
+$AWK -f $cf_srcdir/filters/mk-2nd.awk <$cf_srcdir/filters/genmake.mak from=$cf_SRCDIR/filters linking="$ECHO_LD" compiling="$RULE_CC" show="$ECHO_CC" mode=loadable list="$VILE_LOADABLE_FILTERS" >>filters/makefile
 
 (for i in $cf_srcdir/filters/*.key;do echo $i;done) | $AWK -f $cf_srcdir/filters/mk-key.awk from=$cf_srcdir >>filters/makefile
 } ;;
Index: configure.in
Prereq:  1.190 
--- vile-9.4a+/configure.in	2003-07-08 21:20:13.000000000 -0400
+++ vile-9.4b/configure.in	2003-11-02 18:00:35.000000000 -0500
@@ -1,12 +1,14 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_REVISION($Revision: 1.190 $)
+AC_REVISION($Revision: 1.199 $)
 AC_PREREQ(2.13.20020210)
 rm -f config.cache
 
 ### Use "configure -with-screen" to override the default configuration, which is
 ### termcap-based on unix systems.
 
-dnl $Header: /usr/build/vile/vile/RCS/configure.in,v 1.190 2003/07/09 01:20:13 tom Exp $
+dnl $Header: /usr/build/vile/vile/RCS/configure.in,v 1.199 2003/11/02 23:00:35 tom Exp $
+
+define(MAKELIST, sh $srcdir/filters/makelist.sh $srcdir/filters/genmake.mak)
 
 dnl
 AC_INIT(mktbls.c)
@@ -21,6 +23,7 @@
 AC_GCC_TRADITIONAL
 AC_PROG_INSTALL
 
+AC_PROG_MAKE_SET
 AC_PROG_AWK
 AC_PROG_RANLIB
 case $host_os in hpux*) CPPFLAGS="-DYYCHAR_ARRAY $CPPFLAGS";; esac; AC_DECL_YYTEXT
@@ -102,81 +105,143 @@
 AC_SUBST(MAKE_FILTERS)
 
 if test "$with_filters" = yes ; then
+
+# allow user to preset these environment variables:
+: ${VILE_BUILT_IN_FILTERS=none}
+: ${VILE_LOADABLE_FILTERS=none}
+: ${VILE_EXTERNAL_FILTERS=all}
+
 AC_MSG_CHECKING(if you want built-in syntax filters)
 AC_ARG_WITH(builtin-filters,
-[  --with-builtin-filters=XX specify filters to compile built-in vs external
-                          Give an option value to specify only certain filters.
+[  --with-builtin-filters=XX specify filters to compile built-in vs external.
+                          Give an option value to specify only certain filters,
+			  i.e., a comma-separated list of filter-names.
+                          The default, if no value is given is 'all'.
+                          The default if the option is not given is 'none'],
+[test "$withval" = yes && withval=all; VILE_BUILT_IN_FILTERS="$withval"],
+
+[VILE_BUILT_IN_FILTERS=none])
+test "$VILE_BUILT_IN_FILTERS" = no && VILE_BUILT_IN_FILTERS=none
+AC_MSG_RESULT($VILE_BUILT_IN_FILTERS)
+
+AC_MSG_CHECKING(if you want loadable syntax filters)
+AC_ARG_WITH(loadable-filters,
+[  --with-loadable-filters=XX specify filters to dynamially load at runtime.
+                          Give an option value to specify only certain filters,
+			  i.e., a comma-separated list of filter-names.
                           The default, if no value is given is 'all'.
                           The default if the option is not given is 'none'],
-[test "$withval" = yes && withval=all; VILE_BUILTIN_FILTERS="$withval"],
+[test "$withval" = yes && withval=all; VILE_LOADABLE_FILTERS="$withval"],
+
+[VILE_LOADABLE_FILTERS=none])
+test "$VILE_LOADABLE_FILTERS" = no && VILE_LOADABLE_FILTERS=none
+AC_MSG_RESULT($VILE_LOADABLE_FILTERS)
+
+# If both "--with-builtin-filters" and "--with-loadable-filters" were given,
+# the user must provide an explicit list since we cannot build both at once.
+if test "$VILE_BUILT_IN_FILTERS" != none && test "$VILE_LOADABLE_FILTERS" != none
+then
+	builtins=`MAKELIST lc "$VILE_BUILT_IN_FILTERS"`
+	test "$builtins" = "." && exit 1
+	loadable=`MAKELIST lc "$VILE_LOADABLE_FILTERS"`
+	test "$loadable" = "." && exit 1
 
-[VILE_BUILTIN_FILTERS=none])
-test -z "$VILE_BUILTIN_FILTERS" && VILE_BUILTIN_FILTERS=none
-test "$VILE_BUILTIN_FILTERS" = no && VILE_BUILTIN_FILTERS=none
-AC_MSG_RESULT($VILE_BUILTIN_FILTERS)
-
-if test "$VILE_BUILTIN_FILTERS" != none ; then
-	AC_MSG_CHECKING(if any filters require flex)
-	cf_save_IFS="$IFS"
-	cf_found=
-	cf_lexed=
-	cf_missed=
-	IFS=",$IFS"
-	for cf_name in $VILE_BUILTIN_FILTERS
+	for cf_b in $builtins
 	do
-		if test "$cf_name" = all ; then
-			cf_lexed=some; cf_found=all
-			break
-		else
-			if (grep "^$cf_name	[[	]]*[[^	]]*	[[	]]*l$" $srcdir/filters/genmake.mak 2>/dev/null >/dev/null )
+		for cf_l in $loadable
+		do
+			if test "$cf_b" = "$cf_l"
 			then
-				cf_lexed="$cf_lexed $cf_name"
-				cf_found="$cf_found $cf_name"
-			elif (grep "^$cf_name	[[	]]*[[^	]]*	[[	]]*c$" $srcdir/filters/genmake.mak 2>/dev/null >/dev/null )
-			then
-				cf_found="$cf_found $cf_name"
+				AC_MSG_ERROR(Cannot overlap built-in and loadable filter lists)
+			fi
+		done
+	done
+fi
+
+# Anything that is neither a built-in or a loadable filter is an external
+# filter.  We could have 3 options, but resolving inconsistencies would be
+# a lot more work.
+if test "$VILE_BUILT_IN_FILTERS" = none && test "$VILE_LOADABLE_FILTERS" = none
+then
+	VILE_EXTERNAL_FILTERS=all
+elif test "$VILE_BUILT_IN_FILTERS" = all || test "$VILE_LOADABLE_FILTERS" = all
+then
+	VILE_EXTERNAL_FILTERS=none
+else
+	complete=`MAKELIST lc all`
+	VILE_EXTERNAL_FILTERS=
+	for cf_a in $complete
+	do
+		found=no
+		for cf_b in $builtins $loadable
+		do
+			if test $cf_b = $cf_a ; then
+				found=yes
+				break
+			fi
+		done
+		if test $found = no ; then
+			if test -z "$VILE_EXTERNAL_FILTERS" ; then
+				VILE_EXTERNAL_FILTERS=$cf_a
 			else
-				cf_missed="$cf_missed $cf_name"
+				VILE_EXTERNAL_FILTERS="$VILE_EXTERNAL_FILTERS,$cf_a"
 			fi
 		fi
 	done
-	IFS="$cf_save_IFS"
-	AC_MSG_RESULT($cf_lexed)
+	test -z "$VILE_EXTERNAL_FILTERS" && VILE_EXTERNAL_FILTERS=none
+fi
 
-	VILE_BUILTIN_FILTERS="$cf_found"
-	if test -n "$cf_lexed" ; then
-		CF_LEX_VERSION
-		if test -z "$LEX_VERSION"
+AC_MSG_CHECKING(if any filters require flex)
+
+builtins=`MAKELIST l "$VILE_BUILT_IN_FILTERS"`
+loadable=`MAKELIST l "$VILE_LOADABLE_FILTERS"`
+
+if test -n "$builtins" ; then
+	cf_needflex=yes
+elif test -n "$loadable" ; then
+	cf_needflex=yes
+else
+	cf_needflex=no
+fi
+AC_MSG_RESULT($cf_needflex)
+
+if test "$cf_needflex" = yes ; then
+	CF_LEX_VERSION
+	if test -z "$LEX_VERSION"
+	then
+		AC_MSG_ERROR(You need flex to compile builtin filters)
+	elif ( expr $LEX_VERSION \< 2.5 >/dev/null )
+	then
+		AC_MSG_ERROR(Sorry - your version of flex is too old: $LEX_VERSION)
+	elif ( expr $LEX_VERSION \>= 2.6 >/dev/null )
+	then
+		AC_MSG_ERROR(Sorry - your version of flex is too unstable: $LEX_VERSION)
+	else
+		LEX_SUBVERSION=`echo "$LEX_VERSION" | sed -e 's/^2.5.//'`
+		if test -z "$LEX_SUBVERSION"
 		then
-			AC_MSG_ERROR(You need flex to compile builtin filters)
-		elif ( expr $LEX_VERSION \< 2.5 >/dev/null )
+			AC_MSG_ERROR(This version of flex cannot compile builtin filters)
+		elif test $LEX_SUBVERSION = 4a
 		then
-			AC_MSG_ERROR(Sorry - your version of flex is too old: $LEX_VERSION)
-		elif ( expr $LEX_VERSION \>= 2.6 >/dev/null )
+			CF_VERBOSE(good)
+		elif ( expr $LEX_SUBVERSION \> 4 >/dev/null )
 		then
-			AC_MSG_ERROR(Sorry - your version of flex is too unstable: $LEX_VERSION)
-		else
-			LEX_SUBVERSION=`echo "$LEX_VERSION" | sed -e 's/^2.5.//'`
-			if test -z "$LEX_SUBVERSION"
-			then
-				AC_MSG_ERROR(This version of flex cannot compile builtin filters)
-			elif test $LEX_SUBVERSION = 4a
-			then
-				CF_VERBOSE(good)
-			elif ( expr $LEX_SUBVERSION \> 4 >/dev/null )
-			then
-				AC_MSG_ERROR(This version of flex cannot compile builtin filters)
-			fi
+			AC_MSG_ERROR(This version of flex cannot compile builtin filters)
 		fi
 	fi
-	test -n "$cf_missed" && AC_MSG_ERROR(Not all filter names were found: $cf_missed)
 fi
+
+# "--disable-filters" was given.
 else
-	VILE_BUILTIN_FILTERS=none
+	VILE_BUILT_IN_FILTERS=none
+	VILE_LOADABLE_FILTERS=none
+	VILE_EXTERNAL_FILTERS=none
 	MAKE_FILTERS="#"
 fi
 
-AC_SUBST(VILE_BUILTIN_FILTERS)
+dnl These substitutions are used in makefile.in to build builtflt.h
+AC_SUBST(VILE_BUILT_IN_FILTERS)
+AC_SUBST(VILE_LOADABLE_FILTERS)
 
 AC_MSG_CHECKING(for library path)
 CF_WITH_PATHLIST(libdir-path,
@@ -728,13 +793,25 @@
 )
 fi
 
-if test "$VILE_BUILTIN_FILTERS" != none ; then
+if test "$VILE_BUILT_IN_FILTERS" != none ; then
+	cf_filter_libs=yes
+elif test "$VILE_LOADABLE_FILTERS" != none ; then
+	cf_filter_libs=yes
+else
+	cf_filter_libs=no
+fi
+
+if test "$cf_filter_libs" = yes ; then
 	EXTRAOBJS="$EXTRAOBJS builtflt.o"
 	CFLAGS="-I\$(srcdir)/filters $CFLAGS"
 	FILTER_LIBS="-Lfilters -lvlflt"
 	LIBBUILTFLT="${LIB_PREFIX}vlflt.a"
 	BUILTLIBS="$BUILTLIBS filters/$LIBBUILTFLT"
 	AC_DEFINE(OPT_FILTER)
+else
+	BUILTLIBS=
+	FILTER_LIBS=
+	LIBBUILTFLT=
 fi
 
 AC_SUBST(EXTRAOBJS)
@@ -742,6 +819,22 @@
 AC_SUBST(FILTER_LIBS)
 AC_SUBST(LIBBUILTFLT)
 
+if test "$VILE_LOADABLE_FILTERS" != none ; then
+	AC_CHECK_LIB(dl,dlsym,[
+		LIBS="-ldl $LIBS"
+		test "$GCC" = yes && CFLAGS="-rdynamic $CFLAGS"
+	AC_TRY_LINK([#include <dlfcn.h>],[
+		void *obj;
+		if ((obj = dlopen("filename", RTLD_NOW)) != 0) {
+			if (dlsym(obj, "symbolname") == 0) {
+			dlclose(obj);
+			}
+		}],[
+		AC_DEFINE(HAVE_LIBDL)],[
+		AC_MSG_ERROR(Cannot link test program for libdl)])
+	],[AC_MSG_ERROR(Cannot find libdl)])
+fi
+
 AC_CHECK_PROGS(SPELL_PROG, ispell spell, [])
 case .$SPELL_PROG in
 .ispell) AC_DEFINE(ISPELL_PROG);;
@@ -755,7 +848,6 @@
 ###	output makefile and config.h
 AC_OUTPUT(makefile filters/makefile filters/makefile.tmp:filters/makefile.2nd,
 {
-echo "Checking for built-in filters: $VILE_BUILTIN_FILTERS"
 test -n "$ac_top_srcdir" && top_srcdir="$ac_top_srcdir"
 if test "$top_srcdir" = ".."
 then
@@ -764,8 +856,14 @@
 	cf_srcdir=`echo $top_srcdir |sed -e 's%^../%%'`
 fi
 
-$AWK -f $cf_srcdir/filters/mk-1st.awk <$cf_srcdir/filters/genmake.mak mode=built-in list="$VILE_BUILTIN_FILTERS" >>filters/makefile
-$AWK -f $cf_srcdir/filters/mk-1st.awk <$cf_srcdir/filters/genmake.mak mode=external list="$VILE_BUILTIN_FILTERS" >>filters/makefile
+echo "Checking for built-in filters: $VILE_BUILT_IN_FILTERS"
+$AWK -f $cf_srcdir/filters/mk-1st.awk <$cf_srcdir/filters/genmake.mak mode=built-in list="$VILE_BUILT_IN_FILTERS" >>filters/makefile
+
+echo "Checking for external filters: $VILE_EXTERNAL_FILTERS"
+$AWK -f $cf_srcdir/filters/mk-1st.awk <$cf_srcdir/filters/genmake.mak mode=external list="$VILE_EXTERNAL_FILTERS" >>filters/makefile
+
+echo "Checking for loadable filters: $VILE_LOADABLE_FILTERS"
+$AWK -f $cf_srcdir/filters/mk-1st.awk <$cf_srcdir/filters/genmake.mak mode=loadable list="$VILE_LOADABLE_FILTERS" >>filters/makefile
 
 cat   filters/makefile.tmp >>filters/makefile
 rm -f filters/makefile.tmp
@@ -779,8 +877,9 @@
 	;;
 esac
 
-$AWK -f $cf_srcdir/filters/mk-2nd.awk <$cf_srcdir/filters/genmake.mak from=$cf_SRCDIR/filters linking="$ECHO_LD" compiling="$RULE_CC" show="$ECHO_CC" mode=built-in list="$VILE_BUILTIN_FILTERS" >>filters/makefile
-$AWK -f $cf_srcdir/filters/mk-2nd.awk <$cf_srcdir/filters/genmake.mak from=$cf_SRCDIR/filters linking="$ECHO_LD" compiling="$RULE_CC" show="$ECHO_CC" mode=external list="$VILE_BUILTIN_FILTERS" >>filters/makefile
+$AWK -f $cf_srcdir/filters/mk-2nd.awk <$cf_srcdir/filters/genmake.mak from=$cf_SRCDIR/filters linking="$ECHO_LD" compiling="$RULE_CC" show="$ECHO_CC" mode=built-in list="$VILE_BUILT_IN_FILTERS" >>filters/makefile
+$AWK -f $cf_srcdir/filters/mk-2nd.awk <$cf_srcdir/filters/genmake.mak from=$cf_SRCDIR/filters linking="$ECHO_LD" compiling="$RULE_CC" show="$ECHO_CC" mode=external list="$VILE_EXTERNAL_FILTERS" >>filters/makefile
+$AWK -f $cf_srcdir/filters/mk-2nd.awk <$cf_srcdir/filters/genmake.mak from=$cf_SRCDIR/filters linking="$ECHO_LD" compiling="$RULE_CC" show="$ECHO_CC" mode=loadable list="$VILE_LOADABLE_FILTERS" >>filters/makefile
 
 (for i in $cf_srcdir/filters/*.key;do echo $i;done) | $AWK -f $cf_srcdir/filters/mk-key.awk from=$cf_srcdir >>filters/makefile
 },
@@ -790,6 +889,8 @@
 ECHO_CC='$ECHO_CC'
 MAKE_LEX='$MAKE_LEX'
 AWK="$AWK"
-VILE_BUILTIN_FILTERS='$VILE_BUILTIN_FILTERS'
+VILE_BUILT_IN_FILTERS='$VILE_BUILT_IN_FILTERS'
+VILE_LOADABLE_FILTERS='$VILE_LOADABLE_FILTERS'
+VILE_EXTERNAL_FILTERS='$VILE_EXTERNAL_FILTERS'
 },
 sort)
Index: estruct.h
Prereq:  1.537 
--- vile-9.4a+/estruct.h	2003-10-08 20:02:33.000000000 -0400
+++ vile-9.4b/estruct.h	2003-11-02 19:53:13.000000000 -0500
@@ -12,7 +12,7 @@
 */
 
 /*
- * $Header: /usr/build/vile/vile/RCS/estruct.h,v 1.537 2003/10/09 00:02:33 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/estruct.h,v 1.538 2003/11/03 00:53:13 tom Exp $
  */
 
 #ifndef _estruct_h
@@ -1808,7 +1808,9 @@
 	struct VAL      *global;
 } VALARGS;
 
-#define CHGD_ARGS VALARGS *args, int glob_vals, int testing
+struct	BUFFER;
+
+#define CHGD_ARGS struct BUFFER *bp, VALARGS *args, int glob_vals, int testing
 
 typedef	int	(*ChgdFunc) ( CHGD_ARGS );
 
@@ -1979,8 +1981,6 @@
  * read in at "use buffer" time.
  */
 
-struct	BUFFER;
-
 typedef	int	(*UpBuffFunc) ( struct BUFFER * );
 
 typedef struct	BUFFER {
Index: filters/filters.h
Prereq:  1.80 
--- vile-9.4a+/filters/filters.h	2003-07-08 21:16:30.000000000 -0400
+++ vile-9.4b/filters/filters.h	2003-10-28 19:03:56.000000000 -0500
@@ -1,5 +1,5 @@
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/filters.h,v 1.80 2003/07/09 01:16:30 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/filters.h,v 1.81 2003/10/29 00:03:56 bod Exp $
  */
 
 #ifndef FILTERS_H
@@ -228,6 +228,7 @@
  */
 typedef struct {
 	char *filter_name;
+	int loaded;
 	void (*InitFilter)(int before);
 	void (*DoFilter)(FILE *in);
 	char *options;
@@ -245,7 +246,7 @@
 #define DefineOptFilter(name,options) \
 static void init_filter(int before); \
 static void do_filter(FILE *Input); \
-FILTER_DEF filter_def = { name, init_filter, do_filter, options }
+FILTER_DEF filter_def = { name, 1, init_filter, do_filter, options }
 
 #define DefineFilter(name) DefineOptFilter(name,0)
 
Index: filters/filters.rc
Prereq:  1.176 
--- vile-9.4a+/filters/filters.rc	2003-10-08 16:45:25.000000000 -0400
+++ vile-9.4b/filters/filters.rc	2003-11-02 16:11:48.000000000 -0500
@@ -1,4 +1,4 @@
-; $Id: filters.rc,v 1.176 2003/10/08 20:45:25 tom Exp $
+; $Id: filters.rc,v 1.178 2003/11/02 21:11:48 tom Exp $
 ; majormodes in this file are ordered alphabetically for convenience - the
 ; precedence used by vile is strictly alphabetic, counting case.
 
@@ -254,7 +254,7 @@
 define-mode latex
 ~with define-submode latex
 	filtername 'vile-latex-filt -a'
-	suf '\.\(latex\|ltex\|ltx\|sty\|tex\)$'
+	suf '\.\(latex\|ltex\|ltx\|sty\)$'
 	fence-pairs='<>{}()[]'
 	comment-prefix	'^\s*%'
 	comments	'^\s*%.*$'
@@ -649,6 +649,9 @@
 ~elsewith define-submode vim group 'while'
 	fence-if	'^\s*while\>'
 	fence-fi	'^\s*endwhile\>'
+~elsewith define-submode vim group 'function'
+	fence-if	'^\s*function\>'
+	fence-fi	'^\s*endfunction\>'
 ~endwith
 
 define-mode xml
Index: filters/latexflt.l
Prereq:  1.35 
--- vile-9.4a+/filters/latexflt.l	2003-05-23 20:49:25.000000000 -0400
+++ vile-9.4b/filters/latexflt.l	2003-11-02 15:41:00.000000000 -0500
@@ -5,7 +5,7 @@
 
 %{
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/latexflt.l,v 1.35 2003/05/24 00:49:25 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/latexflt.l,v 1.36 2003/11/02 20:41:00 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of TeX or LaTeX
  * input text.
@@ -104,6 +104,9 @@
 <TEXT>\\"xdef"\\{NONNAME}	|
 <TEXT>\\"gdef"\\{NONNAME}	{ write_define(5); }
 
+<TEXT>\\"let"[^a-zA-Z]		|
+<TEXT>\\"def"[^a-zA-Z]		{ write_define(4); }
+
 <TEXT>\\"begintt"{NONNAME}	{
 			  yyless(yyleng-1);	/* reinterp {NONAME} */
 			  write_keyword();
Index: filters/lispfilt.l
Prereq:  1.8 
--- vile-9.4a+/filters/lispfilt.l	2003-09-17 18:11:30.000000000 -0400
+++ vile-9.4b/filters/lispfilt.l	2003-11-02 16:58:13.000000000 -0500
@@ -2,7 +2,7 @@
 
 %{
 /*
- * $Id: lispfilt.l,v 1.8 2003/09/17 22:11:30 tom Exp $
+ * $Id: lispfilt.l,v 1.9 2003/11/02 21:58:13 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of lisp code.
  *
@@ -112,4 +112,5 @@
     while (yylex() > 0) {
     }
     flt_bfr_error();
+    end_state();
 }
Index: filters/makefile.2nd
Prereq:  1.7 
--- vile-9.4a+/filters/makefile.2nd	2003-05-06 19:18:51.000000000 -0400
+++ vile-9.4b/filters/makefile.2nd	2003-10-29 19:39:23.000000000 -0500
@@ -1,4 +1,4 @@
-# $Header: /usr/build/vile/vile/filters/RCS/makefile.2nd,v 1.7 2003/05/06 23:18:51 tom Exp $
+# $Header: /usr/build/vile/vile/filters/RCS/makefile.2nd,v 1.8 2003/10/30 00:39:23 tom Exp $
 #
 
 .SUFFIXES: .l .c .i $o
@@ -28,7 +28,9 @@
 	vile-crypt$x \
 	vile-manfilt$x
 
-ALL = 	$(PROGS) $(C_ALL) @MAKE_LEX@ $(LEX_ALL)
+ALL = 	$(PROGS) $(C_ALL) $(C_DYN) @MAKE_LEX@ $(LEX_ALL) $(LEX_DYN)
+
+# library objects:
 LOBJS = filters$o $(C_OBJ) @MAKE_LEX@ $(LEX_OBJ)
 
 all:	$(ALL) @LIBBUILTFLT@
@@ -43,7 +45,7 @@
 	$(BINDIR)/vile-crypt$x \
 	$(BINDIR)/vile-manfilt$x \
 	$(DATADIR)/filters.rc \
-	$(DATADIR)/spell.rc $(INSTALL_C) @MAKE_LEX@ $(INSTALL_LEX)
+	$(DATADIR)/spell.rc $(INSTALL_C) $(INSTALL_DYN_C) @MAKE_LEX@ $(INSTALL_LEX) $(INSTALL_DYN_LEX) 
 
 install :: $(INSTALL_DIRS) $(INSTALL_FILES)
 
@@ -61,7 +63,7 @@
 	$(SHELL) ./config.status --recheck
 
 mostlyclean:
-	-$(RM) *.[oi] o$(TARGET) $(BUILTSRCS) core *~ *.BAK $(LEX_OUTPUT_ROOT).* *.bb* *.da *.gcov @LIBBUILTFLT@
+	-$(RM) *.[oi] *$(so) o$(TARGET) $(BUILTSRCS) core *~ *.BAK $(LEX_OUTPUT_ROOT).* *.bb* *.da *.gcov @LIBBUILTFLT@
 
 clean: mostlyclean
 	-$(RM) $(ALL)
Index: filters/makefile.in
Prereq:  1.73 
--- vile-9.4a+/filters/makefile.in	2003-07-27 10:52:16.000000000 -0400
+++ vile-9.4b/filters/makefile.in	2003-11-02 17:56:23.000000000 -0500
@@ -1,4 +1,4 @@
-# $Header: /usr/build/vile/vile/filters/RCS/makefile.in,v 1.73 2003/07/27 14:52:16 tom Exp $
+# $Header: /usr/build/vile/vile/filters/RCS/makefile.in,v 1.75 2003/11/02 22:56:23 tom Exp $
 #
 
 #### Start of system configuration section. ####
@@ -29,6 +29,7 @@
 
 x		= @PROG_EXT@
 o		= .o
+so		= .so
 
 SCREEN		= @SCREEN@
 TARGET		= @TARGET@$x
@@ -36,7 +37,7 @@
 prefix		= @prefix@
 exec_prefix	= @exec_prefix@
 
-libdir		= @libdir@
+libdir		= @libdir@/vile
 bindir		= @filters_bindir@
 datadir		= @datadir@/vile
 
@@ -52,11 +53,12 @@
 
 DESTDIR		=
 BINDIR		= $(DESTDIR)$(bindir)
+LIBDIR		= $(DESTDIR)$(libdir)
 DATADIR		= $(DESTDIR)$(datadir)
 
 INSTALL_DIRS    = $(BINDIR) $(DATADIR)
 
-.SUFFIXES: .l .c .i $o
+.SUFFIXES: .l .c .i $o $(so)
 
 LF_DEPS = filterio$o filters$o
 LF_ARGS = $(LF_DEPS) $(LEXLIB)
Index: filters/makelist.sh
--- /dev/null	2003-09-09 19:35:02.000000000 -0400
+++ vile-9.4b/filters/makelist.sh	2003-11-02 17:24:50.000000000 -0500
@@ -0,0 +1,80 @@
+#!/bin/sh
+# $Header: /usr/build/vile/vile/filters/RCS/makelist.sh,v 1.3 2003/11/02 22:24:50 tom Exp $
+#
+# Make a list of the names for the specified syntax filters, for the configure
+# script, etc.
+#
+# $1 is the path of genmake.mak
+#
+# $2 is the language key, i.e., "c", "l", or "lc"
+#
+# $3 is the nominal list, which may be "all", "none" or an explicit
+# comma-separated list of the names from the first column of genmak.mak
+
+all=`grep "^[^	#][^	]*	[	]*[^	]*	[	]*[$2]$" $1 2>/dev/null | sed -e 's/	.*//' |sort -u`
+list="$3"
+
+save_IFS="$IFS"
+IFS=",$IFS"
+
+key=none
+for j in $list
+do
+	case $j in
+	all)	
+		key=$j
+		;;
+	none)	
+		key=
+		;;
+	*)	
+		if test "$key" = none ; then
+			key=$j
+		elif test "$key" != all ; then
+			key=some
+		fi
+		;;
+	esac
+done
+
+if test "$key" = all ; then
+	key="$all"
+elif test "$key" = none ; then
+	key=
+else
+	key=
+	for j in $list
+	do
+		if test "$j" != all ; then
+			if test "$j" = none ; then
+				key=
+			else
+				found=no
+				for k in $all
+				do
+					if test "$k" = "$j" ; then
+						found=yes
+						break
+					fi
+				done
+				if test "$found" = no ; then
+					echo "no such filter: $j" >&2
+					echo "."
+					exit 1
+				fi
+				if test -n "$key" ; then
+					key="$key
+$j"
+				else
+					key="$j"
+				fi
+			fi
+		fi
+	done
+fi
+
+IFS="$save_IFS"
+
+# The result has no repeats, does not use the keywords "all" or "none", making
+# it possible to compare two lists.
+echo "$key" |sort -u | sed -e '/^$/d'
Index: filters/mk-0th.awk
Prereq:  1.5 
--- vile-9.4a+/filters/mk-0th.awk	2000-10-25 19:53:14.000000000 -0400
+++ vile-9.4b/filters/mk-0th.awk	2003-11-02 17:22:24.000000000 -0500
@@ -1,45 +1,65 @@
-# $Header: /usr/build/vile/vile/filters/RCS/mk-0th.awk,v 1.5 2000/10/25 23:53:14 tom Exp $
+# $Header: /usr/build/vile/vile/filters/RCS/mk-0th.awk,v 1.7 2003/11/02 22:22:24 tom Exp $
+# Construct the header file "builtflt.h".
 BEGIN	{
-		print "/* Generated by filters/mk-0th.awk */"
-		count = 0;
-		first = 1;
+	    print "/* Generated by filters/mk-0th.awk */"
+	    nAll = 0;
+	    nInt = 0;
+	    nExt = 0;
+	    first = 1;
 	}
 	!/^#/ {
-		# command-line parameters aren't available until we're matching
-		if (first == 1) {
-			Len = split(list,List,/ /)
-			first = 0;
+	    # command-line parameters aren't available until we're matching
+	    if (first == 1) {
+		# printf "splitting lists\n";
+		numInt = split(static,listInt,/,/)
+		numExt = split(dynamic,listExt,/,/)
+		first = 0;
+	    }
+	    if ( NF >= 2 ) {
+		for (i = 1; i <= numInt; i++) {
+		    if ( $1 == listInt[i] || listInt[i] == "all" ) {
+			# printf "nameInt[%d] = %s\n", nInt, $1
+			nameInt[nInt++] = $1;
+			nameAll[nAll++] = $1;
+			break;
+		    }
 		}
-		if ( NF >= 2 ) {
-			for (i = 1; i <= Len; i++) {
-				if ( $1 == List[i] || List[i] == "all" ) {
-					table[count++] = $1;
-					break;
-				}
-			}
+		for (i = 1; i <= numExt; i++) {
+		    if ( $1 == listExt[i] || listExt[i] == "all" ) {
+			# printf "nameExt[%d] = %s\n", nExt, $1
+			nameAll[nAll++] = $1;
+			nameExt[nExt++] = $1;
+			break;
+		    }
 		}
+	    }
 	}
 END	{
-		if (count != 0) {
-			print "#ifndef _builtflt_h"
-			print "#define _builtflt_h 1"
-			print ""
-			print "#include <filters.h>"
-			print ""
-			for (i = 0; i < count; i++) {
-				printf "extern FILTER_DEF define_%s;\n", table[i]
-			}
-			print ""
-			print "static FILTER_DEF *builtflt[] = {"
-			for (i = 0; i < count; i++) {
-				if ( i != 0 )
-					printf "\t, &define_%s\n", table[i]
-				else
-					printf "\t&define_%s\n", table[i]
-			}
-			print "\t,0"
-			print "};"
-			print ""
-			print "#endif /* _builtflt_h */"
+	    if (nInt != 0 || nExt != 0) {
+		print "#ifndef _builtflt_h"
+		print "#define _builtflt_h 1"
+		print ""
+		print "#include <filters.h>"
+		print ""
+		if (nExt != 0) {
+		    printf "/* loadable filters: %d */\n", nExt
+		    for (i = 0; i < nExt; i++) {
+			printf "FILTER_DEF define_%s = { \"%s\", 0, 0,0,0 };\n", nameExt[i], nameExt[i]
+		    }
+		    print ""
 		}
+		printf "/* built-in filters: %d */\n", nInt
+		for (i = 0; i < nInt; i++) {
+		    printf "extern FILTER_DEF define_%s;\n", nameInt[i]
+		}
+		print ""
+		printf "/* built-in or loadable filters: %d */\n", nAll
+		print "static FILTER_DEF *builtflt[] = {"
+		for (i = 0; i < nAll; i++) {
+		    printf "\t&define_%s,\n", nameAll[i]
+		}
+		print "\t0"
+		print "};"
+		print "#endif /* _builtflt_h */"
+	    }
 	}
Index: filters/mk-1st.awk
Prereq:  1.7 
--- vile-9.4a+/filters/mk-1st.awk	2000-10-25 19:53:14.000000000 -0400
+++ vile-9.4b/filters/mk-1st.awk	2003-11-02 17:22:24.000000000 -0500
@@ -1,63 +1,74 @@
-# $Header: /usr/build/vile/vile/filters/RCS/mk-1st.awk,v 1.7 2000/10/25 23:53:14 tom Exp $
+# $Header: /usr/build/vile/vile/filters/RCS/mk-1st.awk,v 1.9 2003/11/02 22:22:24 tom Exp $
 #
 # Generate makefile lists for vile's external and built-in filters.  We will
 # build each filter only one way (external _or_ built-in).  This script uses
 # these parameters:
-#	mode =	'built-in' or 'external'
-#	list =	a list of the filter root-names that are built-in, with 'all'
+#	mode =	one of 'built-in','dynamic' or 'external'
+#	list =	a list of the filter root-names to use, with 'all'
 #		matching all root-names.
 function dump_list(format, name, names, only) {
 	printf "%s =", name
 	for (i = 0; i < count; i++) {
-		if (index(file[i], only)) {
-			printf " \\\n\t"
-			printf format, names[i]
-		}
+	    if (index(file[i], only)) {
+		printf " \\\n\t"
+		printf format, names[i]
+	    }
 	}
 	print ""
 	print ""
 }
 BEGIN	{
-		first = 1;
-		count = 0;
+	    first = 1;
+	    count = 0;
 	}
 	!/^#/ {
-		# command-line parameters aren't available until we're matching
-		if (first == 1) {
-			Len = split(list,List,/ /)
-			Opt = (mode == "built-in");
+	    # command-line parameters aren't available until we're matching
+	    if (first == 1) {
+		Len = split(list,List,/,/)
+		if (mode == "loadable") {
+		    suffix = "$(so)";
+		} else {
+		    suffix = "$x";
+		}
+	    }
+	    found = 0;
+	    if ( NF >= 2 ) {
+		for (i = 1; i <= Len; i++) {
+		    if ( $1 == List[i] || List[i] == "all" ) {
+			found = 1;
+			break;
+		    }
 		}
-		found = !Opt;
-		if ( NF >= 2 ) {
-			for (i = 1; i <= Len; i++) {
-				if ( $1 == List[i] || List[i] == "all" ) {
-					found = Opt;
-					break;
-				}
-			}
-			if (found) {
-				if ( NF > 3 )
-					prog[count] = $4 "$x";
-				else
-					prog[count] = "vile-" $1 "-filt$x";
-				file[count] = sprintf("%s.%s", $2, $3);
-				root[count] = $2;
-				count = count + 1;
-			}
-			if ((first == 1) && (found == Opt)) {
-				printf "# Lists generated by filters/mk-1st.awk for %s filters\n", mode
-				first = 0;
-			}
+		if (found) {
+		    if ( NF > 3 )
+			prog[count] = $4 suffix;
+		    else
+			prog[count] = "vile-" $1 "-filt" suffix;
+		    file[count] = sprintf("%s.%s", $2, $3);
+		    root[count] = $2;
+		    count = count + 1;
 		}
+		if ((first == 1) && (found == 1)) {
+		    printf "# Lists generated by filters/mk-1st.awk for %s filters\n", mode
+		    first = 0;
+		}
+	    }
 	}
 END	{
-		if ( !Opt ) {
-			dump_list("%s", "C_ALL", prog, ".c");
-			dump_list("%s", "LEX_ALL", prog, ".l");
-			dump_list("$(BINDIR)/%s", "INSTALL_C", prog, ".c");
-			dump_list("$(BINDIR)/%s", "INSTALL_LEX", prog, ".l");
-		} else {
-			dump_list("%s$o", "C_OBJ", root, ".c");
-			dump_list("%s$o", "LEX_OBJ", root, ".l");
-		}
+	    if (first == 1) {
+		printf "# No lists generated by filters/mk-1st.awk for %s filters\n", mode
+	    } else if (mode == "external") {
+		dump_list("%s", "C_ALL", prog, ".c");
+		dump_list("%s", "LEX_ALL", prog, ".l");
+		dump_list("$(BINDIR)/%s", "INSTALL_C", prog, ".c");
+		dump_list("$(BINDIR)/%s", "INSTALL_LEX", prog, ".l");
+	    } else if (mode == "built-in") {
+		dump_list("%s$o", "C_OBJ", root, ".c");
+		dump_list("%s$o", "LEX_OBJ", root, ".l");
+	    } else {
+		dump_list("%s", "C_DYN", prog, ".c");
+		dump_list("%s", "LEX_DYN", prog, ".l");
+		dump_list("$(LIBDIR)/%s", "INSTALL_DYN_C", prog, ".c");
+		dump_list("$(LIBDIR)/%s", "INSTALL_DYN_LEX", prog, ".l");
+	    }
 	}
Index: filters/mk-2nd.awk
Prereq:  1.8 
--- vile-9.4a+/filters/mk-2nd.awk	2000-10-25 19:53:14.000000000 -0400
+++ vile-9.4b/filters/mk-2nd.awk	2003-11-02 17:22:24.000000000 -0500
@@ -1,85 +1,117 @@
-# $Header: /usr/build/vile/vile/filters/RCS/mk-2nd.awk,v 1.8 2000/10/25 23:53:14 tom Exp $
+# $Header: /usr/build/vile/vile/filters/RCS/mk-2nd.awk,v 1.10 2003/11/02 22:22:24 tom Exp $
 #
 # Generate makefile rules for vile's external and built-in filters.  We will
-# build each filter only one way (external _or_ built-in).  This script uses
-# these parameters:
-#	mode =	'built-in' or 'external'
+# build each filter only one way, to avoid conflict with the generated files. 
+# This script uses these parameters:
+#	mode =	one of 'built-in','dynamic' or 'external'
 #	list =	a list of the filter root-names that are built-in, with 'all'
 #		matching all root-names.
 BEGIN	{
-		first = 1;
-		count = 0;
+	    first = 1;
+	    count = 0;
 	}
 	!/^#/ {
-		# command-line parameters aren't available until we're matching
-		if (first == 1) {
-			Len = split(list,List,/ /)
-			Opt = (mode == "built-in");
-		}
-		found = !Opt;
-		if ( $NF >= 2 ) {
-			for (i = 1; i <= Len; i++) {
-				if ( $1 == List[i] || List[i] == "all" ) {
-					found = Opt;
-					break;
-				}
-			}
-			if (found) {
-				if ( NF > 3 ) {
-					main[count] = 0;
-					dest[count] = $4 "$x";
-				} else {
-					main[count] = 1;
-					dest[count] = "vile-" $1 "-filt$x";
-				}
-				name[count] = $1;
-				file[count] = sprintf("%s.%s", $2, $3);
-				root[count] = $2;
-				type[count] = $3;
-				count = count + 1;
-				if (first == 1) {
-					printf "# Lists generated by filters/mk-2nd.awk for %s filters\n", mode
-					first = 0;
-				}
-			}
+	    # command-line parameters aren't available until we're matching
+	    if (first == 1) {
+		Len = split(list,List,/,/)
+		if (mode == "loadable") {
+		    suffix = "$(so)";
+		} else {
+		    suffix = "$x";
+		}
+	    }
+	    found = 0;
+	    if ( $NF >= 2 ) {
+		for (i = 1; i <= Len; i++) {
+		    if ( $1 == List[i] || List[i] == "all" ) {
+			found = 1;
+			break;
+		    }
+		}
+		if (found) {
+		    if ( NF > 3 ) {
+			main[count] = 0;
+			prog[count] = $4 suffix;
+		    } else {
+			main[count] = 1;
+			prog[count] = "vile-" $1 "-filt" suffix;
+		    }
+		    name[count] = $1;
+		    file[count] = sprintf("%s.%s", $2, $3);
+		    root[count] = $2;
+		    type[count] = $3;
+		    count = count + 1;
+		    if (first == 1) {
+			printf "# Lists generated by filters/mk-2nd.awk for %s filters\n", mode
+			first = 0;
+		    }
 		}
+	    }
 	}
 END	{
-		if ( !Opt ) {
-			for (i = 0; i < count; i++) {
-				src = sprintf("vile-%s$x", root[i]);
-				nit = (type[i] == "c") ? "C" : "L";
-				print ""
-				if (main[i]) {
-					printf "%s : %s$o $(%sF_DEPS)\n", dest[i], root[i], nit
-					printf "\t%s$(LINK) $(LDFLAGS) -o $@ %s$o $(%sF_ARGS)\n", linking, root[i], nit
-				} else {
-					printf "%s : %s$o\n", dest[i], root[i]
-					printf "\t%s$(LINK) $(LDFLAGS) -o $@ %s$o\n", linking, root[i]
-				}
-			}
-			print ""
-			print "# dependency-rules for install/installdirs"
-			for (i = 0; i < count; i++) {
-				src = sprintf("vile-%s-filt$x", name[i]);
-				dst = sprintf("$(BINDIR)/%s", src);
-				printf "%s :\t%s\t\t; $(INSTALL_PROGRAM) $? $@\n", dst, src
-			}
-		} else {
-			for (i = 0; i < count; i++) {
-				dst = sprintf("%s$o", root[i]);
-				print ""
-				printf "%s : %s\n", dst, file[i]
-				if (index(compiling,"#") == 0)
-					printf "\t@echo compiling %s\n", file[i]
-				if (type[i] == "l") {
-					printf "\t%s$(LEX) -P%s_ -t %s/%s > %s.c\n", show, name[i], from, file[i], root[i]
-					printf "\t%s$(CC) -c $(CPPFLAGS) $(CFLAGS) -Dfilter_def=define_%s %s/%s.c\n", show, name[i], ".", root[i]
-					printf "\t%s $(RM) %s.c\n", show, root[i]
-				} else {
-					printf "\t%s$(CC) -c $(CPPFLAGS) $(CFLAGS) -Dfilter_def=define_%s %s/%s.c\n", show, name[i], from, root[i]
-				}
-			}
-			print ""
+	    if ( first == 1 ) {
+		printf "# No lists generated by filters/mk-2nd.awk for %s filters\n", mode
+	    } else if ( mode == "external" ) {
+		for (i = 0; i < count; i++) {
+		    nit = (type[i] == "c") ? "C" : "L";
+		    print ""
+		    if (main[i]) {
+			printf "%s : %s$o $(%sF_DEPS)\n", prog[i], root[i], nit
+			printf "\t%s$(LINK) $(LDFLAGS) -o $@ %s$o $(%sF_ARGS)\n", linking, root[i], nit
+		    } else {
+			printf "%s : %s$o\n", prog[i], root[i]
+			printf "\t%s$(LINK) $(LDFLAGS) -o $@ %s$o\n", linking, root[i]
+		    }
+		}
+		print ""
+		print "# dependency-rules for install/installdirs (%s)", mode
+		for (i = 0; i < count; i++) {
+		    src = prog[i];
+		    dst = sprintf("$(BINDIR)/%s", src);
+		    printf "%s :\t%s\t\t; $(INSTALL_PROGRAM) $? $@\n", dst, src
+		}
+	    } else if ( mode == "built-in" ) {
+		for (i = 0; i < count; i++) {
+		    dst = sprintf("%s$o", root[i]);
+		    print ""
+		    printf "%s : %s\n", dst, file[i]
+		    if (index(compiling,"#") == 0)
+			printf "\t@echo compiling %s\n", file[i]
+		    if (type[i] == "l") {
+			printf "\t%s$(LEX) -P%s_ -t %s/%s > %s.c\n", show, name[i], from, file[i], root[i]
+			printf "\t%s$(CC) -c $(CPPFLAGS) $(CFLAGS) -Dfilter_def=define_%s %s/%s.c\n", show, name[i], ".", root[i]
+			printf "\t%s $(RM) %s.c\n", show, root[i]
+		    } else {
+			printf "\t%s$(CC) -c $(CPPFLAGS) $(CFLAGS) -Dfilter_def=define_%s %s/%s.c\n", show, name[i], from, root[i]
+		    }
+		}
+		print ""
+	    } else {
+		for (i = 0; i < count; i++) {
+		    dst = sprintf("%s$o", root[i]);
+		    print ""
+		    printf "%s : %s\n", dst, file[i]
+		    if (index(compiling,"#") == 0)
+			printf "\t@echo compiling %s\n", file[i]
+		    if (type[i] == "l") {
+			printf "\t%s$(LEX) -P%s_ -t %s/%s > %s.c\n", show, name[i], from, file[i], root[i]
+			printf "\t%s$(CC) -c -fPIC $(CPPFLAGS) $(CFLAGS) -Dfilter_def=define_%s %s/%s.c\n", show, name[i], ".", root[i]
+			printf "\t%s $(RM) %s.c\n", show, root[i]
+		    } else {
+			printf "\t%s$(CC) -c -fPIC $(CPPFLAGS) $(CFLAGS) -Dfilter_def=define_%s %s/%s.c\n", show, name[i], from, root[i]
+		    }
+		}
+		print ""
+		for (i = 0; i < count; i++) {
+		    printf "%s : %s$o\n", prog[i], root[i]
+		    printf "\t$(LINK) $(LDFLAGS) -o $@ -shared $?\n"
+		    print ""
+		}
+		print "# dependency-rules for install/installdirs (%s)", mode
+		for (i = 0; i < count; i++) {
+		    src = prog[i];
+		    dst = sprintf("$(LIBDIR)/%s", src);
+		    printf "%s :\t%s\t\t; $(INSTALL_PROGRAM) $? $@\n", dst, src
 		}
+	    }
 	}
Index: filters/pl-filt.c
Prereq:  1.70 
--- vile-9.4a+/filters/pl-filt.c	2003-05-24 11:19:03.000000000 -0400
+++ vile-9.4b/filters/pl-filt.c	2003-11-02 17:16:37.000000000 -0500
@@ -1,5 +1,5 @@
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/pl-filt.c,v 1.70 2003/05/24 15:19:03 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/pl-filt.c,v 1.71 2003/11/02 22:16:37 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.
@@ -121,7 +121,7 @@
 {
     int found = 0;
     if (*s == BACKSLASH) {
-	if (ATLEAST(s, 2) && strchr("'\"`\\", s[1]))
+	if (ATLEAST(s, 2) && strchr("'`\\", s[1]))
 	    found = 2;
 	else
 	    found = 1;
Index: makefile.in
Prereq:  1.186 
--- vile-9.4a+/makefile.in	2003-05-25 15:34:47.000000000 -0400
+++ vile-9.4b/makefile.in	2003-11-02 18:13:28.000000000 -0500
@@ -20,7 +20,7 @@
 #
 # gnu autoconf support by kevin buettner, 5/94
 #
-# $Header: /usr/build/vile/vile/RCS/makefile.in,v 1.186 2003/05/25 19:34:47 tom Exp $
+# $Header: /usr/build/vile/vile/RCS/makefile.in,v 1.188 2003/11/02 23:13:28 tom Exp $
 
 SHELL		= /bin/sh
 
@@ -29,6 +29,7 @@
 srcdir = @srcdir@
 srcdir_sl = @srcdir@/
 VPATH  = @srcdir@
+@SET_MAKE@
 
 CC		= @CC@
 CPP		= @CPP@
@@ -330,7 +331,7 @@
 builtflt.o :	builtflt.h
 
 builtflt.h :
-	$(AWK) -f $(srcdir)/filters/mk-0th.awk <$(srcdir)/filters/genmake.mak list="@VILE_BUILTIN_FILTERS@" >$@
+	$(AWK) -f $(srcdir)/filters/mk-0th.awk <$(srcdir)/filters/genmake.mak static="@VILE_BUILT_IN_FILTERS@" dynamic="@VILE_LOADABLE_FILTERS@" >$@
 
 $(MKTBLS):  $(srcdir)/mktbls.c
 	@ECHO_LD@$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) \
Index: modes.c
Prereq:  1.262 
--- vile-9.4a+/modes.c	2003-07-27 11:53:48.000000000 -0400
+++ vile-9.4b/modes.c	2003-11-02 20:33:20.000000000 -0500
@@ -7,7 +7,7 @@
  * Major extensions for vile by Paul Fox, 1991
  * Majormode extensions for vile by T.E.Dickey, 1997
  *
- * $Header: /usr/build/vile/vile/RCS/modes.c,v 1.262 2003/07/27 15:53:48 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/modes.c,v 1.264 2003/11/03 01:33:20 tom Exp $
  *
  */
 
@@ -998,7 +998,7 @@
      */
     if (!defining
 	&& (names->side_effect != 0)
-	&& !(*(names->side_effect)) (args, (values == globls), TRUE)) {
+	&& !(*(names->side_effect)) (curbp, args, (values == globls), TRUE)) {
 	return FALSE;
     }
 
@@ -1072,7 +1072,7 @@
      */
     if (!defining
 	&& (names->side_effect != 0)
-	&& !(*(names->side_effect)) (args, (values == globls), TRUE)) {
+	&& !(*(names->side_effect)) (bp, args, (values == globls), TRUE)) {
 	return FALSE;
     }
 
@@ -1196,7 +1196,7 @@
     if (!defining
 	&& changed
 	&& (names->side_effect != 0)
-	&& !(*(names->side_effect)) (args, (values == globls), FALSE)) {
+	&& !(*(names->side_effect)) (bp, args, (values == globls), FALSE)) {
 	if (!same_val(names, values, &oldvalue)) {
 	    free_val(names, values);
 	}
@@ -1531,7 +1531,10 @@
  */
 /*ARGSUSED*/
 int
-chgd_autobuf(VALARGS * args GCC_UNUSED, int glob_vals, int testing GCC_UNUSED)
+chgd_autobuf(BUFFER *bp GCC_UNUSED,
+	     VALARGS * args GCC_UNUSED,
+	     int glob_vals,
+	     int testing GCC_UNUSED)
 {
     if (glob_vals)
 	sortlistbuffers();
@@ -1540,29 +1543,32 @@
 
 /*ARGSUSED*/
 int
-chgd_buffer(VALARGS * args GCC_UNUSED, int glob_vals, int testing GCC_UNUSED)
+chgd_buffer(BUFFER *bp GCC_UNUSED,
+	    VALARGS * args GCC_UNUSED,
+	    int glob_vals,
+	    int testing GCC_UNUSED)
 {
     if (!glob_vals) {		/* i.e., ":setl" */
-	if (curbp == 0)
+	if (bp == 0)
 	    return FALSE;
-	b_clr_counted(curbp);
-	(void) bsizes(curbp);
+	b_clr_counted(bp);
+	(void) bsizes(bp);
     }
     return TRUE;
 }
 
 int
-chgd_charset(VALARGS * args, int glob_vals, int testing)
+chgd_charset(BUFFER *bp, VALARGS * args, int glob_vals, int testing)
 {
     if (!testing) {
 	charinit();
     }
-    return chgd_window(args, glob_vals, testing);
+    return chgd_window(bp, args, glob_vals, testing);
 }
 
 #if OPT_COLOR
 int
-chgd_color(VALARGS * args, int glob_vals, int testing)
+chgd_color(BUFFER *bp GCC_UNUSED, VALARGS * args, int glob_vals, int testing)
 {
     if (!testing) {
 	if (&args->local->vp->i == &gfcolor)
@@ -1762,7 +1768,10 @@
 	/* Report mode that cannot be changed */
 /*ARGSUSED*/
 int
-chgd_disabled(VALARGS * args, int glob_vals GCC_UNUSED, int testing GCC_UNUSED)
+chgd_disabled(BUFFER *bp GCC_UNUSED,
+	      VALARGS * args,
+	      int glob_vals GCC_UNUSED,
+	      int testing GCC_UNUSED)
 {
     mlforce("[Cannot change \"%s\" ]", args->names->name);
     return FALSE;
@@ -1771,7 +1780,7 @@
 	/* Change "fences" mode */
 /*ARGSUSED*/
 int
-chgd_fences(VALARGS * args, int glob_vals GCC_UNUSED, int testing)
+chgd_fences(BUFFER *bp GCC_UNUSED, VALARGS * args, int glob_vals GCC_UNUSED, int testing)
 {
     if (!testing) {
 	/* was even number of fence pairs specified? */
@@ -1791,13 +1800,13 @@
 
 	/* Change a "major" mode */
 int
-chgd_major(VALARGS * args, int glob_vals, int testing)
+chgd_major(BUFFER *bp, VALARGS * args, int glob_vals, int testing)
 {
     /* prevent major-mode changes for scratch-buffers */
     if (testing) {
 	if (!glob_vals) {
-	    if (b_is_scratch(curbp))
-		return chgd_disabled(args, glob_vals, testing);
+	    if (b_is_scratch(bp))
+		return chgd_disabled(bp, args, glob_vals, testing);
 	}
     } else {
 	set_winflags(glob_vals, WFMODE);
@@ -1807,12 +1816,12 @@
 
 	/* Change the "undoable" mode */
 int
-chgd_undoable(VALARGS * args, int glob_vals, int testing)
+chgd_undoable(BUFFER *bp, VALARGS * args, int glob_vals, int testing)
 {
-    if (chgd_major(args, glob_vals, testing)) {
+    if (chgd_major(bp, args, glob_vals, testing)) {
 	if (!testing
 	    && !(args->local->v.i))
-	    freeundostacks(curbp, TRUE);
+	    freeundostacks(bp, TRUE);
 	return TRUE;
     }
     return FALSE;
@@ -1820,12 +1829,12 @@
 
 	/* Change a major mode that affects the windows on the buffer */
 int
-chgd_major_w(VALARGS * args, int glob_vals, int testing)
+chgd_major_w(BUFFER *bp, VALARGS * args, int glob_vals, int testing)
 {
     if (testing) {
-	if (!chgd_major(args, glob_vals, testing))
+	if (!chgd_major(bp, args, glob_vals, testing))
 	    return FALSE;
-	return chgd_window(args, glob_vals, testing);
+	return chgd_window(bp, args, glob_vals, testing);
     }
 
     set_winflags(glob_vals, WFHARD | WFMODE);
@@ -1880,7 +1889,7 @@
 
 	/* Change the record separator */
 int
-chgd_rs(VALARGS * args, int glob_vals, int testing)
+chgd_rs(BUFFER *bp, VALARGS * args, int glob_vals, int testing)
 {
     /* we can set 'auto' only as a global */
     if (!glob_vals) {
@@ -1888,19 +1897,19 @@
 	    return FALSE;
     }
     if (!testing) {
-	if (curbp == 0)
+	if (bp == 0)
 	    return FALSE;
-	set_record_sep(curbp, (RECORD_SEP) args->local->vp->i);
+	set_record_sep(bp, (RECORD_SEP) args->local->vp->i);
     }
 
     set_winflags(TRUE, WFMODE);
-    return chgd_major_w(args, glob_vals, testing);
+    return chgd_major_w(bp, args, glob_vals, testing);
 }
 
 	/* Change something on the mode/status line */
 /*ARGSUSED*/
 int
-chgd_status(VALARGS * args GCC_UNUSED, int glob_vals, int testing)
+chgd_status(BUFFER *bp GCC_UNUSED, VALARGS * args GCC_UNUSED, int glob_vals, int testing)
 {
     if (!testing) {
 	set_winflags(glob_vals, WFSTAT);
@@ -1911,7 +1920,10 @@
 #if OPT_TITLE
 	/* Changed swap-title */
 int
-chgd_swaptitle(VALARGS * args GCC_UNUSED, int glob_vals GCC_UNUSED, int testing)
+chgd_swaptitle(BUFFER *bp GCC_UNUSED,
+	       VALARGS * args GCC_UNUSED,
+	       int glob_vals GCC_UNUSED,
+	       int testing)
 {
     if (!testing)
 	set_editor_title();
@@ -1928,7 +1940,10 @@
  * editor to flag incorrect syntax before a shell command is initiated.
  */
 int
-chgd_find_cfg(VALARGS * args, int glob_vals GCC_UNUSED, int testing)
+chgd_find_cfg(BUFFER *bp GCC_UNUSED,
+	      VALARGS * args,
+	      int glob_vals GCC_UNUSED,
+	      int testing)
 {
     int rc = TRUE;
     FINDCFG unused;
@@ -1942,7 +1957,7 @@
 	/* Change a mode that affects the windows on the buffer */
 /*ARGSUSED*/
 int
-chgd_window(VALARGS * args GCC_UNUSED, int glob_vals, int testing)
+chgd_window(BUFFER *bp GCC_UNUSED, VALARGS * args GCC_UNUSED, int glob_vals, int testing)
 {
     if (!testing) {
 	set_winflags(glob_vals, WFHARD);
@@ -1954,17 +1969,21 @@
 	   can have a valid fuid */
 /*ARGSUSED*/
 int
-chgd_uniqbuf(VALARGS * args GCC_UNUSED, int glob_vals GCC_UNUSED, int testing)
+chgd_uniqbuf(BUFFER *bp GCC_UNUSED,
+	     VALARGS * args GCC_UNUSED,
+	     int glob_vals GCC_UNUSED,
+	     int testing)
 {
     if (!testing) {
-	BUFFER *bp;
 	if (global_g_val(GMDUNIQ_BUFS)) {
 	    FUID fuid;
-	    for_each_buffer(bp) {
-		if (bp->b_fname != 0
-		    && !isInternalName(bp->b_fname)
-		    && fileuid_get(bp->b_fname, &fuid)) {
-		    fileuid_set(bp, &fuid);
+	    BUFFER *bp2;
+
+	    for_each_buffer(bp2) {
+		if (bp2->b_fname != 0
+		    && !isInternalName(bp2->b_fname)
+		    && fileuid_get(bp2->b_fname, &fuid)) {
+		    fileuid_set(bp2, &fuid);
 		}
 	    }
 	}
@@ -1976,7 +1995,10 @@
 #if OPT_WORKING
 /*ARGSUSED*/
 int
-chgd_working(VALARGS * args GCC_UNUSED, int glob_vals, int testing GCC_UNUSED)
+chgd_working(BUFFER *bp GCC_UNUSED,
+	     VALARGS * args GCC_UNUSED,
+	     int glob_vals,
+	     int testing GCC_UNUSED)
 {
     if (glob_vals)
 	imworking(0);
@@ -1987,7 +2009,10 @@
 	/* Change the xterm-mouse mode */
 /*ARGSUSED*/
 int
-chgd_xterm(VALARGS * args GCC_UNUSED, int glob_vals, int testing GCC_UNUSED)
+chgd_xterm(BUFFER *bp GCC_UNUSED,
+	   VALARGS * args GCC_UNUSED,
+	   int glob_vals,
+	   int testing GCC_UNUSED)
 {
 #if	OPT_XTERM
     if (glob_vals) {
@@ -2007,7 +2032,7 @@
 #ifdef GMDMOUSE
 /*ARGSUSED*/
 int
-chgd_mouse(VALARGS * args GCC_UNUSED, int glob_vals, int testing GCC_UNUSED)
+chgd_mouse(BUFFER *bp, VALARGS * args GCC_UNUSED, int glob_vals, int testing GCC_UNUSED)
 {
     if (glob_vals) {
 	int new_state = global_g_val(GMDMOUSE);
@@ -2025,13 +2050,14 @@
 	/* Change a mode that affects the search-string highlighting */
 /*ARGSUSED*/
 int
-chgd_hilite(VALARGS * args GCC_UNUSED, int glob_vals GCC_UNUSED, int testing)
+chgd_hilite(BUFFER *bp, VALARGS * args GCC_UNUSED, int glob_vals GCC_UNUSED, int testing)
 {
     if (!testing) {
 #if OPT_HILITEMATCH
-	if (curbp->b_highlight & HILITE_ON)
-	    curbp->b_highlight |= HILITE_DIRTY;
-	attrib_matches();
+	if (bp->b_highlight & HILITE_ON)
+	    bp->b_highlight |= HILITE_DIRTY;
+	if (bp == curbp)	/* FIXME: attrib_matches only does curbp */
+	    attrib_matches();
 #endif
 #if OPT_COLOR
 	set_winflags(glob_vals, WFHARD | WFCOLR);
@@ -2882,7 +2908,8 @@
 			args.names = &(b_valnames[n]);
 			args.local = &(bp->b_values.bv[n]);
 			args.global = &mm[n];
-			b_valnames[n].side_effect(&args,
+			b_valnames[n].side_effect(bp,
+						  &args,
 						  TRUE,
 						  FALSE);
 		    }
@@ -3658,8 +3685,10 @@
 
 /*ARGSUSED*/
 int
-chgd_mm_order(VALARGS * args GCC_UNUSED, int glob_vals GCC_UNUSED, int
-	      testing GCC_UNUSED)
+chgd_mm_order(BUFFER *bp GCC_UNUSED,
+	      VALARGS * args GCC_UNUSED,
+	      int glob_vals GCC_UNUSED,
+	      int testing GCC_UNUSED)
 {
     if (!testing) {
 	compute_majormodes_order();
@@ -3670,19 +3699,19 @@
 
 /*ARGSUSED*/
 int
-chgd_filter(VALARGS * args GCC_UNUSED, int glob_vals GCC_UNUSED, int testing)
+chgd_filter(BUFFER *bp, VALARGS * args GCC_UNUSED, int glob_vals GCC_UNUSED, int testing)
 {
     if (!testing) {
 	struct VAL *values = args->local;
-	BUFFER *bp;
+	BUFFER *bp2;
 
 	if (values->vp->i == FALSE) {
 	    if (glob_vals) {
-		for_each_buffer(bp) {
-		    free_attribs(bp);
+		for_each_buffer(bp2) {
+		    free_attribs(bp2);
 		}
 	    } else {
-		free_attribs(curbp);
+		free_attribs(bp);
 	    }
 	}
 	set_winflags(glob_vals, WFHARD);
@@ -3708,7 +3737,7 @@
     VALARGS args;
 
     if (find_mode(bp, my_mode, FALSE, &args) == TRUE
-     && bp == curbp) {
+	&& !b_is_scratch(bp)) {
 	(void) set_mode_value(bp, my_mode, FALSE, TRUE, FALSE, &args,
 			      (char *) 0);
     }
@@ -4173,7 +4202,7 @@
 }
 
 int
-chgd_scheme(VALARGS * args, int glob_vals, int testing)
+chgd_scheme(BUFFER *bp GCC_UNUSED, VALARGS * args, int glob_vals, int testing)
 {
     if (!testing) {
 	PALETTES *p = find_scheme_by_code(args->local->vp->i);
Index: patchlev.h
--- vile-9.4a+/patchlev.h	2003-09-16 17:58:16.000000000 -0400
+++ vile-9.4b/patchlev.h	2003-11-02 11:47:35.000000000 -0500
@@ -1,2 +1,2 @@
 /* set to "" for no patches */
-#define PATCHLEVEL "a"
+#define PATCHLEVEL "b"
Index: revlist
--- vile-9.4a+/revlist	2003-10-08 20:49:13.000000000 -0400
+++ vile-9.4b/revlist	2003-11-02 20:41:26.000000000 -0500
@@ -1,6 +1,6 @@
-revlist for vile, version v9_4a
+revlist for vile, version v9_4b
 --------------------------------------------------------------------------------
-CHANGES	1.731
+CHANGES	1.732
 CHANGES.R3	1.1
 CHANGES.R4	1.1
 CHANGES.R5	1.1
@@ -13,7 +13,7 @@
 README	1.90
 README.PC	1.31
 README.VMS	1.5
-aclocal.m4	1.126
+aclocal.m4	1.128
 ansi.c	1.44
 api.c	1.34
 api.h	1.12
@@ -24,13 +24,13 @@
 btree.h	1.4
 buffer.c	1.263
 buglist	1.398
-builtflt.c	1.30
+builtflt.c	1.33
 chgdfunc.h	1.16
 cmdtbl	1.228
 config.emx	1.2
 config_h.in	1.2
 configure	none
-configure.in	1.190
+configure.in	1.199
 csrch.c	1.31
 curses.c	1.20
 descrip.mms	1.44
@@ -39,7 +39,7 @@
 djhandl.c	1.6
 dumbterm.c	1.17
 edef.h	1.313
-estruct.h	1.537
+estruct.h	1.538
 eval.c	1.322
 exec.c	1.259
 externs.c	1.8
@@ -65,7 +65,7 @@
 makefile.djg	1.32
 makefile.emx	1.5
 makefile.icc	1.13
-makefile.in	1.186
+makefile.in	1.188
 makefile.tbc	1.24
 makefile.wat	1.26
 makefile.wnt	1.76
@@ -74,7 +74,7 @@
 mkdirs.sh	1.5
 mkprlenv.wnt	1.8
 mktbls.c	1.130
-modes.c	1.262
+modes.c	1.264
 modetbl	1.217
 msgs.c	1.25
 npopen.c	1.89
@@ -85,7 +85,7 @@
 os2keys.h	1.1
 os2pipe.c	1.5
 os2vio.c	1.29
-patchlev.h	1.305
+patchlev.h	1.306
 path.c	1.135
 perl.xs	1.89
 proto.h	1.521
@@ -94,7 +94,7 @@
 random.c	1.272
 regexp.c	1.107
 region.c	1.126
-revlist	v9_4a
+revlist	v9_4b
 search.c	1.134
 select.c	1.147
 sinstall.sh	1.1
@@ -110,7 +110,7 @@
 ucrypt.c	1.15
 undo.c	1.84
 version.c	1.55
-vile-9.4.spec	1.2
+vile-9.4.spec	1.3
 vile.1	1.30
 vile.hlp	1.568
 vile.wmconfig	1.1
@@ -193,8 +193,8 @@
 filters/fdl.key	1.4
 filters/filterio.c	1.22
 filters/filters.c	1.88
-filters/filters.h	1.80
-filters/filters.rc	1.176
+filters/filters.h	1.81
+filters/filters.rc	1.178
 filters/fltstack.h	1.8
 filters/genmake.c	1.4
 filters/genmake.mak	1.22
@@ -207,29 +207,30 @@
 filters/js.key	1.2
 filters/key-filt.c	1.17
 filters/latex.key	1.2
-filters/latexflt.l	1.35
+filters/latexflt.l	1.36
 filters/lex-filt.l	1.22
 filters/lex.key	1.4
 filters/lisp.key	1.2
-filters/lispfilt.l	1.8
+filters/lispfilt.l	1.9
 filters/m4-filt.c	1.22
 filters/m4.key	1.3
 filters/mail.key	1.3
 filters/mailfilt.l	1.14
 filters/make.key	1.8
-filters/makefile.2nd	1.7
+filters/makefile.2nd	1.8
 filters/makefile.djg	1.3
 filters/makefile.emx	1.4
 filters/makefile.icc	1.3
-filters/makefile.in	1.73
+filters/makefile.in	1.75
 filters/makefile.wnt	1.30
 filters/makefilt.l	1.49
+filters/makelist.sh	1.3
 filters/manfilt.c	1.35
-filters/mk-0th.awk	1.5
+filters/mk-0th.awk	1.7
 filters/mk-0th.bat	1.6
-filters/mk-1st.awk	1.7
+filters/mk-1st.awk	1.9
 filters/mk-1st.bat	1.6
-filters/mk-2nd.awk	1.8
+filters/mk-2nd.awk	1.10
 filters/mk-2nd.bat	1.6
 filters/mk-key.awk	1.2
 filters/mms-filt.l	1.9
@@ -240,7 +241,7 @@
 filters/pc.key	1.1
 filters/perl.key	1.8
 filters/perlfilt.l	1.39
-filters/pl-filt.c	1.70
+filters/pl-filt.c	1.71
 filters/pot-filt.l	1.2
 filters/pot.key	1.1
 filters/ps-filt.l	1.3
Index: vile-9.4.spec
Prereq:  1.2 
--- vile-9.4a+/vile-9.4.spec	2003-09-16 17:57:59.000000000 -0400
+++ vile-9.4b/vile-9.4.spec	2003-11-02 11:46:59.000000000 -0500
@@ -1,7 +1,7 @@
 Summary: VILE VI Like Emacs editor
-# $Header: /usr/build/vile/vile/RCS/vile-9.4.spec,v 1.2 2003/09/16 21:57:59 tom Exp $
+# $Header: /usr/build/vile/vile/RCS/vile-9.4.spec,v 1.3 2003/11/02 16:46:59 tom Exp $
 Name: vile
-Version: 9.4a
+Version: 9.4b
 # each patch should update the version
 Release: 1
 Copyright: GPL
@@ -9,6 +9,7 @@
 URL: ftp://invisible-island.net/vile
 Source0: vile-9.4.tgz
 Patch1: vile-9.4a.patch.gz
+Patch2: vile-9.4b.patch.gz
 # each patch should add itself to this list
 Packager: Thomas Dickey <dickey@invisible-island.net>
 BuildRoot: %{_tmppath}/%{name}-root
@@ -22,6 +23,7 @@
 %prep
 %setup -q -n vile-9.4
 %patch1 -p1
+%patch2 -p1
 # each patch should add itself to this list
 
 %build
@@ -69,6 +71,9 @@
 %changelog
 # each patch should add its ChangeLog entries here
 
+* Sun Nov 02 2003 Thomas Dickey
+- added patch for 9.4b
+
 * Tue Sep 16 2003 Thomas Dickey
 - added patch for 9.4a