Sophie

Sophie

distrib > * > 2008.0 > x86_64 > by-pkgid > c6d8198fd3a861c932152544cde921fd > files > 14

vile-9.5r-1mdv2008.0.src.rpm

# vile 9.5k - patch 2006/09/24 - Thomas Dickey <dickey@invisible-island.net>
# ------------------------------------------------------------------------------
# CHANGES                      |   18 
# MANIFEST                     |    4 
# README                       |    6 
# aclocal.m4                   |   25 
# config.guess                 |   11 
# config.sub                   |   16 
# configure                    | 3205 ++++++++++++++++++++---------------------
# configure.in                 |   29 
# file.c                       |   11 
# filters/genmake.mak          |    3 
# filters/nr-filt.l            |   14 
# filters/spellflt.l           |   16 
# macros/modes.rc              |   11 
# patchlev.h                   |    2 
# revlist                      |   36 
# tcap.h                       |   11 
# vile-9.5.spec                |    9 
# vile-9.5k/filters/mcrl.key   |   47 
# vile-9.5k/filters/mcrlfilt.l |   64 
# vile-9.5k/revlist.bak        |  408 +++++
# 20 files changed, 2300 insertions(+), 1646 deletions(-)
# ------------------------------------------------------------------------------
Index: CHANGES
--- vile-9.5j+/CHANGES	2006-06-25 19:47:37.000000000 +0000
+++ vile-9.5k/CHANGES	2006-09-25 00:11:30.000000000 +0000
@@ -1,5 +1,23 @@
 Changes for vile 9.6 (released ??? ??? ?? ????)
 
+ 200608?? (k)
+	> Paul van Tilburg
+	+ add syntax filter (mcrl) for mCRL/mCRL2 modeling language.
+	> Tom Dickey:
+	+ modify fileread() to ensure that the error-buffer is reset after
+	  reading (or re-reading) a shell/pipe command, e.g., using ":e!".
+	+ fix configure --disable-largefile option (from ncurses).
+	+ minor fixes for nroff filter to improve rendition of groff's macros. 
+	+ add configure check for ncurses 5.2(sic) on FreeBSD, which was broken by
+	  an incomplete set of changes to wchar.h (report by Chris Green).
+	+ add configure check for aspell, whose attempt at a compatibility script
+	  for ispell does not recognize ispell's options.
+	+ workaround for breakage in FreeBSD's header files: updates to wchar.h
+	  were not reflected in updates to curses.h (report by Chris Green).
+	+ remove reference to obsolete http://www.vile.cx from README (report
+	  by Paul Fox).
+	+ update config.guess, config.sub
+
  20060625 (j)
 	> Tom Dickey:
 	+ fix expression for shmode $mode-filename to match ".profile".
Index: MANIFEST
--- vile-9.5j+/MANIFEST	2006-06-25 21:37:22.000000000 +0000
+++ vile-9.5k/MANIFEST	2006-09-25 00:14:02.000000000 +0000
@@ -1,4 +1,4 @@
-MANIFEST for vile, version v9_5j
+MANIFEST for vile, version v9_5k
 --------------------------------------------------------------------------------
 MANIFEST                        this file
 CHANGES                         Change-log for VILE
@@ -249,6 +249,8 @@
 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/mcrl.key                filters for mCRL/mCRL2
+filters/mcrlfilt.l              filters for mCRL/mCRL2
 filters/midl.key                keywords for MIDL
 filters/midlfilt.l              syntax filter for MIDL
 filters/mk-0th.awk              construct builtflt.h
Index: README
Prereq:  1.95 
--- vile-9.5j+/README	2006-05-21 00:29:29.000000000 +0000
+++ vile-9.5k/README	2006-08-13 15:42:38.000000000 +0000
@@ -74,10 +74,6 @@
 non-subscribers aren't allowed to post) or use the bug system at
 that same URL.
 
-There is also a project place-holder page at:
-	http://www.vile.cx
-from which you can find most other sites mentioned in this README.
-
 ------------------------------------------------------
 
 extracts from the original README, from February, 1992:
@@ -1162,5 +1158,5 @@
     + modify vmsbuild.com and descrip.mms to work with IA64.
 
 -------------------------------
-$Header: /usr/build/vile/vile/RCS/README,v 1.95 2006/05/21 00:29:29 pgf Exp $
+$Header: /usr/build/vile/vile/RCS/README,v 1.96 2006/08/13 15:42:38 tom Exp $
 -------------------------------
Index: aclocal.m4
Prereq:  1.161 
--- vile-9.5j+/aclocal.m4	2006-06-25 19:46:13.000000000 +0000
+++ vile-9.5k/aclocal.m4	2006-09-24 23:30:12.000000000 +0000
@@ -1,6 +1,6 @@
 dnl vile's local definitions for autoconf.
 dnl
-dnl $Header: /usr/build/vile/vile/RCS/aclocal.m4,v 1.161 2006/06/25 19:46:13 tom Exp $
+dnl $Header: /usr/build/vile/vile/RCS/aclocal.m4,v 1.163 2006/09/24 23:30:12 tom Exp $
 dnl
 dnl ---------------------------------------------------------------------------
 dnl ---------------------------------------------------------------------------
@@ -1545,13 +1545,14 @@
 test $cf_cv_need_killpg = yes && AC_DEFINE(HAVE_KILLPG)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_LARGEFILE version: 5 updated: 2005/07/17 11:03:36
+dnl CF_LARGEFILE version: 6 updated: 2006/09/23 19:07:52
 dnl ------------
 dnl Add checks for large file support.
 AC_DEFUN([CF_LARGEFILE],[
 ifdef([AC_FUNC_FSEEKO],[
+    AC_SYS_LARGEFILE
+    if test "$enable_largefile" != no ; then
 	AC_FUNC_FSEEKO
-	AC_SYS_LARGEFILE
 
 	# Normally we would collect these definitions in the config.h,
 	# but (like _XOPEN_SOURCE), some environments rely on having these
@@ -1578,6 +1579,7 @@
 		[cf_cv_struct_dirent64=no])
 	])
 	test "$cf_cv_struct_dirent64" = yes && AC_DEFINE(HAVE_STRUCT_DIRENT64)
+    fi
 ])
 ])
 dnl ---------------------------------------------------------------------------
@@ -1696,7 +1698,7 @@
 test $cf_cv_locale = yes && { ifelse($1,,AC_DEFINE(LOCALE),[$1]) }
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_MAKEFLAGS version: 9 updated: 2001/12/30 18:17:27
+dnl CF_MAKEFLAGS version: 10 updated: 2006/08/05 09:56:13
 dnl ------------
 dnl Some 'make' programs support $(MAKEFLAGS), some $(MFLAGS), to pass 'make'
 dnl options to lower-levels.  It's very useful for "make -n" -- if we have it.
@@ -1725,7 +1727,8 @@
 			esac
 			break
 			;;
-		*)	echo no match "$cf_result"
+		.-)	;;
+		*)	echo "given option \"$cf_option\", no match \"$cf_result\""
 			;;
 		esac
 	done
@@ -2147,13 +2150,19 @@
 	AC_SUBST(PATHSEP)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_PATH_SYNTAX version: 10 updated: 2006/01/02 19:36:00
