snapshot of project "lynx", label v2-8-8dev_6d

8 files changed, 3448 insertions, 2674 deletions

diff --git a/CHANGES b/CHANGES
index 6f28e514..eeccf3f6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,20 @@
--- $LynxId: CHANGES,v 1.515 2010/11/22 13:02:10 tom Exp $
+-- $LynxId: CHANGES,v 1.518 2010/11/26 20:17:33 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
-2010-11-21 (2.8.8dev.7)
+2010-11-26 (2.8.8dev.7)
+* improve configure check for IDNA library, which may depend upon intllib,
+  e.g., building with mingw on cygwin -DK
+* modify autoconf macros which look for X libraries, e.g., for PDCurses, to
+  accommodate ongoing changes in xorg package scripts -TD
+* reorganize autoconf macro CF_WITH_CURSES_DIR, to make it usable for both
+  curses and ncurses -TD
+* several changes to autoconf macros to lessen use of legacy shell feature
+  "${name-value}" in favor of "${name:-value}", since the former is broken in
+  recent versions of bash -TD
+* apply overlooked patch from pre-2.8.5, makes RMDIR_PATH configurable
+  (report/patch by Frank Heckenbach).
 * correct one of the places where link-number is formatted, for form input
   anchors.  This was broken in dev.6 by the -unique_urls changes (report by
   DK) -TD
@@ -15,6 +26,7 @@ Changes since Lynx 2.8 release
 * fix a double-free in make_argv() (report by FLWM) -TD
 * add a memset in RestoreSession(), fixes uninitialized memory reference for
   the VLINK section -PBM
+* update config.guess (2010-09-24), config.sub (2010-09-11)
 
 2010-10-04 (2.8.8dev.6)
 * amend change for Debian #514897 to exclude XML documents (Debian #592883) -TD
diff --git a/aclocal.m4 b/aclocal.m4
index c74a4d87..5416337f 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,11 +1,11 @@
-dnl $LynxId: aclocal.m4,v 1.171 2010/09/26 14:24:45 tom Exp $
+dnl $LynxId: aclocal.m4,v 1.175 2010/11/26 20:15:56 tom Exp $
 dnl Macros for auto-configure script.
 dnl by T.E.Dickey <dickey@invisible-island.net>
 dnl and Jim Spath <jspath@mail.bcpl.lib.md.us>
 dnl and Philippe De Muyter <phdm@macqel.be>
 dnl
 dnl Created: 1997/1/28
-dnl Updated: 2010/9/23
+dnl Updated: 2010/11/26
 dnl
 dnl The autoconf used in Lynx development is GNU autoconf 2.13 or 2.52, patched
 dnl by Thomas Dickey.  See your local GNU archives, and this URL:
@@ -796,6 +796,19 @@ dnl $1 = libraries to add, with the "-l", etc.
 dnl $2 = variable to update (default $LIBS)
 AC_DEFUN([CF_ADD_LIBS],[ifelse($2,,LIBS,[$2])="$1 [$]ifelse($2,,LIBS,[$2])"])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_ADD_LIB_AFTER version: 2 updated: 2010/11/08 20:33:46
+dnl ----------------
+dnl Add a given library after another, e.g., following the one it satisfies a
+dnl dependency for.
+dnl
+dnl $1 = the first library
+dnl $2 = its dependency
+AC_DEFUN([CF_ADD_LIB_AFTER],[
+CF_VERBOSE(...before $LIBS)
+LIBS=`echo "$LIBS" | sed -e "s/[[ 	]][[ 	]]*/ /g" -e "s,$1 ,$1 $2 ," -e 's/  / /g'`
+CF_VERBOSE(...after  $LIBS)
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_ADD_OPTIONAL_PATH version: 1 updated: 2007/07/29 12:33:33
 dnl --------------------
 dnl Add an optional search-path to the compile/link variables.
@@ -867,7 +880,7 @@ ifelse([$5],NONE,,[(test $5 = NONE || test "$4" != "$5") &&]) {
 }
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_ALT_CHAR_SET version: 6 updated: 1998/11/18 14:45:34
+dnl CF_ALT_CHAR_SET version: 7 updated: 2010/10/23 15:54:49
 dnl ---------------
 dnl Check for existence of alternate-character-set support in curses, so we
 dnl can decide to use it for box characters.
@@ -879,7 +892,7 @@ AC_CACHE_VAL(cf_cv_alt_char_set,[
 for mapname in acs_map _acs_map
 do
 	AC_TRY_LINK([
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 	],[chtype x = $mapname['l']; $mapname['m'] = 0],
 	[cf_cv_alt_char_set=$mapname
 	 break],
@@ -890,13 +903,13 @@ AC_MSG_RESULT($cf_cv_alt_char_set)
 test $cf_cv_alt_char_set != no && AC_DEFINE_UNQUOTED(ALT_CHAR_SET,$cf_cv_alt_char_set)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_ANSI_CC_CHECK version: 9 updated: 2001/12/30 17:53:34
+dnl CF_ANSI_CC_CHECK version: 10 updated: 2010/10/23 15:52:32
 dnl ----------------
 dnl This is adapted from the macros 'fp_PROG_CC_STDC' and 'fp_C_PROTOTYPES'
 dnl in the sharutils 4.2 distribution.
 AC_DEFUN([CF_ANSI_CC_CHECK],
 [
-AC_CACHE_CHECK(for ${CC-cc} option to accept ANSI C, cf_cv_ansi_cc,[
+AC_CACHE_CHECK(for ${CC:-cc} option to accept ANSI C, cf_cv_ansi_cc,[
 cf_cv_ansi_cc=no
 cf_save_CFLAGS="$CFLAGS"
 cf_save_CPPFLAGS="$CPPFLAGS"
@@ -1048,7 +1061,7 @@ fi
 AC_SUBST(ARFLAGS)
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_BOOL_DEFS version: 3 updated: 1998/04/27 20:32:33
+dnl CF_BOOL_DEFS version: 4 updated: 2010/10/23 15:54:49
 dnl ------------
 dnl Check if curses.h defines TRUE/FALSE (it does under SVr4).
 AC_DEFUN([CF_BOOL_DEFS],
@@ -1056,7 +1069,7 @@ AC_DEFUN([CF_BOOL_DEFS],
 AC_MSG_CHECKING(if TRUE/FALSE are defined)
 AC_CACHE_VAL(cf_cv_bool_defs,[
 AC_TRY_COMPILE([
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 #include <stdio.h>],[int x = TRUE, y = FALSE],
 	[cf_cv_bool_defs=yes],
 	[cf_cv_bool_defs=no])])
@@ -1158,7 +1171,7 @@ AC_SUBST(BUILD_EXEEXT)
 AC_SUBST(BUILD_OBJEXT)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_BUNDLED_INTL version: 15 updated: 2010/09/19 15:09:44
+dnl CF_BUNDLED_INTL version: 16 updated: 2010/10/23 15:55:05
 dnl ---------------
 dnl Top-level macro for configuring an application with a bundled copy of
 dnl the intl and po directories for gettext.
@@ -1192,7 +1205,7 @@ dnl rather than $LC_ALL
 test -z "$ALL_LINGUAS" && ALL_LINGUAS=`test -d $srcdir/po && cd $srcdir/po && echo *.po|sed -e 's/\.po//g' -e 's/*//'`
 
 # Allow override of "config.h" definition:
-: ${CONFIG_H=config.h}
+: ${CONFIG_H:=config.h}
 AC_SUBST(CONFIG_H)
 
 if test -z "$PACKAGE" ; then
@@ -1528,7 +1541,7 @@ if test $ac_cv_type_$1 = no; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_COLOR_CURSES version: 6 updated: 2002/10/27 18:21:42
+dnl CF_COLOR_CURSES version: 7 updated: 2010/10/23 15:54:49
 dnl ---------------
 dnl Check if curses supports color.  (Note that while SVr3 curses supports
 dnl color, it does this differently from SVr4 curses; more work would be needed
@@ -1539,7 +1552,7 @@ AC_DEFUN([CF_COLOR_CURSES],
 AC_MSG_CHECKING(if curses supports color attributes)
 AC_CACHE_VAL(cf_cv_color_curses,[
 	AC_TRY_LINK([
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 ],
 	[chtype x = COLOR_BLUE;
 	 has_colors();
@@ -1558,21 +1571,21 @@ if test $cf_cv_color_curses = yes ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_CHTYPE version: 6 updated: 2003/11/06 19:59:57
+dnl CF_CURSES_CHTYPE version: 7 updated: 2010/10/23 15:54:49
 dnl ----------------
 dnl Test if curses defines 'chtype' (usually a 'long' type for SysV curses).
 AC_DEFUN([CF_CURSES_CHTYPE],
 [
 AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl
 AC_CACHE_CHECK(for chtype typedef,cf_cv_chtype_decl,[
-	AC_TRY_COMPILE([#include <${cf_cv_ncurses_header-curses.h}>],
+	AC_TRY_COMPILE([#include <${cf_cv_ncurses_header:-curses.h}>],
 		[chtype foo],
 		[cf_cv_chtype_decl=yes],
 		[cf_cv_chtype_decl=no])])
 if test $cf_cv_chtype_decl = yes ; then
 	AC_DEFINE(HAVE_TYPE_CHTYPE)
 	AC_CACHE_CHECK(if chtype is scalar or struct,cf_cv_chtype_type,[
-		AC_TRY_COMPILE([#include <${cf_cv_ncurses_header-curses.h}>],
+		AC_TRY_COMPILE([#include <${cf_cv_ncurses_header:-curses.h}>],
 			[chtype foo; long x = foo],
 			[cf_cv_chtype_type=scalar],
 			[cf_cv_chtype_type=struct])])
@@ -1619,7 +1632,7 @@ CF_CURSES_HEADER
 CF_TERM_HEADER
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_FUNCS version: 14 updated: 2009/07/16 19:34:55
+dnl CF_CURSES_FUNCS version: 15 updated: 2010/10/23 15:52:32
 dnl ---------------
 dnl Curses-functions are a little complicated, since a lot of them are macros.
 AC_DEFUN([CF_CURSES_FUNCS],
@@ -1639,7 +1652,7 @@ do
 			[
 #ifndef ${cf_func}
 long foo = (long)(&${cf_func});
-${cf_cv_main_return-return}(foo == 0);
+${cf_cv_main_return:-return}(foo == 0);
 #endif
 			],
 			[cf_result=yes],
@@ -1685,7 +1698,7 @@ fi
 AC_CHECK_HEADERS($cf_cv_ncurses_header)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_LIBS version: 30 updated: 2010/06/20 09:24:28
+dnl CF_CURSES_LIBS version: 31 updated: 2010/10/23 15:54:49
 dnl --------------
 dnl Look for the curses libraries.  Older curses implementations may require
 dnl termcap/termlib to be linked as well.  Call CF_CURSES_CPPFLAGS first.
@@ -1693,7 +1706,7 @@ AC_DEFUN([CF_CURSES_LIBS],[
 
 AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl
 AC_MSG_CHECKING(if we have identified curses libraries)
-AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>],
+AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
     [initscr(); tgoto("?", 0,0)],
     cf_result=yes,
     cf_result=no)
@@ -1733,7 +1746,7 @@ if test ".$ac_cv_func_initscr" != .yes ; then
     cf_term_lib=""
     cf_curs_lib=""
 
-    if test ".${cf_cv_ncurses_version-no}" != .no
+    if test ".${cf_cv_ncurses_version:-no}" != .no
     then
         cf_check_list="ncurses curses cursesX"
     else
@@ -1760,7 +1773,7 @@ if test ".$ac_cv_func_initscr" != .yes ; then
     LIBS="-l$cf_curs_lib $cf_save_LIBS"
     if test "$cf_term_lib" = unknown ; then
         AC_MSG_CHECKING(if we can link with $cf_curs_lib library)
-        AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>],
+        AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
             [initscr()],
             [cf_result=yes],
             [cf_result=no])
@@ -1770,12 +1783,12 @@ if test ".$ac_cv_func_initscr" != .yes ; then
         :
     elif test "$cf_term_lib" != predefined ; then
         AC_MSG_CHECKING(if we need both $cf_curs_lib and $cf_term_lib libraries)
-        AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>],
+        AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
             [initscr(); tgoto((char *)0, 0, 0);],
             [cf_result=no],
             [
             LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
-            AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>],
+            AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
                 [initscr()],
                 [cf_result=yes],
                 [cf_result=error])
@@ -1787,7 +1800,7 @@ fi
 
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_TERM_H version: 7 updated: 2010/01/24 18:40:06
+dnl CF_CURSES_TERM_H version: 8 updated: 2010/10/23 15:54:49
 dnl ----------------
 dnl SVr4 curses should have term.h as well (where it puts the definitions of
 dnl the low-level interface).  This may not be true in old/broken implementations,
@@ -1802,11 +1815,11 @@ AC_CACHE_CHECK(for term.h, cf_cv_term_header,[
 # If we found <ncurses/curses.h>, look for <ncurses/term.h>, but always look
 # for <term.h> if we do not find the variant.
 for cf_header in \
-	`echo ${cf_cv_ncurses_header-curses.h} | sed -e 's%/.*%/%'`term.h \
+	`echo ${cf_cv_ncurses_header:-curses.h} | sed -e 's%/.*%/%'`term.h \
 	term.h
 do
 	AC_TRY_COMPILE([
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 #include <${cf_header}>],
 	[WINDOW *x],
 	[cf_cv_term_header=$cf_header
@@ -1821,7 +1834,7 @@ no)
 	for cf_header in ncurses/term.h ncursesw/term.h
 	do
 		AC_TRY_COMPILE([
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 #ifdef NCURSES_VERSION
 #include <${cf_header}>
 #else
@@ -1849,7 +1862,7 @@ ncursesw/term.h)
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CURS_PERFORMANCE version: 3 updated: 1998/04/27 20:32:33
+dnl CF_CURS_PERFORMANCE version: 4 updated: 2010/10/23 15:54:49
 dnl -------------------
 dnl Solaris 2.x curses provides a "performance" tradeoff according to whether
 dnl CURS_PERFORMANCE is defined.  If defined, the implementation defines macros
@@ -1860,7 +1873,7 @@ AC_MSG_CHECKING([for curses performance tradeoff])
 AC_CACHE_VAL(cf_cv_curs_performance,[
     cf_cv_curs_performance=no
     AC_TRY_COMPILE([
-#include <${cf_cv_ncurses_header-curses.h}>],[
+#include <${cf_cv_ncurses_header:-curses.h}>],[
 #if defined(wbkgdset) && defined(clearok) && defined(getbkgd)
 	int x = ERR;
 #else
@@ -1869,7 +1882,7 @@ AC_CACHE_VAL(cf_cv_curs_performance,[
 	],[
 	AC_TRY_COMPILE([
 #define CURS_PERFORMANCE
-#include <${cf_cv_ncurses_header-curses.h}>],[
+#include <${cf_cv_ncurses_header:-curses.h}>],[
 #if defined(wbkgdset) && defined(clearok) && defined(getbkgd)
 	int x = ;	/* force an error */
 #else
@@ -1880,7 +1893,7 @@ AC_MSG_RESULT($cf_cv_curs_performance)
 test $cf_cv_curs_performance = yes && AC_DEFINE(CURS_PERFORMANCE)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CURS_TOUCHLINE version: 2 updated: 2001/05/13 13:42:46
+dnl CF_CURS_TOUCHLINE version: 3 updated: 2010/10/23 15:54:49
 dnl -----------------
 dnl Check for the flavor of the touchline function, to distinguish between BSD
 dnl and SYSV.  This is needed on NetBSD 1.5 which has a partial implementation
@@ -1888,11 +1901,11 @@ dnl of SVR4 curses.
 AC_DEFUN([CF_CURS_TOUCHLINE],[
 AC_CACHE_CHECK(for curses touchline function,cf_cv_curs_touchline,[
 	AC_TRY_LINK([
-#include <${cf_cv_ncurses_header-curses.h}>],
+#include <${cf_cv_ncurses_header:-curses.h}>],
 	[touchline(stdscr, 1,2,3);],
 	[cf_cv_curs_touchline=bsd],
 	[AC_TRY_LINK([
-#include <${cf_cv_ncurses_header-curses.h}>],
+#include <${cf_cv_ncurses_header:-curses.h}>],
 		[touchline(stdscr, 1,2);],
 		[cf_cv_curs_touchline=sysv],
 		[cf_cv_curs_touchline=bsd])])])
@@ -1996,14 +2009,14 @@ AC_DEFUN([CF_ERRNO],
 CF_CHECK_ERRNO(errno)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_FANCY_CURSES version: 4 updated: 2002/10/27 18:21:42
+dnl CF_FANCY_CURSES version: 5 updated: 2010/10/23 15:54:49
 dnl ---------------
 AC_DEFUN([CF_FANCY_CURSES],
 [
 AC_MSG_CHECKING(if curses supports fancy attributes)
 AC_CACHE_VAL(cf_cv_fancy_curses,[
 	AC_TRY_LINK([
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 ],
 	[attrset(A_UNDERLINE|A_BOLD|A_REVERSE);
 	 wattrset(stdscr, A_BLINK|A_DIM);
@@ -2388,7 +2401,7 @@ AC_TRY_LINK([
 test "$cf_cv_fionbio" = "fcntl" && AC_DEFINE(USE_FCNTL)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_FUNC_CURSES_VERSION version: 4 updated: 2007/04/28 09:15:55
+dnl CF_FUNC_CURSES_VERSION version: 5 updated: 2010/10/23 15:54:49
 dnl ----------------------
 dnl Solaris has a data item 'curses_version', which confuses AC_CHECK_FUNCS.
 dnl It's a character string "SVR4", not documented.
@@ -2396,12 +2409,12 @@ AC_DEFUN([CF_FUNC_CURSES_VERSION],
 [
 AC_CACHE_CHECK(for function curses_version, cf_cv_func_curses_version,[
 AC_TRY_RUN([
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 int main()
 {
 	char temp[1024];
 	sprintf(temp, "%s\n", curses_version());
-	${cf_cv_main_return-return}(0);
+	${cf_cv_main_return:-return}(0);
 }]
 ,[cf_cv_func_curses_version=yes]
 ,[cf_cv_func_curses_version=no]
@@ -2410,7 +2423,7 @@ rm -f core])
 test "$cf_cv_func_curses_version" = yes && AC_DEFINE(HAVE_CURSES_VERSION)
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_FUNC_GETADDRINFO version: 6 updated: 2007/04/28 09:15:55
+dnl CF_FUNC_GETADDRINFO version: 7 updated: 2010/10/23 15:52:32
 dnl -------------------
 dnl Look for a working version of getaddrinfo(), for IPV6 support.
 AC_DEFUN([CF_FUNC_GETADDRINFO],[
@@ -2483,12 +2496,12 @@ int main()
 
    if (aitop)
      freeaddrinfo(aitop);
-   ${cf_cv_main_return-return}(0);
+   ${cf_cv_main_return:-return}(0);
 
   bad:
    if (aitop)
      freeaddrinfo(aitop);
-   ${cf_cv_main_return-return}(1);
+   ${cf_cv_main_return:-return}(1);
 }
 ],
 [cf_cv_getaddrinfo=yes],
@@ -2586,7 +2599,7 @@ if test $cf_cv_type_unionwait = yes; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_GCC_ATTRIBUTES version: 13 updated: 2009/08/11 20:19:56
+dnl CF_GCC_ATTRIBUTES version: 14 updated: 2010/10/23 15:52:32
 dnl -----------------
 dnl Test for availability of useful gcc __attribute__ directives to quiet
 dnl compiler warnings.  Though useful, not all are supported -- and contrary
@@ -2613,7 +2626,7 @@ if test "$GCC" = yes
 then
 	AC_CHECKING([for $CC __attribute__ directives])
 cat > conftest.$ac_ext <<EOF
-#line __oline__ "${as_me-configure}"
+#line __oline__ "${as_me:-configure}"
 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"
@@ -2710,7 +2723,7 @@ if test "$GCC" = yes ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_GCC_WARNINGS version: 26 updated: 2010/08/14 18:25:37
+dnl CF_GCC_WARNINGS version: 27 updated: 2010/10/23 15:52:32
 dnl ---------------
 dnl Check if the compiler supports useful warning options.  There's a few that
 dnl we don't use, simply because they're too noisy:
@@ -2735,7 +2748,7 @@ AC_REQUIRE([CF_GCC_VERSION])
 CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS)
 
 cat > conftest.$ac_ext <<EOF
-#line __oline__ "${as_me-configure}"
+#line __oline__ "${as_me:-configure}"
 int main(int argc, char *argv[[]]) { return (argv[[argc-1]] == 0) ; }
 EOF
 
@@ -3267,7 +3280,7 @@ AC_MSG_RESULT($cf_cv_locale)
 test $cf_cv_locale = yes && { ifelse($1,,AC_DEFINE(LOCALE),[$1]) }
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_MAKE_TAGS version: 5 updated: 2010/04/03 20:07:32
+dnl CF_MAKE_TAGS version: 6 updated: 2010/10/23 15:52:32
 dnl ------------
 dnl Generate tags/TAGS targets for makefiles.  Do not generate TAGS if we have
 dnl a monocase filesystem.
@@ -3277,10 +3290,10 @@ AC_REQUIRE([CF_MIXEDCASE_FILENAMES])
 AC_CHECK_PROGS(CTAGS, exctags ctags)
 AC_CHECK_PROGS(ETAGS, exetags etags)
 
-AC_CHECK_PROG(MAKE_LOWER_TAGS, ${CTAGS-ctags}, yes, no)
+AC_CHECK_PROG(MAKE_LOWER_TAGS, ${CTAGS:-ctags}, yes, no)
 
 if test "$cf_cv_mixedcase" = yes ; then
-	AC_CHECK_PROG(MAKE_UPPER_TAGS, ${ETAGS-etags}, yes, no)
+	AC_CHECK_PROG(MAKE_UPPER_TAGS, ${ETAGS:-etags}, yes, no)
 else
 	MAKE_UPPER_TAGS=no
 fi
@@ -3358,15 +3371,15 @@ fi
 test "$cf_cv_mixedcase" = yes && AC_DEFINE(MIXEDCASE_FILENAMES)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_MSG_LOG version: 4 updated: 2007/07/29 09:55:12
+dnl CF_MSG_LOG version: 5 updated: 2010/10/23 15:52:32
 dnl ----------
 dnl Write a debug message to config.log, along with the line number in the
 dnl configure script.
 AC_DEFUN([CF_MSG_LOG],[
-echo "${as_me-configure}:__oline__: testing $* ..." 1>&AC_FD_CC
+echo "${as_me:-configure}:__oline__: testing $* ..." 1>&AC_FD_CC
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_NCURSES_BROKEN version: 6 updated: 1998/04/27 20:32:34
+dnl CF_NCURSES_BROKEN version: 7 updated: 2010/10/23 15:54:49
 dnl -----------------
 dnl Check for pre-1.9.9g ncurses (among other problems, the most obvious is
 dnl that color combinations don't work).
@@ -3377,7 +3390,7 @@ if test "$cf_cv_ncurses_version" != no ; then
 AC_MSG_CHECKING(for obsolete/broken version of ncurses)
 AC_CACHE_VAL(cf_cv_ncurses_broken,[
 AC_TRY_COMPILE([
-#include <${cf_cv_ncurses_header-curses.h}>],[
+#include <${cf_cv_ncurses_header:-curses.h}>],[
 #if defined(NCURSES_VERSION) && defined(wgetbkgd)
 	make an error
 #else
@@ -3468,7 +3481,7 @@ CF_NCURSES_LIBS(ifelse($1,,ncurses,$1))
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_NCURSES_CPPFLAGS version: 19 updated: 2007/07/29 13:35:20
+dnl CF_NCURSES_CPPFLAGS version: 20 updated: 2010/11/20 17:02:38
 dnl -------------------
 dnl Look for the SVr4 curses clone 'ncurses' in the standard places, adjusting
 dnl the CPPFLAGS variable so we can include its header.
@@ -3497,7 +3510,7 @@ cf_ncuhdr_root=ifelse($1,,ncurses,$1)
 
 test -n "$cf_cv_curses_dir" && \
 test "$cf_cv_curses_dir" != "no" && { \
-  CF_ADD_INCDIR($cf_cv_curses_dir/include $cf_cv_curses_dir/include/$cf_ncuhdr_root)
+  CF_ADD_INCDIR($cf_cv_curses_dir/include/$cf_ncuhdr_root)
 }
 
 AC_CACHE_CHECK(for $cf_ncuhdr_root header in include-path, cf_cv_ncurses_h,[
@@ -3585,7 +3598,7 @@ esac
 
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_NCURSES_LIBS version: 14 updated: 2010/06/20 09:24:28
+dnl CF_NCURSES_LIBS version: 16 updated: 2010/11/20 17:02:38
 dnl ---------------
 dnl Look for the ncurses library.  This is a little complicated on Linux,
 dnl because it may be linked with the gpm (general purpose mouse) library.
@@ -3625,11 +3638,10 @@ CF_ADD_LIBS($cf_ncurses_LIBS)
 
 if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
 then
-	CF_ADD_LIBDIR($cf_cv_curses_dir/lib)
 	CF_ADD_LIBS(-l$cf_nculib_root)
 else
 	CF_FIND_LIBRARY($cf_nculib_root,$cf_nculib_root,
-		[#include <${cf_cv_ncurses_header-curses.h}>],
+		[#include <${cf_cv_ncurses_header:-curses.h}>],
 		[initscr()],
 		initscr)
 fi
@@ -3643,7 +3655,7 @@ if test -n "$cf_ncurses_LIBS" ; then
 			LIBS="$q"
 		fi
 	done
-	AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>],
+	AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
 		[initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);],
 		[AC_MSG_RESULT(yes)],
 		[AC_MSG_RESULT(no)
@@ -3654,7 +3666,7 @@ CF_UPPER(cf_nculib_ROOT,HAVE_LIB$cf_nculib_root)
 AC_DEFINE_UNQUOTED($cf_nculib_ROOT)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_NCURSES_VERSION version: 12 updated: 2007/04/28 09:15:55
+dnl CF_NCURSES_VERSION version: 13 updated: 2010/10/23 15:54:49
 dnl ------------------
 dnl Check for the version of ncurses, to aid in reporting bugs, etc.
 dnl Call CF_CURSES_CPPFLAGS first, or CF_NCURSES_CPPFLAGS.  We don't use
@@ -3667,7 +3679,7 @@ AC_CACHE_CHECK(for ncurses version, cf_cv_ncurses_version,[
 	cf_tempfile=out$$
 	rm -f $cf_tempfile
 	AC_TRY_RUN([
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 #include <stdio.h>
 int main()
 {
@@ -3685,14 +3697,14 @@ int main()
 	make an error
 # endif
 #endif
-	${cf_cv_main_return-return}(0);
+	${cf_cv_main_return:-return}(0);
 }],[
 	cf_cv_ncurses_version=`cat $cf_tempfile`],,[
 
 	# This will not work if the preprocessor splits the line after the
 	# Autoconf token.  The 'unproto' program does that.
 	cat > conftest.$ac_ext <<EOF
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 #undef Autoconf
 #ifdef NCURSES_VERSION
 Autoconf NCURSES_VERSION
@@ -4014,7 +4026,7 @@ ifelse([$1],,,[$1=$PATH_SEPARATOR])
 	AC_SUBST(PATH_SEPARATOR)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_PATH_PROG version: 7 updated: 2009/01/11 20:34:16
+dnl CF_PATH_PROG version: 8 updated: 2010/10/23 16:12:25
 dnl ------------
 dnl Check for a given program, defining corresponding symbol.
 dnl	$1 = environment variable, which is suffixed by "_PATH" in the #define.
@@ -4033,7 +4045,7 @@ AC_PATH_PROGS($1,[$]$1 $2 $3,[$]$1)
 
 cf_path_prog=""
 cf_path_args=""
-IFS="${IFS= 	}"; cf_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR"
+IFS="${IFS:- 	}"; cf_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR"
 for cf_temp in $ac_cv_path_$1
 do
 	if test -z "$cf_path_prog" ; then
@@ -4479,7 +4491,7 @@ CF_VERBOSE(...checked $1 [$]$1)
 AC_SUBST(EXTRA_LDFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_SET_ERRNO version: 3 updated: 2007/04/28 09:15:55
+dnl CF_SET_ERRNO version: 4 updated: 2010/10/23 15:52:32
 dnl ------------
 dnl Check if 'errno' is declared in a fashion that lets us set it.
 AC_DEFUN([CF_SET_ERRNO],
@@ -4490,7 +4502,7 @@ AC_TRY_RUN([
 int main()
 {
 	errno = 255;
-	${cf_cv_main_return-return}(errno != 255);
+	${cf_cv_main_return:-return}(errno != 255);
 }],
 	[cf_cv_set_errno=yes],
 	[cf_cv_set_errno=no],
@@ -5302,7 +5314,7 @@ if test "$cf_cv_termlib" = none; then
 fi
 ])])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_TERMIO_AND_CURSES version: 3 updated: 2000/12/31 19:47:37
+dnl CF_TERMIO_AND_CURSES version: 4 updated: 2010/10/23 15:54:49
 dnl --------------------
 dnl Check if including termio.h with <curses.h> dies like on sysv68
 dnl FIXME: this is too Lynx-specific
@@ -5310,7 +5322,7 @@ AC_DEFUN([CF_TERMIO_AND_CURSES],
 [
 AC_CACHE_CHECK(if we can include termio.h with curses,cf_cv_termio_and_curses,[
     cf_save_CFLAGS="$CPPFLAGS"
-    CPPFLAGS="$CPPFLAGS -DHAVE_CONFIG_H -I. -I${srcdir-.} -I${srcdir-.}/src -I${srcdir-.}/WWW/Library/Implementation"
+    CPPFLAGS="$CPPFLAGS -DHAVE_CONFIG_H -I. -I${srcdir:-.} -I${srcdir:-.}/src -I${srcdir:-.}/WWW/Library/Implementation"
     touch lynx_cfg.h
     AC_TRY_COMPILE([
 #include <$1>
@@ -5346,7 +5358,7 @@ AC_MSG_RESULT($cf_cv_termio_and_termios)
 test $cf_cv_termio_and_termios = no && AC_DEFINE(TERMIO_AND_TERMIOS)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_TERM_HEADER version: 1 updated: 2005/12/31 13:26:39
+dnl CF_TERM_HEADER version: 2 updated: 2010/10/23 15:54:49
 dnl --------------
 dnl Look for term.h, which is part of X/Open curses.  It defines the interface
 dnl to terminfo database.  Usually it is in the same include-path as curses.h,
@@ -5365,7 +5377,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 AC_TRY_COMPILE([#include <stdio.h>
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 #include <$cf_test>
 ],[int x = auto_left_margin],[
 	cf_cv_term_header="$cf_test"],[
@@ -5471,13 +5483,13 @@ else
 fi
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_TTYTYPE version: 4 updated: 2002/10/27 18:21:42
+dnl CF_TTYTYPE version: 5 updated: 2010/10/23 15:54:49
 dnl ----------
 AC_DEFUN([CF_TTYTYPE],
 [
 AC_MSG_CHECKING(if ttytype is declared in curses library)
 AC_CACHE_VAL(cf_cv_have_ttytype,[
-	AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>],
+	AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
 	[char *x = &ttytype[1]; *x = 1],
 	[cf_cv_have_ttytype=yes],
 	[cf_cv_have_ttytype=no])
@@ -5853,7 +5865,7 @@ fi
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WIDEC_CURSES version: 3 updated: 2001/11/18 20:52:38
+dnl CF_WIDEC_CURSES version: 4 updated: 2010/10/23 15:54:49
 dnl ---------------
 dnl Check for curses implementations that can handle wide-characters
 AC_DEFUN([CF_WIDEC_CURSES],
@@ -5861,7 +5873,7 @@ AC_DEFUN([CF_WIDEC_CURSES],
 AC_CACHE_CHECK(if curses supports wide characters,cf_cv_widec_curses,[
 AC_TRY_LINK([
 #include <stdlib.h>
-#include <${cf_cv_ncurses_header-curses.h}>],[
+#include <${cf_cv_ncurses_header:-curses.h}>],[
     wchar_t temp[2];
     wchar_t wch = 'A';
     temp[0] = wch;
@@ -5878,13 +5890,13 @@ if test "$cf_cv_widec_curses" = yes ; then
 	AC_CACHE_CHECK(if we must include wchar.h to declare mbstate_t,cf_cv_widec_mbstate,[
 	AC_TRY_COMPILE([
 #include <stdlib.h>
-#include <${cf_cv_ncurses_header-curses.h}>],
+#include <${cf_cv_ncurses_header:-curses.h}>],
 [mbstate_t state],
 [cf_cv_widec_mbstate=no],
 [AC_TRY_COMPILE([
 #include <stdlib.h>
 #include <wchar.h>
-#include <${cf_cv_ncurses_header-curses.h}>],
+#include <${cf_cv_ncurses_header:-curses.h}>],
 [mbstate_t state],
 [cf_cv_widec_mbstate=yes],
 [cf_cv_widec_mbstate=unknown])])])
@@ -5916,16 +5928,28 @@ AC_DEFUN([CF_WITH_BZLIB],[
 ],bz2,,,bzlib)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_CURSES_DIR version: 2 updated: 2002/11/10 14:46:59
+dnl CF_WITH_CURSES_DIR version: 3 updated: 2010/11/20 17:02:38
 dnl ------------------
 dnl Wrapper for AC_ARG_WITH to specify directory under which to look for curses
 dnl libraries.
 AC_DEFUN([CF_WITH_CURSES_DIR],[
+
+AC_MSG_CHECKING(for specific curses-directory)
 AC_ARG_WITH(curses-dir,
 	[  --with-curses-dir=DIR   directory in which (n)curses is installed],
-	[CF_PATH_SYNTAX(withval)
-	 cf_cv_curses_dir=$withval],
+	[cf_cv_curses_dir=$withval],
 	[cf_cv_curses_dir=no])
+AC_MSG_RESULT($cf_cv_curses_dir)
+
+if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
+then
+	CF_PATH_SYNTAX(withval)
+	if test -d "$cf_cv_curses_dir"
+	then
+		CF_ADD_INCDIR($cf_cv_curses_dir/include)
+		CF_ADD_LIBDIR($cf_cv_curses_dir/lib)
+	fi
+fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_WITH_DBMALLOC version: 7 updated: 2010/06/21 17:26:47
@@ -5958,7 +5982,7 @@ if test "$with_dmalloc" = yes ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_IDNA version: 7 updated: 2010/05/05 20:27:55
+dnl CF_WITH_IDNA version: 8 updated: 2010/11/26 15:10:07
 dnl ------------
 dnl Check for libidn, use it if found.
 dnl
@@ -5972,14 +5996,14 @@ AC_DEFUN([CF_WITH_IDNA],[
 ],[
 	char *output = 0;
     int code = idna_to_ascii_8z("name", &output, IDNA_USE_STD3_ASCII_RULES);
-],idn)
+],idn,,,,[$LIBICONV])
 
 if test "x$cf_cv_find_linkage_idn" = xyes ; then
 	AC_DEFINE(USE_IDNA)
 fi 
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_PATH version: 9 updated: 2010/05/26 05:38:42
+dnl CF_WITH_PATH version: 10 updated: 2010/10/23 15:44:18
 dnl ------------
 dnl Wrapper for AC_ARG_WITH to ensure that user supplies a pathname, not just
 dnl defaulting to yes/no.
@@ -5992,7 +6016,7 @@ dnl $5 = default value, if it's an expression & cannot be in the help-message
 dnl
 AC_DEFUN([CF_WITH_PATH],
 [AC_ARG_WITH($1,[$2 ](default: ifelse([$4],,empty,[$4])),,
-ifelse([$4],,[withval="${$3}"],[withval="${$3-ifelse([$5],,[$4],[$5])}"]))dnl
+ifelse([$4],,[withval="${$3}"],[withval="${$3:-ifelse([$5],,[$4],[$5])}"]))dnl
 if ifelse([$5],,true,[test -n "$5"]) ; then
 CF_PATH_SYNTAX(withval)
 fi
@@ -6013,7 +6037,7 @@ AC_DEFUN([CF_WITH_ZLIB],[
 ],z,,,zlib)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_XOPEN_CURSES version: 9 updated: 2010/04/28 06:02:16
+dnl CF_XOPEN_CURSES version: 10 updated: 2010/10/23 15:54:49
 dnl ---------------
 dnl Test if we should define X/Open source for curses, needed on Digital Unix
 dnl 4.x, to see the extended functions, but breaks on IRIX 6.x.
@@ -6026,7 +6050,7 @@ AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl
 AC_CACHE_CHECK(if we must define _XOPEN_SOURCE_EXTENDED,cf_cv_need_xopen_extension,[
 AC_TRY_LINK([
 #include <stdlib.h>
-#include <${cf_cv_ncurses_header-curses.h}>],[
+#include <${cf_cv_ncurses_header:-curses.h}>],[
 #if defined(NCURSES_VERSION_PATCH)
 if (NCURSES_VERSION_PATCH < 20100501) && (NCURSES_VERSION_PATCH >= 20100403)
 	make an error
@@ -6039,7 +6063,7 @@ if (NCURSES_VERSION_PATCH < 20100501) && (NCURSES_VERSION_PATCH >= 20100403)
 	[AC_TRY_LINK([
 #define _XOPEN_SOURCE_EXTENDED
 #include <stdlib.h>
-#include <${cf_cv_ncurses_header-curses.h}>],[
+#include <${cf_cv_ncurses_header:-curses.h}>],[
 #ifdef NCURSES_VERSION
 	cchar_t check;
 	int check2 = curs_set((int)sizeof(check));
@@ -6154,14 +6178,14 @@ if test -n "$cf_xopen_source" ; then
 fi
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_X_ATHENA version: 16 updated: 2010/06/14 17:42:30
+dnl CF_X_ATHENA version: 20 updated: 2010/11/09 05:18:02
 dnl -----------
 dnl Check for Xaw (Athena) libraries
 dnl
 dnl Sets $cf_x_athena according to the flavor of Xaw which is used.
 AC_DEFUN([CF_X_ATHENA],
 [
-cf_x_athena=${cf_x_athena-Xaw}
+cf_x_athena=${cf_x_athena:-Xaw}
 
 AC_MSG_CHECKING(if you want to link with Xaw 3d library)
 withval=
@@ -6212,6 +6236,27 @@ if test "$PKG_CONFIG" != none ; then
 			cf_x_athena_lib="$cf_pkgconfig_libs"
 			CF_UPPER(cf_x_athena_LIBS,HAVE_LIB_$cf_x_athena)
 			AC_DEFINE_UNQUOTED($cf_x_athena_LIBS)
+
+AC_CACHE_CHECK(for usable $cf_x_athena/Xmu package,cf_cv_xaw_compat,[
+AC_TRY_LINK([
+#include <X11/Xmu/CharSet.h>
+],[
+int check = XmuCompareISOLatin1("big", "small")
+],[cf_cv_xaw_compat=yes],[cf_cv_xaw_compat=no])])
+
+			if test "$cf_cv_xaw_compat" = no
+			then
+				# workaround for broken ".pc" files...
+				case "$cf_x_athena_lib" in #(vi
+				*-lXmu*) #(vi
+					;;
+				*)
+					CF_VERBOSE(work around broken package)
+					CF_TRY_PKG_CONFIG(xmu,,[CF_ADD_LIB_AFTER(-lXt,-lXmu)])
+					;;
+				esac
+			fi
+
 			break])
 	done
 fi
@@ -6331,7 +6376,7 @@ CF_TRY_PKG_CONFIG(Xext,,[
 		[CF_ADD_LIB(Xext)])])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_X_TOOLKIT version: 15 updated: 2010/06/14 17:42:30
+dnl CF_X_TOOLKIT version: 20 updated: 2010/11/19 05:43:04
 dnl ------------
 dnl Check for X Toolkit libraries
 dnl
@@ -6344,22 +6389,54 @@ cf_have_X_LIBS=no
 
 CF_TRY_PKG_CONFIG(xt,[
 
-	# workaround for broken ".pc" files used for X Toolkit.
-	case "x$X_PRE_LIBS" in #(vi
-	*-lICE*)
-		case "x$LIBS" in #(vi
-		*-lICE*) #(vi
-			;;
-		*)
-			CF_VERBOSE(work around broken package)
-			CF_VERBOSE(...before $LIBS)
-			LIBS=`echo "$LIBS" | sed -e "s/[[ 	]][[ 	]]*/ /g" -e "s,-lXt ,-lXt $X_PRE_LIBS ," -e 's/  / /g'`
-			CF_VERBOSE(...after  $LIBS)
-			;;
-		esac
+	case "x$LIBS" in #(vi
+	*-lX11*) #(vi
+		;;
+	*)
+# we have an "xt" package, but it may omit Xt's dependency on X11
+AC_CACHE_CHECK(for usable X dependency,cf_cv_xt_x11_compat,[
+AC_TRY_LINK([
+#include <X11/Xlib.h>
+],[
+	int rc1 = XDrawLine((Display*) 0, (Drawable) 0, (GC) 0, 0, 0, 0, 0);
+	int rc2 = XClearWindow((Display*) 0, (Window) 0);
+	int rc3 = XMoveWindow((Display*) 0, (Window) 0, 0, 0);
+	int rc4 = XMoveResizeWindow((Display*)0, (Window)0, 0, 0, 0, 0);
+],[cf_cv_xt_x11_compat=yes],[cf_cv_xt_x11_compat=no])])
+		if test "$cf_cv_xt_x11_compat" = no
+		then
+			CF_VERBOSE(work around broken X11 dependency)
+			# 2010/11/19 - good enough until a working Xt on Xcb is delivered.
+			CF_TRY_PKG_CONFIG(x11,,[CF_ADD_LIB_AFTER(-lXt,-lX11)])
+		fi
 		;;
 	esac
 
+AC_CACHE_CHECK(for usable X Toolkit package,cf_cv_xt_ice_compat,[
+AC_TRY_LINK([
+#include <X11/Shell.h>
+],[int num = IceConnectionNumber(0)
+],[cf_cv_xt_ice_compat=yes],[cf_cv_xt_ice_compat=no])])
+
+	if test "$cf_cv_xt_ice_compat" = no
+	then
+		# workaround for broken ".pc" files used for X Toolkit.
+		case "x$X_PRE_LIBS" in #(vi
+		*-lICE*)
+			case "x$LIBS" in #(vi
+			*-lICE*) #(vi
+				;;
+			*)
+				CF_VERBOSE(work around broken ICE dependency)
+				CF_TRY_PKG_CONFIG(ice,
+					[CF_TRY_PKG_CONFIG(sm)],
+					[CF_ADD_LIB_AFTER(-lXt,$X_PRE_LIBS)])
+				;;
+			esac
+			;;
+		esac
+	fi
+
 	cf_have_X_LIBS=yes
 ],[
 
@@ -6387,7 +6464,7 @@ to makefile.])
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF__CURSES_HEAD version: 1 updated: 2009/07/16 19:32:31
+dnl CF__CURSES_HEAD version: 2 updated: 2010/10/23 15:54:49
 dnl ---------------
 dnl Define a reusable chunk which includes <curses.h> and <term.h> when they
 dnl are both available.
@@ -6396,7 +6473,7 @@ define([CF__CURSES_HEAD],[
 #include <xcurses.h>
 char * XCursesProgramName = "test";
 #else
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 #if defined(NCURSES_VERSION) && defined(HAVE_NCURSESW_TERM_H)
 #include <ncursesw/term.h>
 #elif defined(NCURSES_VERSION) && defined(HAVE_NCURSES_TERM_H)
diff --git a/config.guess b/config.guess
index c2246a4f..bec935b9 100755
--- a/config.guess
+++ b/config.guess
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 #   Free Software Foundation, Inc.
 
-timestamp='2009-12-30'
+timestamp='2010-09-24'
 
 # 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
@@ -92,7 +92,7 @@ if test $# != 0; then
   exit 1
 fi
 
-trap 'exit 1' 1 2 15
+trap 'exit 1' HUP INT TERM
 
 # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
 # compiler to aid in system detection is discouraged as it requires
@@ -106,7 +106,7 @@ trap 'exit 1' 1 2 15
 
 set_cc_for_build='
 trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" HUP INT PIPE TERM ;
 : ${TMPDIR=/tmp} ;
  { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
@@ -181,7 +181,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		fi
 		;;
 	    *)
-	        os=netbsd
+		os=netbsd
 		;;
 	esac
 	# The OS release
@@ -220,11 +220,11 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	exit ;;
     alpha:OSF1:*:*)
 	case $UNAME_RELEASE in
-	*4.0)
+	    *4.0)
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 		;;
-	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+	    *5.*)
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 		;;
 	esac
 	# According to Compaq, /usr/sbin/psrinfo has been available on
@@ -296,7 +296,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	echo s390-ibm-zvmoe
 	exit ;;
     *:OS400:*:*)
-        echo powerpc-ibm-os400
+	echo powerpc-ibm-os400
 	exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
@@ -326,8 +326,8 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	    sparc) echo sparc-icl-nx7; exit ;;
 	esac ;;
     s390x:SunOS:*:*)
-	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
+    	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+    	exit ;;
     sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
@@ -395,23 +395,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     # MiNT.  But MiNT is downward compatible to TOS, so this should
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
+	exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-milan-mint${UNAME_RELEASE}
+	exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-hades-mint${UNAME_RELEASE}
+	exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-unknown-mint${UNAME_RELEASE}
+	exit ;;
     m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
 	exit ;;
@@ -481,8 +481,8 @@ EOF
 	echo m88k-motorola-sysv3
 	exit ;;
     AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
 	then
 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -552,7 +552,7 @@ EOF
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:[456])
+    *:AIX:*:[4567])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@@ -595,8 +595,8 @@ EOF
 	    9000/[678][0-9][0-9])
 		if [ -x /usr/bin/getconf ]; then
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+		    case "${sc_cpu_version}" in
                       523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
                       528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
                       532)                      # CPU_PA_RISC2_0
@@ -731,22 +731,22 @@ EOF
 	exit ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-        exit ;;
+	exit ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-        exit ;;
+	exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-        exit ;;
+	exit ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-        exit ;;
+	exit ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-        exit ;;
+	exit ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit ;;
@@ -770,14 +770,14 @@ EOF
 	exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit ;;
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
     5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -805,14 +805,14 @@ EOF
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
     i*:windows32*:*)
-    	# uname -m includes "-pc" on this system.
-    	echo ${UNAME_MACHINE}-mingw32
+	# uname -m includes "-pc" on this system.
+	echo ${UNAME_MACHINE}-mingw32
 	exit ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
     *:Interix*:*)
-    	case ${UNAME_MACHINE} in
+	case ${UNAME_MACHINE} in
 	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
@@ -820,8 +820,8 @@ EOF
 		echo x86_64-unknown-interix${UNAME_RELEASE}
 		exit ;;
 	    IA64)
-		echo ia64-unknown-interix${UNAME_RELEASE}
-		exit ;;
+	    	echo ia64-unknown-interix${UNAME_RELEASE}
+	    	exit ;;
 	esac ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
@@ -860,22 +860,22 @@ EOF
 	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
+	    EV5)   UNAME_MACHINE=alphaev5 ;;
+	    EV56)  UNAME_MACHINE=alphaev56 ;;
+	    PCA56) UNAME_MACHINE=alphapca56 ;;
+	    PCA57) UNAME_MACHINE=alphapca56 ;;
+	    EV6)   UNAME_MACHINE=alphaev6 ;;
+	    EV67)  UNAME_MACHINE=alphaev67 ;;
+	    EV68*) UNAME_MACHINE=alphaev68 ;;
+	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
 	exit ;;
     arm*:Linux:*:*)
 	eval $set_cc_for_build
-	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-	    | grep -q __ARM_EABI__
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null | \
+	    grep -q __ARM_EABI__
 	then
 	    echo ${UNAME_MACHINE}-unknown-linux-gnu
 	else
@@ -892,12 +892,12 @@ EOF
 	echo crisv32-axis-linux-gnu
 	exit ;;
     frv:Linux:*:*)
-    	echo frv-unknown-linux-gnu
+	echo frv-unknown-linux-gnu
 	exit ;;
     i*86:Linux:*:*)
 	LIBC=gnu
 	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
+	sed 's/^        //' << EOF >$dummy.c
 	#ifdef __dietlibc__
 	LIBC=dietlibc
 	#endif
@@ -934,14 +934,14 @@ EOF
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     or32:Linux:*:*)
-	echo or32-unknown-linux-gnu
-	exit ;;
+    	echo or32-unknown-linux-gnu
+    	exit ;;
     padre:Linux:*:*)
 	echo sparc-unknown-linux-gnu
 	exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
-	exit ;;
+    	echo hppa64-unknown-linux-gnu
+    	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -960,7 +960,7 @@ EOF
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit ;;
     sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -968,6 +968,9 @@ EOF
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
+    tile*:Linux:*:*)
+	echo ${UNAME_MACHINE}-tilera-linux-gnu
+	exit ;;
     vax:Linux:*:*)
 	echo ${UNAME_MACHINE}-dec-linux-gnu
 	exit ;;
@@ -975,7 +978,7 @@ EOF
 	echo x86_64-unknown-linux-gnu
 	exit ;;
     xtensa*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -984,11 +987,11 @@ EOF
 	echo i386-sequent-sysv4
 	exit ;;
     i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
+	# Unixware is an offshoot of SVR4, but it has its own version
+	# number series starting with 2...
+	# I am not positive that other SVR4 systems won't match this,
 	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
+	# Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit ;;
     i*86:OS/2:*:*)
@@ -1020,7 +1023,7 @@ EOF
 	fi
 	exit ;;
     i*86:*:5:[678]*)
-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
@@ -1048,13 +1051,13 @@ EOF
 	exit ;;
     pc:*:*:*)
 	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i586.
+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
+	# the processor, so we play safe by assuming i586.
 	# Note: whatever this is, it MUST be the same as what config.sub
 	# prints for the "djgpp" host, or else GDB configury will decide that
 	# this is a cross-build.
 	echo i586-pc-msdosdjgpp
-        exit ;;
+	exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
 	exit ;;
@@ -1089,8 +1092,8 @@ EOF
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
 	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4; exit; } ;;
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	   && { echo i486-ncr-sysv4; exit; } ;;
     NCR*:*:4.2:* | MPRAS*:*:4.2:*)
 	OS_REL='.3'
 	test -r /etc/.relid \
@@ -1134,9 +1137,9 @@ EOF
 	fi
 	exit ;;
     PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit ;;
+	              # says <Richard.M.Bartel@ccMail.Census.GOV>
+	echo i586-unisys-sysv4
+	exit ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes@openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
@@ -1166,7 +1169,7 @@ EOF
 	else
 	        echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-        exit ;;
+	exit ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
 	exit ;;
@@ -1209,12 +1212,12 @@ EOF
 	    i386)
 		eval $set_cc_for_build
 		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		      grep IS_64BIT_ARCH >/dev/null
-		  then
-		      UNAME_PROCESSOR="x86_64"
-		  fi
+		    if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+			(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+			grep IS_64BIT_ARCH >/dev/null
+		    then
+			UNAME_PROCESSOR="x86_64"
+		    fi
 		fi ;;
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
@@ -1223,14 +1226,17 @@ EOF
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
 	UNAME_PROCESSOR=`uname -p`
 	if test "$UNAME_PROCESSOR" = "x86"; then
-		UNAME_PROCESSOR=i386
-		UNAME_MACHINE=pc
+	    UNAME_PROCESSOR=i386
+	    UNAME_MACHINE=pc
 	fi
 	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
 	exit ;;
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit ;;
+    NEO-?:NONSTOP_KERNEL:*:*)
+	echo neo-tandem-nsk${UNAME_RELEASE}
+	exit ;;
     NSE-?:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
 	exit ;;
@@ -1276,13 +1282,13 @@ EOF
 	echo pdp10-unknown-its
 	exit ;;
     SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
+	echo mips-sei-seiux${UNAME_RELEASE}
 	exit ;;
     *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit ;;
     *:*VMS:*:*)
-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 	case "${UNAME_MACHINE}" in
 	    A*) echo alpha-dec-vms ; exit ;;
 	    I*) echo ia64-dec-vms ; exit ;;
diff --git a/config.sub b/config.sub
index 85186096..de11910f 100755
--- a/config.sub
+++ b/config.sub
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 #   Free Software Foundation, Inc.
 
-timestamp='2009-12-31'
+timestamp='2010-09-11'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -124,8 +124,9 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | \
   kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
@@ -157,8 +158,8 @@ case $os in
 		os=
 		basic_machine=$1
 		;;
-        -bluegene*)
-	        os=-cnk
+	-bluegene*)
+		os=-cnk
 		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
@@ -282,6 +283,7 @@ case $basic_machine in
 	| moxie \
 	| mt \
 	| msp430 \
+	| nds32 | nds32le | nds32be\
 	| nios | nios2 \
 	| ns16k | ns32k \
 	| or32 \
@@ -295,7 +297,7 @@ case $basic_machine in
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
 	| spu | strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
+	| tahoe | thumb | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 	| ubicom32 \
 	| v850 | v850e \
 	| we32k \
@@ -303,6 +305,15 @@ case $basic_machine in
 	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
+	c54x)
+		basic_machine=tic54x-unknown
+		;;
+	c55x)
+		basic_machine=tic55x-unknown
+		;;
+	c6x)
+		basic_machine=tic6x-unknown
+		;;
 	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
@@ -318,8 +329,8 @@ case $basic_machine in
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
 	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
+		basic_machine=$basic_machine-pc
+		;;
 	# Object if more than one company name word.
 	*-*-*)
 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
@@ -334,7 +345,7 @@ case $basic_machine in
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
 	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
@@ -368,6 +379,7 @@ case $basic_machine in
 	| mmix-* \
 	| mt-* \
 	| msp430-* \
+	| nds32-* | nds32le-* | nds32be-* \
 	| nios-* | nios2-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
@@ -381,7 +393,8 @@ case $basic_machine in
 	| sparclite-* \
 	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tile-* | tilegx-* \
 	| tron-* \
 	| ubicom32-* \
 	| v850-* | v850e-* | vax-* \
@@ -411,7 +424,7 @@ case $basic_machine in
 		basic_machine=a29k-amd
 		os=-udi
 		;;
-    	abacus)
+	abacus)
 		basic_machine=abacus-unknown
 		;;
 	adobe68k)
@@ -481,11 +494,20 @@ case $basic_machine in
 		basic_machine=powerpc-ibm
 		os=-cnk
 		;;
+	c54x-*)
+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c55x-*)
+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c6x-*)
+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
 		;;
-        cegcc)
+	cegcc)
 		basic_machine=arm-unknown
 		os=-cegcc
 		;;
@@ -733,7 +755,7 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
-        microblaze)
+	microblaze)
 		basic_machine=microblaze-xilinx
 		;;
 	mingw32)
@@ -840,6 +862,12 @@ case $basic_machine in
 	np1)
 		basic_machine=np1-gould
 		;;
+	neo-tandem)
+		basic_machine=neo-tandem
+		;;
+	nse-tandem)
+		basic_machine=nse-tandem
+		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
@@ -1074,17 +1102,10 @@ case $basic_machine in
 		basic_machine=t90-cray
 		os=-unicos
 		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
+	# This must be matched before tile*.
+	tilegx*)
+		basic_machine=tilegx-unknown
+		os=-linux-gnu
 		;;
 	tile*)
 		basic_machine=tile-unknown
@@ -1254,11 +1275,11 @@ esac
 if [ x"$os" != x"" ]
 then
 case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
+	# First match some system type aliases
+	# that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
-        -auroraux)
-	        os=-auroraux
+	-auroraux)
+		os=-auroraux
 		;;
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
@@ -1295,7 +1316,8 @@ case $os in
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* | -cegcc* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+	      | -mingw32* | -linux-gnu* | -linux-android* \
+	      | -linux-newlib* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1342,7 +1364,7 @@ case $os in
 	-opened*)
 		os=-openedition
 		;;
-        -os400*)
+	-os400*)
 		os=-os400
 		;;
 	-wince*)
@@ -1391,7 +1413,7 @@ case $os in
 	-sinix*)
 		os=-sysv4
 		;;
-        -tpf*)
+	-tpf*)
 		os=-tpf
 		;;
 	-triton*)
@@ -1436,8 +1458,8 @@ case $os in
 	-dicos*)
 		os=-dicos
 		;;
-        -nacl*)
-	        ;;
+	-nacl*)
+		;;
 	-none)
 		;;
 	*)
@@ -1460,10 +1482,10 @@ else
 # system, and we'll never get to this point.
 
 case $basic_machine in
-        score-*)
+	score-*)
 		os=-elf
 		;;
-        spu-*)
+	spu-*)
 		os=-elf
 		;;
 	*-acorn)
@@ -1475,8 +1497,17 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
-        c4x-* | tic4x-*)
-        	os=-coff
+	c4x-* | tic4x-*)
+		os=-coff
+		;;
+	tic54x-*)
+		os=-coff
+		;;
+	tic55x-*)
+		os=-coff
+		;;
+	tic6x-*)
+		os=-coff
 		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
@@ -1503,7 +1534,7 @@ case $basic_machine in
 	m68*-cisco)
 		os=-aout
 		;;
-        mep-*)
+	mep-*)
 		os=-elf
 		;;
 	mips*-cisco)
@@ -1530,7 +1561,7 @@ case $basic_machine in
 	*-ibm)
 		os=-aix
 		;;
-    	*-knuth)
+	*-knuth)
 		os=-mmixware
 		;;
 	*-wec)
diff --git a/configure b/configure
index 1bb42cc1..b8c899f9 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in 2.8.8dev.5.
+# From configure.in 2.8.8dev.6.
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20101001.
 #
@@ -1271,7 +1271,7 @@ if test "${with_destdir+set}" = set; then
   withval="$with_destdir"
 
 else
-  withval="${DESTDIR-$DESTDIR}"
+  withval="${DESTDIR:-$DESTDIR}"
 fi; if test -n "$DESTDIR" ; then
 
 if test "x$prefix" != xNONE; then
@@ -2521,8 +2521,8 @@ fi
   test -n "$ETAGS" && break
 done
 
-# Extract the first word of "${CTAGS-ctags}", so it can be a program name with args.
-set dummy ${CTAGS-ctags}; ac_word=$2
+# Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
+set dummy ${CTAGS:-ctags}; ac_word=$2
 echo "$as_me:2526: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then
@@ -2555,8 +2555,8 @@ echo "${ECHO_T}no" >&6
 fi
 
 if test "$cf_cv_mixedcase" = yes ; then
-	# Extract the first word of "${ETAGS-etags}", so it can be a program name with args.
-set dummy ${ETAGS-etags}; ac_word=$2
+	# Extract the first word of "${ETAGS:-etags}", so it can be a program name with args.
+set dummy ${ETAGS:-etags}; ac_word=$2
 echo "$as_me:2560: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then
@@ -2997,7 +2997,7 @@ EOF
 		else
 			test -n "$verbose" && echo "	cannot compile test-program" 1>&6
 
-echo "${as_me-configure}:3000: testing cannot compile test-program ..." 1>&5
+echo "${as_me:-configure}:3000: testing cannot compile test-program ..." 1>&5
 
 			break
 		fi
@@ -3219,7 +3219,7 @@ then
 	{ echo "$as_me:3219: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > conftest.$ac_ext <<EOF
-#line 3222 "${as_me-configure}"
+#line 3222 "${as_me:-configure}"
 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"
@@ -3372,7 +3372,7 @@ echo "${ECHO_T}$INTEL_COMPILER" >&6
 fi
 
 cat > conftest.$ac_ext <<EOF
-#line 3375 "${as_me-configure}"
+#line 3375 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 
@@ -3455,7 +3455,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				[34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me-configure}:3458: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:3458: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -4508,8 +4508,8 @@ mingw*)
 	;;
 esac
 
-echo "$as_me:4511: checking for ${CC-cc} option to accept ANSI C" >&5
-echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6
+echo "$as_me:4511: checking for ${CC:-cc} option to accept ANSI C" >&5
+echo $ECHO_N "checking for ${CC:-cc} option to accept ANSI C... $ECHO_C" >&6
 if test "${cf_cv_ansi_cc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -5292,7 +5292,7 @@ fi
 	if test "$MSGINIT" != ":" ; then
 		test -n "$verbose" && echo "	adding en.po" 1>&6
 
-echo "${as_me-configure}:5295: testing adding en.po ..." 1>&5
+echo "${as_me:-configure}:5295: testing adding en.po ..." 1>&5
 
 		ALL_LINGUAS="$ALL_LINGUAS en"
 	fi
@@ -6320,7 +6320,7 @@ cf_makefile=makefile
 test -z "$ALL_LINGUAS" && ALL_LINGUAS=`test -d $srcdir/po && cd $srcdir/po && echo *.po|sed -e 's/\.po//g' -e 's/*//'`
 
 # Allow override of "config.h" definition:
-: ${CONFIG_H=config.h}
+: ${CONFIG_H:=config.h}
 
 if test -z "$PACKAGE" ; then
 	{ { echo "$as_me:6326: error: CF_BUNDLED_INTL used without setting PACKAGE variable" >&5
@@ -6532,7 +6532,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:6535: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:6535: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -6611,7 +6611,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:6614: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:6614: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -6652,7 +6652,7 @@ if test -n "$cf_searchpath/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:6655: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:6655: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -6681,7 +6681,7 @@ if test -n "$cf_searchpath" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:6684: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:6684: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -6712,7 +6712,7 @@ else
 cf_cv_header_path_iconv=
 cf_cv_library_path_iconv=
 
-echo "${as_me-configure}:6715: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:6715: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
@@ -6804,9 +6804,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for iconv library" 1>&6
 
-echo "${as_me-configure}:6807: testing find linkage for iconv library ..." 1>&5
+echo "${as_me:-configure}:6807: testing find linkage for iconv library ..." 1>&5
 
-echo "${as_me-configure}:6809: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:6809: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -6919,7 +6919,7 @@ cf_search="$cf_search $cf_header_path_list"
       if test -d $cf_cv_header_path_iconv ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_iconv" 1>&6
 
-echo "${as_me-configure}:6922: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:6922: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_iconv"
         cat >conftest.$ac_ext <<_ACEOF
@@ -6956,7 +6956,7 @@ if { (eval echo "$as_me:6945: \"$ac_compile\"") >&5
 
             test -n "$verbose" && echo "	... found iconv headers in $cf_cv_header_path_iconv" 1>&6
 
-echo "${as_me-configure}:6959: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:6959: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
 
             cf_cv_find_linkage_iconv=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -6974,7 +6974,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_iconv" = maybe ; then
 
-echo "${as_me-configure}:6977: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:6977: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -7071,7 +7071,7 @@ cf_search="$cf_library_path_list $cf_search"
           if test -d $cf_cv_library_path_iconv ; then
             test -n "$verbose" && echo "	... testing $cf_cv_library_path_iconv" 1>&6
 
-echo "${as_me-configure}:7074: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:7074: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-liconv  $cf_save_LIBS"
@@ -7110,7 +7110,7 @@ if { (eval echo "$as_me:7099: \"$ac_link\"") >&5
 
                 test -n "$verbose" && echo "	... found iconv library in $cf_cv_library_path_iconv" 1>&6
 
-echo "${as_me-configure}:7113: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:7113: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
 
                 cf_cv_find_linkage_iconv=yes
                 cf_cv_library_file_iconv="-liconv"
@@ -7290,7 +7290,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:7293: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:7293: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -7327,7 +7327,7 @@ if test -n "$cf_cv_library_path_iconv" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:7330: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:7330: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -7487,7 +7487,7 @@ else
 cf_cv_header_path_intl=
 cf_cv_library_path_intl=
 
-echo "${as_me-configure}:7490: testing Starting FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me:-configure}:7490: testing Starting FIND_LINKAGE(intl,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
@@ -7581,9 +7581,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for intl library" 1>&6
 
-echo "${as_me-configure}:7584: testing find linkage for intl library ..." 1>&5
+echo "${as_me:-configure}:7584: testing find linkage for intl library ..." 1>&5
 
-echo "${as_me-configure}:7586: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me:-configure}:7586: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -7696,7 +7696,7 @@ cf_search="$cf_search $cf_header_path_list"
       if test -d $cf_cv_header_path_intl ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_intl" 1>&6
 
-echo "${as_me-configure}:7699: testing ... testing $cf_cv_header_path_intl ..." 1>&5
+echo "${as_me:-configure}:7699: testing ... testing $cf_cv_header_path_intl ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_intl"
         cat >conftest.$ac_ext <<_ACEOF
@@ -7734,7 +7734,7 @@ if { (eval echo "$as_me:7723: \"$ac_compile\"") >&5
 
             test -n "$verbose" && echo "	... found intl headers in $cf_cv_header_path_intl" 1>&6
 
-echo "${as_me-configure}:7737: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5
+echo "${as_me:-configure}:7737: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5
 
             cf_cv_find_linkage_intl=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -7752,7 +7752,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_intl" = maybe ; then
 
-echo "${as_me-configure}:7755: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me:-configure}:7755: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -7849,7 +7849,7 @@ cf_search="$cf_library_path_list $cf_search"
           if test -d $cf_cv_library_path_intl ; then
             test -n "$verbose" && echo "	... testing $cf_cv_library_path_intl" 1>&6
 
-echo "${as_me-configure}:7852: testing ... testing $cf_cv_library_path_intl ..." 1>&5
+echo "${as_me:-configure}:7852: testing ... testing $cf_cv_library_path_intl ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-lintl  $cf_save_LIBS"
@@ -7889,7 +7889,7 @@ if { (eval echo "$as_me:7878: \"$ac_link\"") >&5
 
                 test -n "$verbose" && echo "	... found intl library in $cf_cv_library_path_intl" 1>&6
 
-echo "${as_me-configure}:7892: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5
+echo "${as_me:-configure}:7892: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5
 
                 cf_cv_find_linkage_intl=yes
                 cf_cv_library_file_intl="-lintl"
@@ -8006,7 +8006,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:8009: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:8009: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -8043,7 +8043,7 @@ if test -n "$cf_cv_library_path_intl" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:8046: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:8046: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         INTLLIBS="-L$cf_add_libdir $INTLLIBS"
       fi
@@ -8676,7 +8676,7 @@ if test "${with_nls_datadir+set}" = set; then
   withval="$with_nls_datadir"
 
 else
-  withval="${NLS_DATADIR-$prefix/$DATADIRNAME}"
+  withval="${NLS_DATADIR:-$prefix/$DATADIRNAME}"
 fi; if test -n "$prefix/$DATADIRNAME" ; then
 
 if test "x$prefix" != xNONE; then
@@ -9124,7 +9124,7 @@ if test "${cf_cv_posix_c_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-echo "${as_me-configure}:9127: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:9127: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >conftest.$ac_ext <<_ACEOF
 #line 9130 "configure"
@@ -9207,12 +9207,12 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 	 fi
 
-echo "${as_me-configure}:9210: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:9210: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
 
-echo "${as_me-configure}:9215: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:9215: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >conftest.$ac_ext <<_ACEOF
 #line 9218 "configure"
@@ -9578,7 +9578,7 @@ if test -n "$TRY_CFLAGS" ; then
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me-configure}:9581: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:9581: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -9649,7 +9649,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me-configure}:9652: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:9652: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	CFLAGS="$CFLAGS $cf_new_cflags"
 fi
@@ -9657,7 +9657,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me-configure}:9660: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:9660: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
 fi
@@ -9665,7 +9665,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me-configure}:9668: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:9668: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
 
 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
 fi
@@ -9701,12 +9701,12 @@ else
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me-configure}:9704: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:9704: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
 
 	 if test "$cf_check_cppflags" != "$CPPFLAGS" ; then
 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
 
-echo "${as_me-configure}:9709: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:9709: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_flags"
@@ -9901,7 +9901,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:9904: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9904: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -9980,7 +9980,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:9983: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9983: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -10021,7 +10021,7 @@ if test -n "$cf_searchpath/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:10024: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:10024: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -10050,7 +10050,7 @@ if test -n "$cf_searchpath" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:10053: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:10053: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -10073,7 +10073,7 @@ done
 cf_cv_header_path_socks=
 cf_cv_library_path_socks=
 
-echo "${as_me-configure}:10076: testing Starting FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me:-configure}:10076: testing Starting FIND_LINKAGE(socks,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
@@ -10159,9 +10159,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for socks library" 1>&6
 
-echo "${as_me-configure}:10162: testing find linkage for socks library ..." 1>&5
+echo "${as_me:-configure}:10162: testing find linkage for socks library ..." 1>&5
 
-echo "${as_me-configure}:10164: testing Searching for headers in FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me:-configure}:10164: testing Searching for headers in FIND_LINKAGE(socks,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -10274,7 +10274,7 @@ cf_search="$cf_search $cf_header_path_list"
       if test -d $cf_cv_header_path_socks ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_socks" 1>&6
 
-echo "${as_me-configure}:10277: testing ... testing $cf_cv_header_path_socks ..." 1>&5
+echo "${as_me:-configure}:10277: testing ... testing $cf_cv_header_path_socks ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_socks"
         cat >conftest.$ac_ext <<_ACEOF
@@ -10308,7 +10308,7 @@ if { (eval echo "$as_me:10297: \"$ac_compile\"") >&5
 
             test -n "$verbose" && echo "	... found socks headers in $cf_cv_header_path_socks" 1>&6
 
-echo "${as_me-configure}:10311: testing ... found socks headers in $cf_cv_header_path_socks ..." 1>&5
+echo "${as_me:-configure}:10311: testing ... found socks headers in $cf_cv_header_path_socks ..." 1>&5
 
             cf_cv_find_linkage_socks=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -10326,7 +10326,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_socks" = maybe ; then
 
-echo "${as_me-configure}:10329: testing Searching for socks library in FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me:-configure}:10329: testing Searching for socks library in FIND_LINKAGE(socks,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -10423,7 +10423,7 @@ cf_search="$cf_library_path_list $cf_search"
           if test -d $cf_cv_library_path_socks ; then
             test -n "$verbose" && echo "	... testing $cf_cv_library_path_socks" 1>&6
 
-echo "${as_me-configure}:10426: testing ... testing $cf_cv_library_path_socks ..." 1>&5
+echo "${as_me:-configure}:10426: testing ... testing $cf_cv_library_path_socks ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-lsocks  $cf_save_LIBS"
@@ -10459,7 +10459,7 @@ if { (eval echo "$as_me:10448: \"$ac_link\"") >&5
 
                 test -n "$verbose" && echo "	... found socks library in $cf_cv_library_path_socks" 1>&6
 
-echo "${as_me-configure}:10462: testing ... found socks library in $cf_cv_library_path_socks ..." 1>&5
+echo "${as_me:-configure}:10462: testing ... found socks library in $cf_cv_library_path_socks ..." 1>&5
 
                 cf_cv_find_linkage_socks=yes
                 cf_cv_library_file_socks="-lsocks"
@@ -10556,7 +10556,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:10559: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:10559: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -10590,7 +10590,7 @@ if test -n "$cf_cv_library_path_socks" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:10593: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:10593: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -10722,7 +10722,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:10725: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:10725: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -10801,7 +10801,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:10804: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:10804: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -10842,7 +10842,7 @@ if test -n "$cf_searchpath/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:10845: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:10845: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -10871,7 +10871,7 @@ if test -n "$cf_searchpath" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:10874: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:10874: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -12418,7 +12418,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:12421: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:12421: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -12497,7 +12497,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:12500: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:12500: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -12538,7 +12538,7 @@ if test -n "$cf_searchpath/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:12541: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:12541: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -12567,7 +12567,7 @@ if test -n "$cf_searchpath" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:12570: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:12570: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -12707,7 +12707,7 @@ fi
 					esac
 					test -n "$verbose" && echo "	adding $cf_libs_ssl to LIBS" 1>&6
 
-echo "${as_me-configure}:12710: testing adding $cf_libs_ssl to LIBS ..." 1>&5
+echo "${as_me:-configure}:12710: testing adding $cf_libs_ssl to LIBS ..." 1>&5
 
 					LIBS="$cf_libs_ssl $LIBS"
 				fi
@@ -12791,7 +12791,7 @@ fi
 cf_cv_header_path_ssl=
 cf_cv_library_path_ssl=
 
-echo "${as_me-configure}:12794: testing Starting FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me:-configure}:12794: testing Starting FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
@@ -12903,9 +12903,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for ssl library" 1>&6
 
-echo "${as_me-configure}:12906: testing find linkage for ssl library ..." 1>&5
+echo "${as_me:-configure}:12906: testing find linkage for ssl library ..." 1>&5
 
-echo "${as_me-configure}:12908: testing Searching for headers in FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me:-configure}:12908: testing Searching for headers in FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -13018,7 +13018,7 @@ cf_search="$cf_search $cf_header_path_list"
       if test -d $cf_cv_header_path_ssl ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_ssl" 1>&6
 
-echo "${as_me-configure}:13021: testing ... testing $cf_cv_header_path_ssl ..." 1>&5
+echo "${as_me:-configure}:13021: testing ... testing $cf_cv_header_path_ssl ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_ssl"
         cat >conftest.$ac_ext <<_ACEOF
@@ -13065,7 +13065,7 @@ if { (eval echo "$as_me:13054: \"$ac_compile\"") >&5
 
             test -n "$verbose" && echo "	... found ssl headers in $cf_cv_header_path_ssl" 1>&6
 
-echo "${as_me-configure}:13068: testing ... found ssl headers in $cf_cv_header_path_ssl ..." 1>&5
+echo "${as_me:-configure}:13068: testing ... found ssl headers in $cf_cv_header_path_ssl ..." 1>&5
 
             cf_cv_find_linkage_ssl=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -13083,7 +13083,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_ssl" = maybe ; then
 
-echo "${as_me-configure}:13086: testing Searching for ssl library in FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me:-configure}:13086: testing Searching for ssl library in FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -13134,7 +13134,7 @@ if { (eval echo "$as_me:13123: \"$ac_link\"") >&5
 
             test -n "$verbose" && echo "	... found ssl library in system" 1>&6
 
-echo "${as_me-configure}:13137: testing ... found ssl library in system ..." 1>&5
+echo "${as_me:-configure}:13137: testing ... found ssl library in system ..." 1>&5
 
             cf_cv_find_linkage_ssl=yes
 else
@@ -13237,7 +13237,7 @@ cf_search="$cf_library_path_list $cf_search"
           if test -d $cf_cv_library_path_ssl ; then
             test -n "$verbose" && echo "	... testing $cf_cv_library_path_ssl" 1>&6
 
-echo "${as_me-configure}:13240: testing ... testing $cf_cv_library_path_ssl ..." 1>&5
+echo "${as_me:-configure}:13240: testing ... testing $cf_cv_library_path_ssl ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-lssl $cf_extra_ssl_libs $cf_save_LIBS"
@@ -13286,7 +13286,7 @@ if { (eval echo "$as_me:13275: \"$ac_link\"") >&5
 
                 test -n "$verbose" && echo "	... found ssl library in $cf_cv_library_path_ssl" 1>&6
 
-echo "${as_me-configure}:13289: testing ... found ssl library in $cf_cv_library_path_ssl ..." 1>&5
+echo "${as_me:-configure}:13289: testing ... found ssl library in $cf_cv_library_path_ssl ..." 1>&5
 
                 cf_cv_find_linkage_ssl=yes
                 cf_cv_library_file_ssl="-lssl"
@@ -13348,7 +13348,7 @@ if test -n "$cf_cv_library_path_ssl" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:13351: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:13351: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -13426,7 +13426,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:13429: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:13429: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -13599,7 +13599,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:13602: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:13602: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -13678,7 +13678,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:13681: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:13681: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -13719,7 +13719,7 @@ if test -n "$cf_searchpath/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:13722: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:13722: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -13748,7 +13748,7 @@ if test -n "$cf_searchpath" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:13751: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:13751: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -13775,12 +13775,12 @@ done
 		yes) # if no explicit directory given, try pkg-config
 			test -n "$verbose" && echo "	checking pkg-config for $cf_pkg_gnutls" 1>&6
 
-echo "${as_me-configure}:13778: testing checking pkg-config for $cf_pkg_gnutls ..." 1>&5
+echo "${as_me:-configure}:13778: testing checking pkg-config for $cf_pkg_gnutls ..." 1>&5
 
 			if "$PKG_CONFIG" --exists $cf_pkg_gnutls ; then
 				test -n "$verbose" && echo "	... found $cf_pkg_gnutls in pkg-config" 1>&6
 
-echo "${as_me-configure}:13783: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:13783: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_cv_have_gnutls=yes
 				cf_cv_pkg_config_ssl=yes
@@ -13892,14 +13892,14 @@ fi
 					esac
 					test -n "$verbose" && echo "	adding $cf_libs_ssl to LIBS" 1>&6
 
-echo "${as_me-configure}:13895: testing adding $cf_libs_ssl to LIBS ..." 1>&5
+echo "${as_me:-configure}:13895: testing adding $cf_libs_ssl to LIBS ..." 1>&5
 
 					LIBS="$cf_libs_ssl $LIBS"
 				fi
 			else
 				test -n "$verbose" && echo "	... did not find $cf_pkg_gnutls in pkg-config" 1>&6
 
-echo "${as_me-configure}:13902: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:13902: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_pkg_gnutls=none
 			fi
@@ -13919,7 +13919,7 @@ EOF
 cf_cv_header_path_gnutls=
 cf_cv_library_path_gnutls=
 
-echo "${as_me-configure}:13922: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:13922: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
@@ -14031,9 +14031,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for gnutls library" 1>&6
 
-echo "${as_me-configure}:14034: testing find linkage for gnutls library ..." 1>&5
+echo "${as_me:-configure}:14034: testing find linkage for gnutls library ..." 1>&5
 
-echo "${as_me-configure}:14036: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:14036: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -14146,7 +14146,7 @@ cf_search="$cf_search $cf_header_path_list"
       if test -d $cf_cv_header_path_gnutls ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_gnutls" 1>&6
 
-echo "${as_me-configure}:14149: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:14149: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_gnutls"
         cat >conftest.$ac_ext <<_ACEOF
@@ -14193,7 +14193,7 @@ if { (eval echo "$as_me:14182: \"$ac_compile\"") >&5
 
             test -n "$verbose" && echo "	... found gnutls headers in $cf_cv_header_path_gnutls" 1>&6
 
-echo "${as_me-configure}:14196: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:14196: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
 
             cf_cv_find_linkage_gnutls=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -14211,7 +14211,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_gnutls" = maybe ; then
 
-echo "${as_me-configure}:14214: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:14214: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -14308,7 +14308,7 @@ cf_search="$cf_library_path_list $cf_search"
           if test -d $cf_cv_library_path_gnutls ; then
             test -n "$verbose" && echo "	... testing $cf_cv_library_path_gnutls" 1>&6
 
-echo "${as_me-configure}:14311: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:14311: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-lgnutls -lgnutls -lgcrypt $cf_save_LIBS"
@@ -14357,7 +14357,7 @@ if { (eval echo "$as_me:14346: \"$ac_link\"") >&5
 
                 test -n "$verbose" && echo "	... found gnutls library in $cf_cv_library_path_gnutls" 1>&6
 
-echo "${as_me-configure}:14360: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:14360: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
 
                 cf_cv_find_linkage_gnutls=yes
                 cf_cv_library_file_gnutls="-lgnutls"
@@ -14472,7 +14472,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:14475: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:14475: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -14511,7 +14511,7 @@ if test -n "$cf_cv_library_path_gnutls" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:14514: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:14514: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -14658,7 +14658,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:14661: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:14661: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -14737,7 +14737,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:14740: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:14740: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -14778,7 +14778,7 @@ if test -n "$cf_searchpath/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:14781: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:14781: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -14807,7 +14807,7 @@ if test -n "$cf_searchpath" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:14810: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:14810: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -14834,12 +14834,12 @@ done
 		yes) # if no explicit directory given, try pkg-config
 			test -n "$verbose" && echo "	checking pkg-config for $cf_pkg_gnutls" 1>&6
 
-echo "${as_me-configure}:14837: testing checking pkg-config for $cf_pkg_gnutls ..." 1>&5
+echo "${as_me:-configure}:14837: testing checking pkg-config for $cf_pkg_gnutls ..." 1>&5
 
 			if "$PKG_CONFIG" --exists $cf_pkg_gnutls ; then
 				test -n "$verbose" && echo "	... found $cf_pkg_gnutls in pkg-config" 1>&6
 
-echo "${as_me-configure}:14842: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:14842: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_cv_have_gnutls=yes
 				cf_cv_pkg_config_ssl=yes
@@ -14951,14 +14951,14 @@ fi
 					esac
 					test -n "$verbose" && echo "	adding $cf_libs_ssl to LIBS" 1>&6
 
-echo "${as_me-configure}:14954: testing adding $cf_libs_ssl to LIBS ..." 1>&5
+echo "${as_me:-configure}:14954: testing adding $cf_libs_ssl to LIBS ..." 1>&5
 
 					LIBS="$cf_libs_ssl $LIBS"
 				fi
 			else
 				test -n "$verbose" && echo "	... did not find $cf_pkg_gnutls in pkg-config" 1>&6
 
-echo "${as_me-configure}:14961: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:14961: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_pkg_gnutls=none
 			fi
@@ -14978,7 +14978,7 @@ EOF
 cf_cv_header_path_gnutls=
 cf_cv_library_path_gnutls=
 
-echo "${as_me-configure}:14981: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:14981: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
@@ -15090,9 +15090,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for gnutls library" 1>&6
 
-echo "${as_me-configure}:15093: testing find linkage for gnutls library ..." 1>&5
+echo "${as_me:-configure}:15093: testing find linkage for gnutls library ..." 1>&5
 
-echo "${as_me-configure}:15095: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:15095: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -15205,7 +15205,7 @@ cf_search="$cf_search $cf_header_path_list"
       if test -d $cf_cv_header_path_gnutls ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_gnutls" 1>&6
 
-echo "${as_me-configure}:15208: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:15208: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_gnutls"
         cat >conftest.$ac_ext <<_ACEOF
@@ -15252,7 +15252,7 @@ if { (eval echo "$as_me:15241: \"$ac_compile\"") >&5
 
             test -n "$verbose" && echo "	... found gnutls headers in $cf_cv_header_path_gnutls" 1>&6
 
-echo "${as_me-configure}:15255: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:15255: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
 
             cf_cv_find_linkage_gnutls=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -15270,7 +15270,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_gnutls" = maybe ; then
 
-echo "${as_me-configure}:15273: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:15273: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -15367,7 +15367,7 @@ cf_search="$cf_library_path_list $cf_search"
           if test -d $cf_cv_library_path_gnutls ; then
             test -n "$verbose" && echo "	... testing $cf_cv_library_path_gnutls" 1>&6
 
-echo "${as_me-configure}:15370: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:15370: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-lgnutls -lgnutls-openssl -lgnutls-extra -lgnutls -lgcrypt $cf_save_LIBS"
@@ -15416,7 +15416,7 @@ if { (eval echo "$as_me:15405: \"$ac_link\"") >&5
 
                 test -n "$verbose" && echo "	... found gnutls library in $cf_cv_library_path_gnutls" 1>&6
 
-echo "${as_me-configure}:15419: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:15419: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
 
                 cf_cv_find_linkage_gnutls=yes
                 cf_cv_library_file_gnutls="-lgnutls"
@@ -15531,7 +15531,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:15534: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:15534: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -15570,7 +15570,7 @@ if test -n "$cf_cv_library_path_gnutls" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:15573: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:15573: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -15834,7 +15834,7 @@ else
 		if test -d $cf_ssl_root ; then
 			test -n "$verbose" && echo "	assume it is in $cf_ssl_root" 1>&6
 
-echo "${as_me-configure}:15837: testing assume it is in $cf_ssl_root ..." 1>&5
+echo "${as_me:-configure}:15837: testing assume it is in $cf_ssl_root ..." 1>&5
 
 			cf_ssl_library="-L$cf_ssl_root/lib $cf_ssl_library"
 		else
@@ -16458,7 +16458,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:16461: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:16461: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -16816,12 +16816,12 @@ int main()
 
    if (aitop)
      freeaddrinfo(aitop);
-   ${cf_cv_main_return-return}(0);
+   ${cf_cv_main_return:-return}(0);
 
   bad:
    if (aitop)
      freeaddrinfo(aitop);
-   ${cf_cv_main_return-return}(1);
+   ${cf_cv_main_return:-return}(1);
 }
 
 _ACEOF
@@ -16907,9 +16907,21 @@ echo "${ECHO_T}$cf_cv_screen" >&6
 case $cf_cv_screen in
 curses|ncurses*)
 
+echo "$as_me:16910: checking for specific curses-directory" >&5
+echo $ECHO_N "checking for specific curses-directory... $ECHO_C" >&6
+
 # Check whether --with-curses-dir or --without-curses-dir was given.
 if test "${with_curses_dir+set}" = set; then
   withval="$with_curses_dir"
+  cf_cv_curses_dir=$withval
+else
+  cf_cv_curses_dir=no
+fi;
+echo "$as_me:16920: result: $cf_cv_curses_dir" >&5
+echo "${ECHO_T}$cf_cv_curses_dir" >&6
+
+if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
+then
 
 if test "x$prefix" != xNONE; then
   cf_path_syntax="$prefix"
@@ -16936,16 +16948,121 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:16939: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:16951: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
 esac
 
-	 cf_cv_curses_dir=$withval
+	if test -d "$cf_cv_curses_dir"
+	then
+
+if test -n "$cf_cv_curses_dir/include" ; then
+  for cf_add_incdir in $cf_cv_curses_dir/include
+  do
+	while test $cf_add_incdir != /usr/include
+	do
+	  if test -d $cf_add_incdir
+	  then
+		cf_have_incdir=no
+		if test -n "$CFLAGS$CPPFLAGS" ; then
+		  # a loop is needed to ensure we can add subdirs of existing dirs
+		  for cf_test_incdir in $CFLAGS $CPPFLAGS ; do
+			if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then
+			  cf_have_incdir=yes; break
+			fi
+		  done
+		fi
+
+		if test "$cf_have_incdir" = no ; then
+		  if test "$cf_add_incdir" = /usr/local/include ; then
+			if test "$GCC" = yes
+			then
+			  cf_save_CPPFLAGS=$CPPFLAGS
+			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+			  cat >conftest.$ac_ext <<_ACEOF
+#line 16984 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+int
+main ()
+{
+printf("Hello")
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:16996: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:16999: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:17002: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:17005: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
 else
-  cf_cv_curses_dir=no
-fi;
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+cf_have_incdir=yes
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+			  CPPFLAGS=$cf_save_CPPFLAGS
+			fi
+		  fi
+		fi
+
+		if test "$cf_have_incdir" = no ; then
+		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+
+echo "${as_me:-configure}:17022: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+		  cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
+		  test "$cf_top_incdir" = "$cf_add_incdir" && break
+		  cf_add_incdir="$cf_top_incdir"
+		else
+		  break
+		fi
+	  fi
+	done
+  done
+fi
+
+if test -n "$cf_cv_curses_dir/lib" ; then
+  for cf_add_libdir in $cf_cv_curses_dir/lib
+  do
+    if test $cf_add_libdir = /usr/lib ; then
+      :
+    elif test -d $cf_add_libdir
+    then
+      cf_have_libdir=no
+      if test -n "$LDFLAGS$LIBS" ; then
+        # a loop is needed to ensure we can add subdirs of existing dirs
+        for cf_test_libdir in $LDFLAGS $LIBS ; do
+          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+            cf_have_libdir=yes; break
+          fi
+        done
+      fi
+      if test "$cf_have_libdir" = no ; then
+        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+
+echo "${as_me:-configure}:17056: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+      fi
+    fi
+  done
+fi
+
+	fi
+fi
 
 	;;
 esac
@@ -16955,7 +17072,7 @@ dft_color_style=yes
 case $cf_cv_screen in
 curses)
 
-echo "$as_me:16958: checking for extra include directories" >&5
+echo "$as_me:17075: 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
@@ -16975,11 +17092,11 @@ sunos3*|sunos4*)
 esac
 
 fi
-echo "$as_me:16978: result: $cf_cv_curses_incdir" >&5
+echo "$as_me:17095: result: $cf_cv_curses_incdir" >&5
 echo "${ECHO_T}$cf_cv_curses_incdir" >&6
 test "$cf_cv_curses_incdir" != no && CPPFLAGS="$CPPFLAGS $cf_cv_curses_incdir"
 
-echo "$as_me:16982: checking if we have identified curses headers" >&5
+echo "$as_me:17099: 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
@@ -16991,7 +17108,7 @@ for cf_header in  \
 	ncurses.h ncurses/curses.h ncurses/ncurses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 16994 "configure"
+#line 17111 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -17003,16 +17120,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17006: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17123: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17009: \$? = $ac_status" >&5
+  echo "$as_me:17126: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17012: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17129: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17015: \$? = $ac_status" >&5
+  echo "$as_me:17132: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -17023,11 +17140,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:17026: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:17143: 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:17030: error: No curses header-files found" >&5
+	{ { echo "$as_me:17147: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -17037,23 +17154,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:17040: checking for $ac_header" >&5
+echo "$as_me:17157: 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 17046 "configure"
+#line 17163 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:17050: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:17167: \"$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:17056: \$? = $ac_status" >&5
+  echo "$as_me:17173: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -17072,7 +17189,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:17075: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:17192: 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
@@ -17082,7 +17199,7 @@ EOF
 fi
 done
 
-echo "$as_me:17085: checking for terminfo header" >&5
+echo "$as_me:17202: 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
@@ -17100,10 +17217,10 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 17103 "configure"
+#line 17220 "configure"
 #include "confdefs.h"
 #include <stdio.h>
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 #include <$cf_test>
 
 int
@@ -17115,16 +17232,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17118: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17235: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17121: \$? = $ac_status" >&5
+  echo "$as_me:17238: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17124: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17241: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17127: \$? = $ac_status" >&5
+  echo "$as_me:17244: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -17140,7 +17257,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:17143: result: $cf_cv_term_header" >&5
+echo "$as_me:17260: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -17169,7 +17286,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:17172: checking for ncurses version" >&5
+echo "$as_me:17289: 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
@@ -17183,7 +17300,7 @@ else
 	# This will not work if the preprocessor splits the line after the
 	# Autoconf token.  The 'unproto' program does that.
 	cat > conftest.$ac_ext <<EOF
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 #undef Autoconf
 #ifdef NCURSES_VERSION
 Autoconf NCURSES_VERSION
@@ -17195,10 +17312,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:17198: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:17315: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:17201: \$? = $ac_status" >&5
+  echo "$as_me:17318: \$? = $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%".*%%'`
@@ -17208,10 +17325,10 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 17211 "configure"
+#line 17328 "configure"
 #include "confdefs.h"
 
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 #include <stdio.h>
 int main()
 {
@@ -17229,19 +17346,19 @@ int main()
 	make an error
 # endif
 #endif
-	${cf_cv_main_return-return}(0);
+	${cf_cv_main_return:-return}(0);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:17236: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17353: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17239: \$? = $ac_status" >&5
+  echo "$as_me:17356: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:17241: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17358: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17244: \$? = $ac_status" >&5
+  echo "$as_me:17361: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -17255,18 +17372,18 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:17258: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:17375: 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:17264: checking if we have identified curses libraries" >&5
+echo "$as_me:17381: 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 17267 "configure"
+#line 17384 "configure"
 #include "confdefs.h"
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 int
 main ()
 {
@@ -17276,16 +17393,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17279: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17396: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17282: \$? = $ac_status" >&5
+  echo "$as_me:17399: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17285: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17402: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17288: \$? = $ac_status" >&5
+  echo "$as_me:17405: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -17294,13 +17411,13 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:17297: result: $cf_result" >&5
+echo "$as_me:17414: 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:17303: checking for tgoto in -lmytinfo" >&5
+    echo "$as_me:17420: 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
@@ -17308,7 +17425,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 17311 "configure"
+#line 17428 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17327,16 +17444,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17330: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17447: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17333: \$? = $ac_status" >&5
+  echo "$as_me:17450: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17336: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17453: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17339: \$? = $ac_status" >&5
+  echo "$as_me:17456: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -17347,7 +17464,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17350: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:17467: 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"
@@ -17355,7 +17472,7 @@ fi
 
     ;;
 hpux10.*) #(vi
-    echo "$as_me:17358: checking for initscr in -lcur_colr" >&5
+    echo "$as_me:17475: 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
@@ -17363,7 +17480,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcur_colr  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 17366 "configure"
+#line 17483 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17382,16 +17499,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17385: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17502: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17388: \$? = $ac_status" >&5
+  echo "$as_me:17505: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17391: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17508: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17394: \$? = $ac_status" >&5
+  echo "$as_me:17511: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_cur_colr_initscr=yes
 else
@@ -17402,7 +17519,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17405: result: $ac_cv_lib_cur_colr_initscr" >&5
+echo "$as_me:17522: 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
 
@@ -17411,7 +17528,7 @@ if test $ac_cv_lib_cur_colr_initscr = yes; then
 
 else
 
-    echo "$as_me:17414: checking for initscr in -lHcurses" >&5
+    echo "$as_me:17531: 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
@@ -17419,7 +17536,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lHcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 17422 "configure"
+#line 17539 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17438,16 +17555,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17441: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17558: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17444: \$? = $ac_status" >&5
+  echo "$as_me:17561: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17447: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17564: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17450: \$? = $ac_status" >&5
+  echo "$as_me:17567: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Hcurses_initscr=yes
 else
@@ -17458,7 +17575,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17461: result: $ac_cv_lib_Hcurses_initscr" >&5
+echo "$as_me:17578: 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
 
@@ -17493,7 +17610,7 @@ if test -n "/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:17496: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:17613: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -17524,7 +17641,7 @@ if test -n "/usr/5lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:17527: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:17644: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -17543,7 +17660,7 @@ if test ".$ac_cv_func_initscr" != .yes ; then
     cf_term_lib=""
     cf_curs_lib=""
 
-    if test ".${cf_cv_ncurses_version-no}" != .no
+    if test ".${cf_cv_ncurses_version:-no}" != .no
     then
         cf_check_list="ncurses curses cursesX"
     else
@@ -17552,13 +17669,13 @@ if test ".$ac_cv_func_initscr" != .yes ; then
 
     # 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:17555: checking for tgoto" >&5
+    echo "$as_me:17672: 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 17561 "configure"
+#line 17678 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char tgoto (); below.  */
@@ -17589,16 +17706,16 @@ f = tgoto;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17592: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17709: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17595: \$? = $ac_status" >&5
+  echo "$as_me:17712: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17598: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17715: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17601: \$? = $ac_status" >&5
+  echo "$as_me:17718: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_tgoto=yes
 else
@@ -17608,7 +17725,7 @@ ac_cv_func_tgoto=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:17611: result: $ac_cv_func_tgoto" >&5
+echo "$as_me:17728: 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
@@ -17617,7 +17734,7 @@ else
         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:17620: checking for tgoto in -l$cf_term_lib" >&5
+echo "$as_me:17737: 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
@@ -17625,7 +17742,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_term_lib  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 17628 "configure"
+#line 17745 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17644,16 +17761,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17647: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17764: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17650: \$? = $ac_status" >&5
+  echo "$as_me:17767: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17653: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17770: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17656: \$? = $ac_status" >&5
+  echo "$as_me:17773: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -17664,7 +17781,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17667: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:17784: 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
@@ -17679,7 +17796,7 @@ fi
  	for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown
     do
         as_ac_Lib=`echo "ac_cv_lib_$cf_curs_lib''_initscr" | $as_tr_sh`
-echo "$as_me:17682: checking for initscr in -l$cf_curs_lib" >&5
+echo "$as_me:17799: 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
@@ -17687,7 +17804,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_curs_lib  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 17690 "configure"
+#line 17807 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17706,16 +17823,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17709: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17826: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17712: \$? = $ac_status" >&5
+  echo "$as_me:17829: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17715: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17832: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17718: \$? = $ac_status" >&5
+  echo "$as_me:17835: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -17726,25 +17843,25 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17729: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:17846: 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:17736: error: no curses library found" >&5
+    test $cf_curs_lib = unknown && { { echo "$as_me:17853: 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:17742: checking if we can link with $cf_curs_lib library" >&5
+        echo "$as_me:17859: 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 17745 "configure"
+#line 17862 "configure"
 #include "confdefs.h"
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 int
 main ()
 {
@@ -17754,16 +17871,16 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17757: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17874: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17760: \$? = $ac_status" >&5
+  echo "$as_me:17877: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17763: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17880: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17766: \$? = $ac_status" >&5
+  echo "$as_me:17883: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -17772,20 +17889,20 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-        echo "$as_me:17775: result: $cf_result" >&5
+        echo "$as_me:17892: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
-        test $cf_result = no && { { echo "$as_me:17777: error: Cannot link curses library" >&5
+        test $cf_result = no && { { echo "$as_me:17894: 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:17783: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+        echo "$as_me:17900: 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 17786 "configure"
+#line 17903 "configure"
 #include "confdefs.h"
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 int
 main ()
 {
@@ -17795,16 +17912,16 @@ initscr(); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17798: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17915: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17801: \$? = $ac_status" >&5
+  echo "$as_me:17918: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17804: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17921: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17807: \$? = $ac_status" >&5
+  echo "$as_me:17924: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=no
 else
@@ -17813,9 +17930,9 @@ cat conftest.$ac_ext >&5
 
             LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
             cat >conftest.$ac_ext <<_ACEOF
-#line 17816 "configure"
+#line 17933 "configure"
 #include "confdefs.h"
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 int
 main ()
 {
@@ -17825,16 +17942,16 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17828: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17945: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17831: \$? = $ac_status" >&5
+  echo "$as_me:17948: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17834: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17951: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17837: \$? = $ac_status" >&5
+  echo "$as_me:17954: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -17846,13 +17963,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-        echo "$as_me:17849: result: $cf_result" >&5
+        echo "$as_me:17966: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
     fi
 fi
 fi
 
-echo "$as_me:17855: checking for curses performance tradeoff" >&5
+echo "$as_me:17972: checking for curses performance tradeoff" >&5
 echo $ECHO_N "checking for curses performance tradeoff... $ECHO_C" >&6
 if test "${cf_cv_curs_performance+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17860,10 +17977,10 @@ else
 
     cf_cv_curs_performance=no
     cat >conftest.$ac_ext <<_ACEOF
-#line 17863 "configure"
+#line 17980 "configure"
 #include "confdefs.h"
 
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 int
 main ()
 {
@@ -17879,24 +17996,24 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17882: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17999: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17885: \$? = $ac_status" >&5
+  echo "$as_me:18002: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17888: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18005: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17891: \$? = $ac_status" >&5
+  echo "$as_me:18008: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 17895 "configure"
+#line 18012 "configure"
 #include "confdefs.h"
 
 #define CURS_PERFORMANCE
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 int
 main ()
 {
@@ -17912,16 +18029,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17915: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18032: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17918: \$? = $ac_status" >&5
+  echo "$as_me:18035: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17921: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18038: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17924: \$? = $ac_status" >&5
+  echo "$as_me:18041: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_curs_performance=yes
 else
@@ -17936,23 +18053,23 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:17939: result: $cf_cv_curs_performance" >&5
+echo "$as_me:18056: result: $cf_cv_curs_performance" >&5
 echo "${ECHO_T}$cf_cv_curs_performance" >&6
 test $cf_cv_curs_performance = yes && cat >>confdefs.h <<\EOF
 #define CURS_PERFORMANCE 1
 EOF
 
-echo "$as_me:17945: checking for curses touchline function" >&5
+echo "$as_me:18062: checking for curses touchline function" >&5
 echo $ECHO_N "checking for curses touchline function... $ECHO_C" >&6
 if test "${cf_cv_curs_touchline+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 17952 "configure"
+#line 18069 "configure"
 #include "confdefs.h"
 
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 int
 main ()
 {
@@ -17962,26 +18079,26 @@ touchline(stdscr, 1,2,3);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17965: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18082: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17968: \$? = $ac_status" >&5
+  echo "$as_me:18085: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17971: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18088: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17974: \$? = $ac_status" >&5
+  echo "$as_me:18091: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_curs_touchline=bsd
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 17981 "configure"
+#line 18098 "configure"
 #include "confdefs.h"
 
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 int
 main ()
 {
@@ -17991,16 +18108,16 @@ touchline(stdscr, 1,2);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17994: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18111: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17997: \$? = $ac_status" >&5
+  echo "$as_me:18114: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18000: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18117: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18003: \$? = $ac_status" >&5
+  echo "$as_me:18120: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_curs_touchline=sysv
 else
@@ -18012,7 +18129,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:18015: result: $cf_cv_curs_touchline" >&5
+echo "$as_me:18132: result: $cf_cv_curs_touchline" >&5
 echo "${ECHO_T}$cf_cv_curs_touchline" >&6
 case "$cf_cv_curs_touchline" in #(vi
 bsd) #(vi
@@ -18039,7 +18156,7 @@ for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config
 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:18042: checking for $ac_word" >&5
+echo "$as_me:18159: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_NCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18056,7 +18173,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_NCURSES_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:18059: found $ac_dir/$ac_word" >&5
+   echo "$as_me:18176: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -18067,10 +18184,10 @@ fi
 NCURSES_CONFIG=$ac_cv_path_NCURSES_CONFIG
 
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:18070: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:18187: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:18073: result: no" >&5
+  echo "$as_me:18190: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -18085,7 +18202,7 @@ LIBS="`$NCURSES_CONFIG --libs` $LIBS"
 
 # even with config script, some packages use no-override for curses.h
 
-echo "$as_me:18088: checking if we have identified curses headers" >&5
+echo "$as_me:18205: 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
@@ -18099,7 +18216,7 @@ for cf_header in  \
 	ncurses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 18102 "configure"
+#line 18219 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -18111,16 +18228,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18114: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18231: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18117: \$? = $ac_status" >&5
+  echo "$as_me:18234: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18120: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18237: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18123: \$? = $ac_status" >&5
+  echo "$as_me:18240: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -18131,11 +18248,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:18134: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:18251: 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:18138: error: No curses header-files found" >&5
+	{ { echo "$as_me:18255: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -18145,23 +18262,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:18148: checking for $ac_header" >&5
+echo "$as_me:18265: 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 18154 "configure"
+#line 18271 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18158: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:18275: \"$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:18164: \$? = $ac_status" >&5
+  echo "$as_me:18281: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18180,7 +18297,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:18183: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:18300: 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
@@ -18209,8 +18326,8 @@ cf_ncuhdr_root=ncurses
 test -n "$cf_cv_curses_dir" && \
 test "$cf_cv_curses_dir" != "no" && { \
 
-if test -n "$cf_cv_curses_dir/include $cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
-  for cf_add_incdir in $cf_cv_curses_dir/include $cf_cv_curses_dir/include/$cf_ncuhdr_root
+if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
+  for cf_add_incdir in $cf_cv_curses_dir/include/$cf_ncuhdr_root
   do
 	while test $cf_add_incdir != /usr/include
 	do
@@ -18233,7 +18350,7 @@ if test -n "$cf_cv_curses_dir/include $cf_cv_curses_dir/include/$cf_ncuhdr_root"
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 18236 "configure"
+#line 18353 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -18245,16 +18362,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18248: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18365: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18251: \$? = $ac_status" >&5
+  echo "$as_me:18368: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18254: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18371: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18257: \$? = $ac_status" >&5
+  echo "$as_me:18374: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -18271,7 +18388,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:18274: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:18391: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -18288,7 +18405,7 @@ fi
 
 }
 
-echo "$as_me:18291: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:18408: 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
@@ -18300,7 +18417,7 @@ else
 	do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 18303 "configure"
+#line 18420 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -18324,16 +18441,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18327: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18444: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18330: \$? = $ac_status" >&5
+  echo "$as_me:18447: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18333: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18450: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18336: \$? = $ac_status" >&5
+  echo "$as_me:18453: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -18348,14 +18465,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 	done
 
 fi
-echo "$as_me:18351: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:18468: 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:18358: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:18475: 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
@@ -18495,7 +18612,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 18498 "configure"
+#line 18615 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -18507,16 +18624,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18510: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18627: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18513: \$? = $ac_status" >&5
+  echo "$as_me:18630: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18516: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18633: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18519: \$? = $ac_status" >&5
+  echo "$as_me:18636: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -18533,7 +18650,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:18536: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:18653: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -18554,7 +18671,7 @@ fi
 		do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 18557 "configure"
+#line 18674 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -18578,16 +18695,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18581: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18698: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18584: \$? = $ac_status" >&5
+  echo "$as_me:18701: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18587: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18704: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18590: \$? = $ac_status" >&5
+  echo "$as_me:18707: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -18608,12 +18725,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:18611: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:18728: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:18616: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:18733: 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%/[^/]*$%%'`
@@ -18646,7 +18763,7 @@ if test -n "$cf_1st_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 18649 "configure"
+#line 18766 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -18658,16 +18775,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18661: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18778: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18664: \$? = $ac_status" >&5
+  echo "$as_me:18781: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18667: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18784: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18670: \$? = $ac_status" >&5
+  echo "$as_me:18787: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -18684,7 +18801,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:18687: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:18804: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -18727,7 +18844,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:18730: checking for terminfo header" >&5
+echo "$as_me:18847: 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
@@ -18745,10 +18862,10 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 18748 "configure"
+#line 18865 "configure"
 #include "confdefs.h"
 #include <stdio.h>
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 #include <$cf_test>
 
 int
@@ -18760,16 +18877,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18763: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18880: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18766: \$? = $ac_status" >&5
+  echo "$as_me:18883: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18769: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18886: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18772: \$? = $ac_status" >&5
+  echo "$as_me:18889: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -18785,7 +18902,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:18788: result: $cf_cv_term_header" >&5
+echo "$as_me:18905: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -18819,7 +18936,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:18822: checking for ncurses version" >&5
+echo "$as_me:18939: 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
@@ -18833,7 +18950,7 @@ else
 	# This will not work if the preprocessor splits the line after the
 	# Autoconf token.  The 'unproto' program does that.
 	cat > conftest.$ac_ext <<EOF
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 #undef Autoconf
 #ifdef NCURSES_VERSION
 Autoconf NCURSES_VERSION
@@ -18845,10 +18962,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:18848: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:18965: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:18851: \$? = $ac_status" >&5
+  echo "$as_me:18968: \$? = $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%".*%%'`
@@ -18858,10 +18975,10 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 18861 "configure"
+#line 18978 "configure"
 #include "confdefs.h"
 
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 #include <stdio.h>
 int main()
 {
@@ -18879,19 +18996,19 @@ int main()
 	make an error
 # endif
 #endif
-	${cf_cv_main_return-return}(0);
+	${cf_cv_main_return:-return}(0);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:18886: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19003: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18889: \$? = $ac_status" >&5
+  echo "$as_me:19006: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:18891: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19008: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18894: \$? = $ac_status" >&5
+  echo "$as_me:19011: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -18905,7 +19022,7 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:18908: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:19025: 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
@@ -18917,7 +19034,7 @@ cf_nculib_root=ncurses
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:18920: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:19037: 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
@@ -18925,7 +19042,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 18928 "configure"
+#line 19045 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18944,16 +19061,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18947: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19064: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18950: \$? = $ac_status" >&5
+  echo "$as_me:19067: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18953: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19070: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18956: \$? = $ac_status" >&5
+  echo "$as_me:19073: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -18964,10 +19081,10 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18967: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:19084: 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:18970: checking for initscr in -lgpm" >&5
+  echo "$as_me:19087: 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
@@ -18975,7 +19092,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 18978 "configure"
+#line 19095 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18994,16 +19111,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18997: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19114: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19000: \$? = $ac_status" >&5
+  echo "$as_me:19117: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19003: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19120: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19006: \$? = $ac_status" >&5
+  echo "$as_me:19123: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -19014,7 +19131,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19017: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:19134: 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"
@@ -19029,7 +19146,7 @@ freebsd*)
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it's static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:19032: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:19149: 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
@@ -19037,7 +19154,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 19040 "configure"
+#line 19157 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19056,16 +19173,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19059: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19176: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19062: \$? = $ac_status" >&5
+  echo "$as_me:19179: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19065: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19182: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19068: \$? = $ac_status" >&5
+  echo "$as_me:19185: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -19076,7 +19193,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19079: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:19196: 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"
@@ -19090,46 +19207,18 @@ LIBS="$cf_ncurses_LIBS $LIBS"
 
 if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
 then
-
-if test -n "$cf_cv_curses_dir/lib" ; then
-  for cf_add_libdir in $cf_cv_curses_dir/lib
-  do
-    if test $cf_add_libdir = /usr/lib ; then
-      :
-    elif test -d $cf_add_libdir
-    then
-      cf_have_libdir=no
-      if test -n "$LDFLAGS$LIBS" ; then
-        # a loop is needed to ensure we can add subdirs of existing dirs
-        for cf_test_libdir in $LDFLAGS $LIBS ; do
-          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
-            cf_have_libdir=yes; break
-          fi
-        done
-      fi
-      if test "$cf_have_libdir" = no ; then
-        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
-
-echo "${as_me-configure}:19113: testing adding $cf_add_libdir to library-path ..." 1>&5
-
-        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-      fi
-    fi
-  done
-fi
-
 	LIBS="-l$cf_nculib_root $LIBS"
 else
 
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
-	echo "$as_me:19126: checking for initscr" >&5
+	echo "$as_me:19215: 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 19132 "configure"
+#line 19221 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */
@@ -19160,16 +19249,16 @@ f = initscr;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19163: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19252: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19166: \$? = $ac_status" >&5
+  echo "$as_me:19255: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19169: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19258: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19172: \$? = $ac_status" >&5
+  echo "$as_me:19261: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -19179,20 +19268,20 @@ ac_cv_func_initscr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:19182: result: $ac_cv_func_initscr" >&5
+echo "$as_me:19271: 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:19189: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:19278: 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 19193 "configure"
+#line 19282 "configure"
 #include "confdefs.h"
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 int
 main ()
 {
@@ -19202,25 +19291,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19205: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19294: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19208: \$? = $ac_status" >&5
+  echo "$as_me:19297: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19211: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19300: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19214: \$? = $ac_status" >&5
+  echo "$as_me:19303: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:19216: result: yes" >&5
+  echo "$as_me:19305: 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:19223: result: no" >&5
+echo "$as_me:19312: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -19310,13 +19399,13 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:19313: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:19402: 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 19317 "configure"
+#line 19406 "configure"
 #include "confdefs.h"
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 int
 main ()
 {
@@ -19326,25 +19415,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19329: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19418: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19332: \$? = $ac_status" >&5
+  echo "$as_me:19421: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19335: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19424: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19338: \$? = $ac_status" >&5
+  echo "$as_me:19427: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:19340: result: yes" >&5
+  echo "$as_me:19429: 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:19347: result: no" >&5
+echo "$as_me:19436: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -19359,7 +19448,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:19362: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:19451: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -19367,7 +19456,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:19370: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:19459: 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
@@ -19377,9 +19466,9 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >conftest.$ac_ext <<_ACEOF
-#line 19380 "configure"
+#line 19469 "configure"
 #include "confdefs.h"
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 int
 main ()
 {
@@ -19389,23 +19478,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19392: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19481: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19395: \$? = $ac_status" >&5
+  echo "$as_me:19484: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19398: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19487: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19401: \$? = $ac_status" >&5
+  echo "$as_me:19490: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:19403: result: yes" >&5
+  echo "$as_me:19492: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:19408: result: no" >&5
+echo "$as_me:19497: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -19423,7 +19512,7 @@ fi
 	;;
 ncursesw)
 
-echo "$as_me:19426: checking for multibyte character support" >&5
+echo "$as_me:19515: checking for multibyte character support" >&5
 echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6
 if test "${cf_cv_utf8_lib+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19431,7 +19520,7 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 19434 "configure"
+#line 19523 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -19444,16 +19533,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19447: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19536: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19450: \$? = $ac_status" >&5
+  echo "$as_me:19539: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19453: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19542: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19456: \$? = $ac_status" >&5
+  echo "$as_me:19545: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_utf8_lib=yes
 else
@@ -19465,12 +19554,12 @@ cat conftest.$ac_ext >&5
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
-echo "${as_me-configure}:19468: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:19557: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 19473 "configure"
+#line 19562 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -19483,16 +19572,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19486: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19575: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19489: \$? = $ac_status" >&5
+  echo "$as_me:19578: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19492: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19581: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19495: \$? = $ac_status" >&5
+  echo "$as_me:19584: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -19506,7 +19595,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lutf8  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 19509 "configure"
+#line 19598 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -19519,16 +19608,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19522: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19611: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19525: \$? = $ac_status" >&5
+  echo "$as_me:19614: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19528: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19617: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19531: \$? = $ac_status" >&5
+  echo "$as_me:19620: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -19545,9 +19634,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
 
-echo "${as_me-configure}:19548: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:19637: testing find linkage for utf8 library ..." 1>&5
 
-echo "${as_me-configure}:19550: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:19639: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -19660,11 +19749,11 @@ cf_search="$cf_search $cf_header_path_list"
       if test -d $cf_cv_header_path_utf8 ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
 
-echo "${as_me-configure}:19663: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:19752: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8"
         cat >conftest.$ac_ext <<_ACEOF
-#line 19667 "configure"
+#line 19756 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -19677,21 +19766,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19680: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19769: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19683: \$? = $ac_status" >&5
+  echo "$as_me:19772: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19686: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19775: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19689: \$? = $ac_status" >&5
+  echo "$as_me:19778: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found utf8 headers in $cf_cv_header_path_utf8" 1>&6
 
-echo "${as_me-configure}:19694: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:19783: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
 
             cf_cv_find_linkage_utf8=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -19709,7 +19798,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
-echo "${as_me-configure}:19712: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:19801: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -19806,13 +19895,13 @@ cf_search="$cf_library_path_list $cf_search"
           if test -d $cf_cv_library_path_utf8 ; then
             test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
 
-echo "${as_me-configure}:19809: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:19898: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-lutf8  $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8"
             cat >conftest.$ac_ext <<_ACEOF
-#line 19815 "configure"
+#line 19904 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -19825,21 +19914,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19828: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19917: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19831: \$? = $ac_status" >&5
+  echo "$as_me:19920: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19834: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19923: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19837: \$? = $ac_status" >&5
+  echo "$as_me:19926: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
                 test -n "$verbose" && echo "	... found utf8 library in $cf_cv_library_path_utf8" 1>&6
 
-echo "${as_me-configure}:19842: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:19931: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
 
                 cf_cv_find_linkage_utf8=yes
                 cf_cv_library_file_utf8="-lutf8"
@@ -19881,7 +19970,7 @@ fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:19884: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:19973: result: $cf_cv_utf8_lib" >&5
 echo "${ECHO_T}$cf_cv_utf8_lib" >&6
 
 # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between
@@ -19915,7 +20004,7 @@ if test -n "$cf_cv_header_path_utf8" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 19918 "configure"
+#line 20007 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -19927,16 +20016,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19930: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20019: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19933: \$? = $ac_status" >&5
+  echo "$as_me:20022: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19936: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20025: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19939: \$? = $ac_status" >&5
+  echo "$as_me:20028: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -19953,7 +20042,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:19956: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:20045: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -19987,7 +20076,7 @@ if test -n "$cf_cv_library_path_utf8" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:19990: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:20079: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -20005,7 +20094,7 @@ for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config
 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:20008: checking for $ac_word" >&5
+echo "$as_me:20097: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_NCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20022,7 +20111,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_NCURSES_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:20025: found $ac_dir/$ac_word" >&5
+   echo "$as_me:20114: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -20033,10 +20122,10 @@ fi
 NCURSES_CONFIG=$ac_cv_path_NCURSES_CONFIG
 
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:20036: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:20125: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:20039: result: no" >&5
+  echo "$as_me:20128: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -20051,7 +20140,7 @@ LIBS="`$NCURSES_CONFIG --libs` $LIBS"
 
 # even with config script, some packages use no-override for curses.h
 
-echo "$as_me:20054: checking if we have identified curses headers" >&5
+echo "$as_me:20143: 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
@@ -20065,7 +20154,7 @@ for cf_header in  \
 	ncurses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 20068 "configure"
+#line 20157 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -20077,16 +20166,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20080: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20169: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20083: \$? = $ac_status" >&5
+  echo "$as_me:20172: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20086: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20175: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20089: \$? = $ac_status" >&5
+  echo "$as_me:20178: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -20097,11 +20186,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:20100: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:20189: 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:20104: error: No curses header-files found" >&5
+	{ { echo "$as_me:20193: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -20111,23 +20200,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20114: checking for $ac_header" >&5
+echo "$as_me:20203: 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 20120 "configure"
+#line 20209 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20124: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:20213: \"$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:20130: \$? = $ac_status" >&5
+  echo "$as_me:20219: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20146,7 +20235,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:20149: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:20238: 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
@@ -20175,8 +20264,8 @@ cf_ncuhdr_root=ncursesw
 test -n "$cf_cv_curses_dir" && \
 test "$cf_cv_curses_dir" != "no" && { \
 
-if test -n "$cf_cv_curses_dir/include $cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
-  for cf_add_incdir in $cf_cv_curses_dir/include $cf_cv_curses_dir/include/$cf_ncuhdr_root
+if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
+  for cf_add_incdir in $cf_cv_curses_dir/include/$cf_ncuhdr_root
   do
 	while test $cf_add_incdir != /usr/include
 	do
@@ -20199,7 +20288,7 @@ if test -n "$cf_cv_curses_dir/include $cf_cv_curses_dir/include/$cf_ncuhdr_root"
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 20202 "configure"
+#line 20291 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -20211,16 +20300,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20214: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20303: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20217: \$? = $ac_status" >&5
+  echo "$as_me:20306: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20220: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20309: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20223: \$? = $ac_status" >&5
+  echo "$as_me:20312: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -20237,7 +20326,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:20240: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:20329: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -20254,7 +20343,7 @@ fi
 
 }
 
-echo "$as_me:20257: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:20346: 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
@@ -20266,7 +20355,7 @@ else
 	do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 20269 "configure"
+#line 20358 "configure"
 #include "confdefs.h"
 
 #define _XOPEN_SOURCE_EXTENDED
@@ -20298,16 +20387,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20301: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20390: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20304: \$? = $ac_status" >&5
+  echo "$as_me:20393: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20307: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20396: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20310: \$? = $ac_status" >&5
+  echo "$as_me:20399: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -20322,14 +20411,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 	done
 
 fi
-echo "$as_me:20325: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:20414: 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:20332: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:20421: 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
@@ -20469,7 +20558,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 20472 "configure"
+#line 20561 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -20481,16 +20570,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20484: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20573: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20487: \$? = $ac_status" >&5
+  echo "$as_me:20576: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20490: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20579: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20493: \$? = $ac_status" >&5
+  echo "$as_me:20582: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -20507,7 +20596,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:20510: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:20599: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -20528,7 +20617,7 @@ fi
 		do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 20531 "configure"
+#line 20620 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -20552,16 +20641,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20555: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20644: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20558: \$? = $ac_status" >&5
+  echo "$as_me:20647: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20561: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20650: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20564: \$? = $ac_status" >&5
+  echo "$as_me:20653: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -20582,12 +20671,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:20585: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:20674: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:20590: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:20679: 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%/[^/]*$%%'`
@@ -20620,7 +20709,7 @@ if test -n "$cf_1st_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 20623 "configure"
+#line 20712 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -20632,16 +20721,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20635: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20724: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20638: \$? = $ac_status" >&5
+  echo "$as_me:20727: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20641: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20730: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20644: \$? = $ac_status" >&5
+  echo "$as_me:20733: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -20658,7 +20747,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:20661: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:20750: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -20701,7 +20790,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:20704: checking for terminfo header" >&5
+echo "$as_me:20793: 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
@@ -20719,10 +20808,10 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 20722 "configure"
+#line 20811 "configure"
 #include "confdefs.h"
 #include <stdio.h>
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 #include <$cf_test>
 
 int
@@ -20734,16 +20823,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20737: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20826: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20740: \$? = $ac_status" >&5
+  echo "$as_me:20829: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20743: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20832: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20746: \$? = $ac_status" >&5
+  echo "$as_me:20835: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -20759,7 +20848,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:20762: result: $cf_cv_term_header" >&5
+echo "$as_me:20851: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -20793,7 +20882,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:20796: checking for ncurses version" >&5
+echo "$as_me:20885: 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
@@ -20807,7 +20896,7 @@ else
 	# This will not work if the preprocessor splits the line after the
 	# Autoconf token.  The 'unproto' program does that.
 	cat > conftest.$ac_ext <<EOF
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 #undef Autoconf
 #ifdef NCURSES_VERSION
 Autoconf NCURSES_VERSION
@@ -20819,10 +20908,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:20822: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:20911: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:20825: \$? = $ac_status" >&5
+  echo "$as_me:20914: \$? = $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%".*%%'`
@@ -20832,10 +20921,10 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 20835 "configure"
+#line 20924 "configure"
 #include "confdefs.h"
 
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 #include <stdio.h>
 int main()
 {
@@ -20853,19 +20942,19 @@ int main()
 	make an error
 # endif
 #endif
-	${cf_cv_main_return-return}(0);
+	${cf_cv_main_return:-return}(0);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:20860: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20949: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20863: \$? = $ac_status" >&5
+  echo "$as_me:20952: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:20865: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20954: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20868: \$? = $ac_status" >&5
+  echo "$as_me:20957: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -20879,7 +20968,7 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:20882: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:20971: 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
@@ -20891,7 +20980,7 @@ cf_nculib_root=ncursesw
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:20894: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:20983: 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
@@ -20899,7 +20988,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 20902 "configure"
+#line 20991 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20918,16 +21007,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20921: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21010: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20924: \$? = $ac_status" >&5
+  echo "$as_me:21013: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20927: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21016: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20930: \$? = $ac_status" >&5
+  echo "$as_me:21019: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -20938,10 +21027,10 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20941: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:21030: 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:20944: checking for initscr in -lgpm" >&5
+  echo "$as_me:21033: 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
@@ -20949,7 +21038,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 20952 "configure"
+#line 21041 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20968,16 +21057,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20971: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21060: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20974: \$? = $ac_status" >&5
+  echo "$as_me:21063: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20977: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21066: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20980: \$? = $ac_status" >&5
+  echo "$as_me:21069: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -20988,7 +21077,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20991: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:21080: 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"
@@ -21003,7 +21092,7 @@ freebsd*)
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it's static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:21006: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:21095: 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
@@ -21011,7 +21100,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 21014 "configure"
+#line 21103 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21030,16 +21119,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21033: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21122: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21036: \$? = $ac_status" >&5
+  echo "$as_me:21125: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21039: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21128: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21042: \$? = $ac_status" >&5
+  echo "$as_me:21131: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -21050,7 +21139,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21053: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:21142: 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"
@@ -21064,46 +21153,18 @@ LIBS="$cf_ncurses_LIBS $LIBS"
 
 if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
 then
-
-if test -n "$cf_cv_curses_dir/lib" ; then
-  for cf_add_libdir in $cf_cv_curses_dir/lib
-  do
-    if test $cf_add_libdir = /usr/lib ; then
-      :
-    elif test -d $cf_add_libdir
-    then
-      cf_have_libdir=no
-      if test -n "$LDFLAGS$LIBS" ; then
-        # a loop is needed to ensure we can add subdirs of existing dirs
-        for cf_test_libdir in $LDFLAGS $LIBS ; do
-          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
-            cf_have_libdir=yes; break
-          fi
-        done
-      fi
-      if test "$cf_have_libdir" = no ; then
-        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
-
-echo "${as_me-configure}:21087: testing adding $cf_add_libdir to library-path ..." 1>&5
-
-        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-      fi
-    fi
-  done
-fi
-
 	LIBS="-l$cf_nculib_root $LIBS"
 else
 
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
-	echo "$as_me:21100: checking for initscr" >&5
+	echo "$as_me:21161: 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 21106 "configure"
+#line 21167 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */
@@ -21134,16 +21195,16 @@ f = initscr;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21137: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21198: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21140: \$? = $ac_status" >&5
+  echo "$as_me:21201: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21143: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21204: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21146: \$? = $ac_status" >&5
+  echo "$as_me:21207: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -21153,20 +21214,20 @@ ac_cv_func_initscr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:21156: result: $ac_cv_func_initscr" >&5
+echo "$as_me:21217: 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:21163: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:21224: 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 21167 "configure"
+#line 21228 "configure"
 #include "confdefs.h"
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 int
 main ()
 {
@@ -21176,25 +21237,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21179: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21240: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21182: \$? = $ac_status" >&5
+  echo "$as_me:21243: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21185: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21246: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21188: \$? = $ac_status" >&5
+  echo "$as_me:21249: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:21190: result: yes" >&5
+  echo "$as_me:21251: 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:21197: result: no" >&5
+echo "$as_me:21258: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -21284,13 +21345,13 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:21287: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:21348: 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 21291 "configure"
+#line 21352 "configure"
 #include "confdefs.h"
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 int
 main ()
 {
@@ -21300,25 +21361,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21303: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21364: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21306: \$? = $ac_status" >&5
+  echo "$as_me:21367: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21309: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21370: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21312: \$? = $ac_status" >&5
+  echo "$as_me:21373: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:21314: result: yes" >&5
+  echo "$as_me:21375: 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:21321: result: no" >&5
+echo "$as_me:21382: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -21333,7 +21394,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:21336: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:21397: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -21341,7 +21402,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:21344: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:21405: 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
@@ -21351,9 +21412,9 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >conftest.$ac_ext <<_ACEOF
-#line 21354 "configure"
+#line 21415 "configure"
 #include "confdefs.h"
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 int
 main ()
 {
@@ -21363,23 +21424,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21366: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21427: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21369: \$? = $ac_status" >&5
+  echo "$as_me:21430: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21372: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21433: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21375: \$? = $ac_status" >&5
+  echo "$as_me:21436: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:21377: result: yes" >&5
+  echo "$as_me:21438: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:21382: result: no" >&5
+echo "$as_me:21443: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -21402,7 +21463,7 @@ pdcurses)
 	;;
 slang)
 
-echo "$as_me:21405: checking for slang header file" >&5
+echo "$as_me:21466: checking for slang header file" >&5
 echo $ECHO_N "checking for slang header file... $ECHO_C" >&6
 if test "${cf_cv_slang_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21410,7 +21471,7 @@ else
 
 	cf_cv_slang_header=no
 	cat >conftest.$ac_ext <<_ACEOF
-#line 21413 "configure"
+#line 21474 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -21422,16 +21483,16 @@ printf("%s\n", SLANG_VERSION)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21425: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21486: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21428: \$? = $ac_status" >&5
+  echo "$as_me:21489: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21431: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21492: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21434: \$? = $ac_status" >&5
+  echo "$as_me:21495: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_header=predefined
 else
@@ -21558,7 +21619,7 @@ cf_search="$cf_search $cf_header_path_list"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:21561: result: $cf_cv_slang_header" >&5
+echo "$as_me:21622: result: $cf_cv_slang_header" >&5
 echo "${ECHO_T}$cf_cv_slang_header" >&6
 
 if test "x$cf_cv_slang_header" != xno
@@ -21598,7 +21659,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 21601 "configure"
+#line 21662 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -21610,16 +21671,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21613: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21674: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21616: \$? = $ac_status" >&5
+  echo "$as_me:21677: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21619: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21680: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21622: \$? = $ac_status" >&5
+  echo "$as_me:21683: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -21636,7 +21697,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:21639: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:21700: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -21666,7 +21727,7 @@ else
 
 cf_cv_termlib=none
 cat >conftest.$ac_ext <<_ACEOF
-#line 21669 "configure"
+#line 21730 "configure"
 #include "confdefs.h"
 
 int
@@ -21678,19 +21739,19 @@ char *x=(char*)tgoto("",0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21681: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21742: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21684: \$? = $ac_status" >&5
+  echo "$as_me:21745: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21687: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21748: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21690: \$? = $ac_status" >&5
+  echo "$as_me:21751: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 21693 "configure"
+#line 21754 "configure"
 #include "confdefs.h"
 
 int
@@ -21702,16 +21763,16 @@ int x=tigetstr("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21705: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21766: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21708: \$? = $ac_status" >&5
+  echo "$as_me:21769: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21711: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21772: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21714: \$? = $ac_status" >&5
+  echo "$as_me:21775: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termlib=terminfo
 else
@@ -21722,7 +21783,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	test -n "$verbose" && echo "	using functions in predefined $cf_cv_termlib LIBS" 1>&6
 
-echo "${as_me-configure}:21725: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
+echo "${as_me:-configure}:21786: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
 
 else
   echo "$as_me: failed program was:" >&5
@@ -21737,10 +21798,10 @@ if test "$cf_cv_termlib" = none; then
 	LIBS="-l$cf_lib $cf_save_LIBS"
 	for cf_func in tigetstr tgetstr
 	do
-		echo "$as_me:21740: checking for $cf_func in -l$cf_lib" >&5
+		echo "$as_me:21801: 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 21743 "configure"
+#line 21804 "configure"
 #include "confdefs.h"
 
 int
@@ -21752,16 +21813,16 @@ int x=$cf_func("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21755: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21816: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21758: \$? = $ac_status" >&5
+  echo "$as_me:21819: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21761: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21822: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21764: \$? = $ac_status" >&5
+  echo "$as_me:21825: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -21770,7 +21831,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-		echo "$as_me:21773: result: $cf_result" >&5
+		echo "$as_me:21834: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 		if test "$cf_result" = yes ; then
 			if test "$cf_func" = tigetstr ; then
@@ -21787,7 +21848,7 @@ echo "${ECHO_T}$cf_result" >&6
 fi
 if test "$cf_cv_termlib" = none; then
 	# allow curses library for broken AIX system.
-	echo "$as_me:21790: checking for initscr in -lcurses" >&5
+	echo "$as_me:21851: 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
@@ -21795,7 +21856,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 21798 "configure"
+#line 21859 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21814,16 +21875,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21817: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21878: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21820: \$? = $ac_status" >&5
+  echo "$as_me:21881: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21823: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21884: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21826: \$? = $ac_status" >&5
+  echo "$as_me:21887: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_curses_initscr=yes
 else
@@ -21834,13 +21895,13 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21837: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:21898: 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="-lcurses $LIBS" cf_cv_termlib=termcap
 fi
 
-	echo "$as_me:21843: checking for tgoto in -ltermcap" >&5
+	echo "$as_me:21904: 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
@@ -21848,7 +21909,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 21851 "configure"
+#line 21912 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21867,16 +21928,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21870: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21931: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21873: \$? = $ac_status" >&5
+  echo "$as_me:21934: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21876: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21937: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21879: \$? = $ac_status" >&5
+  echo "$as_me:21940: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_termcap_tgoto=yes
 else
@@ -21887,7 +21948,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21890: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:21951: 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="-ltermcap $LIBS" cf_cv_termlib=termcap
@@ -21898,20 +21959,20 @@ fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 if test "$cf_cv_termlib" = none; then
-	{ echo "$as_me:21901: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+	{ echo "$as_me:21962: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
 echo "$as_me: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&2;}
 fi
 
 fi
 
 cf_slang_LIBS2="$LIBS"
-echo "$as_me:21908: checking for acos" >&5
+echo "$as_me:21969: checking for acos" >&5
 echo $ECHO_N "checking for acos... $ECHO_C" >&6
 if test "${ac_cv_func_acos+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 21914 "configure"
+#line 21975 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char acos (); below.  */
@@ -21942,16 +22003,16 @@ f = acos;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21945: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22006: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21948: \$? = $ac_status" >&5
+  echo "$as_me:22009: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21951: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22012: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21954: \$? = $ac_status" >&5
+  echo "$as_me:22015: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_acos=yes
 else
@@ -21961,13 +22022,13 @@ ac_cv_func_acos=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:21964: result: $ac_cv_func_acos" >&5
+echo "$as_me:22025: result: $ac_cv_func_acos" >&5
 echo "${ECHO_T}$ac_cv_func_acos" >&6
 if test $ac_cv_func_acos = yes; then
   :
 else
 
-echo "$as_me:21970: checking for acos in -lm" >&5
+echo "$as_me:22031: checking for acos in -lm" >&5
 echo $ECHO_N "checking for acos in -lm... $ECHO_C" >&6
 if test "${ac_cv_lib_m_acos+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21975,7 +22036,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm $LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 21978 "configure"
+#line 22039 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21994,16 +22055,16 @@ acos ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21997: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22058: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22000: \$? = $ac_status" >&5
+  echo "$as_me:22061: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22003: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22064: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22006: \$? = $ac_status" >&5
+  echo "$as_me:22067: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_m_acos=yes
 else
@@ -22014,7 +22075,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22017: result: $ac_cv_lib_m_acos" >&5
+echo "$as_me:22078: result: $ac_cv_lib_m_acos" >&5
 echo "${ECHO_T}$ac_cv_lib_m_acos" >&6
 if test $ac_cv_lib_m_acos = yes; then
 
@@ -22040,13 +22101,13 @@ os2*)
 
 	eval 'cf_cv_have_lib_'video'=no'
 	cf_libdir=""
-	echo "$as_me:22043: checking for v_init" >&5
+	echo "$as_me:22104: checking for v_init" >&5
 echo $ECHO_N "checking for v_init... $ECHO_C" >&6
 if test "${ac_cv_func_v_init+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 22049 "configure"
+#line 22110 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char v_init (); below.  */
@@ -22077,16 +22138,16 @@ f = v_init;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22080: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22141: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22083: \$? = $ac_status" >&5
+  echo "$as_me:22144: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22086: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22147: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22089: \$? = $ac_status" >&5
+  echo "$as_me:22150: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_v_init=yes
 else
@@ -22096,18 +22157,18 @@ ac_cv_func_v_init=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:22099: result: $ac_cv_func_v_init" >&5
+echo "$as_me:22160: result: $ac_cv_func_v_init" >&5
 echo "${ECHO_T}$ac_cv_func_v_init" >&6
 if test $ac_cv_func_v_init = yes; then
   eval 'cf_cv_have_lib_'video'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:22106: checking for v_init in -lvideo" >&5
+		echo "$as_me:22167: checking for v_init in -lvideo" >&5
 echo $ECHO_N "checking for v_init in -lvideo... $ECHO_C" >&6
 		LIBS="-lvideo $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 22110 "configure"
+#line 22171 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -22119,25 +22180,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22122: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22183: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22125: \$? = $ac_status" >&5
+  echo "$as_me:22186: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22128: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22189: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22131: \$? = $ac_status" >&5
+  echo "$as_me:22192: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:22133: result: yes" >&5
+  echo "$as_me:22194: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'video'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:22140: result: no" >&5
+echo "$as_me:22201: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -22227,11 +22288,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:22230: checking for -lvideo in $cf_libdir" >&5
+				echo "$as_me:22291: checking for -lvideo in $cf_libdir" >&5
 echo $ECHO_N "checking for -lvideo in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -lvideo $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 22234 "configure"
+#line 22295 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -22243,25 +22304,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22246: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22307: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22249: \$? = $ac_status" >&5
+  echo "$as_me:22310: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22252: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22313: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22255: \$? = $ac_status" >&5
+  echo "$as_me:22316: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:22257: result: yes" >&5
+  echo "$as_me:22318: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'video'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:22264: result: no" >&5
+echo "$as_me:22325: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -22276,7 +22337,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'video
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:22279: error: Cannot link video library" >&5
+	{ { echo "$as_me:22340: error: Cannot link video library" >&5
 echo "$as_me: error: Cannot link video library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -22286,13 +22347,13 @@ esac
 
 	eval 'cf_cv_have_lib_'slang'=no'
 	cf_libdir=""
-	echo "$as_me:22289: checking for SLtt_get_screen_size" >&5
+	echo "$as_me:22350: checking for SLtt_get_screen_size" >&5
 echo $ECHO_N "checking for SLtt_get_screen_size... $ECHO_C" >&6
 if test "${ac_cv_func_SLtt_get_screen_size+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 22295 "configure"
+#line 22356 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char SLtt_get_screen_size (); below.  */
@@ -22323,16 +22384,16 @@ f = SLtt_get_screen_size;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22326: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22387: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22329: \$? = $ac_status" >&5
+  echo "$as_me:22390: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22332: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22393: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22335: \$? = $ac_status" >&5
+  echo "$as_me:22396: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_SLtt_get_screen_size=yes
 else
@@ -22342,18 +22403,18 @@ ac_cv_func_SLtt_get_screen_size=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:22345: result: $ac_cv_func_SLtt_get_screen_size" >&5
+echo "$as_me:22406: result: $ac_cv_func_SLtt_get_screen_size" >&5
 echo "${ECHO_T}$ac_cv_func_SLtt_get_screen_size" >&6
 if test $ac_cv_func_SLtt_get_screen_size = yes; then
   eval 'cf_cv_have_lib_'slang'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:22352: checking for SLtt_get_screen_size in -lslang" >&5
+		echo "$as_me:22413: checking for SLtt_get_screen_size in -lslang" >&5
 echo $ECHO_N "checking for SLtt_get_screen_size in -lslang... $ECHO_C" >&6
 		LIBS="-lslang $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 22356 "configure"
+#line 22417 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -22365,25 +22426,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22368: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22429: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22371: \$? = $ac_status" >&5
+  echo "$as_me:22432: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22374: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22435: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22377: \$? = $ac_status" >&5
+  echo "$as_me:22438: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:22379: result: yes" >&5
+  echo "$as_me:22440: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'slang'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:22386: result: no" >&5
+echo "$as_me:22447: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -22473,11 +22534,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:22476: checking for -lslang in $cf_libdir" >&5
+				echo "$as_me:22537: checking for -lslang in $cf_libdir" >&5
 echo $ECHO_N "checking for -lslang in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -lslang $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 22480 "configure"
+#line 22541 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -22489,25 +22550,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22492: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22553: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22495: \$? = $ac_status" >&5
+  echo "$as_me:22556: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22498: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22559: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22501: \$? = $ac_status" >&5
+  echo "$as_me:22562: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:22503: result: yes" >&5
+  echo "$as_me:22564: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'slang'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:22510: result: no" >&5
+echo "$as_me:22571: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -22522,13 +22583,13 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'slang
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:22525: error: Cannot link slang library" >&5
+	{ { echo "$as_me:22586: error: Cannot link slang library" >&5
 echo "$as_me: error: Cannot link slang library" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 cf_slang_LIBS3="$LIBS"
-echo "$as_me:22531: checking if we can link slang without termcap" >&5
+echo "$as_me:22592: checking if we can link slang without termcap" >&5
 echo $ECHO_N "checking if we can link slang without termcap... $ECHO_C" >&6
 if test -n "`echo $cf_slang_LIBS1 | sed -e 's/ //g'`" ; then
 	cf_exclude=`echo ".$cf_slang_LIBS2" | sed -e "s%$cf_slang_LIBS1%%" -e 's%^.%%'`
@@ -22537,7 +22598,7 @@ else
 fi
 LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s%$cf_exclude%%" -e 's%^.%%'`
 cat >conftest.$ac_ext <<_ACEOF
-#line 22540 "configure"
+#line 22601 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -22549,16 +22610,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22552: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22613: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22555: \$? = $ac_status" >&5
+  echo "$as_me:22616: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22558: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22619: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22561: \$? = $ac_status" >&5
+  echo "$as_me:22622: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -22567,13 +22628,13 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:22570: result: $cf_result" >&5
+echo "$as_me:22631: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 test $cf_result = no && LIBS="$cf_slang_LIBS3"
 
 else
 
-echo "$as_me:22576: checking for slang2 header file" >&5
+echo "$as_me:22637: checking for slang2 header file" >&5
 echo $ECHO_N "checking for slang2 header file... $ECHO_C" >&6
 if test "${cf_cv_slang2_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22581,7 +22642,7 @@ else
 
 	cf_cv_slang2_header=no
 	cat >conftest.$ac_ext <<_ACEOF
-#line 22584 "configure"
+#line 22645 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -22593,16 +22654,16 @@ printf("%s\n", SLANG_VERSION)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22596: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22657: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22599: \$? = $ac_status" >&5
+  echo "$as_me:22660: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22602: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22663: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22605: \$? = $ac_status" >&5
+  echo "$as_me:22666: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang2_header=predefined
 else
@@ -22729,7 +22790,7 @@ cf_search="$cf_search $cf_header_path_list"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:22732: result: $cf_cv_slang2_header" >&5
+echo "$as_me:22793: result: $cf_cv_slang2_header" >&5
 echo "${ECHO_T}$cf_cv_slang2_header" >&6
 
 if test "x$cf_cv_slang2_header" != xno
@@ -22769,7 +22830,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 22772 "configure"
+#line 22833 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -22781,16 +22842,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22784: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22845: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22787: \$? = $ac_status" >&5
+  echo "$as_me:22848: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22790: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22851: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22793: \$? = $ac_status" >&5
+  echo "$as_me:22854: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -22807,7 +22868,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:22810: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:22871: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -22837,7 +22898,7 @@ else
 
 cf_cv_termlib=none
 cat >conftest.$ac_ext <<_ACEOF
-#line 22840 "configure"
+#line 22901 "configure"
 #include "confdefs.h"
 
 int
@@ -22849,19 +22910,19 @@ char *x=(char*)tgoto("",0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22852: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22913: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22855: \$? = $ac_status" >&5
+  echo "$as_me:22916: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22858: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22919: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22861: \$? = $ac_status" >&5
+  echo "$as_me:22922: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 22864 "configure"
+#line 22925 "configure"
 #include "confdefs.h"
 
 int
@@ -22873,16 +22934,16 @@ int x=tigetstr("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22876: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22937: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22879: \$? = $ac_status" >&5
+  echo "$as_me:22940: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22882: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22943: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22885: \$? = $ac_status" >&5
+  echo "$as_me:22946: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termlib=terminfo
 else
@@ -22893,7 +22954,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	test -n "$verbose" && echo "	using functions in predefined $cf_cv_termlib LIBS" 1>&6
 
-echo "${as_me-configure}:22896: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
+echo "${as_me:-configure}:22957: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
 
 else
   echo "$as_me: failed program was:" >&5
@@ -22908,10 +22969,10 @@ if test "$cf_cv_termlib" = none; then
 	LIBS="-l$cf_lib $cf_save_LIBS"
 	for cf_func in tigetstr tgetstr
 	do
-		echo "$as_me:22911: checking for $cf_func in -l$cf_lib" >&5
+		echo "$as_me:22972: 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 22914 "configure"
+#line 22975 "configure"
 #include "confdefs.h"
 
 int
@@ -22923,16 +22984,16 @@ int x=$cf_func("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22926: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22987: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22929: \$? = $ac_status" >&5
+  echo "$as_me:22990: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22932: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22993: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22935: \$? = $ac_status" >&5
+  echo "$as_me:22996: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -22941,7 +23002,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-		echo "$as_me:22944: result: $cf_result" >&5
+		echo "$as_me:23005: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 		if test "$cf_result" = yes ; then
 			if test "$cf_func" = tigetstr ; then
@@ -22958,7 +23019,7 @@ echo "${ECHO_T}$cf_result" >&6
 fi
 if test "$cf_cv_termlib" = none; then
 	# allow curses library for broken AIX system.
-	echo "$as_me:22961: checking for initscr in -lcurses" >&5
+	echo "$as_me:23022: 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
@@ -22966,7 +23027,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 22969 "configure"
+#line 23030 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22985,16 +23046,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22988: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23049: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22991: \$? = $ac_status" >&5
+  echo "$as_me:23052: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22994: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23055: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22997: \$? = $ac_status" >&5
+  echo "$as_me:23058: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_curses_initscr=yes
 else
@@ -23005,13 +23066,13 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23008: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:23069: 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="-lcurses $LIBS" cf_cv_termlib=termcap
 fi
 
-	echo "$as_me:23014: checking for tgoto in -ltermcap" >&5
+	echo "$as_me:23075: 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
@@ -23019,7 +23080,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 23022 "configure"
+#line 23083 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23038,16 +23099,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23041: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23102: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23044: \$? = $ac_status" >&5
+  echo "$as_me:23105: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23047: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23108: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23050: \$? = $ac_status" >&5
+  echo "$as_me:23111: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_termcap_tgoto=yes
 else
@@ -23058,7 +23119,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23061: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:23122: 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="-ltermcap $LIBS" cf_cv_termlib=termcap
@@ -23069,20 +23130,20 @@ fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 if test "$cf_cv_termlib" = none; then
-	{ echo "$as_me:23072: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+	{ echo "$as_me:23133: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
 echo "$as_me: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&2;}
 fi
 
 fi
 
 cf_slang_LIBS2="$LIBS"
-echo "$as_me:23079: checking for acos" >&5
+echo "$as_me:23140: checking for acos" >&5
 echo $ECHO_N "checking for acos... $ECHO_C" >&6
 if test "${ac_cv_func_acos+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 23085 "configure"
+#line 23146 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char acos (); below.  */
@@ -23113,16 +23174,16 @@ f = acos;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23116: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23177: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23119: \$? = $ac_status" >&5
+  echo "$as_me:23180: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23122: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23183: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23125: \$? = $ac_status" >&5
+  echo "$as_me:23186: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_acos=yes
 else
@@ -23132,13 +23193,13 @@ ac_cv_func_acos=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:23135: result: $ac_cv_func_acos" >&5
+echo "$as_me:23196: result: $ac_cv_func_acos" >&5
 echo "${ECHO_T}$ac_cv_func_acos" >&6
 if test $ac_cv_func_acos = yes; then
   :
 else
 
-echo "$as_me:23141: checking for acos in -lm" >&5
+echo "$as_me:23202: checking for acos in -lm" >&5
 echo $ECHO_N "checking for acos in -lm... $ECHO_C" >&6
 if test "${ac_cv_lib_m_acos+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -23146,7 +23207,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm $LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 23149 "configure"
+#line 23210 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23165,16 +23226,16 @@ acos ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23168: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23229: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23171: \$? = $ac_status" >&5
+  echo "$as_me:23232: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23174: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23235: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23177: \$? = $ac_status" >&5
+  echo "$as_me:23238: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_m_acos=yes
 else
@@ -23185,7 +23246,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23188: result: $ac_cv_lib_m_acos" >&5
+echo "$as_me:23249: result: $ac_cv_lib_m_acos" >&5
 echo "${ECHO_T}$ac_cv_lib_m_acos" >&6
 if test $ac_cv_lib_m_acos = yes; then
 
@@ -23211,13 +23272,13 @@ os2*)
 
 	eval 'cf_cv_have_lib_'video'=no'
 	cf_libdir=""
-	echo "$as_me:23214: checking for v_init" >&5
+	echo "$as_me:23275: checking for v_init" >&5
 echo $ECHO_N "checking for v_init... $ECHO_C" >&6
 if test "${ac_cv_func_v_init+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 23220 "configure"
+#line 23281 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char v_init (); below.  */
@@ -23248,16 +23309,16 @@ f = v_init;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23251: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23312: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23254: \$? = $ac_status" >&5
+  echo "$as_me:23315: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23257: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23318: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23260: \$? = $ac_status" >&5
+  echo "$as_me:23321: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_v_init=yes
 else
@@ -23267,18 +23328,18 @@ ac_cv_func_v_init=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:23270: result: $ac_cv_func_v_init" >&5
+echo "$as_me:23331: result: $ac_cv_func_v_init" >&5
 echo "${ECHO_T}$ac_cv_func_v_init" >&6
 if test $ac_cv_func_v_init = yes; then
   eval 'cf_cv_have_lib_'video'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:23277: checking for v_init in -lvideo" >&5
+		echo "$as_me:23338: checking for v_init in -lvideo" >&5
 echo $ECHO_N "checking for v_init in -lvideo... $ECHO_C" >&6
 		LIBS="-lvideo $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 23281 "configure"
+#line 23342 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -23290,25 +23351,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23293: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23354: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23296: \$? = $ac_status" >&5
+  echo "$as_me:23357: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23299: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23360: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23302: \$? = $ac_status" >&5
+  echo "$as_me:23363: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:23304: result: yes" >&5
+  echo "$as_me:23365: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'video'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:23311: result: no" >&5
+echo "$as_me:23372: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -23398,11 +23459,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:23401: checking for -lvideo in $cf_libdir" >&5
+				echo "$as_me:23462: checking for -lvideo in $cf_libdir" >&5
 echo $ECHO_N "checking for -lvideo in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -lvideo $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 23405 "configure"
+#line 23466 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -23414,25 +23475,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23417: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23478: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23420: \$? = $ac_status" >&5
+  echo "$as_me:23481: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23423: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23484: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23426: \$? = $ac_status" >&5
+  echo "$as_me:23487: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:23428: result: yes" >&5
+  echo "$as_me:23489: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'video'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:23435: result: no" >&5
+echo "$as_me:23496: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -23447,7 +23508,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'video
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:23450: error: Cannot link video library" >&5
+	{ { echo "$as_me:23511: error: Cannot link video library" >&5
 echo "$as_me: error: Cannot link video library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -23457,13 +23518,13 @@ esac
 
 	eval 'cf_cv_have_lib_'slang2'=no'
 	cf_libdir=""
-	echo "$as_me:23460: checking for SLtt_get_screen_size" >&5
+	echo "$as_me:23521: checking for SLtt_get_screen_size" >&5
 echo $ECHO_N "checking for SLtt_get_screen_size... $ECHO_C" >&6
 if test "${ac_cv_func_SLtt_get_screen_size+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 23466 "configure"
+#line 23527 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char SLtt_get_screen_size (); below.  */
@@ -23494,16 +23555,16 @@ f = SLtt_get_screen_size;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23497: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23558: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23500: \$? = $ac_status" >&5
+  echo "$as_me:23561: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23503: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23564: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23506: \$? = $ac_status" >&5
+  echo "$as_me:23567: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_SLtt_get_screen_size=yes
 else
@@ -23513,18 +23574,18 @@ ac_cv_func_SLtt_get_screen_size=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:23516: result: $ac_cv_func_SLtt_get_screen_size" >&5
+echo "$as_me:23577: result: $ac_cv_func_SLtt_get_screen_size" >&5
 echo "${ECHO_T}$ac_cv_func_SLtt_get_screen_size" >&6
 if test $ac_cv_func_SLtt_get_screen_size = yes; then
   eval 'cf_cv_have_lib_'slang2'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:23523: checking for SLtt_get_screen_size in -lslang2" >&5
+		echo "$as_me:23584: checking for SLtt_get_screen_size in -lslang2" >&5
 echo $ECHO_N "checking for SLtt_get_screen_size in -lslang2... $ECHO_C" >&6
 		LIBS="-lslang2 $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 23527 "configure"
+#line 23588 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -23536,25 +23597,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23539: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23600: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23542: \$? = $ac_status" >&5
+  echo "$as_me:23603: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23545: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23606: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23548: \$? = $ac_status" >&5
+  echo "$as_me:23609: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:23550: result: yes" >&5
+  echo "$as_me:23611: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'slang2'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:23557: result: no" >&5
+echo "$as_me:23618: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -23644,11 +23705,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:23647: checking for -lslang2 in $cf_libdir" >&5
+				echo "$as_me:23708: checking for -lslang2 in $cf_libdir" >&5
 echo $ECHO_N "checking for -lslang2 in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -lslang2 $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 23651 "configure"
+#line 23712 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -23660,25 +23721,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23663: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23724: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23666: \$? = $ac_status" >&5
+  echo "$as_me:23727: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23669: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23730: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23672: \$? = $ac_status" >&5
+  echo "$as_me:23733: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:23674: result: yes" >&5
+  echo "$as_me:23735: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'slang2'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:23681: result: no" >&5
+echo "$as_me:23742: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -23693,13 +23754,13 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'slang2
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:23696: error: Cannot link slang2 library" >&5
+	{ { echo "$as_me:23757: error: Cannot link slang2 library" >&5
 echo "$as_me: error: Cannot link slang2 library" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 cf_slang_LIBS3="$LIBS"
-echo "$as_me:23702: checking if we can link slang2 without termcap" >&5
+echo "$as_me:23763: checking if we can link slang2 without termcap" >&5
 echo $ECHO_N "checking if we can link slang2 without termcap... $ECHO_C" >&6
 if test -n "`echo $cf_slang_LIBS1 | sed -e 's/ //g'`" ; then
 	cf_exclude=`echo ".$cf_slang_LIBS2" | sed -e "s%$cf_slang_LIBS1%%" -e 's%^.%%'`
@@ -23708,7 +23769,7 @@ else
 fi
 LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s%$cf_exclude%%" -e 's%^.%%'`
 cat >conftest.$ac_ext <<_ACEOF
-#line 23711 "configure"
+#line 23772 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -23720,16 +23781,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23723: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23784: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23726: \$? = $ac_status" >&5
+  echo "$as_me:23787: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23729: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23790: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23732: \$? = $ac_status" >&5
+  echo "$as_me:23793: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -23738,12 +23799,12 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:23741: result: $cf_result" >&5
+echo "$as_me:23802: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 test $cf_result = no && LIBS="$cf_slang_LIBS3"
 
 	else
-		{ { echo "$as_me:23746: error: cannot find slang headers" >&5
+		{ { echo "$as_me:23807: error: cannot find slang headers" >&5
 echo "$as_me: error: cannot find slang headers" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -23751,14 +23812,14 @@ fi
 
 # There's an unofficial set of patches for slang that gives it some limited
 # UTF8 capability.  Unfortunately it won't compile unless one defines UTF8.
-echo "$as_me:23754: checking if we must define UTF8" >&5
+echo "$as_me:23815: checking if we must define UTF8" >&5
 echo $ECHO_N "checking if we must define UTF8... $ECHO_C" >&6
 if test "${cf_cv_slang_utf8+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 23761 "configure"
+#line 23822 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -23770,16 +23831,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23773: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23834: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23776: \$? = $ac_status" >&5
+  echo "$as_me:23837: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23779: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23840: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23782: \$? = $ac_status" >&5
+  echo "$as_me:23843: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_utf8=no
 else
@@ -23787,7 +23848,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 23790 "configure"
+#line 23851 "configure"
 #include "confdefs.h"
 
 #define UTF8
@@ -23801,16 +23862,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23804: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23865: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23807: \$? = $ac_status" >&5
+  echo "$as_me:23868: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23810: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23871: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23813: \$? = $ac_status" >&5
+  echo "$as_me:23874: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_utf8=yes
 else
@@ -23823,7 +23884,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:23826: result: $cf_cv_slang_utf8" >&5
+echo "$as_me:23887: result: $cf_cv_slang_utf8" >&5
 echo "${ECHO_T}$cf_cv_slang_utf8" >&6
 
 if test "$cf_cv_slang_utf8" = yes ; then
@@ -23833,14 +23894,14 @@ EOF
 
 fi
 
-echo "$as_me:23836: checking if we must tell slang this is UNIX" >&5
+echo "$as_me:23897: checking if we must tell slang this is UNIX" >&5
 echo $ECHO_N "checking if we must tell slang this is UNIX... $ECHO_C" >&6
 if test "${cf_cv_slang_unix+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 23843 "configure"
+#line 23904 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -23859,16 +23920,16 @@ SLang_TT_Baud_Rate = 1
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23862: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23923: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23865: \$? = $ac_status" >&5
+  echo "$as_me:23926: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23868: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23929: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23871: \$? = $ac_status" >&5
+  echo "$as_me:23932: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_unix=yes
 else
@@ -23879,19 +23940,19 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:23882: result: $cf_cv_slang_unix" >&5
+echo "$as_me:23943: result: $cf_cv_slang_unix" >&5
 echo "${ECHO_T}$cf_cv_slang_unix" >&6
 test $cf_cv_slang_unix = yes && cat >>confdefs.h <<\EOF
 #define REAL_UNIX_SYSTEM 1
 EOF
 
-	echo "$as_me:23888: checking for SLsmg_Color_Type" >&5
+	echo "$as_me:23949: checking for SLsmg_Color_Type" >&5
 echo $ECHO_N "checking for SLsmg_Color_Type... $ECHO_C" >&6
 if test "${ac_cv_type_SLsmg_Color_Type+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 23894 "configure"
+#line 23955 "configure"
 #include "confdefs.h"
 #include <slang.h>
 
@@ -23907,16 +23968,16 @@ if (sizeof (SLsmg_Color_Type))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23910: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23971: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23913: \$? = $ac_status" >&5
+  echo "$as_me:23974: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23916: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23977: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23919: \$? = $ac_status" >&5
+  echo "$as_me:23980: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_SLsmg_Color_Type=yes
 else
@@ -23926,7 +23987,7 @@ ac_cv_type_SLsmg_Color_Type=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:23929: result: $ac_cv_type_SLsmg_Color_Type" >&5
+echo "$as_me:23990: result: $ac_cv_type_SLsmg_Color_Type" >&5
 echo "${ECHO_T}$ac_cv_type_SLsmg_Color_Type" >&6
 if test $ac_cv_type_SLsmg_Color_Type = yes; then
   ac_cv_type_SLsmg_Color_Type=yes
@@ -23941,13 +24002,13 @@ EOF
 
 fi
 
-	echo "$as_me:23944: checking for SLtt_Char_Type" >&5
+	echo "$as_me:24005: checking for SLtt_Char_Type" >&5
 echo $ECHO_N "checking for SLtt_Char_Type... $ECHO_C" >&6
 if test "${ac_cv_type_SLtt_Char_Type+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 23950 "configure"
+#line 24011 "configure"
 #include "confdefs.h"
 #include <slang.h>
 
@@ -23963,16 +24024,16 @@ if (sizeof (SLtt_Char_Type))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23966: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24027: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23969: \$? = $ac_status" >&5
+  echo "$as_me:24030: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23972: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24033: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23975: \$? = $ac_status" >&5
+  echo "$as_me:24036: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_SLtt_Char_Type=yes
 else
@@ -23982,7 +24043,7 @@ ac_cv_type_SLtt_Char_Type=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:23985: result: $ac_cv_type_SLtt_Char_Type" >&5
+echo "$as_me:24046: result: $ac_cv_type_SLtt_Char_Type" >&5
 echo "${ECHO_T}$ac_cv_type_SLtt_Char_Type" >&6
 if test $ac_cv_type_SLtt_Char_Type = yes; then
   ac_cv_type_SLtt_Char_Type=yes
@@ -24001,16 +24062,16 @@ fi
 	;;
 esac
 
-echo "$as_me:24004: checking for chtype typedef" >&5
+echo "$as_me:24065: checking for chtype typedef" >&5
 echo $ECHO_N "checking for chtype typedef... $ECHO_C" >&6
 if test "${cf_cv_chtype_decl+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 24011 "configure"
+#line 24072 "configure"
 #include "confdefs.h"
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 int
 main ()
 {
@@ -24020,16 +24081,16 @@ chtype foo
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24023: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24084: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24026: \$? = $ac_status" >&5
+  echo "$as_me:24087: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24029: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24090: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24032: \$? = $ac_status" >&5
+  echo "$as_me:24093: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_chtype_decl=yes
 else
@@ -24039,23 +24100,23 @@ cf_cv_chtype_decl=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:24042: result: $cf_cv_chtype_decl" >&5
+echo "$as_me:24103: result: $cf_cv_chtype_decl" >&5
 echo "${ECHO_T}$cf_cv_chtype_decl" >&6
 if test $cf_cv_chtype_decl = yes ; then
 	cat >>confdefs.h <<\EOF
 #define HAVE_TYPE_CHTYPE 1
 EOF
 
-	echo "$as_me:24049: checking if chtype is scalar or struct" >&5
+	echo "$as_me:24110: checking if chtype is scalar or struct" >&5
 echo $ECHO_N "checking if chtype is scalar or struct... $ECHO_C" >&6
 if test "${cf_cv_chtype_type+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 24056 "configure"
+#line 24117 "configure"
 #include "confdefs.h"
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 int
 main ()
 {
@@ -24065,16 +24126,16 @@ chtype foo; long x = foo
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24068: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24129: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24071: \$? = $ac_status" >&5
+  echo "$as_me:24132: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24074: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24135: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24077: \$? = $ac_status" >&5
+  echo "$as_me:24138: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_chtype_type=scalar
 else
@@ -24084,7 +24145,7 @@ cf_cv_chtype_type=struct
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:24087: result: $cf_cv_chtype_type" >&5
+echo "$as_me:24148: result: $cf_cv_chtype_type" >&5
 echo "${ECHO_T}$cf_cv_chtype_type" >&6
 	if test $cf_cv_chtype_type = scalar ; then
 		cat >>confdefs.h <<\EOF
@@ -24094,7 +24155,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:24097: checking if you want the wide-curses features" >&5
+echo "$as_me:24158: checking if you want the wide-curses features" >&5
 echo $ECHO_N "checking if you want the wide-curses features... $ECHO_C" >&6
 
 # Check whether --enable-widec or --disable-widec was given.
@@ -24111,10 +24172,10 @@ else
   use_wide_curses=$cf_wide_curses
 
 fi;
-echo "$as_me:24114: result: $use_wide_curses" >&5
+echo "$as_me:24175: result: $use_wide_curses" >&5
 echo "${ECHO_T}$use_wide_curses" >&6
 
-echo "$as_me:24117: checking if color-style code should be used" >&5
+echo "$as_me:24178: checking if color-style code should be used" >&5
 echo $ECHO_N "checking if color-style code should be used... $ECHO_C" >&6
 
 # Check whether --enable-color-style or --disable-color-style was given.
@@ -24134,7 +24195,7 @@ fi;
 
 case $use_color_style in
 no)
-	echo "$as_me:24137: result: no" >&5
+	echo "$as_me:24198: result: no" >&5
 echo "${ECHO_T}no" >&6
 	INSTALL_LSS=
 	;;
@@ -24143,10 +24204,10 @@ echo "${ECHO_T}no" >&6
 #define USE_COLOR_STYLE 1
 EOF
 
-	echo "$as_me:24146: result: yes" >&5
+	echo "$as_me:24207: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-	echo "$as_me:24149: checking for location of style-sheet file" >&5
+	echo "$as_me:24210: checking for location of style-sheet file" >&5
 echo $ECHO_N "checking for location of style-sheet file... $ECHO_C" >&6
 
 # Check whether --with-lss-file or --without-lss-file was given.
@@ -24154,7 +24215,7 @@ if test "${with_lss_file+set}" = set; then
   withval="$with_lss_file"
 
 else
-  withval="${LYNX_LSS_FILE-$sysconfdir/lynx.lss}"
+  withval="${LYNX_LSS_FILE:-$sysconfdir/lynx.lss}"
 fi; if test -n "$sysconfdir/lynx.lss" ; then
 
 if test "x$prefix" != xNONE; then
@@ -24182,7 +24243,7 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:24185: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:24246: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -24191,7 +24252,7 @@ esac
 fi
 LYNX_LSS_FILE="$withval"
 
-	echo "$as_me:24194: result: $LYNX_LSS_FILE" >&5
+	echo "$as_me:24255: result: $LYNX_LSS_FILE" >&5
 echo "${ECHO_T}$LYNX_LSS_FILE" >&6
 
 	test "$LYNX_LSS_FILE" = no && LYNX_LSS_FILE=
@@ -24203,7 +24264,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:24206: checking for the default configuration-file" >&5
+echo "$as_me:24267: checking for the default configuration-file" >&5
 echo $ECHO_N "checking for the default configuration-file... $ECHO_C" >&6
 
 # Check whether --with-cfg-file or --without-cfg-file was given.
@@ -24211,7 +24272,7 @@ if test "${with_cfg_file+set}" = set; then
   withval="$with_cfg_file"
 
 else
-  withval="${LYNX_CFG_FILE-$sysconfdir/lynx.cfg}"
+  withval="${LYNX_CFG_FILE:-$sysconfdir/lynx.cfg}"
 fi; if test -n "$sysconfdir/lynx.cfg" ; then
 
 if test "x$prefix" != xNONE; then
@@ -24239,7 +24300,7 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:24242: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:24303: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -24248,7 +24309,7 @@ esac
 fi
 LYNX_CFG_FILE="$withval"
 
-echo "$as_me:24251: result: $LYNX_CFG_FILE" >&5
+echo "$as_me:24312: result: $LYNX_CFG_FILE" >&5
 echo "${ECHO_T}$LYNX_CFG_FILE" >&6
 
 test "$LYNX_CFG_FILE" = no && LYNX_CFG_FILE=
@@ -24256,7 +24317,7 @@ cat >>confdefs.h <<EOF
 #define LYNX_CFG_FILE "$LYNX_CFG_FILE"
 EOF
 
-echo "$as_me:24259: checking if htmlized lynx.cfg should be built" >&5
+echo "$as_me:24320: checking if htmlized lynx.cfg should be built" >&5
 echo $ECHO_N "checking if htmlized lynx.cfg should be built... $ECHO_C" >&6
 
 # Check whether --enable-htmlized-cfg or --disable-htmlized-cfg was given.
@@ -24273,7 +24334,7 @@ else
   use_htmlized_cfg=no
 
 fi;
-echo "$as_me:24276: result: $use_htmlized_cfg" >&5
+echo "$as_me:24337: result: $use_htmlized_cfg" >&5
 echo "${ECHO_T}$use_htmlized_cfg" >&6
 
 LYNXCFG_MAKE=''
@@ -24281,7 +24342,7 @@ if test $use_htmlized_cfg = no ; then
 	LYNXCFG_MAKE='#'
 fi
 
-echo "$as_me:24284: checking if local doc directory should be linked to help page" >&5
+echo "$as_me:24345: checking if local doc directory should be linked to help page" >&5
 echo $ECHO_N "checking if local doc directory should be linked to help page... $ECHO_C" >&6
 
 # Check whether --enable-local-docs or --disable-local-docs was given.
@@ -24298,7 +24359,7 @@ else
   use_local_docs=no
 
 fi;
-echo "$as_me:24301: result: $use_local_docs" >&5
+echo "$as_me:24362: result: $use_local_docs" >&5
 echo "${ECHO_T}$use_local_docs" >&6
 
 LYNXDOC_MAKE=''
@@ -24306,7 +24367,7 @@ if test $use_local_docs = no ; then
 	LYNXDOC_MAKE='#'
 fi
 
-echo "$as_me:24309: checking for MIME library directory" >&5
+echo "$as_me:24370: checking for MIME library directory" >&5
 echo $ECHO_N "checking for MIME library directory... $ECHO_C" >&6
 
 # Check whether --with-mime-libdir or --without-mime-libdir was given.
@@ -24314,7 +24375,7 @@ if test "${with_mime_libdir+set}" = set; then
   withval="$with_mime_libdir"
 
 else
-  withval="${MIME_LIBDIR-/etc}"
+  withval="${MIME_LIBDIR:-/etc}"
 fi; if true ; then
 
 if test "x$prefix" != xNONE; then
@@ -24342,7 +24403,7 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:24345: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:24406: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -24351,14 +24412,14 @@ esac
 fi
 MIME_LIBDIR="$withval"
 
-echo "$as_me:24354: result: $MIME_LIBDIR" >&5
+echo "$as_me:24415: result: $MIME_LIBDIR" >&5
 echo "${ECHO_T}$MIME_LIBDIR" >&6
 MIME_LIBDIR=`echo "$MIME_LIBDIR" | sed -e 's,/$,,' -e 's,$,/,'`
 cat >>confdefs.h <<EOF
 #define MIME_LIBDIR "$MIME_LIBDIR"
 EOF
 
-echo "$as_me:24361: checking if locale-charset selection logic should be used" >&5
+echo "$as_me:24422: checking if locale-charset selection logic should be used" >&5
 echo $ECHO_N "checking if locale-charset selection logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-locale-charset or --disable-locale-charset was given.
@@ -24375,7 +24436,7 @@ else
   use_locale_charset=yes
 
 fi;
-echo "$as_me:24378: result: $use_locale_charset" >&5
+echo "$as_me:24439: result: $use_locale_charset" >&5
 echo "${ECHO_T}$use_locale_charset" >&6
 test $use_locale_charset != no && cat >>confdefs.h <<\EOF
 #define USE_LOCALE_CHARSET 1
@@ -24383,7 +24444,7 @@ EOF
 
 CHARSET_DEFS=
 
-echo "$as_me:24386: checking if you want only a few charsets" >&5
+echo "$as_me:24447: checking if you want only a few charsets" >&5
 echo $ECHO_N "checking if you want only a few charsets... $ECHO_C" >&6
 
 # Check whether --with-charsets or --without-charsets was given.
@@ -24395,7 +24456,7 @@ else
 fi;
 
 if test -n "$cf_charsets" ; then
-	echo "$as_me:24398: result: yes" >&5
+	echo "$as_me:24459: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	cat >>confdefs.h <<\EOF
 #define ALL_CHARSETS 0
@@ -24408,7 +24469,7 @@ EOF
 	if test "$cf_charsets" = "minimal" ; then
 		test -n "$verbose" && echo "	using minimal list of charsets: $cf_min_charsets" 1>&6
 
-echo "${as_me-configure}:24411: testing using minimal list of charsets: $cf_min_charsets ..." 1>&5
+echo "${as_me:-configure}:24472: testing using minimal list of charsets: $cf_min_charsets ..." 1>&5
 
 	fi
 	cf_charsets=`echo $cf_charsets | sed -e "s/minimal/$cf_min_charsets/g" -e 's/,/ /g'`
@@ -24435,28 +24496,28 @@ echo "${as_me-configure}:24411: testing using minimal list of charsets: $cf_min_
 		then
 			test -n "$verbose" && echo "	found $cf_charset" 1>&6
 
-echo "${as_me-configure}:24438: testing found $cf_charset ..." 1>&5
+echo "${as_me:-configure}:24499: testing found $cf_charset ..." 1>&5
 
 			CHARSET_DEFS="-DNO_CHARSET_${cf_def_charset}=0 $CHARSET_DEFS"
 		else
 			test -n "$verbose" && echo "	not found $cf_charset" 1>&6
 
-echo "${as_me-configure}:24444: testing not found $cf_charset ..." 1>&5
+echo "${as_me:-configure}:24505: testing not found $cf_charset ..." 1>&5
 
 		fi
 	done
 else
-	echo "$as_me:24449: result: no" >&5
+	echo "$as_me:24510: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:24453: checking for ANSI C header files" >&5
+echo "$as_me:24514: 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 24459 "configure"
+#line 24520 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -24464,13 +24525,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:24467: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:24528: \"$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:24473: \$? = $ac_status" >&5
+  echo "$as_me:24534: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -24492,7 +24553,7 @@ rm -f conftest.err conftest.$ac_ext
 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 24495 "configure"
+#line 24556 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -24510,7 +24571,7 @@ fi
 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 24513 "configure"
+#line 24574 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -24531,7 +24592,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 24534 "configure"
+#line 24595 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -24557,15 +24618,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:24560: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24621: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24563: \$? = $ac_status" >&5
+  echo "$as_me:24624: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:24565: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24626: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24568: \$? = $ac_status" >&5
+  echo "$as_me:24629: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -24578,7 +24639,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:24581: result: $ac_cv_header_stdc" >&5
+echo "$as_me:24642: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -24588,13 +24649,13 @@ EOF
 
 fi
 
-echo "$as_me:24591: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:24652: 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 24597 "configure"
+#line 24658 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -24610,16 +24671,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24613: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24674: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24616: \$? = $ac_status" >&5
+  echo "$as_me:24677: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24619: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24680: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24622: \$? = $ac_status" >&5
+  echo "$as_me:24683: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_header_time=yes
 else
@@ -24629,7 +24690,7 @@ ac_cv_header_time=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:24632: result: $ac_cv_header_time" >&5
+echo "$as_me:24693: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -24642,13 +24703,13 @@ fi
 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:24645: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:24706: 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 24651 "configure"
+#line 24712 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -24663,16 +24724,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24666: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24727: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24669: \$? = $ac_status" >&5
+  echo "$as_me:24730: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24672: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24733: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24675: \$? = $ac_status" >&5
+  echo "$as_me:24736: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -24682,7 +24743,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:24685: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:24746: 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
@@ -24695,7 +24756,7 @@ fi
 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:24698: checking for opendir in -ldir" >&5
+  echo "$as_me:24759: 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
@@ -24703,7 +24764,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 24706 "configure"
+#line 24767 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24722,16 +24783,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24725: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24786: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24728: \$? = $ac_status" >&5
+  echo "$as_me:24789: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24731: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24792: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24734: \$? = $ac_status" >&5
+  echo "$as_me:24795: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -24742,14 +24803,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24745: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:24806: 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:24752: checking for opendir in -lx" >&5
+  echo "$as_me:24813: 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
@@ -24757,7 +24818,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 24760 "configure"
+#line 24821 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24776,16 +24837,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24779: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24840: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24782: \$? = $ac_status" >&5
+  echo "$as_me:24843: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24785: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24846: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24788: \$? = $ac_status" >&5
+  echo "$as_me:24849: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -24796,7 +24857,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24799: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:24860: 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"
@@ -24824,23 +24885,23 @@ for ac_header in \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:24827: checking for $ac_header" >&5
+echo "$as_me:24888: 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 24833 "configure"
+#line 24894 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:24837: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:24898: \"$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:24843: \$? = $ac_status" >&5
+  echo "$as_me:24904: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -24859,7 +24920,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:24862: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:24923: 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
@@ -24869,14 +24930,14 @@ EOF
 fi
 done
 
-echo "$as_me:24872: checking termio.h and termios.h" >&5
+echo "$as_me:24933: checking termio.h and termios.h" >&5
 echo $ECHO_N "checking termio.h and termios.h... $ECHO_C" >&6
 if test "${cf_cv_termio_and_termios+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 24879 "configure"
+#line 24940 "configure"
 #include "confdefs.h"
 
 #if HAVE_TERMIO_H
@@ -24894,16 +24955,16 @@ putchar (0x0a)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24897: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24958: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24900: \$? = $ac_status" >&5
+  echo "$as_me:24961: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24903: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24964: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24906: \$? = $ac_status" >&5
+  echo "$as_me:24967: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termio_and_termios=yes
 else
@@ -24914,20 +24975,20 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:24917: result: $cf_cv_termio_and_termios" >&5
+echo "$as_me:24978: result: $cf_cv_termio_and_termios" >&5
 echo "${ECHO_T}$cf_cv_termio_and_termios" >&6
 test $cf_cv_termio_and_termios = no && cat >>confdefs.h <<\EOF
 #define TERMIO_AND_TERMIOS 1
 EOF
 
-echo "$as_me:24923: checking for sigaction and structs" >&5
+echo "$as_me:24984: checking for sigaction and structs" >&5
 echo $ECHO_N "checking for sigaction and structs... $ECHO_C" >&6
 if test "${cf_cv_func_sigaction+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 24930 "configure"
+#line 24991 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -24947,16 +25008,16 @@ struct sigaction act;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24950: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25011: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24953: \$? = $ac_status" >&5
+  echo "$as_me:25014: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24956: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25017: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24959: \$? = $ac_status" >&5
+  echo "$as_me:25020: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_func_sigaction=yes
 else
@@ -24967,7 +25028,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:24970: result: $cf_cv_func_sigaction" >&5
+echo "$as_me:25031: result: $cf_cv_func_sigaction" >&5
 echo "${ECHO_T}$cf_cv_func_sigaction" >&6
 test "$cf_cv_func_sigaction" = yes && cat >>confdefs.h <<\EOF
 #define HAVE_SIGACTION 1
@@ -24976,23 +25037,23 @@ EOF
 for ac_header in sys/wait.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:24979: checking for $ac_header" >&5
+echo "$as_me:25040: 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 24985 "configure"
+#line 25046 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:24989: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:25050: \"$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:24995: \$? = $ac_status" >&5
+  echo "$as_me:25056: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -25011,7 +25072,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:25014: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:25075: 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
@@ -25032,23 +25093,23 @@ else
 for ac_header in wait.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:25035: checking for $ac_header" >&5
+echo "$as_me:25096: 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 25041 "configure"
+#line 25102 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:25045: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:25106: \"$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:25051: \$? = $ac_status" >&5
+  echo "$as_me:25112: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -25067,7 +25128,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:25070: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:25131: 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
@@ -25080,23 +25141,23 @@ done
 for ac_header in waitstatus.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:25083: checking for $ac_header" >&5
+echo "$as_me:25144: 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 25089 "configure"
+#line 25150 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:25093: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:25154: \"$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:25099: \$? = $ac_status" >&5
+  echo "$as_me:25160: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -25115,7 +25176,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:25118: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:25179: 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
@@ -25137,14 +25198,14 @@ cf_wait_headers="$cf_wait_headers
 fi
 fi
 
-echo "$as_me:25140: checking for union wait" >&5
+echo "$as_me:25201: checking for union wait" >&5
 echo $ECHO_N "checking for union wait... $ECHO_C" >&6
 if test "${cf_cv_type_unionwait+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 25147 "configure"
+#line 25208 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -25160,16 +25221,16 @@ int x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25163: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25224: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25166: \$? = $ac_status" >&5
+  echo "$as_me:25227: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25169: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25230: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25172: \$? = $ac_status" >&5
+  echo "$as_me:25233: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_unionwait=no
 	 echo compiles ok w/o union wait 1>&5
@@ -25179,7 +25240,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 25182 "configure"
+#line 25243 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -25199,16 +25260,16 @@ union wait x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25202: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25263: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25205: \$? = $ac_status" >&5
+  echo "$as_me:25266: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25208: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25269: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25211: \$? = $ac_status" >&5
+  echo "$as_me:25272: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_unionwait=yes
 	 echo compiles ok with union wait and possibly macros too 1>&5
@@ -25223,7 +25284,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:25226: result: $cf_cv_type_unionwait" >&5
+echo "$as_me:25287: result: $cf_cv_type_unionwait" >&5
 echo "${ECHO_T}$cf_cv_type_unionwait" >&6
 test $cf_cv_type_unionwait = yes && cat >>confdefs.h <<\EOF
 #define HAVE_TYPE_UNIONWAIT 1
@@ -25231,14 +25292,14 @@ EOF
 
 if test $cf_cv_type_unionwait = yes; then
 
-	echo "$as_me:25234: checking if union wait can be used as wait-arg" >&5
+	echo "$as_me:25295: checking if union wait can be used as wait-arg" >&5
 echo $ECHO_N "checking if union wait can be used as wait-arg... $ECHO_C" >&6
 	if test "${cf_cv_arg_union_wait+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 25241 "configure"
+#line 25302 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -25250,16 +25311,16 @@ union wait x; wait(&x)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25253: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25314: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25256: \$? = $ac_status" >&5
+  echo "$as_me:25317: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25259: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25320: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25262: \$? = $ac_status" >&5
+  echo "$as_me:25323: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_arg_union_wait=yes
 else
@@ -25271,20 +25332,20 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-	echo "$as_me:25274: result: $cf_cv_arg_union_wait" >&5
+	echo "$as_me:25335: result: $cf_cv_arg_union_wait" >&5
 echo "${ECHO_T}$cf_cv_arg_union_wait" >&6
 	test $cf_cv_arg_union_wait = yes && cat >>confdefs.h <<\EOF
 #define WAIT_USES_UNION 1
 EOF
 
-	echo "$as_me:25280: checking if union wait can be used as waitpid-arg" >&5
+	echo "$as_me:25341: checking if union wait can be used as waitpid-arg" >&5
 echo $ECHO_N "checking if union wait can be used as waitpid-arg... $ECHO_C" >&6
 	if test "${cf_cv_arg_union_waitpid+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 25287 "configure"
+#line 25348 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -25296,16 +25357,16 @@ union wait x; waitpid(0, &x, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25299: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25360: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25302: \$? = $ac_status" >&5
+  echo "$as_me:25363: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25305: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25366: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25308: \$? = $ac_status" >&5
+  echo "$as_me:25369: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_arg_union_waitpid=yes
 else
@@ -25317,7 +25378,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-	echo "$as_me:25320: result: $cf_cv_arg_union_waitpid" >&5
+	echo "$as_me:25381: result: $cf_cv_arg_union_waitpid" >&5
 echo "${ECHO_T}$cf_cv_arg_union_waitpid" >&6
 	test $cf_cv_arg_union_waitpid = yes && cat >>confdefs.h <<\EOF
 #define WAITPID_USES_UNION 1
@@ -25325,13 +25386,13 @@ EOF
 
 fi
 
-echo "$as_me:25328: checking for uid_t in sys/types.h" >&5
+echo "$as_me:25389: 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 25334 "configure"
+#line 25395 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -25345,7 +25406,7 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:25348: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:25409: 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
 
@@ -25359,7 +25420,7 @@ EOF
 
 fi
 
-echo "$as_me:25362: checking type of array argument to getgroups" >&5
+echo "$as_me:25423: checking type of array argument to getgroups" >&5
 echo $ECHO_N "checking type of array argument to getgroups... $ECHO_C" >&6
 if test "${ac_cv_type_getgroups+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -25368,7 +25429,7 @@ else
   ac_cv_type_getgroups=cross
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 25371 "configure"
+#line 25432 "configure"
 #include "confdefs.h"
 /* Thanks to Mike Rendell for this test.  */
 #include <sys/types.h>
@@ -25394,15 +25455,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:25397: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25458: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25400: \$? = $ac_status" >&5
+  echo "$as_me:25461: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:25402: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25463: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25405: \$? = $ac_status" >&5
+  echo "$as_me:25466: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_getgroups=gid_t
 else
@@ -25415,7 +25476,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 if test $ac_cv_type_getgroups = cross; then
         cat >conftest.$ac_ext <<_ACEOF
-#line 25418 "configure"
+#line 25479 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 
@@ -25430,20 +25491,20 @@ rm -rf conftest*
 
 fi
 fi
-echo "$as_me:25433: result: $ac_cv_type_getgroups" >&5
+echo "$as_me:25494: result: $ac_cv_type_getgroups" >&5
 echo "${ECHO_T}$ac_cv_type_getgroups" >&6
 
 cat >>confdefs.h <<EOF
 #define GETGROUPS_T $ac_cv_type_getgroups
 EOF
 
-echo "$as_me:25440: checking for off_t" >&5
+echo "$as_me:25501: checking for off_t" >&5
 echo $ECHO_N "checking for off_t... $ECHO_C" >&6
 if test "${ac_cv_type_off_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 25446 "configure"
+#line 25507 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -25458,16 +25519,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25461: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25522: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25464: \$? = $ac_status" >&5
+  echo "$as_me:25525: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25467: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25528: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25470: \$? = $ac_status" >&5
+  echo "$as_me:25531: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -25477,7 +25538,7 @@ ac_cv_type_off_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25480: result: $ac_cv_type_off_t" >&5
+echo "$as_me:25541: result: $ac_cv_type_off_t" >&5
 echo "${ECHO_T}$ac_cv_type_off_t" >&6
 if test $ac_cv_type_off_t = yes; then
   :
@@ -25489,13 +25550,13 @@ EOF
 
 fi
 
-echo "$as_me:25492: checking for pid_t" >&5
+echo "$as_me:25553: 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 25498 "configure"
+#line 25559 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -25510,16 +25571,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25513: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25574: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25516: \$? = $ac_status" >&5
+  echo "$as_me:25577: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25519: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25580: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25522: \$? = $ac_status" >&5
+  echo "$as_me:25583: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -25529,7 +25590,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25532: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:25593: 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
   :
@@ -25541,13 +25602,13 @@ EOF
 
 fi
 
-echo "$as_me:25544: checking for uid_t in sys/types.h" >&5
+echo "$as_me:25605: 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 25550 "configure"
+#line 25611 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -25561,7 +25622,7 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:25564: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:25625: 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
 
@@ -25575,13 +25636,13 @@ EOF
 
 fi
 
-echo "$as_me:25578: checking for mode_t" >&5
+echo "$as_me:25639: checking for mode_t" >&5
 echo $ECHO_N "checking for mode_t... $ECHO_C" >&6
 if test "${ac_cv_type_mode_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 25584 "configure"
+#line 25645 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -25596,16 +25657,16 @@ if (sizeof (mode_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25599: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25660: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25602: \$? = $ac_status" >&5
+  echo "$as_me:25663: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25605: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25666: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25608: \$? = $ac_status" >&5
+  echo "$as_me:25669: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_mode_t=yes
 else
@@ -25615,7 +25676,7 @@ ac_cv_type_mode_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25618: result: $ac_cv_type_mode_t" >&5
+echo "$as_me:25679: result: $ac_cv_type_mode_t" >&5
 echo "${ECHO_T}$ac_cv_type_mode_t" >&6
 if test $ac_cv_type_mode_t = yes; then
   :
@@ -25627,13 +25688,13 @@ EOF
 
 fi
 
-	echo "$as_me:25630: checking for ssize_t" >&5
+	echo "$as_me:25691: checking for ssize_t" >&5
 echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6
 if test "${ac_cv_type_ssize_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 25636 "configure"
+#line 25697 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -25648,16 +25709,16 @@ if (sizeof (ssize_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25651: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25712: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25654: \$? = $ac_status" >&5
+  echo "$as_me:25715: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25657: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25718: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25660: \$? = $ac_status" >&5
+  echo "$as_me:25721: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_ssize_t=yes
 else
@@ -25667,7 +25728,7 @@ ac_cv_type_ssize_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25670: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:25731: result: $ac_cv_type_ssize_t" >&5
 echo "${ECHO_T}$ac_cv_type_ssize_t" >&6
 if test $ac_cv_type_ssize_t = yes; then
   ac_cv_type_ssize_t=yes
@@ -25682,13 +25743,13 @@ EOF
 
 fi
 
-	echo "$as_me:25685: checking for socklen_t" >&5
+	echo "$as_me:25746: checking for socklen_t" >&5
 echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
 if test "${ac_cv_type_socklen_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 25691 "configure"
+#line 25752 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -25706,16 +25767,16 @@ if (sizeof (socklen_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25709: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25770: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25712: \$? = $ac_status" >&5
+  echo "$as_me:25773: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25715: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25776: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25718: \$? = $ac_status" >&5
+  echo "$as_me:25779: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_socklen_t=yes
 else
@@ -25725,7 +25786,7 @@ ac_cv_type_socklen_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25728: result: $ac_cv_type_socklen_t" >&5
+echo "$as_me:25789: result: $ac_cv_type_socklen_t" >&5
 echo "${ECHO_T}$ac_cv_type_socklen_t" >&6
 if test $ac_cv_type_socklen_t = yes; then
   ac_cv_type_socklen_t=yes
@@ -25740,7 +25801,7 @@ EOF
 
 fi
 
-echo "$as_me:25743: checking for long long type" >&5
+echo "$as_me:25804: checking for long long type" >&5
 echo $ECHO_N "checking for long long type... $ECHO_C" >&6
 if test "${cf_cv_type_long_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -25771,7 +25832,7 @@ _CFEOF
 	rm -f conftest*
 
 fi
-echo "$as_me:25774: result: $cf_cv_type_long_long" >&5
+echo "$as_me:25835: result: $cf_cv_type_long_long" >&5
 echo "${ECHO_T}$cf_cv_type_long_long" >&6
 
 if test "$cf_cv_type_long_long" = yes ; then
@@ -25781,14 +25842,14 @@ EOF
 
 fi
 
-echo "$as_me:25784: checking for tm.tm_gmtoff" >&5
+echo "$as_me:25845: checking for tm.tm_gmtoff" >&5
 echo $ECHO_N "checking for tm.tm_gmtoff... $ECHO_C" >&6
 if test "${cf_cv_tm_gmtoff+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 25791 "configure"
+#line 25852 "configure"
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
@@ -25813,16 +25874,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25816: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25877: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25819: \$? = $ac_status" >&5
+  echo "$as_me:25880: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25822: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25883: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25825: \$? = $ac_status" >&5
+  echo "$as_me:25886: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_tm_gmtoff=yes
 else
@@ -25833,19 +25894,19 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:25836: result: $cf_cv_tm_gmtoff" >&5
+echo "$as_me:25897: result: $cf_cv_tm_gmtoff" >&5
 echo "${ECHO_T}$cf_cv_tm_gmtoff" >&6
 test $cf_cv_tm_gmtoff = no && cat >>confdefs.h <<\EOF
 #define DONT_HAVE_TM_GMTOFF 1
 EOF
 
-echo "$as_me:25842: checking for int" >&5
+echo "$as_me:25903: checking for int" >&5
 echo $ECHO_N "checking for int... $ECHO_C" >&6
 if test "${ac_cv_type_int+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 25848 "configure"
+#line 25909 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -25860,16 +25921,16 @@ if (sizeof (int))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25863: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25924: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25866: \$? = $ac_status" >&5
+  echo "$as_me:25927: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25869: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25930: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25872: \$? = $ac_status" >&5
+  echo "$as_me:25933: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_int=yes
 else
@@ -25879,10 +25940,10 @@ ac_cv_type_int=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25882: result: $ac_cv_type_int" >&5
+echo "$as_me:25943: result: $ac_cv_type_int" >&5
 echo "${ECHO_T}$ac_cv_type_int" >&6
 
-echo "$as_me:25885: checking size of int" >&5
+echo "$as_me:25946: checking size of int" >&5
 echo $ECHO_N "checking size of int... $ECHO_C" >&6
 if test "${ac_cv_sizeof_int+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -25891,7 +25952,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 25894 "configure"
+#line 25955 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -25903,21 +25964,21 @@ int _array_ [1 - 2 * !((sizeof (int)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25906: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25967: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25909: \$? = $ac_status" >&5
+  echo "$as_me:25970: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25912: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25973: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25915: \$? = $ac_status" >&5
+  echo "$as_me:25976: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 25920 "configure"
+#line 25981 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -25929,16 +25990,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25932: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25993: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25935: \$? = $ac_status" >&5
+  echo "$as_me:25996: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25938: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25999: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25941: \$? = $ac_status" >&5
+  echo "$as_me:26002: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -25954,7 +26015,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 25957 "configure"
+#line 26018 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -25966,16 +26027,16 @@ int _array_ [1 - 2 * !((sizeof (int)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25969: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26030: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25972: \$? = $ac_status" >&5
+  echo "$as_me:26033: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25975: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26036: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25978: \$? = $ac_status" >&5
+  echo "$as_me:26039: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -25991,7 +26052,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
   cat >conftest.$ac_ext <<_ACEOF
-#line 25994 "configure"
+#line 26055 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26003,16 +26064,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26006: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26067: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26009: \$? = $ac_status" >&5
+  echo "$as_me:26070: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26012: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26073: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26015: \$? = $ac_status" >&5
+  echo "$as_me:26076: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -26025,12 +26086,12 @@ done
 ac_cv_sizeof_int=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:26028: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:26089: 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 26033 "configure"
+#line 26094 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26046,15 +26107,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:26049: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26110: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26052: \$? = $ac_status" >&5
+  echo "$as_me:26113: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:26054: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26115: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26057: \$? = $ac_status" >&5
+  echo "$as_me:26118: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_int=`cat conftest.val`
 else
@@ -26070,19 +26131,19 @@ else
   ac_cv_sizeof_int=0
 fi
 fi
-echo "$as_me:26073: result: $ac_cv_sizeof_int" >&5
+echo "$as_me:26134: result: $ac_cv_sizeof_int" >&5
 echo "${ECHO_T}$ac_cv_sizeof_int" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_INT $ac_cv_sizeof_int
 EOF
 
-echo "$as_me:26079: checking for long" >&5
+echo "$as_me:26140: checking for long" >&5
 echo $ECHO_N "checking for long... $ECHO_C" >&6
 if test "${ac_cv_type_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 26085 "configure"
+#line 26146 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26097,16 +26158,16 @@ if (sizeof (long))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26100: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26161: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26103: \$? = $ac_status" >&5
+  echo "$as_me:26164: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26106: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26167: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26109: \$? = $ac_status" >&5
+  echo "$as_me:26170: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_long=yes
 else
@@ -26116,10 +26177,10 @@ ac_cv_type_long=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:26119: result: $ac_cv_type_long" >&5
+echo "$as_me:26180: result: $ac_cv_type_long" >&5
 echo "${ECHO_T}$ac_cv_type_long" >&6
 
-echo "$as_me:26122: checking size of long" >&5
+echo "$as_me:26183: checking size of long" >&5
 echo $ECHO_N "checking size of long... $ECHO_C" >&6
 if test "${ac_cv_sizeof_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26128,7 +26189,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 26131 "configure"
+#line 26192 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26140,21 +26201,21 @@ int _array_ [1 - 2 * !((sizeof (long)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26143: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26204: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26146: \$? = $ac_status" >&5
+  echo "$as_me:26207: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26149: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26210: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26152: \$? = $ac_status" >&5
+  echo "$as_me:26213: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 26157 "configure"
+#line 26218 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26166,16 +26227,16 @@ int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26169: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26230: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26172: \$? = $ac_status" >&5
+  echo "$as_me:26233: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26175: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26236: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26178: \$? = $ac_status" >&5
+  echo "$as_me:26239: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -26191,7 +26252,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 26194 "configure"
+#line 26255 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26203,16 +26264,16 @@ int _array_ [1 - 2 * !((sizeof (long)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26206: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26267: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26209: \$? = $ac_status" >&5
+  echo "$as_me:26270: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26212: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26273: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26215: \$? = $ac_status" >&5
+  echo "$as_me:26276: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -26228,7 +26289,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
   cat >conftest.$ac_ext <<_ACEOF
-#line 26231 "configure"
+#line 26292 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26240,16 +26301,16 @@ int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26243: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26304: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26246: \$? = $ac_status" >&5
+  echo "$as_me:26307: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26249: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26310: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26252: \$? = $ac_status" >&5
+  echo "$as_me:26313: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -26262,12 +26323,12 @@ done
 ac_cv_sizeof_long=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:26265: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:26326: 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 26270 "configure"
+#line 26331 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26283,15 +26344,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:26286: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26347: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26289: \$? = $ac_status" >&5
+  echo "$as_me:26350: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:26291: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26352: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26294: \$? = $ac_status" >&5
+  echo "$as_me:26355: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_long=`cat conftest.val`
 else
@@ -26307,19 +26368,19 @@ else
   ac_cv_sizeof_long=0
 fi
 fi
-echo "$as_me:26310: result: $ac_cv_sizeof_long" >&5
+echo "$as_me:26371: result: $ac_cv_sizeof_long" >&5
 echo "${ECHO_T}$ac_cv_sizeof_long" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_LONG $ac_cv_sizeof_long
 EOF
 
-echo "$as_me:26316: checking for off_t" >&5
+echo "$as_me:26377: checking for off_t" >&5
 echo $ECHO_N "checking for off_t... $ECHO_C" >&6
 if test "${ac_cv_type_off_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 26322 "configure"
+#line 26383 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26334,16 +26395,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26337: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26398: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26340: \$? = $ac_status" >&5
+  echo "$as_me:26401: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26343: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26404: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26346: \$? = $ac_status" >&5
+  echo "$as_me:26407: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -26353,10 +26414,10 @@ ac_cv_type_off_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:26356: result: $ac_cv_type_off_t" >&5
+echo "$as_me:26417: result: $ac_cv_type_off_t" >&5
 echo "${ECHO_T}$ac_cv_type_off_t" >&6
 
-echo "$as_me:26359: checking size of off_t" >&5
+echo "$as_me:26420: checking size of off_t" >&5
 echo $ECHO_N "checking size of off_t... $ECHO_C" >&6
 if test "${ac_cv_sizeof_off_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26365,7 +26426,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 26368 "configure"
+#line 26429 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26377,21 +26438,21 @@ int _array_ [1 - 2 * !((sizeof (off_t)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26380: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26441: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26383: \$? = $ac_status" >&5
+  echo "$as_me:26444: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26386: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26447: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26389: \$? = $ac_status" >&5
+  echo "$as_me:26450: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 26394 "configure"
+#line 26455 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26403,16 +26464,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26406: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26467: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26409: \$? = $ac_status" >&5
+  echo "$as_me:26470: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26412: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26473: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26415: \$? = $ac_status" >&5
+  echo "$as_me:26476: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -26428,7 +26489,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 26431 "configure"
+#line 26492 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26440,16 +26501,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26443: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26504: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26446: \$? = $ac_status" >&5
+  echo "$as_me:26507: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26449: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26510: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26452: \$? = $ac_status" >&5
+  echo "$as_me:26513: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -26465,7 +26526,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
   cat >conftest.$ac_ext <<_ACEOF
-#line 26468 "configure"
+#line 26529 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26477,16 +26538,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26480: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26541: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26483: \$? = $ac_status" >&5
+  echo "$as_me:26544: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26486: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26547: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26489: \$? = $ac_status" >&5
+  echo "$as_me:26550: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -26499,12 +26560,12 @@ done
 ac_cv_sizeof_off_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:26502: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:26563: 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 26507 "configure"
+#line 26568 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26520,15 +26581,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:26523: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26584: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26526: \$? = $ac_status" >&5
+  echo "$as_me:26587: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:26528: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26589: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26531: \$? = $ac_status" >&5
+  echo "$as_me:26592: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_off_t=`cat conftest.val`
 else
@@ -26544,19 +26605,19 @@ else
   ac_cv_sizeof_off_t=0
 fi
 fi
-echo "$as_me:26547: result: $ac_cv_sizeof_off_t" >&5
+echo "$as_me:26608: result: $ac_cv_sizeof_off_t" >&5
 echo "${ECHO_T}$ac_cv_sizeof_off_t" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_OFF_T $ac_cv_sizeof_off_t
 EOF
 
-echo "$as_me:26553: checking for time_t" >&5
+echo "$as_me:26614: 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 26559 "configure"
+#line 26620 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26571,16 +26632,16 @@ if (sizeof (time_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26574: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26635: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26577: \$? = $ac_status" >&5
+  echo "$as_me:26638: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26580: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26641: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26583: \$? = $ac_status" >&5
+  echo "$as_me:26644: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_time_t=yes
 else
@@ -26590,10 +26651,10 @@ ac_cv_type_time_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:26593: result: $ac_cv_type_time_t" >&5
+echo "$as_me:26654: result: $ac_cv_type_time_t" >&5
 echo "${ECHO_T}$ac_cv_type_time_t" >&6
 
-echo "$as_me:26596: checking size of time_t" >&5
+echo "$as_me:26657: checking size of time_t" >&5
 echo $ECHO_N "checking size of time_t... $ECHO_C" >&6
 if test "${ac_cv_sizeof_time_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26602,7 +26663,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 26605 "configure"
+#line 26666 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26614,21 +26675,21 @@ int _array_ [1 - 2 * !((sizeof (time_t)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26617: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26678: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26620: \$? = $ac_status" >&5
+  echo "$as_me:26681: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26623: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26684: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26626: \$? = $ac_status" >&5
+  echo "$as_me:26687: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 26631 "configure"
+#line 26692 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26640,16 +26701,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26643: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26704: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26646: \$? = $ac_status" >&5
+  echo "$as_me:26707: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26649: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26710: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26652: \$? = $ac_status" >&5
+  echo "$as_me:26713: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -26665,7 +26726,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 26668 "configure"
+#line 26729 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26677,16 +26738,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26680: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26741: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26683: \$? = $ac_status" >&5
+  echo "$as_me:26744: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26686: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26747: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26689: \$? = $ac_status" >&5
+  echo "$as_me:26750: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -26702,7 +26763,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
   cat >conftest.$ac_ext <<_ACEOF
-#line 26705 "configure"
+#line 26766 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26714,16 +26775,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26717: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26778: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26720: \$? = $ac_status" >&5
+  echo "$as_me:26781: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26723: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26784: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26726: \$? = $ac_status" >&5
+  echo "$as_me:26787: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -26736,12 +26797,12 @@ done
 ac_cv_sizeof_time_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:26739: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:26800: 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 26744 "configure"
+#line 26805 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26757,15 +26818,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:26760: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26821: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26763: \$? = $ac_status" >&5
+  echo "$as_me:26824: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:26765: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26826: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26768: \$? = $ac_status" >&5
+  echo "$as_me:26829: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_time_t=`cat conftest.val`
 else
@@ -26781,7 +26842,7 @@ else
   ac_cv_sizeof_time_t=0
 fi
 fi
-echo "$as_me:26784: result: $ac_cv_sizeof_time_t" >&5
+echo "$as_me:26845: result: $ac_cv_sizeof_time_t" >&5
 echo "${ECHO_T}$ac_cv_sizeof_time_t" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_TIME_T $ac_cv_sizeof_time_t
@@ -26789,13 +26850,13 @@ EOF
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:26792: checking for working alloca.h" >&5
+echo "$as_me:26853: checking for working alloca.h" >&5
 echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6
 if test "${ac_cv_working_alloca_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 26798 "configure"
+#line 26859 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int
@@ -26807,16 +26868,16 @@ char *p = (char *) alloca (2 * sizeof (int));
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26810: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26871: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26813: \$? = $ac_status" >&5
+  echo "$as_me:26874: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26816: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26877: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26819: \$? = $ac_status" >&5
+  echo "$as_me:26880: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_working_alloca_h=yes
 else
@@ -26826,7 +26887,7 @@ ac_cv_working_alloca_h=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:26829: result: $ac_cv_working_alloca_h" >&5
+echo "$as_me:26890: result: $ac_cv_working_alloca_h" >&5
 echo "${ECHO_T}$ac_cv_working_alloca_h" >&6
 if test $ac_cv_working_alloca_h = yes; then
 
@@ -26836,13 +26897,13 @@ EOF
 
 fi
 
-echo "$as_me:26839: checking for alloca" >&5
+echo "$as_me:26900: checking for alloca" >&5
 echo $ECHO_N "checking for alloca... $ECHO_C" >&6
 if test "${ac_cv_func_alloca_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 26845 "configure"
+#line 26906 "configure"
 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -26874,16 +26935,16 @@ char *p = (char *) alloca (1);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26877: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26938: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26880: \$? = $ac_status" >&5
+  echo "$as_me:26941: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26883: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26944: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26886: \$? = $ac_status" >&5
+  echo "$as_me:26947: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_alloca_works=yes
 else
@@ -26893,7 +26954,7 @@ ac_cv_func_alloca_works=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:26896: result: $ac_cv_func_alloca_works" >&5
+echo "$as_me:26957: result: $ac_cv_func_alloca_works" >&5
 echo "${ECHO_T}$ac_cv_func_alloca_works" >&6
 
 if test $ac_cv_func_alloca_works = yes; then
@@ -26914,13 +26975,13 @@ cat >>confdefs.h <<\EOF
 #define C_ALLOCA 1
 EOF
 
-echo "$as_me:26917: checking whether \`alloca.c' needs Cray hooks" >&5
+echo "$as_me:26978: checking whether \`alloca.c' needs Cray hooks" >&5
 echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6
 if test "${ac_cv_os_cray+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 26923 "configure"
+#line 26984 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -26938,18 +26999,18 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:26941: result: $ac_cv_os_cray" >&5
+echo "$as_me:27002: result: $ac_cv_os_cray" >&5
 echo "${ECHO_T}$ac_cv_os_cray" >&6
 if test $ac_cv_os_cray = yes; then
   for ac_func in _getb67 GETB67 getb67; do
     as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:26946: checking for $ac_func" >&5
+echo "$as_me:27007: 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 26952 "configure"
+#line 27013 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -26980,16 +27041,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26983: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27044: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26986: \$? = $ac_status" >&5
+  echo "$as_me:27047: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26989: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27050: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26992: \$? = $ac_status" >&5
+  echo "$as_me:27053: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -26999,7 +27060,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:27002: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:27063: 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
 
@@ -27013,7 +27074,7 @@ fi
   done
 fi
 
-echo "$as_me:27016: checking stack direction for C alloca" >&5
+echo "$as_me:27077: checking stack direction for C alloca" >&5
 echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6
 if test "${ac_cv_c_stack_direction+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27022,7 +27083,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 27025 "configure"
+#line 27086 "configure"
 #include "confdefs.h"
 int
 find_stack_direction ()
@@ -27045,15 +27106,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:27048: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27109: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27051: \$? = $ac_status" >&5
+  echo "$as_me:27112: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:27053: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27114: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27056: \$? = $ac_status" >&5
+  echo "$as_me:27117: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_stack_direction=1
 else
@@ -27065,7 +27126,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:27068: result: $ac_cv_c_stack_direction" >&5
+echo "$as_me:27129: result: $ac_cv_c_stack_direction" >&5
 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
 cat >>confdefs.h <<EOF
@@ -27077,23 +27138,23 @@ fi
 for ac_header in unistd.h vfork.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:27080: checking for $ac_header" >&5
+echo "$as_me:27141: 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 27086 "configure"
+#line 27147 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:27090: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:27151: \"$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:27096: \$? = $ac_status" >&5
+  echo "$as_me:27157: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -27112,7 +27173,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:27115: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:27176: 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
@@ -27125,13 +27186,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:27128: checking for $ac_func" >&5
+echo "$as_me:27189: 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 27134 "configure"
+#line 27195 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -27162,16 +27223,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27165: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27226: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27168: \$? = $ac_status" >&5
+  echo "$as_me:27229: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27171: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27232: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27174: \$? = $ac_status" >&5
+  echo "$as_me:27235: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -27181,7 +27242,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:27184: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:27245: 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
@@ -27193,7 +27254,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:27196: checking for working fork" >&5
+  echo "$as_me:27257: checking for working fork" >&5
 echo $ECHO_N "checking for working fork... $ECHO_C" >&6
 if test "${ac_cv_func_fork_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27216,15 +27277,15 @@ else
       }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:27219: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27280: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27222: \$? = $ac_status" >&5
+  echo "$as_me:27283: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:27224: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27285: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27227: \$? = $ac_status" >&5
+  echo "$as_me:27288: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -27236,7 +27297,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:27239: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:27300: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -27250,12 +27311,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:27253: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:27314: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
 echo "$as_me: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&2;}
 fi
 ac_cv_func_vfork_works=$ac_cv_func_vfork
 if test "x$ac_cv_func_vfork" = xyes; then
-  echo "$as_me:27258: checking for working vfork" >&5
+  echo "$as_me:27319: checking for working vfork" >&5
 echo $ECHO_N "checking for working vfork... $ECHO_C" >&6
 if test "${ac_cv_func_vfork_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27264,7 +27325,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 27267 "configure"
+#line 27328 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -27361,15 +27422,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:27364: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27425: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27367: \$? = $ac_status" >&5
+  echo "$as_me:27428: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:27369: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27430: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27372: \$? = $ac_status" >&5
+  echo "$as_me:27433: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -27381,13 +27442,13 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:27384: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:27445: result: $ac_cv_func_vfork_works" >&5
 echo "${ECHO_T}$ac_cv_func_vfork_works" >&6
 
 fi;
 if test "x$ac_cv_func_fork_works" = xcross; then
   ac_cv_func_vfork_works=ac_cv_func_vfork
-  { echo "$as_me:27390: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:27451: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
 echo "$as_me: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&2;}
 fi
 
@@ -27412,14 +27473,14 @@ EOF
 
 fi
 
-echo "$as_me:27415: checking if we should use fcntl or ioctl" >&5
+echo "$as_me:27476: checking if we should use fcntl or ioctl" >&5
 echo $ECHO_N "checking if we should use fcntl or ioctl... $ECHO_C" >&6
 if test "${cf_cv_fionbio+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 27422 "configure"
+#line 27483 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -27436,16 +27497,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27439: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27500: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27442: \$? = $ac_status" >&5
+  echo "$as_me:27503: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27445: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27506: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27448: \$? = $ac_status" >&5
+  echo "$as_me:27509: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fionbio=ioctl
 else
@@ -27453,7 +27514,7 @@ else
 cat conftest.$ac_ext >&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 27456 "configure"
+#line 27517 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -27475,16 +27536,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27478: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27539: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27481: \$? = $ac_status" >&5
+  echo "$as_me:27542: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27484: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27545: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27487: \$? = $ac_status" >&5
+  echo "$as_me:27548: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fionbio=fcntl
 else
@@ -27497,20 +27558,20 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:27500: result: $cf_cv_fionbio" >&5
+echo "$as_me:27561: result: $cf_cv_fionbio" >&5
 echo "${ECHO_T}$cf_cv_fionbio" >&6
 test "$cf_cv_fionbio" = "fcntl" && cat >>confdefs.h <<\EOF
 #define USE_FCNTL 1
 EOF
 
-echo "$as_me:27506: checking for broken/missing definition of remove" >&5
+echo "$as_me:27567: checking for broken/missing definition of remove" >&5
 echo $ECHO_N "checking for broken/missing definition of remove... $ECHO_C" >&6
 if test "${cf_cv_baddef_remove+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 27513 "configure"
+#line 27574 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -27522,23 +27583,23 @@ remove("dummy")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27525: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27586: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27528: \$? = $ac_status" >&5
+  echo "$as_me:27589: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27531: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27592: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27534: \$? = $ac_status" >&5
+  echo "$as_me:27595: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_baddef_remove=no
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 27541 "configure"
+#line 27602 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 		int __unlink(name) { return unlink(name); }
@@ -27551,16 +27612,16 @@ remove("dummy")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27554: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27615: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27557: \$? = $ac_status" >&5
+  echo "$as_me:27618: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27560: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27621: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27563: \$? = $ac_status" >&5
+  echo "$as_me:27624: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_baddef_remove=yes
 else
@@ -27575,20 +27636,20 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:27578: result: $cf_cv_baddef_remove" >&5
+echo "$as_me:27639: result: $cf_cv_baddef_remove" >&5
 echo "${ECHO_T}$cf_cv_baddef_remove" >&6
 test "$cf_cv_baddef_remove" != no && cat >>confdefs.h <<\EOF
 #define NEED_REMOVE 1
 EOF
 
-echo "$as_me:27584: checking for lstat" >&5
+echo "$as_me:27645: checking for lstat" >&5
 echo $ECHO_N "checking for lstat... $ECHO_C" >&6
 if test "${ac_cv_func_lstat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 27591 "configure"
+#line 27652 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -27602,16 +27663,16 @@ lstat(".", (struct stat *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27605: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27666: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27608: \$? = $ac_status" >&5
+  echo "$as_me:27669: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27611: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27672: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27614: \$? = $ac_status" >&5
+  echo "$as_me:27675: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_lstat=yes
 else
@@ -27623,7 +27684,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:27626: result: $ac_cv_func_lstat " >&5
+echo "$as_me:27687: result: $ac_cv_func_lstat " >&5
 echo "${ECHO_T}$ac_cv_func_lstat " >&6
 if test $ac_cv_func_lstat = yes; then
 	cat >>confdefs.h <<\EOF
@@ -27657,13 +27718,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:27660: checking for $ac_func" >&5
+echo "$as_me:27721: 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 27666 "configure"
+#line 27727 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -27694,16 +27755,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27697: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27758: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27700: \$? = $ac_status" >&5
+  echo "$as_me:27761: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27703: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27764: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27706: \$? = $ac_status" >&5
+  echo "$as_me:27767: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -27713,7 +27774,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:27716: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:27777: 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
@@ -27729,13 +27790,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:27732: checking for $ac_func" >&5
+echo "$as_me:27793: 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 27738 "configure"
+#line 27799 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -27766,16 +27827,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27769: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27830: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27772: \$? = $ac_status" >&5
+  echo "$as_me:27833: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27775: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27836: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27778: \$? = $ac_status" >&5
+  echo "$as_me:27839: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -27785,7 +27846,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:27788: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:27849: 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
@@ -27797,7 +27858,7 @@ else
 fi
 done
 
-echo "$as_me:27800: checking for random-integer functions" >&5
+echo "$as_me:27861: checking for random-integer functions" >&5
 echo $ECHO_N "checking for random-integer functions... $ECHO_C" >&6
 if test "${cf_cv_srand_func+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27817,7 +27878,7 @@ do
 	esac
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 27820 "configure"
+#line 27881 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -27836,16 +27897,16 @@ long seed = 1; $cf_srand_func(seed); seed = $cf_rand_func()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27839: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27900: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27842: \$? = $ac_status" >&5
+  echo "$as_me:27903: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27845: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27906: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27848: \$? = $ac_status" >&5
+  echo "$as_me:27909: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_srand_func=$cf_func
  break
@@ -27857,10 +27918,10 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:27860: result: $cf_cv_srand_func" >&5
+echo "$as_me:27921: result: $cf_cv_srand_func" >&5
 echo "${ECHO_T}$cf_cv_srand_func" >&6
 if test "$cf_cv_srand_func" != unknown ; then
-	echo "$as_me:27863: checking for range of random-integers" >&5
+	echo "$as_me:27924: checking for range of random-integers" >&5
 echo $ECHO_N "checking for range of random-integers... $ECHO_C" >&6
 if test "${cf_cv_rand_max+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27881,7 +27942,7 @@ else
 			;;
 		esac
 		cat >conftest.$ac_ext <<_ACEOF
-#line 27884 "configure"
+#line 27945 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -27900,16 +27961,16 @@ long x = $cf_cv_rand_max
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27903: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27964: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27906: \$? = $ac_status" >&5
+  echo "$as_me:27967: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27909: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27970: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27912: \$? = $ac_status" >&5
+  echo "$as_me:27973: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -27920,7 +27981,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:27923: result: $cf_cv_rand_max" >&5
+echo "$as_me:27984: result: $cf_cv_rand_max" >&5
 echo "${ECHO_T}$cf_cv_rand_max" >&6
 
 	cf_srand_func=`echo $cf_func | sed -e 's%/.*%%'`
@@ -27951,13 +28012,13 @@ fi
 for ac_func in strstr
 do
 
-echo "$as_me:27954: checking for $ac_func declaration" >&5
+echo "$as_me:28015: checking for $ac_func declaration" >&5
 echo $ECHO_N "checking for $ac_func declaration... $ECHO_C" >&6
 if eval "test \"\${ac_cv_func_decl_$ac_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 27960 "configure"
+#line 28021 "configure"
 #include "confdefs.h"
 #include <string.h>
 int
@@ -27971,20 +28032,20 @@ extern	int	$ac_func();
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27974: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28035: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27977: \$? = $ac_status" >&5
+  echo "$as_me:28038: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27980: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28041: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27983: \$? = $ac_status" >&5
+  echo "$as_me:28044: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 27987 "configure"
+#line 28048 "configure"
 #include "confdefs.h"
 #include <string.h>
 int
@@ -27998,16 +28059,16 @@ int	(*p)() = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28001: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28062: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28004: \$? = $ac_status" >&5
+  echo "$as_me:28065: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28007: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28068: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28010: \$? = $ac_status" >&5
+  echo "$as_me:28071: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -28028,11 +28089,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
 if eval "test \"`echo '$ac_cv_func_'decl_$ac_func`\" = yes"; then
-  echo "$as_me:28031: result: yes" >&5
+  echo "$as_me:28092: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:28035: result: no" >&5
+  echo "$as_me:28096: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -28047,13 +28108,13 @@ done
 for ac_func in getgrgid getgrnam
 do
 
-echo "$as_me:28050: checking for $ac_func declaration" >&5
+echo "$as_me:28111: checking for $ac_func declaration" >&5
 echo $ECHO_N "checking for $ac_func declaration... $ECHO_C" >&6
 if eval "test \"\${ac_cv_func_decl_$ac_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 28056 "configure"
+#line 28117 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -28069,20 +28130,20 @@ extern	int	$ac_func();
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28072: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28133: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28075: \$? = $ac_status" >&5
+  echo "$as_me:28136: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28078: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28139: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28081: \$? = $ac_status" >&5
+  echo "$as_me:28142: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 28085 "configure"
+#line 28146 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -28098,16 +28159,16 @@ int	(*p)() = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28101: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28162: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28104: \$? = $ac_status" >&5
+  echo "$as_me:28165: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28107: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28168: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28110: \$? = $ac_status" >&5
+  echo "$as_me:28171: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -28128,11 +28189,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
 if eval "test \"`echo '$ac_cv_func_'decl_$ac_func`\" = yes"; then
-  echo "$as_me:28131: result: yes" >&5
+  echo "$as_me:28192: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:28135: result: no" >&5
+  echo "$as_me:28196: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -28144,17 +28205,17 @@ EOF
 fi
 done
 
-echo "$as_me:28147: checking if TRUE/FALSE are defined" >&5
+echo "$as_me:28208: checking if TRUE/FALSE are defined" >&5
 echo $ECHO_N "checking if TRUE/FALSE are defined... $ECHO_C" >&6
 if test "${cf_cv_bool_defs+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 28154 "configure"
+#line 28215 "configure"
 #include "confdefs.h"
 
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 #include <stdio.h>
 int
 main ()
@@ -28165,16 +28226,16 @@ int x = TRUE, y = FALSE
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28168: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28229: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28171: \$? = $ac_status" >&5
+  echo "$as_me:28232: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28174: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28235: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28177: \$? = $ac_status" >&5
+  echo "$as_me:28238: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_bool_defs=yes
 else
@@ -28185,7 +28246,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:28188: result: $cf_cv_bool_defs" >&5
+echo "$as_me:28249: result: $cf_cv_bool_defs" >&5
 echo "${ECHO_T}$cf_cv_bool_defs" >&6
 if test "$cf_cv_bool_defs" = no ; then
 	cat >>confdefs.h <<\EOF
@@ -28198,14 +28259,14 @@ EOF
 
 fi
 
-echo "$as_me:28201: checking if external errno is declared" >&5
+echo "$as_me:28262: 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 28208 "configure"
+#line 28269 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -28223,16 +28284,16 @@ int x = (int) errno
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28226: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28287: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28229: \$? = $ac_status" >&5
+  echo "$as_me:28290: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28232: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28293: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28235: \$? = $ac_status" >&5
+  echo "$as_me:28296: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -28243,7 +28304,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:28246: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:28307: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -28258,14 +28319,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:28261: checking if external errno exists" >&5
+echo "$as_me:28322: 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 28268 "configure"
+#line 28329 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -28280,16 +28341,16 @@ errno = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28283: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28344: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28286: \$? = $ac_status" >&5
+  echo "$as_me:28347: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28289: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28350: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28292: \$? = $ac_status" >&5
+  echo "$as_me:28353: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_errno=yes
 else
@@ -28300,7 +28361,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:28303: result: $cf_cv_have_errno" >&5
+echo "$as_me:28364: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -28313,7 +28374,7 @@ EOF
 
 fi
 
-echo "$as_me:28316: checking if we can set errno" >&5
+echo "$as_me:28377: checking if we can set errno" >&5
 echo $ECHO_N "checking if we can set errno... $ECHO_C" >&6
 if test "${cf_cv_set_errno+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -28321,7 +28382,7 @@ else
 
 if test "$cross_compiling" = yes; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 28324 "configure"
+#line 28385 "configure"
 #include "confdefs.h"
 #include <errno.h>
 int
@@ -28333,16 +28394,16 @@ errno = 255
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28336: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28397: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28339: \$? = $ac_status" >&5
+  echo "$as_me:28400: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28342: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28403: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28345: \$? = $ac_status" >&5
+  echo "$as_me:28406: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_set_errno=maybe
 else
@@ -28353,26 +28414,26 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 28356 "configure"
+#line 28417 "configure"
 #include "confdefs.h"
 
 #include <errno.h>
 int main()
 {
 	errno = 255;
-	${cf_cv_main_return-return}(errno != 255);
+	${cf_cv_main_return:-return}(errno != 255);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:28367: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28428: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28370: \$? = $ac_status" >&5
+  echo "$as_me:28431: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:28372: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28433: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28375: \$? = $ac_status" >&5
+  echo "$as_me:28436: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_set_errno=yes
 else
@@ -28385,20 +28446,20 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:28388: result: $cf_cv_set_errno" >&5
+echo "$as_me:28449: result: $cf_cv_set_errno" >&5
 echo "${ECHO_T}$cf_cv_set_errno" >&6
 test "$cf_cv_set_errno" != no && cat >>confdefs.h <<\EOF
 #define CAN_SET_ERRNO 1
 EOF
 
-echo "$as_me:28394: checking for setlocale()" >&5
+echo "$as_me:28455: 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 28401 "configure"
+#line 28462 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int
@@ -28410,16 +28471,16 @@ setlocale(LC_ALL, "")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28413: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28474: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28416: \$? = $ac_status" >&5
+  echo "$as_me:28477: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28419: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28480: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28422: \$? = $ac_status" >&5
+  echo "$as_me:28483: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_locale=yes
 else
@@ -28431,21 +28492,21 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:28434: result: $cf_cv_locale" >&5
+echo "$as_me:28495: result: $cf_cv_locale" >&5
 echo "${ECHO_T}$cf_cv_locale" >&6
 test $cf_cv_locale = yes && { cat >>confdefs.h <<\EOF
 #define LOCALE 1
 EOF
  }
 
-echo "$as_me:28441: checking if NGROUPS is defined" >&5
+echo "$as_me:28502: checking if NGROUPS is defined" >&5
 echo $ECHO_N "checking if NGROUPS is defined... $ECHO_C" >&6
 if test "${cf_cv_ngroups+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 28448 "configure"
+#line 28509 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -28464,23 +28525,23 @@ int x = NGROUPS
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28467: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28528: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28470: \$? = $ac_status" >&5
+  echo "$as_me:28531: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28473: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28534: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28476: \$? = $ac_status" >&5
+  echo "$as_me:28537: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ngroups=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 28483 "configure"
+#line 28544 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -28499,16 +28560,16 @@ int x = NGROUPS_MAX
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28502: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28563: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28505: \$? = $ac_status" >&5
+  echo "$as_me:28566: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28508: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28569: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28511: \$? = $ac_status" >&5
+  echo "$as_me:28572: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ngroups=NGROUPS_MAX
 else
@@ -28520,7 +28581,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:28523: result: $cf_cv_ngroups" >&5
+echo "$as_me:28584: result: $cf_cv_ngroups" >&5
 echo "${ECHO_T}$cf_cv_ngroups" >&6
 
 fi
@@ -28537,14 +28598,14 @@ EOF
 
 fi
 
-echo "$as_me:28540: checking if external sys_nerr is declared" >&5
+echo "$as_me:28601: 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 28547 "configure"
+#line 28608 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -28562,16 +28623,16 @@ int x = (int) sys_nerr
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28565: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28626: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28568: \$? = $ac_status" >&5
+  echo "$as_me:28629: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28571: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28632: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28574: \$? = $ac_status" >&5
+  echo "$as_me:28635: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_nerr=yes
 else
@@ -28582,7 +28643,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:28585: result: $cf_cv_dcl_sys_nerr" >&5
+echo "$as_me:28646: 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
@@ -28597,14 +28658,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:28600: checking if external sys_nerr exists" >&5
+echo "$as_me:28661: 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 28607 "configure"
+#line 28668 "configure"
 #include "confdefs.h"
 
 #undef sys_nerr
@@ -28619,16 +28680,16 @@ sys_nerr = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28622: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28683: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28625: \$? = $ac_status" >&5
+  echo "$as_me:28686: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28628: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28689: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28631: \$? = $ac_status" >&5
+  echo "$as_me:28692: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_nerr=yes
 else
@@ -28639,7 +28700,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:28642: result: $cf_cv_have_sys_nerr" >&5
+echo "$as_me:28703: 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
@@ -28652,14 +28713,14 @@ EOF
 
 fi
 
-echo "$as_me:28655: checking if external sys_errlist is declared" >&5
+echo "$as_me:28716: 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 28662 "configure"
+#line 28723 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -28677,16 +28738,16 @@ int x = (int) sys_errlist
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28680: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28741: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28683: \$? = $ac_status" >&5
+  echo "$as_me:28744: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28686: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28747: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28689: \$? = $ac_status" >&5
+  echo "$as_me:28750: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_errlist=yes
 else
@@ -28697,7 +28758,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:28700: result: $cf_cv_dcl_sys_errlist" >&5
+echo "$as_me:28761: 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
@@ -28712,14 +28773,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:28715: checking if external sys_errlist exists" >&5
+echo "$as_me:28776: 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 28722 "configure"
+#line 28783 "configure"
 #include "confdefs.h"
 
 #undef sys_errlist
@@ -28734,16 +28795,16 @@ sys_errlist = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28737: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28798: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28740: \$? = $ac_status" >&5
+  echo "$as_me:28801: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28743: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28804: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28746: \$? = $ac_status" >&5
+  echo "$as_me:28807: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_errlist=yes
 else
@@ -28754,7 +28815,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:28757: result: $cf_cv_have_sys_errlist" >&5
+echo "$as_me:28818: 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
@@ -28770,23 +28831,23 @@ fi
 for ac_header in lastlog.h paths.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:28773: checking for $ac_header" >&5
+echo "$as_me:28834: 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 28779 "configure"
+#line 28840 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:28783: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:28844: \"$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:28789: \$? = $ac_status" >&5
+  echo "$as_me:28850: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -28805,7 +28866,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:28808: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:28869: 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
@@ -28815,14 +28876,14 @@ EOF
 fi
 done
 
-echo "$as_me:28818: checking for lastlog path" >&5
+echo "$as_me:28879: checking for lastlog path" >&5
 echo $ECHO_N "checking for lastlog path... $ECHO_C" >&6
 if test "${cf_cv_path_lastlog+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 28825 "configure"
+#line 28886 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -28842,16 +28903,16 @@ char *path = _PATH_LASTLOG
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28845: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28906: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28848: \$? = $ac_status" >&5
+  echo "$as_me:28909: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28851: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28912: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28854: \$? = $ac_status" >&5
+  echo "$as_me:28915: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_path_lastlog="_PATH_LASTLOG"
 else
@@ -28866,13 +28927,13 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:28869: result: $cf_cv_path_lastlog" >&5
+echo "$as_me:28930: result: $cf_cv_path_lastlog" >&5
 echo "${ECHO_T}$cf_cv_path_lastlog" >&6
 test $cf_cv_path_lastlog != no && cat >>confdefs.h <<\EOF
 #define USE_LASTLOG 1
 EOF
 
-echo "$as_me:28875: checking for utmp implementation" >&5
+echo "$as_me:28936: checking for utmp implementation" >&5
 echo $ECHO_N "checking for utmp implementation... $ECHO_C" >&6
 if test "${cf_cv_have_utmp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -28889,7 +28950,7 @@ cf_utmp_includes="
 #endif
 "
 	cat >conftest.$ac_ext <<_ACEOF
-#line 28892 "configure"
+#line 28953 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -28903,16 +28964,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28906: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28967: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28909: \$? = $ac_status" >&5
+  echo "$as_me:28970: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28912: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28973: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28915: \$? = $ac_status" >&5
+  echo "$as_me:28976: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -28921,7 +28982,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 28924 "configure"
+#line 28985 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -28935,16 +28996,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28938: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28999: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28941: \$? = $ac_status" >&5
+  echo "$as_me:29002: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28944: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29005: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28947: \$? = $ac_status" >&5
+  echo "$as_me:29008: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -28959,7 +29020,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:28962: result: $cf_cv_have_utmp" >&5
+echo "$as_me:29023: result: $cf_cv_have_utmp" >&5
 echo "${ECHO_T}$cf_cv_have_utmp" >&6
 
 if test $cf_cv_have_utmp != no ; then
@@ -28972,14 +29033,14 @@ EOF
 EOF
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:28975: checking if ${cf_cv_have_utmp}.ut_host is declared" >&5
+echo "$as_me:29036: checking if ${cf_cv_have_utmp}.ut_host is declared" >&5
 echo $ECHO_N "checking if ${cf_cv_have_utmp}.ut_host is declared... $ECHO_C" >&6
 if test "${cf_cv_have_utmp_ut_host+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 28982 "configure"
+#line 29043 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -28993,16 +29054,16 @@ struct $cf_cv_have_utmp x; char *y = &x.ut_host[0]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28996: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29057: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28999: \$? = $ac_status" >&5
+  echo "$as_me:29060: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29002: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29063: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29005: \$? = $ac_status" >&5
+  echo "$as_me:29066: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_host=yes
 else
@@ -29014,7 +29075,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:29017: result: $cf_cv_have_utmp_ut_host" >&5
+echo "$as_me:29078: result: $cf_cv_have_utmp_ut_host" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_host" >&6
 test $cf_cv_have_utmp_ut_host != no && cat >>confdefs.h <<\EOF
 #define HAVE_UTMP_UT_HOST 1
@@ -29023,14 +29084,14 @@ EOF
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:29026: checking if ${cf_cv_have_utmp}.ut_syslen is declared" >&5
+echo "$as_me:29087: checking if ${cf_cv_have_utmp}.ut_syslen is declared" >&5
 echo $ECHO_N "checking if ${cf_cv_have_utmp}.ut_syslen is declared... $ECHO_C" >&6
 if test "${cf_cv_have_utmp_ut_syslen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 29033 "configure"
+#line 29094 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -29044,16 +29105,16 @@ struct $cf_cv_have_utmp x; int y = x.ut_syslen
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29047: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29108: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29050: \$? = $ac_status" >&5
+  echo "$as_me:29111: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29053: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29114: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29056: \$? = $ac_status" >&5
+  echo "$as_me:29117: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_syslen=yes
 else
@@ -29065,7 +29126,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:29068: result: $cf_cv_have_utmp_ut_syslen" >&5
+echo "$as_me:29129: result: $cf_cv_have_utmp_ut_syslen" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_syslen" >&6
 test $cf_cv_have_utmp_ut_syslen != no && cat >>confdefs.h <<\EOF
 #define HAVE_UTMP_UT_SYSLEN 1
@@ -29074,7 +29135,7 @@ EOF
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:29077: checking if ${cf_cv_have_utmp}.ut_name is declared" >&5
+echo "$as_me:29138: checking if ${cf_cv_have_utmp}.ut_name is declared" >&5
 echo $ECHO_N "checking if ${cf_cv_have_utmp}.ut_name is declared... $ECHO_C" >&6
 if test "${cf_cv_have_utmp_ut_name+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29091,7 +29152,7 @@ cf_utmp_includes="
 "
 for cf_header in ut_name ut_user ; do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 29094 "configure"
+#line 29155 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -29105,16 +29166,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29108: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29169: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29111: \$? = $ac_status" >&5
+  echo "$as_me:29172: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29114: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29175: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29117: \$? = $ac_status" >&5
+  echo "$as_me:29178: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_name=$cf_header
 	 break
@@ -29126,12 +29187,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:29129: result: $cf_cv_have_utmp_ut_name" >&5
+echo "$as_me:29190: result: $cf_cv_have_utmp_ut_name" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_name" >&6
 
 case $cf_cv_have_utmp_ut_name in #(vi
 no) #(vi
-	{ { echo "$as_me:29134: error: Cannot find declaration for ut.ut_name" >&5
+	{ { echo "$as_me:29195: error: Cannot find declaration for ut.ut_name" >&5
 echo "$as_me: error: Cannot find declaration for ut.ut_name" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -29145,7 +29206,7 @@ esac
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:29148: checking for exit-status in $cf_cv_have_utmp" >&5
+echo "$as_me:29209: checking for exit-status in $cf_cv_have_utmp" >&5
 echo $ECHO_N "checking for exit-status in $cf_cv_have_utmp... $ECHO_C" >&6
 if test "${cf_cv_have_utmp_ut_xstatus+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29158,7 +29219,7 @@ for cf_result in \
 	ut_exit.ut_exit
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 29161 "configure"
+#line 29222 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -29172,16 +29233,16 @@ struct $cf_cv_have_utmp x; long y = x.$cf_result = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29175: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29236: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29178: \$? = $ac_status" >&5
+  echo "$as_me:29239: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29181: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29242: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29184: \$? = $ac_status" >&5
+  echo "$as_me:29245: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_xstatus=$cf_result
 	 break
@@ -29194,7 +29255,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:29197: result: $cf_cv_have_utmp_ut_xstatus" >&5
+echo "$as_me:29258: result: $cf_cv_have_utmp_ut_xstatus" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_xstatus" >&6
 if test $cf_cv_have_utmp_ut_xstatus != no ; then
 	cat >>confdefs.h <<\EOF
@@ -29209,14 +29270,14 @@ fi
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:29212: checking if ${cf_cv_have_utmp}.ut_xtime is declared" >&5
+echo "$as_me:29273: checking if ${cf_cv_have_utmp}.ut_xtime is declared" >&5
 echo $ECHO_N "checking if ${cf_cv_have_utmp}.ut_xtime is declared... $ECHO_C" >&6
 if test "${cf_cv_have_utmp_ut_xtime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 29219 "configure"
+#line 29280 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -29230,23 +29291,23 @@ struct $cf_cv_have_utmp x; long y = x.ut_xtime = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29233: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29294: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29236: \$? = $ac_status" >&5
+  echo "$as_me:29297: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29239: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29300: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29242: \$? = $ac_status" >&5
+  echo "$as_me:29303: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_xtime=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 29249 "configure"
+#line 29310 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -29260,16 +29321,16 @@ struct $cf_cv_have_utmp x; long y = x.ut_tv.tv_sec
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29263: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29324: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29266: \$? = $ac_status" >&5
+  echo "$as_me:29327: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29269: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29330: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29272: \$? = $ac_status" >&5
+  echo "$as_me:29333: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_xtime=define
 else
@@ -29283,7 +29344,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:29286: result: $cf_cv_have_utmp_ut_xtime" >&5
+echo "$as_me:29347: result: $cf_cv_have_utmp_ut_xtime" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_xtime" >&6
 if test $cf_cv_have_utmp_ut_xtime != no ; then
 	cat >>confdefs.h <<\EOF
@@ -29300,14 +29361,14 @@ fi
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:29303: checking if ${cf_cv_have_utmp}.ut_session is declared" >&5
+echo "$as_me:29364: checking if ${cf_cv_have_utmp}.ut_session is declared" >&5
 echo $ECHO_N "checking if ${cf_cv_have_utmp}.ut_session is declared... $ECHO_C" >&6
 if test "${cf_cv_have_utmp_ut_session+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 29310 "configure"
+#line 29371 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -29321,16 +29382,16 @@ struct $cf_cv_have_utmp x; long y = x.ut_session
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29324: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29385: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29327: \$? = $ac_status" >&5
+  echo "$as_me:29388: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29330: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29391: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29333: \$? = $ac_status" >&5
+  echo "$as_me:29394: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_session=yes
 else
@@ -29341,7 +29402,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:29344: result: $cf_cv_have_utmp_ut_session" >&5
+echo "$as_me:29405: result: $cf_cv_have_utmp_ut_session" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_session" >&6
 if test $cf_cv_have_utmp_ut_session != no ; then
 	cat >>confdefs.h <<\EOF
@@ -29351,7 +29412,7 @@ EOF
 fi
 fi
 
-echo "$as_me:29354: checking if $cf_cv_have_utmp is SYSV flavor" >&5
+echo "$as_me:29415: checking if $cf_cv_have_utmp is SYSV flavor" >&5
 echo $ECHO_N "checking if $cf_cv_have_utmp is SYSV flavor... $ECHO_C" >&6
 if test "${cf_cv_sysv_utmp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29359,7 +29420,7 @@ else
 
 test "$cf_cv_have_utmp" = "utmp" && cf_prefix="ut" || cf_prefix="utx"
 cat >conftest.$ac_ext <<_ACEOF
-#line 29362 "configure"
+#line 29423 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -29378,16 +29439,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29381: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29442: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29384: \$? = $ac_status" >&5
+  echo "$as_me:29445: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29387: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29448: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29390: \$? = $ac_status" >&5
+  echo "$as_me:29451: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_sysv_utmp=yes
 else
@@ -29398,7 +29459,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:29401: result: $cf_cv_sysv_utmp" >&5
+echo "$as_me:29462: result: $cf_cv_sysv_utmp" >&5
 echo "${ECHO_T}$cf_cv_sysv_utmp" >&6
 test $cf_cv_sysv_utmp = yes && cat >>confdefs.h <<\EOF
 #define USE_SYSV_UTMP 1
@@ -29406,14 +29467,14 @@ EOF
 
 fi
 
-echo "$as_me:29409: checking if external h_errno exists" >&5
+echo "$as_me:29470: checking if external h_errno exists" >&5
 echo $ECHO_N "checking if external h_errno exists... $ECHO_C" >&6
 if test "${cf_cv_have_h_errno+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 29416 "configure"
+#line 29477 "configure"
 #include "confdefs.h"
 
 #undef h_errno
@@ -29428,16 +29489,16 @@ h_errno = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29431: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29492: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29434: \$? = $ac_status" >&5
+  echo "$as_me:29495: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29437: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29498: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29440: \$? = $ac_status" >&5
+  echo "$as_me:29501: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_h_errno=yes
 else
@@ -29448,7 +29509,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:29451: result: $cf_cv_have_h_errno" >&5
+echo "$as_me:29512: result: $cf_cv_have_h_errno" >&5
 echo "${ECHO_T}$cf_cv_have_h_errno" >&6
 
 if test "$cf_cv_have_h_errno" = yes ; then
@@ -29461,7 +29522,7 @@ EOF
 
 fi
 
-echo "$as_me:29464: checking if bibp: URLs should be supported" >&5
+echo "$as_me:29525: checking if bibp: URLs should be supported" >&5
 echo $ECHO_N "checking if bibp: URLs should be supported... $ECHO_C" >&6
 
 # Check whether --enable-bibp-urls or --disable-bibp-urls was given.
@@ -29478,13 +29539,13 @@ else
   use_bibp_urls=yes
 
 fi;
-echo "$as_me:29481: result: $use_bibp_urls" >&5
+echo "$as_me:29542: result: $use_bibp_urls" >&5
 echo "${ECHO_T}$use_bibp_urls" >&6
 test $use_bibp_urls = no && cat >>confdefs.h <<\EOF
 #define DISABLE_BIBP 1
 EOF
 
-echo "$as_me:29487: checking if configuration info should be browsable" >&5
+echo "$as_me:29548: checking if configuration info should be browsable" >&5
 echo $ECHO_N "checking if configuration info should be browsable... $ECHO_C" >&6
 
 # Check whether --enable-config-info or --disable-config-info was given.
@@ -29501,13 +29562,13 @@ else
   use_config_info=yes
 
 fi;
-echo "$as_me:29504: result: $use_config_info" >&5
+echo "$as_me:29565: result: $use_config_info" >&5
 echo "${ECHO_T}$use_config_info" >&6
 test $use_config_info = no && cat >>confdefs.h <<\EOF
 #define NO_CONFIG_INFO 1
 EOF
 
-echo "$as_me:29510: checking if new-style forms-based options screen should be used" >&5
+echo "$as_me:29571: checking if new-style forms-based options screen should be used" >&5
 echo $ECHO_N "checking if new-style forms-based options screen should be used... $ECHO_C" >&6
 
 # Check whether --enable-forms-options or --disable-forms-options was given.
@@ -29524,13 +29585,13 @@ else
   use_forms_options=yes
 
 fi;
-echo "$as_me:29527: result: $use_forms_options" >&5
+echo "$as_me:29588: result: $use_forms_options" >&5
 echo "${ECHO_T}$use_forms_options" >&6
 test $use_forms_options = no && cat >>confdefs.h <<\EOF
 #define NO_OPTION_FORMS 1
 EOF
 
-echo "$as_me:29533: checking if old-style options menu should be used" >&5
+echo "$as_me:29594: checking if old-style options menu should be used" >&5
 echo $ECHO_N "checking if old-style options menu should be used... $ECHO_C" >&6
 
 # Check whether --enable-menu-options or --disable-menu-options was given.
@@ -29547,13 +29608,13 @@ else
   use_menu_options=yes
 
 fi;
-echo "$as_me:29550: result: $use_menu_options" >&5
+echo "$as_me:29611: result: $use_menu_options" >&5
 echo "${ECHO_T}$use_menu_options" >&6
 test $use_menu_options = no && cat >>confdefs.h <<\EOF
 #define NO_OPTION_MENU 1
 EOF
 
-echo "$as_me:29556: checking if sessions code should be used" >&5
+echo "$as_me:29617: checking if sessions code should be used" >&5
 echo $ECHO_N "checking if sessions code should be used... $ECHO_C" >&6
 
 # Check whether --enable-sessions or --disable-sessions was given.
@@ -29570,7 +29631,7 @@ else
   use_sessions=yes
 
 fi;
-echo "$as_me:29573: result: $use_sessions" >&5
+echo "$as_me:29634: result: $use_sessions" >&5
 echo "${ECHO_T}$use_sessions" >&6
 if test $use_sessions != no ; then
 	cat >>confdefs.h <<\EOF
@@ -29580,7 +29641,7 @@ EOF
 	EXTRA_OBJS="$EXTRA_OBJS LYSession\$o"
 fi
 
-echo "$as_me:29583: checking if session-caching code should be used" >&5
+echo "$as_me:29644: checking if session-caching code should be used" >&5
 echo $ECHO_N "checking if session-caching code should be used... $ECHO_C" >&6
 
 # Check whether --enable-session-cache or --disable-session-cache was given.
@@ -29597,7 +29658,7 @@ else
   use_session_cache=yes
 
 fi;
-echo "$as_me:29600: result: $use_session_cache" >&5
+echo "$as_me:29661: result: $use_session_cache" >&5
 echo "${ECHO_T}$use_session_cache" >&6
 if test $use_session_cache != no ; then
     cat >>confdefs.h <<\EOF
@@ -29606,7 +29667,7 @@ EOF
 
 fi
 
-echo "$as_me:29609: checking if experimental address-list page should be used" >&5
+echo "$as_me:29670: checking if experimental address-list page should be used" >&5
 echo $ECHO_N "checking if experimental address-list page should be used... $ECHO_C" >&6
 
 # Check whether --enable-addrlist-page or --disable-addrlist-page was given.
@@ -29623,13 +29684,13 @@ else
   use_addrlist_page=no
 
 fi;
-echo "$as_me:29626: result: $use_addrlist_page" >&5
+echo "$as_me:29687: result: $use_addrlist_page" >&5
 echo "${ECHO_T}$use_addrlist_page" >&6
 test $use_addrlist_page != no && cat >>confdefs.h <<\EOF
 #define EXP_ADDRLIST_PAGE 1
 EOF
 
-echo "$as_me:29632: checking if experimental CJK logic should be used" >&5
+echo "$as_me:29693: checking if experimental CJK logic should be used" >&5
 echo $ECHO_N "checking if experimental CJK logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-cjk or --disable-cjk was given.
@@ -29646,13 +29707,13 @@ else
   use_cjk=no
 
 fi;
-echo "$as_me:29649: result: $use_cjk" >&5
+echo "$as_me:29710: result: $use_cjk" >&5
 echo "${ECHO_T}$use_cjk" >&6
 test $use_cjk != no && cat >>confdefs.h <<\EOF
 #define CJK_EX 1
 EOF
 
-echo "$as_me:29655: checking if experimental Japanese UTF-8 logic should be used" >&5
+echo "$as_me:29716: checking if experimental Japanese UTF-8 logic should be used" >&5
 echo $ECHO_N "checking if experimental Japanese UTF-8 logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-japanese-utf8 or --disable-japanese-utf8 was given.
@@ -29669,7 +29730,7 @@ else
   use_ja_utf8=no
 
 fi;
-echo "$as_me:29672: result: $use_ja_utf8" >&5
+echo "$as_me:29733: result: $use_ja_utf8" >&5
 echo "${ECHO_T}$use_ja_utf8" >&6
 if test $use_ja_utf8 != no ; then
 	cat >>confdefs.h <<\EOF
@@ -29714,7 +29775,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 29717 "configure"
+#line 29778 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -29726,16 +29787,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29729: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29790: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29732: \$? = $ac_status" >&5
+  echo "$as_me:29793: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29735: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29796: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29738: \$? = $ac_status" >&5
+  echo "$as_me:29799: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -29752,7 +29813,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:29755: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:29816: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -29793,7 +29854,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 29796 "configure"
+#line 29857 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -29805,16 +29866,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29808: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29869: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29811: \$? = $ac_status" >&5
+  echo "$as_me:29872: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29814: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29875: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29817: \$? = $ac_status" >&5
+  echo "$as_me:29878: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -29831,7 +29892,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:29834: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:29895: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -29847,7 +29908,7 @@ echo "${as_me-configure}:29834: testing adding $cf_add_incdir to include-path ..
 fi
 
 	else
-{ { echo "$as_me:29850: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:29911: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -29872,7 +29933,7 @@ if test -n "$cf_searchpath/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:29875: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:29936: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -29901,7 +29962,7 @@ if test -n "$cf_searchpath" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:29904: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:29965: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -29910,7 +29971,7 @@ echo "${as_me-configure}:29904: testing adding $cf_add_libdir to library-path ..
 fi
 
 	else
-{ { echo "$as_me:29913: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:29974: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -29921,7 +29982,7 @@ done
 
 fi;
 
-  echo "$as_me:29924: checking for iconv" >&5
+  echo "$as_me:29985: checking for iconv" >&5
 echo $ECHO_N "checking for iconv... $ECHO_C" >&6
 if test "${am_cv_func_iconv+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29932,12 +29993,12 @@ else
 cf_cv_header_path_iconv=
 cf_cv_library_path_iconv=
 
-echo "${as_me-configure}:29935: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:29996: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 29940 "configure"
+#line 30001 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -29956,16 +30017,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29959: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30020: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29962: \$? = $ac_status" >&5
+  echo "$as_me:30023: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29965: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30026: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29968: \$? = $ac_status" >&5
+  echo "$as_me:30029: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -29979,7 +30040,7 @@ cat conftest.$ac_ext >&5
 LIBS="-liconv  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 29982 "configure"
+#line 30043 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -29998,16 +30059,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30001: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30062: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30004: \$? = $ac_status" >&5
+  echo "$as_me:30065: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30007: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30068: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30010: \$? = $ac_status" >&5
+  echo "$as_me:30071: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -30024,9 +30085,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for iconv library" 1>&6
 
-echo "${as_me-configure}:30027: testing find linkage for iconv library ..." 1>&5
+echo "${as_me:-configure}:30088: testing find linkage for iconv library ..." 1>&5
 
-echo "${as_me-configure}:30029: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:30090: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -30139,11 +30200,11 @@ cf_search="$cf_search $cf_header_path_list"
       if test -d $cf_cv_header_path_iconv ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_iconv" 1>&6
 
-echo "${as_me-configure}:30142: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:30203: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_iconv"
         cat >conftest.$ac_ext <<_ACEOF
-#line 30146 "configure"
+#line 30207 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -30162,21 +30223,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30165: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30226: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30168: \$? = $ac_status" >&5
+  echo "$as_me:30229: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30171: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30232: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30174: \$? = $ac_status" >&5
+  echo "$as_me:30235: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found iconv headers in $cf_cv_header_path_iconv" 1>&6
 
-echo "${as_me-configure}:30179: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:30240: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
 
             cf_cv_find_linkage_iconv=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -30194,7 +30255,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_iconv" = maybe ; then
 
-echo "${as_me-configure}:30197: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:30258: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -30291,13 +30352,13 @@ cf_search="$cf_library_path_list $cf_search"
           if test -d $cf_cv_library_path_iconv ; then
             test -n "$verbose" && echo "	... testing $cf_cv_library_path_iconv" 1>&6
 
-echo "${as_me-configure}:30294: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:30355: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-liconv  $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_iconv"
             cat >conftest.$ac_ext <<_ACEOF
-#line 30300 "configure"
+#line 30361 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -30316,21 +30377,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30319: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30380: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30322: \$? = $ac_status" >&5
+  echo "$as_me:30383: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30325: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30386: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30328: \$? = $ac_status" >&5
+  echo "$as_me:30389: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
                 test -n "$verbose" && echo "	... found iconv library in $cf_cv_library_path_iconv" 1>&6
 
-echo "${as_me-configure}:30333: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:30394: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
 
                 cf_cv_find_linkage_iconv=yes
                 cf_cv_library_file_iconv="-liconv"
@@ -30370,7 +30431,7 @@ am_cv_func_iconv="no, consider installing GNU libiconv"
 fi
 
 fi
-echo "$as_me:30373: result: $am_cv_func_iconv" >&5
+echo "$as_me:30434: result: $am_cv_func_iconv" >&5
 echo "${ECHO_T}$am_cv_func_iconv" >&6
 
   if test "$am_cv_func_iconv" = yes; then
@@ -30379,14 +30440,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_ICONV 1
 EOF
 
-    echo "$as_me:30382: checking if the declaration of iconv() needs const." >&5
+    echo "$as_me:30443: checking if the declaration of iconv() needs const." >&5
 echo $ECHO_N "checking if the declaration of iconv() needs const.... $ECHO_C" >&6
 if test "${am_cv_proto_iconv_const+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
       cat >conftest.$ac_ext <<_ACEOF
-#line 30389 "configure"
+#line 30450 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -30411,16 +30472,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30414: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30475: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30417: \$? = $ac_status" >&5
+  echo "$as_me:30478: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30420: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30481: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30423: \$? = $ac_status" >&5
+  echo "$as_me:30484: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_proto_iconv_const=no
 else
@@ -30430,7 +30491,7 @@ am_cv_proto_iconv_const=yes
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:30433: result: $am_cv_proto_iconv_const" >&5
+echo "$as_me:30494: result: $am_cv_proto_iconv_const" >&5
 echo "${ECHO_T}$am_cv_proto_iconv_const" >&6
 
     if test "$am_cv_proto_iconv_const" = yes ; then
@@ -30472,7 +30533,7 @@ if test -n "$cf_cv_header_path_iconv" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 30475 "configure"
+#line 30536 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -30484,16 +30545,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30487: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30548: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30490: \$? = $ac_status" >&5
+  echo "$as_me:30551: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30493: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30554: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30496: \$? = $ac_status" >&5
+  echo "$as_me:30557: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -30510,7 +30571,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:30513: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:30574: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -30547,7 +30608,7 @@ if test -n "$cf_cv_library_path_iconv" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:30550: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:30611: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -30571,7 +30632,7 @@ curses|slang|ncurses*)
 esac
 
 if test "$use_dft_colors" != no ; then
-echo "$as_me:30574: checking if you want to use default-colors" >&5
+echo "$as_me:30635: checking if you want to use default-colors" >&5
 echo $ECHO_N "checking if you want to use default-colors... $ECHO_C" >&6
 
 # Check whether --enable-default-colors or --disable-default-colors was given.
@@ -30588,7 +30649,7 @@ else
   use_dft_colors=no
 
 fi;
-echo "$as_me:30591: result: $use_dft_colors" >&5
+echo "$as_me:30652: result: $use_dft_colors" >&5
 echo "${ECHO_T}$use_dft_colors" >&6
 test $use_dft_colors = "yes" && cat >>confdefs.h <<\EOF
 #define USE_DEFAULT_COLORS 1
@@ -30596,7 +30657,7 @@ EOF
 
 fi
 
-echo "$as_me:30599: checking if experimental keyboard-layout logic should be used" >&5
+echo "$as_me:30660: checking if experimental keyboard-layout logic should be used" >&5
 echo $ECHO_N "checking if experimental keyboard-layout logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-kbd-layout or --disable-kbd-layout was given.
@@ -30613,13 +30674,13 @@ else
   use_kbd_layout=no
 
 fi;
-echo "$as_me:30616: result: $use_kbd_layout" >&5
+echo "$as_me:30677: result: $use_kbd_layout" >&5
 echo "${ECHO_T}$use_kbd_layout" >&6
 test $use_kbd_layout != no && cat >>confdefs.h <<\EOF
 #define EXP_KEYBOARD_LAYOUT 1
 EOF
 
-echo "$as_me:30622: checking if experimental nested-table logic should be used" >&5
+echo "$as_me:30683: checking if experimental nested-table logic should be used" >&5
 echo $ECHO_N "checking if experimental nested-table logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-nested-tables or --disable-nested-tables was given.
@@ -30636,13 +30697,13 @@ else
   use_nested_tables=no
 
 fi;
-echo "$as_me:30639: result: $use_nested_tables" >&5
+echo "$as_me:30700: result: $use_nested_tables" >&5
 echo "${ECHO_T}$use_nested_tables" >&6
 test $use_nested_tables != no && cat >>confdefs.h <<\EOF
 #define EXP_NESTED_TABLES 1
 EOF
 
-echo "$as_me:30645: checking if alternative line-edit bindings should be used" >&5
+echo "$as_me:30706: checking if alternative line-edit bindings should be used" >&5
 echo $ECHO_N "checking if alternative line-edit bindings should be used... $ECHO_C" >&6
 
 # Check whether --enable-alt-bindings or --disable-alt-bindings was given.
@@ -30659,13 +30720,13 @@ else
   use_alt_bindings=yes
 
 fi;
-echo "$as_me:30662: result: $use_alt_bindings" >&5
+echo "$as_me:30723: result: $use_alt_bindings" >&5
 echo "${ECHO_T}$use_alt_bindings" >&6
 test $use_alt_bindings != no && cat >>confdefs.h <<\EOF
 #define EXP_ALT_BINDINGS 1
 EOF
 
-echo "$as_me:30668: checking if ascii case-conversion should be used" >&5
+echo "$as_me:30729: checking if ascii case-conversion should be used" >&5
 echo $ECHO_N "checking if ascii case-conversion should be used... $ECHO_C" >&6
 
 # Check whether --enable-ascii-ctypes or --disable-ascii-ctypes was given.
@@ -30682,13 +30743,13 @@ else
   use_ascii_ctypes=yes
 
 fi;
-echo "$as_me:30685: result: $use_ascii_ctypes" >&5
+echo "$as_me:30746: result: $use_ascii_ctypes" >&5
 echo "${ECHO_T}$use_ascii_ctypes" >&6
 test $use_ascii_ctypes != no && cat >>confdefs.h <<\EOF
 #define USE_ASCII_CTYPES 1
 EOF
 
-echo "$as_me:30691: checking if you want to use extended HTML DTD logic" >&5
+echo "$as_me:30752: checking if you want to use extended HTML DTD logic" >&5
 echo $ECHO_N "checking if you want to use extended HTML DTD logic... $ECHO_C" >&6
 
 # Check whether --enable-extended-dtd or --disable-extended-dtd was given.
@@ -30705,13 +30766,13 @@ else
   use_ext_htmldtd=yes
 
 fi;
-echo "$as_me:30708: result: $use_ext_htmldtd" >&5
+echo "$as_me:30769: result: $use_ext_htmldtd" >&5
 echo "${ECHO_T}$use_ext_htmldtd" >&6
 test $use_ext_htmldtd = "no" && cat >>confdefs.h <<\EOF
 #define NO_EXTENDED_HTMLDTD 1
 EOF
 
-echo "$as_me:30714: checking if file-upload logic should be used" >&5
+echo "$as_me:30775: checking if file-upload logic should be used" >&5
 echo $ECHO_N "checking if file-upload logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-file-upload or --disable-file-upload was given.
@@ -30728,13 +30789,13 @@ else
   use_file_upload=yes
 
 fi;
-echo "$as_me:30731: result: $use_file_upload" >&5
+echo "$as_me:30792: result: $use_file_upload" >&5
 echo "${ECHO_T}$use_file_upload" >&6
 test $use_file_upload != no && cat >>confdefs.h <<\EOF
 #define USE_FILE_UPLOAD 1
 EOF
 
-echo "$as_me:30737: checking if IDNA support should be used" >&5
+echo "$as_me:30798: checking if IDNA support should be used" >&5
 echo $ECHO_N "checking if IDNA support should be used... $ECHO_C" >&6
 
 # Check whether --enable-idna or --disable-idna was given.
@@ -30751,7 +30812,7 @@ else
   use_idna=yes
 
 fi;
-echo "$as_me:30754: result: $use_idna" >&5
+echo "$as_me:30815: result: $use_idna" >&5
 echo "${ECHO_T}$use_idna" >&6
 
 if test "$use_idna" = yes ; then
@@ -30790,7 +30851,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 30793 "configure"
+#line 30854 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -30802,16 +30863,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30805: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30866: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30808: \$? = $ac_status" >&5
+  echo "$as_me:30869: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30811: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30872: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30814: \$? = $ac_status" >&5
+  echo "$as_me:30875: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -30828,7 +30889,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:30831: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:30892: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -30869,7 +30930,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 30872 "configure"
+#line 30933 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -30881,16 +30942,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30884: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30945: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30887: \$? = $ac_status" >&5
+  echo "$as_me:30948: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30890: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30951: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30893: \$? = $ac_status" >&5
+  echo "$as_me:30954: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -30907,7 +30968,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:30910: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:30971: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -30923,7 +30984,7 @@ echo "${as_me-configure}:30910: testing adding $cf_add_incdir to include-path ..
 fi
 
 	else
-{ { echo "$as_me:30926: error: cannot find  under $use_idna" >&5
+{ { echo "$as_me:30987: error: cannot find  under $use_idna" >&5
 echo "$as_me: error: cannot find  under $use_idna" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -30948,7 +31009,7 @@ if test -n "$cf_searchpath/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:30951: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:31012: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -30977,7 +31038,7 @@ if test -n "$cf_searchpath" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:30980: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:31041: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -30986,7 +31047,7 @@ echo "${as_me-configure}:30980: testing adding $cf_add_libdir to library-path ..
 fi
 
 	else
-{ { echo "$as_me:30989: error: cannot find  under $use_idna" >&5
+{ { echo "$as_me:31050: error: cannot find  under $use_idna" >&5
 echo "$as_me: error: cannot find  under $use_idna" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -31000,12 +31061,12 @@ done
 cf_cv_header_path_idn=
 cf_cv_library_path_idn=
 
-echo "${as_me-configure}:31003: testing Starting FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:31064: testing Starting FIND_LINKAGE(idn,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 31008 "configure"
+#line 31069 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -31023,16 +31084,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31026: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31087: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31029: \$? = $ac_status" >&5
+  echo "$as_me:31090: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31032: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31093: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31035: \$? = $ac_status" >&5
+  echo "$as_me:31096: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_idn=yes
@@ -31043,10 +31104,10 @@ else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-LIBS="-lidn  $cf_save_LIBS"
+LIBS="-lidn $LIBICONV $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 31049 "configure"
+#line 31110 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -31064,16 +31125,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31067: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31128: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31070: \$? = $ac_status" >&5
+  echo "$as_me:31131: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31073: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31134: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31076: \$? = $ac_status" >&5
+  echo "$as_me:31137: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_idn=yes
@@ -31090,9 +31151,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for idn library" 1>&6
 
-echo "${as_me-configure}:31093: testing find linkage for idn library ..." 1>&5
+echo "${as_me:-configure}:31154: testing find linkage for idn library ..." 1>&5
 
-echo "${as_me-configure}:31095: testing Searching for headers in FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:31156: testing Searching for headers in FIND_LINKAGE(idn,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -31205,11 +31266,11 @@ cf_search="$cf_search $cf_header_path_list"
       if test -d $cf_cv_header_path_idn ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_idn" 1>&6
 
-echo "${as_me-configure}:31208: testing ... testing $cf_cv_header_path_idn ..." 1>&5
+echo "${as_me:-configure}:31269: testing ... testing $cf_cv_header_path_idn ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_idn"
         cat >conftest.$ac_ext <<_ACEOF
-#line 31212 "configure"
+#line 31273 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -31227,21 +31288,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31230: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31291: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31233: \$? = $ac_status" >&5
+  echo "$as_me:31294: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31236: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31297: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31239: \$? = $ac_status" >&5
+  echo "$as_me:31300: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found idn headers in $cf_cv_header_path_idn" 1>&6
 
-echo "${as_me-configure}:31244: testing ... found idn headers in $cf_cv_header_path_idn ..." 1>&5
+echo "${as_me:-configure}:31305: testing ... found idn headers in $cf_cv_header_path_idn ..." 1>&5
 
             cf_cv_find_linkage_idn=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -31259,7 +31320,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_idn" = maybe ; then
 
-echo "${as_me-configure}:31262: testing Searching for idn library in FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:31323: testing Searching for idn library in FIND_LINKAGE(idn,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -31356,13 +31417,13 @@ cf_search="$cf_library_path_list $cf_search"
           if test -d $cf_cv_library_path_idn ; then
             test -n "$verbose" && echo "	... testing $cf_cv_library_path_idn" 1>&6
 
-echo "${as_me-configure}:31359: testing ... testing $cf_cv_library_path_idn ..." 1>&5
+echo "${as_me:-configure}:31420: testing ... testing $cf_cv_library_path_idn ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
-            LIBS="-lidn  $cf_save_LIBS"
+            LIBS="-lidn $LIBICONV $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_idn"
             cat >conftest.$ac_ext <<_ACEOF
-#line 31365 "configure"
+#line 31426 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -31380,21 +31441,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31383: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31444: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31386: \$? = $ac_status" >&5
+  echo "$as_me:31447: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31389: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31450: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31392: \$? = $ac_status" >&5
+  echo "$as_me:31453: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
                 test -n "$verbose" && echo "	... found idn library in $cf_cv_library_path_idn" 1>&6
 
-echo "${as_me-configure}:31397: testing ... found idn library in $cf_cv_library_path_idn ..." 1>&5
+echo "${as_me:-configure}:31458: testing ... found idn library in $cf_cv_library_path_idn ..." 1>&5
 
                 cf_cv_find_linkage_idn=yes
                 cf_cv_library_file_idn="-lidn"
@@ -31453,7 +31514,7 @@ if test -n "$cf_cv_header_path_idn" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 31456 "configure"
+#line 31517 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -31465,16 +31526,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31468: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31529: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31471: \$? = $ac_status" >&5
+  echo "$as_me:31532: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31474: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31535: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31477: \$? = $ac_status" >&5
+  echo "$as_me:31538: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -31491,7 +31552,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:31494: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:31555: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -31525,7 +31586,7 @@ if test -n "$cf_cv_library_path_idn" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:31528: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:31589: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -31536,7 +31597,7 @@ fi
 	LIBS="-lidn $LIBS"
 
 else
-{ echo "$as_me:31539: WARNING: Cannot find idn library" >&5
+{ echo "$as_me:31600: WARNING: Cannot find idn library" >&5
 echo "$as_me: WARNING: Cannot find idn library" >&2;}
 fi
 
@@ -31549,7 +31610,7 @@ fi
 
 fi
 
-echo "$as_me:31552: checking if element-justification logic should be used" >&5
+echo "$as_me:31613: checking if element-justification logic should be used" >&5
 echo $ECHO_N "checking if element-justification logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-justify-elts or --disable-justify-elts was given.
@@ -31566,13 +31627,13 @@ else
   use_justify_elts=yes
 
 fi;
-echo "$as_me:31569: result: $use_justify_elts" >&5
+echo "$as_me:31630: result: $use_justify_elts" >&5
 echo "${ECHO_T}$use_justify_elts" >&6
 test $use_justify_elts != no && cat >>confdefs.h <<\EOF
 #define USE_JUSTIFY_ELTS 1
 EOF
 
-echo "$as_me:31575: checking if partial-display should be used" >&5
+echo "$as_me:31636: checking if partial-display should be used" >&5
 echo $ECHO_N "checking if partial-display should be used... $ECHO_C" >&6
 
 # Check whether --enable-partial or --disable-partial was given.
@@ -31589,13 +31650,13 @@ else
   use_partial_display=yes
 
 fi;
-echo "$as_me:31592: result: $use_partial_display" >&5
+echo "$as_me:31653: result: $use_partial_display" >&5
 echo "${ECHO_T}$use_partial_display" >&6
 test $use_partial_display != no && cat >>confdefs.h <<\EOF
 #define DISP_PARTIAL 1
 EOF
 
-echo "$as_me:31598: checking if persistent-cookie logic should be used" >&5
+echo "$as_me:31659: checking if persistent-cookie logic should be used" >&5
 echo $ECHO_N "checking if persistent-cookie logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-persistent-cookies or --disable-persistent-cookies was given.
@@ -31612,13 +31673,13 @@ else
   use_filed_cookies=yes
 
 fi;
-echo "$as_me:31615: result: $use_filed_cookies" >&5
+echo "$as_me:31676: result: $use_filed_cookies" >&5
 echo "${ECHO_T}$use_filed_cookies" >&6
 test $use_filed_cookies != no && cat >>confdefs.h <<\EOF
 #define USE_PERSISTENT_COOKIES 1
 EOF
 
-echo "$as_me:31621: checking if html source should be colorized" >&5
+echo "$as_me:31682: checking if html source should be colorized" >&5
 echo $ECHO_N "checking if html source should be colorized... $ECHO_C" >&6
 
 # Check whether --enable-prettysrc or --disable-prettysrc was given.
@@ -31635,13 +31696,13 @@ else
   use_prettysrc=yes
 
 fi;
-echo "$as_me:31638: result: $use_prettysrc" >&5
+echo "$as_me:31699: result: $use_prettysrc" >&5
 echo "${ECHO_T}$use_prettysrc" >&6
 test $use_prettysrc != no && cat >>confdefs.h <<\EOF
 #define USE_PRETTYSRC 1
 EOF
 
-echo "$as_me:31644: checking if progress-bar code should be used" >&5
+echo "$as_me:31705: checking if progress-bar code should be used" >&5
 echo $ECHO_N "checking if progress-bar code should be used... $ECHO_C" >&6
 
 # Check whether --enable-progressbar or --disable-progressbar was given.
@@ -31658,13 +31719,13 @@ else
   use_progressbar=yes
 
 fi;
-echo "$as_me:31661: result: $use_progressbar" >&5
+echo "$as_me:31722: result: $use_progressbar" >&5
 echo "${ECHO_T}$use_progressbar" >&6
 test $use_progressbar != no && cat >>confdefs.h <<\EOF
 #define USE_PROGRESSBAR 1
 EOF
 
-echo "$as_me:31667: checking if read-progress message should show ETA" >&5
+echo "$as_me:31728: checking if read-progress message should show ETA" >&5
 echo $ECHO_N "checking if read-progress message should show ETA... $ECHO_C" >&6
 
 # Check whether --enable-read-eta or --disable-read-eta was given.
@@ -31681,13 +31742,13 @@ else
   use_read_eta=yes
 
 fi;
-echo "$as_me:31684: result: $use_read_eta" >&5
+echo "$as_me:31745: result: $use_read_eta" >&5
 echo "${ECHO_T}$use_read_eta" >&6
 test $use_read_eta != no && cat >>confdefs.h <<\EOF
 #define USE_READPROGRESS 1
 EOF
 
-echo "$as_me:31690: checking if source caching should be used" >&5
+echo "$as_me:31751: checking if source caching should be used" >&5
 echo $ECHO_N "checking if source caching should be used... $ECHO_C" >&6
 
 # Check whether --enable-source-cache or --disable-source-cache was given.
@@ -31704,13 +31765,13 @@ else
   use_source_cache=yes
 
 fi;
-echo "$as_me:31707: result: $use_source_cache" >&5
+echo "$as_me:31768: result: $use_source_cache" >&5
 echo "${ECHO_T}$use_source_cache" >&6
 test $use_source_cache != no && cat >>confdefs.h <<\EOF
 #define USE_SOURCE_CACHE 1
 EOF
 
-echo "$as_me:31713: checking if scrollbar code should be used" >&5
+echo "$as_me:31774: checking if scrollbar code should be used" >&5
 echo $ECHO_N "checking if scrollbar code should be used... $ECHO_C" >&6
 
 # Check whether --enable-scrollbar or --disable-scrollbar was given.
@@ -31727,10 +31788,10 @@ else
   use_scrollbar=yes
 
 fi;
-echo "$as_me:31730: result: $use_scrollbar" >&5
+echo "$as_me:31791: result: $use_scrollbar" >&5
 echo "${ECHO_T}$use_scrollbar" >&6
 
-echo "$as_me:31733: checking if charset-selection logic should be used" >&5
+echo "$as_me:31794: checking if charset-selection logic should be used" >&5
 echo $ECHO_N "checking if charset-selection logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-charset-choice or --disable-charset-choice was given.
@@ -31747,13 +31808,13 @@ else
   use_charset_choice=no
 
 fi;
-echo "$as_me:31750: result: $use_charset_choice" >&5
+echo "$as_me:31811: result: $use_charset_choice" >&5
 echo "${ECHO_T}$use_charset_choice" >&6
 test $use_charset_choice != no && cat >>confdefs.h <<\EOF
 #define USE_CHARSET_CHOICE 1
 EOF
 
-echo "$as_me:31756: checking if you want to use external commands" >&5
+echo "$as_me:31817: checking if you want to use external commands" >&5
 echo $ECHO_N "checking if you want to use external commands... $ECHO_C" >&6
 
 # Check whether --enable-externs or --disable-externs was given.
@@ -31770,7 +31831,7 @@ else
   use_externs=no
 
 fi;
-echo "$as_me:31773: result: $use_externs" >&5
+echo "$as_me:31834: result: $use_externs" >&5
 echo "${ECHO_T}$use_externs" >&6
 if test $use_externs != "no" ; then
 	cat >>confdefs.h <<\EOF
@@ -31780,7 +31841,7 @@ EOF
 	EXTRA_OBJS="$EXTRA_OBJS LYExtern\$o"
 fi
 
-echo "$as_me:31783: checking if you want to use setfont support" >&5
+echo "$as_me:31844: checking if you want to use setfont support" >&5
 echo $ECHO_N "checking if you want to use setfont support... $ECHO_C" >&6
 
 # Check whether --enable-font-switch or --disable-font-switch was given.
@@ -31797,7 +31858,7 @@ else
   use_setfont=no
 
 fi;
-echo "$as_me:31800: result: $use_setfont" >&5
+echo "$as_me:31861: result: $use_setfont" >&5
 echo "${ECHO_T}$use_setfont" >&6
 if test $use_setfont = yes ; then
 	case $host_os in
@@ -31808,7 +31869,7 @@ for ac_prog in $SETFONT consolechars setfont
 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:31811: checking for $ac_word" >&5
+echo "$as_me:31872: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_SETFONT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -31825,7 +31886,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_SETFONT="$ac_dir/$ac_word"
-   echo "$as_me:31828: found $ac_dir/$ac_word" >&5
+   echo "$as_me:31889: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -31836,10 +31897,10 @@ fi
 SETFONT=$ac_cv_path_SETFONT
 
 if test -n "$SETFONT"; then
-  echo "$as_me:31839: result: $SETFONT" >&5
+  echo "$as_me:31900: result: $SETFONT" >&5
 echo "${ECHO_T}$SETFONT" >&6
 else
-  echo "$as_me:31842: result: no" >&5
+  echo "$as_me:31903: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -31849,7 +31910,7 @@ test -n "$SETFONT" || SETFONT="$SETFONT"
 
 cf_path_prog=""
 cf_path_args=""
-IFS="${IFS= 	}"; cf_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR"
+IFS="${IFS:- 	}"; cf_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR"
 for cf_temp in $ac_cv_path_SETFONT
 do
 	if test -z "$cf_path_prog" ; then
@@ -31898,7 +31959,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:31901: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:31962: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define SETFONT_PATH "$cf_path_prog"
@@ -31915,19 +31976,19 @@ fi
 		SETFONT=built-in
 		test -n "$verbose" && echo "	Assume $host_os has font-switching" 1>&6
 
-echo "${as_me-configure}:31918: testing Assume $host_os has font-switching ..." 1>&5
+echo "${as_me:-configure}:31979: testing Assume $host_os has font-switching ..." 1>&5
 
 		;;
 	*)
 		SETFONT=unknown
 		test -n "$verbose" && echo "	Assume $host_os has no font-switching" 1>&6
 
-echo "${as_me-configure}:31925: testing Assume $host_os has no font-switching ..." 1>&5
+echo "${as_me:-configure}:31986: testing Assume $host_os has no font-switching ..." 1>&5
 
 		;;
 	esac
 	if test -z "$SETFONT" ; then
-		{ echo "$as_me:31930: WARNING: Cannot find a font-setting program" >&5
+		{ echo "$as_me:31991: WARNING: Cannot find a font-setting program" >&5
 echo "$as_me: WARNING: Cannot find a font-setting program" >&2;}
 	elif test "$SETFONT" != unknown ; then
 		cat >>confdefs.h <<\EOF
@@ -31937,7 +31998,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:31940: checking if you want cgi-link support" >&5
+echo "$as_me:32001: checking if you want cgi-link support" >&5
 echo $ECHO_N "checking if you want cgi-link support... $ECHO_C" >&6
 
 # Check whether --enable-cgi-links or --disable-cgi-links was given.
@@ -31953,10 +32014,10 @@ EOF
 else
   enableval=no
 fi;
-echo "$as_me:31956: result: $enableval" >&5
+echo "$as_me:32017: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:31959: checking if you want change-exec support" >&5
+echo "$as_me:32020: checking if you want change-exec support" >&5
 echo $ECHO_N "checking if you want change-exec support... $ECHO_C" >&6
 
 # Check whether --enable-change-exec or --disable-change-exec was given.
@@ -31973,13 +32034,13 @@ else
   use_change_exec=no
 
 fi;
-echo "$as_me:31976: result: $use_change_exec" >&5
+echo "$as_me:32037: result: $use_change_exec" >&5
 echo "${ECHO_T}$use_change_exec" >&6
 test $use_change_exec = yes && cat >>confdefs.h <<\EOF
 #define ENABLE_OPTS_CHANGE_EXEC 1
 EOF
 
-echo "$as_me:31982: checking if you want exec-links support" >&5
+echo "$as_me:32043: checking if you want exec-links support" >&5
 echo $ECHO_N "checking if you want exec-links support... $ECHO_C" >&6
 
 # Check whether --enable-exec-links or --disable-exec-links was given.
@@ -31996,13 +32057,13 @@ else
   use_exec_links=$enableval
 
 fi;
-echo "$as_me:31999: result: $use_exec_links" >&5
+echo "$as_me:32060: result: $use_exec_links" >&5
 echo "${ECHO_T}$use_exec_links" >&6
 test $use_exec_links = yes && cat >>confdefs.h <<\EOF
 #define EXEC_LINKS 1
 EOF
 
-echo "$as_me:32005: checking if you want exec-scripts support" >&5
+echo "$as_me:32066: checking if you want exec-scripts support" >&5
 echo $ECHO_N "checking if you want exec-scripts support... $ECHO_C" >&6
 
 # Check whether --enable-exec-scripts or --disable-exec-scripts was given.
@@ -32019,13 +32080,13 @@ else
   use_exec_scripts=$enableval
 
 fi;
-echo "$as_me:32022: result: $use_exec_scripts" >&5
+echo "$as_me:32083: result: $use_exec_scripts" >&5
 echo "${ECHO_T}$use_exec_scripts" >&6
 test $use_exec_scripts = yes && cat >>confdefs.h <<\EOF
 #define EXEC_SCRIPTS 1
 EOF
 
-echo "$as_me:32028: checking if you want internal-links feature" >&5
+echo "$as_me:32089: checking if you want internal-links feature" >&5
 echo $ECHO_N "checking if you want internal-links feature... $ECHO_C" >&6
 
 # Check whether --enable-internal-links or --disable-internal-links was given.
@@ -32042,13 +32103,13 @@ else
   use_internal_links=no
 
 fi;
-echo "$as_me:32045: result: $use_internal_links" >&5
+echo "$as_me:32106: result: $use_internal_links" >&5
 echo "${ECHO_T}$use_internal_links" >&6
 test $use_internal_links = no && cat >>confdefs.h <<\EOF
 #define DONT_TRACK_INTERNAL_LINKS 1
 EOF
 
-echo "$as_me:32051: checking if you want to fork NSL requests" >&5
+echo "$as_me:32112: checking if you want to fork NSL requests" >&5
 echo $ECHO_N "checking if you want to fork NSL requests... $ECHO_C" >&6
 
 # Check whether --enable-nsl-fork or --disable-nsl-fork was given.
@@ -32065,7 +32126,7 @@ else
   use_nsl_fork=no
 
 fi;
-echo "$as_me:32068: result: $use_nsl_fork" >&5
+echo "$as_me:32129: result: $use_nsl_fork" >&5
 echo "${ECHO_T}$use_nsl_fork" >&6
 if test $use_nsl_fork = yes ; then
 	case $host_os in
@@ -32084,7 +32145,7 @@ EOF
 	esac
 fi
 
-echo "$as_me:32087: checking if you want to log URL requests via syslog" >&5
+echo "$as_me:32148: checking if you want to log URL requests via syslog" >&5
 echo $ECHO_N "checking if you want to log URL requests via syslog... $ECHO_C" >&6
 
 # Check whether --enable-syslog or --disable-syslog was given.
@@ -32101,13 +32162,13 @@ else
   use_syslog=no
 
 fi;
-echo "$as_me:32104: result: $use_syslog" >&5
+echo "$as_me:32165: result: $use_syslog" >&5
 echo "${ECHO_T}$use_syslog" >&6
 test $use_syslog = yes && cat >>confdefs.h <<\EOF
 #define SYSLOG_REQUESTED_URLS 1
 EOF
 
-echo "$as_me:32110: checking if you want to underline links" >&5
+echo "$as_me:32171: checking if you want to underline links" >&5
 echo $ECHO_N "checking if you want to underline links... $ECHO_C" >&6
 
 # Check whether --enable-underlines or --disable-underlines was given.
@@ -32124,7 +32185,7 @@ else
   use_underline=no
 
 fi;
-echo "$as_me:32127: result: $use_underline" >&5
+echo "$as_me:32188: result: $use_underline" >&5
 echo "${ECHO_T}$use_underline" >&6
 test $use_underline = yes && cat >>confdefs.h <<\EOF
 #define UNDERLINE_LINKS 1
@@ -32134,7 +32195,7 @@ test $use_underline = no  && cat >>confdefs.h <<\EOF
 #define UNDERLINE_LINKS 0
 EOF
 
-echo "$as_me:32137: checking if help files should be gzip'ed" >&5
+echo "$as_me:32198: checking if help files should be gzip'ed" >&5
 echo $ECHO_N "checking if help files should be gzip'ed... $ECHO_C" >&6
 
 # Check whether --enable-gzip-help or --disable-gzip-help was given.
@@ -32151,10 +32212,10 @@ else
   use_gzip_help=no
 
 fi;
-echo "$as_me:32154: result: $use_gzip_help" >&5
+echo "$as_me:32215: result: $use_gzip_help" >&5
 echo "${ECHO_T}$use_gzip_help" >&6
 
-echo "$as_me:32157: checking if you want to use libbz2 for decompression of some bzip2 files" >&5
+echo "$as_me:32218: checking if you want to use libbz2 for decompression of some bzip2 files" >&5
 echo $ECHO_N "checking if you want to use libbz2 for decompression of some bzip2 files... $ECHO_C" >&6
 
 # Check whether --with-bzlib or --without-bzlib was given.
@@ -32164,7 +32225,7 @@ if test "${with_bzlib+set}" = set; then
 else
   use_bzlib=no
 fi;
-echo "$as_me:32167: result: $use_bzlib" >&5
+echo "$as_me:32228: result: $use_bzlib" >&5
 echo "${ECHO_T}$use_bzlib" >&6
 
 if test ".$use_bzlib" != ".no" ; then
@@ -32203,7 +32264,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 32206 "configure"
+#line 32267 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -32215,16 +32276,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32218: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32279: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32221: \$? = $ac_status" >&5
+  echo "$as_me:32282: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32224: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32285: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32227: \$? = $ac_status" >&5
+  echo "$as_me:32288: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -32241,7 +32302,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:32244: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:32305: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -32282,7 +32343,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 32285 "configure"
+#line 32346 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -32294,16 +32355,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32297: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32358: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32300: \$? = $ac_status" >&5
+  echo "$as_me:32361: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32303: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32364: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32306: \$? = $ac_status" >&5
+  echo "$as_me:32367: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -32320,7 +32381,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:32323: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:32384: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -32336,7 +32397,7 @@ echo "${as_me-configure}:32323: testing adding $cf_add_incdir to include-path ..
 fi
 
 	else
-{ { echo "$as_me:32339: error: cannot find  under $use_bzlib" >&5
+{ { echo "$as_me:32400: error: cannot find  under $use_bzlib" >&5
 echo "$as_me: error: cannot find  under $use_bzlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -32361,7 +32422,7 @@ if test -n "$cf_searchpath/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:32364: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:32425: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -32390,7 +32451,7 @@ if test -n "$cf_searchpath" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:32393: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:32454: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -32399,7 +32460,7 @@ echo "${as_me-configure}:32393: testing adding $cf_add_libdir to library-path ..
 fi
 
 	else
-{ { echo "$as_me:32402: error: cannot find  under $use_bzlib" >&5
+{ { echo "$as_me:32463: error: cannot find  under $use_bzlib" >&5
 echo "$as_me: error: cannot find  under $use_bzlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -32413,12 +32474,12 @@ done
 cf_cv_header_path_bz2=
 cf_cv_library_path_bz2=
 
-echo "${as_me-configure}:32416: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:32477: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 32421 "configure"
+#line 32482 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -32435,16 +32496,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32438: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32499: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32441: \$? = $ac_status" >&5
+  echo "$as_me:32502: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32444: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32505: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32447: \$? = $ac_status" >&5
+  echo "$as_me:32508: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_bz2=yes
@@ -32458,7 +32519,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lbz2  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 32461 "configure"
+#line 32522 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -32475,16 +32536,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32478: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32539: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32481: \$? = $ac_status" >&5
+  echo "$as_me:32542: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32484: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32545: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32487: \$? = $ac_status" >&5
+  echo "$as_me:32548: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_bz2=yes
@@ -32501,9 +32562,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for bz2 library" 1>&6
 
-echo "${as_me-configure}:32504: testing find linkage for bz2 library ..." 1>&5
+echo "${as_me:-configure}:32565: testing find linkage for bz2 library ..." 1>&5
 
-echo "${as_me-configure}:32506: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:32567: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -32616,11 +32677,11 @@ cf_search="$cf_search $cf_header_path_list"
       if test -d $cf_cv_header_path_bz2 ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_bz2" 1>&6
 
-echo "${as_me-configure}:32619: testing ... testing $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:32680: testing ... testing $cf_cv_header_path_bz2 ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_bz2"
         cat >conftest.$ac_ext <<_ACEOF
-#line 32623 "configure"
+#line 32684 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -32637,21 +32698,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32640: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32701: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32643: \$? = $ac_status" >&5
+  echo "$as_me:32704: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32646: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32707: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32649: \$? = $ac_status" >&5
+  echo "$as_me:32710: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found bz2 headers in $cf_cv_header_path_bz2" 1>&6
 
-echo "${as_me-configure}:32654: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:32715: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
 
             cf_cv_find_linkage_bz2=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -32669,7 +32730,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_bz2" = maybe ; then
 
-echo "${as_me-configure}:32672: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:32733: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -32677,7 +32738,7 @@ echo "${as_me-configure}:32672: testing Searching for bz2 library in FIND_LINKAG
         CPPFLAGS="$cf_test_CPPFLAGS"
         LIBS="-lbz2  $cf_save_LIBS"
         cat >conftest.$ac_ext <<_ACEOF
-#line 32680 "configure"
+#line 32741 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -32694,21 +32755,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32697: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32758: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32700: \$? = $ac_status" >&5
+  echo "$as_me:32761: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32703: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32764: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32706: \$? = $ac_status" >&5
+  echo "$as_me:32767: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found bz2 library in system" 1>&6
 
-echo "${as_me-configure}:32711: testing ... found bz2 library in system ..." 1>&5
+echo "${as_me:-configure}:32772: testing ... found bz2 library in system ..." 1>&5
 
             cf_cv_find_linkage_bz2=yes
 else
@@ -32811,13 +32872,13 @@ cf_search="$cf_library_path_list $cf_search"
           if test -d $cf_cv_library_path_bz2 ; then
             test -n "$verbose" && echo "	... testing $cf_cv_library_path_bz2" 1>&6
 
-echo "${as_me-configure}:32814: testing ... testing $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:32875: testing ... testing $cf_cv_library_path_bz2 ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-lbz2  $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_bz2"
             cat >conftest.$ac_ext <<_ACEOF
-#line 32820 "configure"
+#line 32881 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -32834,21 +32895,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32837: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32898: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32840: \$? = $ac_status" >&5
+  echo "$as_me:32901: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32843: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32904: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32846: \$? = $ac_status" >&5
+  echo "$as_me:32907: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
                 test -n "$verbose" && echo "	... found bz2 library in $cf_cv_library_path_bz2" 1>&6
 
-echo "${as_me-configure}:32851: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:32912: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
 
                 cf_cv_find_linkage_bz2=yes
                 cf_cv_library_file_bz2="-lbz2"
@@ -32907,7 +32968,7 @@ if test -n "$cf_cv_header_path_bz2" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 32910 "configure"
+#line 32971 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -32919,16 +32980,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32922: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32983: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32925: \$? = $ac_status" >&5
+  echo "$as_me:32986: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32928: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32989: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32931: \$? = $ac_status" >&5
+  echo "$as_me:32992: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -32945,7 +33006,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:32948: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:33009: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -32979,7 +33040,7 @@ if test -n "$cf_cv_library_path_bz2" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:32982: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:33043: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -32990,7 +33051,7 @@ fi
 	LIBS="-lbz2 $LIBS"
 
 else
-{ echo "$as_me:32993: WARNING: Cannot find bz2 library" >&5
+{ echo "$as_me:33054: WARNING: Cannot find bz2 library" >&5
 echo "$as_me: WARNING: Cannot find bz2 library" >&2;}
 fi
 
@@ -33000,7 +33061,7 @@ EOF
 
 fi
 
-echo "$as_me:33003: checking if you want to use zlib for decompression of some gzip files" >&5
+echo "$as_me:33064: checking if you want to use zlib for decompression of some gzip files" >&5
 echo $ECHO_N "checking if you want to use zlib for decompression of some gzip files... $ECHO_C" >&6
 
 # Check whether --with-zlib or --without-zlib was given.
@@ -33010,7 +33071,7 @@ if test "${with_zlib+set}" = set; then
 else
   use_zlib=no
 fi;
-echo "$as_me:33013: result: $use_zlib" >&5
+echo "$as_me:33074: result: $use_zlib" >&5
 echo "${ECHO_T}$use_zlib" >&6
 
 if test ".$use_zlib" != ".no" ; then
@@ -33049,7 +33110,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 33052 "configure"
+#line 33113 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -33061,16 +33122,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33064: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33125: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33067: \$? = $ac_status" >&5
+  echo "$as_me:33128: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33070: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33131: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33073: \$? = $ac_status" >&5
+  echo "$as_me:33134: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -33087,7 +33148,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:33090: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:33151: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -33128,7 +33189,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 33131 "configure"
+#line 33192 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -33140,16 +33201,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33143: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33204: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33146: \$? = $ac_status" >&5
+  echo "$as_me:33207: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33149: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33210: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33152: \$? = $ac_status" >&5
+  echo "$as_me:33213: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -33166,7 +33227,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:33169: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:33230: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -33182,7 +33243,7 @@ echo "${as_me-configure}:33169: testing adding $cf_add_incdir to include-path ..
 fi
 
 	else
-{ { echo "$as_me:33185: error: cannot find  under $use_zlib" >&5
+{ { echo "$as_me:33246: error: cannot find  under $use_zlib" >&5
 echo "$as_me: error: cannot find  under $use_zlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -33207,7 +33268,7 @@ if test -n "$cf_searchpath/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:33210: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:33271: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -33236,7 +33297,7 @@ if test -n "$cf_searchpath" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:33239: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:33300: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -33245,7 +33306,7 @@ echo "${as_me-configure}:33239: testing adding $cf_add_libdir to library-path ..
 fi
 
 	else
-{ { echo "$as_me:33248: error: cannot find  under $use_zlib" >&5
+{ { echo "$as_me:33309: error: cannot find  under $use_zlib" >&5
 echo "$as_me: error: cannot find  under $use_zlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -33259,12 +33320,12 @@ done
 cf_cv_header_path_z=
 cf_cv_library_path_z=
 
-echo "${as_me-configure}:33262: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:33323: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 33267 "configure"
+#line 33328 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -33280,16 +33341,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33283: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33344: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33286: \$? = $ac_status" >&5
+  echo "$as_me:33347: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33289: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33350: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33292: \$? = $ac_status" >&5
+  echo "$as_me:33353: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_z=yes
@@ -33303,7 +33364,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lz  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 33306 "configure"
+#line 33367 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -33319,16 +33380,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33322: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33383: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33325: \$? = $ac_status" >&5
+  echo "$as_me:33386: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33328: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33389: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33331: \$? = $ac_status" >&5
+  echo "$as_me:33392: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_z=yes
@@ -33345,9 +33406,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for z library" 1>&6
 
-echo "${as_me-configure}:33348: testing find linkage for z library ..." 1>&5
+echo "${as_me:-configure}:33409: testing find linkage for z library ..." 1>&5
 
-echo "${as_me-configure}:33350: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:33411: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -33460,11 +33521,11 @@ cf_search="$cf_search $cf_header_path_list"
       if test -d $cf_cv_header_path_z ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_z" 1>&6
 
-echo "${as_me-configure}:33463: testing ... testing $cf_cv_header_path_z ..." 1>&5
+echo "${as_me:-configure}:33524: testing ... testing $cf_cv_header_path_z ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_z"
         cat >conftest.$ac_ext <<_ACEOF
-#line 33467 "configure"
+#line 33528 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -33480,21 +33541,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33483: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33544: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33486: \$? = $ac_status" >&5
+  echo "$as_me:33547: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33489: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33550: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33492: \$? = $ac_status" >&5
+  echo "$as_me:33553: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found z headers in $cf_cv_header_path_z" 1>&6
 
-echo "${as_me-configure}:33497: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
+echo "${as_me:-configure}:33558: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
 
             cf_cv_find_linkage_z=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -33512,7 +33573,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_z" = maybe ; then
 
-echo "${as_me-configure}:33515: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:33576: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -33520,7 +33581,7 @@ echo "${as_me-configure}:33515: testing Searching for z library in FIND_LINKAGE(
         CPPFLAGS="$cf_test_CPPFLAGS"
         LIBS="-lz  $cf_save_LIBS"
         cat >conftest.$ac_ext <<_ACEOF
-#line 33523 "configure"
+#line 33584 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -33536,21 +33597,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33539: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33600: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33542: \$? = $ac_status" >&5
+  echo "$as_me:33603: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33545: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33606: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33548: \$? = $ac_status" >&5
+  echo "$as_me:33609: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found z library in system" 1>&6
 
-echo "${as_me-configure}:33553: testing ... found z library in system ..." 1>&5
+echo "${as_me:-configure}:33614: testing ... found z library in system ..." 1>&5
 
             cf_cv_find_linkage_z=yes
 else
@@ -33653,13 +33714,13 @@ cf_search="$cf_library_path_list $cf_search"
           if test -d $cf_cv_library_path_z ; then
             test -n "$verbose" && echo "	... testing $cf_cv_library_path_z" 1>&6
 
-echo "${as_me-configure}:33656: testing ... testing $cf_cv_library_path_z ..." 1>&5
+echo "${as_me:-configure}:33717: testing ... testing $cf_cv_library_path_z ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-lz  $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_z"
             cat >conftest.$ac_ext <<_ACEOF
-#line 33662 "configure"
+#line 33723 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -33675,21 +33736,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33678: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33739: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33681: \$? = $ac_status" >&5
+  echo "$as_me:33742: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33684: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33745: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33687: \$? = $ac_status" >&5
+  echo "$as_me:33748: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
                 test -n "$verbose" && echo "	... found z library in $cf_cv_library_path_z" 1>&6
 
-echo "${as_me-configure}:33692: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
+echo "${as_me:-configure}:33753: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
 
                 cf_cv_find_linkage_z=yes
                 cf_cv_library_file_z="-lz"
@@ -33748,7 +33809,7 @@ if test -n "$cf_cv_header_path_z" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 33751 "configure"
+#line 33812 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -33760,16 +33821,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33763: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33824: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33766: \$? = $ac_status" >&5
+  echo "$as_me:33827: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33769: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33830: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33772: \$? = $ac_status" >&5
+  echo "$as_me:33833: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -33786,7 +33847,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:33789: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:33850: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -33820,7 +33881,7 @@ if test -n "$cf_cv_library_path_z" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:33823: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:33884: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -33831,7 +33892,7 @@ fi
 	LIBS="-lz $LIBS"
 
 else
-{ echo "$as_me:33834: WARNING: Cannot find z library" >&5
+{ echo "$as_me:33895: WARNING: Cannot find z library" >&5
 echo "$as_me: WARNING: Cannot find z library" >&2;}
 fi
 
@@ -33841,7 +33902,7 @@ EOF
 
 fi
 
-echo "$as_me:33844: checking if you want to exclude FINGER code" >&5
+echo "$as_me:33905: checking if you want to exclude FINGER code" >&5
 echo $ECHO_N "checking if you want to exclude FINGER code... $ECHO_C" >&6
 
 # Check whether --enable-finger or --disable-finger was given.
@@ -33858,13 +33919,13 @@ else
   use_finger=no
 
 fi;
-echo "$as_me:33861: result: $use_finger" >&5
+echo "$as_me:33922: result: $use_finger" >&5
 echo "${ECHO_T}$use_finger" >&6
 test $use_finger != "no" && cat >>confdefs.h <<\EOF
 #define DISABLE_FINGER 1
 EOF
 
-echo "$as_me:33867: checking if you want to exclude GOPHER code" >&5
+echo "$as_me:33928: checking if you want to exclude GOPHER code" >&5
 echo $ECHO_N "checking if you want to exclude GOPHER code... $ECHO_C" >&6
 
 # Check whether --enable-gopher or --disable-gopher was given.
@@ -33881,13 +33942,13 @@ else
   use_gopher=no
 
 fi;
-echo "$as_me:33884: result: $use_gopher" >&5
+echo "$as_me:33945: result: $use_gopher" >&5
 echo "${ECHO_T}$use_gopher" >&6
 test $use_gopher != "no" && cat >>confdefs.h <<\EOF
 #define DISABLE_GOPHER 1
 EOF
 
-echo "$as_me:33890: checking if you want to exclude NEWS code" >&5
+echo "$as_me:33951: checking if you want to exclude NEWS code" >&5
 echo $ECHO_N "checking if you want to exclude NEWS code... $ECHO_C" >&6
 
 # Check whether --enable-news or --disable-news was given.
@@ -33904,13 +33965,13 @@ else
   use_news=no
 
 fi;
-echo "$as_me:33907: result: $use_news" >&5
+echo "$as_me:33968: result: $use_news" >&5
 echo "${ECHO_T}$use_news" >&6
 test $use_news != "no" && cat >>confdefs.h <<\EOF
 #define DISABLE_NEWS 1
 EOF
 
-echo "$as_me:33913: checking if you want to exclude FTP code" >&5
+echo "$as_me:33974: checking if you want to exclude FTP code" >&5
 echo $ECHO_N "checking if you want to exclude FTP code... $ECHO_C" >&6
 
 # Check whether --enable-ftp or --disable-ftp was given.
@@ -33927,13 +33988,13 @@ else
   use_ftp=no
 
 fi;
-echo "$as_me:33930: result: $use_ftp" >&5
+echo "$as_me:33991: result: $use_ftp" >&5
 echo "${ECHO_T}$use_ftp" >&6
 test $use_ftp != "no" && cat >>confdefs.h <<\EOF
 #define DISABLE_FTP 1
 EOF
 
-echo "$as_me:33936: checking if you want to include WAIS code" >&5
+echo "$as_me:33997: checking if you want to include WAIS code" >&5
 echo $ECHO_N "checking if you want to include WAIS code... $ECHO_C" >&6
 
 # Check whether --enable-wais or --disable-wais was given.
@@ -33950,13 +34011,13 @@ else
   use_wais=no
 
 fi;
-echo "$as_me:33953: result: $use_wais" >&5
+echo "$as_me:34014: result: $use_wais" >&5
 echo "${ECHO_T}$use_wais" >&6
 
 MAKE_WAIS="#"
 if test $use_wais != "no"
 then
-	echo "$as_me:33959: checking for fs_free in -lwais" >&5
+	echo "$as_me:34020: checking for fs_free in -lwais" >&5
 echo $ECHO_N "checking for fs_free in -lwais... $ECHO_C" >&6
 if test "${ac_cv_lib_wais_fs_free+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -33964,7 +34025,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lwais  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 33967 "configure"
+#line 34028 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -33983,16 +34044,16 @@ fs_free ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33986: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34047: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33989: \$? = $ac_status" >&5
+  echo "$as_me:34050: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33992: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34053: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33995: \$? = $ac_status" >&5
+  echo "$as_me:34056: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_wais_fs_free=yes
 else
@@ -34003,18 +34064,18 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:34006: result: $ac_cv_lib_wais_fs_free" >&5
+echo "$as_me:34067: result: $ac_cv_lib_wais_fs_free" >&5
 echo "${ECHO_T}$ac_cv_lib_wais_fs_free" >&6
 if test $ac_cv_lib_wais_fs_free = yes; then
 
-echo "$as_me:34010: checking if -lm needed for math functions" >&5
+echo "$as_me:34071: checking if -lm needed for math functions" >&5
 echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6
 if test "${cf_cv_need_libm+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 34017 "configure"
+#line 34078 "configure"
 #include "confdefs.h"
 
 	#include <stdio.h>
@@ -34029,16 +34090,16 @@ double x = rand(); printf("result = %g\n", sin(x))
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34032: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34093: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34035: \$? = $ac_status" >&5
+  echo "$as_me:34096: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:34038: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34099: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34041: \$? = $ac_status" >&5
+  echo "$as_me:34102: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_libm=no
 else
@@ -34048,7 +34109,7 @@ cf_cv_need_libm=yes
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:34051: result: $cf_cv_need_libm" >&5
+echo "$as_me:34112: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 if test "$cf_cv_need_libm" = yes
 then
@@ -34062,23 +34123,23 @@ fi
 for ac_header in wais.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:34065: checking for $ac_header" >&5
+echo "$as_me:34126: 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 34071 "configure"
+#line 34132 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:34075: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:34136: \"$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:34081: \$? = $ac_status" >&5
+  echo "$as_me:34142: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -34097,7 +34158,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:34100: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:34161: 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
@@ -34110,7 +34171,7 @@ done
 		MAKE_WAIS=
 
 else
-  { echo "$as_me:34113: WARNING: could not find WAIS library" >&5
+  { echo "$as_me:34174: WARNING: could not find WAIS library" >&5
 echo "$as_me: WARNING: could not find WAIS library" >&2;}
 fi
 
@@ -34118,7 +34179,7 @@ fi
 
 # All DirEd functions that were enabled on compilation can be disabled
 # or modified at run time via DIRED_MENU symbols in lynx.cfg.
-echo "$as_me:34121: checking if directory-editor code should be used" >&5
+echo "$as_me:34182: checking if directory-editor code should be used" >&5
 echo $ECHO_N "checking if directory-editor code should be used... $ECHO_C" >&6
 
 # Check whether --enable-dired or --disable-dired was given.
@@ -34135,7 +34196,7 @@ else
   use_dired=yes
 
 fi;
-echo "$as_me:34138: result: $use_dired" >&5
+echo "$as_me:34199: result: $use_dired" >&5
 echo "${ECHO_T}$use_dired" >&6
 
 if test ".$use_dired" != ".no" ; then
@@ -34144,7 +34205,7 @@ if test ".$use_dired" != ".no" ; then
 #define DIRED_SUPPORT 1
 EOF
 
-	echo "$as_me:34147: checking if you wish to allow extracting from archives via DirEd" >&5
+	echo "$as_me:34208: checking if you wish to allow extracting from archives via DirEd" >&5
 echo $ECHO_N "checking if you wish to allow extracting from archives via DirEd... $ECHO_C" >&6
 
 # Check whether --enable-dired-dearchive or --disable-dired-dearchive was given.
@@ -34160,10 +34221,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:34163: result: $enableval" >&5
+	echo "$as_me:34224: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:34166: checking if DirEd mode should override keys" >&5
+	echo "$as_me:34227: checking if DirEd mode should override keys" >&5
 echo $ECHO_N "checking if DirEd mode should override keys... $ECHO_C" >&6
 
 # Check whether --enable-dired-override or --disable-dired-override was given.
@@ -34185,10 +34246,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:34188: result: $enableval" >&5
+	echo "$as_me:34249: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:34191: checking if you wish to allow permissions commands via DirEd" >&5
+	echo "$as_me:34252: checking if you wish to allow permissions commands via DirEd" >&5
 echo $ECHO_N "checking if you wish to allow permissions commands via DirEd... $ECHO_C" >&6
 
 # Check whether --enable-dired-permit or --disable-dired-permit was given.
@@ -34210,10 +34271,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:34213: result: $enableval" >&5
+	echo "$as_me:34274: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:34216: checking if you wish to allow executable-permission commands via DirEd" >&5
+	echo "$as_me:34277: checking if you wish to allow executable-permission commands via DirEd" >&5
 echo $ECHO_N "checking if you wish to allow executable-permission commands via DirEd... $ECHO_C" >&6
 
 # Check whether --enable-dired-xpermit or --disable-dired-xpermit was given.
@@ -34229,10 +34290,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:34232: result: $enableval" >&5
+	echo "$as_me:34293: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:34235: checking if you wish to allow \"tar\" commands from DirEd" >&5
+	echo "$as_me:34296: checking if you wish to allow \"tar\" commands from DirEd" >&5
 echo $ECHO_N "checking if you wish to allow \"tar\" commands from DirEd... $ECHO_C" >&6
 
 # Check whether --enable-dired-tar or --disable-dired-tar was given.
@@ -34254,10 +34315,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:34257: result: $enableval" >&5
+	echo "$as_me:34318: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:34260: checking if you wish to allow \"uudecode\" commands from DirEd" >&5
+	echo "$as_me:34321: checking if you wish to allow \"uudecode\" commands from DirEd" >&5
 echo $ECHO_N "checking if you wish to allow \"uudecode\" commands from DirEd... $ECHO_C" >&6
 
 # Check whether --enable-dired-uudecode or --disable-dired-uudecode was given.
@@ -34279,10 +34340,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:34282: result: $enableval" >&5
+	echo "$as_me:34343: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:34285: checking if you wish to allow \"zip\" and \"unzip\" commands from DirEd" >&5
+	echo "$as_me:34346: checking if you wish to allow \"zip\" and \"unzip\" commands from DirEd" >&5
 echo $ECHO_N "checking if you wish to allow \"zip\" and \"unzip\" commands from DirEd... $ECHO_C" >&6
 
 # Check whether --enable-dired-zip or --disable-dired-zip was given.
@@ -34304,10 +34365,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:34307: result: $enableval" >&5
+	echo "$as_me:34368: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:34310: checking if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd" >&5
+	echo "$as_me:34371: checking if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd" >&5
 echo $ECHO_N "checking if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd... $ECHO_C" >&6
 
 # Check whether --enable-dired-gzip or --disable-dired-gzip was given.
@@ -34329,11 +34390,11 @@ else
 EOF
 
 fi;
-	echo "$as_me:34332: result: $enableval" >&5
+	echo "$as_me:34393: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 fi
 
-echo "$as_me:34336: checking if you want long-directory listings" >&5
+echo "$as_me:34397: checking if you want long-directory listings" >&5
 echo $ECHO_N "checking if you want long-directory listings... $ECHO_C" >&6
 
 # Check whether --enable-long-list or --disable-long-list was given.
@@ -34355,10 +34416,10 @@ else
 EOF
 
 fi;
-echo "$as_me:34358: result: $enableval" >&5
+echo "$as_me:34419: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:34361: checking if parent-directory references are permitted" >&5
+echo "$as_me:34422: checking if parent-directory references are permitted" >&5
 echo $ECHO_N "checking if parent-directory references are permitted... $ECHO_C" >&6
 
 # Check whether --enable-parent-dir-refs or --disable-parent-dir-refs was given.
@@ -34374,7 +34435,7 @@ EOF
 else
   enableval=yes
 fi;
-echo "$as_me:34377: result: $enableval" >&5
+echo "$as_me:34438: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 test -z "$TELNET" && TELNET=telnet
@@ -34382,7 +34443,7 @@ for ac_prog in $TELNET telnet
 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:34385: checking for $ac_word" >&5
+echo "$as_me:34446: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_TELNET+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -34399,7 +34460,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_TELNET="$ac_dir/$ac_word"
-   echo "$as_me:34402: found $ac_dir/$ac_word" >&5
+   echo "$as_me:34463: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -34410,10 +34471,10 @@ fi
 TELNET=$ac_cv_path_TELNET
 
 if test -n "$TELNET"; then
-  echo "$as_me:34413: result: $TELNET" >&5
+  echo "$as_me:34474: result: $TELNET" >&5
 echo "${ECHO_T}$TELNET" >&6
 else
-  echo "$as_me:34416: result: no" >&5
+  echo "$as_me:34477: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -34423,7 +34484,7 @@ test -n "$TELNET" || TELNET="$TELNET"
 
 cf_path_prog=""
 cf_path_args=""
-IFS="${IFS= 	}"; cf_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR"
+IFS="${IFS:- 	}"; cf_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR"
 for cf_temp in $ac_cv_path_TELNET
 do
 	if test -z "$cf_path_prog" ; then
@@ -34472,7 +34533,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:34475: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:34536: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define TELNET_PATH "$cf_path_prog"
@@ -34489,7 +34550,7 @@ for ac_prog in $TN3270 tn3270
 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:34492: checking for $ac_word" >&5
+echo "$as_me:34553: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_TN3270+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -34506,7 +34567,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_TN3270="$ac_dir/$ac_word"
-   echo "$as_me:34509: found $ac_dir/$ac_word" >&5
+   echo "$as_me:34570: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -34517,10 +34578,10 @@ fi
 TN3270=$ac_cv_path_TN3270
 
 if test -n "$TN3270"; then
-  echo "$as_me:34520: result: $TN3270" >&5
+  echo "$as_me:34581: result: $TN3270" >&5
 echo "${ECHO_T}$TN3270" >&6
 else
-  echo "$as_me:34523: result: no" >&5
+  echo "$as_me:34584: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -34530,7 +34591,7 @@ test -n "$TN3270" || TN3270="$TN3270"
 
 cf_path_prog=""
 cf_path_args=""
-IFS="${IFS= 	}"; cf_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR"
+IFS="${IFS:- 	}"; cf_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR"
 for cf_temp in $ac_cv_path_TN3270
 do
 	if test -z "$cf_path_prog" ; then
@@ -34579,7 +34640,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:34582: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:34643: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define TN3270_PATH "$cf_path_prog"
@@ -34596,7 +34657,7 @@ for ac_prog in $RLOGIN rlogin
 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:34599: checking for $ac_word" >&5
+echo "$as_me:34660: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_RLOGIN+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -34613,7 +34674,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_RLOGIN="$ac_dir/$ac_word"
-   echo "$as_me:34616: found $ac_dir/$ac_word" >&5
+   echo "$as_me:34677: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -34624,10 +34685,10 @@ fi
 RLOGIN=$ac_cv_path_RLOGIN
 
 if test -n "$RLOGIN"; then
-  echo "$as_me:34627: result: $RLOGIN" >&5
+  echo "$as_me:34688: result: $RLOGIN" >&5
 echo "${ECHO_T}$RLOGIN" >&6
 else
-  echo "$as_me:34630: result: no" >&5
+  echo "$as_me:34691: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -34637,7 +34698,7 @@ test -n "$RLOGIN" || RLOGIN="$RLOGIN"
 
 cf_path_prog=""
 cf_path_args=""
-IFS="${IFS= 	}"; cf_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR"
+IFS="${IFS:- 	}"; cf_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR"
 for cf_temp in $ac_cv_path_RLOGIN
 do
 	if test -z "$cf_path_prog" ; then
@@ -34686,7 +34747,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:34689: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:34750: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define RLOGIN_PATH "$cf_path_prog"
@@ -34703,7 +34764,7 @@ for ac_prog in $MV mv
 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:34706: checking for $ac_word" >&5
+echo "$as_me:34767: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_MV+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -34720,7 +34781,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_MV="$ac_dir/$ac_word"
-   echo "$as_me:34723: found $ac_dir/$ac_word" >&5
+   echo "$as_me:34784: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -34731,10 +34792,10 @@ fi
 MV=$ac_cv_path_MV
 
 if test -n "$MV"; then
-  echo "$as_me:34734: result: $MV" >&5
+  echo "$as_me:34795: result: $MV" >&5
 echo "${ECHO_T}$MV" >&6
 else
-  echo "$as_me:34737: result: no" >&5
+  echo "$as_me:34798: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -34744,7 +34805,7 @@ test -n "$MV" || MV="$MV"
 
 cf_path_prog=""
 cf_path_args=""
-IFS="${IFS= 	}"; cf_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR"
+IFS="${IFS:- 	}"; cf_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR"
 for cf_temp in $ac_cv_path_MV
 do
 	if test -z "$cf_path_prog" ; then
@@ -34793,7 +34854,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:34796: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:34857: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define MV_PATH "$cf_path_prog"
@@ -34810,7 +34871,7 @@ for ac_prog in $GZIP gzip
 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:34813: checking for $ac_word" >&5
+echo "$as_me:34874: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_GZIP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -34827,7 +34888,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_GZIP="$ac_dir/$ac_word"
-   echo "$as_me:34830: found $ac_dir/$ac_word" >&5
+   echo "$as_me:34891: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -34838,10 +34899,10 @@ fi
 GZIP=$ac_cv_path_GZIP
 
 if test -n "$GZIP"; then
-  echo "$as_me:34841: result: $GZIP" >&5
+  echo "$as_me:34902: result: $GZIP" >&5
 echo "${ECHO_T}$GZIP" >&6
 else
-  echo "$as_me:34844: result: no" >&5
+  echo "$as_me:34905: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -34851,7 +34912,7 @@ test -n "$GZIP" || GZIP="$GZIP"
 
 cf_path_prog=""
 cf_path_args=""
-IFS="${IFS= 	}"; cf_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR"
+IFS="${IFS:- 	}"; cf_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR"
 for cf_temp in $ac_cv_path_GZIP
 do
 	if test -z "$cf_path_prog" ; then
@@ -34900,7 +34961,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:34903: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:34964: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define GZIP_PATH "$cf_path_prog"
@@ -34917,7 +34978,7 @@ for ac_prog in $UNCOMPRESS gunzip
 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:34920: checking for $ac_word" >&5
+echo "$as_me:34981: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_UNCOMPRESS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -34934,7 +34995,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_UNCOMPRESS="$ac_dir/$ac_word"
-   echo "$as_me:34937: found $ac_dir/$ac_word" >&5
+   echo "$as_me:34998: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -34945,10 +35006,10 @@ fi
 UNCOMPRESS=$ac_cv_path_UNCOMPRESS
 
 if test -n "$UNCOMPRESS"; then
-  echo "$as_me:34948: result: $UNCOMPRESS" >&5
+  echo "$as_me:35009: result: $UNCOMPRESS" >&5
 echo "${ECHO_T}$UNCOMPRESS" >&6
 else
-  echo "$as_me:34951: result: no" >&5
+  echo "$as_me:35012: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -34958,7 +35019,7 @@ test -n "$UNCOMPRESS" || UNCOMPRESS="$UNCOMPRESS"
 
 cf_path_prog=""
 cf_path_args=""
-IFS="${IFS= 	}"; cf_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR"
+IFS="${IFS:- 	}"; cf_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR"
 for cf_temp in $ac_cv_path_UNCOMPRESS
 do
 	if test -z "$cf_path_prog" ; then
@@ -35007,7 +35068,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:35010: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:35071: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define UNCOMPRESS_PATH "$cf_path_prog"
@@ -35024,7 +35085,7 @@ for ac_prog in $UNZIP unzip
 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:35027: checking for $ac_word" >&5
+echo "$as_me:35088: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_UNZIP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -35041,7 +35102,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_UNZIP="$ac_dir/$ac_word"
-   echo "$as_me:35044: found $ac_dir/$ac_word" >&5
+   echo "$as_me:35105: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -35052,10 +35113,10 @@ fi
 UNZIP=$ac_cv_path_UNZIP
 
 if test -n "$UNZIP"; then
-  echo "$as_me:35055: result: $UNZIP" >&5
+  echo "$as_me:35116: result: $UNZIP" >&5
 echo "${ECHO_T}$UNZIP" >&6
 else
-  echo "$as_me:35058: result: no" >&5
+  echo "$as_me:35119: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -35065,7 +35126,7 @@ test -n "$UNZIP" || UNZIP="$UNZIP"
 
 cf_path_prog=""
 cf_path_args=""
-IFS="${IFS= 	}"; cf_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR"
+IFS="${IFS:- 	}"; cf_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR"
 for cf_temp in $ac_cv_path_UNZIP
 do
 	if test -z "$cf_path_prog" ; then
@@ -35114,7 +35175,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:35117: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:35178: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define UNZIP_PATH "$cf_path_prog"
@@ -35131,7 +35192,7 @@ for ac_prog in $BZIP2 bzip2
 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:35134: checking for $ac_word" >&5
+echo "$as_me:35195: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_BZIP2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -35148,7 +35209,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_BZIP2="$ac_dir/$ac_word"
-   echo "$as_me:35151: found $ac_dir/$ac_word" >&5
+   echo "$as_me:35212: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -35159,10 +35220,10 @@ fi
 BZIP2=$ac_cv_path_BZIP2
 
 if test -n "$BZIP2"; then
-  echo "$as_me:35162: result: $BZIP2" >&5
+  echo "$as_me:35223: result: $BZIP2" >&5
 echo "${ECHO_T}$BZIP2" >&6
 else
-  echo "$as_me:35165: result: no" >&5
+  echo "$as_me:35226: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -35172,7 +35233,7 @@ test -n "$BZIP2" || BZIP2="$BZIP2"
 
 cf_path_prog=""
 cf_path_args=""
-IFS="${IFS= 	}"; cf_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR"
+IFS="${IFS:- 	}"; cf_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR"
 for cf_temp in $ac_cv_path_BZIP2
 do
 	if test -z "$cf_path_prog" ; then
@@ -35221,7 +35282,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:35224: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:35285: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define BZIP2_PATH "$cf_path_prog"
@@ -35238,7 +35299,7 @@ for ac_prog in $TAR tar pax gtar gnutar bsdtar star
 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:35241: checking for $ac_word" >&5
+echo "$as_me:35302: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_TAR+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -35255,7 +35316,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_TAR="$ac_dir/$ac_word"
-   echo "$as_me:35258: found $ac_dir/$ac_word" >&5
+   echo "$as_me:35319: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -35266,10 +35327,10 @@ fi
 TAR=$ac_cv_path_TAR
 
 if test -n "$TAR"; then
-  echo "$as_me:35269: result: $TAR" >&5
+  echo "$as_me:35330: result: $TAR" >&5
 echo "${ECHO_T}$TAR" >&6
 else
-  echo "$as_me:35272: result: no" >&5
+  echo "$as_me:35333: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -35279,7 +35340,7 @@ test -n "$TAR" || TAR="$TAR"
 
 cf_path_prog=""
 cf_path_args=""
-IFS="${IFS= 	}"; cf_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR"
+IFS="${IFS:- 	}"; cf_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR"
 for cf_temp in $ac_cv_path_TAR
 do
 	if test -z "$cf_path_prog" ; then
@@ -35328,7 +35389,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:35331: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:35392: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define TAR_PATH "$cf_path_prog"
@@ -35385,7 +35446,7 @@ for ac_prog in $COMPRESS compress
 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:35388: checking for $ac_word" >&5
+echo "$as_me:35449: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_COMPRESS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -35402,7 +35463,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_COMPRESS="$ac_dir/$ac_word"
-   echo "$as_me:35405: found $ac_dir/$ac_word" >&5
+   echo "$as_me:35466: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -35413,10 +35474,10 @@ fi
 COMPRESS=$ac_cv_path_COMPRESS
 
 if test -n "$COMPRESS"; then
-  echo "$as_me:35416: result: $COMPRESS" >&5
+  echo "$as_me:35477: result: $COMPRESS" >&5
 echo "${ECHO_T}$COMPRESS" >&6
 else
-  echo "$as_me:35419: result: no" >&5
+  echo "$as_me:35480: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -35426,7 +35487,7 @@ test -n "$COMPRESS" || COMPRESS="$COMPRESS"
 
 cf_path_prog=""
 cf_path_args=""
-IFS="${IFS= 	}"; cf_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR"
+IFS="${IFS:- 	}"; cf_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR"
 for cf_temp in $ac_cv_path_COMPRESS
 do
 	if test -z "$cf_path_prog" ; then
@@ -35475,7 +35536,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:35478: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:35539: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define COMPRESS_PATH "$cf_path_prog"
@@ -35492,7 +35553,7 @@ for ac_prog in $RM rm
 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:35495: checking for $ac_word" >&5
+echo "$as_me:35556: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_RM+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -35509,7 +35570,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_RM="$ac_dir/$ac_word"
-   echo "$as_me:35512: found $ac_dir/$ac_word" >&5
+   echo "$as_me:35573: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -35520,10 +35581,10 @@ fi
 RM=$ac_cv_path_RM
 
 if test -n "$RM"; then
-  echo "$as_me:35523: result: $RM" >&5
+  echo "$as_me:35584: result: $RM" >&5
 echo "${ECHO_T}$RM" >&6
 else
-  echo "$as_me:35526: result: no" >&5
+  echo "$as_me:35587: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -35533,7 +35594,7 @@ test -n "$RM" || RM="$RM"
 
 cf_path_prog=""
 cf_path_args=""
-IFS="${IFS= 	}"; cf_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR"
+IFS="${IFS:- 	}"; cf_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR"
 for cf_temp in $ac_cv_path_RM
 do
 	if test -z "$cf_path_prog" ; then
@@ -35582,7 +35643,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:35585: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:35646: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define RM_PATH "$cf_path_prog"
@@ -35599,7 +35660,7 @@ for ac_prog in $UUDECODE uudecode
 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:35602: checking for $ac_word" >&5
+echo "$as_me:35663: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_UUDECODE+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -35616,7 +35677,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_UUDECODE="$ac_dir/$ac_word"
-   echo "$as_me:35619: found $ac_dir/$ac_word" >&5
+   echo "$as_me:35680: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -35627,10 +35688,10 @@ fi
 UUDECODE=$ac_cv_path_UUDECODE
 
 if test -n "$UUDECODE"; then
-  echo "$as_me:35630: result: $UUDECODE" >&5
+  echo "$as_me:35691: result: $UUDECODE" >&5
 echo "${ECHO_T}$UUDECODE" >&6
 else
-  echo "$as_me:35633: result: no" >&5
+  echo "$as_me:35694: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -35640,7 +35701,7 @@ test -n "$UUDECODE" || UUDECODE="$UUDECODE"
 
 cf_path_prog=""
 cf_path_args=""
-IFS="${IFS= 	}"; cf_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR"
+IFS="${IFS:- 	}"; cf_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR"
 for cf_temp in $ac_cv_path_UUDECODE
 do
 	if test -z "$cf_path_prog" ; then
@@ -35689,7 +35750,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:35692: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:35753: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define UUDECODE_PATH "$cf_path_prog"
@@ -35706,7 +35767,7 @@ for ac_prog in $ZCAT zcat
 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:35709: checking for $ac_word" >&5
+echo "$as_me:35770: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_ZCAT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -35723,7 +35784,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_ZCAT="$ac_dir/$ac_word"
-   echo "$as_me:35726: found $ac_dir/$ac_word" >&5
+   echo "$as_me:35787: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -35734,10 +35795,10 @@ fi
 ZCAT=$ac_cv_path_ZCAT
 
 if test -n "$ZCAT"; then
-  echo "$as_me:35737: result: $ZCAT" >&5
+  echo "$as_me:35798: result: $ZCAT" >&5
 echo "${ECHO_T}$ZCAT" >&6
 else
-  echo "$as_me:35740: result: no" >&5
+  echo "$as_me:35801: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -35747,7 +35808,7 @@ test -n "$ZCAT" || ZCAT="$ZCAT"
 
 cf_path_prog=""
 cf_path_args=""
-IFS="${IFS= 	}"; cf_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR"
+IFS="${IFS:- 	}"; cf_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR"
 for cf_temp in $ac_cv_path_ZCAT
 do
 	if test -z "$cf_path_prog" ; then
@@ -35796,7 +35857,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:35799: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:35860: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define ZCAT_PATH "$cf_path_prog"
@@ -35813,7 +35874,7 @@ for ac_prog in $ZIP zip
 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:35816: checking for $ac_word" >&5
+echo "$as_me:35877: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_ZIP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -35830,7 +35891,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_ZIP="$ac_dir/$ac_word"
-   echo "$as_me:35833: found $ac_dir/$ac_word" >&5
+   echo "$as_me:35894: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -35841,10 +35902,10 @@ fi
 ZIP=$ac_cv_path_ZIP
 
 if test -n "$ZIP"; then
-  echo "$as_me:35844: result: $ZIP" >&5
+  echo "$as_me:35905: result: $ZIP" >&5
 echo "${ECHO_T}$ZIP" >&6
 else
-  echo "$as_me:35847: result: no" >&5
+  echo "$as_me:35908: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -35854,7 +35915,7 @@ test -n "$ZIP" || ZIP="$ZIP"
 
 cf_path_prog=""
 cf_path_args=""
-IFS="${IFS= 	}"; cf_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR"
+IFS="${IFS:- 	}"; cf_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR"
 for cf_temp in $ac_cv_path_ZIP
 do
 	if test -z "$cf_path_prog" ; then
@@ -35903,7 +35964,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:35906: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:35967: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define ZIP_PATH "$cf_path_prog"
@@ -35930,7 +35991,7 @@ for ac_prog in $INSTALL install
 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:35933: checking for $ac_word" >&5
+echo "$as_me:35994: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_INSTALL+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -35947,7 +36008,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_INSTALL="$ac_dir/$ac_word"
-   echo "$as_me:35950: found $ac_dir/$ac_word" >&5
+   echo "$as_me:36011: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -35958,10 +36019,10 @@ fi
 INSTALL=$ac_cv_path_INSTALL
 
 if test -n "$INSTALL"; then
-  echo "$as_me:35961: result: $INSTALL" >&5
+  echo "$as_me:36022: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 else
-  echo "$as_me:35964: result: no" >&5
+  echo "$as_me:36025: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -35971,7 +36032,7 @@ test -n "$INSTALL" || INSTALL="$INSTALL"
 
 cf_path_prog=""
 cf_path_args=""
-IFS="${IFS= 	}"; cf_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR"
+IFS="${IFS:- 	}"; cf_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR"
 for cf_temp in $ac_cv_path_INSTALL
 do
 	if test -z "$cf_path_prog" ; then
@@ -36020,7 +36081,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:36023: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:36084: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define INSTALL_PATH "$cf_path_prog"
@@ -36046,7 +36107,7 @@ fi
 
 if test $cf_cv_screen = pdcurses ; then
 
-	echo "$as_me:36049: checking for X" >&5
+	echo "$as_me:36110: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -36143,17 +36204,17 @@ if test "$ac_x_includes" = no; then
   # 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 36146 "configure"
+#line 36207 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:36150: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:36211: \"$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:36156: \$? = $ac_status" >&5
+  echo "$as_me:36217: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -36186,7 +36247,7 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >conftest.$ac_ext <<_ACEOF
-#line 36189 "configure"
+#line 36250 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -36198,16 +36259,16 @@ XtMalloc (0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36201: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36262: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36204: \$? = $ac_status" >&5
+  echo "$as_me:36265: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36207: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36268: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36210: \$? = $ac_status" >&5
+  echo "$as_me:36271: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -36245,7 +36306,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:36248: result: $have_x" >&5
+  echo "$as_me:36309: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -36255,7 +36316,7 @@ else
   # 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:36258: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:36319: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -36279,11 +36340,11 @@ else
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:36282: checking whether -R must be followed by a space" >&5
+      echo "$as_me:36343: 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 36286 "configure"
+#line 36347 "configure"
 #include "confdefs.h"
 
 int
@@ -36295,16 +36356,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36298: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36359: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36301: \$? = $ac_status" >&5
+  echo "$as_me:36362: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36304: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36365: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36307: \$? = $ac_status" >&5
+  echo "$as_me:36368: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_nospace=yes
 else
@@ -36314,13 +36375,13 @@ ac_R_nospace=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
       if test $ac_R_nospace = yes; then
-	echo "$as_me:36317: result: no" >&5
+	echo "$as_me:36378: 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 36323 "configure"
+#line 36384 "configure"
 #include "confdefs.h"
 
 int
@@ -36332,16 +36393,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36335: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36396: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36338: \$? = $ac_status" >&5
+  echo "$as_me:36399: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36341: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36402: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36344: \$? = $ac_status" >&5
+  echo "$as_me:36405: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_space=yes
 else
@@ -36351,11 +36412,11 @@ ac_R_space=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	if test $ac_R_space = yes; then
-	  echo "$as_me:36354: result: yes" >&5
+	  echo "$as_me:36415: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:36358: result: neither works" >&5
+	  echo "$as_me:36419: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -36375,7 +36436,7 @@ echo "${ECHO_T}neither works" >&6
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
     cat >conftest.$ac_ext <<_ACEOF
-#line 36378 "configure"
+#line 36439 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -36394,22 +36455,22 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36397: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36458: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36400: \$? = $ac_status" >&5
+  echo "$as_me:36461: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36403: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36464: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36406: \$? = $ac_status" >&5
+  echo "$as_me:36467: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:36412: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:36473: 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
@@ -36417,7 +36478,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 36420 "configure"
+#line 36481 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -36436,16 +36497,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36439: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36500: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36442: \$? = $ac_status" >&5
+  echo "$as_me:36503: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36445: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36506: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36448: \$? = $ac_status" >&5
+  echo "$as_me:36509: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -36456,14 +36517,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:36459: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:36520: 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:36466: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:36527: 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
@@ -36471,7 +36532,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 36474 "configure"
+#line 36535 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -36490,16 +36551,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36493: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36554: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36496: \$? = $ac_status" >&5
+  echo "$as_me:36557: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36499: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36560: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36502: \$? = $ac_status" >&5
+  echo "$as_me:36563: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -36510,7 +36571,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:36513: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:36574: 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"
@@ -36529,13 +36590,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     # 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:36532: checking for gethostbyname" >&5
+    echo "$as_me:36593: 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 36538 "configure"
+#line 36599 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname (); below.  */
@@ -36566,16 +36627,16 @@ f = gethostbyname;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36569: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36630: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36572: \$? = $ac_status" >&5
+  echo "$as_me:36633: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36575: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36636: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36578: \$? = $ac_status" >&5
+  echo "$as_me:36639: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -36585,11 +36646,11 @@ ac_cv_func_gethostbyname=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:36588: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:36649: 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:36592: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:36653: 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
@@ -36597,7 +36658,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 36600 "configure"
+#line 36661 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -36616,16 +36677,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36619: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36680: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36622: \$? = $ac_status" >&5
+  echo "$as_me:36683: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36625: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36686: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36628: \$? = $ac_status" >&5
+  echo "$as_me:36689: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -36636,14 +36697,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:36639: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:36700: 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:36646: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:36707: 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
@@ -36651,7 +36712,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 36654 "configure"
+#line 36715 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -36670,16 +36731,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36673: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36734: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36676: \$? = $ac_status" >&5
+  echo "$as_me:36737: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36679: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36740: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36682: \$? = $ac_status" >&5
+  echo "$as_me:36743: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -36690,7 +36751,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:36693: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:36754: 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"
@@ -36706,13 +36767,13 @@ fi
     # 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:36709: checking for connect" >&5
+    echo "$as_me:36770: 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 36715 "configure"
+#line 36776 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect (); below.  */
@@ -36743,16 +36804,16 @@ f = connect;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36746: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36807: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36749: \$? = $ac_status" >&5
+  echo "$as_me:36810: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36752: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36813: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36755: \$? = $ac_status" >&5
+  echo "$as_me:36816: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_connect=yes
 else
@@ -36762,11 +36823,11 @@ ac_cv_func_connect=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:36765: result: $ac_cv_func_connect" >&5
+echo "$as_me:36826: 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:36769: checking for connect in -lsocket" >&5
+      echo "$as_me:36830: 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
@@ -36774,7 +36835,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 36777 "configure"
+#line 36838 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -36793,16 +36854,16 @@ connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36796: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36857: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36799: \$? = $ac_status" >&5
+  echo "$as_me:36860: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36802: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36863: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36805: \$? = $ac_status" >&5
+  echo "$as_me:36866: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -36813,7 +36874,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:36816: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:36877: 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"
@@ -36822,13 +36883,13 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:36825: checking for remove" >&5
+    echo "$as_me:36886: 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 36831 "configure"
+#line 36892 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove (); below.  */
@@ -36859,16 +36920,16 @@ f = remove;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36862: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36923: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36865: \$? = $ac_status" >&5
+  echo "$as_me:36926: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36868: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36929: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36871: \$? = $ac_status" >&5
+  echo "$as_me:36932: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_remove=yes
 else
@@ -36878,11 +36939,11 @@ ac_cv_func_remove=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:36881: result: $ac_cv_func_remove" >&5
+echo "$as_me:36942: 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:36885: checking for remove in -lposix" >&5
+      echo "$as_me:36946: 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
@@ -36890,7 +36951,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 36893 "configure"
+#line 36954 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -36909,16 +36970,16 @@ remove ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36912: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36973: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36915: \$? = $ac_status" >&5
+  echo "$as_me:36976: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36918: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36979: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36921: \$? = $ac_status" >&5
+  echo "$as_me:36982: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -36929,7 +36990,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:36932: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:36993: 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"
@@ -36938,13 +36999,13 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:36941: checking for shmat" >&5
+    echo "$as_me:37002: 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 36947 "configure"
+#line 37008 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat (); below.  */
@@ -36975,16 +37036,16 @@ f = shmat;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36978: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37039: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36981: \$? = $ac_status" >&5
+  echo "$as_me:37042: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36984: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37045: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36987: \$? = $ac_status" >&5
+  echo "$as_me:37048: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -36994,11 +37055,11 @@ ac_cv_func_shmat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:36997: result: $ac_cv_func_shmat" >&5
+echo "$as_me:37058: 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:37001: checking for shmat in -lipc" >&5
+      echo "$as_me:37062: 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
@@ -37006,7 +37067,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 37009 "configure"
+#line 37070 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -37025,16 +37086,16 @@ shmat ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:37028: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37089: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37031: \$? = $ac_status" >&5
+  echo "$as_me:37092: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:37034: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37095: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37037: \$? = $ac_status" >&5
+  echo "$as_me:37098: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -37045,7 +37106,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:37048: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:37109: 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"
@@ -37063,7 +37124,7 @@ fi
   # 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:37066: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:37127: 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
@@ -37071,7 +37132,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 37074 "configure"
+#line 37135 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -37090,16 +37151,16 @@ IceConnectionNumber ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:37093: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37154: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37096: \$? = $ac_status" >&5
+  echo "$as_me:37157: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:37099: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37160: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37102: \$? = $ac_status" >&5
+  echo "$as_me:37163: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -37110,7 +37171,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:37113: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:37174: 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"
@@ -37120,9 +37181,9 @@ fi
 
 fi
 
-cf_x_athena=${cf_x_athena-Xaw}
+cf_x_athena=${cf_x_athena:-Xaw}
 
-echo "$as_me:37125: checking if you want to link with Xaw 3d library" >&5
+echo "$as_me:37186: 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=
 
@@ -37133,14 +37194,14 @@ if test "${with_Xaw3d+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3d
-	echo "$as_me:37136: result: yes" >&5
+	echo "$as_me:37197: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:37139: result: no" >&5
+	echo "$as_me:37200: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:37143: checking if you want to link with neXT Athena library" >&5
+echo "$as_me:37204: 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=
 
@@ -37151,14 +37212,14 @@ if test "${with_neXtaw+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=neXtaw
-	echo "$as_me:37154: result: yes" >&5
+	echo "$as_me:37215: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:37157: result: no" >&5
+	echo "$as_me:37218: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:37161: checking if you want to link with Athena-Plus library" >&5
+echo "$as_me:37222: 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=
 
@@ -37169,10 +37230,10 @@ if test "${with_XawPlus+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=XawPlus
-	echo "$as_me:37172: result: yes" >&5
+	echo "$as_me:37233: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:37175: result: no" >&5
+	echo "$as_me:37236: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37192,17 +37253,17 @@ if test "$PKG_CONFIG" != none ; then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists $cf_athena_pkg; then
 	test -n "$verbose" && echo "	found package $cf_athena_pkg" 1>&6
 
-echo "${as_me-configure}:37195: testing found package $cf_athena_pkg ..." 1>&5
+echo "${as_me:-configure}:37256: testing found package $cf_athena_pkg ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags $cf_athena_pkg 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   $cf_athena_pkg 2>/dev/null`"
 	test -n "$verbose" && echo "	package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me-configure}:37201: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:37262: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package $cf_athena_pkg LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me-configure}:37205: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:37266: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -37292,6 +37353,174 @@ cf_x_athena_LIBS=`echo "HAVE_LIB_$cf_x_athena" | sed y%abcdefghijklmnopqrstuvwxy
 #define $cf_x_athena_LIBS 1
 EOF
 
+echo "$as_me:37356: checking for usable $cf_x_athena/Xmu package" >&5
+echo $ECHO_N "checking for usable $cf_x_athena/Xmu package... $ECHO_C" >&6
+if test "${cf_cv_xaw_compat+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+cat >conftest.$ac_ext <<_ACEOF
+#line 37363 "configure"
+#include "confdefs.h"
+
+#include <X11/Xmu/CharSet.h>
+
+int
+main ()
+{
+
+int check = XmuCompareISOLatin1("big", "small")
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:37379: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:37382: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:37385: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:37388: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  cf_cv_xaw_compat=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+cf_cv_xaw_compat=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:37398: result: $cf_cv_xaw_compat" >&5
+echo "${ECHO_T}$cf_cv_xaw_compat" >&6
+
+			if test "$cf_cv_xaw_compat" = no
+			then
+				# workaround for broken ".pc" files...
+				case "$cf_x_athena_lib" in #(vi
+				*-lXmu*) #(vi
+					;;
+				*)
+					test -n "$verbose" && echo "	work around broken package" 1>&6
+
+echo "${as_me:-configure}:37410: testing work around broken package ..." 1>&5
+
+if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xmu; then
+	test -n "$verbose" && echo "	found package xmu" 1>&6
+
+echo "${as_me:-configure}:37415: testing found package xmu ..." 1>&5
+
+	cf_pkgconfig_incs="`$PKG_CONFIG --cflags xmu 2>/dev/null`"
+	cf_pkgconfig_libs="`$PKG_CONFIG --libs   xmu 2>/dev/null`"
+	test -n "$verbose" && echo "	package xmu CFLAGS: $cf_pkgconfig_incs" 1>&6
+
+echo "${as_me:-configure}:37421: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+
+	test -n "$verbose" && echo "	package xmu LIBS: $cf_pkgconfig_libs" 1>&6
+
+echo "${as_me:-configure}:37425: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+cf_fix_cppflags=no
+cf_new_cflags=
+cf_new_cppflags=
+cf_new_extra_cppflags=
+
+for cf_add_cflags in $cf_pkgconfig_incs
+do
+case $cf_fix_cppflags in
+no)
+	case $cf_add_cflags in #(vi
+	-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
+		case $cf_add_cflags in
+		-D*)
+			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+
+			test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+				&& test -z "${cf_tst_cflags}" \
+				&& cf_fix_cppflags=yes
+
+			if test $cf_fix_cppflags = yes ; then
+				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+				continue
+			elif test "${cf_tst_cflags}" = "\"'" ; then
+				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+				continue
+			fi
+			;;
+		esac
+		case "$CPPFLAGS" in
+		*$cf_add_cflags) #(vi
+			;;
+		*) #(vi
+			case $cf_add_cflags in #(vi
+			-D*)
+				cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
+
+CPPFLAGS=`echo "$CPPFLAGS" | \
+	sed	-e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ 	]*\)\?[ 	]/ /g' \
+		-e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ 	]*\)\?$//g'`
+
+				;;
+			esac
+			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+			;;
+		esac
+		;;
+	*)
+		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+		;;
+	esac
+	;;
+yes)
+	cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
+
+	test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+		&& test -z "${cf_tst_cflags}" \
+		&& cf_fix_cppflags=no
+	;;
+esac
+done
+
+if test -n "$cf_new_cflags" ; then
+
+	CFLAGS="$CFLAGS $cf_new_cflags"
+fi
+
+if test -n "$cf_new_cppflags" ; then
+
+	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+fi
+
+if test -n "$cf_new_extra_cppflags" ; then
+
+	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+fi
+
+	LIBS="$cf_pkgconfig_libs $LIBS"
+	:
+else
+
+test -n "$verbose" && echo "	...before $LIBS" 1>&6
+
+echo "${as_me:-configure}:37511: testing ...before $LIBS ..." 1>&5
+
+LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s,-lXt ,-lXt -lXmu ," -e 's/  / /g'`
+test -n "$verbose" && echo "	...after  $LIBS" 1>&6
+
+echo "${as_me:-configure}:37516: testing ...after  $LIBS ..." 1>&5
+
+fi
+
+					;;
+				esac
+			fi
+
 			break
 else
 	:
@@ -37305,17 +37534,17 @@ if test -z "$cf_x_athena_lib" ; then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists Xext; then
 	test -n "$verbose" && echo "	found package Xext" 1>&6
 
-echo "${as_me-configure}:37308: testing found package Xext ..." 1>&5
+echo "${as_me:-configure}:37537: testing found package Xext ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags Xext 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   Xext 2>/dev/null`"
 	test -n "$verbose" && echo "	package Xext CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me-configure}:37314: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:37543: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package Xext LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me-configure}:37318: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:37547: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -37399,7 +37628,7 @@ fi
 	:
 else
 
-	echo "$as_me:37402: checking for XextCreateExtension in -lXext" >&5
+	echo "$as_me:37631: 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
@@ -37407,7 +37636,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 37410 "configure"
+#line 37639 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -37426,16 +37655,16 @@ XextCreateExtension ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:37429: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37658: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37432: \$? = $ac_status" >&5
+  echo "$as_me:37661: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:37435: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37664: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37438: \$? = $ac_status" >&5
+  echo "$as_me:37667: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
@@ -37446,7 +37675,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:37449: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:37678: 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"
@@ -37459,17 +37688,17 @@ cf_have_X_LIBS=no
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then
 	test -n "$verbose" && echo "	found package xt" 1>&6
 
-echo "${as_me-configure}:37462: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:37691: testing found package xt ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags xt 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   xt 2>/dev/null`"
 	test -n "$verbose" && echo "	package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me-configure}:37468: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:37697: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package xt LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me-configure}:37472: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:37701: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -37551,30 +37780,447 @@ fi
 
 	LIBS="$cf_pkgconfig_libs $LIBS"
 
-	# workaround for broken ".pc" files used for X Toolkit.
-	case "x$X_PRE_LIBS" in #(vi
-	*-lICE*)
-		case "x$LIBS" in #(vi
-		*-lICE*) #(vi
+	case "x$LIBS" in #(vi
+	*-lX11*) #(vi
+		;;
+	*)
+# we have an "xt" package, but it may omit Xt's dependency on X11
+echo "$as_me:37788: checking for usable X dependency" >&5
+echo $ECHO_N "checking for usable X dependency... $ECHO_C" >&6
+if test "${cf_cv_xt_x11_compat+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+cat >conftest.$ac_ext <<_ACEOF
+#line 37795 "configure"
+#include "confdefs.h"
+
+#include <X11/Xlib.h>
+
+int
+main ()
+{
+
+	int rc1 = XDrawLine((Display*) 0, (Drawable) 0, (GC) 0, 0, 0, 0, 0);
+	int rc2 = XClearWindow((Display*) 0, (Window) 0);
+	int rc3 = XMoveWindow((Display*) 0, (Window) 0, 0, 0);
+	int rc4 = XMoveResizeWindow((Display*)0, (Window)0, 0, 0, 0, 0);
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:37814: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:37817: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:37820: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:37823: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  cf_cv_xt_x11_compat=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+cf_cv_xt_x11_compat=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:37833: result: $cf_cv_xt_x11_compat" >&5
+echo "${ECHO_T}$cf_cv_xt_x11_compat" >&6
+		if test "$cf_cv_xt_x11_compat" = no
+		then
+			test -n "$verbose" && echo "	work around broken X11 dependency" 1>&6
+
+echo "${as_me:-configure}:37839: testing work around broken X11 dependency ..." 1>&5
+
+			# 2010/11/19 - good enough until a working Xt on Xcb is delivered.
+
+if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then
+	test -n "$verbose" && echo "	found package x11" 1>&6
+
+echo "${as_me:-configure}:37846: testing found package x11 ..." 1>&5
+
+	cf_pkgconfig_incs="`$PKG_CONFIG --cflags x11 2>/dev/null`"
+	cf_pkgconfig_libs="`$PKG_CONFIG --libs   x11 2>/dev/null`"
+	test -n "$verbose" && echo "	package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
+
+echo "${as_me:-configure}:37852: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+
+	test -n "$verbose" && echo "	package x11 LIBS: $cf_pkgconfig_libs" 1>&6
+
+echo "${as_me:-configure}:37856: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+cf_fix_cppflags=no
+cf_new_cflags=
+cf_new_cppflags=
+cf_new_extra_cppflags=
+
+for cf_add_cflags in $cf_pkgconfig_incs
+do
+case $cf_fix_cppflags in
+no)
+	case $cf_add_cflags in #(vi
+	-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
+		case $cf_add_cflags in
+		-D*)
+			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+
+			test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+				&& test -z "${cf_tst_cflags}" \
+				&& cf_fix_cppflags=yes
+
+			if test $cf_fix_cppflags = yes ; then
+				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+				continue
+			elif test "${cf_tst_cflags}" = "\"'" ; then
+				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+				continue
+			fi
 			;;
-		*)
-			test -n "$verbose" && echo "	work around broken package" 1>&6
+		esac
+		case "$CPPFLAGS" in
+		*$cf_add_cflags) #(vi
+			;;
+		*) #(vi
+			case $cf_add_cflags in #(vi
+			-D*)
+				cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
+
+CPPFLAGS=`echo "$CPPFLAGS" | \
+	sed	-e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ 	]*\)\?[ 	]/ /g' \
+		-e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ 	]*\)\?$//g'`
+
+				;;
+			esac
+			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+			;;
+		esac
+		;;
+	*)
+		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+		;;
+	esac
+	;;
+yes)
+	cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
+
+	test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+		&& test -z "${cf_tst_cflags}" \
+		&& cf_fix_cppflags=no
+	;;
+esac
+done
+
+if test -n "$cf_new_cflags" ; then
+
+	CFLAGS="$CFLAGS $cf_new_cflags"
+fi
+
+if test -n "$cf_new_cppflags" ; then
+
+	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+fi
+
+if test -n "$cf_new_extra_cppflags" ; then
+
+	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+fi
+
+	LIBS="$cf_pkgconfig_libs $LIBS"
+	:
+else
+
+test -n "$verbose" && echo "	...before $LIBS" 1>&6
+
+echo "${as_me:-configure}:37942: testing ...before $LIBS ..." 1>&5
+
+LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s,-lXt ,-lXt -lX11 ," -e 's/  / /g'`
+test -n "$verbose" && echo "	...after  $LIBS" 1>&6
+
+echo "${as_me:-configure}:37947: testing ...after  $LIBS ..." 1>&5
+
+fi
+
+		fi
+		;;
+	esac
+
+echo "$as_me:37955: checking for usable X Toolkit package" >&5
+echo $ECHO_N "checking for usable X Toolkit package... $ECHO_C" >&6
+if test "${cf_cv_xt_ice_compat+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+cat >conftest.$ac_ext <<_ACEOF
+#line 37962 "configure"
+#include "confdefs.h"
+
+#include <X11/Shell.h>
+
+int
+main ()
+{
+int num = IceConnectionNumber(0)
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:37977: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:37980: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:37983: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:37986: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  cf_cv_xt_ice_compat=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+cf_cv_xt_ice_compat=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:37996: result: $cf_cv_xt_ice_compat" >&5
+echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
+
+	if test "$cf_cv_xt_ice_compat" = no
+	then
+		# workaround for broken ".pc" files used for X Toolkit.
+		case "x$X_PRE_LIBS" in #(vi
+		*-lICE*)
+			case "x$LIBS" in #(vi
+			*-lICE*) #(vi
+				;;
+			*)
+				test -n "$verbose" && echo "	work around broken ICE dependency" 1>&6
+
+echo "${as_me:-configure}:38010: testing work around broken ICE dependency ..." 1>&5
+
+if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then
+	test -n "$verbose" && echo "	found package ice" 1>&6
+
+echo "${as_me:-configure}:38015: testing found package ice ..." 1>&5
+
+	cf_pkgconfig_incs="`$PKG_CONFIG --cflags ice 2>/dev/null`"
+	cf_pkgconfig_libs="`$PKG_CONFIG --libs   ice 2>/dev/null`"
+	test -n "$verbose" && echo "	package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
+
+echo "${as_me:-configure}:38021: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+
+	test -n "$verbose" && echo "	package ice LIBS: $cf_pkgconfig_libs" 1>&6
+
+echo "${as_me:-configure}:38025: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+cf_fix_cppflags=no
+cf_new_cflags=
+cf_new_cppflags=
+cf_new_extra_cppflags=
 
-echo "${as_me-configure}:37563: testing work around broken package ..." 1>&5
+for cf_add_cflags in $cf_pkgconfig_incs
+do
+case $cf_fix_cppflags in
+no)
+	case $cf_add_cflags in #(vi
+	-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
+		case $cf_add_cflags in
+		-D*)
+			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
 
-			test -n "$verbose" && echo "	...before $LIBS" 1>&6
+			test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+				&& test -z "${cf_tst_cflags}" \
+				&& cf_fix_cppflags=yes
 
-echo "${as_me-configure}:37567: testing ...before $LIBS ..." 1>&5
+			if test $cf_fix_cppflags = yes ; then
+				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+				continue
+			elif test "${cf_tst_cflags}" = "\"'" ; then
+				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+				continue
+			fi
+			;;
+		esac
+		case "$CPPFLAGS" in
+		*$cf_add_cflags) #(vi
+			;;
+		*) #(vi
+			case $cf_add_cflags in #(vi
+			-D*)
+				cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
-			LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s,-lXt ,-lXt $X_PRE_LIBS ," -e 's/  / /g'`
-			test -n "$verbose" && echo "	...after  $LIBS" 1>&6
+CPPFLAGS=`echo "$CPPFLAGS" | \
+	sed	-e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ 	]*\)\?[ 	]/ /g' \
+		-e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ 	]*\)\?$//g'`
+
+				;;
+			esac
+			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+			;;
+		esac
+		;;
+	*)
+		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+		;;
+	esac
+	;;
+yes)
+	cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
 
-echo "${as_me-configure}:37572: testing ...after  $LIBS ..." 1>&5
+	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
+
+	test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+		&& test -z "${cf_tst_cflags}" \
+		&& cf_fix_cppflags=no
+	;;
+esac
+done
+
+if test -n "$cf_new_cflags" ; then
+
+	CFLAGS="$CFLAGS $cf_new_cflags"
+fi
+
+if test -n "$cf_new_cppflags" ; then
+
+	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+fi
+
+if test -n "$cf_new_extra_cppflags" ; then
+
+	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+fi
+
+	LIBS="$cf_pkgconfig_libs $LIBS"
+
+if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then
+	test -n "$verbose" && echo "	found package sm" 1>&6
+
+echo "${as_me:-configure}:38110: testing found package sm ..." 1>&5
+
+	cf_pkgconfig_incs="`$PKG_CONFIG --cflags sm 2>/dev/null`"
+	cf_pkgconfig_libs="`$PKG_CONFIG --libs   sm 2>/dev/null`"
+	test -n "$verbose" && echo "	package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
+
+echo "${as_me:-configure}:38116: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+
+	test -n "$verbose" && echo "	package sm LIBS: $cf_pkgconfig_libs" 1>&6
+
+echo "${as_me:-configure}:38120: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+
+cf_fix_cppflags=no
+cf_new_cflags=
+cf_new_cppflags=
+cf_new_extra_cppflags=
+
+for cf_add_cflags in $cf_pkgconfig_incs
+do
+case $cf_fix_cppflags in
+no)
+	case $cf_add_cflags in #(vi
+	-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
+		case $cf_add_cflags in
+		-D*)
+			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
 
+			test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+				&& test -z "${cf_tst_cflags}" \
+				&& cf_fix_cppflags=yes
+
+			if test $cf_fix_cppflags = yes ; then
+				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+				continue
+			elif test "${cf_tst_cflags}" = "\"'" ; then
+				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+				continue
+			fi
+			;;
+		esac
+		case "$CPPFLAGS" in
+		*$cf_add_cflags) #(vi
+			;;
+		*) #(vi
+			case $cf_add_cflags in #(vi
+			-D*)
+				cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
+
+CPPFLAGS=`echo "$CPPFLAGS" | \
+	sed	-e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ 	]*\)\?[ 	]/ /g' \
+		-e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ 	]*\)\?$//g'`
+
+				;;
+			esac
+			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
 			;;
 		esac
 		;;
+	*)
+		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+		;;
 	esac
+	;;
+yes)
+	cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
+
+	test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+		&& test -z "${cf_tst_cflags}" \
+		&& cf_fix_cppflags=no
+	;;
+esac
+done
+
+if test -n "$cf_new_cflags" ; then
+
+	CFLAGS="$CFLAGS $cf_new_cflags"
+fi
+
+if test -n "$cf_new_cppflags" ; then
+
+	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+fi
+
+if test -n "$cf_new_extra_cppflags" ; then
+
+	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+fi
+
+	LIBS="$cf_pkgconfig_libs $LIBS"
+	:
+else
+	:
+fi
+
+else
+
+test -n "$verbose" && echo "	...before $LIBS" 1>&6
+
+echo "${as_me:-configure}:38210: testing ...before $LIBS ..." 1>&5
+
+LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s,-lXt ,-lXt $X_PRE_LIBS ," -e 's/  / /g'`
+test -n "$verbose" && echo "	...after  $LIBS" 1>&6
+
+echo "${as_me:-configure}:38215: testing ...after  $LIBS ..." 1>&5
+
+fi
+
+				;;
+			esac
+			;;
+		esac
+	fi
 
 	cf_have_X_LIBS=yes
 
@@ -37584,7 +38230,7 @@ else
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me-configure}:37587: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:38233: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -37655,7 +38301,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me-configure}:37658: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:38304: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	CFLAGS="$CFLAGS $cf_new_cflags"
 fi
@@ -37663,7 +38309,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me-configure}:37666: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:38312: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
 fi
@@ -37671,14 +38317,14 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me-configure}:37674: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:38320: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
 
 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
 fi
 
 if test "$cf_check_cflags" != "$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 37681 "configure"
+#line 38327 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -37690,16 +38336,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:37693: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38339: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37696: \$? = $ac_status" >&5
+  echo "$as_me:38342: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:37699: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38345: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37702: \$? = $ac_status" >&5
+  echo "$as_me:38348: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -37707,12 +38353,12 @@ else
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me-configure}:37710: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:38356: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
 
 	 if test "$cf_check_cppflags" != "$CPPFLAGS" ; then
 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
 
-echo "${as_me-configure}:37715: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:38361: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_flags"
@@ -37720,13 +38366,13 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-	echo "$as_me:37723: checking for XOpenDisplay" >&5
+	echo "$as_me:38369: 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 37729 "configure"
+#line 38375 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char XOpenDisplay (); below.  */
@@ -37757,16 +38403,16 @@ f = XOpenDisplay;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:37760: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38406: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37763: \$? = $ac_status" >&5
+  echo "$as_me:38409: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:37766: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38412: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37769: \$? = $ac_status" >&5
+  echo "$as_me:38415: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_XOpenDisplay=yes
 else
@@ -37776,13 +38422,13 @@ ac_cv_func_XOpenDisplay=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:37779: result: $ac_cv_func_XOpenDisplay" >&5
+echo "$as_me:38425: 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:37785: checking for XOpenDisplay in -lX11" >&5
+	echo "$as_me:38431: 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
@@ -37790,7 +38436,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 37793 "configure"
+#line 38439 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -37809,16 +38455,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:37812: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38458: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37815: \$? = $ac_status" >&5
+  echo "$as_me:38461: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:37818: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38464: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37821: \$? = $ac_status" >&5
+  echo "$as_me:38467: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -37829,7 +38475,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:37832: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:38478: 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"
@@ -37837,13 +38483,13 @@ fi
 
 fi
 
-	echo "$as_me:37840: checking for XtAppInitialize" >&5
+	echo "$as_me:38486: 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 37846 "configure"
+#line 38492 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char XtAppInitialize (); below.  */
@@ -37874,16 +38520,16 @@ f = XtAppInitialize;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:37877: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38523: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37880: \$? = $ac_status" >&5
+  echo "$as_me:38526: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:37883: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38529: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37886: \$? = $ac_status" >&5
+  echo "$as_me:38532: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_XtAppInitialize=yes
 else
@@ -37893,13 +38539,13 @@ ac_cv_func_XtAppInitialize=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:37896: result: $ac_cv_func_XtAppInitialize" >&5
+echo "$as_me:38542: 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:37902: checking for XtAppInitialize in -lXt" >&5
+	echo "$as_me:38548: 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
@@ -37907,7 +38553,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 37910 "configure"
+#line 38556 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -37926,16 +38572,16 @@ XtAppInitialize ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:37929: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38575: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37932: \$? = $ac_status" >&5
+  echo "$as_me:38578: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:37935: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38581: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37938: \$? = $ac_status" >&5
+  echo "$as_me:38584: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xt_XtAppInitialize=yes
 else
@@ -37946,7 +38592,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:37949: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:38595: 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
@@ -37962,7 +38608,7 @@ fi
 fi
 
 if test $cf_have_X_LIBS = no ; then
-	{ echo "$as_me:37965: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+	{ echo "$as_me:38611: 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
@@ -37984,14 +38630,14 @@ do
 		cf_test=X11/$cf_x_athena_root/SimpleMenu.h
 		if test $cf_path != default ; then
 			CPPFLAGS="$cf_save -I$cf_path/include"
-			echo "$as_me:37987: checking for $cf_test in $cf_path" >&5
+			echo "$as_me:38633: 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:37990: checking for $cf_test" >&5
+			echo "$as_me:38636: checking for $cf_test" >&5
 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
 		fi
 		cat >conftest.$ac_ext <<_ACEOF
-#line 37994 "configure"
+#line 38640 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -38005,16 +38651,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:38008: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:38654: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:38011: \$? = $ac_status" >&5
+  echo "$as_me:38657: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:38014: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38660: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38017: \$? = $ac_status" >&5
+  echo "$as_me:38663: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -38023,7 +38669,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-		echo "$as_me:38026: result: $cf_result" >&5
+		echo "$as_me:38672: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 		if test "$cf_result" = yes ; then
 			cf_x_athena_inc=$cf_path
@@ -38035,7 +38681,7 @@ echo "${ECHO_T}$cf_result" >&6
 done
 
 if test -z "$cf_x_athena_inc" ; then
-	{ echo "$as_me:38038: WARNING: Unable to successfully find Athena header files with test program" >&5
+	{ echo "$as_me:38684: 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_inc" != default ; then
 	CPPFLAGS="$CPPFLAGS -I$cf_x_athena_inc"
@@ -38060,15 +38706,15 @@ do
 			cf_test=XawSimpleMenuAddGlobalActions
 			if test $cf_path != default ; then
 				LIBS="-L$cf_path/lib $cf_lib $LIBS"
-				echo "$as_me:38063: checking for $cf_lib in $cf_path" >&5
+				echo "$as_me:38709: 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:38067: checking for $cf_test in $cf_lib" >&5
+				echo "$as_me:38713: checking for $cf_test in $cf_lib" >&5
 echo $ECHO_N "checking for $cf_test in $cf_lib... $ECHO_C" >&6
 			fi
 			cat >conftest.$ac_ext <<_ACEOF
-#line 38071 "configure"
+#line 38717 "configure"
 #include "confdefs.h"
 
 int
@@ -38080,16 +38726,16 @@ $cf_test()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38083: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38729: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38086: \$? = $ac_status" >&5
+  echo "$as_me:38732: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38089: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38735: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38092: \$? = $ac_status" >&5
+  echo "$as_me:38738: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -38098,7 +38744,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-			echo "$as_me:38101: result: $cf_result" >&5
+			echo "$as_me:38747: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				cf_x_athena_lib="$cf_lib"
@@ -38110,7 +38756,7 @@ echo "${ECHO_T}$cf_result" >&6
 done
 
 if test -z "$cf_x_athena_lib" ; then
-	{ { echo "$as_me:38113: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+	{ { echo "$as_me:38759: 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
@@ -38127,7 +38773,7 @@ for ac_prog in xcurses-config
 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:38130: checking for $ac_word" >&5
+echo "$as_me:38776: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_XCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -38144,7 +38790,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_XCURSES_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:38147: found $ac_dir/$ac_word" >&5
+   echo "$as_me:38793: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -38155,10 +38801,10 @@ fi
 XCURSES_CONFIG=$ac_cv_path_XCURSES_CONFIG
 
 if test -n "$XCURSES_CONFIG"; then
-  echo "$as_me:38158: result: $XCURSES_CONFIG" >&5
+  echo "$as_me:38804: result: $XCURSES_CONFIG" >&5
 echo "${ECHO_T}$XCURSES_CONFIG" >&6
 else
-  echo "$as_me:38161: result: no" >&5
+  echo "$as_me:38807: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -38179,7 +38825,7 @@ LDFLAGS="$LDFLAGS $X_LIBS"
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me-configure}:38182: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:38828: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -38250,7 +38896,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me-configure}:38253: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:38899: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	CFLAGS="$CFLAGS $cf_new_cflags"
 fi
@@ -38258,7 +38904,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me-configure}:38261: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:38907: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
 fi
@@ -38266,14 +38912,14 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me-configure}:38269: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:38915: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
 
 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
 fi
 
 if test "$cf_check_cflags" != "$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 38276 "configure"
+#line 38922 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -38285,16 +38931,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38288: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38934: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38291: \$? = $ac_status" >&5
+  echo "$as_me:38937: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38294: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38940: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38297: \$? = $ac_status" >&5
+  echo "$as_me:38943: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -38302,12 +38948,12 @@ else
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me-configure}:38305: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:38951: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
 
 	 if test "$cf_check_cppflags" != "$CPPFLAGS" ; then
 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
 
-echo "${as_me-configure}:38310: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:38956: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_flags"
@@ -38315,7 +38961,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:38318: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:38964: 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
@@ -38323,7 +38969,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 38326 "configure"
+#line 38972 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -38342,16 +38988,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38345: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38991: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38348: \$? = $ac_status" >&5
+  echo "$as_me:38994: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38351: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38997: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38354: \$? = $ac_status" >&5
+  echo "$as_me:39000: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -38362,13 +39008,13 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:38365: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:39011: result: $ac_cv_lib_X11_XOpenDisplay" >&5
 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
 if test $ac_cv_lib_X11_XOpenDisplay = yes; then
   LIBS="-lX11 $LIBS"
 fi
 
-echo "$as_me:38371: checking for XCurses library" >&5
+echo "$as_me:39017: checking for XCurses library" >&5
 echo $ECHO_N "checking for XCurses library... $ECHO_C" >&6
 if test "${cf_cv_lib_XCurses+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -38376,7 +39022,7 @@ else
 
 LIBS="-lXCurses $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 38379 "configure"
+#line 39025 "configure"
 #include "confdefs.h"
 
 #include <xcurses.h>
@@ -38391,16 +39037,16 @@ XCursesExit();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38394: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39040: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38397: \$? = $ac_status" >&5
+  echo "$as_me:39043: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38400: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39046: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38403: \$? = $ac_status" >&5
+  echo "$as_me:39049: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_lib_XCurses=yes
 else
@@ -38411,7 +39057,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:38414: result: $cf_cv_lib_XCurses" >&5
+echo "$as_me:39060: result: $cf_cv_lib_XCurses" >&5
 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
 
 fi
@@ -38430,24 +39076,24 @@ EOF
 EOF
 
 else
-	{ { echo "$as_me:38433: error: Cannot link with XCurses" >&5
+	{ { echo "$as_me:39079: error: Cannot link with XCurses" >&5
 echo "$as_me: error: Cannot link with XCurses" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 else
 
-echo "$as_me:38440: checking if we can include termio.h with curses" >&5
+echo "$as_me:39086: checking if we can include termio.h with curses" >&5
 echo $ECHO_N "checking if we can include termio.h with curses... $ECHO_C" >&6
 if test "${cf_cv_termio_and_curses+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cf_save_CFLAGS="$CPPFLAGS"
-    CPPFLAGS="$CPPFLAGS -DHAVE_CONFIG_H -I. -I${srcdir-.} -I${srcdir-.}/src -I${srcdir-.}/WWW/Library/Implementation"
+    CPPFLAGS="$CPPFLAGS -DHAVE_CONFIG_H -I. -I${srcdir:-.} -I${srcdir:-.}/src -I${srcdir:-.}/WWW/Library/Implementation"
     touch lynx_cfg.h
     cat >conftest.$ac_ext <<_ACEOF
-#line 38450 "configure"
+#line 39096 "configure"
 #include "confdefs.h"
 
 #include <LYCurses.h>
@@ -38461,16 +39107,16 @@ putchar(0x0a)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:38464: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:39110: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:38467: \$? = $ac_status" >&5
+  echo "$as_me:39113: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:38470: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39116: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38473: \$? = $ac_status" >&5
+  echo "$as_me:39119: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termio_and_curses=yes
 else
@@ -38483,7 +39129,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
     rm -f lynx_cfg.h
 
 fi
-echo "$as_me:38486: result: $cf_cv_termio_and_curses" >&5
+echo "$as_me:39132: result: $cf_cv_termio_and_curses" >&5
 echo "${ECHO_T}$cf_cv_termio_and_curses" >&6
 
 test $cf_cv_termio_and_curses = yes && cat >>confdefs.h <<\EOF
@@ -38498,23 +39144,23 @@ if test $cf_cv_screen != slang ; then
 for ac_header in $cf_cv_screen/term.h term.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:38501: checking for $ac_header" >&5
+echo "$as_me:39147: 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 38507 "configure"
+#line 39153 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:38511: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:39157: \"$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:38517: \$? = $ac_status" >&5
+  echo "$as_me:39163: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -38533,7 +39179,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:38536: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:39182: 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
@@ -38543,7 +39189,7 @@ EOF
 fi
 done
 
-echo "$as_me:38546: checking if curses supports alternate-character set" >&5
+echo "$as_me:39192: checking if curses supports alternate-character set" >&5
 echo $ECHO_N "checking if curses supports alternate-character set... $ECHO_C" >&6
 if test "${cf_cv_alt_char_set+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -38552,10 +39198,10 @@ else
 for mapname in acs_map _acs_map
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 38555 "configure"
+#line 39201 "configure"
 #include "confdefs.h"
 
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 
 int
 main ()
@@ -38566,16 +39212,16 @@ chtype x = $mapname['l']; $mapname['m'] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38569: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39215: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38572: \$? = $ac_status" >&5
+  echo "$as_me:39218: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38575: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39221: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38578: \$? = $ac_status" >&5
+  echo "$as_me:39224: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_alt_char_set=$mapname
 	 break
@@ -38589,23 +39235,23 @@ done
 
 fi
 
-echo "$as_me:38592: result: $cf_cv_alt_char_set" >&5
+echo "$as_me:39238: result: $cf_cv_alt_char_set" >&5
 echo "${ECHO_T}$cf_cv_alt_char_set" >&6
 test $cf_cv_alt_char_set != no && cat >>confdefs.h <<EOF
 #define ALT_CHAR_SET $cf_cv_alt_char_set
 EOF
 
-echo "$as_me:38598: checking if curses supports fancy attributes" >&5
+echo "$as_me:39244: checking if curses supports fancy attributes" >&5
 echo $ECHO_N "checking if curses supports fancy attributes... $ECHO_C" >&6
 if test "${cf_cv_fancy_curses+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 38605 "configure"
+#line 39251 "configure"
 #include "confdefs.h"
 
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 
 int
 main ()
@@ -38620,16 +39266,16 @@ attrset(A_UNDERLINE|A_BOLD|A_REVERSE);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38623: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39269: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38626: \$? = $ac_status" >&5
+  echo "$as_me:39272: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38629: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39275: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38632: \$? = $ac_status" >&5
+  echo "$as_me:39278: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fancy_curses=yes
 else
@@ -38641,13 +39287,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:38644: result: $cf_cv_fancy_curses" >&5
+echo "$as_me:39290: result: $cf_cv_fancy_curses" >&5
 echo "${ECHO_T}$cf_cv_fancy_curses" >&6
 test $cf_cv_fancy_curses = yes && cat >>confdefs.h <<\EOF
 #define FANCY_CURSES 1
 EOF
 
-echo "$as_me:38650: checking for function curses_version" >&5
+echo "$as_me:39296: checking for function curses_version" >&5
 echo $ECHO_N "checking for function curses_version... $ECHO_C" >&6
 if test "${cf_cv_func_curses_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -38657,28 +39303,28 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_curses_version=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 38660 "configure"
+#line 39306 "configure"
 #include "confdefs.h"
 
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 int main()
 {
 	char temp[1024];
 	sprintf(temp, "%s\n", curses_version());
-	${cf_cv_main_return-return}(0);
+	${cf_cv_main_return:-return}(0);
 }
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:38673: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39319: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38676: \$? = $ac_status" >&5
+  echo "$as_me:39322: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:38678: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39324: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38681: \$? = $ac_status" >&5
+  echo "$as_me:39327: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_func_curses_version=yes
 
@@ -38693,24 +39339,24 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core
 fi
-echo "$as_me:38696: result: $cf_cv_func_curses_version" >&5
+echo "$as_me:39342: result: $cf_cv_func_curses_version" >&5
 echo "${ECHO_T}$cf_cv_func_curses_version" >&6
 test "$cf_cv_func_curses_version" = yes && cat >>confdefs.h <<\EOF
 #define HAVE_CURSES_VERSION 1
 EOF
 
 if test "$cf_cv_ncurses_version" != no ; then
-echo "$as_me:38703: checking for obsolete/broken version of ncurses" >&5
+echo "$as_me:39349: checking for obsolete/broken version of ncurses" >&5
 echo $ECHO_N "checking for obsolete/broken version of ncurses... $ECHO_C" >&6
 if test "${cf_cv_ncurses_broken+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 38710 "configure"
+#line 39356 "configure"
 #include "confdefs.h"
 
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 int
 main ()
 {
@@ -38726,16 +39372,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:38729: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:39375: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:38732: \$? = $ac_status" >&5
+  echo "$as_me:39378: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:38735: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39381: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38738: \$? = $ac_status" >&5
+  echo "$as_me:39384: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_broken=no
 else
@@ -38747,10 +39393,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:38750: result: $cf_cv_ncurses_broken" >&5
+echo "$as_me:39396: result: $cf_cv_ncurses_broken" >&5
 echo "${ECHO_T}$cf_cv_ncurses_broken" >&6
 if test "$cf_cv_ncurses_broken" = yes ; then
-	{ echo "$as_me:38753: WARNING: hmm... you should get an up-to-date version of ncurses" >&5
+	{ echo "$as_me:39399: WARNING: hmm... you should get an up-to-date version of ncurses" >&5
 echo "$as_me: WARNING: hmm... you should get an up-to-date version of ncurses" >&2;}
 	cat >>confdefs.h <<\EOF
 #define NCURSES_BROKEN 1
@@ -38759,17 +39405,17 @@ EOF
 fi
 fi
 
-echo "$as_me:38762: checking if curses supports color attributes" >&5
+echo "$as_me:39408: checking if curses supports color attributes" >&5
 echo $ECHO_N "checking if curses supports color attributes... $ECHO_C" >&6
 if test "${cf_cv_color_curses+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 38769 "configure"
+#line 39415 "configure"
 #include "confdefs.h"
 
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 
 int
 main ()
@@ -38786,16 +39432,16 @@ chtype x = COLOR_BLUE;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38789: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39435: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38792: \$? = $ac_status" >&5
+  echo "$as_me:39438: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38795: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39441: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38798: \$? = $ac_status" >&5
+  echo "$as_me:39444: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_color_curses=yes
 else
@@ -38807,7 +39453,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:38810: result: $cf_cv_color_curses" >&5
+echo "$as_me:39456: result: $cf_cv_color_curses" >&5
 echo "${ECHO_T}$cf_cv_color_curses" >&6
 if test $cf_cv_color_curses = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -38827,23 +39473,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:38830: checking for $ac_header" >&5
+echo "$as_me:39476: 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 38836 "configure"
+#line 39482 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:38840: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:39486: \"$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:38846: \$? = $ac_status" >&5
+  echo "$as_me:39492: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -38862,7 +39508,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:38865: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:39511: 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
@@ -38877,23 +39523,23 @@ if test "$ISC" = yes ; then
 for ac_header in sys/termio.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:38880: checking for $ac_header" >&5
+echo "$as_me:39526: 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 38886 "configure"
+#line 39532 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:38890: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:39536: \"$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:38896: \$? = $ac_status" >&5
+  echo "$as_me:39542: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -38912,7 +39558,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:38915: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:39561: 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
@@ -38930,10 +39576,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:38933: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:39579: 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 38936 "configure"
+#line 39582 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -38945,16 +39591,16 @@ struct termios foo; int x = foo.c_iflag
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:38948: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:39594: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:38951: \$? = $ac_status" >&5
+  echo "$as_me:39597: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:38954: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39600: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38957: \$? = $ac_status" >&5
+  echo "$as_me:39603: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   termios_bad=no
 else
@@ -38962,7 +39608,7 @@ else
 cat conftest.$ac_ext >&5
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 38965 "configure"
+#line 39611 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -38976,16 +39622,16 @@ struct termios foo; int x = foo.c_iflag
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:38979: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:39625: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:38982: \$? = $ac_status" >&5
+  echo "$as_me:39628: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:38985: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39631: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38988: \$? = $ac_status" >&5
+  echo "$as_me:39634: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   termios_bad=unknown
 else
@@ -39000,12 +39646,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-	echo "$as_me:39003: result: $termios_bad" >&5
+	echo "$as_me:39649: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:39008: checking declaration of size-change" >&5
+echo "$as_me:39654: 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
@@ -39020,7 +39666,7 @@ do
     CPPFLAGS="$cf_save_CPPFLAGS"
     test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
     cat >conftest.$ac_ext <<_ACEOF
-#line 39023 "configure"
+#line 39669 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -39064,16 +39710,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:39067: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:39713: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:39070: \$? = $ac_status" >&5
+  echo "$as_me:39716: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:39073: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39719: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39076: \$? = $ac_status" >&5
+  echo "$as_me:39722: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_sizechange=yes
 else
@@ -39092,7 +39738,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:39095: result: $cf_cv_sizechange" >&5
+echo "$as_me:39741: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 	cat >>confdefs.h <<\EOF
@@ -39109,16 +39755,16 @@ EOF
 	esac
 fi
 
-echo "$as_me:39112: checking if ttytype is declared in curses library" >&5
+echo "$as_me:39758: checking if ttytype is declared in curses library" >&5
 echo $ECHO_N "checking if ttytype is declared in curses library... $ECHO_C" >&6
 if test "${cf_cv_have_ttytype+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 39119 "configure"
+#line 39765 "configure"
 #include "confdefs.h"
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 int
 main ()
 {
@@ -39128,16 +39774,16 @@ char *x = &ttytype[1]; *x = 1
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39131: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39777: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39134: \$? = $ac_status" >&5
+  echo "$as_me:39780: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39137: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39783: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39140: \$? = $ac_status" >&5
+  echo "$as_me:39786: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_ttytype=yes
 else
@@ -39149,7 +39795,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:39152: result: $cf_cv_have_ttytype" >&5
+echo "$as_me:39798: result: $cf_cv_have_ttytype" >&5
 echo "${ECHO_T}$cf_cv_have_ttytype" >&6
 test $cf_cv_have_ttytype = yes && cat >>confdefs.h <<\EOF
 #define HAVE_TTYTYPE 1
@@ -39157,18 +39803,18 @@ EOF
 
 	if test "$use_wide_curses" = yes ; then
 
-echo "$as_me:39160: checking if curses supports wide characters" >&5
+echo "$as_me:39806: checking if curses supports wide characters" >&5
 echo $ECHO_N "checking if curses supports wide characters... $ECHO_C" >&6
 if test "${cf_cv_widec_curses+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 39167 "configure"
+#line 39813 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 int
 main ()
 {
@@ -39183,16 +39829,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39186: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39832: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39189: \$? = $ac_status" >&5
+  echo "$as_me:39835: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39192: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39838: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39195: \$? = $ac_status" >&5
+  echo "$as_me:39841: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_widec_curses=yes
 else
@@ -39203,7 +39849,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:39206: result: $cf_cv_widec_curses" >&5
+echo "$as_me:39852: result: $cf_cv_widec_curses" >&5
 echo "${ECHO_T}$cf_cv_widec_curses" >&6
 
 if test "$cf_cv_widec_curses" = yes ; then
@@ -39212,18 +39858,18 @@ if test "$cf_cv_widec_curses" = yes ; then
 EOF
 
 	# This is needed on Tru64 5.0 to declare mbstate_t
-	echo "$as_me:39215: checking if we must include wchar.h to declare mbstate_t" >&5
+	echo "$as_me:39861: checking if we must include wchar.h to declare mbstate_t" >&5
 echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6
 if test "${cf_cv_widec_mbstate+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 39222 "configure"
+#line 39868 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 int
 main ()
 {
@@ -39233,28 +39879,28 @@ mbstate_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:39236: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:39882: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:39239: \$? = $ac_status" >&5
+  echo "$as_me:39885: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:39242: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39888: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39245: \$? = $ac_status" >&5
+  echo "$as_me:39891: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_widec_mbstate=no
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 39252 "configure"
+#line 39898 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
 #include <wchar.h>
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 int
 main ()
 {
@@ -39264,16 +39910,16 @@ mbstate_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:39267: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:39913: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:39270: \$? = $ac_status" >&5
+  echo "$as_me:39916: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:39273: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39919: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39276: \$? = $ac_status" >&5
+  echo "$as_me:39922: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_widec_mbstate=yes
 else
@@ -39285,7 +39931,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:39288: result: $cf_cv_widec_mbstate" >&5
+echo "$as_me:39934: result: $cf_cv_widec_mbstate" >&5
 echo "${ECHO_T}$cf_cv_widec_mbstate" >&6
 
 if test "$cf_cv_widec_mbstate" = yes ; then
@@ -39306,18 +39952,18 @@ fi
 
 	fi
 
-echo "$as_me:39309: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+echo "$as_me:39955: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
 echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6
 if test "${cf_cv_need_xopen_extension+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 39316 "configure"
+#line 39962 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 int
 main ()
 {
@@ -39335,28 +39981,28 @@ if (NCURSES_VERSION_PATCH < 20100501) && (NCURSES_VERSION_PATCH >= 20100403)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39338: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39984: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39341: \$? = $ac_status" >&5
+  echo "$as_me:39987: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39344: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39990: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39347: \$? = $ac_status" >&5
+  echo "$as_me:39993: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_xopen_extension=no
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 39354 "configure"
+#line 40000 "configure"
 #include "confdefs.h"
 
 #define _XOPEN_SOURCE_EXTENDED
 #include <stdlib.h>
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 int
 main ()
 {
@@ -39373,16 +40019,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39376: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40022: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39379: \$? = $ac_status" >&5
+  echo "$as_me:40025: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39382: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40028: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39385: \$? = $ac_status" >&5
+  echo "$as_me:40031: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_xopen_extension=yes
 else
@@ -39394,11 +40040,11 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:39397: result: $cf_cv_need_xopen_extension" >&5
+echo "$as_me:40043: result: $cf_cv_need_xopen_extension" >&5
 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
 test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
 
-echo "$as_me:39401: checking for term.h" >&5
+echo "$as_me:40047: 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
@@ -39407,14 +40053,14 @@ else
 # If we found <ncurses/curses.h>, look for <ncurses/term.h>, but always look
 # for <term.h> if we do not find the variant.
 for cf_header in \
-	`echo ${cf_cv_ncurses_header-curses.h} | sed -e 's%/.*%/%'`term.h \
+	`echo ${cf_cv_ncurses_header:-curses.h} | sed -e 's%/.*%/%'`term.h \
 	term.h
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 39414 "configure"
+#line 40060 "configure"
 #include "confdefs.h"
 
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 #include <${cf_header}>
 int
 main ()
@@ -39425,16 +40071,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:39428: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:40074: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:39431: \$? = $ac_status" >&5
+  echo "$as_me:40077: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:39434: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40080: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39437: \$? = $ac_status" >&5
+  echo "$as_me:40083: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_term_header=$cf_header
 	 break
@@ -39453,10 +40099,10 @@ no)
 	for cf_header in ncurses/term.h ncursesw/term.h
 	do
 		cat >conftest.$ac_ext <<_ACEOF
-#line 39456 "configure"
+#line 40102 "configure"
 #include "confdefs.h"
 
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 #ifdef NCURSES_VERSION
 #include <${cf_header}>
 #else
@@ -39471,16 +40117,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:39474: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:40120: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:39477: \$? = $ac_status" >&5
+  echo "$as_me:40123: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:39480: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40126: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39483: \$? = $ac_status" >&5
+  echo "$as_me:40129: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_term_header=$cf_header
 			 break
@@ -39495,7 +40141,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 esac
 
 fi
-echo "$as_me:39498: result: $cf_cv_term_header" >&5
+echo "$as_me:40144: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 case $cf_cv_term_header in #(vi
@@ -39546,10 +40192,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:39549: checking for ${cf_func}" >&5
+	echo "$as_me:40195: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me-configure}:39552: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:40198: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -39558,14 +40204,14 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >conftest.$ac_ext <<_ACEOF
-#line 39561 "configure"
+#line 40207 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
 #include <xcurses.h>
 char * XCursesProgramName = "test";
 #else
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 #if defined(NCURSES_VERSION) && defined(HAVE_NCURSESW_TERM_H)
 #include <ncursesw/term.h>
 #elif defined(NCURSES_VERSION) && defined(HAVE_NCURSES_TERM_H)
@@ -39581,7 +40227,7 @@ main ()
 
 #ifndef ${cf_func}
 long foo = (long)(&${cf_func});
-${cf_cv_main_return-return}(foo == 0);
+${cf_cv_main_return:-return}(foo == 0);
 #endif
 
   ;
@@ -39589,16 +40235,16 @@ ${cf_cv_main_return-return}(foo == 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39592: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40238: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39595: \$? = $ac_status" >&5
+  echo "$as_me:40241: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39598: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40244: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39601: \$? = $ac_status" >&5
+  echo "$as_me:40247: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -39614,7 +40260,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:39617: result: $cf_result" >&5
+	echo "$as_me:40263: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test $cf_result != no; then
 		cat >>confdefs.h <<EOF
@@ -39630,13 +40276,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:39633: checking for $ac_func" >&5
+echo "$as_me:40279: 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 39639 "configure"
+#line 40285 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -39667,16 +40313,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39670: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40316: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39673: \$? = $ac_status" >&5
+  echo "$as_me:40319: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39676: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40322: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39679: \$? = $ac_status" >&5
+  echo "$as_me:40325: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -39686,7 +40332,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:39689: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:40335: 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
@@ -39700,12 +40346,12 @@ fi
 
 if test $use_color_style != no ; then
 	if test .$cf_cv_color_curses != .yes ; then
-		{ { echo "$as_me:39703: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:40349: error: Configuration does not support color-styles" >&5
 echo "$as_me: error: Configuration does not support color-styles" >&2;}
    { (exit 1); exit 1; }; }
 	fi
 	if test $cf_cv_screen = slang ; then
-		{ { echo "$as_me:39708: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:40354: error: Configuration does not support color-styles" >&5
 echo "$as_me: error: Configuration does not support color-styles" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -39713,7 +40359,7 @@ fi
 
 if test $use_scrollbar != no ; then
 	if test .$cf_cv_fancy_curses != .yes ; then
-		{ echo "$as_me:39716: WARNING: Configuration does not support ACS_xxx definitions" >&5
+		{ echo "$as_me:40362: WARNING: Configuration does not support ACS_xxx definitions" >&5
 echo "$as_me: WARNING: Configuration does not support ACS_xxx definitions" >&2;}
 	else
 		cat >>confdefs.h <<\EOF
@@ -39726,7 +40372,7 @@ fi
 # use rpath for libraries in unusual places
 
 LD_RPATH_OPT=
-echo "$as_me:39729: checking for an rpath option" >&5
+echo "$as_me:40375: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 case $cf_cv_system_name in #(vi
 irix*) #(vi
@@ -39757,17 +40403,17 @@ solaris2*) #(vi
 *)
 	;;
 esac
-echo "$as_me:39760: result: $LD_RPATH_OPT" >&5
+echo "$as_me:40406: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 case "x$LD_RPATH_OPT" in #(vi
 x-R*)
-	echo "$as_me:39765: checking if we need a space after rpath option" >&5
+	echo "$as_me:40411: checking if we need a space after rpath option" >&5
 echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
 	cf_save_LIBS="$LIBS"
 	LIBS="${LD_RPATH_OPT}$libdir $LIBS"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 39770 "configure"
+#line 40416 "configure"
 #include "confdefs.h"
 
 int
@@ -39779,16 +40425,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39782: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40428: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39785: \$? = $ac_status" >&5
+  echo "$as_me:40431: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39788: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40434: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39791: \$? = $ac_status" >&5
+  echo "$as_me:40437: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_rpath_space=no
 else
@@ -39798,13 +40444,13 @@ cf_rpath_space=yes
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	LIBS="$cf_save_LIBS"
-	echo "$as_me:39801: result: $cf_rpath_space" >&5
+	echo "$as_me:40447: result: $cf_rpath_space" >&5
 echo "${ECHO_T}$cf_rpath_space" >&6
 	test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
 	;;
 esac
 
-echo "$as_me:39807: checking if rpath should be not be set" >&5
+echo "$as_me:40453: checking if rpath should be not be set" >&5
 echo $ECHO_N "checking if rpath should be not be set... $ECHO_C" >&6
 
 # Check whether --enable-rpath-hack or --disable-rpath-hack was given.
@@ -39821,21 +40467,21 @@ else
   cf_disable_rpath_hack=no
 
 fi;
-echo "$as_me:39824: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:40470: result: $cf_disable_rpath_hack" >&5
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 if test "$cf_disable_rpath_hack" = no ; then
 
-echo "$as_me:39828: checking for updated LDFLAGS" >&5
+echo "$as_me:40474: checking for updated LDFLAGS" >&5
 echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
 if test -n "$LD_RPATH_OPT" ; then
-	echo "$as_me:39831: result: maybe" >&5
+	echo "$as_me:40477: result: maybe" >&5
 echo "${ECHO_T}maybe" >&6
 
 	for ac_prog in ldd
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:39838: checking for $ac_word" >&5
+echo "$as_me:40484: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -39850,7 +40496,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_cf_ldd_prog="$ac_prog"
-echo "$as_me:39853: found $ac_dir/$ac_word" >&5
+echo "$as_me:40499: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -39858,10 +40504,10 @@ fi
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:39861: result: $cf_ldd_prog" >&5
+  echo "$as_me:40507: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:39864: result: no" >&5
+  echo "$as_me:40510: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -39873,7 +40519,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
 	if test "$cf_ldd_prog" != no
 	then
 cat >conftest.$ac_ext <<_ACEOF
-#line 39876 "configure"
+#line 40522 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -39885,16 +40531,16 @@ printf("Hello");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39888: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40534: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39891: \$? = $ac_status" >&5
+  echo "$as_me:40537: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39894: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40540: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39897: \$? = $ac_status" >&5
+  echo "$as_me:40543: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort -u`
 else
@@ -39906,11 +40552,11 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me-configure}:39909: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:40555: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me-configure}:39913: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:40559: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -39947,7 +40593,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me-configure}:39950: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:40596: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -39960,11 +40606,11 @@ LDFLAGS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me-configure}:39963: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:40609: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me-configure}:39967: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:40613: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -40001,7 +40647,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me-configure}:40004: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:40650: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -40014,11 +40660,11 @@ LIBS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me-configure}:40017: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:40663: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me-configure}:40021: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:40667: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 fi
 
@@ -40119,7 +40765,7 @@ DEFS=-DHAVE_CONFIG_H
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:40122: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:40768: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -40295,7 +40941,7 @@ cat >>$CONFIG_STATUS <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:40298: error: ambiguous option: $1
+    { { echo "$as_me:40944: 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;}
@@ -40314,7 +40960,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:40317: error: unrecognized option: $1
+  -*) { { echo "$as_me:40963: 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;}
@@ -40367,7 +41013,7 @@ do
   "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
   "$CONFIG_H" ) CONFIG_HEADERS="$CONFIG_HEADERS $CONFIG_H:config.hin" ;;
-  *) { { echo "$as_me:40370: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:41016: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -40694,7 +41340,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:40697: creating $ac_file" >&5
+    { echo "$as_me:41343: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -40712,7 +41358,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:40715: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:41361: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -40725,7 +41371,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:40728: error: cannot find input file: $f" >&5
+           { { echo "$as_me:41374: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -40791,7 +41437,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:40794: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:41440: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -40802,7 +41448,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:40805: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:41451: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -40815,7 +41461,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:40818: error: cannot find input file: $f" >&5
+           { { echo "$as_me:41464: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -40933,7 +41579,7 @@ cat >>$CONFIG_STATUS <<\EOF
   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:40936: $ac_file is unchanged" >&5
+      { echo "$as_me:41582: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
diff --git a/src/LYReadCFG.c b/src/LYReadCFG.c
index 593eed5e..6ce38c0a 100644
--- a/src/LYReadCFG.c
+++ b/src/LYReadCFG.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYReadCFG.c,v 1.157 2010/11/07 21:21:06 tom Exp $
+ * $LynxId: LYReadCFG.c,v 1.158 2010/11/26 18:10:19 Frank.Heckenbach Exp $
  */
 #ifndef NO_RULES
 #include <HTRules.h>
@@ -1549,6 +1549,7 @@ static Config_Type Config_Table [] =
 #endif
      PARSE_SET(RC_REUSE_TEMPFILES,      LYReuseTempfiles),
      PARSE_PRG(RC_RLOGIN_PATH,          ppRLOGIN),
+     PARSE_PRG(RC_RMDIR_PATH,           ppRMDIR),
      PARSE_PRG(RC_RM_PATH,              ppRM),
 #ifndef NO_RULES
      PARSE_FUN(RC_RULE,                 HTSetConfiguration),
diff --git a/src/LYrcFile.h b/src/LYrcFile.h
index 13488d22..b8e45a99 100644
--- a/src/LYrcFile.h
+++ b/src/LYrcFile.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYrcFile.h,v 1.36 2010/09/26 17:05:07 tom Exp $
+ * $LynxId: LYrcFile.h,v 1.37 2010/11/26 18:10:19 Frank.Heckenbach Exp $
  */
 #ifndef LYRCFILE_H
 #define LYRCFILE_H
@@ -190,6 +190,7 @@
 #define RC_REPLAYSECS                   "replaysecs"
 #define RC_REUSE_TEMPFILES              "reuse_tempfiles"
 #define RC_RLOGIN_PATH                  "rlogin_path"
+#define RC_RMDIR_PATH                   "rmdir_path"
 #define RC_RM_PATH                      "rm_path"
 #define RC_RULE                         "rule"
 #define RC_RULESFILE                    "rulesfile"
diff --git a/src/makefile.in b/src/makefile.in
index 7ec3ae81..e02478f7 100644
--- a/src/makefile.in
+++ b/src/makefile.in
@@ -1,4 +1,4 @@
-# $LynxId: makefile.in,v 1.63 2010/09/19 19:31:18 tom Exp $
+# $LynxId: makefile.in,v 1.64 2010/11/26 19:56:45 Doug.Kaufman Exp $
 # template-makefile for Lynx src directory
 
 SHELL		= @CONFIG_SHELL@
@@ -102,7 +102,7 @@ all: lynx$x
 
 lynx$x:   message do_chartrans_stuff $(top_builddir)/LYHelp.h $(OBJS) $(WWWLIB)
 	@echo "Linking and creating Lynx executable"
-	$(CC) $(CC_OPTS) $(LDFLAGS) -o $@  $(OBJS) $(WWWLIB) $(INTLLIB) $(LDFLAGS) $(LIBS)
+	$(CC) $(CC_OPTS) $(LDFLAGS) -o $@  $(OBJS) $(WWWLIB) $(LDFLAGS) $(LIBS) $(INTLLIB)
 	@echo "Copying Lynx executable into top-level directory"
 	rm -f $(top_builddir)/$@
 	cp $@ $(top_builddir)/