+dnl CF_PATH_SYNTAX version: 11 updated: 2006/09/02 08:55:46
 dnl --------------
 dnl Check the argument to see that it looks like a pathname.  Rewrite it if it
 dnl begins with one of the prefix/exec_prefix variables, and then again if the
 dnl result begins with 'NONE'.  This is necessary to work around autoconf's
 dnl delayed evaluation of those symbols.
 AC_DEFUN([CF_PATH_SYNTAX],[
+if test "x$prefix" != xNONE; then
+  cf_path_syntax="$prefix"
+else
+  cf_path_syntax="$ac_default_prefix"
+fi
+
 case ".[$]$1" in #(vi
 .\[$]\(*\)*|.\'*\'*) #(vi
   ;;
@@ -2165,12 +2174,12 @@
   eval $1="[$]$1"
   case ".[$]$1" in #(vi
   .NONE/*)
-    $1=`echo [$]$1 | sed -e s%NONE%$ac_default_prefix%`
+    $1=`echo [$]$1 | sed -e s%NONE%$cf_path_syntax%`
     ;;
   esac
   ;; #(vi
 .no|.NONE/*)
-  $1=`echo [$]$1 | sed -e s%NONE%$ac_default_prefix%`
+  $1=`echo [$]$1 | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
   ifelse($2,,[AC_ERROR([expected a pathname, not \"[$]$1\"])],$2)
Index: config.guess
--- vile-9.5j+/config.guess	2006-05-13 14:58:39.000000000 +0000
+++ vile-9.5k/config.guess	2006-07-22 15:57:37.000000000 +0000
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 #   Inc.
 
-timestamp='2006-04-26'
+timestamp='2006-07-02'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -211,7 +211,7 @@
 	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
 	exit ;;
     macppc:MirBSD:*:*)
-	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
 	exit ;;
     *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
@@ -790,10 +790,10 @@
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    x86:Interix*:[345]*)
+    x86:Interix*:[3456]*)
 	echo i586-pc-interix${UNAME_RELEASE}
 	exit ;;
-    EM64T:Interix*:[345]*)
+    EM64T:Interix*:[3456]*)
 	echo x86_64-unknown-interix${UNAME_RELEASE}
 	exit ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
@@ -831,6 +831,9 @@
     arm*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
+    avr32*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     cris:Linux:*:*)
 	echo cris-axis-linux-gnu
 	exit ;;
Index: config.sub
--- vile-9.5j+/config.sub	2006-05-13 14:58:49.000000000 +0000
+++ vile-9.5k/config.sub	2006-08-14 16:00:00.000000000 +0000
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 #   Inc.
 
-timestamp='2006-05-13'
+timestamp='2006-08-14'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -241,7 +241,7 @@
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
@@ -284,7 +284,7 @@
 	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
-	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
@@ -317,7 +317,7 @@
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* \
+	| avr-* | avr32-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
 	| clipper-* | craynv-* | cydra-* \
@@ -367,7 +367,7 @@
 	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
 	| xstormy16-* | xtensa-* \
 	| ymp-* \
 	| z8k-*)
@@ -909,6 +909,10 @@
 	sb1el)
 		basic_machine=mipsisa64sb1el-unknown
 		;;
+	sde)
+		basic_machine=mipsisa32-sde
+		os=-elf
+		;;
 	sei)
 		basic_machine=mips-sei
 		os=-seiux
@@ -1214,7 +1218,7 @@
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos*)
+	      | -skyos* | -haiku* | -rdos* | -toppers*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
Index: configure
--- vile-9.5j+/configure	2006-06-25 19:50:51.000000000 +0000
+++ vile-9.5k/configure	2006-09-24 23:30:22.000000000 +0000
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.222 .
+# From configure.in Revision: 1.224 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20030208.
 #
@@ -689,7 +689,7 @@
 			  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.
+  --with-loadable-filters=XX specify filters to dynamically 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'.
@@ -3411,14 +3411,15 @@
 			esac
 			break
 			;;
-		*)	echo no match "$cf_result"
+		.-)	;;
+		*)	echo "given option \"$cf_option\", no match \"$cf_result\""
 			;;
 		esac
 	done
 	rm -f cf_makeflags.tmp
 
 fi
-echo "$as_me:3421: result: $cf_cv_makeflags" >&5
+echo "$as_me:3422: result: $cf_cv_makeflags" >&5
 echo "${ECHO_T}$cf_cv_makeflags" >&6
 
 # Find a good install program.  We prefer a C program (faster),
@@ -3433,7 +3434,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:3436: checking for a BSD compatible install" >&5
+echo "$as_me:3437: 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
@@ -3482,7 +3483,7 @@
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:3485: result: $INSTALL" >&5
+echo "$as_me:3486: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -3493,7 +3494,7 @@
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-echo "$as_me:3496: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:3497: 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
@@ -3513,11 +3514,11 @@
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:3516: result: yes" >&5
+  echo "$as_me:3517: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:3520: result: no" >&5
+  echo "$as_me:3521: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
@@ -3526,7 +3527,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:3529: checking for $ac_word" >&5
+echo "$as_me:3530: 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
@@ -3541,7 +3542,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AWK="$ac_prog"
-echo "$as_me:3544: found $ac_dir/$ac_word" >&5
+echo "$as_me:3545: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3549,10 +3550,10 @@
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$as_me:3552: result: $AWK" >&5
+  echo "$as_me:3553: result: $AWK" >&5
 echo "${ECHO_T}$AWK" >&6
 else
-  echo "$as_me:3555: result: no" >&5
+  echo "$as_me:3556: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3562,7 +3563,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:3565: checking for $ac_word" >&5
+echo "$as_me:3566: 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
@@ -3577,7 +3578,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:3580: found $ac_dir/$ac_word" >&5
+echo "$as_me:3581: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3585,10 +3586,10 @@
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:3588: result: $RANLIB" >&5
+  echo "$as_me:3589: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:3591: result: no" >&5
+  echo "$as_me:3592: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3597,7 +3598,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:3600: checking for $ac_word" >&5
+echo "$as_me:3601: 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
@@ -3612,7 +3613,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:3615: found $ac_dir/$ac_word" >&5
+echo "$as_me:3616: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3621,10 +3622,10 @@
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:3624: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:3625: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:3627: result: no" >&5
+  echo "$as_me:3628: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3637,7 +3638,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-echo "$as_me:3640: checking for archiver (symbol AR)" >&5
+echo "$as_me:3641: checking for archiver (symbol AR)" >&5
 echo $ECHO_N "checking for archiver (symbol AR)... $ECHO_C" >&6
 
 if test -z "$AR" ; then
@@ -3646,7 +3647,7 @@
 fi
 
 cf_cv_subst_AR=$AR
-echo "$as_me:3649: result: $AR" >&5
+echo "$as_me:3650: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 
 fi
@@ -3655,7 +3656,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-echo "$as_me:3658: checking for archiver options (symbol AR_OPTS)" >&5
+echo "$as_me:3659: checking for archiver options (symbol AR_OPTS)" >&5
 echo $ECHO_N "checking for archiver options (symbol AR_OPTS)... $ECHO_C" >&6
 
 if test -z "$AR_OPTS" ; then
@@ -3664,12 +3665,12 @@
 fi
 
 cf_cv_subst_AR_OPTS=$AR_OPTS
-echo "$as_me:3667: result: $AR_OPTS" >&5
+echo "$as_me:3668: result: $AR_OPTS" >&5
 echo "${ECHO_T}$AR_OPTS" >&6
 
 fi
 
-echo "$as_me:3672: checking if you want to see long compiling messages" >&5
+echo "$as_me:3673: 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.
@@ -3703,7 +3704,7 @@
     ECHO_CC=''
 
 fi;
-echo "$as_me:3706: result: $enableval" >&5
+echo "$as_me:3707: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 	case $cf_cv_system_name in
@@ -3722,7 +3723,7 @@
 BUILTLIBS=
 BUILTSRCS=
 
-echo "$as_me:3725: checking if you wish to build only core functions" >&5
+echo "$as_me:3726: 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.
@@ -3739,7 +3740,7 @@
   DISABLE_EXTS=no
 
 fi;
-echo "$as_me:3742: result: $DISABLE_EXTS" >&5
+echo "$as_me:3743: result: $DISABLE_EXTS" >&5
 echo "${ECHO_T}$DISABLE_EXTS" >&6
 if test "$DISABLE_EXTS" = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -3756,7 +3757,7 @@
 	cf_extensions=yes
 fi
 
-echo "$as_me:3759: checking if you wish to disable shell/external commands" >&5
+echo "$as_me:3760: 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.
@@ -3773,7 +3774,7 @@
   DISABLE_SHELL=no
 
 fi;
-echo "$as_me:3776: result: $DISABLE_SHELL" >&5
+echo "$as_me:3777: result: $DISABLE_SHELL" >&5
 echo "${ECHO_T}$DISABLE_SHELL" >&6
 if test "$DISABLE_SHELL" = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -3785,7 +3786,7 @@
 fi
 
 ###	use option --with-cflags to set default CFLAGS
-echo "$as_me:3788: checking for CFLAGS options" >&5
+echo "$as_me:3789: checking for CFLAGS options" >&5
 echo $ECHO_N "checking for CFLAGS options... $ECHO_C" >&6
 
 # Check whether --with-CFLAGS or --without-CFLAGS was given.
@@ -3809,10 +3810,10 @@
 elif test -z "$CFLAGS" ; then
 	CFLAGS="-O"
 fi
-echo "$as_me:3812: result: $cflags" >&5
+echo "$as_me:3813: result: $cflags" >&5
 echo "${ECHO_T}$cflags" >&6
 
-echo "$as_me:3815: checking if you want to compile-in plugin support" >&5
+echo "$as_me:3816: checking if you want to compile-in plugin support" >&5
 echo $ECHO_N "checking if you want to compile-in plugin support... $ECHO_C" >&6
 
 # Check whether --enable-plugins or --disable-plugins was given.
@@ -3829,10 +3830,10 @@
   with_plugins=no
 
 fi;
-echo "$as_me:3832: result: $with_plugins" >&5
+echo "$as_me:3833: result: $with_plugins" >&5
 echo "${ECHO_T}$with_plugins" >&6
 
-echo "$as_me:3835: checking if you want to build syntax filters" >&5
+echo "$as_me:3836: 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.
@@ -3849,7 +3850,7 @@
   with_filters=yes
 
 fi;
-echo "$as_me:3852: result: $with_filters" >&5
+echo "$as_me:3853: result: $with_filters" >&5
 echo "${ECHO_T}$with_filters" >&6
 
 MAKE_FILTERS=
@@ -3861,7 +3862,7 @@
 : ${VILE_LOADABLE_FILTERS=none}
 : ${VILE_EXTERNAL_FILTERS=all}
 
-echo "$as_me:3864: checking if you want built-in syntax filters" >&5
+echo "$as_me:3865: 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.
@@ -3872,10 +3873,10 @@
   VILE_BUILT_IN_FILTERS=none
 fi;
 test "$VILE_BUILT_IN_FILTERS" = no && VILE_BUILT_IN_FILTERS=none
-echo "$as_me:3875: result: $VILE_BUILT_IN_FILTERS" >&5
+echo "$as_me:3876: result: $VILE_BUILT_IN_FILTERS" >&5
 echo "${ECHO_T}$VILE_BUILT_IN_FILTERS" >&6
 
-echo "$as_me:3878: checking if you want loadable syntax filters" >&5
+echo "$as_me:3879: 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.
@@ -3886,7 +3887,7 @@
   VILE_LOADABLE_FILTERS=none
 fi;
 test "$VILE_LOADABLE_FILTERS" = no && VILE_LOADABLE_FILTERS=none
-echo "$as_me:3889: result: $VILE_LOADABLE_FILTERS" >&5
+echo "$as_me:3890: result: $VILE_LOADABLE_FILTERS" >&5
 echo "${ECHO_T}$VILE_LOADABLE_FILTERS" >&6
 
 # If both "--with-builtin-filters" and "--with-loadable-filters" were given,
@@ -3904,7 +3905,7 @@
 		do
 			if test "$cf_b" = "$cf_l"
 			then
-				{ { echo "$as_me:3907: error: Cannot overlap built-in and loadable filter lists" >&5
+				{ { echo "$as_me:3908: 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
@@ -3947,7 +3948,7 @@
 	test -z "$VILE_EXTERNAL_FILTERS" && VILE_EXTERNAL_FILTERS=none
 fi
 
-echo "$as_me:3950: checking if any filters require flex" >&5
+echo "$as_me:3951: 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"`
@@ -3960,48 +3961,48 @@
 else
 	cf_needflex=no
 fi
-echo "$as_me:3963: result: $cf_needflex" >&5
+echo "$as_me:3964: result: $cf_needflex" >&5
 echo "${ECHO_T}$cf_needflex" >&6
 
 if test "$cf_needflex" = yes ; then
 
 test -z "$LEX" && LEX=lex
-echo "$as_me:3969: checking if $LEX is really flex" >&5
+echo "$as_me:3970: 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:3973: result: yes" >&5
+	echo "$as_me:3974: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-	echo "$as_me:3975: checking version of $LEX" >&5
+	echo "$as_me:3976: 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:3978: result: $LEX_VERSION" >&5
+	echo "$as_me:3979: result: $LEX_VERSION" >&5
 echo "${ECHO_T}$LEX_VERSION" >&6
 else
-	echo "$as_me:3981: result: no" >&5
+	echo "$as_me:3982: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 	if test -z "$LEX_VERSION"
 	then
-		{ { echo "$as_me:3987: error: You need flex to compile builtin filters" >&5
+		{ { echo "$as_me:3988: 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:3992: error: Sorry - your version of flex is too old: $LEX_VERSION" >&5
+		{ { echo "$as_me:3993: 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:3997: error: Sorry - your version of flex is too unstable: $LEX_VERSION" >&5
+		{ { echo "$as_me:3998: 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:4004: error: This version of flex cannot compile builtin filters" >&5
+			{ { echo "$as_me:4005: 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
@@ -4010,7 +4011,7 @@
 
 		elif ( expr $LEX_SUBVERSION \> 4 >/dev/null )
 		then
-			{ { echo "$as_me:4013: error: This version of flex cannot compile builtin filters" >&5
+			{ { echo "$as_me:4014: 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
@@ -4025,7 +4026,7 @@
 	MAKE_FILTERS="#"
 fi
 
-echo "$as_me:4028: checking for library path" >&5
+echo "$as_me:4029: 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.
@@ -4040,6 +4041,12 @@
 for cf_src_path in $withval
 do
 
+if test "x$prefix" != xNONE; then
+  cf_path_syntax="$prefix"
+else
+  cf_path_syntax="$ac_default_prefix"
+fi
+
 case ".$cf_src_path" in #(vi
 .\$\(*\)*|.\'*\'*) #(vi
   ;;
@@ -4051,15 +4058,15 @@
   eval cf_src_path="$cf_src_path"
   case ".$cf_src_path" in #(vi
   .NONE/*)
-    cf_src_path=`echo $cf_src_path | sed -e s%NONE%$ac_default_prefix%`
+    cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
     ;;
   esac
   ;; #(vi
 .no|.NONE/*)
-  cf_src_path=`echo $cf_src_path | sed -e s%NONE%$ac_default_prefix%`
+  cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:4062: error: expected a pathname, not \"$cf_src_path\"" >&5
+  { { echo "$as_me:4069: 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; }; }
   ;;
@@ -4081,10 +4088,10 @@
 
 eval 'VILE_LIBDIR_PATH="$cf_dst_path"'
 
-echo "$as_me:4084: result: $VILE_LIBDIR_PATH" >&5
+echo "$as_me:4091: result: $VILE_LIBDIR_PATH" >&5
 echo "${ECHO_T}$VILE_LIBDIR_PATH" >&6
 
-echo "$as_me:4087: checking for startup path" >&5
+echo "$as_me:4094: 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.
@@ -4099,6 +4106,12 @@
 for cf_src_path in $withval
 do
 
+if test "x$prefix" != xNONE; then
+  cf_path_syntax="$prefix"
+else
+  cf_path_syntax="$ac_default_prefix"
+fi
+
 case ".$cf_src_path" in #(vi
 .\$\(*\)*|.\'*\'*) #(vi
   ;;
@@ -4110,15 +4123,15 @@
   eval cf_src_path="$cf_src_path"
   case ".$cf_src_path" in #(vi
   .NONE/*)
-    cf_src_path=`echo $cf_src_path | sed -e s%NONE%$ac_default_prefix%`
+    cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
     ;;
   esac
   ;; #(vi
 .no|.NONE/*)
-  cf_src_path=`echo $cf_src_path | sed -e s%NONE%$ac_default_prefix%`
+  cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:4121: error: expected a pathname, not \"$cf_src_path\"" >&5
+  { { echo "$as_me:4134: 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; }; }
   ;;
@@ -4140,10 +4153,10 @@
 
 eval 'VILE_STARTUP_PATH="$cf_dst_path"'
 
-echo "$as_me:4143: result: $VILE_STARTUP_PATH" >&5
+echo "$as_me:4156: result: $VILE_STARTUP_PATH" >&5
 echo "${ECHO_T}$VILE_STARTUP_PATH" >&6
 
-echo "$as_me:4146: checking if $LEX supports character classes" >&5
+echo "$as_me:4159: checking if $LEX supports character classes" >&5
 echo $ECHO_N "checking if $LEX supports character classes... $ECHO_C" >&6
 cat >conftest.l <<CF_EOF
 IDENT	[[:alpha:]][[:alnum:]]+
@@ -4153,24 +4166,24 @@
 {DATE}	{ ECHO; }
 CF_EOF
 cf_lex_char_classes="$LEX conftest.l 1>&5"
-if { (eval echo "$as_me:4156: \"$cf_lex_char_classes\"") >&5
+if { (eval echo "$as_me:4169: \"$cf_lex_char_classes\"") >&5
   (eval $cf_lex_char_classes) 2>&5
   ac_status=$?
-  echo "$as_me:4159: \$? = $ac_status" >&5
+  echo "$as_me:4172: \$? = $ac_status" >&5
   (exit $ac_status); }; then
 	LEX_CHAR_CLASSES=yes
 else
 	LEX_CHAR_CLASSES=no
 fi
-echo "$as_me:4165: result: $LEX_CHAR_CLASSES" >&5
+echo "$as_me:4178: result: $LEX_CHAR_CLASSES" >&5
 echo "${ECHO_T}$LEX_CHAR_CLASSES" >&6
 rm -f conftest.* $LEX_OUTPUT_ROOT.c
 if test "$LEX_CHAR_CLASSES" != yes ; then
-	{ echo "$as_me:4169: WARNING: Your $LEX program does not support character classes.  Get flex." >&5
+	{ echo "$as_me:4182: WARNING: Your $LEX program does not support character classes.  Get flex." >&5
 echo "$as_me: WARNING: Your $LEX program does not support character classes.  Get flex." >&2;}
 fi
 
-echo "$as_me:4173: checking if $LEX supports states" >&5
+echo "$as_me:4186: 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
@@ -4180,21 +4193,21 @@
 nothing	ECHO;
 CF_EOF
 cf_lex_states="$LEX conftest.l 1>&5"
-if { (eval echo "$as_me:4183: \"$cf_lex_states\"") >&5
+if { (eval echo "$as_me:4196: \"$cf_lex_states\"") >&5
   (eval $cf_lex_states) 2>&5
   ac_status=$?
-  echo "$as_me:4186: \$? = $ac_status" >&5
+  echo "$as_me:4199: \$? = $ac_status" >&5
   (exit $ac_status); }; then
 cf_lex_states=yes
 else
 cf_lex_states=no
 fi
-echo "$as_me:4192: result: $cf_lex_states" >&5
+echo "$as_me:4205: 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:4197: WARNING: Your $LEX program does not support states.  Get flex." >&5
+	{ echo "$as_me:4210: 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
@@ -4205,7 +4218,7 @@
 	LEX_CHAR_CLASSES='sh $(srcdir)/noclass.sh '
 fi
 
-echo "$as_me:4208: checking if you want to use perl as an extension language" >&5
+echo "$as_me:4221: 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.
@@ -4215,16 +4228,16 @@
 else
   with_perl=no
 fi;
-echo "$as_me:4218: result: $with_perl" >&5
+echo "$as_me:4231: result: $with_perl" >&5
 echo "${ECHO_T}$with_perl" >&6
 if test "$with_perl" = yes ; then
 	# find perl binary
-echo "$as_me:4222: checking for perl-5.004" >&5
+echo "$as_me:4235: 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:4227: ...version 5.004 required" >&5
+  echo "configure:4240: ...version 5.004 required" >&5
   # allow user to override
   if test -n "$PERL"; then
     cf_try="$PERL"
@@ -4234,7 +4247,7 @@
 
   cf_version=`echo '[]'|sed -e 's/^./$/'`
   for cf_prog in $cf_try; do
-    echo "configure:4237: trying $cf_prog" >&5
+    echo "configure:4250: 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
@@ -4243,15 +4256,15 @@
 fi
 PERL="$cf_cv_prog_PERL"
 if test -n "$PERL"; then
-  echo "$as_me:4246: result: $PERL" >&5
+  echo "$as_me:4259: result: $PERL" >&5
 echo "${ECHO_T}$PERL" >&6
 else
-  echo "$as_me:4249: result: no" >&5
+  echo "$as_me:4262: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 	if test "$PERL" = no; then
-	    { { echo "$as_me:4254: error: perl not found" >&5
+	    { { echo "$as_me:4267: error: perl not found" >&5
 echo "$as_me: error: perl not found" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -4343,7 +4356,7 @@
 
 if test "$cf_check_cflags" != "$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 4346 "configure"
+#line 4359 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -4355,16 +4368,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4358: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4371: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4361: \$? = $ac_status" >&5
+  echo "$as_me:4374: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4364: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4377: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4367: \$? = $ac_status" >&5
+  echo "$as_me:4380: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -4389,13 +4402,13 @@
 # X11 checks will sometimes add to CFLAGS.  We want the state of CFLAGS
 # prior to these checks
 
-echo "$as_me:4392: checking for getpwnam" >&5
+echo "$as_me:4405: 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 4398 "configure"
+#line 4411 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char getpwnam (); below.  */
@@ -4426,16 +4439,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4429: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4442: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4432: \$? = $ac_status" >&5
+  echo "$as_me:4445: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4435: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4448: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4438: \$? = $ac_status" >&5
+  echo "$as_me:4451: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_getpwnam=yes
 else
@@ -4445,13 +4458,13 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4448: result: $ac_cv_func_getpwnam" >&5
+echo "$as_me:4461: 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:4454: checking for getpwnam in -lsun" >&5
+echo "$as_me:4467: 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
@@ -4459,7 +4472,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsun  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 4462 "configure"
+#line 4475 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4478,16 +4491,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4481: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4494: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4484: \$? = $ac_status" >&5
+  echo "$as_me:4497: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4487: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4500: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4490: \$? = $ac_status" >&5
+  echo "$as_me:4503: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_sun_getpwnam=yes
 else
@@ -4498,7 +4511,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4501: result: $ac_cv_lib_sun_getpwnam" >&5
+echo "$as_me:4514: 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
@@ -4516,7 +4529,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:4519: checking for $ac_word" >&5
+echo "$as_me:4532: 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
@@ -4531,7 +4544,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LINT="$ac_prog"
-echo "$as_me:4534: found $ac_dir/$ac_word" >&5
+echo "$as_me:4547: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4539,10 +4552,10 @@
 fi
 LINT=$ac_cv_prog_LINT
 if test -n "$LINT"; then
-  echo "$as_me:4542: result: $LINT" >&5
+  echo "$as_me:4555: result: $LINT" >&5
 echo "${ECHO_T}$LINT" >&6
 else
-  echo "$as_me:4545: result: no" >&5
+  echo "$as_me:4558: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4558,13 +4571,13 @@
 fi
 
 ###	checks for header files
-echo "$as_me:4561: checking for ANSI C header files" >&5
+echo "$as_me:4574: 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 4567 "configure"
+#line 4580 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -4572,13 +4585,13 @@
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:4575: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4588: \"$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:4581: \$? = $ac_status" >&5
+  echo "$as_me:4594: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4600,7 +4613,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 4603 "configure"
+#line 4616 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -4618,7 +4631,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 4621 "configure"
+#line 4634 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -4639,7 +4652,7 @@
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4642 "configure"
+#line 4655 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -4665,15 +4678,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:4668: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4681: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4671: \$? = $ac_status" >&5
+  echo "$as_me:4684: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:4673: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4686: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4676: \$? = $ac_status" >&5
+  echo "$as_me:4689: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -4686,7 +4699,7 @@
 fi
 fi
 fi
-echo "$as_me:4689: result: $ac_cv_header_stdc" >&5
+echo "$as_me:4702: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -4699,13 +4712,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:4702: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:4715: 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 4708 "configure"
+#line 4721 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -4720,16 +4733,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4723: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4736: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4726: \$? = $ac_status" >&5
+  echo "$as_me:4739: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4729: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4742: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4732: \$? = $ac_status" >&5
+  echo "$as_me:4745: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -4739,7 +4752,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4742: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:4755: 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
@@ -4752,7 +4765,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:4755: checking for opendir in -ldir" >&5
+  echo "$as_me:4768: 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
@@ -4760,7 +4773,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 4763 "configure"
+#line 4776 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4779,16 +4792,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4782: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4795: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4785: \$? = $ac_status" >&5
+  echo "$as_me:4798: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4788: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4801: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4791: \$? = $ac_status" >&5
+  echo "$as_me:4804: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -4799,14 +4812,14 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4802: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:4815: 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:4809: checking for opendir in -lx" >&5
+  echo "$as_me:4822: 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
@@ -4814,7 +4827,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 4817 "configure"
+#line 4830 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4833,16 +4846,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4836: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4849: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4839: \$? = $ac_status" >&5
+  echo "$as_me:4852: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4842: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4855: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4845: \$? = $ac_status" >&5
+  echo "$as_me:4858: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -4853,7 +4866,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4856: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:4869: 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"
@@ -4861,13 +4874,13 @@
 
 fi
 
-  echo "$as_me:4864: checking for nl_langinfo and CODESET" >&5
+  echo "$as_me:4877: checking for nl_langinfo and CODESET" >&5
 echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
 if test "${am_cv_langinfo_codeset+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4870 "configure"
+#line 4883 "configure"
 #include "confdefs.h"
 #include <langinfo.h>
 int
@@ -4879,16 +4892,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4882: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4895: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4885: \$? = $ac_status" >&5
+  echo "$as_me:4898: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4888: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4901: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4891: \$? = $ac_status" >&5
+  echo "$as_me:4904: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_langinfo_codeset=yes
 else
@@ -4899,7 +4912,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:4902: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:4915: result: $am_cv_langinfo_codeset" >&5
 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
   if test $am_cv_langinfo_codeset = yes; then
 
@@ -4941,23 +4954,23 @@
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:4944: checking for $ac_header" >&5
+echo "$as_me:4957: 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 4950 "configure"
+#line 4963 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:4954: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4967: \"$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:4960: \$? = $ac_status" >&5
+  echo "$as_me:4973: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4976,7 +4989,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:4979: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:4992: 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
@@ -4987,13 +5000,13 @@
 done
 
 ###	checks for typedefs
-echo "$as_me:4990: checking return type of signal handlers" >&5
+echo "$as_me:5003: 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 4996 "configure"
+#line 5009 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -5015,16 +5028,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5018: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5031: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5021: \$? = $ac_status" >&5
+  echo "$as_me:5034: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5024: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5037: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5027: \$? = $ac_status" >&5
+  echo "$as_me:5040: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_signal=void
 else
@@ -5034,7 +5047,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5037: result: $ac_cv_type_signal" >&5
+echo "$as_me:5050: result: $ac_cv_type_signal" >&5
 echo "${ECHO_T}$ac_cv_type_signal" >&6
 
 cat >>confdefs.h <<EOF
@@ -5063,28 +5076,28 @@
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:5066: checking for $ac_header" >&5
+echo "$as_me:5079: 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 5072 "configure"
+#line 5085 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5078: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5091: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5081: \$? = $ac_status" >&5
+  echo "$as_me:5094: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5084: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5097: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5087: \$? = $ac_status" >&5
+  echo "$as_me:5100: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -5094,7 +5107,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5097: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:5110: 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
@@ -5104,13 +5117,13 @@
 fi
 done
 
-echo "$as_me:5107: checking for size_t" >&5
+echo "$as_me:5120: 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 5113 "configure"
+#line 5126 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -5125,16 +5138,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5128: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5141: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5131: \$? = $ac_status" >&5
+  echo "$as_me:5144: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5134: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5147: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5137: \$? = $ac_status" >&5
+  echo "$as_me:5150: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_size_t=yes
 else
@@ -5144,7 +5157,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5147: result: $ac_cv_type_size_t" >&5
+echo "$as_me:5160: 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
   :
@@ -5156,13 +5169,13 @@
 
 fi
 
-echo "$as_me:5159: checking for uid_t in sys/types.h" >&5
+echo "$as_me:5172: 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 5165 "configure"
+#line 5178 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -5176,7 +5189,7 @@
 rm -f conftest*
 
 fi
-echo "$as_me:5179: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:5192: 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
 
@@ -5190,13 +5203,13 @@
 
 fi
 
-echo "$as_me:5193: checking for pid_t" >&5
+echo "$as_me:5206: 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 5199 "configure"
+#line 5212 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -5211,16 +5224,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5214: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5227: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5217: \$? = $ac_status" >&5
+  echo "$as_me:5230: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5220: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5233: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5223: \$? = $ac_status" >&5
+  echo "$as_me:5236: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -5230,7 +5243,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5233: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:5246: 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
   :
@@ -5242,13 +5255,13 @@
 
 fi
 
-echo "$as_me:5245: checking for time_t" >&5
+echo "$as_me:5258: 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 5251 "configure"
+#line 5264 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -5263,16 +5276,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5266: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5279: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5269: \$? = $ac_status" >&5
+  echo "$as_me:5282: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5272: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5285: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5275: \$? = $ac_status" >&5
+  echo "$as_me:5288: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_time_t=yes
 else
@@ -5282,7 +5295,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5285: result: $ac_cv_type_time_t" >&5
+echo "$as_me:5298: 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
   :
@@ -5296,18 +5309,18 @@
 
 ###	checks for library functions
 if test "$cross_compiling" = no; then
-	echo "$as_me:5299: checking whether setvbuf arguments are reversed" >&5
+	echo "$as_me:5312: 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:5305: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:5318: 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 5310 "configure"
+#line 5323 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 /* If setvbuf has the reversed format, exit 0. */
@@ -5324,15 +5337,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:5327: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5340: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5330: \$? = $ac_status" >&5
+  echo "$as_me:5343: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:5332: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5345: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5335: \$? = $ac_status" >&5
+  echo "$as_me:5348: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_setvbuf_reversed=yes
 else
@@ -5345,7 +5358,7 @@
 fi
 rm -f core core.* *.core
 fi
-echo "$as_me:5348: result: $ac_cv_func_setvbuf_reversed" >&5
+echo "$as_me:5361: 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
 
@@ -5358,13 +5371,13 @@
 fi
 
 ###	checks for structures
-echo "$as_me:5361: checking whether stat file-mode macros are broken" >&5
+echo "$as_me:5374: 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 5367 "configure"
+#line 5380 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -5403,7 +5416,7 @@
 rm -f conftest*
 
 fi
-echo "$as_me:5406: result: $ac_cv_header_stat_broken" >&5
+echo "$as_me:5419: 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
 
@@ -5413,13 +5426,13 @@
 
 fi
 
-echo "$as_me:5416: checking for struct stat.st_blksize" >&5
+echo "$as_me:5429: 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 5422 "configure"
+#line 5435 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -5433,16 +5446,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5436: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5449: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5439: \$? = $ac_status" >&5
+  echo "$as_me:5452: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5442: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5455: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5445: \$? = $ac_status" >&5
+  echo "$as_me:5458: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_member_struct_stat_st_blksize=yes
 else
@@ -5452,7 +5465,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5455: result: $ac_cv_member_struct_stat_st_blksize" >&5
+echo "$as_me:5468: 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
 
@@ -5466,13 +5479,13 @@
 
 fi
 
-echo "$as_me:5469: checking for struct stat.st_blocks" >&5
+echo "$as_me:5482: 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 5475 "configure"
+#line 5488 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -5486,16 +5499,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5489: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5502: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5492: \$? = $ac_status" >&5
+  echo "$as_me:5505: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5495: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5508: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5498: \$? = $ac_status" >&5
+  echo "$as_me:5511: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_member_struct_stat_st_blocks=yes
 else
@@ -5505,7 +5518,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5508: result: $ac_cv_member_struct_stat_st_blocks" >&5
+echo "$as_me:5521: 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
 
@@ -5521,13 +5534,13 @@
   LIBOBJS="$LIBOBJS fileblocks.$ac_objext"
 fi
 
-echo "$as_me:5524: checking for struct stat.st_rdev" >&5
+echo "$as_me:5537: 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 5530 "configure"
+#line 5543 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -5541,16 +5554,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5544: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5557: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5547: \$? = $ac_status" >&5
+  echo "$as_me:5560: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5550: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5563: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5553: \$? = $ac_status" >&5
+  echo "$as_me:5566: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_member_struct_stat_st_rdev=yes
 else
@@ -5560,7 +5573,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5563: result: $ac_cv_member_struct_stat_st_rdev" >&5
+echo "$as_me:5576: 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
 
@@ -5574,13 +5587,13 @@
 
 fi
 
-echo "$as_me:5577: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "$as_me:5590: 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 5583 "configure"
+#line 5596 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <time.h>
@@ -5594,16 +5607,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5597: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5610: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5600: \$? = $ac_status" >&5
+  echo "$as_me:5613: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5603: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5616: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5606: \$? = $ac_status" >&5
+  echo "$as_me:5619: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_struct_tm=time.h
 else
@@ -5613,7 +5626,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5616: result: $ac_cv_struct_tm" >&5
+echo "$as_me:5629: result: $ac_cv_struct_tm" >&5
 echo "${ECHO_T}$ac_cv_struct_tm" >&6
 if test $ac_cv_struct_tm = sys/time.h; then
 
@@ -5623,13 +5636,13 @@
 
 fi
 
-echo "$as_me:5626: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:5639: 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 5632 "configure"
+#line 5645 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -5645,16 +5658,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5648: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5661: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5651: \$? = $ac_status" >&5
+  echo "$as_me:5664: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5654: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5667: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5657: \$? = $ac_status" >&5
+  echo "$as_me:5670: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_header_time=yes
 else
@@ -5664,7 +5677,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5667: result: $ac_cv_header_time" >&5
+echo "$as_me:5680: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -5674,14 +5687,14 @@
 
 fi
 
-echo "$as_me:5677: checking if we can include select.h with time.h" >&5
+echo "$as_me:5690: 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 5684 "configure"
+#line 5697 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -5711,16 +5724,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5714: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5727: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5717: \$? = $ac_status" >&5
+  echo "$as_me:5730: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5720: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5733: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5723: \$? = $ac_status" >&5
+  echo "$as_me:5736: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_select_with_time=yes
 else
@@ -5731,20 +5744,20 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:5734: result: $cf_cv_select_with_time" >&5
+echo "$as_me:5747: 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:5740: checking if we may include sys/resource.h with sys/wait.h" >&5
+echo "$as_me:5753: 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 5747 "configure"
+#line 5760 "configure"
 #include "confdefs.h"
 
 #if defined(HAVE_SYS_TIME_H) && (defined(SELECT_WITH_TIME) || !(defined(HAVE_SELECT_H || defined(HAVE_SYS_SELECT_H))))
@@ -5768,16 +5781,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5771: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5784: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5774: \$? = $ac_status" >&5
+  echo "$as_me:5787: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5777: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5790: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5780: \$? = $ac_status" >&5
+  echo "$as_me:5793: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_resource_with_wait=yes
 else
@@ -5788,7 +5801,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:5791: result: $cf_cv_resource_with_wait" >&5
+echo "$as_me:5804: 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
@@ -5801,23 +5814,23 @@
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:5804: checking for $ac_header" >&5
+echo "$as_me:5817: 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 5810 "configure"
+#line 5823 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:5814: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5827: \"$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:5820: \$? = $ac_status" >&5
+  echo "$as_me:5833: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5836,7 +5849,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:5839: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:5852: 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
@@ -5851,23 +5864,23 @@
 for ac_header in sys/termio.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:5854: checking for $ac_header" >&5
+echo "$as_me:5867: 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 5860 "configure"
+#line 5873 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:5864: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5877: \"$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:5870: \$? = $ac_status" >&5
+  echo "$as_me:5883: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5886,7 +5899,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:5889: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:5902: 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
@@ -5904,10 +5917,10 @@
 	*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:5907: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:5920: 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 5910 "configure"
+#line 5923 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -5919,16 +5932,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5922: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5935: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5925: \$? = $ac_status" >&5
+  echo "$as_me:5938: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5928: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5941: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5931: \$? = $ac_status" >&5
+  echo "$as_me:5944: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   termios_bad=no
 else
@@ -5936,7 +5949,7 @@
 cat conftest.$ac_ext >&5
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 5939 "configure"
+#line 5952 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -5950,16 +5963,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5953: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5966: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5956: \$? = $ac_status" >&5
+  echo "$as_me:5969: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5959: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5972: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5962: \$? = $ac_status" >&5
+  echo "$as_me:5975: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   termios_bad=unknown
 else
@@ -5974,12 +5987,12 @@
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-	echo "$as_me:5977: result: $termios_bad" >&5
+	echo "$as_me:5990: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:5982: checking declaration of size-change" >&5
+echo "$as_me:5995: 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
@@ -5994,7 +6007,7 @@
     CPPFLAGS="$cf_save_CPPFLAGS"
     test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
     cat >conftest.$ac_ext <<_ACEOF
-#line 5997 "configure"
+#line 6010 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -6038,16 +6051,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6041: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6054: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6044: \$? = $ac_status" >&5
+  echo "$as_me:6057: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6047: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6060: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6050: \$? = $ac_status" >&5
+  echo "$as_me:6063: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_sizechange=yes
 else
@@ -6066,7 +6079,7 @@
 done
 
 fi
-echo "$as_me:6069: result: $cf_cv_sizechange" >&5
+echo "$as_me:6082: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 	cat >>confdefs.h <<\EOF
@@ -6083,7 +6096,7 @@
 	esac
 fi
 
-echo "$as_me:6086: checking for file-pointer ready definition" >&5
+echo "$as_me:6099: 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
@@ -6097,7 +6110,7 @@
 	echo "test-compile $definition" 1>&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 6100 "configure"
+#line 6113 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -6112,16 +6125,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6115: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6128: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6118: \$? = $ac_status" >&5
+  echo "$as_me:6131: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6121: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6134: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6124: \$? = $ac_status" >&5
+  echo "$as_me:6137: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   echo "$definition" >conftest.env
 	 break
@@ -6145,21 +6158,21 @@
 test -f conftest.env && cf_cv_fp_isready=`cat conftest.env`
 
 fi
-echo "$as_me:6148: result: $cf_cv_fp_isready" >&5
+echo "$as_me:6161: 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:6155: checking for <wctype.h> and functions" >&5
+echo "$as_me:6168: 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 6162 "configure"
+#line 6175 "configure"
 #include "confdefs.h"
 
 #include <wctype.h>
@@ -6186,16 +6199,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6189: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6202: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6192: \$? = $ac_status" >&5
+  echo "$as_me:6205: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6195: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6208: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6198: \$? = $ac_status" >&5
+  echo "$as_me:6211: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_wctype=yes
 else
@@ -6206,10 +6219,10 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:6209: result: $cf_cv_have_wctype" >&5
+echo "$as_me:6222: 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:6212: checking for library containing wctype" >&5
+	echo "$as_me:6225: 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
@@ -6217,7 +6230,7 @@
   ac_func_search_save_LIBS=$LIBS
 ac_cv_search_wctype=no
 cat >conftest.$ac_ext <<_ACEOF
-#line 6220 "configure"
+#line 6233 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6236,16 +6249,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6239: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6252: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6242: \$? = $ac_status" >&5
+  echo "$as_me:6255: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6245: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6258: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6248: \$? = $ac_status" >&5
+  echo "$as_me:6261: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_search_wctype="none required"
 else
@@ -6257,7 +6270,7 @@
   for ac_lib in w; do
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
     cat >conftest.$ac_ext <<_ACEOF
-#line 6260 "configure"
+#line 6273 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6276,16 +6289,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6279: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6292: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6282: \$? = $ac_status" >&5
+  echo "$as_me:6295: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6285: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6298: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6288: \$? = $ac_status" >&5
+  echo "$as_me:6301: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_search_wctype="-l$ac_lib"
 break
@@ -6298,7 +6311,7 @@
 fi
 LIBS=$ac_func_search_save_LIBS
 fi
-echo "$as_me:6301: result: $ac_cv_search_wctype" >&5
+echo "$as_me:6314: 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"
@@ -6311,7 +6324,7 @@
 fi
 
 ###	checks for system services and user specified options
-echo "$as_me:6314: checking for long file names" >&5
+echo "$as_me:6327: 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
@@ -6350,7 +6363,7 @@
   rm -rf $ac_xdir 2>/dev/null
 done
 fi
-echo "$as_me:6353: result: $ac_cv_sys_long_file_names" >&5
+echo "$as_me:6366: 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
 
@@ -6360,7 +6373,7 @@
 
 fi
 
-echo "$as_me:6363: checking for restartable reads on pipes" >&5
+echo "$as_me:6376: 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
@@ -6370,7 +6383,7 @@
   cf_cv_can_restart_read=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6373 "configure"
+#line 6386 "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
@@ -6417,15 +6430,15 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:6420: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6433: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6423: \$? = $ac_status" >&5
+  echo "$as_me:6436: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:6425: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6438: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6428: \$? = $ac_status" >&5
+  echo "$as_me:6441: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_can_restart_read=yes
 else
@@ -6438,7 +6451,7 @@
 fi
 
 fi
-echo "$as_me:6441: result: $cf_cv_can_restart_read" >&5
+echo "$as_me:6454: 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
@@ -6447,18 +6460,18 @@
 
 		# is a read() of a pipe restartable?
 
-echo "$as_me:6450: checking whether setpgrp takes no argument" >&5
+echo "$as_me:6463: 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:6456: error: cannot check setpgrp if cross compiling" >&5
+  { { echo "$as_me:6469: 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 6461 "configure"
+#line 6474 "configure"
 #include "confdefs.h"
 #if HAVE_UNISTD_H
 # include <unistd.h>
@@ -6475,15 +6488,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:6478: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6491: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6481: \$? = $ac_status" >&5
+  echo "$as_me:6494: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:6483: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6496: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6486: \$? = $ac_status" >&5
+  echo "$as_me:6499: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_setpgrp_void=no
 else
@@ -6495,7 +6508,7 @@
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:6498: result: $ac_cv_func_setpgrp_void" >&5
+echo "$as_me:6511: 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
 
@@ -6505,14 +6518,14 @@
 
 fi
 
-echo "$as_me:6508: checking whether getpgrp takes no argument" >&5
+echo "$as_me:6521: 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 6515 "configure"
+#line 6528 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -6524,16 +6537,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6527: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6540: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6530: \$? = $ac_status" >&5
+  echo "$as_me:6543: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6533: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6546: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6536: \$? = $ac_status" >&5
+  echo "$as_me:6549: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_func_getpgrp_1=yes
 else
@@ -6544,7 +6557,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 # Use it with no arg.
 cat >conftest.$ac_ext <<_ACEOF
-#line 6547 "configure"
+#line 6560 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -6556,16 +6569,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6559: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6572: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6562: \$? = $ac_status" >&5
+  echo "$as_me:6575: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6565: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6578: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6568: \$? = $ac_status" >&5
+  echo "$as_me:6581: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_func_getpgrp_0=yes
 else
@@ -6579,12 +6592,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:6582: error: cannot check getpgrp if cross compiling" >&5
+  { { echo "$as_me:6595: 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 6587 "configure"
+#line 6600 "configure"
 #include "confdefs.h"
 $ac_includes_default
 
@@ -6638,15 +6651,15 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:6641: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6654: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6644: \$? = $ac_status" >&5
+  echo "$as_me:6657: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:6646: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6659: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6649: \$? = $ac_status" >&5
+  echo "$as_me:6662: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_getpgrp_void=yes
 else
@@ -6660,7 +6673,7 @@
 esac # $ac_func_getpgrp_0:$ac_func_getpgrp_1
 
 fi
-echo "$as_me:6663: result: $ac_cv_func_getpgrp_void" >&5
+echo "$as_me:6676: 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
 
@@ -6670,7 +6683,7 @@
 
 fi
 
-echo "$as_me:6673: checking if killpg is needed" >&5
+echo "$as_me:6686: 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
@@ -6680,7 +6693,7 @@
   cf_cv_need_killpg=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6683 "configure"
+#line 6696 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -6705,15 +6718,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:6708: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6721: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6711: \$? = $ac_status" >&5
+  echo "$as_me:6724: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:6713: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6726: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6716: \$? = $ac_status" >&5
+  echo "$as_me:6729: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_killpg=no
 else
@@ -6726,21 +6739,21 @@
 fi
 
 fi
-echo "$as_me:6729: result: $cf_cv_need_killpg" >&5
+echo "$as_me:6742: 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:6736: checking if external errno is declared" >&5
+echo "$as_me:6749: 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 6743 "configure"
+#line 6756 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -6758,16 +6771,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6761: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6774: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6764: \$? = $ac_status" >&5
+  echo "$as_me:6777: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6767: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6780: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6770: \$? = $ac_status" >&5
+  echo "$as_me:6783: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -6778,7 +6791,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:6781: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:6794: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -6793,14 +6806,14 @@
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:6796: checking if external errno exists" >&5
+echo "$as_me:6809: 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 6803 "configure"
+#line 6816 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -6815,16 +6828,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6818: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6831: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6821: \$? = $ac_status" >&5
+  echo "$as_me:6834: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6824: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6837: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6827: \$? = $ac_status" >&5
+  echo "$as_me:6840: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_errno=yes
 else
@@ -6835,7 +6848,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:6838: result: $cf_cv_have_errno" >&5
+echo "$as_me:6851: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -6848,14 +6861,14 @@
 
 fi
 
-echo "$as_me:6851: checking if external sys_nerr is declared" >&5
+echo "$as_me:6864: 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 6858 "configure"
+#line 6871 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -6873,16 +6886,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6876: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6889: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6879: \$? = $ac_status" >&5
+  echo "$as_me:6892: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6882: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6895: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6885: \$? = $ac_status" >&5
+  echo "$as_me:6898: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_nerr=yes
 else
@@ -6893,7 +6906,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:6896: result: $cf_cv_dcl_sys_nerr" >&5
+echo "$as_me:6909: 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
@@ -6908,14 +6921,14 @@
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:6911: checking if external sys_nerr exists" >&5
+echo "$as_me:6924: 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 6918 "configure"
+#line 6931 "configure"
 #include "confdefs.h"
 
 #undef sys_nerr
@@ -6930,16 +6943,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6933: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6946: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6936: \$? = $ac_status" >&5
+  echo "$as_me:6949: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6939: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6952: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6942: \$? = $ac_status" >&5
+  echo "$as_me:6955: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_nerr=yes
 else
@@ -6950,7 +6963,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:6953: result: $cf_cv_have_sys_nerr" >&5
+echo "$as_me:6966: 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
@@ -6963,14 +6976,14 @@
 
 fi
 
-echo "$as_me:6966: checking if external sys_errlist is declared" >&5
+echo "$as_me:6979: 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 6973 "configure"
+#line 6986 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -6988,16 +7001,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6991: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7004: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6994: \$? = $ac_status" >&5
+  echo "$as_me:7007: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6997: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7010: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7000: \$? = $ac_status" >&5
+  echo "$as_me:7013: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_errlist=yes
 else
@@ -7008,7 +7021,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:7011: result: $cf_cv_dcl_sys_errlist" >&5
+echo "$as_me:7024: 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
@@ -7023,14 +7036,14 @@
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:7026: checking if external sys_errlist exists" >&5
+echo "$as_me:7039: 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 7033 "configure"
+#line 7046 "configure"
 #include "confdefs.h"
 
 #undef sys_errlist
@@ -7045,16 +7058,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7048: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7061: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7051: \$? = $ac_status" >&5
+  echo "$as_me:7064: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7054: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7067: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7057: \$? = $ac_status" >&5
+  echo "$as_me:7070: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_errlist=yes
 else
@@ -7065,7 +7078,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:7068: result: $cf_cv_have_sys_errlist" >&5
+echo "$as_me:7081: 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
@@ -7091,7 +7104,7 @@
 #define os_chosen 1
 EOF
 
-echo "$as_me:7094: checking for screen type" >&5
+echo "$as_me:7107: checking for screen type" >&5
 echo $ECHO_N "checking for screen type... $ECHO_C" >&6
 
 # Check whether --with-screen or --without-screen was given.
@@ -7112,14 +7125,14 @@
 if test -z "$screen"; then
 	screen=termcap;
 fi
-echo "$as_me:7115: result: $screen" >&5
+echo "$as_me:7128: 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:7122: checking for X" >&5
+		echo "$as_me:7135: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -7216,17 +7229,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 7219 "configure"
+#line 7232 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:7223: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7236: \"$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:7229: \$? = $ac_status" >&5
+  echo "$as_me:7242: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7259,7 +7272,7 @@
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >conftest.$ac_ext <<_ACEOF
-#line 7262 "configure"
+#line 7275 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -7271,16 +7284,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7274: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7287: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7277: \$? = $ac_status" >&5
+  echo "$as_me:7290: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7280: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7293: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7283: \$? = $ac_status" >&5
+  echo "$as_me:7296: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -7318,7 +7331,7 @@
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:7321: result: $have_x" >&5
+  echo "$as_me:7334: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -7328,7 +7341,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:7331: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:7344: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -7352,11 +7365,11 @@
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:7355: checking whether -R must be followed by a space" >&5
+      echo "$as_me:7368: 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 7359 "configure"
+#line 7372 "configure"
 #include "confdefs.h"
 
 int
@@ -7368,16 +7381,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7371: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7384: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7374: \$? = $ac_status" >&5
+  echo "$as_me:7387: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7377: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7390: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7380: \$? = $ac_status" >&5
+  echo "$as_me:7393: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_nospace=yes
 else
@@ -7387,13 +7400,13 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
       if test $ac_R_nospace = yes; then
-	echo "$as_me:7390: result: no" >&5
+	echo "$as_me:7403: 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 7396 "configure"
+#line 7409 "configure"
 #include "confdefs.h"
 
 int
@@ -7405,16 +7418,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7408: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7421: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7411: \$? = $ac_status" >&5
+  echo "$as_me:7424: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7414: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7427: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7417: \$? = $ac_status" >&5
+  echo "$as_me:7430: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_space=yes
 else
@@ -7424,11 +7437,11 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	if test $ac_R_space = yes; then
-	  echo "$as_me:7427: result: yes" >&5
+	  echo "$as_me:7440: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:7431: result: neither works" >&5
+	  echo "$as_me:7444: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -7448,7 +7461,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 7451 "configure"
+#line 7464 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7467,22 +7480,22 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7470: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7483: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7473: \$? = $ac_status" >&5
+  echo "$as_me:7486: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7476: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7489: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7479: \$? = $ac_status" >&5
+  echo "$as_me:7492: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:7485: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:7498: 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
@@ -7490,7 +7503,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7493 "configure"
+#line 7506 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7509,16 +7522,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7512: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7525: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7515: \$? = $ac_status" >&5
+  echo "$as_me:7528: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7518: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7531: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7521: \$? = $ac_status" >&5
+  echo "$as_me:7534: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -7529,14 +7542,14 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7532: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:7545: 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:7539: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:7552: 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
@@ -7544,7 +7557,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7547 "configure"
+#line 7560 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7563,16 +7576,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7566: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7579: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7569: \$? = $ac_status" >&5
+  echo "$as_me:7582: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7572: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7585: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7575: \$? = $ac_status" >&5
+  echo "$as_me:7588: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -7583,7 +7596,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7586: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:7599: 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"
@@ -7602,13 +7615,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:7605: checking for gethostbyname" >&5
+    echo "$as_me:7618: 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 7611 "configure"
+#line 7624 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname (); below.  */
@@ -7639,16 +7652,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7642: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7655: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7645: \$? = $ac_status" >&5
+  echo "$as_me:7658: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7648: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7661: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7651: \$? = $ac_status" >&5
+  echo "$as_me:7664: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -7658,11 +7671,11 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7661: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:7674: 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:7665: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:7678: 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
@@ -7670,7 +7683,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7673 "configure"
+#line 7686 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7689,16 +7702,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7692: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7705: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7695: \$? = $ac_status" >&5
+  echo "$as_me:7708: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7698: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7711: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7701: \$? = $ac_status" >&5
+  echo "$as_me:7714: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -7709,14 +7722,14 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7712: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:7725: 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:7719: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:7732: 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
@@ -7724,7 +7737,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7727 "configure"
+#line 7740 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7743,16 +7756,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7746: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7759: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7749: \$? = $ac_status" >&5
+  echo "$as_me:7762: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7752: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7765: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7755: \$? = $ac_status" >&5
+  echo "$as_me:7768: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -7763,7 +7776,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7766: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:7779: 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"
@@ -7779,13 +7792,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:7782: checking for connect" >&5
+    echo "$as_me:7795: 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 7788 "configure"
+#line 7801 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect (); below.  */
@@ -7816,16 +7829,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7819: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7832: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7822: \$? = $ac_status" >&5
+  echo "$as_me:7835: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7825: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7838: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7828: \$? = $ac_status" >&5
+  echo "$as_me:7841: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_connect=yes
 else
@@ -7835,11 +7848,11 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7838: result: $ac_cv_func_connect" >&5
+echo "$as_me:7851: 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:7842: checking for connect in -lsocket" >&5
+      echo "$as_me:7855: 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
@@ -7847,7 +7860,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7850 "configure"
+#line 7863 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7866,16 +7879,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7869: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7882: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7872: \$? = $ac_status" >&5
+  echo "$as_me:7885: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7875: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7888: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7878: \$? = $ac_status" >&5
+  echo "$as_me:7891: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -7886,7 +7899,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7889: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:7902: 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"
@@ -7895,13 +7908,13 @@
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:7898: checking for remove" >&5
+    echo "$as_me:7911: 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 7904 "configure"
+#line 7917 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove (); below.  */
@@ -7932,16 +7945,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7935: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7948: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7938: \$? = $ac_status" >&5
+  echo "$as_me:7951: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7941: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7954: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7944: \$? = $ac_status" >&5
+  echo "$as_me:7957: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_remove=yes
 else
@@ -7951,11 +7964,11 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7954: result: $ac_cv_func_remove" >&5
+echo "$as_me:7967: 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:7958: checking for remove in -lposix" >&5
+      echo "$as_me:7971: 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
@@ -7963,7 +7976,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7966 "configure"
+#line 7979 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7982,16 +7995,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7985: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7998: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7988: \$? = $ac_status" >&5
+  echo "$as_me:8001: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7991: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8004: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7994: \$? = $ac_status" >&5
+  echo "$as_me:8007: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -8002,7 +8015,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8005: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:8018: 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"
@@ -8011,13 +8024,13 @@
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:8014: checking for shmat" >&5
+    echo "$as_me:8027: 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 8020 "configure"
+#line 8033 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat (); below.  */
@@ -8048,16 +8061,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8051: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8064: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8054: \$? = $ac_status" >&5
+  echo "$as_me:8067: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8057: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8070: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8060: \$? = $ac_status" >&5
+  echo "$as_me:8073: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -8067,11 +8080,11 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8070: result: $ac_cv_func_shmat" >&5
+echo "$as_me:8083: 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:8074: checking for shmat in -lipc" >&5
+      echo "$as_me:8087: 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
@@ -8079,7 +8092,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8082 "configure"
+#line 8095 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8098,16 +8111,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8101: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8114: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8104: \$? = $ac_status" >&5
+  echo "$as_me:8117: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8107: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8120: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8110: \$? = $ac_status" >&5
+  echo "$as_me:8123: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -8118,7 +8131,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8121: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:8134: 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"
@@ -8136,7 +8149,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:8139: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:8152: 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
@@ -8144,7 +8157,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8147 "configure"
+#line 8160 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8163,16 +8176,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8166: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8179: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8169: \$? = $ac_status" >&5
+  echo "$as_me:8182: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8172: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8185: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8175: \$? = $ac_status" >&5
+  echo "$as_me:8188: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -8183,7 +8196,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8186: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:8199: 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"
@@ -8277,7 +8290,7 @@
 
 if test "$cf_check_cflags" != "$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 8280 "configure"
+#line 8293 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8289,16 +8302,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8292: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8305: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8295: \$? = $ac_status" >&5
+  echo "$as_me:8308: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8298: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8311: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8301: \$? = $ac_status" >&5
+  echo "$as_me:8314: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -8315,13 +8328,13 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:8318: checking for XOpenDisplay" >&5
+echo "$as_me:8331: checking for XOpenDisplay" >&5
 echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6
 if test "${ac_cv_func_XOpenDisplay+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8324 "configure"
+#line 8337 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char XOpenDisplay (); below.  */
@@ -8352,16 +8365,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8355: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8368: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8358: \$? = $ac_status" >&5
+  echo "$as_me:8371: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8361: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8374: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8364: \$? = $ac_status" >&5
+  echo "$as_me:8377: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_XOpenDisplay=yes
 else
@@ -8371,13 +8384,13 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8374: result: $ac_cv_func_XOpenDisplay" >&5
+echo "$as_me:8387: result: $ac_cv_func_XOpenDisplay" >&5
 echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6
 if test $ac_cv_func_XOpenDisplay = yes; then
   :
 else
 
-echo "$as_me:8380: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:8393: 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
@@ -8385,7 +8398,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8388 "configure"
+#line 8401 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8404,16 +8417,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8407: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8420: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8410: \$? = $ac_status" >&5
+  echo "$as_me:8423: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8413: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8426: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8416: \$? = $ac_status" >&5
+  echo "$as_me:8429: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -8424,7 +8437,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8427: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:8440: 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"
@@ -8432,13 +8445,13 @@
 
 fi
 
-echo "$as_me:8435: checking for XtAppInitialize" >&5
+echo "$as_me:8448: checking for XtAppInitialize" >&5
 echo $ECHO_N "checking for XtAppInitialize... $ECHO_C" >&6
 if test "${ac_cv_func_XtAppInitialize+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8441 "configure"
+#line 8454 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char XtAppInitialize (); below.  */
@@ -8469,16 +8482,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8472: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8485: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8475: \$? = $ac_status" >&5
+  echo "$as_me:8488: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8478: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8491: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8481: \$? = $ac_status" >&5
+  echo "$as_me:8494: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_XtAppInitialize=yes
 else
@@ -8488,13 +8501,13 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8491: result: $ac_cv_func_XtAppInitialize" >&5
+echo "$as_me:8504: result: $ac_cv_func_XtAppInitialize" >&5
 echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6
 if test $ac_cv_func_XtAppInitialize = yes; then
   :
 else
 
-echo "$as_me:8497: checking for XtAppInitialize in -lXt" >&5
+echo "$as_me:8510: 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
@@ -8502,7 +8515,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8505 "configure"
+#line 8518 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8521,16 +8534,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8524: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8537: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8527: \$? = $ac_status" >&5
+  echo "$as_me:8540: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8530: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8543: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8533: \$? = $ac_status" >&5
+  echo "$as_me:8546: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xt_XtAppInitialize=yes
 else
@@ -8541,7 +8554,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8544: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:8557: 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
@@ -8555,7 +8568,7 @@
 fi
 
 if test $cf_have_X_LIBS = no ; then
-	{ echo "$as_me:8558: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+	{ echo "$as_me:8571: 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
@@ -8563,7 +8576,7 @@
 to makefile." >&2;}
 fi
 
-echo "$as_me:8566: checking if you want narrow prototypes for X libraries" >&5
+echo "$as_me:8579: checking if you want narrow prototypes for X libraries" >&5
 echo $ECHO_N "checking if you want narrow prototypes for X libraries... $ECHO_C" >&6
 
 case `$ac_config_guess` in #(vi
@@ -8589,10 +8602,10 @@
   enable_narrowproto=$cf_default_narrowproto
 
 fi;
-echo "$as_me:8592: result: $enable_narrowproto" >&5
+echo "$as_me:8605: result: $enable_narrowproto" >&5
 echo "${ECHO_T}$enable_narrowproto" >&6
 
-echo "$as_me:8595: checking if we should use imake to help" >&5
+echo "$as_me:8608: checking if we should use imake to help" >&5
 echo $ECHO_N "checking if we should use imake to help... $ECHO_C" >&6
 
 # Check whether --enable-imake or --disable-imake was given.
@@ -8609,7 +8622,7 @@
   enable_imake=yes
 
 fi;
-echo "$as_me:8612: result: $enable_imake" >&5
+echo "$as_me:8625: result: $enable_imake" >&5
 echo "${ECHO_T}$enable_imake" >&6
 
 if test "$enable_imake" = yes ; then
@@ -8618,7 +8631,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:8621: checking for $ac_word" >&5
+echo "$as_me:8634: 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
@@ -8635,7 +8648,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:8638: found $ac_dir/$ac_word" >&5
+   echo "$as_me:8651: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -8646,10 +8659,10 @@
 IMAKE=$ac_cv_path_IMAKE
 
 if test -n "$IMAKE"; then
-  echo "$as_me:8649: result: $IMAKE" >&5
+  echo "$as_me:8662: result: $IMAKE" >&5
 echo "${ECHO_T}$IMAKE" >&6
 else
-  echo "$as_me:8652: result: no" >&5
+  echo "$as_me:8665: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8722,7 +8735,7 @@
 			esac
 		done
 		if test -z "$cf_config" ; then
-			{ echo "$as_me:8725: WARNING: Could not find imake config-directory" >&5
+			{ echo "$as_me:8738: 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"
@@ -8731,7 +8744,7 @@
 				test -n "$verbose" && echo "	Using $IMAKE $cf_config" 1>&6
 
 			else
-				{ echo "$as_me:8734: WARNING: Cannot run $IMAKE" >&5
+				{ echo "$as_me:8747: WARNING: Cannot run $IMAKE" >&5
 echo "$as_me: WARNING: Cannot run $IMAKE" >&2;}
 			fi
 		fi
@@ -9068,7 +9081,7 @@
 
 if test "$cf_check_cflags" != "$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 9071 "configure"
+#line 9084 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9080,16 +9093,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9083: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9096: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9086: \$? = $ac_status" >&5
+  echo "$as_me:9099: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9089: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9102: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9092: \$? = $ac_status" >&5
+  echo "$as_me:9105: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9119,23 +9132,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:9122: checking for $ac_header" >&5
+echo "$as_me:9135: 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 9128 "configure"
+#line 9141 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:9132: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:9145: \"$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:9138: \$? = $ac_status" >&5
+  echo "$as_me:9151: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9154,7 +9167,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:9157: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:9170: 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
@@ -9180,7 +9193,7 @@
 fi
 LDFLAGS="$LDFLAGS $X_LIBS"
 
-echo "$as_me:9183: checking for XmuClientWindow in -lXmu" >&5
+echo "$as_me:9196: 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
@@ -9188,7 +9201,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXmu  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9191 "configure"
+#line 9204 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9207,16 +9220,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9210: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9223: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9213: \$? = $ac_status" >&5
+  echo "$as_me:9226: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9216: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9229: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9219: \$? = $ac_status" >&5
+  echo "$as_me:9232: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xmu_XmuClientWindow=yes
 else
@@ -9227,7 +9240,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9230: result: $ac_cv_lib_Xmu_XmuClientWindow" >&5
+echo "$as_me:9243: 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
@@ -9238,7 +9251,7 @@
 
 fi
 
-echo "$as_me:9241: checking for OlToolkitInitialize in -lXol" >&5
+echo "$as_me:9254: 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
@@ -9246,7 +9259,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXol  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9249 "configure"
+#line 9262 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9265,16 +9278,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9268: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9281: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9271: \$? = $ac_status" >&5
+  echo "$as_me:9284: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9274: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9287: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9277: \$? = $ac_status" >&5
+  echo "$as_me:9290: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xol_OlToolkitInitialize=yes
 else
@@ -9285,12 +9298,12 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9288: result: $ac_cv_lib_Xol_OlToolkitInitialize" >&5
+echo "$as_me:9301: 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:9293: error: Unable to successfully link OpenLook library (-lXol) with test program" >&5
+  { { echo "$as_me:9306: 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
@@ -9305,23 +9318,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:9308: checking for $ac_header" >&5
+echo "$as_me:9321: 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 9314 "configure"
+#line 9327 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:9318: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:9331: \"$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:9324: \$? = $ac_status" >&5
+  echo "$as_me:9337: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9340,7 +9353,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:9343: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:9356: 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
@@ -9350,7 +9363,7 @@
 fi
 done
 
-echo "$as_me:9353: checking for regcmp in -lgen" >&5
+echo "$as_me:9366: 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
@@ -9358,7 +9371,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgen  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9361 "configure"
+#line 9374 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9377,16 +9390,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9380: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9393: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9383: \$? = $ac_status" >&5
+  echo "$as_me:9396: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9386: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9399: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9389: \$? = $ac_status" >&5
+  echo "$as_me:9402: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gen_regcmp=yes
 else
@@ -9397,7 +9410,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9400: result: $ac_cv_lib_gen_regcmp" >&5
+echo "$as_me:9413: 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
@@ -9408,7 +9421,7 @@
 
 fi
 
-echo "$as_me:9411: checking for XmuClientWindow in -lXmu" >&5
+echo "$as_me:9424: 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
@@ -9416,7 +9429,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXmu  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9419 "configure"
+#line 9432 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9435,16 +9448,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9438: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9451: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9441: \$? = $ac_status" >&5
+  echo "$as_me:9454: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9444: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9457: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9447: \$? = $ac_status" >&5
+  echo "$as_me:9460: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xmu_XmuClientWindow=yes
 else
@@ -9455,7 +9468,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9458: result: $ac_cv_lib_Xmu_XmuClientWindow" >&5
+echo "$as_me:9471: 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
@@ -9466,7 +9479,7 @@
 
 fi
 
-echo "$as_me:9469: checking for XpStartDoc in -lXp" >&5
+echo "$as_me:9482: 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
@@ -9474,7 +9487,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXp $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9477 "configure"
+#line 9490 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9493,16 +9506,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9496: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9509: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9499: \$? = $ac_status" >&5
+  echo "$as_me:9512: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9502: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9515: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9505: \$? = $ac_status" >&5
+  echo "$as_me:9518: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xp_XpStartDoc=yes
 else
@@ -9513,7 +9526,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9516: result: $ac_cv_lib_Xp_XpStartDoc" >&5
+echo "$as_me:9529: 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
@@ -9524,7 +9537,7 @@
 
 fi
 
-echo "$as_me:9527: checking for XextCreateExtension in -lXext" >&5
+echo "$as_me:9540: 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
@@ -9532,7 +9545,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9535 "configure"
+#line 9548 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9551,16 +9564,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9554: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9567: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9557: \$? = $ac_status" >&5
+  echo "$as_me:9570: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9560: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9573: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9563: \$? = $ac_status" >&5
+  echo "$as_me:9576: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
@@ -9571,13 +9584,13 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9574: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:9587: 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:9580: checking for XpmCreatePixmapFromXpmImage in -lXpm" >&5
+echo "$as_me:9593: 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
@@ -9585,7 +9598,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXpm $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9588 "configure"
+#line 9601 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9604,16 +9617,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9607: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9620: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9610: \$? = $ac_status" >&5
+  echo "$as_me:9623: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9613: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9626: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9616: \$? = $ac_status" >&5
+  echo "$as_me:9629: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xpm_XpmCreatePixmapFromXpmImage=yes
 else
@@ -9624,13 +9637,13 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9627: result: $ac_cv_lib_Xpm_XpmCreatePixmapFromXpmImage" >&5
+echo "$as_me:9640: 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:9633: checking for XmbTextListToTextProperty in -lXIM" >&5
+echo "$as_me:9646: 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
@@ -9638,7 +9651,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXIM  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9641 "configure"
+#line 9654 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9657,16 +9670,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9660: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9673: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9663: \$? = $ac_status" >&5
+  echo "$as_me:9676: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9666: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9679: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9669: \$? = $ac_status" >&5
+  echo "$as_me:9682: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_XIM_XmbTextListToTextProperty=yes
 else
@@ -9677,7 +9690,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9680: result: $ac_cv_lib_XIM_XmbTextListToTextProperty" >&5
+echo "$as_me:9693: 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
@@ -9687,7 +9700,7 @@
   LIBS="-lXIM $LIBS"
 
 fi
-echo "$as_me:9690: checking for XmProcessTraversal in -lXm" >&5
+echo "$as_me:9703: 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
@@ -9695,7 +9708,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXm $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9698 "configure"
+#line 9711 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9714,16 +9727,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9717: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9730: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9720: \$? = $ac_status" >&5
+  echo "$as_me:9733: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9723: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9736: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9726: \$? = $ac_status" >&5
+  echo "$as_me:9739: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xm_XmProcessTraversal=yes
 else
@@ -9734,12 +9747,12 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9737: result: $ac_cv_lib_Xm_XmProcessTraversal" >&5
+echo "$as_me:9750: 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:9742: error: Unable to successfully link Motif library (-lXm) with test program" >&5
+  { { echo "$as_me:9755: 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
@@ -9760,7 +9773,7 @@
 
 cf_x_athena=${cf_x_athena-Xaw}
 
-echo "$as_me:9763: checking if you want to link with Xaw 3d library" >&5
+echo "$as_me:9776: checking if you want to link with Xaw 3d library" >&5
 echo $ECHO_N "checking if you want to link with Xaw 3d library... $ECHO_C" >&6
 withval=
 
@@ -9771,14 +9784,14 @@
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3d
-	echo "$as_me:9774: result: yes" >&5
+	echo "$as_me:9787: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:9777: result: no" >&5
+	echo "$as_me:9790: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:9781: checking if you want to link with neXT Athena library" >&5
+echo "$as_me:9794: checking if you want to link with neXT Athena library" >&5
 echo $ECHO_N "checking if you want to link with neXT Athena library... $ECHO_C" >&6
 withval=
 
@@ -9789,14 +9802,14 @@
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=neXtaw
-	echo "$as_me:9792: result: yes" >&5
+	echo "$as_me:9805: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:9795: result: no" >&5
+	echo "$as_me:9808: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:9799: checking if you want to link with Athena-Plus library" >&5
+echo "$as_me:9812: checking if you want to link with Athena-Plus library" >&5
 echo $ECHO_N "checking if you want to link with Athena-Plus library... $ECHO_C" >&6
 withval=
 
@@ -9807,14 +9820,14 @@
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=XawPlus
-	echo "$as_me:9810: result: yes" >&5
+	echo "$as_me:9823: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:9813: result: no" >&5
+	echo "$as_me:9826: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:9817: checking for XextCreateExtension in -lXext" >&5
+echo "$as_me:9830: 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
@@ -9822,7 +9835,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9825 "configure"
+#line 9838 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9841,16 +9854,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9844: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9857: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9847: \$? = $ac_status" >&5
+  echo "$as_me:9860: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9850: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9863: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9853: \$? = $ac_status" >&5
+  echo "$as_me:9866: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
@@ -9861,7 +9874,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9864: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:9877: 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"
@@ -9883,14 +9896,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:9886: checking for $cf_test in $cf_path" >&5
+			echo "$as_me:9899: 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:9889: checking for $cf_test" >&5
+			echo "$as_me:9902: checking for $cf_test" >&5
 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
 		fi
 		cat >conftest.$ac_ext <<_ACEOF
-#line 9893 "configure"
+#line 9906 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -9904,16 +9917,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9907: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9920: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9910: \$? = $ac_status" >&5
+  echo "$as_me:9923: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9913: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9926: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9916: \$? = $ac_status" >&5
+  echo "$as_me:9929: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -9922,7 +9935,7 @@
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-		echo "$as_me:9925: result: $cf_result" >&5
+		echo "$as_me:9938: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 		if test "$cf_result" = yes ; then
 			cf_x_athena_include=$cf_path
@@ -9934,7 +9947,7 @@
 done
 
 if test -z "$cf_x_athena_include" ; then
-	{ echo "$as_me:9937: WARNING: Unable to successfully find Athena header files with test program" >&5
+	{ echo "$as_me:9950: 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"
@@ -9959,17 +9972,17 @@
 			cf_test=XawSimpleMenuAddGlobalActions
 			if test $cf_path != default ; then
 				LIBS="-L$cf_path/lib $cf_lib $LIBS"
-				echo "$as_me:9962: checking for $cf_lib in $cf_path" >&5
+				echo "$as_me:9975: 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:9966: checking for $cf_test in $cf_lib" >&5
+				echo "$as_me:9979: 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 9972 "configure"
+#line 9985 "configure"
 #include "confdefs.h"
 
 int
@@ -9981,16 +9994,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9984: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9997: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9987: \$? = $ac_status" >&5
+  echo "$as_me:10000: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9990: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10003: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9993: \$? = $ac_status" >&5
+  echo "$as_me:10006: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -9999,7 +10012,7 @@
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-			echo "$as_me:10002: result: $cf_result" >&5
+			echo "$as_me:10015: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				cf_x_athena_lib="$cf_lib"
@@ -10013,7 +10026,7 @@
 done
 
 if test -z "$cf_x_athena_lib" ; then
-	{ { echo "$as_me:10016: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+	{ { echo "$as_me:10029: 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
@@ -10049,7 +10062,7 @@
 #define DISP_CURSES 1
 EOF
 
-echo "$as_me:10052: checking for extra include directories" >&5
+echo "$as_me:10065: 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
@@ -10069,11 +10082,11 @@
 esac
 
 fi
-echo "$as_me:10072: result: $cf_cv_curses_incdir" >&5
+echo "$as_me:10085: result: $cf_cv_curses_incdir" >&5
 echo "${ECHO_T}$cf_cv_curses_incdir" >&6
 test "$cf_cv_curses_incdir" != no && CPPFLAGS="$cf_cv_curses_incdir $CPPFLAGS"
 
-echo "$as_me:10076: checking if we have identified curses headers" >&5
+echo "$as_me:10089: 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
@@ -10087,7 +10100,7 @@
 	ncurses/ncurses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 10090 "configure"
+#line 10103 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -10099,16 +10112,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10102: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10115: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10105: \$? = $ac_status" >&5
+  echo "$as_me:10118: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10108: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10121: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10111: \$? = $ac_status" >&5
+  echo "$as_me:10124: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -10119,11 +10132,11 @@
 done
 
 fi
-echo "$as_me:10122: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:10135: 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:10126: error: No curses header-files found" >&5
+	{ { echo "$as_me:10139: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -10133,23 +10146,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:10136: checking for $ac_header" >&5
+echo "$as_me:10149: 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 10142 "configure"
+#line 10155 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:10146: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:10159: \"$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:10152: \$? = $ac_status" >&5
+  echo "$as_me:10165: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -10168,7 +10181,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:10171: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:10184: 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
@@ -10178,7 +10191,7 @@
 fi
 done
 
-echo "$as_me:10181: checking for terminfo header" >&5
+echo "$as_me:10194: checking for terminfo header" >&5
 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
 if test "${cf_cv_term_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10196,7 +10209,7 @@
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 10199 "configure"
+#line 10212 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -10211,16 +10224,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10214: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10227: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10217: \$? = $ac_status" >&5
+  echo "$as_me:10230: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10220: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10233: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10223: \$? = $ac_status" >&5
+  echo "$as_me:10236: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -10236,7 +10249,7 @@
 done
 
 fi
-echo "$as_me:10239: result: $cf_cv_term_header" >&5
+echo "$as_me:10252: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -10265,7 +10278,7 @@
 	;;
 esac
 
-echo "$as_me:10268: checking for ncurses version" >&5
+echo "$as_me:10281: 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
@@ -10291,10 +10304,10 @@
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:10294: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:10307: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:10297: \$? = $ac_status" >&5
+  echo "$as_me:10310: \$? = $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%".*%%'`
@@ -10304,7 +10317,7 @@
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10307 "configure"
+#line 10320 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -10329,15 +10342,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:10332: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10345: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10335: \$? = $ac_status" >&5
+  echo "$as_me:10348: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:10337: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10350: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10340: \$? = $ac_status" >&5
+  echo "$as_me:10353: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -10351,16 +10364,16 @@
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:10354: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:10367: 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:10360: checking if we have identified curses libraries" >&5
+echo "$as_me:10373: 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 10363 "configure"
+#line 10376 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -10372,16 +10385,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10375: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10388: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10378: \$? = $ac_status" >&5
+  echo "$as_me:10391: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10381: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10394: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10384: \$? = $ac_status" >&5
+  echo "$as_me:10397: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -10390,13 +10403,13 @@
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:10393: result: $cf_result" >&5
+echo "$as_me:10406: 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:10399: checking for tgoto in -lmytinfo" >&5
+	echo "$as_me:10412: 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
@@ -10404,7 +10417,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10407 "configure"
+#line 10420 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10423,16 +10436,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10426: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10439: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10429: \$? = $ac_status" >&5
+  echo "$as_me:10442: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10432: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10445: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10435: \$? = $ac_status" >&5
+  echo "$as_me:10448: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -10443,7 +10456,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10446: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:10459: 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"
@@ -10451,7 +10464,7 @@
 
 	;;
 hpux10.*) #(vi
-	echo "$as_me:10454: checking for initscr in -lcur_colr" >&5
+	echo "$as_me:10467: 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
@@ -10459,7 +10472,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcur_colr  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10462 "configure"
+#line 10475 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10478,16 +10491,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10481: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10494: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10484: \$? = $ac_status" >&5
+  echo "$as_me:10497: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10487: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10500: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10490: \$? = $ac_status" >&5
+  echo "$as_me:10503: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_cur_colr_initscr=yes
 else
@@ -10498,7 +10511,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10501: result: $ac_cv_lib_cur_colr_initscr" >&5
+echo "$as_me:10514: 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
 
@@ -10507,7 +10520,7 @@
 
 else
 
-	echo "$as_me:10510: checking for initscr in -lHcurses" >&5
+	echo "$as_me:10523: 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
@@ -10515,7 +10528,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lHcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10518 "configure"
+#line 10531 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10534,16 +10547,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10537: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10550: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10540: \$? = $ac_status" >&5
+  echo "$as_me:10553: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10543: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10556: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10546: \$? = $ac_status" >&5
+  echo "$as_me:10559: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Hcurses_initscr=yes
 else
@@ -10554,7 +10567,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10557: result: $ac_cv_lib_Hcurses_initscr" >&5
+echo "$as_me:10570: 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
 
@@ -10592,13 +10605,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:10595: checking for tgoto" >&5
+	echo "$as_me:10608: 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 10601 "configure"
+#line 10614 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char tgoto (); below.  */
@@ -10629,16 +10642,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10632: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10645: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10635: \$? = $ac_status" >&5
+  echo "$as_me:10648: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10638: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10651: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10641: \$? = $ac_status" >&5
+  echo "$as_me:10654: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_tgoto=yes
 else
@@ -10648,7 +10661,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10651: result: $ac_cv_func_tgoto" >&5
+echo "$as_me:10664: 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
@@ -10657,7 +10670,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:10660: checking for tgoto in -l$cf_term_lib" >&5
+echo "$as_me:10673: 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
@@ -10665,7 +10678,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_term_lib  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10668 "configure"
+#line 10681 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10684,16 +10697,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10687: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10700: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10690: \$? = $ac_status" >&5
+  echo "$as_me:10703: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10693: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10706: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10696: \$? = $ac_status" >&5
+  echo "$as_me:10709: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -10704,7 +10717,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10707: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:10720: 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
@@ -10719,7 +10732,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:10722: checking for initscr in -l$cf_curs_lib" >&5
+echo "$as_me:10735: 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
@@ -10727,7 +10740,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_curs_lib  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10730 "configure"
+#line 10743 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10746,16 +10759,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10749: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10762: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10752: \$? = $ac_status" >&5
+  echo "$as_me:10765: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10755: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10768: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10758: \$? = $ac_status" >&5
+  echo "$as_me:10771: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -10766,23 +10779,23 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10769: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:10782: 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:10776: error: no curses library found" >&5
+	test $cf_curs_lib = unknown && { { echo "$as_me:10789: 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:10782: checking if we can link with $cf_curs_lib library" >&5
+		echo "$as_me:10795: 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 10785 "configure"
+#line 10798 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -10794,16 +10807,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10797: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10810: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10800: \$? = $ac_status" >&5
+  echo "$as_me:10813: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10803: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10816: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10806: \$? = $ac_status" >&5
+  echo "$as_me:10819: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -10812,18 +10825,18 @@
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-		echo "$as_me:10815: result: $cf_result" >&5
+		echo "$as_me:10828: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
-		test $cf_result = no && { { echo "$as_me:10817: error: Cannot link curses library" >&5
+		test $cf_result = no && { { echo "$as_me:10830: 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:10823: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+		echo "$as_me:10836: 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 10826 "configure"
+#line 10839 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -10835,16 +10848,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10838: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10851: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10841: \$? = $ac_status" >&5
+  echo "$as_me:10854: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10844: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10857: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10847: \$? = $ac_status" >&5
+  echo "$as_me:10860: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=no
 else
@@ -10853,7 +10866,7 @@
 
 			LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
 			cat >conftest.$ac_ext <<_ACEOF
-#line 10856 "configure"
+#line 10869 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -10865,16 +10878,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10868: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10881: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10871: \$? = $ac_status" >&5
+  echo "$as_me:10884: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10874: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10887: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10877: \$? = $ac_status" >&5
+  echo "$as_me:10890: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -10886,7 +10899,7 @@
 
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-		echo "$as_me:10889: result: $cf_result" >&5
+		echo "$as_me:10902: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	fi
 fi
@@ -10904,6 +10917,12 @@
 if test "${with_curses_dir+set}" = set; then
   withval="$with_curses_dir"
 
+if test "x$prefix" != xNONE; then
+  cf_path_syntax="$prefix"
+else
+  cf_path_syntax="$ac_default_prefix"
+fi
+
 case ".$withval" in #(vi
 .\$\(*\)*|.\'*\'*) #(vi
   ;;
@@ -10915,15 +10934,15 @@
   eval withval="$withval"
   case ".$withval" in #(vi
   .NONE/*)
-    withval=`echo $withval | sed -e s%NONE%$ac_default_prefix%`
+    withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
     ;;
   esac
   ;; #(vi
 .no|.NONE/*)
-  withval=`echo $withval | sed -e s%NONE%$ac_default_prefix%`
+  withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:10926: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:10945: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -10940,7 +10959,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:10943: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:10962: 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
@@ -10952,7 +10971,7 @@
 	do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 10955 "configure"
+#line 10974 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -10976,16 +10995,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10979: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10998: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10982: \$? = $ac_status" >&5
+  echo "$as_me:11001: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10985: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11004: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10988: \$? = $ac_status" >&5
+  echo "$as_me:11007: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -11000,14 +11019,14 @@
 	done
 
 fi
-echo "$as_me:11003: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:11022: 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:11010: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:11029: 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
@@ -11102,7 +11121,7 @@
 				cf_save_CPPFLAGS="$CPPFLAGS"
 				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 11105 "configure"
+#line 11124 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11114,16 +11133,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11117: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11136: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11120: \$? = $ac_status" >&5
+  echo "$as_me:11139: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11123: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11142: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11126: \$? = $ac_status" >&5
+  echo "$as_me:11145: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11150,7 +11169,7 @@
 		do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 11153 "configure"
+#line 11172 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -11174,16 +11193,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11177: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11196: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11180: \$? = $ac_status" >&5
+  echo "$as_me:11199: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11183: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11202: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11186: \$? = $ac_status" >&5
+  echo "$as_me:11205: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -11204,12 +11223,12 @@
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11207: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11226: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:11212: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:11231: 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%/[^/]*$%%'`
@@ -11231,7 +11250,7 @@
 				cf_save_CPPFLAGS="$CPPFLAGS"
 				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 11234 "configure"
+#line 11253 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11243,16 +11262,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11246: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11265: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11249: \$? = $ac_status" >&5
+  echo "$as_me:11268: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11252: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11271: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11255: \$? = $ac_status" >&5
+  echo "$as_me:11274: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11301,7 +11320,7 @@
 	;;
 esac
 
-echo "$as_me:11304: checking for terminfo header" >&5
+echo "$as_me:11323: checking for terminfo header" >&5
 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
 if test "${cf_cv_term_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11319,7 +11338,7 @@
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 11322 "configure"
+#line 11341 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -11334,16 +11353,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11337: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11356: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11340: \$? = $ac_status" >&5
+  echo "$as_me:11359: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11343: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11362: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11346: \$? = $ac_status" >&5
+  echo "$as_me:11365: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -11359,7 +11378,7 @@
 done
 
 fi
-echo "$as_me:11362: result: $cf_cv_term_header" >&5
+echo "$as_me:11381: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -11393,7 +11412,7 @@
 #define NCURSES 1
 EOF
 
-echo "$as_me:11396: checking for ncurses version" >&5
+echo "$as_me:11415: 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
@@ -11419,10 +11438,10 @@
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:11422: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:11441: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:11425: \$? = $ac_status" >&5
+  echo "$as_me:11444: \$? = $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%".*%%'`
@@ -11432,7 +11451,7 @@
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11435 "configure"
+#line 11454 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -11457,15 +11476,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:11460: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11479: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11463: \$? = $ac_status" >&5
+  echo "$as_me:11482: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:11465: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11484: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11468: \$? = $ac_status" >&5
+  echo "$as_me:11487: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -11479,7 +11498,7 @@
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:11482: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:11501: 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
@@ -11491,7 +11510,7 @@
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:11494: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:11513: 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
@@ -11499,7 +11518,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 11502 "configure"
+#line 11521 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11518,16 +11537,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11521: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11540: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11524: \$? = $ac_status" >&5
+  echo "$as_me:11543: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11527: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11546: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11530: \$? = $ac_status" >&5
+  echo "$as_me:11549: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -11538,10 +11557,10 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11541: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:11560: 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:11544: checking for initscr in -lgpm" >&5
+  echo "$as_me:11563: 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
@@ -11549,7 +11568,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 11552 "configure"
+#line 11571 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11568,16 +11587,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11571: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11590: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11574: \$? = $ac_status" >&5
+  echo "$as_me:11593: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11577: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11596: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11580: \$? = $ac_status" >&5
+  echo "$as_me:11599: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -11588,7 +11607,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11591: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:11610: 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"
@@ -11603,7 +11622,7 @@
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it's static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:11606: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:11625: 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
@@ -11611,7 +11630,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 11614 "configure"
+#line 11633 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11630,16 +11649,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11633: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11652: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11636: \$? = $ac_status" >&5
+  echo "$as_me:11655: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11639: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11658: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11642: \$? = $ac_status" >&5
+  echo "$as_me:11661: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -11650,7 +11669,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11653: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:11672: 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"
@@ -11669,13 +11688,13 @@
 
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
-	echo "$as_me:11672: checking for initscr" >&5
+	echo "$as_me:11691: 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 11678 "configure"
+#line 11697 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */
@@ -11706,16 +11725,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11709: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11728: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11712: \$? = $ac_status" >&5
+  echo "$as_me:11731: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11715: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11734: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11718: \$? = $ac_status" >&5
+  echo "$as_me:11737: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -11725,18 +11744,18 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:11728: result: $ac_cv_func_initscr" >&5
+echo "$as_me:11747: 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:11735: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:11754: 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 11739 "configure"
+#line 11758 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -11748,25 +11767,25 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11751: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11770: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11754: \$? = $ac_status" >&5
+  echo "$as_me:11773: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11757: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11776: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11760: \$? = $ac_status" >&5
+  echo "$as_me:11779: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:11762: result: yes" >&5
+  echo "$as_me:11781: 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:11769: result: no" >&5
+echo "$as_me:11788: result: no" >&5
 echo "${ECHO_T}no" >&6
 			cf_search=""
 
@@ -11826,11 +11845,11 @@
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:11829: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:11848: 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 11833 "configure"
+#line 11852 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -11842,25 +11861,25 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11845: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11864: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11848: \$? = $ac_status" >&5
+  echo "$as_me:11867: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11851: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11870: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11854: \$? = $ac_status" >&5
+  echo "$as_me:11873: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:11856: result: yes" >&5
+  echo "$as_me:11875: 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:11863: result: no" >&5
+echo "$as_me:11882: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -11875,7 +11894,7 @@
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:11878: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:11897: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -11883,7 +11902,7 @@
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:11886: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:11905: 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
@@ -11893,7 +11912,7 @@
 		fi
 	done
 	cat >conftest.$ac_ext <<_ACEOF
-#line 11896 "configure"
+#line 11915 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -11905,23 +11924,23 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11908: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11927: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11911: \$? = $ac_status" >&5
+  echo "$as_me:11930: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11914: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11933: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11917: \$? = $ac_status" >&5
+  echo "$as_me:11936: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:11919: result: yes" >&5
+  echo "$as_me:11938: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:11924: result: no" >&5
+echo "$as_me:11943: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -11948,7 +11967,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:11951: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:11970: 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
@@ -11960,7 +11979,7 @@
 	do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 11963 "configure"
+#line 11982 "configure"
 #include "confdefs.h"
 
 #define _XOPEN_SOURCE_EXTENDED
@@ -11992,16 +12011,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11995: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12014: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11998: \$? = $ac_status" >&5
+  echo "$as_me:12017: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12001: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12020: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12004: \$? = $ac_status" >&5
+  echo "$as_me:12023: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -12016,14 +12035,14 @@
 	done
 
 fi
-echo "$as_me:12019: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:12038: 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:12026: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:12045: 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
@@ -12118,7 +12137,7 @@
 				cf_save_CPPFLAGS="$CPPFLAGS"
 				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 12121 "configure"
+#line 12140 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -12130,16 +12149,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12133: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12152: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12136: \$? = $ac_status" >&5
+  echo "$as_me:12155: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12139: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12158: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12142: \$? = $ac_status" >&5
+  echo "$as_me:12161: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -12166,7 +12185,7 @@
 		do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 12169 "configure"
+#line 12188 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -12190,16 +12209,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12193: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12212: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12196: \$? = $ac_status" >&5
+  echo "$as_me:12215: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12199: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12218: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12202: \$? = $ac_status" >&5
+  echo "$as_me:12221: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -12220,12 +12239,12 @@
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:12223: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:12242: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:12228: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:12247: 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%/[^/]*$%%'`
@@ -12247,7 +12266,7 @@
 				cf_save_CPPFLAGS="$CPPFLAGS"
 				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 12250 "configure"
+#line 12269 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -12259,16 +12278,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12262: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12281: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12265: \$? = $ac_status" >&5
+  echo "$as_me:12284: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12268: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12287: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12271: \$? = $ac_status" >&5
+  echo "$as_me:12290: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -12317,7 +12336,7 @@
 	;;
 esac
 
-echo "$as_me:12320: checking for terminfo header" >&5
+echo "$as_me:12339: checking for terminfo header" >&5
 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
 if test "${cf_cv_term_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12335,7 +12354,7 @@
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 12338 "configure"
+#line 12357 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -12350,16 +12369,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12353: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12372: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12356: \$? = $ac_status" >&5
+  echo "$as_me:12375: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12359: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12378: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12362: \$? = $ac_status" >&5
+  echo "$as_me:12381: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -12375,7 +12394,7 @@
 done
 
 fi
-echo "$as_me:12378: result: $cf_cv_term_header" >&5
+echo "$as_me:12397: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -12409,7 +12428,7 @@
 #define NCURSES 1
 EOF
 
-echo "$as_me:12412: checking for ncurses version" >&5
+echo "$as_me:12431: 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
@@ -12435,10 +12454,10 @@
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:12438: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:12457: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:12441: \$? = $ac_status" >&5
+  echo "$as_me:12460: \$? = $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%".*%%'`
@@ -12448,7 +12467,7 @@
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12451 "configure"
+#line 12470 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -12473,15 +12492,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:12476: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12495: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12479: \$? = $ac_status" >&5
+  echo "$as_me:12498: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:12481: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12500: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12484: \$? = $ac_status" >&5
+  echo "$as_me:12503: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -12495,7 +12514,7 @@
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:12498: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:12517: 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
@@ -12507,7 +12526,7 @@
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:12510: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:12529: 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
@@ -12515,7 +12534,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12518 "configure"
+#line 12537 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12534,16 +12553,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12537: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12556: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12540: \$? = $ac_status" >&5
+  echo "$as_me:12559: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12543: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12562: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12546: \$? = $ac_status" >&5
+  echo "$as_me:12565: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -12554,10 +12573,10 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12557: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:12576: 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:12560: checking for initscr in -lgpm" >&5
+  echo "$as_me:12579: 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
@@ -12565,7 +12584,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12568 "configure"
+#line 12587 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12584,16 +12603,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12587: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12606: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12590: \$? = $ac_status" >&5
+  echo "$as_me:12609: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12593: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12612: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12596: \$? = $ac_status" >&5
+  echo "$as_me:12615: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -12604,7 +12623,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12607: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:12626: 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"
@@ -12619,7 +12638,7 @@
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it's static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:12622: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:12641: 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
@@ -12627,7 +12646,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12630 "configure"
+#line 12649 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12646,16 +12665,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12649: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12668: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12652: \$? = $ac_status" >&5
+  echo "$as_me:12671: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12655: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12674: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12658: \$? = $ac_status" >&5
+  echo "$as_me:12677: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -12666,7 +12685,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12669: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:12688: 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"
@@ -12685,13 +12704,13 @@
 
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
-	echo "$as_me:12688: checking for initscr" >&5
+	echo "$as_me:12707: 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 12694 "configure"
+#line 12713 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */
@@ -12722,16 +12741,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12725: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12744: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12728: \$? = $ac_status" >&5
+  echo "$as_me:12747: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12731: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12750: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12734: \$? = $ac_status" >&5
+  echo "$as_me:12753: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -12741,18 +12760,18 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12744: result: $ac_cv_func_initscr" >&5
+echo "$as_me:12763: 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:12751: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:12770: 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 12755 "configure"
+#line 12774 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -12764,25 +12783,25 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12767: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12786: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12770: \$? = $ac_status" >&5
+  echo "$as_me:12789: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12773: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12792: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12776: \$? = $ac_status" >&5
+  echo "$as_me:12795: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:12778: result: yes" >&5
+  echo "$as_me:12797: 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:12785: result: no" >&5
+echo "$as_me:12804: result: no" >&5
 echo "${ECHO_T}no" >&6
 			cf_search=""
 
@@ -12842,11 +12861,11 @@
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:12845: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:12864: 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 12849 "configure"
+#line 12868 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -12858,25 +12877,25 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12861: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12880: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12864: \$? = $ac_status" >&5
+  echo "$as_me:12883: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12867: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12886: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12870: \$? = $ac_status" >&5
+  echo "$as_me:12889: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:12872: result: yes" >&5
+  echo "$as_me:12891: 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:12879: result: no" >&5
+echo "$as_me:12898: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -12891,7 +12910,7 @@
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:12894: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:12913: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -12899,7 +12918,7 @@
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:12902: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:12921: 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
@@ -12909,7 +12928,7 @@
 		fi
 	done
 	cat >conftest.$ac_ext <<_ACEOF
-#line 12912 "configure"
+#line 12931 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -12921,23 +12940,23 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12924: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12943: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12927: \$? = $ac_status" >&5
+  echo "$as_me:12946: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12930: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12949: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12933: \$? = $ac_status" >&5
+  echo "$as_me:12952: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:12935: result: yes" >&5
+  echo "$as_me:12954: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:12940: result: no" >&5
+echo "$as_me:12959: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -12958,7 +12977,7 @@
 #define DISP_TERMCAP 1
 EOF
 
-		echo "$as_me:12961: checking if you want to use ncurses" >&5
+		echo "$as_me:12980: 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.
@@ -12968,7 +12987,7 @@
 else
   withval=no
 fi;
-		echo "$as_me:12971: result: $withval" >&5
+		echo "$as_me:12990: result: $withval" >&5
 echo "${ECHO_T}$withval" >&6
 
 if test "${cf_cv_termlib+set}" = set; then
@@ -12977,7 +12996,7 @@
 
 cf_cv_termlib=none
 cat >conftest.$ac_ext <<_ACEOF
-#line 12980 "configure"
+#line 12999 "configure"
 #include "confdefs.h"
 
 int
@@ -12989,19 +13008,19 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12992: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13011: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12995: \$? = $ac_status" >&5
+  echo "$as_me:13014: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12998: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13017: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13001: \$? = $ac_status" >&5
+  echo "$as_me:13020: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 13004 "configure"
+#line 13023 "configure"
 #include "confdefs.h"
 
 int
@@ -13013,16 +13032,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13016: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13035: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13019: \$? = $ac_status" >&5
+  echo "$as_me:13038: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13022: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13041: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13025: \$? = $ac_status" >&5
+  echo "$as_me:13044: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termlib=terminfo
 else
@@ -13046,7 +13065,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:13049: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:13068: 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
@@ -13058,7 +13077,7 @@
 	do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 13061 "configure"
+#line 13080 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -13082,16 +13101,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13085: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13104: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13088: \$? = $ac_status" >&5
+  echo "$as_me:13107: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13091: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13110: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13094: \$? = $ac_status" >&5
+  echo "$as_me:13113: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -13106,14 +13125,14 @@
 	done
 
 fi
-echo "$as_me:13109: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:13128: 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:13116: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:13135: 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
@@ -13208,7 +13227,7 @@
 				cf_save_CPPFLAGS="$CPPFLAGS"
 				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 13211 "configure"
+#line 13230 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13220,16 +13239,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13223: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13242: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13226: \$? = $ac_status" >&5
+  echo "$as_me:13245: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13229: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13248: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13232: \$? = $ac_status" >&5
+  echo "$as_me:13251: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -13256,7 +13275,7 @@
 		do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 13259 "configure"
+#line 13278 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -13280,16 +13299,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13283: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13302: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13286: \$? = $ac_status" >&5
+  echo "$as_me:13305: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13289: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13308: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13292: \$? = $ac_status" >&5
+  echo "$as_me:13311: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -13310,12 +13329,12 @@
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:13313: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:13332: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:13318: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:13337: 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%/[^/]*$%%'`
@@ -13337,7 +13356,7 @@
 				cf_save_CPPFLAGS="$CPPFLAGS"
 				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 13340 "configure"
+#line 13359 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13349,16 +13368,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13352: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13371: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13355: \$? = $ac_status" >&5
+  echo "$as_me:13374: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13358: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13377: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13361: \$? = $ac_status" >&5
+  echo "$as_me:13380: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -13407,7 +13426,7 @@
 	;;
 esac
 
-echo "$as_me:13410: checking for terminfo header" >&5
+echo "$as_me:13429: checking for terminfo header" >&5
 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
 if test "${cf_cv_term_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13425,7 +13444,7 @@
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 13428 "configure"
+#line 13447 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -13440,16 +13459,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13443: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13462: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13446: \$? = $ac_status" >&5
+  echo "$as_me:13465: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13449: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13468: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13452: \$? = $ac_status" >&5
+  echo "$as_me:13471: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -13465,7 +13484,7 @@
 done
 
 fi
-echo "$as_me:13468: result: $cf_cv_term_header" >&5
+echo "$as_me:13487: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -13499,7 +13518,7 @@
 #define NCURSES 1
 EOF
 
-echo "$as_me:13502: checking for ncurses version" >&5
+echo "$as_me:13521: 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
@@ -13525,10 +13544,10 @@
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:13528: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:13547: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:13531: \$? = $ac_status" >&5
+  echo "$as_me:13550: \$? = $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%".*%%'`
@@ -13538,7 +13557,7 @@
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13541 "configure"
+#line 13560 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -13563,15 +13582,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:13566: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13585: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13569: \$? = $ac_status" >&5
+  echo "$as_me:13588: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:13571: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13590: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13574: \$? = $ac_status" >&5
+  echo "$as_me:13593: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -13585,7 +13604,7 @@
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:13588: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:13607: 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
@@ -13597,7 +13616,7 @@
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:13600: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:13619: 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
@@ -13605,7 +13624,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 13608 "configure"
+#line 13627 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13624,16 +13643,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13627: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13646: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13630: \$? = $ac_status" >&5
+  echo "$as_me:13649: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13633: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13652: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13636: \$? = $ac_status" >&5
+  echo "$as_me:13655: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -13644,10 +13663,10 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13647: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:13666: 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:13650: checking for initscr in -lgpm" >&5
+  echo "$as_me:13669: 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
@@ -13655,7 +13674,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 13658 "configure"
+#line 13677 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13674,16 +13693,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13677: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13696: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13680: \$? = $ac_status" >&5
+  echo "$as_me:13699: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13683: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13702: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13686: \$? = $ac_status" >&5
+  echo "$as_me:13705: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -13694,7 +13713,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13697: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:13716: 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"
@@ -13709,7 +13728,7 @@
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it's static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:13712: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:13731: 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
@@ -13717,7 +13736,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 13720 "configure"
+#line 13739 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13736,16 +13755,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13739: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13758: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13742: \$? = $ac_status" >&5
+  echo "$as_me:13761: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13745: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13764: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13748: \$? = $ac_status" >&5
+  echo "$as_me:13767: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -13756,7 +13775,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13759: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:13778: 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"
@@ -13775,13 +13794,13 @@
 
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
-	echo "$as_me:13778: checking for initscr" >&5
+	echo "$as_me:13797: 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 13784 "configure"
+#line 13803 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */
@@ -13812,16 +13831,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13815: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13834: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13818: \$? = $ac_status" >&5
+  echo "$as_me:13837: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13821: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13840: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13824: \$? = $ac_status" >&5
+  echo "$as_me:13843: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -13831,18 +13850,18 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:13834: result: $ac_cv_func_initscr" >&5
+echo "$as_me:13853: 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:13841: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:13860: 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 13845 "configure"
+#line 13864 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -13854,25 +13873,25 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13857: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13876: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13860: \$? = $ac_status" >&5
+  echo "$as_me:13879: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13863: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13882: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13866: \$? = $ac_status" >&5
+  echo "$as_me:13885: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:13868: result: yes" >&5
+  echo "$as_me:13887: 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:13875: result: no" >&5
+echo "$as_me:13894: result: no" >&5
 echo "${ECHO_T}no" >&6
 			cf_search=""
 
@@ -13932,11 +13951,11 @@
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:13935: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:13954: 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 13939 "configure"
+#line 13958 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -13948,25 +13967,25 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13951: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13970: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13954: \$? = $ac_status" >&5
+  echo "$as_me:13973: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13957: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13976: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13960: \$? = $ac_status" >&5
+  echo "$as_me:13979: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:13962: result: yes" >&5
+  echo "$as_me:13981: 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:13969: result: no" >&5
+echo "$as_me:13988: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -13981,7 +14000,7 @@
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:13984: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:14003: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -13989,7 +14008,7 @@
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:13992: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:14011: 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
@@ -13999,7 +14018,7 @@
 		fi
 	done
 	cat >conftest.$ac_ext <<_ACEOF
-#line 14002 "configure"
+#line 14021 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -14011,23 +14030,23 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14014: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14033: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14017: \$? = $ac_status" >&5
+  echo "$as_me:14036: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14020: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14039: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14023: \$? = $ac_status" >&5
+  echo "$as_me:14042: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:14025: result: yes" >&5
+  echo "$as_me:14044: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:14030: result: no" >&5
+echo "$as_me:14049: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -14053,10 +14072,10 @@
 	LIBS="-l$cf_lib $cf_save_LIBS"
 	for cf_func in tigetstr tgetstr
 	do
-		echo "$as_me:14056: checking for $cf_func in -l$cf_lib" >&5
+		echo "$as_me:14075: 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 14059 "configure"
+#line 14078 "configure"
 #include "confdefs.h"
 
 int
@@ -14068,16 +14087,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14071: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14090: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14074: \$? = $ac_status" >&5
+  echo "$as_me:14093: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14077: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14096: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14080: \$? = $ac_status" >&5
+  echo "$as_me:14099: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -14086,7 +14105,7 @@
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-		echo "$as_me:14089: result: $cf_result" >&5
+		echo "$as_me:14108: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 		if test "$cf_result" = yes ; then
 			if test "$cf_func" = tigetstr ; then
@@ -14103,7 +14122,7 @@
 fi
 if test "$cf_cv_termlib" = none; then
 	# allow curses library for broken AIX system.
-	echo "$as_me:14106: checking for initscr in -lcurses" >&5
+	echo "$as_me:14125: 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
@@ -14111,7 +14130,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 14114 "configure"
+#line 14133 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14130,16 +14149,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14133: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14152: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14136: \$? = $ac_status" >&5
+  echo "$as_me:14155: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14139: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14158: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14142: \$? = $ac_status" >&5
+  echo "$as_me:14161: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_curses_initscr=yes
 else
@@ -14150,13 +14169,13 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14153: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:14172: 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:14159: checking for tgoto in -ltermcap" >&5
+	echo "$as_me:14178: 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
@@ -14164,7 +14183,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 14167 "configure"
+#line 14186 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14183,16 +14202,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14186: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14205: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14189: \$? = $ac_status" >&5
+  echo "$as_me:14208: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14192: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14211: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14195: \$? = $ac_status" >&5
+  echo "$as_me:14214: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_termcap_tgoto=yes
 else
@@ -14203,7 +14222,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14206: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:14225: 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
@@ -14214,7 +14233,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 if test "$cf_cv_termlib" = none; then
-	{ echo "$as_me:14217: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+	{ echo "$as_me:14236: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
 echo "$as_me: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&2;}
 fi
 
@@ -14223,6 +14242,16 @@
 	;;
 esac
 
+# work around for broken FreeBSD header files (see tcap.h)
+case "$cf_cv_ncurses_version" in
+5.2.20020615)
+	cat >>confdefs.h <<\EOF
+#define FREEBSD_BROKE_NCURSES 1
+EOF
+
+	;;
+esac
+
 : Check for termcap vs terminfo:
 cf_tc_funcs=""
 cf_tc_externs=""
@@ -14234,7 +14263,7 @@
 
 cf_cv_termlib=none
 cat >conftest.$ac_ext <<_ACEOF
-#line 14237 "configure"
+#line 14266 "configure"
 #include "confdefs.h"
 
 int
@@ -14246,19 +14275,19 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14249: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14278: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14252: \$? = $ac_status" >&5
+  echo "$as_me:14281: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14255: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14284: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14258: \$? = $ac_status" >&5
+  echo "$as_me:14287: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 14261 "configure"
+#line 14290 "configure"
 #include "confdefs.h"
 
 int
@@ -14270,16 +14299,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14273: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14302: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14276: \$? = $ac_status" >&5
+  echo "$as_me:14305: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14279: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14308: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14282: \$? = $ac_status" >&5
+  echo "$as_me:14311: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termlib=terminfo
 else
@@ -14303,10 +14332,10 @@
 	LIBS="-l$cf_lib $cf_save_LIBS"
 	for cf_func in tigetstr tgetstr
 	do
-		echo "$as_me:14306: checking for $cf_func in -l$cf_lib" >&5
+		echo "$as_me:14335: 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 14309 "configure"
+#line 14338 "configure"
 #include "confdefs.h"
 
 int
@@ -14318,16 +14347,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14321: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14350: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14324: \$? = $ac_status" >&5
+  echo "$as_me:14353: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14327: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14356: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14330: \$? = $ac_status" >&5
+  echo "$as_me:14359: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -14336,7 +14365,7 @@
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-		echo "$as_me:14339: result: $cf_result" >&5
+		echo "$as_me:14368: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 		if test "$cf_result" = yes ; then
 			if test "$cf_func" = tigetstr ; then
@@ -14353,7 +14382,7 @@
 fi
 if test "$cf_cv_termlib" = none; then
 	# allow curses library for broken AIX system.
-	echo "$as_me:14356: checking for initscr in -lcurses" >&5
+	echo "$as_me:14385: 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
@@ -14361,7 +14390,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 14364 "configure"
+#line 14393 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14380,16 +14409,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14383: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14412: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14386: \$? = $ac_status" >&5
+  echo "$as_me:14415: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14389: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14418: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14392: \$? = $ac_status" >&5
+  echo "$as_me:14421: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_curses_initscr=yes
 else
@@ -14400,13 +14429,13 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14403: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:14432: 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:14409: checking for tgoto in -ltermcap" >&5
+	echo "$as_me:14438: 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
@@ -14414,7 +14443,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 14417 "configure"
+#line 14446 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14433,16 +14462,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14436: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14465: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14439: \$? = $ac_status" >&5
+  echo "$as_me:14468: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14442: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14471: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14445: \$? = $ac_status" >&5
+  echo "$as_me:14474: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_termcap_tgoto=yes
 else
@@ -14453,7 +14482,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14456: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:14485: 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
@@ -14464,7 +14493,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 if test "$cf_cv_termlib" = none; then
-	{ echo "$as_me:14467: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+	{ echo "$as_me:14496: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
 echo "$as_me: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&2;}
 fi
 
@@ -14486,7 +14515,7 @@
 elif test ".$cf_cv_termlib" = .termcap ; then
 	# BSD 'tputs()' may need 'PC' to be set.
 	cat >conftest.$ac_ext <<_ACEOF
-#line 14489 "configure"
+#line 14518 "configure"
 #include "confdefs.h"
 
 int
@@ -14498,16 +14527,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14501: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14530: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14504: \$? = $ac_status" >&5
+  echo "$as_me:14533: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14507: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14536: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14510: \$? = $ac_status" >&5
+  echo "$as_me:14539: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >>confdefs.h <<\EOF
 #define HAVE_EXTERN_TCAP_PC 1
@@ -14526,14 +14555,14 @@
 
 LIBS="$LIBS $X_EXTRA_LIBS"
 
-echo "$as_me:14529: checking for /dev/tty" >&5
+echo "$as_me:14558: 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:14536: result: $cf_result" >&5
+echo "$as_me:14565: 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`
@@ -14546,7 +14575,7 @@
 
 fi
 
-echo "$as_me:14549: checking for crypt function" >&5
+echo "$as_me:14578: 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
@@ -14554,7 +14583,7 @@
 
 cf_cv_crypt_func=
 cat >conftest.$ac_ext <<_ACEOF
-#line 14557 "configure"
+#line 14586 "configure"
 #include "confdefs.h"
 
 int
@@ -14566,16 +14595,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14569: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14598: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14572: \$? = $ac_status" >&5
+  echo "$as_me:14601: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14575: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14604: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14578: \$? = $ac_status" >&5
+  echo "$as_me:14607: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_crypt_func=yes
@@ -14586,7 +14615,7 @@
 	cf_save_LIBS="$LIBS"
 	LIBS="-lcrypt $LIBS"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 14589 "configure"
+#line 14618 "configure"
 #include "confdefs.h"
 
 int
@@ -14598,16 +14627,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14601: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14630: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14604: \$? = $ac_status" >&5
+  echo "$as_me:14633: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14607: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14636: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14610: \$? = $ac_status" >&5
+  echo "$as_me:14639: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 		cf_cv_crypt_func="-lcrypt"
@@ -14624,12 +14653,12 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:14627: result: $cf_cv_crypt_func" >&5
+echo "$as_me:14656: 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:14632: checking if crypt works" >&5
+echo "$as_me:14661: 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
@@ -14640,7 +14669,7 @@
 	cf_cv_crypt_works=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14643 "configure"
+#line 14672 "configure"
 #include "confdefs.h"
 
 #include <string.h>
@@ -14652,15 +14681,15 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:14655: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14684: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14658: \$? = $ac_status" >&5
+  echo "$as_me:14687: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:14660: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14689: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14663: \$? = $ac_status" >&5
+  echo "$as_me:14692: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_crypt_works=yes
@@ -14675,7 +14704,7 @@
 fi
 	LIBS="$cf_save_LIBS"
 fi
-echo "$as_me:14678: result: $cf_cv_crypt_works" >&5
+echo "$as_me:14707: 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
@@ -14688,14 +14717,14 @@
 	fi
 fi
 
-echo "$as_me:14691: checking for declaration of fd_set" >&5
+echo "$as_me:14720: 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 14698 "configure"
+#line 14727 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -14708,16 +14737,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14711: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14740: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14714: \$? = $ac_status" >&5
+  echo "$as_me:14743: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14717: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14746: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14720: \$? = $ac_status" >&5
+  echo "$as_me:14749: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_fd_set=sys/types.h
 else
@@ -14725,7 +14754,7 @@
 cat conftest.$ac_ext >&5
 echo "trying X11/Xpoll.h" 1>&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 14728 "configure"
+#line 14757 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_X11_XPOLL_H
@@ -14740,16 +14769,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14743: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14772: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14746: \$? = $ac_status" >&5
+  echo "$as_me:14775: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14749: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14778: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14752: \$? = $ac_status" >&5
+  echo "$as_me:14781: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_fd_set=X11/Xpoll.h
 else
@@ -14757,7 +14786,7 @@
 cat conftest.$ac_ext >&5
 echo "trying sys/select.h" 1>&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 14760 "configure"
+#line 14789 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -14771,16 +14800,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14774: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14803: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14777: \$? = $ac_status" >&5
+  echo "$as_me:14806: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14780: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14809: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14783: \$? = $ac_status" >&5
+  echo "$as_me:14812: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_fd_set=sys/select.h
 else
@@ -14794,7 +14823,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:14797: result: $cf_cv_type_fd_set" >&5
+echo "$as_me:14826: 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
@@ -14803,14 +14832,14 @@
 
 fi
 
-echo "$as_me:14806: checking for fd_set macros" >&5
+echo "$as_me:14835: 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 14813 "configure"
+#line 14842 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -14839,16 +14868,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14842: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14871: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14845: \$? = $ac_status" >&5
+  echo "$as_me:14874: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14848: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14877: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14851: \$? = $ac_status" >&5
+  echo "$as_me:14880: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_macros_fd_set=yes
 else
@@ -14858,7 +14887,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:14861: result: $cf_cv_macros_fd_set" >&5
+echo "$as_me:14890: 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
@@ -14905,13 +14934,13 @@
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:14908: checking for $ac_func" >&5
+echo "$as_me:14937: 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 14914 "configure"
+#line 14943 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -14942,16 +14971,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14945: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14974: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14948: \$? = $ac_status" >&5
+  echo "$as_me:14977: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14951: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14980: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14954: \$? = $ac_status" >&5
+  echo "$as_me:14983: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -14961,7 +14990,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:14964: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:14993: 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
@@ -14971,14 +15000,14 @@
 fi
 done
 
-echo "$as_me:14974: checking for standard qsort" >&5
+echo "$as_me:15003: 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 14981 "configure"
+#line 15010 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -14996,16 +15025,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14999: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15028: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15002: \$? = $ac_status" >&5
+  echo "$as_me:15031: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15005: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15034: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15008: \$? = $ac_status" >&5
+  echo "$as_me:15037: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ansi_qsort=yes
 else
@@ -15016,7 +15045,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:15019: result: $cf_cv_ansi_qsort" >&5
+echo "$as_me:15048: result: $cf_cv_ansi_qsort" >&5
 echo "${ECHO_T}$cf_cv_ansi_qsort" >&6
 
 if test $cf_cv_ansi_qsort = yes; then
@@ -15031,7 +15060,7 @@
 
 fi
 
-echo "$as_me:15034: checking for working mkstemp" >&5
+echo "$as_me:15063: 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
@@ -15039,13 +15068,13 @@
 
 rm -f conftest*
 if test "$cross_compiling" = yes; then
-  echo "$as_me:15042: checking for mkstemp" >&5
+  echo "$as_me:15071: 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 15048 "configure"
+#line 15077 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char mkstemp (); below.  */
@@ -15076,16 +15105,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15079: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15108: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15082: \$? = $ac_status" >&5
+  echo "$as_me:15111: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15085: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15114: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15088: \$? = $ac_status" >&5
+  echo "$as_me:15117: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_mkstemp=yes
 else
@@ -15095,12 +15124,12 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:15098: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:15127: result: $ac_cv_func_mkstemp" >&5
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15103 "configure"
+#line 15132 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -15138,15 +15167,15 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:15141: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15170: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15144: \$? = $ac_status" >&5
+  echo "$as_me:15173: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:15146: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15175: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15149: \$? = $ac_status" >&5
+  echo "$as_me:15178: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_func_mkstemp=yes
 
@@ -15161,7 +15190,7 @@
 fi
 
 fi
-echo "$as_me:15164: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:15193: 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
@@ -15179,7 +15208,7 @@
 cf_save_cppflags="${CPPFLAGS}"
 cf_save_ldflags="${LDFLAGS}"
 
-echo "$as_me:15182: checking if you want to use the Xpm library for colored icon" >&5
+echo "$as_me:15211: 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.
@@ -15189,7 +15218,7 @@
 else
   cf_Xpm_library=no
 fi;
-echo "$as_me:15192: result: $cf_Xpm_library" >&5
+echo "$as_me:15221: result: $cf_Xpm_library" >&5
 echo "${ECHO_T}$cf_Xpm_library" >&6
 
 if test "$cf_Xpm_library" != no ; then
@@ -15197,23 +15226,23 @@
 	CPPFLAGS="$CPPFLAGS -I$withval/include"
 	LDFLAGS="$LDFLAGS -L$withval/lib"
     fi
-    echo "$as_me:15200: checking for X11/xpm.h" >&5
+    echo "$as_me:15229: 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 15206 "configure"
+#line 15235 "configure"
 #include "confdefs.h"
 #include <X11/xpm.h>
 _ACEOF
-if { (eval echo "$as_me:15210: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:15239: \"$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:15216: \$? = $ac_status" >&5
+  echo "$as_me:15245: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15232,11 +15261,11 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:15235: result: $ac_cv_header_X11_xpm_h" >&5
+echo "$as_me:15264: 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:15239: checking for XpmCreatePixmapFromData in -lXpm" >&5
+	echo "$as_me:15268: 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
@@ -15244,7 +15273,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXpm -lX11 $X_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 15247 "configure"
+#line 15276 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15263,16 +15292,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15266: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15295: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15269: \$? = $ac_status" >&5
+  echo "$as_me:15298: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15272: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15301: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15275: \$? = $ac_status" >&5
+  echo "$as_me:15304: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xpm_XpmCreatePixmapFromData=yes
 else
@@ -15283,7 +15312,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15286: result: $ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&5
+echo "$as_me:15315: 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
 
@@ -15304,7 +15333,7 @@
 fi
 
 if test -n "$cf_x_athena" ; then
-    echo "$as_me:15307: checking if you want to use Xaw scrollbars rather than our own" >&5
+    echo "$as_me:15336: 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.
@@ -15314,7 +15343,7 @@
 else
   cf_Xaw_scrollbars=no
 fi;
-    echo "$as_me:15317: result: $cf_Xaw_scrollbars" >&5
+    echo "$as_me:15346: result: $cf_Xaw_scrollbars" >&5
 echo "${ECHO_T}$cf_Xaw_scrollbars" >&6
 
     if test "$cf_Xaw_scrollbars" = no ; then
@@ -15331,7 +15360,7 @@
 #define OPT_XAW_SCROLLBARS 1
 EOF
 
-	echo "$as_me:15334: checking if you want to use the drag/scrolling extension with Xaw" >&5
+	echo "$as_me:15363: 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.
@@ -15341,7 +15370,7 @@
 else
   cf_drag_extension=no
 fi;
-	echo "$as_me:15344: result: $cf_drag_extension" >&5
+	echo "$as_me:15373: result: $cf_drag_extension" >&5
 echo "${ECHO_T}$cf_drag_extension" >&6
 	if test "$cf_drag_extension" != "no" ; then
 	    cat >>confdefs.h <<\EOF
@@ -15354,7 +15383,7 @@
 
 fi
 
-echo "$as_me:15357: checking if you want to change the number of exec-macros" >&5
+echo "$as_me:15386: 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.
@@ -15364,144 +15393,12 @@
 else
   cf_exec_macros=no
 fi;
-echo "$as_me:15367: result: $cf_exec_macros" >&5
+echo "$as_me:15396: result: $cf_exec_macros" >&5
 echo "${ECHO_T}$cf_exec_macros" >&6
 test "$cf_exec_macros" != no && cat >>confdefs.h <<EOF
 #define OPT_EXEC_MACROS $cf_exec_macros
 EOF
 
-	echo "$as_me:15373: checking for _LARGEFILE_SOURCE value needed for large files" >&5
-echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
-if test "${ac_cv_sys_largefile_source+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  while :; do
-  ac_cv_sys_largefile_source=no
-  cat >conftest.$ac_ext <<_ACEOF
-#line 15381 "configure"
-#include "confdefs.h"
-#include <stdio.h>
-int
-main ()
-{
-return !fseeko;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15393: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:15396: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15399: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:15402: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  break
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-#line 15411 "configure"
-#include "confdefs.h"
-#define _LARGEFILE_SOURCE 1
-#include <stdio.h>
-int
-main ()
-{
-return !fseeko;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15424: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:15427: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15430: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:15433: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sys_largefile_source=1; break
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-  break
-done
-fi
-echo "$as_me:15444: result: $ac_cv_sys_largefile_source" >&5
-echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
-if test "$ac_cv_sys_largefile_source" != no; then
-
-cat >>confdefs.h <<EOF
-#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source
-EOF
-
-fi
-rm -f conftest*
-
-# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
-# in glibc 2.1.3, but that breaks too many other things.
-# If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-echo "$as_me:15458: checking for fseeko" >&5
-echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
-if test "${ac_cv_func_fseeko+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line 15464 "configure"
-#include "confdefs.h"
-#include <stdio.h>
-int
-main ()
-{
-return fseeko && fseeko (stdin, 0, 0);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15476: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:15479: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15482: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:15485: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_fseeko=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_func_fseeko=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:15495: result: $ac_cv_func_fseeko" >&5
-echo "${ECHO_T}$ac_cv_func_fseeko" >&6
-if test $ac_cv_func_fseeko = yes; then
-
-cat >>confdefs.h <<\EOF
-#define HAVE_FSEEKO 1
-EOF
-
-fi
-
 # Check whether --enable-largefile or --disable-largefile was given.
 if test "${enable_largefile+set}" = set; then
   enableval="$enable_largefile"
@@ -15509,7 +15406,7 @@
 fi;
 if test "$enable_largefile" != no; then
 
-  echo "$as_me:15512: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:15409: checking for special C compiler options needed for large files" >&5
 echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_largefile_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15521,7 +15418,7 @@
      	 # IRIX 6.2 and later do not support large files by default,
      	 # so use the C compiler's -n32 option if that helps.
          cat >conftest.$ac_ext <<_ACEOF
-#line 15524 "configure"
+#line 15421 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -15541,16 +15438,16 @@
 }
 _ACEOF
      	 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15544: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15441: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15547: \$? = $ac_status" >&5
+  echo "$as_me:15444: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15550: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15447: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15553: \$? = $ac_status" >&5
+  echo "$as_me:15450: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -15560,16 +15457,16 @@
 rm -f conftest.$ac_objext
      	 CC="$CC -n32"
      	 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15563: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15460: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15566: \$? = $ac_status" >&5
+  echo "$as_me:15463: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15569: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15466: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15572: \$? = $ac_status" >&5
+  echo "$as_me:15469: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else
@@ -15583,13 +15480,13 @@
        rm -f conftest.$ac_ext
     fi
 fi
-echo "$as_me:15586: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:15483: result: $ac_cv_sys_largefile_CC" >&5
 echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
   if test "$ac_cv_sys_largefile_CC" != no; then
     CC=$CC$ac_cv_sys_largefile_CC
   fi
 
-  echo "$as_me:15592: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:15489: checking for _FILE_OFFSET_BITS value needed for large files" >&5
 echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_file_offset_bits+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15597,7 +15494,7 @@
   while :; do
   ac_cv_sys_file_offset_bits=no
   cat >conftest.$ac_ext <<_ACEOF
-#line 15600 "configure"
+#line 15497 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -15617,16 +15514,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15620: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15517: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15623: \$? = $ac_status" >&5
+  echo "$as_me:15520: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15626: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15523: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15629: \$? = $ac_status" >&5
+  echo "$as_me:15526: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -15635,7 +15532,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 15638 "configure"
+#line 15535 "configure"
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -15656,16 +15553,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15659: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15556: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15662: \$? = $ac_status" >&5
+  echo "$as_me:15559: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15665: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15562: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15668: \$? = $ac_status" >&5
+  echo "$as_me:15565: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else
@@ -15676,7 +15573,7 @@
   break
 done
 fi
-echo "$as_me:15679: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:15576: result: $ac_cv_sys_file_offset_bits" >&5
 echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
 if test "$ac_cv_sys_file_offset_bits" != no; then
 
@@ -15686,7 +15583,7 @@
 
 fi
 rm -f conftest*
-  echo "$as_me:15689: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:15586: checking for _LARGE_FILES value needed for large files" >&5
 echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_large_files+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15694,7 +15591,7 @@
   while :; do
   ac_cv_sys_large_files=no
   cat >conftest.$ac_ext <<_ACEOF
-#line 15697 "configure"
+#line 15594 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -15714,16 +15611,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15717: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15614: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15720: \$? = $ac_status" >&5
+  echo "$as_me:15617: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15723: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15620: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15726: \$? = $ac_status" >&5
+  echo "$as_me:15623: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -15732,7 +15629,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 15735 "configure"
+#line 15632 "configure"
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
@@ -15753,16 +15650,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15756: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15653: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15759: \$? = $ac_status" >&5
+  echo "$as_me:15656: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15762: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15659: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15765: \$? = $ac_status" >&5
+  echo "$as_me:15662: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_large_files=1; break
 else
@@ -15773,7 +15670,7 @@
   break
 done
 fi
-echo "$as_me:15776: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:15673: result: $ac_cv_sys_large_files" >&5
 echo "${ECHO_T}$ac_cv_sys_large_files" >&6
 if test "$ac_cv_sys_large_files" != no; then
 
@@ -15785,6 +15682,139 @@
 rm -f conftest*
 fi
 
+    if test "$enable_largefile" != no ; then
+	echo "$as_me:15686: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
+if test "${ac_cv_sys_largefile_source+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  while :; do
+  ac_cv_sys_largefile_source=no
+  cat >conftest.$ac_ext <<_ACEOF
+#line 15694 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+int
+main ()
+{
+return !fseeko;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:15706: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:15709: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:15712: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:15715: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  break
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+#line 15724 "configure"
+#include "confdefs.h"
+#define _LARGEFILE_SOURCE 1
+#include <stdio.h>
+int
+main ()
+{
+return !fseeko;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:15737: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:15740: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:15743: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:15746: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_sys_largefile_source=1; break
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+  break
+done
+fi
+echo "$as_me:15757: result: $ac_cv_sys_largefile_source" >&5
+echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
+if test "$ac_cv_sys_largefile_source" != no; then
+
+cat >>confdefs.h <<EOF
+#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source
+EOF
+
+fi
+rm -f conftest*
+
+# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
+# in glibc 2.1.3, but that breaks too many other things.
+# If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
+echo "$as_me:15771: checking for fseeko" >&5
+echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
+if test "${ac_cv_func_fseeko+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 15777 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+int
+main ()
+{
+return fseeko && fseeko (stdin, 0, 0);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:15789: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:15792: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:15795: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:15798: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_fseeko=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_func_fseeko=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:15808: result: $ac_cv_func_fseeko" >&5
+echo "${ECHO_T}$ac_cv_func_fseeko" >&6
+if test $ac_cv_func_fseeko = yes; then
+
+cat >>confdefs.h <<\EOF
+#define HAVE_FSEEKO 1
+EOF
+
+fi
+
 	# Normally we would collect these definitions in the config.h,
 	# but (like _XOPEN_SOURCE), some environments rely on having these
 	# defined before any of the system headers are included.  Another
@@ -15795,14 +15825,14 @@
 	test "$ac_cv_sys_large_files"      != no && CPPFLAGS="$CPPFLAGS -D_LARGE_FILES "
 	test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE "
 
-	echo "$as_me:15798: checking whether to use struct dirent64" >&5
+	echo "$as_me:15828: checking whether to use struct dirent64" >&5
 echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6
 if test "${cf_cv_struct_dirent64+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 15805 "configure"
+#line 15835 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -15823,16 +15853,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15826: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15856: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15829: \$? = $ac_status" >&5
+  echo "$as_me:15859: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15832: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15862: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15835: \$? = $ac_status" >&5
+  echo "$as_me:15865: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_struct_dirent64=yes
 else
@@ -15843,23 +15873,25 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:15846: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:15876: result: $cf_cv_struct_dirent64" >&5
 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
 	test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF
 #define HAVE_STRUCT_DIRENT64 1
 EOF
 
+    fi
+
 # 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:15855: checking for setlocale()" >&5
+echo "$as_me:15887: 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 15862 "configure"
+#line 15894 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int
@@ -15871,16 +15903,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15874: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15906: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15877: \$? = $ac_status" >&5
+  echo "$as_me:15909: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15880: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15912: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15883: \$? = $ac_status" >&5
+  echo "$as_me:15915: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_locale=yes
 else
@@ -15892,7 +15924,7 @@
 
 fi
 
-echo "$as_me:15895: result: $cf_cv_locale" >&5
+echo "$as_me:15927: result: $cf_cv_locale" >&5
 echo "${ECHO_T}$cf_cv_locale" >&6
 test $cf_cv_locale = yes && { cat >>confdefs.h <<\EOF
 #define LOCALE 1
@@ -15900,7 +15932,7 @@
  }
 
 if test $cf_cv_locale = yes ; then
-echo "$as_me:15903: checking if you want to use i18n locale support" >&5
+echo "$as_me:15935: 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.
@@ -15910,7 +15942,7 @@
 else
   cf_locale=yes
 fi;
-echo "$as_me:15913: result: $cf_locale" >&5
+echo "$as_me:15945: result: $cf_locale" >&5
 echo "${ECHO_T}$cf_locale" >&6
 if test "$cf_locale" != no ; then
 	cat >>confdefs.h <<\EOF
@@ -15919,13 +15951,13 @@
 
 	eval 'cf_cv_have_lib_'iconv'=no'
 	cf_libdir=""
-	echo "$as_me:15922: checking for iconv" >&5
+	echo "$as_me:15954: checking for iconv" >&5
 echo $ECHO_N "checking for iconv... $ECHO_C" >&6
 if test "${ac_cv_func_iconv+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15928 "configure"
+#line 15960 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char iconv (); below.  */
@@ -15956,16 +15988,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15959: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15991: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15962: \$? = $ac_status" >&5
+  echo "$as_me:15994: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15965: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15997: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15968: \$? = $ac_status" >&5
+  echo "$as_me:16000: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_iconv=yes
 else
@@ -15975,18 +16007,18 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:15978: result: $ac_cv_func_iconv" >&5
+echo "$as_me:16010: result: $ac_cv_func_iconv" >&5
 echo "${ECHO_T}$ac_cv_func_iconv" >&6
 if test $ac_cv_func_iconv = yes; then
   eval 'cf_cv_have_lib_'iconv'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:15985: checking for iconv in -liconv" >&5
+		echo "$as_me:16017: checking for iconv in -liconv" >&5
 echo $ECHO_N "checking for iconv in -liconv... $ECHO_C" >&6
 		LIBS="-liconv $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 15989 "configure"
+#line 16021 "configure"
 #include "confdefs.h"
 #include <iconv.h>
 int
@@ -15998,25 +16030,25 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16001: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16033: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16004: \$? = $ac_status" >&5
+  echo "$as_me:16036: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16007: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16039: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16010: \$? = $ac_status" >&5
+  echo "$as_me:16042: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:16012: result: yes" >&5
+  echo "$as_me:16044: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'iconv'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:16019: result: no" >&5
+echo "$as_me:16051: result: no" >&5
 echo "${ECHO_T}no" >&6
 			cf_search=""
 
@@ -16076,11 +16108,11 @@
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:16079: checking for -liconv in $cf_libdir" >&5
+				echo "$as_me:16111: checking for -liconv in $cf_libdir" >&5
 echo $ECHO_N "checking for -liconv in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -liconv $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 16083 "configure"
+#line 16115 "configure"
 #include "confdefs.h"
 #include <iconv.h>
 int
@@ -16092,25 +16124,25 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16095: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16127: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16098: \$? = $ac_status" >&5
+  echo "$as_me:16130: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16101: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16133: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16104: \$? = $ac_status" >&5
+  echo "$as_me:16136: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:16106: result: yes" >&5
+  echo "$as_me:16138: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'iconv'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:16113: result: no" >&5
+echo "$as_me:16145: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -16124,7 +16156,7 @@
 
 eval 'cf_found_library=$cf_cv_have_lib_'iconv
 
-echo "$as_me:16127: checking for iconv function library" >&5
+echo "$as_me:16159: checking for iconv function library" >&5
 echo $ECHO_N "checking for iconv function library... $ECHO_C" >&6
 if test "${cf_cv_func_iconv+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16137,11 +16169,11 @@
 	fi
 
 fi
-echo "$as_me:16140: result: $cf_cv_func_iconv" >&5
+echo "$as_me:16172: result: $cf_cv_func_iconv" >&5
 echo "${ECHO_T}$cf_cv_func_iconv" >&6
 
 if test "$cf_cv_func_iconv" != no ; then
-echo "$as_me:16144: checking if you want to use iconv() for locale support" >&5
+echo "$as_me:16176: checking if you want to use iconv() for locale support" >&5
 echo $ECHO_N "checking if you want to use iconv() for locale support... $ECHO_C" >&6
 
 # Check whether --with-iconv or --without-iconv was given.
@@ -16151,7 +16183,7 @@
 else
   cf_func_iconv=yes
 fi;
-echo "$as_me:16154: result: $cf_func_iconv" >&5
+echo "$as_me:16186: result: $cf_func_iconv" >&5
 echo "${ECHO_T}$cf_func_iconv" >&6
 if test "$cf_func_iconv" = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -16166,7 +16198,7 @@
 
 ###	Debugging/development options
 
-echo "$as_me:16169: checking if you want to link with dbmalloc for testing" >&5
+echo "$as_me:16201: 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.
@@ -16176,26 +16208,26 @@
 else
   with_dbmalloc=no
 fi;
-echo "$as_me:16179: result: $with_dbmalloc" >&5
+echo "$as_me:16211: result: $with_dbmalloc" >&5
 echo "${ECHO_T}$with_dbmalloc" >&6
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:16182: checking for dbmalloc.h" >&5
+	echo "$as_me:16214: checking for dbmalloc.h" >&5
 echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6
 if test "${ac_cv_header_dbmalloc_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 16188 "configure"
+#line 16220 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:16192: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:16224: \"$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:16198: \$? = $ac_status" >&5
+  echo "$as_me:16230: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -16214,11 +16246,11 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:16217: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:16249: result: $ac_cv_header_dbmalloc_h" >&5
 echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6
 if test $ac_cv_header_dbmalloc_h = yes; then
 
-echo "$as_me:16221: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:16253: 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
@@ -16226,7 +16258,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 16229 "configure"
+#line 16261 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16245,16 +16277,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16248: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16280: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16251: \$? = $ac_status" >&5
+  echo "$as_me:16283: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16254: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16286: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16257: \$? = $ac_status" >&5
+  echo "$as_me:16289: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -16265,7 +16297,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16268: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:16300: 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
@@ -16280,7 +16312,7 @@
 
 fi
 
-echo "$as_me:16283: checking if you want to link with dmalloc for testing" >&5
+echo "$as_me:16315: 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.
@@ -16290,26 +16322,26 @@
 else
   with_dmalloc=no
 fi;
-echo "$as_me:16293: result: $with_dmalloc" >&5
+echo "$as_me:16325: result: $with_dmalloc" >&5
 echo "${ECHO_T}$with_dmalloc" >&6
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:16296: checking for dmalloc.h" >&5
+	echo "$as_me:16328: checking for dmalloc.h" >&5
 echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6
 if test "${ac_cv_header_dmalloc_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 16302 "configure"
+#line 16334 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:16306: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:16338: \"$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:16312: \$? = $ac_status" >&5
+  echo "$as_me:16344: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -16328,11 +16360,11 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:16331: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:16363: result: $ac_cv_header_dmalloc_h" >&5
 echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6
 if test $ac_cv_header_dmalloc_h = yes; then
 
-echo "$as_me:16335: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:16367: 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
@@ -16340,7 +16372,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 16343 "configure"
+#line 16375 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16359,16 +16391,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16362: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16394: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16365: \$? = $ac_status" >&5
+  echo "$as_me:16397: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16368: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16400: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16371: \$? = $ac_status" >&5
+  echo "$as_me:16403: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -16379,7 +16411,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16382: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:16414: 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
@@ -16453,17 +16485,17 @@
 
 GCC_VERSION=none
 if test "$GCC" = yes ; then
-	echo "$as_me:16456: checking version of $CC" >&5
+	echo "$as_me:16488: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	GCC_VERSION="`${CC} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
-	echo "$as_me:16460: result: $GCC_VERSION" >&5
+	echo "$as_me:16492: result: $GCC_VERSION" >&5
 echo "${ECHO_T}$GCC_VERSION" >&6
 fi
 
 if ( test "$GCC" = yes || test "$GXX" = yes )
 then
-echo "$as_me:16466: checking if you want to check for gcc warnings" >&5
+echo "$as_me:16498: 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.
@@ -16473,7 +16505,7 @@
 else
   cf_opt_with_warnings=no
 fi;
-echo "$as_me:16476: result: $cf_opt_with_warnings" >&5
+echo "$as_me:16508: result: $cf_opt_with_warnings" >&5
 echo "${ECHO_T}$cf_opt_with_warnings" >&6
 if test "$cf_opt_with_warnings" != no ; then
 
@@ -16495,10 +16527,10 @@
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:16498: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:16530: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > conftest.$ac_ext <<EOF
-#line 16501 "configure"
+#line 16533 "configure"
 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"
@@ -16536,12 +16568,12 @@
 EOF
 			;;
 		esac
-		if { (eval echo "$as_me:16539: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:16571: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16542: \$? = $ac_status" >&5
+  echo "$as_me:16574: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-			test -n "$verbose" && echo "$as_me:16544: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:16576: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 		fi
@@ -16557,12 +16589,12 @@
 if test "$GCC" = yes ; then
 	case $host_os in
 	linux*|gnu*)
-		echo "$as_me:16560: checking if this is really Intel C compiler" >&5
+		echo "$as_me:16592: checking if this is really Intel C compiler" >&5
 echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS -no-gcc"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 16565 "configure"
+#line 16597 "configure"
 #include "confdefs.h"
 
 int
@@ -16579,16 +16611,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16582: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16614: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16585: \$? = $ac_status" >&5
+  echo "$as_me:16617: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16588: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16620: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16591: \$? = $ac_status" >&5
+  echo "$as_me:16623: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
@@ -16599,14 +16631,14 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 		CFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:16602: result: $INTEL_COMPILER" >&5
+		echo "$as_me:16634: result: $INTEL_COMPILER" >&5
 echo "${ECHO_T}$INTEL_COMPILER" >&6
 		;;
 	esac
 fi
 
 cat > conftest.$ac_ext <<EOF
-#line 16609 "configure"
+#line 16641 "configure"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 
@@ -16624,7 +16656,7 @@
 # remark #981: operands are evaluated in unspecified order
 # warning #269: invalid format string conversion
 
-	{ echo "$as_me:16627: checking for $CC warning options..." >&5
+	{ echo "$as_me:16659: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="-Wall"
@@ -16641,12 +16673,12 @@
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:16644: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:16676: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16647: \$? = $ac_status" >&5
+  echo "$as_me:16679: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-			test -n "$verbose" && echo "$as_me:16649: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:16681: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -16655,7 +16687,7 @@
 
 elif test "$GCC" = yes
 then
-	{ echo "$as_me:16658: checking for $CC warning options..." >&5
+	{ echo "$as_me:16690: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="-W -Wall"
@@ -16675,12 +16707,12 @@
 		Wundef $cf_warn_CONST
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:16678: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:16710: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16681: \$? = $ac_status" >&5
+  echo "$as_me:16713: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-			test -n "$verbose" && echo "$as_me:16683: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:16715: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case $cf_opt in #(vi
 			Wcast-qual) #(vi
@@ -16730,7 +16762,7 @@
 
 ac_tr_func=`echo "$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-echo "$as_me:16733: checking for missing \"${ac_func}\" extern" >&5
+echo "$as_me:16765: 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
@@ -16739,7 +16771,7 @@
 cf_save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $CHECK_DECL_FLAG"
 cat >conftest.$ac_ext <<_ACEOF
-#line 16742 "configure"
+#line 16774 "configure"
 #include "confdefs.h"
 
 $CHECK_DECL_HDRS
@@ -16761,16 +16793,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16764: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16796: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16767: \$? = $ac_status" >&5
+  echo "$as_me:16799: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16770: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16802: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16773: \$? = $ac_status" >&5
+  echo "$as_me:16805: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval 'cf_cv_func_'${ac_func}'=yes'
 else
@@ -16784,7 +16816,7 @@
 fi
 
 eval 'cf_result=$cf_cv_func_'${ac_func}
-echo "$as_me:16787: result: $cf_result" >&5
+echo "$as_me:16819: 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
@@ -16798,7 +16830,7 @@
 #include <tcap.h>
 "
 
-echo "$as_me:16801: checking for term.h" >&5
+echo "$as_me:16833: 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
@@ -16811,7 +16843,7 @@
 	term.h
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 16814 "configure"
+#line 16846 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -16825,16 +16857,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16828: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16860: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16831: \$? = $ac_status" >&5
+  echo "$as_me:16863: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16834: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16866: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16837: \$? = $ac_status" >&5
+  echo "$as_me:16869: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_term_header=$cf_header
 	 break
@@ -16847,7 +16879,7 @@
 done
 
 fi
-echo "$as_me:16850: result: $cf_cv_term_header" >&5
+echo "$as_me:16882: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 case $cf_cv_term_header in #(vi
@@ -16871,7 +16903,7 @@
 	;;
 esac
 
-echo "$as_me:16874: checking if we should include curses.h or termcap.h" >&5
+echo "$as_me:16906: 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
@@ -16890,7 +16922,7 @@
     test -n "$cf_t_opts" && CPPFLAGS="$CPPFLAGS -D$cf_t_opts"
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 16893 "configure"
+#line 16925 "configure"
 #include "confdefs.h"
 /* $cf_c_opts $cf_t_opts */
 $CHECK_DECL_HDRS
@@ -16903,16 +16935,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16906: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16938: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16909: \$? = $ac_status" >&5
+  echo "$as_me:16941: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16912: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16944: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16915: \$? = $ac_status" >&5
+  echo "$as_me:16947: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   test "$cf_cv_need_curses_h" = no && {
 	     cf_cv_need_curses_h=maybe
@@ -16924,7 +16956,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 16927 "configure"
+#line 16959 "configure"
 #include "confdefs.h"
 
 $CHECK_DECL_HDRS
@@ -16937,16 +16969,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16940: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16972: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16943: \$? = $ac_status" >&5
+  echo "$as_me:16975: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16946: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16978: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16949: \$? = $ac_status" >&5
+  echo "$as_me:16981: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_curses_h=yes
 	 cf_ok_c_opts=$cf_c_opts
@@ -16983,7 +17015,7 @@
 fi
 
 fi
-echo "$as_me:16986: result: $cf_cv_need_curses_h" >&5
+echo "$as_me:17018: result: $cf_cv_need_curses_h" >&5
 echo "${ECHO_T}$cf_cv_need_curses_h" >&6
 
 case $cf_cv_need_curses_h in
@@ -17017,7 +17049,7 @@
 	;;
 esac
 
-echo "$as_me:17020: checking declaration of tputs 3rd param" >&5
+echo "$as_me:17052: 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
@@ -17033,10 +17065,10 @@
 for R in int char; do
 for S in "" const; do
 
-echo "(line 17036) testing loop variables P:$P, Q:$Q, R:$R, S:$S ..." 1>&5
+echo "(line 17068) testing loop variables P:$P, Q:$Q, R:$R, S:$S ..." 1>&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 17039 "configure"
+#line 17071 "configure"
 #include "confdefs.h"
 $CHECK_DECL_HDRS
 int
@@ -17050,16 +17082,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17053: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17085: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17056: \$? = $ac_status" >&5
+  echo "$as_me:17088: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17059: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17091: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17062: \$? = $ac_status" >&5
+  echo "$as_me:17094: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_outchar="$Q OutChar($R)"
 	 cf_cv_found=yes
@@ -17078,7 +17110,7 @@
 done
 
 fi
-echo "$as_me:17081: result: $cf_cv_type_outchar" >&5
+echo "$as_me:17113: result: $cf_cv_type_outchar" >&5
 echo "${ECHO_T}$cf_cv_type_outchar" >&6
 
 case $cf_cv_type_outchar in
@@ -17110,7 +17142,7 @@
 
 ac_tr_func=`echo "$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-echo "$as_me:17113: checking for missing \"${ac_func}\" extern" >&5
+echo "$as_me:17145: 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
@@ -17119,7 +17151,7 @@
 cf_save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $CHECK_DECL_FLAG"
 cat >conftest.$ac_ext <<_ACEOF
-#line 17122 "configure"
+#line 17154 "configure"
 #include "confdefs.h"
 
 $CHECK_DECL_HDRS
@@ -17141,16 +17173,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17144: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17176: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17147: \$? = $ac_status" >&5
+  echo "$as_me:17179: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17150: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17182: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17153: \$? = $ac_status" >&5
+  echo "$as_me:17185: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval 'cf_cv_func_'${ac_func}'=yes'
 else
@@ -17164,7 +17196,7 @@
 fi
 
 eval 'cf_result=$cf_cv_func_'${ac_func}
-echo "$as_me:17167: result: $cf_result" >&5
+echo "$as_me:17199: 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
@@ -17240,7 +17272,7 @@
 
 ac_tr_func=`echo "$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-echo "$as_me:17243: checking for missing \"${ac_func}\" extern" >&5
+echo "$as_me:17275: 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
@@ -17249,7 +17281,7 @@
 cf_save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $CHECK_DECL_FLAG"
 cat >conftest.$ac_ext <<_ACEOF
-#line 17252 "configure"
+#line 17284 "configure"
 #include "confdefs.h"
 
 $CHECK_DECL_HDRS
@@ -17271,16 +17303,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17274: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17306: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17277: \$? = $ac_status" >&5
+  echo "$as_me:17309: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17280: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17312: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17283: \$? = $ac_status" >&5
+  echo "$as_me:17315: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval 'cf_cv_func_'${ac_func}'=yes'
 else
@@ -17294,7 +17326,7 @@
 fi
 
 eval 'cf_result=$cf_cv_func_'${ac_func}
-echo "$as_me:17297: result: $cf_result" >&5
+echo "$as_me:17329: 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
@@ -17314,7 +17346,7 @@
 
 ac_tr_func=`echo "$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-echo "$as_me:17317: checking for missing \"${ac_func}\" extern" >&5
+echo "$as_me:17349: 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
@@ -17323,7 +17355,7 @@
 cf_save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $CHECK_DECL_FLAG"
 cat >conftest.$ac_ext <<_ACEOF
-#line 17326 "configure"
+#line 17358 "configure"
 #include "confdefs.h"
 
 $CHECK_DECL_HDRS
@@ -17345,16 +17377,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17348: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17380: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17351: \$? = $ac_status" >&5
+  echo "$as_me:17383: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17354: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17386: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17357: \$? = $ac_status" >&5
+  echo "$as_me:17389: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval 'cf_cv_func_'${ac_func}'=yes'
 else
@@ -17368,7 +17400,7 @@
 fi
 
 eval 'cf_result=$cf_cv_func_'${ac_func}
-echo "$as_me:17371: result: $cf_result" >&5
+echo "$as_me:17403: 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
@@ -17425,13 +17457,13 @@
 if test "$cf_need_libdl" = yes ; then
 
 cf_have_dlsym=no
-echo "$as_me:17428: checking for dlsym" >&5
+echo "$as_me:17460: checking for dlsym" >&5
 echo $ECHO_N "checking for dlsym... $ECHO_C" >&6
 if test "${ac_cv_func_dlsym+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 17434 "configure"
+#line 17466 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dlsym (); below.  */
@@ -17462,16 +17494,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17465: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17497: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17468: \$? = $ac_status" >&5
+  echo "$as_me:17500: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17471: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17503: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17474: \$? = $ac_status" >&5
+  echo "$as_me:17506: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_dlsym=yes
 else
@@ -17481,14 +17513,14 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:17484: result: $ac_cv_func_dlsym" >&5
+echo "$as_me:17516: result: $ac_cv_func_dlsym" >&5
 echo "${ECHO_T}$ac_cv_func_dlsym" >&6
 if test $ac_cv_func_dlsym = yes; then
   cf_have_dlsym=yes
 else
 
 cf_have_libdl=no
-echo "$as_me:17491: checking for dlsym in -ldl" >&5
+echo "$as_me:17523: 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
@@ -17496,7 +17528,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 17499 "configure"
+#line 17531 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17515,16 +17547,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17518: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17550: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17521: \$? = $ac_status" >&5
+  echo "$as_me:17553: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17524: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17556: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17527: \$? = $ac_status" >&5
+  echo "$as_me:17559: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dl_dlsym=yes
 else
@@ -17535,7 +17567,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17538: result: $ac_cv_lib_dl_dlsym" >&5
+echo "$as_me:17570: 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
 
@@ -17548,10 +17580,10 @@
 if test "$cf_have_dlsym" = yes ; then
 	test "$cf_have_libdl" = yes && LIBS="-ldl $LIBS"
 
-	echo "$as_me:17551: checking whether able to link to dl*() functions" >&5
+	echo "$as_me:17583: checking whether able to link to dl*() functions" >&5
 echo $ECHO_N "checking whether able to link to dl*() functions... $ECHO_C" >&6
 	cat >conftest.$ac_ext <<_ACEOF
-#line 17554 "configure"
+#line 17586 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 int
@@ -17569,16 +17601,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17572: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17604: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17575: \$? = $ac_status" >&5
+  echo "$as_me:17607: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17578: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17610: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17581: \$? = $ac_status" >&5
+  echo "$as_me:17613: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 		cat >>confdefs.h <<\EOF
@@ -17589,15 +17621,15 @@
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-		{ { echo "$as_me:17592: error: Cannot link test program for libdl" >&5
+		{ { echo "$as_me:17624: error: Cannot link test program for libdl" >&5
 echo "$as_me: error: Cannot link test program for libdl" >&2;}
    { (exit 1); exit 1; }; }
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-	echo "$as_me:17597: result: ok" >&5
+	echo "$as_me:17629: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 else
-	{ { echo "$as_me:17600: error: Cannot find dlsym function" >&5
+	{ { echo "$as_me:17632: error: Cannot find dlsym function" >&5
 echo "$as_me: error: Cannot find dlsym function" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -17612,10 +17644,10 @@
 		cf_opt_rdynamic=no
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="-Wall -rdynamic $CFLAGS"
-		echo "$as_me:17615: checking if gcc has -rdynamic option" >&5
+		echo "$as_me:17647: checking if gcc has -rdynamic option" >&5
 echo $ECHO_N "checking if gcc has -rdynamic option... $ECHO_C" >&6
 		cat >conftest.$ac_ext <<_ACEOF
-#line 17618 "configure"
+#line 17650 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -17627,16 +17659,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17630: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17662: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17633: \$? = $ac_status" >&5
+  echo "$as_me:17665: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17636: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17668: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17639: \$? = $ac_status" >&5
+  echo "$as_me:17671: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_opt_rdynamic=yes
 else
@@ -17645,7 +17677,7 @@
 cf_opt_rdynamic=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-		echo "$as_me:17648: result: $cf_opt_rdynamic" >&5
+		echo "$as_me:17680: result: $cf_opt_rdynamic" >&5
 echo "${ECHO_T}$cf_opt_rdynamic" >&6
 		test "$cf_opt_rdynamic" = no && CFLAGS="$cf_save_CFLAGS"
 
@@ -17658,11 +17690,11 @@
 	fi
 fi
 
-for ac_prog in ispell spell
+for ac_prog in aspell 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:17665: checking for $ac_word" >&5
+echo "$as_me:17697: 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
@@ -17677,7 +17709,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:17680: found $ac_dir/$ac_word" >&5
+echo "$as_me:17712: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -17685,10 +17717,10 @@
 fi
 SPELL_PROG=$ac_cv_prog_SPELL_PROG
 if test -n "$SPELL_PROG"; then
-  echo "$as_me:17688: result: $SPELL_PROG" >&5
+  echo "$as_me:17720: result: $SPELL_PROG" >&5
 echo "${ECHO_T}$SPELL_PROG" >&6
 else
-  echo "$as_me:17691: result: no" >&5
+  echo "$as_me:17723: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -17696,15 +17728,24 @@
 done
 
 case .$SPELL_PROG in
-.ispell) cat >>confdefs.h <<\EOF
-#define ISPELL_PROG 1
+.aspell)
+	SPELL_OPTS="-x list"
+	;;
+.ispell)
+	SPELL_OPTS="-l -x"
+	;;
+*)
+	SPELL_PROG="spell"
+	SPELL_OPTS="-l"
+	;;
+esac
+cat >>confdefs.h <<EOF
+#define SPELL_PROG "$SPELL_PROG"
 EOF
-;;
-.spell) cat >>confdefs.h <<\EOF
-#define SPELL_PROG 1
+
+cat >>confdefs.h <<EOF
+#define SPELL_OPTS "$SPELL_OPTS"
 EOF
-;;
-esac
 
 filters_bindir=`echo "$VILE_LIBDIR_PATH" | sed -e 's%'$PATHSEP'.*%%'`
 echo "Computing location to install filter programs: $filters_bindir"
@@ -17791,7 +17832,7 @@
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:17794: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:17835: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -17967,7 +18008,7 @@
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:17970: error: ambiguous option: $1
+    { { echo "$as_me:18011: 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;}
@@ -17986,7 +18027,7 @@
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:17989: error: unrecognized option: $1
+  -*) { { echo "$as_me:18030: 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;}
@@ -18044,7 +18085,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:18047: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:18088: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -18313,7 +18354,7 @@
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:18316: creating $ac_file" >&5
+    { echo "$as_me:18357: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -18331,7 +18372,7 @@
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:18334: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:18375: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -18344,7 +18385,7 @@
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:18347: error: cannot find input file: $f" >&5
+           { { echo "$as_me:18388: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -18410,7 +18451,7 @@
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:18413: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:18454: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -18421,7 +18462,7 @@
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:18424: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:18465: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -18434,7 +18475,7 @@
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:18437: error: cannot find input file: $f" >&5
+           { { echo "$as_me:18478: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -18492,7 +18533,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:18495: $ac_file is unchanged" >&5
+      { echo "$as_me:18536: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
Index: configure.in
Prereq:  1.222 
--- vile-9.5j+/configure.in	2006-04-05 13:49:06.000000000 +0000
+++ vile-9.5k/configure.in	2006-08-13 20:49:42.000000000 +0000
@@ -1,12 +1,12 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_REVISION($Revision: 1.222 $)
+AC_REVISION($Revision: 1.224 $)
 AC_PREREQ(2.13.20030927)
 rm -f config.cache
 
 ### Use "configure -with-screen" to override the default configuration, which is
 ### termcap-based on unix systems.
 
-dnl $Header: /usr/build/vile/vile/RCS/configure.in,v 1.222 2006/04/05 13:49:06 tom Exp $
+dnl $Header: /usr/build/vile/vile/RCS/configure.in,v 1.224 2006/08/13 20:49:42 tom Exp $
 
 define(MAKELIST, sh $srcdir/filters/makelist.sh $srcdir/filters/genmake.mak)
 
@@ -142,7 +142,7 @@
 
 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.
+[  --with-loadable-filters=XX specify filters to dynamically 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'.
@@ -526,6 +526,13 @@
 	;;
 esac
 
+# work around for broken FreeBSD header files (see tcap.h)
+case "$cf_cv_ncurses_version" in
+5.2.20020615)
+	AC_DEFINE(FREEBSD_BROKE_NCURSES) 	
+	;;
+esac
+
 : Check for termcap vs terminfo:
 cf_tc_funcs=""
 cf_tc_externs=""
@@ -919,11 +926,21 @@
 AC_SUBST(SH_CFLAGS)
 AC_SUBST(SH_LDFLAGS)
 
-AC_CHECK_PROGS(SPELL_PROG, ispell spell, [])
+AC_CHECK_PROGS(SPELL_PROG, aspell ispell spell, [])
 case .$SPELL_PROG in
-.ispell) AC_DEFINE(ISPELL_PROG);;
-.spell) AC_DEFINE(SPELL_PROG);;
+.aspell)
+	SPELL_OPTS="-x list"
+	;;
+.ispell)
+	SPELL_OPTS="-l -x"
+	;;
+*)
+	SPELL_PROG="spell"
+	SPELL_OPTS="-l"
+	;;
 esac
+AC_DEFINE_UNQUOTED(SPELL_PROG,"$SPELL_PROG")
+AC_DEFINE_UNQUOTED(SPELL_OPTS,"$SPELL_OPTS")
 
 filters_bindir=`echo "$VILE_LIBDIR_PATH" | sed -e 's%'$PATHSEP'.*%%'`
 echo "Computing location to install filter programs: $filters_bindir"
Index: file.c
Prereq:  1.394 
--- vile-9.5j+/file.c	2006-06-03 21:01:48.000000000 +0000
+++ vile-9.5k/file.c	2006-09-24 23:57:43.000000000 +0000
@@ -5,7 +5,7 @@
  * reading and writing of the disk are
  * in "fileio.c".
  *
- * $Header: /usr/build/vile/vile/RCS/file.c,v 1.394 2006/06/03 21:01:48 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/file.c,v 1.395 2006/09/24 23:57:43 tom Exp $
  */
 
 #include "estruct.h"
@@ -626,6 +626,15 @@
 	reset_to_unnamed(curbp);
     } else {
 	set_buffer_name(curbp);
+#if OPT_FINDERR
+	/*
+	 * Doing ":e!" on [Output] will reset the buffer name to match the
+	 * command.  Even if it was not [Output], it is still useful to make
+	 * the error-buffer match the last-read shell/pipe output.
+	 */
+	if (isShellOrPipe(curbp->b_fname))
+	    set_febuff(curbp->b_bname);
+#endif
     }
     restore_window_modes(curbp, save_wvals);
 
Index: filters/genmake.mak
Prereq:  1.30 
--- vile-9.5j+/filters/genmake.mak	2006-04-02 01:20:06.000000000 +0000
+++ vile-9.5k/filters/genmake.mak	2006-08-08 21:42:27.000000000 +0000
@@ -1,4 +1,4 @@
-# $Header: /usr/build/vile/vile/filters/RCS/genmake.mak,v 1.30 2006/04/02 01:20:06 tom Exp $
+# $Header: /usr/build/vile/vile/filters/RCS/genmake.mak,v 1.31 2006/08/08 21:42:27 tom Exp $
 # This is a list of filter root names and whether .c or .l files define the
 # filter.  Except for vile-crypt and vile-manfilt (which do not correspond to
 # majormodes), the filter names are constructed as vile-{root}-filt.
@@ -40,6 +40,7 @@
 lua	lua-filt	l
 mail	mailfilt	l
 make	makefilt	l
+mcrl	mcrlfilt	l
 midl	midlfilt	l
 mms	mms-filt	l
 nr	nr-filt		l
Index: filters/mcrl.key
--- /dev/null	2006-09-24 14:02:56.696532000 +0000
+++ vile-9.5k/filters/mcrl.key	2006-08-08 21:48:00.000000000 +0000
@@ -0,0 +1,47 @@
+: mCRL(2) keyword file - by Paul van Tilburg <paul@luon.net>
+: $Id: mcrl.key,v 1.1 2006/08/08 21:48:00 Paul.van.Tilburg Exp $
+
+: Specification elements
+.default Keyword
+act
+cons
+eqn
+init
+map
+proc
+sort
+var
+: Expression elements
+div
+end
+mod
+whr
+
+: Operators
+.default Ident2
+allow
+block
+comm
+exists
+forall
+hide
+lambda
+rename
+sum
+
+: Actions
+.default Ident
+delta
+tau
+
+: Standard sorts
+.default Type
+struct
+Bag
+Bool
+Int
+List
+Nat
+Pos
+Set
+Time
Index: filters/mcrlfilt.l
--- /dev/null	2006-09-24 14:02:56.696532000 +0000
+++ vile-9.5k/filters/mcrlfilt.l	2006-08-08 21:58:57.000000000 +0000
@@ -0,0 +1,64 @@
+%s NORMAL 
+
+%o 6000
+
+%{
+
+/*
+ * $Header: /usr/build/vile/vile/filters/RCS/mcrlfilt.l,v 1.1 2006/08/08 21:58:57 Paul.van.Tilburg Exp $
+ *
+ * Filter to add vile "attribution" sequences to a mCRL(2) specification
+ * or model, based on the text filter.
+ *
+ * By Paul van Tilburg <paul@luon.net> and Bas Kloet <bas@luon.net>.
+ */
+
+#include <filters.h>
+
+DefineFilter("mcrl");
+
+static char *Comment_attr;
+static char *Keyword_attr;
+static char *Number_attr;
+
+%}
+
+COMMENT		%.*\n
+
+KEYWORD		[[:alpha:]_][[:alnum:]_]*
+
+SIGN		[-+]
+DECIMAL		[[:digit:]_]+
+REAL		[-+]?([[:digit:]_]*\.[[:digit:]][[:digit:]_]*)([eE][+-]?[[:digit:]_]+)?
+NUMBER		{SIGN}?({DECIMAL}|{REAL})
+
+%%
+
+<NORMAL>{KEYWORD}	{ WriteToken(keyword_attr(yytext)); }
+
+<NORMAL>{COMMENT}	{ WriteToken(Comment_attr); }
+
+<NORMAL>{NUMBER}	{ WriteToken(Number_attr); }
+
+%%
+
+static void
+init_filter(int before GCC_UNUSED)
+{
+    (void) before;
+}
+
+static void
+do_filter(FILE *inputs)
+{
+    yyin = inputs;
+
+    Comment_attr = class_attr(NAME_COMMENT);
+    Keyword_attr = class_attr(NAME_KEYWORD);
+    Number_attr  = class_attr(NAME_NUMBER);
+
+    BEGIN(NORMAL);
+    while (yylex() > 0) {
+    }
+    flt_bfr_finish();
+}
Index: filters/nr-filt.l
Prereq:  1.20 
--- vile-9.5j+/filters/nr-filt.l	2006-05-21 19:50:19.000000000 +0000
+++ vile-9.5k/filters/nr-filt.l	2006-08-13 22:55:20.000000000 +0000
@@ -1,7 +1,7 @@
 %{
 
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/nr-filt.l,v 1.20 2006/05/21 19:50:19 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/nr-filt.l,v 1.24 2006/08/13 22:55:20 tom Exp $
  *
  * Filter to add vile "attribution" sequences to selected bits of NROFF
  */
@@ -20,13 +20,19 @@
 write_cmd(char *text, int size)
 {
     int cmd = size;
+    int got = 0;
     char *s;
+
     for (s = text; *s; s++) {
-	if (isspace(CharOf(*s))) {
+	int ch = CharOf(*s);
+	if (isalnum(ch)) {
+	    got++;
+	} else if ((got && isspace(ch)) || ((s != text) && ispunct(ch))) {
 	    if (cmd == size)
 		cmd = (s - text) + 1;
 	}
     }
+
     flt_puts(text, cmd, Keyword_attr);
     flt_puts(text+cmd, size-cmd, String_attr);
 }
@@ -41,8 +47,8 @@
 
 %}
 
-COMMAND		^(\.[[:blank:]]*[[:alnum:]]+([ \t][^\r\n]+)?|'\\\"[^\r\n]+)
-COMMENT		^\.[[:blank:]]*\\\"
+COMMAND		^[\.'][[:blank:]]*([[:alnum:]]+|(\\[^\\\r\n\"#])+)([ \t][^\r\n]+)?
+COMMENT		^[\.'][[:blank:]]*(\\\"|#)
 
 ENIT		\\[e *\n\\+-]
 
Index: filters/spellflt.l
Prereq:  1.24 
--- vile-9.5j+/filters/spellflt.l	2006-05-21 19:50:19.000000000 +0000
+++ vile-9.5k/filters/spellflt.l	2006-08-13 20:23:47.000000000 +0000
@@ -1,7 +1,7 @@
 %{
 
 /*
- * $Header: /usr/build/vile/vile/filters/RCS/spellflt.l,v 1.24 2006/05/21 19:50:19 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/spellflt.l,v 1.25 2006/08/13 20:23:47 tom Exp $
  *
  * Filter to add vile "attribution" sequences to misspelled words.
  */
@@ -23,14 +23,18 @@
 #define pclose fclose
 #endif
 
-#if defined(ISPELL_PROG)
+#ifndef SPELL_PROG
+#define SPELL_PROG "spell"
+#endif
+
 /* -l	Produce a list of misspelled words */
-/* -x	Don't create a backup file. */
-#define SPELL_PIPE "ispell -x -l"
-#else
-#define SPELL_PIPE "spell -l"
+/* -x	Don't create a backup file (ispell, aspell). */
+#ifndef SPELL_OPTS
+#define SPELL_OPTS "-l"
 #endif
 
+#define SPELL_PIPE SPELL_PROG " " SPELL_OPTS
+
 #ifdef HAVE_POPEN
 #define pipe_open(command)	popen(command, "r")
 #define	pipe_read(b,s)		fgets(b, sizeof(b), s)
Index: macros/modes.rc
Prereq:  1.46 
--- vile-9.5j+/macros/modes.rc	2006-06-25 21:42:56.000000000 +0000
+++ vile-9.5k/macros/modes.rc	2006-08-09 22:44:23.000000000 +0000
@@ -1,4 +1,4 @@
-; $Id: modes.rc,v 1.46 2006/06/25 21:42:56 tom Exp $
+; $Id: modes.rc,v 1.47 2006/08/09 22:44:23 tom Exp $
 ; majormodes in this file are ordered alphabetically for convenience - the
 ; precedence used by vile is strictly alphabetic, counting case.  Use the
 ; before and after qualifiers to override the precedence.
@@ -339,6 +339,15 @@
 	dos
 ~endwith
 
+define-mode mcrl
+~with define-submode mcrl
+	suffixes	'\.\(mcrl\)$'
+	fence-pairs     '{}()[]'
+	comment-prefix  '^\s*%'
+	comments        '^\s*%.*$'
+	comments	'^\s*%\s+*$'
+~endwith
+
 define-mode ini
 ~with define-submode ini
 	suffixes	'\.\(ini\)$'
Index: patchlev.h
--- vile-9.5j+/patchlev.h	2006-06-03 20:57:01.000000000 +0000
+++ vile-9.5k/patchlev.h	2006-08-13 18:08:47.000000000 +0000
@@ -1,3 +1,3 @@
 #define VILE_VERSION "9.5"
 /* set to "" for no patches */
-#define VILE_PATCHLEVEL "j"
+#define VILE_PATCHLEVEL "k"
Index: revlist
--- vile-9.5j+/revlist	2006-06-25 21:45:30.000000000 +0000
+++ vile-9.5k/revlist	2006-09-25 00:13:23.000000000 +0000
@@ -1,6 +1,6 @@
-revlist for vile, version v9_5j
+revlist for vile, version v9_5k
 --------------------------------------------------------------------------------
-CHANGES	1.929
+CHANGES	1.935
 CHANGES.R3	1.1
 CHANGES.R4	1.1
 CHANGES.R5	1.1
@@ -10,10 +10,10 @@
 COPYING	1.4
 INSTALL	1.6
 MANIFEST	none
-README	1.95
+README	1.96
 README.PC	1.33
 README.VMS	1.5
-aclocal.m4	1.161
+aclocal.m4	1.163
 ansi.c	1.48
 api.c	1.37
 api.h	1.13
@@ -27,11 +27,11 @@
 builtflt.c	1.47
 chgdfunc.h	1.18
 cmdtbl	1.238
-config.guess	1.4
-config.sub	1.4
+config.guess	1.5
+config.sub	1.6
 config_h.in	1.2
-configure	1.5
-configure.in	1.222
+configure	1.7
+configure.in	1.224
 csrch.c	1.32
 curses.c	1.27
 descrip.mms	1.48
@@ -45,7 +45,7 @@
 exec.c	1.288
 externs.c	1.10
 fences.c	1.84
-file.c	1.394
+file.c	1.395
 filec.c	1.124
 fileio.c	1.181
 finderr.c	1.130
@@ -83,7 +83,7 @@
 os2keys.h	1.2
 os2pipe.c	1.5
 os2vio.c	1.35
-patchlev.h	1.346
+patchlev.h	1.347
 path.c	1.151
 perl.xs	1.104
 plugin.c	1.1
@@ -94,7 +94,7 @@
 random.c	1.292
 regexp.c	1.118
 region.c	1.133
-revlist	v9_5j
+revlist	v9_5k
 search.c	1.138
 select.c	1.161
 sinstall.sh	1.1
@@ -103,7 +103,7 @@
 tags.c	1.130
 tbuff.c	1.66
 tcap.c	1.170
-tcap.h	1.10
+tcap.h	1.11
 termio.c	1.211
 test_io.c	1.2
 trace.c	1.54
@@ -111,7 +111,7 @@
 ucrypt.c	1.15
 undo.c	1.88
 version.c	1.59
-vile-9.5.spec	1.11
+vile-9.5.spec	1.12
 vile.1	1.31
 vile.hlp	1.612
 vile.wmconfig	1.1
@@ -211,7 +211,7 @@
 filters/flt_defs.h	1.3
 filters/fltstack.h	1.9
 filters/genmake.c	1.4
-filters/genmake.mak	1.30
+filters/genmake.mak	1.31
 filters/html.key	1.8
 filters/htmlfilt.l	1.38
 filters/imake.key	1.4
@@ -246,6 +246,8 @@
 filters/makefilt.l	1.54
 filters/makelist.sh	1.5
 filters/manfilt.c	1.36
+filters/mcrl.key	1.1
+filters/mcrlfilt.l	1.1
 filters/midl.key	1.3
 filters/midlfilt.l	1.4
 filters/mk-0th.awk	1.9
@@ -257,7 +259,7 @@
 filters/mk-key.awk	1.2
 filters/mms-filt.l	1.14
 filters/noclass.sh	1.6
-filters/nr-filt.l	1.20
+filters/nr-filt.l	1.24
 filters/nr.key	1.1
 filters/nsis.key	1.4
 filters/pas-filt.l	1.5
@@ -293,7 +295,7 @@
 filters/sml-filt.l	1.6
 filters/sml.key	1.1
 filters/spell.rc	1.6
-filters/spellflt.l	1.24
+filters/spellflt.l	1.25
 filters/sql-filt.l	1.31
 filters/sql.key	1.9
 filters/syntax.key	1.1
@@ -345,7 +347,7 @@
 macros/gnugpg.rc	1.3
 macros/loaderrs.rc	1.1
 macros/manpage.rc	1.21
-macros/modes.rc	1.46
+macros/modes.rc	1.47
 macros/palettes.rc	1.7
 macros/pictmode.rc	1.4
 macros/search.rc	1.3
Index: revlist.bak
--- /dev/null	2006-09-24 14:02:56.696532000 +0000
+++ vile-9.5k/revlist.bak	2006-06-25 21:45:30.000000000 +0000
@@ -0,0 +1,408 @@
+revlist for vile, version v9_5j
+--------------------------------------------------------------------------------
+CHANGES	1.929
+CHANGES.R3	1.1
+CHANGES.R4	1.1
+CHANGES.R5	1.1
+CHANGES.R6	1.1
+CHANGES.R7	1.2
+CHANGES.R8	1.1
+COPYING	1.4
+INSTALL	1.6
+MANIFEST	none
+README	1.95
+README.PC	1.33
+README.VMS	1.5
+aclocal.m4	1.161
+ansi.c	1.48
+api.c	1.37
+api.h	1.13
+basic.c	1.124
+bind.c	1.296
+borland.c	1.36
+btree.c	1.23
+btree.h	1.5
+buffer.c	1.300
+buglist	1.403
+builtflt.c	1.47
+chgdfunc.h	1.18
+cmdtbl	1.238
+config.guess	1.4
+config.sub	1.4
+config_h.in	1.2
+configure	1.5
+configure.in	1.222
+csrch.c	1.32
+curses.c	1.27
+descrip.mms	1.48
+dirstuff.h	1.30
+display.c	1.418
+djhandl.c	1.6
+dumbterm.c	1.21
+edef.h	1.323
+estruct.h	1.597
+eval.c	1.353
+exec.c	1.288
+externs.c	1.10
+fences.c	1.84
+file.c	1.394
+filec.c	1.124
+fileio.c	1.181
+finderr.c	1.130
+glob.c	1.89
+globals.c	1.48
+gppconio.c	1.2
+history.c	1.84
+input.c	1.289
+insert.c	1.143
+install.sh	1.7
+isearch.c	1.60
+itbuff.c	1.25
+lckfiles.c	1.11
+line.c	1.171
+main.c	1.551
+makefile.blc	1.20
+makefile.djg	1.35
+makefile.icc	1.16
+makefile.in	1.202
+makefile.wnt	1.91
+map.c	1.109
+menu.c	1.48
+mkdirs.sh	1.6
+mkprlenv.wnt	1.9
+mktbls.c	1.135
+modes.c	1.317
+modetbl	1.239
+msgs.c	1.26
+npopen.c	1.94
+ntconio.c	1.87
+ntwinio.c	1.159
+nullterm.c	1.3
+oneliner.c	1.109
+opers.c	1.90
+os2keys.h	1.2
+os2pipe.c	1.5
+os2vio.c	1.35
+patchlev.h	1.346
+path.c	1.151
+perl.xs	1.104
+plugin.c	1.1
+plugin.h	1.1
+proto.h	1.567
+pscreen.h	1.2
+ptypemap	1.7
+random.c	1.292
+regexp.c	1.118
+region.c	1.133
+revlist	v9_5j
+search.c	1.138
+select.c	1.161
+sinstall.sh	1.1
+spawn.c	1.191
+statevar.c	1.98
+tags.c	1.130
+tbuff.c	1.66
+tcap.c	1.170
+tcap.h	1.10
+termio.c	1.211
+test_io.c	1.2
+trace.c	1.54
+trace.h	1.24
+ucrypt.c	1.15
+undo.c	1.88
+version.c	1.59
+vile-9.5.spec	1.11
+vile.1	1.31
+vile.hlp	1.612
+vile.wmconfig	1.1
+vl_alloc.h	1.1
+vl_ctype.h	1.4
+vl_regex.h	1.4
+vms2unix.c	1.42
+vmsbuild.com	1.46
+vmspipe.c	1.14
+vmsvt.c	1.63
+w32cbrd.c	1.25
+w32cmd.c	1.37
+w32misc.c	1.47
+w32ole.cpp	1.25
+w32ole.h	1.6
+w32ole.rc	1.2
+w32oo.cpp	1.7
+w32pipe.c	1.33
+w32reg.c	1.10
+w32reg.h	1.1
+w32vile.h	1.4
+watch.c	1.5
+window.c	1.106
+winvile.h	1.11
+winvile.odl	1.6
+winvile.rc	1.11
+word.c	1.80
+wordmov.c	1.22
+wvwrap.cpp	1.10
+x11.c	1.286
+x11menu.c	1.10
+xshell.sh	1.4
+xterm.c	1.2
+xtermkeys.h	1.6
+xvile.wmconfig	1.1
+doc/Vileserv.doc	1.1
+doc/config.doc	1.14
+doc/dir.doc	1.3
+doc/filters.doc	1.35
+doc/macros.doc	1.96
+doc/menus.doc	1.7
+doc/modes.doc	1.16
+doc/ncu-indent	1.12
+doc/oleauto.doc	1.8
+doc/perl.doc	1.2
+doc/visvile.doc	1.9
+filters/ada-filt.l	1.14
+filters/ada.key	1.1
+filters/as-filt.l	1.6
+filters/as.key	1.2
+filters/as386.key	1.2
+filters/asm-filt.l	1.6
+filters/asm.key	1.1
+filters/atr2ansi.c	1.3
+filters/atr2html.c	1.3
+filters/atr2text.c	1.3
+filters/au3-filt.l	1.6
+filters/au3.key	1.4
+filters/awk-filt.l	1.17
+filters/awk.key	1.2
+filters/bas-filt.l	1.14
+filters/basic.key	1.4
+filters/bat-filt.l	1.24
+filters/bat.key	1.4
+filters/bnf-filt.l	1.9
+filters/bnf.key	1.1
+filters/c-filt.c	1.74
+filters/c-filt.flx	1.1
+filters/c.key	1.11
+filters/cfg-filt.l	1.14
+filters/cpp.key	1.7
+filters/cs.key	1.1
+filters/csh.key	1.1
+filters/css-filt.l	1.13
+filters/css.key	1.5
+filters/cweb.key	1.2
+filters/cwebfilt.l	1.17
+filters/dcl-filt.l	1.18
+filters/dcl.key	1.5
+filters/def-filt.l	1.9
+filters/def.key	1.1
+filters/diff.key	1.1
+filters/difffilt.l	1.7
+filters/ecl-filt.l	1.6
+filters/ecl.key	1.1
+filters/ecrypt.c	1.8
+filters/esql.key	1.3
+filters/esqlfilt.l	1.16
+filters/est-filt.l	1.6
+filters/est.key	1.1
+filters/fdl-filt.l	1.12
+filters/fdl.key	1.4
+filters/filterio.c	1.29
+filters/filters.c	1.99
+filters/filters.h	1.96
+filters/filters.rc	1.205
+filters/flt_defs.h	1.3
+filters/fltstack.h	1.9
+filters/genmake.c	1.4
+filters/genmake.mak	1.30
+filters/html.key	1.8
+filters/htmlfilt.l	1.38
+filters/imake.key	1.4
+filters/imakeflt.l	1.16
+filters/infofilt.l	1.8
+filters/ini-filt.l	1.6
+filters/ini.key	1.1
+filters/iss-filt.l	1.6
+filters/iss.key	1.4
+filters/java.key	1.3
+filters/js.key	1.4
+filters/key-filt.c	1.20
+filters/latex.key	1.2
+filters/latexflt.l	1.43
+filters/lex-filt.l	1.60
+filters/lex.key	1.8
+filters/lisp.key	1.2
+filters/lispfilt.l	1.13
+filters/lua-filt.l	1.5
+filters/lua.key	1.2
+filters/m4-filt.c	1.27
+filters/m4.key	1.3
+filters/mail.key	1.3
+filters/mailfilt.l	1.20
+filters/make.key	1.8
+filters/makefile.2nd	1.12
+filters/makefile.djg	1.3
+filters/makefile.emx	1.4
+filters/makefile.icc	1.3
+filters/makefile.in	1.80
+filters/makefile.wnt	1.32
+filters/makefilt.l	1.54
+filters/makelist.sh	1.5
+filters/manfilt.c	1.36
+filters/midl.key	1.3
+filters/midlfilt.l	1.4
+filters/mk-0th.awk	1.9
+filters/mk-0th.bat	1.6
+filters/mk-1st.awk	1.12
+filters/mk-1st.bat	1.6
+filters/mk-2nd.awk	1.17
+filters/mk-2nd.bat	1.7
+filters/mk-key.awk	1.2
+filters/mms-filt.l	1.14
+filters/noclass.sh	1.6
+filters/nr-filt.l	1.20
+filters/nr.key	1.1
+filters/nsis.key	1.4
+filters/pas-filt.l	1.5
+filters/pas.key	1.4
+filters/pc.key	1.1
+filters/perl.key	1.8
+filters/perlfilt.l	1.45
+filters/php-filt.l	1.6
+filters/php.key	1.3
+filters/pl-filt.c	1.83
+filters/pot-filt.l	1.7
+filters/pot.key	1.1
+filters/ps-filt.l	1.9
+filters/ps.key	1.2
+filters/py-filt.l	1.13
+filters/py.key	1.3
+filters/rb-filt.l	1.15
+filters/rb.key	1.4
+filters/rc-filt.l	1.8
+filters/rc.key	1.2
+filters/rcs-filt.l	1.11
+filters/rcs.key	1.1
+filters/rexx.key	1.1
+filters/rexxfilt.l	1.9
+filters/rpm-filt.l	1.13
+filters/rpm.key	1.3
+filters/rubyfilt.c	1.40
+filters/sccs.key	1.1
+filters/sccsfilt.l	1.14
+filters/sed-filt.c	1.22
+filters/sh-filt.l	1.67
+filters/sh.key	1.4
+filters/sml-filt.l	1.6
+filters/sml.key	1.1
+filters/spell.rc	1.6
+filters/spellflt.l	1.24
+filters/sql-filt.l	1.31
+filters/sql.key	1.9
+filters/syntax.key	1.1
+filters/tags.key	1.1
+filters/tagsfilt.c	1.8
+filters/tbl-filt.l	1.11
+filters/tbl.key	1.1
+filters/tc-filt.l	1.26
+filters/tc.key	1.2
+filters/tcl-filt.l	1.18
+filters/tcl.key	1.10
+filters/tex.key	1.3
+filters/texi.key	1.1
+filters/texifilt.l	1.6
+filters/ti-filt.l	1.18
+filters/ti.key	1.2
+filters/txt-filt.l	1.23
+filters/unfilter.c	1.9
+filters/unfilter.h	1.1
+filters/vb.key	1.7
+filters/vile.key	1.8
+filters/vilefilt.l	1.32
+filters/vim.key	1.2
+filters/vl-filt.l	1.13
+filters/vlog.key	1.10
+filters/wbt-filt.l	1.5
+filters/wbt.key	1.3
+filters/xml-filt.l	1.15
+filters/xml.key	1.1
+filters/xres.key	1.2
+filters/xresfilt.l	1.18
+filters/xs-filt.l	1.12
+filters/xs.key	1.1
+filters/yacc.key	1.5
+filters/yaccfilt.l	1.24
+icons/pumpkin.ico	1.3
+icons/pumpkin.xbm	1.2
+icons/pumpkin.xpm	1.2
+icons/sink.ico	1.2
+icons/sink.xbm	1.2
+icons/sink.xpm	1.2
+icons/vile.ico	1.3
+icons/vile.xbm	1.1
+icons/vile.xpm	1.1
+macros/XVile.ad	1.1
+macros/color-ls.rc	1.2
+macros/dates.rc	1.2
+macros/digraphs.rc	1.2
+macros/gnugpg.rc	1.3
+macros/loaderrs.rc	1.1
+macros/manpage.rc	1.21
+macros/modes.rc	1.46
+macros/palettes.rc	1.7
+macros/pictmode.rc	1.4
+macros/search.rc	1.3
+macros/shifts.rc	1.4
+macros/showeach.rc	1.5
+macros/vile-pager	1.5
+macros/vileinit.rc	1.33
+macros/vilemenu.rc	1.3
+macros/vileperl.rc	1.7
+macros/which.rc	1.14
+package/winvile.iss	1.5
+package/winvile.nsi	1.3
+perl/Breadcrumbs.pm	1.4
+perl/CaptHook.pm	1.1
+perl/Glob2re.pm	1.1
+perl/Help.pm	1.2
+perl/Vile.pm	1.1
+perl/Vile/Exporter.pm	1.1
+perl/Vile/Manual.pm	1.4
+perl/Vileserv.pm	1.10
+perl/Visit.pm	1.2
+perl/capture.pm	1.2
+perl/dict.pm	1.3
+perl/directory.pm	1.9
+perl/dirlist.pm	1.3
+perl/gdb.pm	1.1
+perl/hgrep.pm	1.3
+perl/lock.pm	1.2
+perl/man.pm	1.3
+perl/mime.pl	1.4
+perl/plugins.pl	1.3
+perl/search.pm	1.2
+perl/shell.pm	1.6
+perl/spell.pm	1.3
+perl/vileget	1.7
+perl/winops.pm	1.1
+plugins/Makefile	1.1
+plugins/test.c	1.1
+plugins/test.rc	1.1
+visvile/commands.cpp	1.4
+visvile/commands.h	1.1
+visvile/dsaddin.cpp	1.1
+visvile/dsaddin.h	1.1
+visvile/oleauto.cpp	1.5
+visvile/oleauto.h	1.4
+visvile/readme.txt	1.6
+visvile/resource.h	1.3
+visvile/stdafx.cpp	1.1
+visvile/stdafx.h	1.1
+visvile/tbarlrge.bmp	1.1
+visvile/tbarmedm.bmp	1.1
+visvile/visvile.cpp	1.1
+visvile/visvile.def	1.1
+visvile/visvile.dsm	1.2
+visvile/visvile.dsp	1.2
+visvile/visvile.dsw	1.2
+visvile/visvile.h	1.1
+visvile/visvile.odl	1.1
+visvile/visvile.rc	1.4
+visvile/visvile.rc2	1.1
Index: tcap.h
Prereq:  1.10 
--- vile-9.5j+/tcap.h	2005-11-23 15:44:04.000000000 +0000
+++ vile-9.5k/tcap.h	2006-08-13 20:33:31.000000000 +0000
@@ -1,7 +1,7 @@
 /*
  * Configurable headers used by termcap/terminfo driver for vile.
  *
- * $Header: /usr/build/vile/vile/RCS/tcap.h,v 1.10 2005/11/23 15:44:04 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/tcap.h,v 1.11 2006/08/13 20:33:31 tom Exp $
  */
 
 #ifndef VILE_TCAP_H
@@ -25,6 +25,15 @@
 #  endif
 #endif
 
+/*
+ * Workaround for breakage in FreeBSD's header files (updates to wchar.h were
+ * not reflected in updates to curses.h).
+ */
+#if DISP_CURSES && defined(__FreeBSD__) && defined(FREEBSD_BROKE_NCURSES)
+#define __wint_t
+#define __wchar_t
+#endif
+
 #ifdef NEED_CURSES_H
 #  ifdef HAVE_NCURSESW_NCURSES_H
 #    include <ncursesw/ncurses.h>
Index: vile-9.5.spec
Prereq:  1.11 
--- vile-9.5j+/vile-9.5.spec	2006-06-03 20:57:01.000000000 +0000
+++ vile-9.5k/vile-9.5.spec	2006-08-13 18:08:19.000000000 +0000
@@ -1,7 +1,7 @@
 Summary: VILE VI Like Emacs editor
-# $Header: /usr/build/vile/vile/RCS/vile-9.5.spec,v 1.11 2006/06/03 20:57:01 tom Exp $
+# $Header: /usr/build/vile/vile/RCS/vile-9.5.spec,v 1.12 2006/08/13 18:08:19 tom Exp $
 Name: vile
-Version: 9.5j
+Version: 9.5k
 # each patch should update the version
 Release: 1
 Copyright: GPL
@@ -18,6 +18,7 @@
 Patch8: vile-9.5h.patch.gz
 Patch9: vile-9.5i.patch.gz
 Patch10: vile-9.5j.patch.gz
+Patch11: vile-9.5k.patch.gz
 # each patch should add itself to this list
 Packager: Thomas Dickey <dickey@invisible-island.net>
 BuildRoot: %{_tmppath}/%{name}-root
@@ -40,6 +41,7 @@
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 # each patch should add itself to this list
 
 %build
@@ -92,6 +94,9 @@
 %changelog
 # each patch should add its ChangeLog entries here
 
+* Sun Aug 13 2006 Thomas Dickey
+- added patch for 9.5k
+
 * Sat Jun 03 2006 Thomas Dickey
 - added patch for 9.5j