about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--CHANGES8
-rw-r--r--WWW/Library/Implementation/HTUtils.h6
-rw-r--r--WWW/Library/Implementation/tidy_tls.h6
-rw-r--r--aclocal.m45
-rw-r--r--config.hin4
-rwxr-xr-xconfigure4877
-rw-r--r--configure.in4
-rw-r--r--src/tidy_tls.c143
8 files changed, 2634 insertions, 2419 deletions
diff --git a/CHANGES b/CHANGES
index 7e978ab8..2e5b5898 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,13 @@
--- $LynxId: CHANGES,v 1.530 2011/05/08 16:00:25 tom Exp $
+-- $LynxId: CHANGES,v 1.533 2011/05/11 10:52:58 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
-2011-05-08 (2.8.8dev.9)
+2011-05-11 (2.8.8dev.9)
+* add configure check for <bsd/random.h>, used in Debian package -TD
+* modify src/tidy_tls.c to use gnutls_priority_set_direct() in preference to
+  various access functions, to eliminate deprecation warnings (report by
+  Andreas Metzler) -TD
 * updated several configure script macros (TD):
   CF_CURSES_CPPFLAGS, CF_CURSES_FUNCS, CF_CURSES_HEADER, CF_CURSES_LIBS,
   CF_CURSES_TERM_H, CF_DISABLE_RPATH_HACK, CF_PDCURSES_X11, CF_PKG_CONFIG,
diff --git a/WWW/Library/Implementation/HTUtils.h b/WWW/Library/Implementation/HTUtils.h
index cdc0a09e..b037dbec 100644
--- a/WWW/Library/Implementation/HTUtils.h
+++ b/WWW/Library/Implementation/HTUtils.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTUtils.h,v 1.103 2010/10/27 00:08:52 tom Exp $
+ * $LynxId: HTUtils.h,v 1.104 2011/05/10 09:31:54 tom Exp $
  *
  * Utility macros for the W3 code library
  * MACROS FOR GENERAL USE
@@ -730,6 +730,10 @@ extern int WWW_TraceMask;
 #undef free_func
 #endif /* USE_SSL */
 
+#ifdef HAVE_BSD_RANDOM_H
+#include <bsd/random.h>		/* prototype for arc4random.h */
+#endif
+
 #ifdef HAVE_LIBDMALLOC
 #include <dmalloc.h>		/* Gray Watson's library */
 #define show_alloc() dmalloc_log_unfreed()
diff --git a/WWW/Library/Implementation/tidy_tls.h b/WWW/Library/Implementation/tidy_tls.h
index 771add4a..25564404 100644
--- a/WWW/Library/Implementation/tidy_tls.h
+++ b/WWW/Library/Implementation/tidy_tls.h
@@ -1,6 +1,6 @@
 /*
- * $LynxId: tidy_tls.h,v 1.2 2010/10/27 00:07:26 tom Exp $
- * Copyright 2008, Thomas E. Dickey
+ * $LynxId: tidy_tls.h,v 1.3 2011/05/11 10:53:36 tom Exp $
+ * Copyright 2008,2011 Thomas E. Dickey
  */
 #ifndef TIDY_TLS_H
 #define TIDY_TLS_H
@@ -108,7 +108,7 @@ extern SSL *SSL_new(SSL_CTX * ctx);
 extern SSL_CIPHER *SSL_get_current_cipher(SSL * ssl);
 extern SSL_CTX *SSL_CTX_new(SSL_METHOD * method);
 extern SSL_METHOD *SSLv23_client_method(void);
-extern X509 *SSL_get_peer_certificate(SSL * ssl);
+extern const X509 *SSL_get_peer_certificate(SSL * ssl);
 extern X509_NAME *X509_get_issuer_name(const X509 * cert);
 extern X509_NAME *X509_get_subject_name(const X509 * cert);
 extern char *X509_NAME_oneline(X509_NAME * name, char *buf, int len);
diff --git a/aclocal.m4 b/aclocal.m4
index 5be6950f..41fc127a 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $LynxId: aclocal.m4,v 1.181 2011/05/08 15:23:06 tom Exp $
+dnl $LynxId: aclocal.m4,v 1.182 2011/05/10 09:21:03 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>
@@ -5066,6 +5066,9 @@ if test "$cf_cv_srand_func" != unknown ; then
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #endif
+#ifdef HAVE_BSD_RANDOM_H
+#include <bsd/random.h>
+#endif
 		],[long x = $cf_cv_rand_max],,
 		[cf_cv_rand_max="(1L<<$cf_rand_max)-1"])
 	])
diff --git a/config.hin b/config.hin
index 6b2b87b2..e0090ab8 100644
--- a/config.hin
+++ b/config.hin
@@ -1,5 +1,5 @@
 /*
- * $LynxId: config.hin,v 1.121 2010/09/26 14:25:50 tom Exp $
+ * $LynxId: config.hin,v 1.123 2011/05/10 09:22:34 tom Exp $
  * vile:cmode
  *
  * The configure script translates "config.hin" into "lynx_cfg.h"
@@ -56,6 +56,7 @@
 #undef HAVE_ARGZ_H		/* AM_GNU_GETTEXT */
 #undef HAVE_ARPA_INET_H
 #undef HAVE_ASSUME_DEFAULT_COLORS /* ncurses extension */
+#undef HAVE_BSD_RANDOM_H	/* have bsd/random.h */
 #undef HAVE_BSD_TOUCHLINE	/* CF_CURS_TOUCHLINE */
 #undef HAVE_CATGETS		/* defined if you want to use non-GNU catgets */
 #undef HAVE_CBREAK
@@ -80,6 +81,7 @@
 #undef HAVE_GETTEXT		/* defined if you want to use non-GNU gettext */
 #undef HAVE_GETTIMEOFDAY
 #undef HAVE_GETUID
+#undef HAVE_GNUTLS_PRIORITY_SET_DIRECT
 #undef HAVE_H_ERRNO
 #undef HAVE_ICONV		/* AM_ICONV */
 #undef HAVE_INET_ATON		/* CF_INET_ADDR */
diff --git a/configure b/configure
index c48405e4..652daa51 100755
--- a/configure
+++ b/configure
@@ -14631,6 +14631,75 @@ fi
 
 	fi
 
+for ac_func in gnutls_priority_set_direct
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:14637: 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 14643 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+char (*f) ();
+
+int
+main ()
+{
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+f = $ac_func;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:14674: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:14677: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:14680: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:14683: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:14693: 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
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+EOF
+
+fi
+done
+
     else
 
 	cf_cv_have_gnutls=no
@@ -14670,7 +14739,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 14673 "configure"
+#line 14742 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14682,16 +14751,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14685: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14754: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14688: \$? = $ac_status" >&5
+  echo "$as_me:14757: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14691: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14760: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14694: \$? = $ac_status" >&5
+  echo "$as_me:14763: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -14708,7 +14777,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}:14711: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:14780: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -14749,7 +14818,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 14752 "configure"
+#line 14821 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14761,16 +14830,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14764: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14833: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14767: \$? = $ac_status" >&5
+  echo "$as_me:14836: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14770: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14839: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14773: \$? = $ac_status" >&5
+  echo "$as_me:14842: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -14787,7 +14856,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}:14790: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:14859: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -14803,7 +14872,7 @@ echo "${as_me:-configure}:14790: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:14806: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:14875: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
 echo "$as_me: error: cannot find ssl library under $cf_cv_use_libgnutls" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -14828,7 +14897,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}:14831: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:14900: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -14857,7 +14926,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}:14860: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:14929: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -14866,7 +14935,7 @@ echo "${as_me:-configure}:14860: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:14869: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:14938: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
 echo "$as_me: error: cannot find ssl library under $cf_cv_use_libgnutls" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -14884,12 +14953,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}:14887: testing checking pkg-config for $cf_pkg_gnutls ..." 1>&5
+echo "${as_me:-configure}:14956: 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}:14892: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:14961: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_cv_have_gnutls=yes
 				cf_cv_pkg_config_ssl=yes
@@ -15001,14 +15070,14 @@ fi
 					esac
 					test -n "$verbose" && echo "	adding $cf_libs_ssl to LIBS" 1>&6
 
-echo "${as_me:-configure}:15004: testing adding $cf_libs_ssl to LIBS ..." 1>&5
+echo "${as_me:-configure}:15073: 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}:15011: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:15080: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_pkg_gnutls=none
 			fi
@@ -15028,12 +15097,12 @@ EOF
 cf_cv_header_path_gnutls=
 cf_cv_library_path_gnutls=
 
-echo "${as_me:-configure}:15031: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:15100: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 15036 "configure"
+#line 15105 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -15062,16 +15131,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15065: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15134: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15068: \$? = $ac_status" >&5
+  echo "$as_me:15137: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15071: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15140: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15074: \$? = $ac_status" >&5
+  echo "$as_me:15143: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -15085,7 +15154,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lgnutls -lgnutls-openssl -lgnutls-extra -lgnutls -lgcrypt $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 15088 "configure"
+#line 15157 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -15114,16 +15183,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15117: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15186: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15120: \$? = $ac_status" >&5
+  echo "$as_me:15189: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15123: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15192: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15126: \$? = $ac_status" >&5
+  echo "$as_me:15195: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -15140,9 +15209,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for gnutls library" 1>&6
 
-echo "${as_me:-configure}:15143: testing find linkage for gnutls library ..." 1>&5
+echo "${as_me:-configure}:15212: testing find linkage for gnutls library ..." 1>&5
 
-echo "${as_me:-configure}:15145: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:15214: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -15255,11 +15324,11 @@ 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}:15258: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:15327: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_gnutls"
         cat >conftest.$ac_ext <<_ACEOF
-#line 15262 "configure"
+#line 15331 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -15288,21 +15357,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15291: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15360: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15294: \$? = $ac_status" >&5
+  echo "$as_me:15363: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15297: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15366: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15300: \$? = $ac_status" >&5
+  echo "$as_me:15369: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found gnutls headers in $cf_cv_header_path_gnutls" 1>&6
 
-echo "${as_me:-configure}:15305: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:15374: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
 
             cf_cv_find_linkage_gnutls=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -15320,7 +15389,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_gnutls" = maybe ; then
 
-echo "${as_me:-configure}:15323: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:15392: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -15417,13 +15486,13 @@ 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}:15420: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:15489: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-lgnutls -lgnutls-openssl -lgnutls-extra -lgnutls -lgcrypt $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_gnutls"
             cat >conftest.$ac_ext <<_ACEOF
-#line 15426 "configure"
+#line 15495 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -15452,21 +15521,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15455: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15524: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15458: \$? = $ac_status" >&5
+  echo "$as_me:15527: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15461: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15530: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15464: \$? = $ac_status" >&5
+  echo "$as_me:15533: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
                 test -n "$verbose" && echo "	... found gnutls library in $cf_cv_library_path_gnutls" 1>&6
 
-echo "${as_me:-configure}:15469: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:15538: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
 
                 cf_cv_find_linkage_gnutls=yes
                 cf_cv_library_file_gnutls="-lgnutls"
@@ -15543,7 +15612,7 @@ if test -n "$cf_cv_header_path_gnutls" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 15546 "configure"
+#line 15615 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -15555,16 +15624,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15558: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15627: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15561: \$? = $ac_status" >&5
+  echo "$as_me:15630: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15564: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15633: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15567: \$? = $ac_status" >&5
+  echo "$as_me:15636: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -15581,7 +15650,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}:15584: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:15653: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -15620,7 +15689,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}:15623: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:15692: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -15632,7 +15701,7 @@ fi
 		LIBS="-lgnutls -lgcrypt $LIBS"
 
 		if test "$cf_pkg_gnutls" = none ; then
-				echo "$as_me:15635: checking for SSL_connect in -lgnutls-openssl" >&5
+				echo "$as_me:15704: checking for SSL_connect in -lgnutls-openssl" >&5
 echo $ECHO_N "checking for SSL_connect in -lgnutls-openssl... $ECHO_C" >&6
 if test "${ac_cv_lib_gnutls_openssl_SSL_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15640,7 +15709,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnutls-openssl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 15643 "configure"
+#line 15712 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15659,16 +15728,16 @@ SSL_connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15662: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15731: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15665: \$? = $ac_status" >&5
+  echo "$as_me:15734: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15668: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15737: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15671: \$? = $ac_status" >&5
+  echo "$as_me:15740: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gnutls_openssl_SSL_connect=yes
 else
@@ -15679,12 +15748,12 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15682: result: $ac_cv_lib_gnutls_openssl_SSL_connect" >&5
+echo "$as_me:15751: result: $ac_cv_lib_gnutls_openssl_SSL_connect" >&5
 echo "${ECHO_T}$ac_cv_lib_gnutls_openssl_SSL_connect" >&6
 if test $ac_cv_lib_gnutls_openssl_SSL_connect = yes; then
   LIBS="-lgnutls-openssl $LIBS"
 else
-  echo "$as_me:15687: checking for SSL_connect in -lgnutls-extra" >&5
+  echo "$as_me:15756: checking for SSL_connect in -lgnutls-extra" >&5
 echo $ECHO_N "checking for SSL_connect in -lgnutls-extra... $ECHO_C" >&6
 if test "${ac_cv_lib_gnutls_extra_SSL_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15692,7 +15761,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnutls-extra  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 15695 "configure"
+#line 15764 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15711,16 +15780,16 @@ SSL_connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15714: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15783: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15717: \$? = $ac_status" >&5
+  echo "$as_me:15786: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15720: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15789: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15723: \$? = $ac_status" >&5
+  echo "$as_me:15792: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gnutls_extra_SSL_connect=yes
 else
@@ -15731,12 +15800,12 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15734: result: $ac_cv_lib_gnutls_extra_SSL_connect" >&5
+echo "$as_me:15803: result: $ac_cv_lib_gnutls_extra_SSL_connect" >&5
 echo "${ECHO_T}$ac_cv_lib_gnutls_extra_SSL_connect" >&6
 if test $ac_cv_lib_gnutls_extra_SSL_connect = yes; then
   LIBS="-lgnutls-extra $LIBS"
 else
-  { { echo "$as_me:15739: error: cannot find gnutls openssl functions" >&5
+  { { echo "$as_me:15808: error: cannot find gnutls openssl functions" >&5
 echo "$as_me: error: cannot find gnutls openssl functions" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -15745,10 +15814,10 @@ fi
 
 			fi
 
-echo "$as_me:15748: checking for X509 support" >&5
+echo "$as_me:15817: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 15751 "configure"
+#line 15820 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -15772,16 +15841,16 @@ X509_verify_cert_error_string(X509_STORE_CTX_get_error(NULL))
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15775: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15844: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15778: \$? = $ac_status" >&5
+  echo "$as_me:15847: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15781: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15850: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15784: \$? = $ac_status" >&5
+  echo "$as_me:15853: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_x509_support=yes
 else
@@ -15790,7 +15859,7 @@ cat conftest.$ac_ext >&5
 cf_x509_support=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:15793: result: $cf_x509_support" >&5
+echo "$as_me:15862: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 
 if test "$cf_x509_support" = yes ; then
@@ -15822,7 +15891,7 @@ no) #(vi
 	;;
 yes) #(vi
 
-echo "$as_me:15825: checking for SSL_get_version in -lnss_compat_ossl" >&5
+echo "$as_me:15894: checking for SSL_get_version in -lnss_compat_ossl" >&5
 echo $ECHO_N "checking for SSL_get_version in -lnss_compat_ossl... $ECHO_C" >&6
 if test "${ac_cv_lib_nss_compat_ossl_SSL_get_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15830,7 +15899,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnss_compat_ossl -lnss_compat_ossl $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 15833 "configure"
+#line 15902 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15849,16 +15918,16 @@ SSL_get_version ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15852: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15921: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15855: \$? = $ac_status" >&5
+  echo "$as_me:15924: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15858: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15927: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15861: \$? = $ac_status" >&5
+  echo "$as_me:15930: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nss_compat_ossl_SSL_get_version=yes
 else
@@ -15869,7 +15938,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15872: result: $ac_cv_lib_nss_compat_ossl_SSL_get_version" >&5
+echo "$as_me:15941: result: $ac_cv_lib_nss_compat_ossl_SSL_get_version" >&5
 echo "${ECHO_T}$ac_cv_lib_nss_compat_ossl_SSL_get_version" >&6
 if test $ac_cv_lib_nss_compat_ossl_SSL_get_version = yes; then
   cat >>confdefs.h <<EOF
@@ -15884,11 +15953,11 @@ 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}:15887: testing assume it is in $cf_ssl_root ..." 1>&5
+echo "${as_me:-configure}:15956: testing assume it is in $cf_ssl_root ..." 1>&5
 
 			cf_ssl_library="-L$cf_ssl_root/lib $cf_ssl_library"
 		else
-			{ { echo "$as_me:15891: error: cannot find NSS compilant libraries" >&5
+			{ { echo "$as_me:15960: error: cannot find NSS compilant libraries" >&5
 echo "$as_me: error: cannot find NSS compilant libraries" >&2;}
    { (exit 1); exit 1; }; }
 		fi
@@ -15903,13 +15972,13 @@ fi
 		elif test -d $cf_cv_use_libnss_compat/../include ; then
 			cf_ssl_root=$cf_cv_use_libnss_compat/..
 		else
-			{ { echo "$as_me:15906: error: cannot find NSS compilant library under $cf_cv_use_libnss_compat" >&5
+			{ { echo "$as_me:15975: error: cannot find NSS compilant library under $cf_cv_use_libnss_compat" >&5
 echo "$as_me: error: cannot find NSS compilant library under $cf_cv_use_libnss_compat" >&2;}
    { (exit 1); exit 1; }; }
 		fi
 		cf_ssl_library="-L$cf_ssl_root/lib $cf_ssl_library"
 	else
-		{ echo "$as_me:15912: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&5
+		{ echo "$as_me:15981: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&5
 echo "$as_me: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&2;}
 	fi
 	;;
@@ -16003,10 +16072,10 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 if test "$cf_ssl_subincs" = yes ; then
-echo "$as_me:16006: checking for NSS compilant include directory" >&5
+echo "$as_me:16075: checking for NSS compilant include directory" >&5
 echo $ECHO_N "checking for NSS compilant include directory... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 16009 "configure"
+#line 16078 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16020,16 +16089,16 @@ SSL_shutdown((SSL *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16023: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16092: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16026: \$? = $ac_status" >&5
+  echo "$as_me:16095: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16029: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16098: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16032: \$? = $ac_status" >&5
+  echo "$as_me:16101: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_ssl_incl=yes
 else
@@ -16038,7 +16107,7 @@ cat conftest.$ac_ext >&5
 cf_ssl_incl=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:16041: result: $cf_ssl_incl" >&5
+echo "$as_me:16110: result: $cf_ssl_incl" >&5
 echo "${ECHO_T}$cf_ssl_incl" >&6
 test "$cf_ssl_incl" = yes && cat >>confdefs.h <<\EOF
 #define USE_NSS_COMPAT_INCL 1
@@ -16046,10 +16115,10 @@ EOF
 
 fi
 
-echo "$as_me:16049: checking if we can link to NSS compilant library" >&5
+echo "$as_me:16118: checking if we can link to NSS compilant library" >&5
 echo $ECHO_N "checking if we can link to NSS compilant library... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 16052 "configure"
+#line 16121 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16068,16 +16137,16 @@ SSL_shutdown((SSL *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16071: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16140: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16074: \$? = $ac_status" >&5
+  echo "$as_me:16143: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16077: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16146: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16080: \$? = $ac_status" >&5
+  echo "$as_me:16149: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_ssl_library=yes
 else
@@ -16086,7 +16155,7 @@ cat conftest.$ac_ext >&5
 cf_ssl_library=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:16089: result: $cf_ssl_library" >&5
+echo "$as_me:16158: result: $cf_ssl_library" >&5
 echo "${ECHO_T}$cf_ssl_library" >&6
 if test "$cf_ssl_library" = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -16098,7 +16167,7 @@ EOF
 EOF
 
 else
-	{ { echo "$as_me:16101: error: Cannot link with NSS compilant libraries" >&5
+	{ { echo "$as_me:16170: error: Cannot link with NSS compilant libraries" >&5
 echo "$as_me: error: Cannot link with NSS compilant libraries" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -16106,7 +16175,7 @@ fi
 fi
 
 ### check for ipv6 support
-echo "$as_me:16109: checking whether to enable ipv6" >&5
+echo "$as_me:16178: checking whether to enable ipv6" >&5
 echo $ECHO_N "checking whether to enable ipv6... $ECHO_C" >&6
 
 # Check whether --enable-ipv6 or --disable-ipv6 was given.
@@ -16122,11 +16191,11 @@ EOF
 else
   enableval=no
 fi;
-echo "$as_me:16125: result: $enableval" >&5
+echo "$as_me:16194: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 if test "$enableval" = "yes"; then
 
-echo "$as_me:16129: checking ipv6 stack type" >&5
+echo "$as_me:16198: checking ipv6 stack type" >&5
 echo $ECHO_N "checking ipv6 stack type... $ECHO_C" >&6
 if test "${cf_cv_ipv6type+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16147,7 +16216,7 @@ do
 		;;
 	inria) #(vi
 				cat >conftest.$ac_ext <<_ACEOF
-#line 16150 "configure"
+#line 16219 "configure"
 #include "confdefs.h"
 
 #include <netinet/in.h>
@@ -16164,7 +16233,7 @@ rm -rf conftest*
 		;;
 	kame) #(vi
 				cat >conftest.$ac_ext <<_ACEOF
-#line 16167 "configure"
+#line 16236 "configure"
 #include "confdefs.h"
 
 #include <netinet/in.h>
@@ -16181,7 +16250,7 @@ rm -rf conftest*
 		;;
 	linux-glibc) #(vi
 				cat >conftest.$ac_ext <<_ACEOF
-#line 16184 "configure"
+#line 16253 "configure"
 #include "confdefs.h"
 
 #include <features.h>
@@ -16207,7 +16276,7 @@ rm -rf conftest*
 		;;
 	toshiba) #(vi
 		cat >conftest.$ac_ext <<_ACEOF
-#line 16210 "configure"
+#line 16279 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -16224,7 +16293,7 @@ rm -rf conftest*
 		;;
 	v6d) #(vi
 		cat >conftest.$ac_ext <<_ACEOF
-#line 16227 "configure"
+#line 16296 "configure"
 #include "confdefs.h"
 
 #include </usr/local/v6/include/sys/v6config.h>
@@ -16241,7 +16310,7 @@ rm -rf conftest*
 		;;
 	zeta)
 		cat >conftest.$ac_ext <<_ACEOF
-#line 16244 "configure"
+#line 16313 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -16263,13 +16332,13 @@ rm -rf conftest*
 done
 
 fi
-echo "$as_me:16266: result: $cf_cv_ipv6type" >&5
+echo "$as_me:16335: result: $cf_cv_ipv6type" >&5
 echo "${ECHO_T}$cf_cv_ipv6type" >&6
 
 cf_ipv6lib=none
 cf_ipv6dir=none
 
-echo "$as_me:16272: checking for IPv6 library if required" >&5
+echo "$as_me:16341: checking for IPv6 library if required" >&5
 echo $ECHO_N "checking for IPv6 library if required... $ECHO_C" >&6
 case $cf_cv_ipv6type in #(vi
 solaris) #(vi
@@ -16299,13 +16368,13 @@ zeta)
 	cf_ipv6dir=v6
 	;;
 esac
-echo "$as_me:16302: result: $cf_ipv6lib" >&5
+echo "$as_me:16371: result: $cf_ipv6lib" >&5
 echo "${ECHO_T}$cf_ipv6lib" >&6
 
 if test "$cf_ipv6lib" != "none"; then
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 16308 "configure"
+#line 16377 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -16321,16 +16390,16 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16324: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16393: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16327: \$? = $ac_status" >&5
+  echo "$as_me:16396: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16330: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16399: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16333: \$? = $ac_status" >&5
+  echo "$as_me:16402: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -16470,7 +16539,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 16473 "configure"
+#line 16542 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -16482,16 +16551,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16485: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16554: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16488: \$? = $ac_status" >&5
+  echo "$as_me:16557: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16491: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16560: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16494: \$? = $ac_status" >&5
+  echo "$as_me:16563: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -16508,7 +16577,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}:16511: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:16580: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -16534,13 +16603,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 	eval 'cf_cv_have_lib_'$cf_ipv6lib'=no'
 	cf_libdir=""
-	echo "$as_me:16537: checking for getaddrinfo" >&5
+	echo "$as_me:16606: checking for getaddrinfo" >&5
 echo $ECHO_N "checking for getaddrinfo... $ECHO_C" >&6
 if test "${ac_cv_func_getaddrinfo+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 16543 "configure"
+#line 16612 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char getaddrinfo (); below.  */
@@ -16571,16 +16640,16 @@ f = getaddrinfo;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16574: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16643: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16577: \$? = $ac_status" >&5
+  echo "$as_me:16646: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16580: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16649: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16583: \$? = $ac_status" >&5
+  echo "$as_me:16652: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_getaddrinfo=yes
 else
@@ -16590,18 +16659,18 @@ ac_cv_func_getaddrinfo=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:16593: result: $ac_cv_func_getaddrinfo" >&5
+echo "$as_me:16662: result: $ac_cv_func_getaddrinfo" >&5
 echo "${ECHO_T}$ac_cv_func_getaddrinfo" >&6
 if test $ac_cv_func_getaddrinfo = yes; then
   eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:16600: checking for getaddrinfo in -l$cf_ipv6lib" >&5
+		echo "$as_me:16669: checking for getaddrinfo in -l$cf_ipv6lib" >&5
 echo $ECHO_N "checking for getaddrinfo in -l$cf_ipv6lib... $ECHO_C" >&6
 		LIBS="-l$cf_ipv6lib $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 16604 "configure"
+#line 16673 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -16617,25 +16686,25 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16620: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16689: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16623: \$? = $ac_status" >&5
+  echo "$as_me:16692: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16626: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16695: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16629: \$? = $ac_status" >&5
+  echo "$as_me:16698: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:16631: result: yes" >&5
+  echo "$as_me:16700: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:16638: result: no" >&5
+echo "$as_me:16707: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -16725,11 +16794,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:16728: checking for -l$cf_ipv6lib in $cf_libdir" >&5
+				echo "$as_me:16797: checking for -l$cf_ipv6lib in $cf_libdir" >&5
 echo $ECHO_N "checking for -l$cf_ipv6lib in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -l$cf_ipv6lib $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 16732 "configure"
+#line 16801 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -16745,25 +16814,25 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16748: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16817: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16751: \$? = $ac_status" >&5
+  echo "$as_me:16820: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16754: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16823: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16757: \$? = $ac_status" >&5
+  echo "$as_me:16826: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:16759: result: yes" >&5
+  echo "$as_me:16828: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:16766: result: no" >&5
+echo "$as_me:16835: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -16778,7 +16847,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_ipv6lib
 
 	if test $cf_found_library = no ; then
-		{ { echo "$as_me:16781: error: No $cf_ipv6lib library found, cannot continue.  You must fetch lib$cf_ipv6lib.a
+		{ { echo "$as_me:16850: error: No $cf_ipv6lib library found, cannot continue.  You must fetch lib$cf_ipv6lib.a
 from an appropriate IPv6 kit and compile beforehand." >&5
 echo "$as_me: error: No $cf_ipv6lib library found, cannot continue.  You must fetch lib$cf_ipv6lib.a
 from an appropriate IPv6 kit and compile beforehand." >&2;}
@@ -16786,7 +16855,7 @@ from an appropriate IPv6 kit and compile beforehand." >&2;}
 	fi
 fi
 
-echo "$as_me:16789: checking working getaddrinfo" >&5
+echo "$as_me:16858: checking working getaddrinfo" >&5
 echo $ECHO_N "checking working getaddrinfo... $ECHO_C" >&6
 if test "${cf_cv_getaddrinfo+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16796,7 +16865,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_getaddrinfo=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 16799 "configure"
+#line 16868 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -16876,15 +16945,15 @@ int main()
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:16879: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16948: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16882: \$? = $ac_status" >&5
+  echo "$as_me:16951: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:16884: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16953: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16887: \$? = $ac_status" >&5
+  echo "$as_me:16956: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_getaddrinfo=yes
 else
@@ -16897,7 +16966,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:16900: result: $cf_cv_getaddrinfo" >&5
+echo "$as_me:16969: result: $cf_cv_getaddrinfo" >&5
 echo "${ECHO_T}$cf_cv_getaddrinfo" >&6
 if test "$cf_cv_getaddrinfo" = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -16912,12 +16981,12 @@ fi
 
 if test "$cf_cv_getaddrinfo" != "yes"; then
 	if test "$cf_cv_ipv6type" != "linux"; then
-		{ echo "$as_me:16915: WARNING: You must get working getaddrinfo() function,
+		{ echo "$as_me:16984: WARNING: You must get working getaddrinfo() function,
 or you can specify \"--disable-ipv6\"" >&5
 echo "$as_me: WARNING: You must get working getaddrinfo() function,
 or you can specify \"--disable-ipv6\"" >&2;}
 	else
-		{ echo "$as_me:16920: WARNING: The getaddrinfo() implementation on your system seems be buggy.
+		{ echo "$as_me:16989: WARNING: The getaddrinfo() implementation on your system seems be buggy.
 You should upgrade your system library to the newest version
 of GNU C library (aka glibc)." >&5
 echo "$as_me: WARNING: The getaddrinfo() implementation on your system seems be buggy.
@@ -16928,7 +16997,7 @@ fi
 
 fi
 
-echo "$as_me:16931: checking for screen type" >&5
+echo "$as_me:17000: checking for screen type" >&5
 echo $ECHO_N "checking for screen type... $ECHO_C" >&6
 if test "${cf_cv_screen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16942,7 +17011,7 @@ case $withval in
 curses|ncurses|ncursesw|pdcurses|slang)
 	cf_cv_screen=$withval
 	;;
-*)	{ { echo "$as_me:16945: error: Unexpected value" >&5
+*)	{ { echo "$as_me:17014: error: Unexpected value" >&5
 echo "$as_me: error: Unexpected value" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -16951,13 +17020,13 @@ else
   cf_cv_screen=curses
 fi;
 fi
-echo "$as_me:16954: result: $cf_cv_screen" >&5
+echo "$as_me:17023: result: $cf_cv_screen" >&5
 echo "${ECHO_T}$cf_cv_screen" >&6
 
 case $cf_cv_screen in
 curses|ncurses*)
 
-echo "$as_me:16960: checking for specific curses-directory" >&5
+echo "$as_me:17029: 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.
@@ -16967,7 +17036,7 @@ if test "${with_curses_dir+set}" = set; then
 else
   cf_cv_curses_dir=no
 fi;
-echo "$as_me:16970: result: $cf_cv_curses_dir" >&5
+echo "$as_me:17039: 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" )
@@ -16998,7 +17067,7 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:17001: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:17070: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -17031,7 +17100,7 @@ if test -n "$cf_cv_curses_dir/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 17034 "configure"
+#line 17103 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -17043,16 +17112,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17046: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17115: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17049: \$? = $ac_status" >&5
+  echo "$as_me:17118: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17052: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17121: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17055: \$? = $ac_status" >&5
+  echo "$as_me:17124: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -17069,7 +17138,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}:17072: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:17141: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -17103,7 +17172,7 @@ if test -n "$cf_cv_curses_dir/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}:17106: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:17175: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -17122,7 +17191,7 @@ dft_color_style=yes
 case $cf_cv_screen in
 curses)
 
-echo "$as_me:17125: checking for extra include directories" >&5
+echo "$as_me:17194: 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
@@ -17148,11 +17217,11 @@ sunos3*|sunos4*)
 esac
 
 fi
-echo "$as_me:17151: result: $cf_cv_curses_incdir" >&5
+echo "$as_me:17220: 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:17155: checking if we have identified curses headers" >&5
+echo "$as_me:17224: 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
@@ -17164,7 +17233,7 @@ for cf_header in  \
 	curses.h ncurses/ncurses.h ncurses/curses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 17167 "configure"
+#line 17236 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -17176,16 +17245,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17179: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17248: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17182: \$? = $ac_status" >&5
+  echo "$as_me:17251: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17185: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17254: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17188: \$? = $ac_status" >&5
+  echo "$as_me:17257: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -17196,11 +17265,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:17199: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:17268: 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:17203: error: No curses header-files found" >&5
+	{ { echo "$as_me:17272: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -17210,23 +17279,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:17213: checking for $ac_header" >&5
+echo "$as_me:17282: 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 17219 "configure"
+#line 17288 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:17223: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:17292: \"$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:17229: \$? = $ac_status" >&5
+  echo "$as_me:17298: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -17245,7 +17314,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:17248: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:17317: 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
@@ -17255,7 +17324,7 @@ EOF
 fi
 done
 
-echo "$as_me:17258: checking for terminfo header" >&5
+echo "$as_me:17327: 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
@@ -17273,7 +17342,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 17276 "configure"
+#line 17345 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -17288,16 +17357,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17291: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17360: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17294: \$? = $ac_status" >&5
+  echo "$as_me:17363: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17297: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17366: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17300: \$? = $ac_status" >&5
+  echo "$as_me:17369: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -17313,7 +17382,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:17316: result: $cf_cv_term_header" >&5
+echo "$as_me:17385: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -17342,7 +17411,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:17345: checking for ncurses version" >&5
+echo "$as_me:17414: 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
@@ -17368,10 +17437,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:17371: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:17440: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:17374: \$? = $ac_status" >&5
+  echo "$as_me:17443: \$? = $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%".*%%'`
@@ -17381,7 +17450,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 17384 "configure"
+#line 17453 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -17406,15 +17475,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:17409: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17478: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17412: \$? = $ac_status" >&5
+  echo "$as_me:17481: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:17414: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17483: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17417: \$? = $ac_status" >&5
+  echo "$as_me:17486: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -17428,16 +17497,16 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:17431: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:17500: 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:17437: checking if we have identified curses libraries" >&5
+echo "$as_me:17506: 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 17440 "configure"
+#line 17509 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -17449,16 +17518,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17452: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17521: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17455: \$? = $ac_status" >&5
+  echo "$as_me:17524: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17458: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17527: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17461: \$? = $ac_status" >&5
+  echo "$as_me:17530: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -17467,13 +17536,13 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:17470: result: $cf_result" >&5
+echo "$as_me:17539: 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:17476: checking for tgoto in -lmytinfo" >&5
+    echo "$as_me:17545: 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
@@ -17481,7 +17550,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 17484 "configure"
+#line 17553 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17500,16 +17569,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17503: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17572: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17506: \$? = $ac_status" >&5
+  echo "$as_me:17575: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17509: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17578: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17512: \$? = $ac_status" >&5
+  echo "$as_me:17581: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -17520,7 +17589,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17523: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:17592: 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"
@@ -17534,7 +17603,7 @@ hpux10.*) #(vi
 	# term.h) for cur_colr
 	if test "x$cf_cv_screen" = "xcurses_colr"
 	then
-		echo "$as_me:17537: checking for initscr in -lcur_colr" >&5
+		echo "$as_me:17606: 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
@@ -17542,7 +17611,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcur_colr  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 17545 "configure"
+#line 17614 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17561,16 +17630,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17564: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17633: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17567: \$? = $ac_status" >&5
+  echo "$as_me:17636: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17570: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17639: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17573: \$? = $ac_status" >&5
+  echo "$as_me:17642: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_cur_colr_initscr=yes
 else
@@ -17581,7 +17650,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17584: result: $ac_cv_lib_cur_colr_initscr" >&5
+echo "$as_me:17653: 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
 
@@ -17590,7 +17659,7 @@ if test $ac_cv_lib_cur_colr_initscr = yes; then
 
 else
 
-		echo "$as_me:17593: checking for initscr in -lHcurses" >&5
+		echo "$as_me:17662: 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
@@ -17598,7 +17667,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lHcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 17601 "configure"
+#line 17670 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17617,16 +17686,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17620: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17689: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17623: \$? = $ac_status" >&5
+  echo "$as_me:17692: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17626: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17695: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17629: \$? = $ac_status" >&5
+  echo "$as_me:17698: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Hcurses_initscr=yes
 else
@@ -17637,7 +17706,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17640: result: $ac_cv_lib_Hcurses_initscr" >&5
+echo "$as_me:17709: 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
 
@@ -17677,7 +17746,7 @@ if test -n "/lib64" ; 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}:17680: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:17749: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -17706,7 +17775,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}:17709: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:17778: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -17737,7 +17806,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}:17740: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:17809: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -17772,7 +17841,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}:17775: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:17844: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -17801,13 +17870,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:17804: checking for tgoto" >&5
+    echo "$as_me:17873: 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 17810 "configure"
+#line 17879 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char tgoto (); below.  */
@@ -17838,16 +17907,16 @@ f = tgoto;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17841: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17910: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17844: \$? = $ac_status" >&5
+  echo "$as_me:17913: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17847: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17916: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17850: \$? = $ac_status" >&5
+  echo "$as_me:17919: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_tgoto=yes
 else
@@ -17857,7 +17926,7 @@ ac_cv_func_tgoto=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:17860: result: $ac_cv_func_tgoto" >&5
+echo "$as_me:17929: 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
@@ -17866,7 +17935,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:17869: checking for tgoto in -l$cf_term_lib" >&5
+echo "$as_me:17938: 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
@@ -17874,7 +17943,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_term_lib  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 17877 "configure"
+#line 17946 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17893,16 +17962,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17896: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17965: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17899: \$? = $ac_status" >&5
+  echo "$as_me:17968: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17902: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17971: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17905: \$? = $ac_status" >&5
+  echo "$as_me:17974: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -17913,7 +17982,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17916: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:17985: 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
@@ -17928,7 +17997,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:17931: checking for initscr in -l$cf_curs_lib" >&5
+echo "$as_me:18000: 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
@@ -17936,7 +18005,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_curs_lib  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 17939 "configure"
+#line 18008 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17955,16 +18024,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17958: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18027: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17961: \$? = $ac_status" >&5
+  echo "$as_me:18030: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17964: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18033: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17967: \$? = $ac_status" >&5
+  echo "$as_me:18036: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -17975,23 +18044,23 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17978: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:18047: 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:17985: error: no curses library found" >&5
+    test $cf_curs_lib = unknown && { { echo "$as_me:18054: 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:17991: checking if we can link with $cf_curs_lib library" >&5
+        echo "$as_me:18060: 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 17994 "configure"
+#line 18063 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -18003,16 +18072,16 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18006: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18075: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18009: \$? = $ac_status" >&5
+  echo "$as_me:18078: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18012: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18081: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18015: \$? = $ac_status" >&5
+  echo "$as_me:18084: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -18021,18 +18090,18 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-        echo "$as_me:18024: result: $cf_result" >&5
+        echo "$as_me:18093: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
-        test $cf_result = no && { { echo "$as_me:18026: error: Cannot link curses library" >&5
+        test $cf_result = no && { { echo "$as_me:18095: 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:18032: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+        echo "$as_me:18101: 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 18035 "configure"
+#line 18104 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -18044,16 +18113,16 @@ initscr(); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18047: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18116: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18050: \$? = $ac_status" >&5
+  echo "$as_me:18119: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18053: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18122: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18056: \$? = $ac_status" >&5
+  echo "$as_me:18125: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=no
 else
@@ -18062,7 +18131,7 @@ cat conftest.$ac_ext >&5
 
             LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
             cat >conftest.$ac_ext <<_ACEOF
-#line 18065 "configure"
+#line 18134 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -18074,16 +18143,16 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18077: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18146: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18080: \$? = $ac_status" >&5
+  echo "$as_me:18149: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18083: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18152: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18086: \$? = $ac_status" >&5
+  echo "$as_me:18155: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -18095,13 +18164,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:18098: result: $cf_result" >&5
+        echo "$as_me:18167: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
     fi
 fi
 fi
 
-echo "$as_me:18104: checking for curses performance tradeoff" >&5
+echo "$as_me:18173: 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
@@ -18109,7 +18178,7 @@ else
 
     cf_cv_curs_performance=no
     cat >conftest.$ac_ext <<_ACEOF
-#line 18112 "configure"
+#line 18181 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -18128,20 +18197,20 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18131: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18200: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18134: \$? = $ac_status" >&5
+  echo "$as_me:18203: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18137: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18206: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18140: \$? = $ac_status" >&5
+  echo "$as_me:18209: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 18144 "configure"
+#line 18213 "configure"
 #include "confdefs.h"
 
 #define CURS_PERFORMANCE
@@ -18161,16 +18230,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18164: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18233: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18167: \$? = $ac_status" >&5
+  echo "$as_me:18236: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18170: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18239: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18173: \$? = $ac_status" >&5
+  echo "$as_me:18242: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_curs_performance=yes
 else
@@ -18185,20 +18254,20 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:18188: result: $cf_cv_curs_performance" >&5
+echo "$as_me:18257: 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:18194: checking for curses touchline function" >&5
+echo "$as_me:18263: 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 18201 "configure"
+#line 18270 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -18211,23 +18280,23 @@ touchline(stdscr, 1,2,3);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18214: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18283: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18217: \$? = $ac_status" >&5
+  echo "$as_me:18286: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18220: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18289: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18223: \$? = $ac_status" >&5
+  echo "$as_me:18292: \$? = $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 18230 "configure"
+#line 18299 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -18240,16 +18309,16 @@ touchline(stdscr, 1,2);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18243: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18312: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18246: \$? = $ac_status" >&5
+  echo "$as_me:18315: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18249: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18318: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18252: \$? = $ac_status" >&5
+  echo "$as_me:18321: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_curs_touchline=sysv
 else
@@ -18261,7 +18330,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:18264: result: $cf_cv_curs_touchline" >&5
+echo "$as_me:18333: result: $cf_cv_curs_touchline" >&5
 echo "${ECHO_T}$cf_cv_curs_touchline" >&6
 case "$cf_cv_curs_touchline" in #(vi
 bsd) #(vi
@@ -18288,7 +18357,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:18291: checking for $ac_word" >&5
+echo "$as_me:18360: 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
@@ -18305,7 +18374,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:18308: found $ac_dir/$ac_word" >&5
+   echo "$as_me:18377: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -18316,10 +18385,10 @@ fi
 NCURSES_CONFIG=$ac_cv_path_NCURSES_CONFIG
 
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:18319: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:18388: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:18322: result: no" >&5
+  echo "$as_me:18391: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -18334,7 +18403,7 @@ LIBS="`$NCURSES_CONFIG --libs` $LIBS"
 
 # even with config script, some packages use no-override for curses.h
 
-echo "$as_me:18337: checking if we have identified curses headers" >&5
+echo "$as_me:18406: 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
@@ -18348,7 +18417,7 @@ for cf_header in  \
 	curses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 18351 "configure"
+#line 18420 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -18360,16 +18429,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18363: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18432: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18366: \$? = $ac_status" >&5
+  echo "$as_me:18435: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18369: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18438: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18372: \$? = $ac_status" >&5
+  echo "$as_me:18441: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -18380,11 +18449,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:18383: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:18452: 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:18387: error: No curses header-files found" >&5
+	{ { echo "$as_me:18456: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -18394,23 +18463,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:18397: checking for $ac_header" >&5
+echo "$as_me:18466: 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 18403 "configure"
+#line 18472 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18407: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:18476: \"$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:18413: \$? = $ac_status" >&5
+  echo "$as_me:18482: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18429,7 +18498,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:18432: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:18501: 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
@@ -18482,7 +18551,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 18485 "configure"
+#line 18554 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -18494,16 +18563,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18497: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18566: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18500: \$? = $ac_status" >&5
+  echo "$as_me:18569: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18503: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18572: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18506: \$? = $ac_status" >&5
+  echo "$as_me:18575: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -18520,7 +18589,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}:18523: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:18592: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -18537,7 +18606,7 @@ fi
 
 }
 
-echo "$as_me:18540: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:18609: 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
@@ -18549,7 +18618,7 @@ else
 	do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 18552 "configure"
+#line 18621 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -18573,16 +18642,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18576: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18645: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18579: \$? = $ac_status" >&5
+  echo "$as_me:18648: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18582: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18651: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18585: \$? = $ac_status" >&5
+  echo "$as_me:18654: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -18597,14 +18666,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 	done
 
 fi
-echo "$as_me:18600: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:18669: 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:18607: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:18676: 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
@@ -18744,7 +18813,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 18747 "configure"
+#line 18816 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -18756,16 +18825,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18759: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18828: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18762: \$? = $ac_status" >&5
+  echo "$as_me:18831: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18765: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18834: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18768: \$? = $ac_status" >&5
+  echo "$as_me:18837: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -18782,7 +18851,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}:18785: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:18854: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -18803,7 +18872,7 @@ fi
 		do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 18806 "configure"
+#line 18875 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -18827,16 +18896,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18830: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18899: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18833: \$? = $ac_status" >&5
+  echo "$as_me:18902: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18836: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18905: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18839: \$? = $ac_status" >&5
+  echo "$as_me:18908: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -18857,12 +18926,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:18860: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:18929: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:18865: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:18934: 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%/[^/]*$%%'`
@@ -18895,7 +18964,7 @@ if test -n "$cf_1st_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 18898 "configure"
+#line 18967 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -18907,16 +18976,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18910: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18979: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18913: \$? = $ac_status" >&5
+  echo "$as_me:18982: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18916: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18985: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18919: \$? = $ac_status" >&5
+  echo "$as_me:18988: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -18933,7 +19002,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}:18936: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:19005: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -18976,7 +19045,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:18979: checking for terminfo header" >&5
+echo "$as_me:19048: 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
@@ -18994,7 +19063,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 18997 "configure"
+#line 19066 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19009,16 +19078,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19012: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19081: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19015: \$? = $ac_status" >&5
+  echo "$as_me:19084: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19018: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19087: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19021: \$? = $ac_status" >&5
+  echo "$as_me:19090: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -19034,7 +19103,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:19037: result: $cf_cv_term_header" >&5
+echo "$as_me:19106: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -19068,7 +19137,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:19071: checking for ncurses version" >&5
+echo "$as_me:19140: 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
@@ -19094,10 +19163,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:19097: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:19166: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:19100: \$? = $ac_status" >&5
+  echo "$as_me:19169: \$? = $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%".*%%'`
@@ -19107,7 +19176,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 19110 "configure"
+#line 19179 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19132,15 +19201,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:19135: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19204: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19138: \$? = $ac_status" >&5
+  echo "$as_me:19207: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:19140: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19209: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19143: \$? = $ac_status" >&5
+  echo "$as_me:19212: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -19154,7 +19223,7 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:19157: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:19226: 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
@@ -19166,7 +19235,7 @@ cf_nculib_root=ncurses
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:19169: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:19238: 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
@@ -19174,7 +19243,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 19177 "configure"
+#line 19246 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19193,16 +19262,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19196: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19265: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19199: \$? = $ac_status" >&5
+  echo "$as_me:19268: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19202: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19271: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19205: \$? = $ac_status" >&5
+  echo "$as_me:19274: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -19213,10 +19282,10 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19216: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:19285: 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:19219: checking for initscr in -lgpm" >&5
+  echo "$as_me:19288: 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
@@ -19224,7 +19293,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 19227 "configure"
+#line 19296 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19243,16 +19312,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19246: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19315: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19249: \$? = $ac_status" >&5
+  echo "$as_me:19318: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19252: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19321: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19255: \$? = $ac_status" >&5
+  echo "$as_me:19324: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -19263,7 +19332,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19266: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:19335: 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"
@@ -19278,7 +19347,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:19281: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:19350: 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
@@ -19286,7 +19355,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 19289 "configure"
+#line 19358 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19305,16 +19374,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19308: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19377: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19311: \$? = $ac_status" >&5
+  echo "$as_me:19380: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19314: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19383: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19317: \$? = $ac_status" >&5
+  echo "$as_me:19386: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -19325,7 +19394,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19328: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:19397: 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"
@@ -19344,13 +19413,13 @@ else
 
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
-	echo "$as_me:19347: checking for initscr" >&5
+	echo "$as_me:19416: 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 19353 "configure"
+#line 19422 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */
@@ -19381,16 +19450,16 @@ f = initscr;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19384: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19453: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19387: \$? = $ac_status" >&5
+  echo "$as_me:19456: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19390: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19459: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19393: \$? = $ac_status" >&5
+  echo "$as_me:19462: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -19400,18 +19469,18 @@ ac_cv_func_initscr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:19403: result: $ac_cv_func_initscr" >&5
+echo "$as_me:19472: 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:19410: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:19479: 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 19414 "configure"
+#line 19483 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -19423,25 +19492,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19426: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19495: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19429: \$? = $ac_status" >&5
+  echo "$as_me:19498: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19432: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19501: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19435: \$? = $ac_status" >&5
+  echo "$as_me:19504: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:19437: result: yes" >&5
+  echo "$as_me:19506: 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:19444: result: no" >&5
+echo "$as_me:19513: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -19531,11 +19600,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:19534: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:19603: 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 19538 "configure"
+#line 19607 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -19547,25 +19616,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19550: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19619: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19553: \$? = $ac_status" >&5
+  echo "$as_me:19622: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19556: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19625: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19559: \$? = $ac_status" >&5
+  echo "$as_me:19628: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:19561: result: yes" >&5
+  echo "$as_me:19630: 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:19568: result: no" >&5
+echo "$as_me:19637: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -19580,7 +19649,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:19583: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:19652: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -19588,7 +19657,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:19591: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:19660: 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
@@ -19598,7 +19667,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >conftest.$ac_ext <<_ACEOF
-#line 19601 "configure"
+#line 19670 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -19610,23 +19679,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19613: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19682: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19616: \$? = $ac_status" >&5
+  echo "$as_me:19685: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19619: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19688: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19622: \$? = $ac_status" >&5
+  echo "$as_me:19691: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:19624: result: yes" >&5
+  echo "$as_me:19693: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:19629: result: no" >&5
+echo "$as_me:19698: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -19644,7 +19713,7 @@ fi
 	;;
 ncursesw)
 
-echo "$as_me:19647: checking for multibyte character support" >&5
+echo "$as_me:19716: 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
@@ -19652,7 +19721,7 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 19655 "configure"
+#line 19724 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -19665,16 +19734,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19668: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19737: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19671: \$? = $ac_status" >&5
+  echo "$as_me:19740: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19674: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19743: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19677: \$? = $ac_status" >&5
+  echo "$as_me:19746: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_utf8_lib=yes
 else
@@ -19686,12 +19755,12 @@ cat conftest.$ac_ext >&5
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
-echo "${as_me:-configure}:19689: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:19758: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 19694 "configure"
+#line 19763 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -19704,16 +19773,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19707: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19776: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19710: \$? = $ac_status" >&5
+  echo "$as_me:19779: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19713: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19782: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19716: \$? = $ac_status" >&5
+  echo "$as_me:19785: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -19727,7 +19796,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lutf8  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 19730 "configure"
+#line 19799 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -19740,16 +19809,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19743: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19812: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19746: \$? = $ac_status" >&5
+  echo "$as_me:19815: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19749: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19818: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19752: \$? = $ac_status" >&5
+  echo "$as_me:19821: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -19766,9 +19835,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
 
-echo "${as_me:-configure}:19769: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:19838: testing find linkage for utf8 library ..." 1>&5
 
-echo "${as_me:-configure}:19771: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:19840: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -19881,11 +19950,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}:19884: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:19953: 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 19888 "configure"
+#line 19957 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -19898,21 +19967,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19901: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19970: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19904: \$? = $ac_status" >&5
+  echo "$as_me:19973: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19907: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19976: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19910: \$? = $ac_status" >&5
+  echo "$as_me:19979: \$? = $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}:19915: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:19984: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
 
             cf_cv_find_linkage_utf8=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -19930,7 +19999,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
-echo "${as_me:-configure}:19933: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:20002: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -20027,13 +20096,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}:20030: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:20099: 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 20036 "configure"
+#line 20105 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -20046,21 +20115,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20049: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20118: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20052: \$? = $ac_status" >&5
+  echo "$as_me:20121: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20055: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20124: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20058: \$? = $ac_status" >&5
+  echo "$as_me:20127: \$? = $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}:20063: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:20132: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
 
                 cf_cv_find_linkage_utf8=yes
                 cf_cv_library_file_utf8="-lutf8"
@@ -20102,7 +20171,7 @@ fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:20105: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:20174: 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
@@ -20136,7 +20205,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 20139 "configure"
+#line 20208 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -20148,16 +20217,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20151: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20220: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20154: \$? = $ac_status" >&5
+  echo "$as_me:20223: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20157: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20226: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20160: \$? = $ac_status" >&5
+  echo "$as_me:20229: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -20174,7 +20243,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}:20177: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:20246: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -20208,7 +20277,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}:20211: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:20280: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -20226,7 +20295,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:20229: checking for $ac_word" >&5
+echo "$as_me:20298: 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
@@ -20243,7 +20312,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:20246: found $ac_dir/$ac_word" >&5
+   echo "$as_me:20315: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -20254,10 +20323,10 @@ fi
 NCURSES_CONFIG=$ac_cv_path_NCURSES_CONFIG
 
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:20257: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:20326: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:20260: result: no" >&5
+  echo "$as_me:20329: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -20272,7 +20341,7 @@ LIBS="`$NCURSES_CONFIG --libs` $LIBS"
 
 # even with config script, some packages use no-override for curses.h
 
-echo "$as_me:20275: checking if we have identified curses headers" >&5
+echo "$as_me:20344: 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
@@ -20286,7 +20355,7 @@ for cf_header in  \
 	curses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 20289 "configure"
+#line 20358 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -20298,16 +20367,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20301: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20370: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20304: \$? = $ac_status" >&5
+  echo "$as_me:20373: \$? = $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:20376: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20310: \$? = $ac_status" >&5
+  echo "$as_me:20379: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -20318,11 +20387,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:20321: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:20390: 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:20325: error: No curses header-files found" >&5
+	{ { echo "$as_me:20394: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -20332,23 +20401,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:20335: checking for $ac_header" >&5
+echo "$as_me:20404: 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 20341 "configure"
+#line 20410 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20345: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:20414: \"$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:20351: \$? = $ac_status" >&5
+  echo "$as_me:20420: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20367,7 +20436,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:20370: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:20439: 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
@@ -20420,7 +20489,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 20423 "configure"
+#line 20492 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -20432,16 +20501,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20435: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20504: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20438: \$? = $ac_status" >&5
+  echo "$as_me:20507: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20441: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20510: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20444: \$? = $ac_status" >&5
+  echo "$as_me:20513: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -20458,7 +20527,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}:20461: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:20530: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -20475,7 +20544,7 @@ fi
 
 }
 
-echo "$as_me:20478: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:20547: 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
@@ -20487,7 +20556,7 @@ else
 	do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 20490 "configure"
+#line 20559 "configure"
 #include "confdefs.h"
 
 #define _XOPEN_SOURCE_EXTENDED
@@ -20519,16 +20588,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20522: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20591: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20525: \$? = $ac_status" >&5
+  echo "$as_me:20594: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20528: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20597: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20531: \$? = $ac_status" >&5
+  echo "$as_me:20600: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -20543,14 +20612,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 	done
 
 fi
-echo "$as_me:20546: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:20615: 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:20553: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:20622: 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
@@ -20690,7 +20759,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 20693 "configure"
+#line 20762 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -20702,16 +20771,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20705: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20774: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20708: \$? = $ac_status" >&5
+  echo "$as_me:20777: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20711: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20780: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20714: \$? = $ac_status" >&5
+  echo "$as_me:20783: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -20728,7 +20797,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}:20731: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:20800: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -20749,7 +20818,7 @@ fi
 		do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 20752 "configure"
+#line 20821 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -20773,16 +20842,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20776: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20845: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20779: \$? = $ac_status" >&5
+  echo "$as_me:20848: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20782: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20851: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20785: \$? = $ac_status" >&5
+  echo "$as_me:20854: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -20803,12 +20872,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:20806: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:20875: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:20811: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:20880: 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%/[^/]*$%%'`
@@ -20841,7 +20910,7 @@ if test -n "$cf_1st_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 20844 "configure"
+#line 20913 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -20853,16 +20922,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20856: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20925: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20859: \$? = $ac_status" >&5
+  echo "$as_me:20928: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20862: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20931: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20865: \$? = $ac_status" >&5
+  echo "$as_me:20934: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -20879,7 +20948,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}:20882: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:20951: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -20922,7 +20991,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:20925: checking for terminfo header" >&5
+echo "$as_me:20994: 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
@@ -20940,7 +21009,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 20943 "configure"
+#line 21012 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20955,16 +21024,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20958: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21027: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20961: \$? = $ac_status" >&5
+  echo "$as_me:21030: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20964: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21033: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20967: \$? = $ac_status" >&5
+  echo "$as_me:21036: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -20980,7 +21049,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:20983: result: $cf_cv_term_header" >&5
+echo "$as_me:21052: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -21014,7 +21083,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:21017: checking for ncurses version" >&5
+echo "$as_me:21086: 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
@@ -21040,10 +21109,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:21043: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:21112: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:21046: \$? = $ac_status" >&5
+  echo "$as_me:21115: \$? = $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%".*%%'`
@@ -21053,7 +21122,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 21056 "configure"
+#line 21125 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -21078,15 +21147,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:21081: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21150: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21084: \$? = $ac_status" >&5
+  echo "$as_me:21153: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:21086: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21155: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21089: \$? = $ac_status" >&5
+  echo "$as_me:21158: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -21100,7 +21169,7 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:21103: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:21172: 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
@@ -21112,7 +21181,7 @@ cf_nculib_root=ncursesw
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:21115: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:21184: 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
@@ -21120,7 +21189,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 21123 "configure"
+#line 21192 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21139,16 +21208,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21142: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21211: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21145: \$? = $ac_status" >&5
+  echo "$as_me:21214: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21148: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21217: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21151: \$? = $ac_status" >&5
+  echo "$as_me:21220: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -21159,10 +21228,10 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21162: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:21231: 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:21165: checking for initscr in -lgpm" >&5
+  echo "$as_me:21234: 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
@@ -21170,7 +21239,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 21173 "configure"
+#line 21242 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21189,16 +21258,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21192: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21261: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21195: \$? = $ac_status" >&5
+  echo "$as_me:21264: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21198: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21267: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21201: \$? = $ac_status" >&5
+  echo "$as_me:21270: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -21209,7 +21278,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21212: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:21281: 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"
@@ -21224,7 +21293,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:21227: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:21296: 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
@@ -21232,7 +21301,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 21235 "configure"
+#line 21304 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21251,16 +21320,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21254: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21323: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21257: \$? = $ac_status" >&5
+  echo "$as_me:21326: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21260: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21329: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21263: \$? = $ac_status" >&5
+  echo "$as_me:21332: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -21271,7 +21340,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21274: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:21343: 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"
@@ -21290,13 +21359,13 @@ else
 
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
-	echo "$as_me:21293: checking for initscr" >&5
+	echo "$as_me:21362: 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 21299 "configure"
+#line 21368 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */
@@ -21327,16 +21396,16 @@ f = initscr;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21330: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21399: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21333: \$? = $ac_status" >&5
+  echo "$as_me:21402: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21336: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21405: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21339: \$? = $ac_status" >&5
+  echo "$as_me:21408: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -21346,18 +21415,18 @@ ac_cv_func_initscr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:21349: result: $ac_cv_func_initscr" >&5
+echo "$as_me:21418: 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:21356: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:21425: 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 21360 "configure"
+#line 21429 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -21369,25 +21438,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21372: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21441: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21375: \$? = $ac_status" >&5
+  echo "$as_me:21444: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21378: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21447: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21381: \$? = $ac_status" >&5
+  echo "$as_me:21450: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:21383: result: yes" >&5
+  echo "$as_me:21452: 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:21390: result: no" >&5
+echo "$as_me:21459: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -21477,11 +21546,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:21480: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:21549: 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 21484 "configure"
+#line 21553 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -21493,25 +21562,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21496: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21565: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21499: \$? = $ac_status" >&5
+  echo "$as_me:21568: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21502: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21571: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21505: \$? = $ac_status" >&5
+  echo "$as_me:21574: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:21507: result: yes" >&5
+  echo "$as_me:21576: 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:21514: result: no" >&5
+echo "$as_me:21583: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -21526,7 +21595,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:21529: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:21598: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -21534,7 +21603,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:21537: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:21606: 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
@@ -21544,7 +21613,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >conftest.$ac_ext <<_ACEOF
-#line 21547 "configure"
+#line 21616 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -21556,23 +21625,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21559: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21628: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21562: \$? = $ac_status" >&5
+  echo "$as_me:21631: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21565: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21634: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21568: \$? = $ac_status" >&5
+  echo "$as_me:21637: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:21570: result: yes" >&5
+  echo "$as_me:21639: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:21575: result: no" >&5
+echo "$as_me:21644: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -21595,7 +21664,7 @@ pdcurses)
 	;;
 slang)
 
-echo "$as_me:21598: checking for slang header file" >&5
+echo "$as_me:21667: 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
@@ -21603,7 +21672,7 @@ else
 
 	cf_cv_slang_header=no
 	cat >conftest.$ac_ext <<_ACEOF
-#line 21606 "configure"
+#line 21675 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -21615,16 +21684,16 @@ printf("%s\n", SLANG_VERSION)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21618: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21687: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21621: \$? = $ac_status" >&5
+  echo "$as_me:21690: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21624: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21693: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21627: \$? = $ac_status" >&5
+  echo "$as_me:21696: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_header=predefined
 else
@@ -21751,7 +21820,7 @@ cf_search="$cf_search $cf_header_path_list"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:21754: result: $cf_cv_slang_header" >&5
+echo "$as_me:21823: result: $cf_cv_slang_header" >&5
 echo "${ECHO_T}$cf_cv_slang_header" >&6
 
 if test "x$cf_cv_slang_header" != xno
@@ -21791,7 +21860,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 21794 "configure"
+#line 21863 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -21803,16 +21872,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21806: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21875: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21809: \$? = $ac_status" >&5
+  echo "$as_me:21878: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21812: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21881: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21815: \$? = $ac_status" >&5
+  echo "$as_me:21884: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -21829,7 +21898,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}:21832: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:21901: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -21859,7 +21928,7 @@ else
 
 cf_cv_termlib=none
 cat >conftest.$ac_ext <<_ACEOF
-#line 21862 "configure"
+#line 21931 "configure"
 #include "confdefs.h"
 
 int
@@ -21871,19 +21940,19 @@ char *x=(char*)tgoto("",0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21874: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21943: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21877: \$? = $ac_status" >&5
+  echo "$as_me:21946: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21880: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21949: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21883: \$? = $ac_status" >&5
+  echo "$as_me:21952: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 21886 "configure"
+#line 21955 "configure"
 #include "confdefs.h"
 
 int
@@ -21895,16 +21964,16 @@ int x=tigetstr("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21898: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21967: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21901: \$? = $ac_status" >&5
+  echo "$as_me:21970: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21904: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21973: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21907: \$? = $ac_status" >&5
+  echo "$as_me:21976: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termlib=terminfo
 else
@@ -21915,7 +21984,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}:21918: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
+echo "${as_me:-configure}:21987: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
 
 else
   echo "$as_me: failed program was:" >&5
@@ -21930,10 +21999,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:21933: checking for $cf_func in -l$cf_lib" >&5
+		echo "$as_me:22002: 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 21936 "configure"
+#line 22005 "configure"
 #include "confdefs.h"
 
 int
@@ -21945,16 +22014,16 @@ int x=$cf_func("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21948: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22017: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21951: \$? = $ac_status" >&5
+  echo "$as_me:22020: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21954: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22023: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21957: \$? = $ac_status" >&5
+  echo "$as_me:22026: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -21963,7 +22032,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-		echo "$as_me:21966: result: $cf_result" >&5
+		echo "$as_me:22035: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 		if test "$cf_result" = yes ; then
 			if test "$cf_func" = tigetstr ; then
@@ -21980,7 +22049,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:21983: checking for initscr in -lcurses" >&5
+	echo "$as_me:22052: 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
@@ -21988,7 +22057,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 21991 "configure"
+#line 22060 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22007,16 +22076,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22010: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22079: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22013: \$? = $ac_status" >&5
+  echo "$as_me:22082: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22016: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22085: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22019: \$? = $ac_status" >&5
+  echo "$as_me:22088: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_curses_initscr=yes
 else
@@ -22027,13 +22096,13 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22030: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:22099: 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:22036: checking for tgoto in -ltermcap" >&5
+	echo "$as_me:22105: 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
@@ -22041,7 +22110,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 22044 "configure"
+#line 22113 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22060,16 +22129,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22063: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22132: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22066: \$? = $ac_status" >&5
+  echo "$as_me:22135: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22069: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22138: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22072: \$? = $ac_status" >&5
+  echo "$as_me:22141: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_termcap_tgoto=yes
 else
@@ -22080,7 +22149,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22083: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:22152: 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
@@ -22091,20 +22160,20 @@ fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 if test "$cf_cv_termlib" = none; then
-	{ echo "$as_me:22094: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+	{ echo "$as_me:22163: 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:22101: checking for acos" >&5
+echo "$as_me:22170: 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 22107 "configure"
+#line 22176 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char acos (); below.  */
@@ -22135,16 +22204,16 @@ f = acos;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22138: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22207: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22141: \$? = $ac_status" >&5
+  echo "$as_me:22210: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22144: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22213: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22147: \$? = $ac_status" >&5
+  echo "$as_me:22216: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_acos=yes
 else
@@ -22154,13 +22223,13 @@ ac_cv_func_acos=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:22157: result: $ac_cv_func_acos" >&5
+echo "$as_me:22226: 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:22163: checking for acos in -lm" >&5
+echo "$as_me:22232: 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
@@ -22168,7 +22237,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm $LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 22171 "configure"
+#line 22240 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22187,16 +22256,16 @@ acos ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22190: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22259: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22193: \$? = $ac_status" >&5
+  echo "$as_me:22262: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22196: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22265: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22199: \$? = $ac_status" >&5
+  echo "$as_me:22268: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_m_acos=yes
 else
@@ -22207,7 +22276,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22210: result: $ac_cv_lib_m_acos" >&5
+echo "$as_me:22279: 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
 
@@ -22233,13 +22302,13 @@ os2*)
 
 	eval 'cf_cv_have_lib_'video'=no'
 	cf_libdir=""
-	echo "$as_me:22236: checking for v_init" >&5
+	echo "$as_me:22305: 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 22242 "configure"
+#line 22311 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char v_init (); below.  */
@@ -22270,16 +22339,16 @@ f = v_init;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22273: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22342: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22276: \$? = $ac_status" >&5
+  echo "$as_me:22345: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22279: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22348: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22282: \$? = $ac_status" >&5
+  echo "$as_me:22351: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_v_init=yes
 else
@@ -22289,18 +22358,18 @@ ac_cv_func_v_init=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:22292: result: $ac_cv_func_v_init" >&5
+echo "$as_me:22361: 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:22299: checking for v_init in -lvideo" >&5
+		echo "$as_me:22368: 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 22303 "configure"
+#line 22372 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -22312,25 +22381,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22315: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22384: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22318: \$? = $ac_status" >&5
+  echo "$as_me:22387: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22321: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22390: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22324: \$? = $ac_status" >&5
+  echo "$as_me:22393: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:22326: result: yes" >&5
+  echo "$as_me:22395: 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:22333: result: no" >&5
+echo "$as_me:22402: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -22420,11 +22489,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:22423: checking for -lvideo in $cf_libdir" >&5
+				echo "$as_me:22492: 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 22427 "configure"
+#line 22496 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -22436,25 +22505,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22439: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22508: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22442: \$? = $ac_status" >&5
+  echo "$as_me:22511: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22445: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22514: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22448: \$? = $ac_status" >&5
+  echo "$as_me:22517: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:22450: result: yes" >&5
+  echo "$as_me:22519: 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:22457: result: no" >&5
+echo "$as_me:22526: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -22469,7 +22538,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'video
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:22472: error: Cannot link video library" >&5
+	{ { echo "$as_me:22541: error: Cannot link video library" >&5
 echo "$as_me: error: Cannot link video library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -22479,13 +22548,13 @@ esac
 
 	eval 'cf_cv_have_lib_'slang'=no'
 	cf_libdir=""
-	echo "$as_me:22482: checking for SLtt_get_screen_size" >&5
+	echo "$as_me:22551: 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 22488 "configure"
+#line 22557 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char SLtt_get_screen_size (); below.  */
@@ -22516,16 +22585,16 @@ f = SLtt_get_screen_size;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22519: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22588: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22522: \$? = $ac_status" >&5
+  echo "$as_me:22591: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22525: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22594: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22528: \$? = $ac_status" >&5
+  echo "$as_me:22597: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_SLtt_get_screen_size=yes
 else
@@ -22535,18 +22604,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:22538: result: $ac_cv_func_SLtt_get_screen_size" >&5
+echo "$as_me:22607: 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:22545: checking for SLtt_get_screen_size in -lslang" >&5
+		echo "$as_me:22614: 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 22549 "configure"
+#line 22618 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -22558,25 +22627,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22561: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22630: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22564: \$? = $ac_status" >&5
+  echo "$as_me:22633: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22567: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22636: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22570: \$? = $ac_status" >&5
+  echo "$as_me:22639: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:22572: result: yes" >&5
+  echo "$as_me:22641: 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:22579: result: no" >&5
+echo "$as_me:22648: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -22666,11 +22735,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:22669: checking for -lslang in $cf_libdir" >&5
+				echo "$as_me:22738: 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 22673 "configure"
+#line 22742 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -22682,25 +22751,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22685: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22754: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22688: \$? = $ac_status" >&5
+  echo "$as_me:22757: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22691: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22760: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22694: \$? = $ac_status" >&5
+  echo "$as_me:22763: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:22696: result: yes" >&5
+  echo "$as_me:22765: 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:22703: result: no" >&5
+echo "$as_me:22772: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -22715,13 +22784,13 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'slang
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:22718: error: Cannot link slang library" >&5
+	{ { echo "$as_me:22787: 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:22724: checking if we can link slang without termcap" >&5
+echo "$as_me:22793: 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%^.%%'`
@@ -22730,7 +22799,7 @@ else
 fi
 LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s%$cf_exclude%%" -e 's%^.%%'`
 cat >conftest.$ac_ext <<_ACEOF
-#line 22733 "configure"
+#line 22802 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -22742,16 +22811,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22745: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22814: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22748: \$? = $ac_status" >&5
+  echo "$as_me:22817: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22751: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22820: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22754: \$? = $ac_status" >&5
+  echo "$as_me:22823: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -22760,13 +22829,13 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:22763: result: $cf_result" >&5
+echo "$as_me:22832: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 test $cf_result = no && LIBS="$cf_slang_LIBS3"
 
 else
 
-echo "$as_me:22769: checking for slang2 header file" >&5
+echo "$as_me:22838: 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
@@ -22774,7 +22843,7 @@ else
 
 	cf_cv_slang2_header=no
 	cat >conftest.$ac_ext <<_ACEOF
-#line 22777 "configure"
+#line 22846 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -22786,16 +22855,16 @@ printf("%s\n", SLANG_VERSION)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22789: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22858: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22792: \$? = $ac_status" >&5
+  echo "$as_me:22861: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22795: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22864: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22798: \$? = $ac_status" >&5
+  echo "$as_me:22867: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang2_header=predefined
 else
@@ -22922,7 +22991,7 @@ cf_search="$cf_search $cf_header_path_list"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:22925: result: $cf_cv_slang2_header" >&5
+echo "$as_me:22994: result: $cf_cv_slang2_header" >&5
 echo "${ECHO_T}$cf_cv_slang2_header" >&6
 
 if test "x$cf_cv_slang2_header" != xno
@@ -22962,7 +23031,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 22965 "configure"
+#line 23034 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -22974,16 +23043,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22977: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23046: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22980: \$? = $ac_status" >&5
+  echo "$as_me:23049: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22983: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23052: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22986: \$? = $ac_status" >&5
+  echo "$as_me:23055: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -23000,7 +23069,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}:23003: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:23072: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -23030,7 +23099,7 @@ else
 
 cf_cv_termlib=none
 cat >conftest.$ac_ext <<_ACEOF
-#line 23033 "configure"
+#line 23102 "configure"
 #include "confdefs.h"
 
 int
@@ -23042,19 +23111,19 @@ char *x=(char*)tgoto("",0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23045: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23114: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23048: \$? = $ac_status" >&5
+  echo "$as_me:23117: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23051: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23120: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23054: \$? = $ac_status" >&5
+  echo "$as_me:23123: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 23057 "configure"
+#line 23126 "configure"
 #include "confdefs.h"
 
 int
@@ -23066,16 +23135,16 @@ int x=tigetstr("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23069: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23138: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23072: \$? = $ac_status" >&5
+  echo "$as_me:23141: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23075: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23144: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23078: \$? = $ac_status" >&5
+  echo "$as_me:23147: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termlib=terminfo
 else
@@ -23086,7 +23155,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}:23089: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
+echo "${as_me:-configure}:23158: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
 
 else
   echo "$as_me: failed program was:" >&5
@@ -23101,10 +23170,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:23104: checking for $cf_func in -l$cf_lib" >&5
+		echo "$as_me:23173: 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 23107 "configure"
+#line 23176 "configure"
 #include "confdefs.h"
 
 int
@@ -23116,16 +23185,16 @@ int x=$cf_func("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23119: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23188: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23122: \$? = $ac_status" >&5
+  echo "$as_me:23191: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23125: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23194: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23128: \$? = $ac_status" >&5
+  echo "$as_me:23197: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -23134,7 +23203,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-		echo "$as_me:23137: result: $cf_result" >&5
+		echo "$as_me:23206: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 		if test "$cf_result" = yes ; then
 			if test "$cf_func" = tigetstr ; then
@@ -23151,7 +23220,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:23154: checking for initscr in -lcurses" >&5
+	echo "$as_me:23223: 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
@@ -23159,7 +23228,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 23162 "configure"
+#line 23231 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23178,16 +23247,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23181: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23250: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23184: \$? = $ac_status" >&5
+  echo "$as_me:23253: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23187: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23256: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23190: \$? = $ac_status" >&5
+  echo "$as_me:23259: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_curses_initscr=yes
 else
@@ -23198,13 +23267,13 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23201: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:23270: 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:23207: checking for tgoto in -ltermcap" >&5
+	echo "$as_me:23276: 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
@@ -23212,7 +23281,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 23215 "configure"
+#line 23284 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23231,16 +23300,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23234: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23303: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23237: \$? = $ac_status" >&5
+  echo "$as_me:23306: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23240: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23309: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23243: \$? = $ac_status" >&5
+  echo "$as_me:23312: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_termcap_tgoto=yes
 else
@@ -23251,7 +23320,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23254: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:23323: 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
@@ -23262,20 +23331,20 @@ fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 if test "$cf_cv_termlib" = none; then
-	{ echo "$as_me:23265: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+	{ echo "$as_me:23334: 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:23272: checking for acos" >&5
+echo "$as_me:23341: 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 23278 "configure"
+#line 23347 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char acos (); below.  */
@@ -23306,16 +23375,16 @@ f = acos;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23309: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23378: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23312: \$? = $ac_status" >&5
+  echo "$as_me:23381: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23315: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23384: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23318: \$? = $ac_status" >&5
+  echo "$as_me:23387: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_acos=yes
 else
@@ -23325,13 +23394,13 @@ ac_cv_func_acos=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:23328: result: $ac_cv_func_acos" >&5
+echo "$as_me:23397: 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:23334: checking for acos in -lm" >&5
+echo "$as_me:23403: 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
@@ -23339,7 +23408,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm $LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 23342 "configure"
+#line 23411 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23358,16 +23427,16 @@ acos ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23361: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23430: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23364: \$? = $ac_status" >&5
+  echo "$as_me:23433: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23367: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23436: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23370: \$? = $ac_status" >&5
+  echo "$as_me:23439: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_m_acos=yes
 else
@@ -23378,7 +23447,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23381: result: $ac_cv_lib_m_acos" >&5
+echo "$as_me:23450: 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
 
@@ -23404,13 +23473,13 @@ os2*)
 
 	eval 'cf_cv_have_lib_'video'=no'
 	cf_libdir=""
-	echo "$as_me:23407: checking for v_init" >&5
+	echo "$as_me:23476: 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 23413 "configure"
+#line 23482 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char v_init (); below.  */
@@ -23441,16 +23510,16 @@ f = v_init;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23444: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23513: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23447: \$? = $ac_status" >&5
+  echo "$as_me:23516: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23450: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23519: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23453: \$? = $ac_status" >&5
+  echo "$as_me:23522: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_v_init=yes
 else
@@ -23460,18 +23529,18 @@ ac_cv_func_v_init=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:23463: result: $ac_cv_func_v_init" >&5
+echo "$as_me:23532: 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:23470: checking for v_init in -lvideo" >&5
+		echo "$as_me:23539: 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 23474 "configure"
+#line 23543 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -23483,25 +23552,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23486: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23555: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23489: \$? = $ac_status" >&5
+  echo "$as_me:23558: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23492: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23561: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23495: \$? = $ac_status" >&5
+  echo "$as_me:23564: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:23497: result: yes" >&5
+  echo "$as_me:23566: 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:23504: result: no" >&5
+echo "$as_me:23573: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -23591,11 +23660,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:23594: checking for -lvideo in $cf_libdir" >&5
+				echo "$as_me:23663: 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 23598 "configure"
+#line 23667 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -23607,25 +23676,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23610: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23679: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23613: \$? = $ac_status" >&5
+  echo "$as_me:23682: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23616: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23685: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23619: \$? = $ac_status" >&5
+  echo "$as_me:23688: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:23621: result: yes" >&5
+  echo "$as_me:23690: 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:23628: result: no" >&5
+echo "$as_me:23697: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -23640,7 +23709,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'video
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:23643: error: Cannot link video library" >&5
+	{ { echo "$as_me:23712: error: Cannot link video library" >&5
 echo "$as_me: error: Cannot link video library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -23650,13 +23719,13 @@ esac
 
 	eval 'cf_cv_have_lib_'slang2'=no'
 	cf_libdir=""
-	echo "$as_me:23653: checking for SLtt_get_screen_size" >&5
+	echo "$as_me:23722: 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 23659 "configure"
+#line 23728 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char SLtt_get_screen_size (); below.  */
@@ -23687,16 +23756,16 @@ f = SLtt_get_screen_size;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23690: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23759: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23693: \$? = $ac_status" >&5
+  echo "$as_me:23762: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23696: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23765: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23699: \$? = $ac_status" >&5
+  echo "$as_me:23768: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_SLtt_get_screen_size=yes
 else
@@ -23706,18 +23775,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:23709: result: $ac_cv_func_SLtt_get_screen_size" >&5
+echo "$as_me:23778: 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:23716: checking for SLtt_get_screen_size in -lslang2" >&5
+		echo "$as_me:23785: 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 23720 "configure"
+#line 23789 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -23729,25 +23798,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23732: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23801: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23735: \$? = $ac_status" >&5
+  echo "$as_me:23804: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23738: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23807: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23741: \$? = $ac_status" >&5
+  echo "$as_me:23810: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:23743: result: yes" >&5
+  echo "$as_me:23812: 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:23750: result: no" >&5
+echo "$as_me:23819: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -23837,11 +23906,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:23840: checking for -lslang2 in $cf_libdir" >&5
+				echo "$as_me:23909: 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 23844 "configure"
+#line 23913 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -23853,25 +23922,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23856: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23925: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23859: \$? = $ac_status" >&5
+  echo "$as_me:23928: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23862: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23931: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23865: \$? = $ac_status" >&5
+  echo "$as_me:23934: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:23867: result: yes" >&5
+  echo "$as_me:23936: 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:23874: result: no" >&5
+echo "$as_me:23943: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -23886,13 +23955,13 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'slang2
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:23889: error: Cannot link slang2 library" >&5
+	{ { echo "$as_me:23958: 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:23895: checking if we can link slang2 without termcap" >&5
+echo "$as_me:23964: 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%^.%%'`
@@ -23901,7 +23970,7 @@ else
 fi
 LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s%$cf_exclude%%" -e 's%^.%%'`
 cat >conftest.$ac_ext <<_ACEOF
-#line 23904 "configure"
+#line 23973 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -23913,16 +23982,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23916: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23985: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23919: \$? = $ac_status" >&5
+  echo "$as_me:23988: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23922: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23991: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23925: \$? = $ac_status" >&5
+  echo "$as_me:23994: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -23931,12 +24000,12 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:23934: result: $cf_result" >&5
+echo "$as_me:24003: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 test $cf_result = no && LIBS="$cf_slang_LIBS3"
 
 	else
-		{ { echo "$as_me:23939: error: cannot find slang headers" >&5
+		{ { echo "$as_me:24008: error: cannot find slang headers" >&5
 echo "$as_me: error: cannot find slang headers" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -23944,14 +24013,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:23947: checking if we must define UTF8" >&5
+echo "$as_me:24016: 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 23954 "configure"
+#line 24023 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -23963,16 +24032,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23966: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24035: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23969: \$? = $ac_status" >&5
+  echo "$as_me:24038: \$? = $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:24041: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23975: \$? = $ac_status" >&5
+  echo "$as_me:24044: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_utf8=no
 else
@@ -23980,7 +24049,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 23983 "configure"
+#line 24052 "configure"
 #include "confdefs.h"
 
 #define UTF8
@@ -23994,16 +24063,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23997: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24066: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24000: \$? = $ac_status" >&5
+  echo "$as_me:24069: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24003: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24072: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24006: \$? = $ac_status" >&5
+  echo "$as_me:24075: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_utf8=yes
 else
@@ -24016,7 +24085,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:24019: result: $cf_cv_slang_utf8" >&5
+echo "$as_me:24088: result: $cf_cv_slang_utf8" >&5
 echo "${ECHO_T}$cf_cv_slang_utf8" >&6
 
 if test "$cf_cv_slang_utf8" = yes ; then
@@ -24026,14 +24095,14 @@ EOF
 
 fi
 
-echo "$as_me:24029: checking if we must tell slang this is UNIX" >&5
+echo "$as_me:24098: 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 24036 "configure"
+#line 24105 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -24052,16 +24121,16 @@ SLang_TT_Baud_Rate = 1
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24055: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24124: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24058: \$? = $ac_status" >&5
+  echo "$as_me:24127: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24061: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24130: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24064: \$? = $ac_status" >&5
+  echo "$as_me:24133: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_unix=yes
 else
@@ -24072,19 +24141,19 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:24075: result: $cf_cv_slang_unix" >&5
+echo "$as_me:24144: 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:24081: checking for SLsmg_Color_Type" >&5
+	echo "$as_me:24150: 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 24087 "configure"
+#line 24156 "configure"
 #include "confdefs.h"
 #include <slang.h>
 
@@ -24100,16 +24169,16 @@ if (sizeof (SLsmg_Color_Type))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24103: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24172: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24106: \$? = $ac_status" >&5
+  echo "$as_me:24175: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24109: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24178: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24112: \$? = $ac_status" >&5
+  echo "$as_me:24181: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_SLsmg_Color_Type=yes
 else
@@ -24119,7 +24188,7 @@ ac_cv_type_SLsmg_Color_Type=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:24122: result: $ac_cv_type_SLsmg_Color_Type" >&5
+echo "$as_me:24191: 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
@@ -24134,13 +24203,13 @@ EOF
 
 fi
 
-	echo "$as_me:24137: checking for SLtt_Char_Type" >&5
+	echo "$as_me:24206: 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 24143 "configure"
+#line 24212 "configure"
 #include "confdefs.h"
 #include <slang.h>
 
@@ -24156,16 +24225,16 @@ if (sizeof (SLtt_Char_Type))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24159: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24228: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24162: \$? = $ac_status" >&5
+  echo "$as_me:24231: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24165: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24234: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24168: \$? = $ac_status" >&5
+  echo "$as_me:24237: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_SLtt_Char_Type=yes
 else
@@ -24175,7 +24244,7 @@ ac_cv_type_SLtt_Char_Type=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:24178: result: $ac_cv_type_SLtt_Char_Type" >&5
+echo "$as_me:24247: 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
@@ -24194,14 +24263,14 @@ fi
 	;;
 esac
 
-echo "$as_me:24197: checking for chtype typedef" >&5
+echo "$as_me:24266: 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 24204 "configure"
+#line 24273 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -24213,16 +24282,16 @@ chtype foo
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24216: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24285: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24219: \$? = $ac_status" >&5
+  echo "$as_me:24288: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24222: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24291: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24225: \$? = $ac_status" >&5
+  echo "$as_me:24294: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_chtype_decl=yes
 else
@@ -24232,21 +24301,21 @@ cf_cv_chtype_decl=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:24235: result: $cf_cv_chtype_decl" >&5
+echo "$as_me:24304: 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:24242: checking if chtype is scalar or struct" >&5
+	echo "$as_me:24311: 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 24249 "configure"
+#line 24318 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -24258,16 +24327,16 @@ chtype foo; long x = foo
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24261: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24330: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24264: \$? = $ac_status" >&5
+  echo "$as_me:24333: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24267: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24336: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24270: \$? = $ac_status" >&5
+  echo "$as_me:24339: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_chtype_type=scalar
 else
@@ -24277,7 +24346,7 @@ cf_cv_chtype_type=struct
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:24280: result: $cf_cv_chtype_type" >&5
+echo "$as_me:24349: 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
@@ -24287,7 +24356,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:24290: checking if you want the wide-curses features" >&5
+echo "$as_me:24359: 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.
@@ -24304,10 +24373,10 @@ else
   use_wide_curses=$cf_wide_curses
 
 fi;
-echo "$as_me:24307: result: $use_wide_curses" >&5
+echo "$as_me:24376: result: $use_wide_curses" >&5
 echo "${ECHO_T}$use_wide_curses" >&6
 
-echo "$as_me:24310: checking if color-style code should be used" >&5
+echo "$as_me:24379: 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.
@@ -24327,7 +24396,7 @@ fi;
 
 case $use_color_style in
 no)
-	echo "$as_me:24330: result: no" >&5
+	echo "$as_me:24399: result: no" >&5
 echo "${ECHO_T}no" >&6
 	INSTALL_LSS=
 	;;
@@ -24336,10 +24405,10 @@ echo "${ECHO_T}no" >&6
 #define USE_COLOR_STYLE 1
 EOF
 
-	echo "$as_me:24339: result: yes" >&5
+	echo "$as_me:24408: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-	echo "$as_me:24342: checking for location of style-sheet file" >&5
+	echo "$as_me:24411: 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.
@@ -24375,7 +24444,7 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:24378: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:24447: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -24384,7 +24453,7 @@ esac
 fi
 LYNX_LSS_FILE="$withval"
 
-	echo "$as_me:24387: result: $LYNX_LSS_FILE" >&5
+	echo "$as_me:24456: result: $LYNX_LSS_FILE" >&5
 echo "${ECHO_T}$LYNX_LSS_FILE" >&6
 
 	test "$LYNX_LSS_FILE" = no && LYNX_LSS_FILE=
@@ -24396,7 +24465,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:24399: checking for the default configuration-file" >&5
+echo "$as_me:24468: 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.
@@ -24432,7 +24501,7 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:24435: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:24504: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -24441,7 +24510,7 @@ esac
 fi
 LYNX_CFG_FILE="$withval"
 
-echo "$as_me:24444: result: $LYNX_CFG_FILE" >&5
+echo "$as_me:24513: result: $LYNX_CFG_FILE" >&5
 echo "${ECHO_T}$LYNX_CFG_FILE" >&6
 
 test "$LYNX_CFG_FILE" = no && LYNX_CFG_FILE=
@@ -24449,7 +24518,7 @@ cat >>confdefs.h <<EOF
 #define LYNX_CFG_FILE "$LYNX_CFG_FILE"
 EOF
 
-echo "$as_me:24452: checking if htmlized lynx.cfg should be built" >&5
+echo "$as_me:24521: 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.
@@ -24466,7 +24535,7 @@ else
   use_htmlized_cfg=no
 
 fi;
-echo "$as_me:24469: result: $use_htmlized_cfg" >&5
+echo "$as_me:24538: result: $use_htmlized_cfg" >&5
 echo "${ECHO_T}$use_htmlized_cfg" >&6
 
 LYNXCFG_MAKE=''
@@ -24474,7 +24543,7 @@ if test $use_htmlized_cfg = no ; then
 	LYNXCFG_MAKE='#'
 fi
 
-echo "$as_me:24477: checking if local doc directory should be linked to help page" >&5
+echo "$as_me:24546: 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.
@@ -24491,7 +24560,7 @@ else
   use_local_docs=no
 
 fi;
-echo "$as_me:24494: result: $use_local_docs" >&5
+echo "$as_me:24563: result: $use_local_docs" >&5
 echo "${ECHO_T}$use_local_docs" >&6
 
 LYNXDOC_MAKE=''
@@ -24499,7 +24568,7 @@ if test $use_local_docs = no ; then
 	LYNXDOC_MAKE='#'
 fi
 
-echo "$as_me:24502: checking for MIME library directory" >&5
+echo "$as_me:24571: 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.
@@ -24535,7 +24604,7 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:24538: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:24607: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -24544,14 +24613,14 @@ esac
 fi
 MIME_LIBDIR="$withval"
 
-echo "$as_me:24547: result: $MIME_LIBDIR" >&5
+echo "$as_me:24616: 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:24554: checking if locale-charset selection logic should be used" >&5
+echo "$as_me:24623: 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.
@@ -24568,7 +24637,7 @@ else
   use_locale_charset=yes
 
 fi;
-echo "$as_me:24571: result: $use_locale_charset" >&5
+echo "$as_me:24640: 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
@@ -24576,7 +24645,7 @@ EOF
 
 CHARSET_DEFS=
 
-echo "$as_me:24579: checking if you want only a few charsets" >&5
+echo "$as_me:24648: 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.
@@ -24588,7 +24657,7 @@ else
 fi;
 
 if test -n "$cf_charsets" ; then
-	echo "$as_me:24591: result: yes" >&5
+	echo "$as_me:24660: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	cat >>confdefs.h <<\EOF
 #define ALL_CHARSETS 0
@@ -24601,7 +24670,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}:24604: testing using minimal list of charsets: $cf_min_charsets ..." 1>&5
+echo "${as_me:-configure}:24673: 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'`
@@ -24628,28 +24697,28 @@ echo "${as_me:-configure}:24604: testing using minimal list of charsets: $cf_min
 		then
 			test -n "$verbose" && echo "	found $cf_charset" 1>&6
 
-echo "${as_me:-configure}:24631: testing found $cf_charset ..." 1>&5
+echo "${as_me:-configure}:24700: 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}:24637: testing not found $cf_charset ..." 1>&5
+echo "${as_me:-configure}:24706: testing not found $cf_charset ..." 1>&5
 
 		fi
 	done
 else
-	echo "$as_me:24642: result: no" >&5
+	echo "$as_me:24711: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:24646: checking for ANSI C header files" >&5
+echo "$as_me:24715: 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 24652 "configure"
+#line 24721 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -24657,13 +24726,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:24660: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:24729: \"$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:24666: \$? = $ac_status" >&5
+  echo "$as_me:24735: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -24685,7 +24754,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 24688 "configure"
+#line 24757 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -24703,7 +24772,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 24706 "configure"
+#line 24775 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -24724,7 +24793,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 24727 "configure"
+#line 24796 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -24750,15 +24819,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:24753: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24822: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24756: \$? = $ac_status" >&5
+  echo "$as_me:24825: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:24758: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24827: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24761: \$? = $ac_status" >&5
+  echo "$as_me:24830: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -24771,7 +24840,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:24774: result: $ac_cv_header_stdc" >&5
+echo "$as_me:24843: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -24781,13 +24850,13 @@ EOF
 
 fi
 
-echo "$as_me:24784: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:24853: 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 24790 "configure"
+#line 24859 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -24803,16 +24872,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24806: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24875: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24809: \$? = $ac_status" >&5
+  echo "$as_me:24878: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24812: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24881: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24815: \$? = $ac_status" >&5
+  echo "$as_me:24884: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_header_time=yes
 else
@@ -24822,7 +24891,7 @@ ac_cv_header_time=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:24825: result: $ac_cv_header_time" >&5
+echo "$as_me:24894: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -24835,13 +24904,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:24838: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:24907: 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 24844 "configure"
+#line 24913 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -24856,16 +24925,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24859: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24928: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24862: \$? = $ac_status" >&5
+  echo "$as_me:24931: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24865: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24934: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24868: \$? = $ac_status" >&5
+  echo "$as_me:24937: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -24875,7 +24944,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:24878: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:24947: 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
@@ -24888,7 +24957,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:24891: checking for opendir in -ldir" >&5
+  echo "$as_me:24960: 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
@@ -24896,7 +24965,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 24899 "configure"
+#line 24968 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24915,16 +24984,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24918: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24987: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24921: \$? = $ac_status" >&5
+  echo "$as_me:24990: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24924: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24993: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24927: \$? = $ac_status" >&5
+  echo "$as_me:24996: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -24935,14 +25004,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24938: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:25007: 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:24945: checking for opendir in -lx" >&5
+  echo "$as_me:25014: 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
@@ -24950,7 +25019,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 24953 "configure"
+#line 25022 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24969,16 +25038,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24972: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25041: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24975: \$? = $ac_status" >&5
+  echo "$as_me:25044: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24978: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25047: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24981: \$? = $ac_status" >&5
+  echo "$as_me:25050: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -24989,7 +25058,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24992: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:25061: 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"
@@ -24999,6 +25068,7 @@ fi
 
 for ac_header in \
 	arpa/inet.h \
+	bsd/random.h \
 	fcntl.h \
 	limits.h \
 	stdlib.h \
@@ -25017,23 +25087,23 @@ for ac_header in \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:25020: checking for $ac_header" >&5
+echo "$as_me:25090: 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 25026 "configure"
+#line 25096 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:25030: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:25100: \"$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:25036: \$? = $ac_status" >&5
+  echo "$as_me:25106: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -25052,7 +25122,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:25055: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:25125: 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
@@ -25062,14 +25132,14 @@ EOF
 fi
 done
 
-echo "$as_me:25065: checking termio.h and termios.h" >&5
+echo "$as_me:25135: 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 25072 "configure"
+#line 25142 "configure"
 #include "confdefs.h"
 
 #if HAVE_TERMIO_H
@@ -25087,16 +25157,16 @@ putchar (0x0a)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25090: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25160: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25093: \$? = $ac_status" >&5
+  echo "$as_me:25163: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25096: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25166: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25099: \$? = $ac_status" >&5
+  echo "$as_me:25169: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termio_and_termios=yes
 else
@@ -25107,20 +25177,20 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:25110: result: $cf_cv_termio_and_termios" >&5
+echo "$as_me:25180: 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:25116: checking for sigaction and structs" >&5
+echo "$as_me:25186: 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 25123 "configure"
+#line 25193 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -25140,16 +25210,16 @@ struct sigaction act;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25143: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25213: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25146: \$? = $ac_status" >&5
+  echo "$as_me:25216: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25149: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25219: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25152: \$? = $ac_status" >&5
+  echo "$as_me:25222: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_func_sigaction=yes
 else
@@ -25160,7 +25230,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:25163: result: $cf_cv_func_sigaction" >&5
+echo "$as_me:25233: 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
@@ -25169,23 +25239,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:25172: checking for $ac_header" >&5
+echo "$as_me:25242: 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 25178 "configure"
+#line 25248 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:25182: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:25252: \"$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:25188: \$? = $ac_status" >&5
+  echo "$as_me:25258: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -25204,7 +25274,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:25207: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:25277: 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
@@ -25225,23 +25295,23 @@ else
 for ac_header in wait.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:25228: checking for $ac_header" >&5
+echo "$as_me:25298: 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 25234 "configure"
+#line 25304 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:25238: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:25308: \"$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:25244: \$? = $ac_status" >&5
+  echo "$as_me:25314: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -25260,7 +25330,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:25263: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:25333: 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
@@ -25273,23 +25343,23 @@ done
 for ac_header in waitstatus.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:25276: checking for $ac_header" >&5
+echo "$as_me:25346: 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 25282 "configure"
+#line 25352 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:25286: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:25356: \"$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:25292: \$? = $ac_status" >&5
+  echo "$as_me:25362: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -25308,7 +25378,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:25311: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:25381: 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
@@ -25330,14 +25400,14 @@ cf_wait_headers="$cf_wait_headers
 fi
 fi
 
-echo "$as_me:25333: checking for union wait" >&5
+echo "$as_me:25403: 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 25340 "configure"
+#line 25410 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -25353,16 +25423,16 @@ int x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25356: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25426: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25359: \$? = $ac_status" >&5
+  echo "$as_me:25429: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25362: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25432: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25365: \$? = $ac_status" >&5
+  echo "$as_me:25435: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_unionwait=no
 	 echo compiles ok w/o union wait 1>&5
@@ -25372,7 +25442,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 25375 "configure"
+#line 25445 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -25392,16 +25462,16 @@ union wait x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25395: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25465: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25398: \$? = $ac_status" >&5
+  echo "$as_me:25468: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25401: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25471: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25404: \$? = $ac_status" >&5
+  echo "$as_me:25474: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_unionwait=yes
 	 echo compiles ok with union wait and possibly macros too 1>&5
@@ -25416,7 +25486,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:25419: result: $cf_cv_type_unionwait" >&5
+echo "$as_me:25489: 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
@@ -25424,14 +25494,14 @@ EOF
 
 if test $cf_cv_type_unionwait = yes; then
 
-	echo "$as_me:25427: checking if union wait can be used as wait-arg" >&5
+	echo "$as_me:25497: 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 25434 "configure"
+#line 25504 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -25443,16 +25513,16 @@ union wait x; wait(&x)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25446: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25516: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25449: \$? = $ac_status" >&5
+  echo "$as_me:25519: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25452: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25522: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25455: \$? = $ac_status" >&5
+  echo "$as_me:25525: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_arg_union_wait=yes
 else
@@ -25464,20 +25534,20 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-	echo "$as_me:25467: result: $cf_cv_arg_union_wait" >&5
+	echo "$as_me:25537: 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:25473: checking if union wait can be used as waitpid-arg" >&5
+	echo "$as_me:25543: 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 25480 "configure"
+#line 25550 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -25489,16 +25559,16 @@ union wait x; waitpid(0, &x, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25492: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25562: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25495: \$? = $ac_status" >&5
+  echo "$as_me:25565: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25498: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25568: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25501: \$? = $ac_status" >&5
+  echo "$as_me:25571: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_arg_union_waitpid=yes
 else
@@ -25510,7 +25580,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-	echo "$as_me:25513: result: $cf_cv_arg_union_waitpid" >&5
+	echo "$as_me:25583: 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
@@ -25518,13 +25588,13 @@ EOF
 
 fi
 
-echo "$as_me:25521: checking for uid_t in sys/types.h" >&5
+echo "$as_me:25591: 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 25527 "configure"
+#line 25597 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -25538,7 +25608,7 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:25541: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:25611: 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
 
@@ -25552,7 +25622,7 @@ EOF
 
 fi
 
-echo "$as_me:25555: checking type of array argument to getgroups" >&5
+echo "$as_me:25625: 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
@@ -25561,7 +25631,7 @@ else
   ac_cv_type_getgroups=cross
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 25564 "configure"
+#line 25634 "configure"
 #include "confdefs.h"
 /* Thanks to Mike Rendell for this test.  */
 #include <sys/types.h>
@@ -25587,15 +25657,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:25590: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25660: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25593: \$? = $ac_status" >&5
+  echo "$as_me:25663: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:25595: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25665: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25598: \$? = $ac_status" >&5
+  echo "$as_me:25668: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_getgroups=gid_t
 else
@@ -25608,7 +25678,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 25611 "configure"
+#line 25681 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 
@@ -25623,20 +25693,20 @@ rm -rf conftest*
 
 fi
 fi
-echo "$as_me:25626: result: $ac_cv_type_getgroups" >&5
+echo "$as_me:25696: 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:25633: checking for off_t" >&5
+echo "$as_me:25703: 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 25639 "configure"
+#line 25709 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -25651,16 +25721,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25654: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25724: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25657: \$? = $ac_status" >&5
+  echo "$as_me:25727: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25660: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25730: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25663: \$? = $ac_status" >&5
+  echo "$as_me:25733: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -25670,7 +25740,7 @@ ac_cv_type_off_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25673: result: $ac_cv_type_off_t" >&5
+echo "$as_me:25743: 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
   :
@@ -25682,13 +25752,13 @@ EOF
 
 fi
 
-echo "$as_me:25685: checking for pid_t" >&5
+echo "$as_me:25755: 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 25691 "configure"
+#line 25761 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -25703,16 +25773,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25706: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25776: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25709: \$? = $ac_status" >&5
+  echo "$as_me:25779: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25712: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25782: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25715: \$? = $ac_status" >&5
+  echo "$as_me:25785: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -25722,7 +25792,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25725: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:25795: 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
   :
@@ -25734,13 +25804,13 @@ EOF
 
 fi
 
-echo "$as_me:25737: checking for uid_t in sys/types.h" >&5
+echo "$as_me:25807: 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 25743 "configure"
+#line 25813 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -25754,7 +25824,7 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:25757: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:25827: 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
 
@@ -25768,13 +25838,13 @@ EOF
 
 fi
 
-echo "$as_me:25771: checking for mode_t" >&5
+echo "$as_me:25841: 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 25777 "configure"
+#line 25847 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -25789,16 +25859,16 @@ if (sizeof (mode_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25792: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25862: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25795: \$? = $ac_status" >&5
+  echo "$as_me:25865: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25798: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25868: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25801: \$? = $ac_status" >&5
+  echo "$as_me:25871: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_mode_t=yes
 else
@@ -25808,7 +25878,7 @@ ac_cv_type_mode_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25811: result: $ac_cv_type_mode_t" >&5
+echo "$as_me:25881: 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
   :
@@ -25820,13 +25890,13 @@ EOF
 
 fi
 
-	echo "$as_me:25823: checking for ssize_t" >&5
+	echo "$as_me:25893: 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 25829 "configure"
+#line 25899 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -25841,16 +25911,16 @@ if (sizeof (ssize_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25844: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25914: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25847: \$? = $ac_status" >&5
+  echo "$as_me:25917: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25850: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25920: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25853: \$? = $ac_status" >&5
+  echo "$as_me:25923: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_ssize_t=yes
 else
@@ -25860,7 +25930,7 @@ ac_cv_type_ssize_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25863: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:25933: 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
@@ -25875,13 +25945,13 @@ EOF
 
 fi
 
-	echo "$as_me:25878: checking for socklen_t" >&5
+	echo "$as_me:25948: 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 25884 "configure"
+#line 25954 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -25899,16 +25969,16 @@ if (sizeof (socklen_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25902: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25972: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25905: \$? = $ac_status" >&5
+  echo "$as_me:25975: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25908: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25978: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25911: \$? = $ac_status" >&5
+  echo "$as_me:25981: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_socklen_t=yes
 else
@@ -25918,7 +25988,7 @@ ac_cv_type_socklen_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25921: result: $ac_cv_type_socklen_t" >&5
+echo "$as_me:25991: 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
@@ -25933,7 +26003,7 @@ EOF
 
 fi
 
-echo "$as_me:25936: checking for long long type" >&5
+echo "$as_me:26006: 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
@@ -25964,7 +26034,7 @@ _CFEOF
 	rm -f conftest*
 
 fi
-echo "$as_me:25967: result: $cf_cv_type_long_long" >&5
+echo "$as_me:26037: 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
@@ -25974,14 +26044,14 @@ EOF
 
 fi
 
-echo "$as_me:25977: checking for tm.tm_gmtoff" >&5
+echo "$as_me:26047: 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 25984 "configure"
+#line 26054 "configure"
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
@@ -26006,16 +26076,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26009: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26079: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26012: \$? = $ac_status" >&5
+  echo "$as_me:26082: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26015: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26085: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26018: \$? = $ac_status" >&5
+  echo "$as_me:26088: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_tm_gmtoff=yes
 else
@@ -26026,19 +26096,19 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:26029: result: $cf_cv_tm_gmtoff" >&5
+echo "$as_me:26099: 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:26035: checking for int" >&5
+echo "$as_me:26105: 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 26041 "configure"
+#line 26111 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26053,16 +26123,16 @@ if (sizeof (int))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26056: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26126: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26059: \$? = $ac_status" >&5
+  echo "$as_me:26129: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26062: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26132: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26065: \$? = $ac_status" >&5
+  echo "$as_me:26135: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_int=yes
 else
@@ -26072,10 +26142,10 @@ ac_cv_type_int=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:26075: result: $ac_cv_type_int" >&5
+echo "$as_me:26145: result: $ac_cv_type_int" >&5
 echo "${ECHO_T}$ac_cv_type_int" >&6
 
-echo "$as_me:26078: checking size of int" >&5
+echo "$as_me:26148: 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
@@ -26084,7 +26154,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 26087 "configure"
+#line 26157 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26096,21 +26166,21 @@ int _array_ [1 - 2 * !((sizeof (int)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26099: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26169: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26102: \$? = $ac_status" >&5
+  echo "$as_me:26172: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26105: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26175: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26108: \$? = $ac_status" >&5
+  echo "$as_me:26178: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 26113 "configure"
+#line 26183 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26122,16 +26192,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26125: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26195: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26128: \$? = $ac_status" >&5
+  echo "$as_me:26198: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26131: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26201: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26134: \$? = $ac_status" >&5
+  echo "$as_me:26204: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -26147,7 +26217,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 26150 "configure"
+#line 26220 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26159,16 +26229,16 @@ int _array_ [1 - 2 * !((sizeof (int)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26162: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26232: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26165: \$? = $ac_status" >&5
+  echo "$as_me:26235: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26168: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26238: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26171: \$? = $ac_status" >&5
+  echo "$as_me:26241: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -26184,7 +26254,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 26187 "configure"
+#line 26257 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26196,16 +26266,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26199: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26269: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26202: \$? = $ac_status" >&5
+  echo "$as_me:26272: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26205: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26275: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26208: \$? = $ac_status" >&5
+  echo "$as_me:26278: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -26218,12 +26288,12 @@ done
 ac_cv_sizeof_int=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:26221: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:26291: 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 26226 "configure"
+#line 26296 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26239,15 +26309,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:26242: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26312: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26245: \$? = $ac_status" >&5
+  echo "$as_me:26315: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:26247: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26317: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26250: \$? = $ac_status" >&5
+  echo "$as_me:26320: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_int=`cat conftest.val`
 else
@@ -26263,19 +26333,19 @@ else
   ac_cv_sizeof_int=0
 fi
 fi
-echo "$as_me:26266: result: $ac_cv_sizeof_int" >&5
+echo "$as_me:26336: 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:26272: checking for long" >&5
+echo "$as_me:26342: 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 26278 "configure"
+#line 26348 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26290,16 +26360,16 @@ if (sizeof (long))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26293: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26363: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26296: \$? = $ac_status" >&5
+  echo "$as_me:26366: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26299: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26369: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26302: \$? = $ac_status" >&5
+  echo "$as_me:26372: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_long=yes
 else
@@ -26309,10 +26379,10 @@ ac_cv_type_long=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:26312: result: $ac_cv_type_long" >&5
+echo "$as_me:26382: result: $ac_cv_type_long" >&5
 echo "${ECHO_T}$ac_cv_type_long" >&6
 
-echo "$as_me:26315: checking size of long" >&5
+echo "$as_me:26385: 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
@@ -26321,7 +26391,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 26324 "configure"
+#line 26394 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26333,21 +26403,21 @@ int _array_ [1 - 2 * !((sizeof (long)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26336: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26406: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26339: \$? = $ac_status" >&5
+  echo "$as_me:26409: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26342: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26412: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26345: \$? = $ac_status" >&5
+  echo "$as_me:26415: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 26350 "configure"
+#line 26420 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26359,16 +26429,16 @@ int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26362: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26432: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26365: \$? = $ac_status" >&5
+  echo "$as_me:26435: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26368: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26438: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26371: \$? = $ac_status" >&5
+  echo "$as_me:26441: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -26384,7 +26454,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 26387 "configure"
+#line 26457 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26396,16 +26466,16 @@ int _array_ [1 - 2 * !((sizeof (long)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26399: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26469: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26402: \$? = $ac_status" >&5
+  echo "$as_me:26472: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26405: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26475: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26408: \$? = $ac_status" >&5
+  echo "$as_me:26478: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -26421,7 +26491,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 26424 "configure"
+#line 26494 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26433,16 +26503,16 @@ int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26436: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26506: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26439: \$? = $ac_status" >&5
+  echo "$as_me:26509: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26442: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26512: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26445: \$? = $ac_status" >&5
+  echo "$as_me:26515: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -26455,12 +26525,12 @@ done
 ac_cv_sizeof_long=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:26458: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:26528: 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 26463 "configure"
+#line 26533 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26476,15 +26546,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:26479: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26549: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26482: \$? = $ac_status" >&5
+  echo "$as_me:26552: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:26484: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26554: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26487: \$? = $ac_status" >&5
+  echo "$as_me:26557: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_long=`cat conftest.val`
 else
@@ -26500,19 +26570,19 @@ else
   ac_cv_sizeof_long=0
 fi
 fi
-echo "$as_me:26503: result: $ac_cv_sizeof_long" >&5
+echo "$as_me:26573: 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:26509: checking for off_t" >&5
+echo "$as_me:26579: 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 26515 "configure"
+#line 26585 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26527,16 +26597,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26530: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26600: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26533: \$? = $ac_status" >&5
+  echo "$as_me:26603: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26536: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26606: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26539: \$? = $ac_status" >&5
+  echo "$as_me:26609: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -26546,10 +26616,10 @@ ac_cv_type_off_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:26549: result: $ac_cv_type_off_t" >&5
+echo "$as_me:26619: result: $ac_cv_type_off_t" >&5
 echo "${ECHO_T}$ac_cv_type_off_t" >&6
 
-echo "$as_me:26552: checking size of off_t" >&5
+echo "$as_me:26622: 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
@@ -26558,7 +26628,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 26561 "configure"
+#line 26631 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26570,21 +26640,21 @@ int _array_ [1 - 2 * !((sizeof (off_t)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26573: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26643: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26576: \$? = $ac_status" >&5
+  echo "$as_me:26646: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26579: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26649: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26582: \$? = $ac_status" >&5
+  echo "$as_me:26652: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 26587 "configure"
+#line 26657 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26596,16 +26666,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26599: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26669: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26602: \$? = $ac_status" >&5
+  echo "$as_me:26672: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26605: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26675: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26608: \$? = $ac_status" >&5
+  echo "$as_me:26678: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -26621,7 +26691,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 26624 "configure"
+#line 26694 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26633,16 +26703,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26636: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26706: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26639: \$? = $ac_status" >&5
+  echo "$as_me:26709: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26642: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26712: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26645: \$? = $ac_status" >&5
+  echo "$as_me:26715: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -26658,7 +26728,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 26661 "configure"
+#line 26731 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26670,16 +26740,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26673: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26743: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26676: \$? = $ac_status" >&5
+  echo "$as_me:26746: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26679: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26749: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26682: \$? = $ac_status" >&5
+  echo "$as_me:26752: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -26692,12 +26762,12 @@ done
 ac_cv_sizeof_off_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:26695: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:26765: 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 26700 "configure"
+#line 26770 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26713,15 +26783,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:26716: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26786: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26719: \$? = $ac_status" >&5
+  echo "$as_me:26789: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:26721: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26791: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26724: \$? = $ac_status" >&5
+  echo "$as_me:26794: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_off_t=`cat conftest.val`
 else
@@ -26737,19 +26807,19 @@ else
   ac_cv_sizeof_off_t=0
 fi
 fi
-echo "$as_me:26740: result: $ac_cv_sizeof_off_t" >&5
+echo "$as_me:26810: 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:26746: checking for time_t" >&5
+echo "$as_me:26816: 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 26752 "configure"
+#line 26822 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26764,16 +26834,16 @@ if (sizeof (time_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26767: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26837: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26770: \$? = $ac_status" >&5
+  echo "$as_me:26840: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26773: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26843: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26776: \$? = $ac_status" >&5
+  echo "$as_me:26846: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_time_t=yes
 else
@@ -26783,10 +26853,10 @@ ac_cv_type_time_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:26786: result: $ac_cv_type_time_t" >&5
+echo "$as_me:26856: result: $ac_cv_type_time_t" >&5
 echo "${ECHO_T}$ac_cv_type_time_t" >&6
 
-echo "$as_me:26789: checking size of time_t" >&5
+echo "$as_me:26859: 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
@@ -26795,7 +26865,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 26798 "configure"
+#line 26868 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26807,21 +26877,21 @@ int _array_ [1 - 2 * !((sizeof (time_t)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26810: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26880: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26813: \$? = $ac_status" >&5
+  echo "$as_me:26883: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26816: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26886: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26819: \$? = $ac_status" >&5
+  echo "$as_me:26889: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 26824 "configure"
+#line 26894 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26833,16 +26903,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26836: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26906: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26839: \$? = $ac_status" >&5
+  echo "$as_me:26909: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26842: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26912: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26845: \$? = $ac_status" >&5
+  echo "$as_me:26915: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -26858,7 +26928,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 26861 "configure"
+#line 26931 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26870,16 +26940,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26873: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26943: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26876: \$? = $ac_status" >&5
+  echo "$as_me:26946: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26879: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26949: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26882: \$? = $ac_status" >&5
+  echo "$as_me:26952: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -26895,7 +26965,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 26898 "configure"
+#line 26968 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26907,16 +26977,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26910: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26980: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26913: \$? = $ac_status" >&5
+  echo "$as_me:26983: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26916: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26986: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26919: \$? = $ac_status" >&5
+  echo "$as_me:26989: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -26929,12 +26999,12 @@ done
 ac_cv_sizeof_time_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:26932: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:27002: 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 26937 "configure"
+#line 27007 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26950,15 +27020,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:26953: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27023: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26956: \$? = $ac_status" >&5
+  echo "$as_me:27026: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:26958: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27028: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26961: \$? = $ac_status" >&5
+  echo "$as_me:27031: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_time_t=`cat conftest.val`
 else
@@ -26974,7 +27044,7 @@ else
   ac_cv_sizeof_time_t=0
 fi
 fi
-echo "$as_me:26977: result: $ac_cv_sizeof_time_t" >&5
+echo "$as_me:27047: 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
@@ -26982,13 +27052,13 @@ EOF
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:26985: checking for working alloca.h" >&5
+echo "$as_me:27055: 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 26991 "configure"
+#line 27061 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int
@@ -27000,16 +27070,16 @@ char *p = (char *) alloca (2 * sizeof (int));
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27003: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27073: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27006: \$? = $ac_status" >&5
+  echo "$as_me:27076: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27009: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27079: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27012: \$? = $ac_status" >&5
+  echo "$as_me:27082: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_working_alloca_h=yes
 else
@@ -27019,7 +27089,7 @@ ac_cv_working_alloca_h=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:27022: result: $ac_cv_working_alloca_h" >&5
+echo "$as_me:27092: 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
 
@@ -27029,13 +27099,13 @@ EOF
 
 fi
 
-echo "$as_me:27032: checking for alloca" >&5
+echo "$as_me:27102: 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 27038 "configure"
+#line 27108 "configure"
 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -27067,16 +27137,16 @@ char *p = (char *) alloca (1);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27070: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27140: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27073: \$? = $ac_status" >&5
+  echo "$as_me:27143: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27076: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27146: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27079: \$? = $ac_status" >&5
+  echo "$as_me:27149: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_alloca_works=yes
 else
@@ -27086,7 +27156,7 @@ ac_cv_func_alloca_works=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:27089: result: $ac_cv_func_alloca_works" >&5
+echo "$as_me:27159: 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
@@ -27107,13 +27177,13 @@ cat >>confdefs.h <<\EOF
 #define C_ALLOCA 1
 EOF
 
-echo "$as_me:27110: checking whether \`alloca.c' needs Cray hooks" >&5
+echo "$as_me:27180: 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 27116 "configure"
+#line 27186 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -27131,18 +27201,18 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:27134: result: $ac_cv_os_cray" >&5
+echo "$as_me:27204: 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:27139: checking for $ac_func" >&5
+echo "$as_me:27209: 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 27145 "configure"
+#line 27215 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -27173,16 +27243,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27176: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27246: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27179: \$? = $ac_status" >&5
+  echo "$as_me:27249: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27182: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27252: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27185: \$? = $ac_status" >&5
+  echo "$as_me:27255: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -27192,7 +27262,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:27195: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:27265: 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
 
@@ -27206,7 +27276,7 @@ fi
   done
 fi
 
-echo "$as_me:27209: checking stack direction for C alloca" >&5
+echo "$as_me:27279: 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
@@ -27215,7 +27285,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 27218 "configure"
+#line 27288 "configure"
 #include "confdefs.h"
 int
 find_stack_direction ()
@@ -27238,15 +27308,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:27241: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27311: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27244: \$? = $ac_status" >&5
+  echo "$as_me:27314: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:27246: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27316: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27249: \$? = $ac_status" >&5
+  echo "$as_me:27319: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_stack_direction=1
 else
@@ -27258,7 +27328,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:27261: result: $ac_cv_c_stack_direction" >&5
+echo "$as_me:27331: result: $ac_cv_c_stack_direction" >&5
 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
 cat >>confdefs.h <<EOF
@@ -27270,23 +27340,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:27273: checking for $ac_header" >&5
+echo "$as_me:27343: 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 27279 "configure"
+#line 27349 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:27283: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:27353: \"$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:27289: \$? = $ac_status" >&5
+  echo "$as_me:27359: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -27305,7 +27375,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:27308: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:27378: 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
@@ -27318,13 +27388,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:27321: checking for $ac_func" >&5
+echo "$as_me:27391: 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 27327 "configure"
+#line 27397 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -27355,16 +27425,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27358: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27428: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27361: \$? = $ac_status" >&5
+  echo "$as_me:27431: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27364: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27434: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27367: \$? = $ac_status" >&5
+  echo "$as_me:27437: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -27374,7 +27444,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:27377: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:27447: 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
@@ -27386,7 +27456,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:27389: checking for working fork" >&5
+  echo "$as_me:27459: 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
@@ -27409,15 +27479,15 @@ else
       }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:27412: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27482: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27415: \$? = $ac_status" >&5
+  echo "$as_me:27485: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:27417: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27487: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27420: \$? = $ac_status" >&5
+  echo "$as_me:27490: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -27429,7 +27499,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:27432: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:27502: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -27443,12 +27513,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:27446: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:27516: 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:27451: checking for working vfork" >&5
+  echo "$as_me:27521: 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
@@ -27457,7 +27527,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 27460 "configure"
+#line 27530 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -27554,15 +27624,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:27557: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27627: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27560: \$? = $ac_status" >&5
+  echo "$as_me:27630: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:27562: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27632: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27565: \$? = $ac_status" >&5
+  echo "$as_me:27635: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -27574,13 +27644,13 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:27577: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:27647: 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:27583: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:27653: 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
 
@@ -27605,14 +27675,14 @@ EOF
 
 fi
 
-echo "$as_me:27608: checking if we should use fcntl or ioctl" >&5
+echo "$as_me:27678: 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 27615 "configure"
+#line 27685 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -27629,16 +27699,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27632: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27702: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27635: \$? = $ac_status" >&5
+  echo "$as_me:27705: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27638: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27708: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27641: \$? = $ac_status" >&5
+  echo "$as_me:27711: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fionbio=ioctl
 else
@@ -27646,7 +27716,7 @@ else
 cat conftest.$ac_ext >&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 27649 "configure"
+#line 27719 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -27668,16 +27738,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27671: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27741: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27674: \$? = $ac_status" >&5
+  echo "$as_me:27744: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27677: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27747: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27680: \$? = $ac_status" >&5
+  echo "$as_me:27750: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fionbio=fcntl
 else
@@ -27690,20 +27760,20 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:27693: result: $cf_cv_fionbio" >&5
+echo "$as_me:27763: 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:27699: checking for broken/missing definition of remove" >&5
+echo "$as_me:27769: 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 27706 "configure"
+#line 27776 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -27715,23 +27785,23 @@ remove("dummy")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27718: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27788: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27721: \$? = $ac_status" >&5
+  echo "$as_me:27791: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27724: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27794: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27727: \$? = $ac_status" >&5
+  echo "$as_me:27797: \$? = $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 27734 "configure"
+#line 27804 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 		int __unlink(name) { return unlink(name); }
@@ -27744,16 +27814,16 @@ remove("dummy")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27747: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27817: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27750: \$? = $ac_status" >&5
+  echo "$as_me:27820: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27753: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27823: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27756: \$? = $ac_status" >&5
+  echo "$as_me:27826: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_baddef_remove=yes
 else
@@ -27768,20 +27838,20 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:27771: result: $cf_cv_baddef_remove" >&5
+echo "$as_me:27841: 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:27777: checking for lstat" >&5
+echo "$as_me:27847: 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 27784 "configure"
+#line 27854 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -27795,16 +27865,16 @@ lstat(".", (struct stat *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27798: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27868: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27801: \$? = $ac_status" >&5
+  echo "$as_me:27871: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27804: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27874: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27807: \$? = $ac_status" >&5
+  echo "$as_me:27877: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_lstat=yes
 else
@@ -27816,7 +27886,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:27819: result: $ac_cv_func_lstat " >&5
+echo "$as_me:27889: 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
@@ -27850,13 +27920,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:27853: checking for $ac_func" >&5
+echo "$as_me:27923: 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 27859 "configure"
+#line 27929 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -27887,16 +27957,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27890: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27960: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27893: \$? = $ac_status" >&5
+  echo "$as_me:27963: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27896: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27966: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27899: \$? = $ac_status" >&5
+  echo "$as_me:27969: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -27906,7 +27976,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:27909: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:27979: 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
@@ -27922,13 +27992,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:27925: checking for $ac_func" >&5
+echo "$as_me:27995: 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 27931 "configure"
+#line 28001 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -27959,16 +28029,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27962: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28032: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27965: \$? = $ac_status" >&5
+  echo "$as_me:28035: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27968: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28038: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27971: \$? = $ac_status" >&5
+  echo "$as_me:28041: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -27978,7 +28048,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:27981: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:28051: 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
@@ -27990,7 +28060,7 @@ else
 fi
 done
 
-echo "$as_me:27993: checking for random-integer functions" >&5
+echo "$as_me:28063: 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
@@ -28010,7 +28080,7 @@ do
 	esac
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 28013 "configure"
+#line 28083 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -28029,16 +28099,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:28032: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28102: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28035: \$? = $ac_status" >&5
+  echo "$as_me:28105: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28038: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28108: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28041: \$? = $ac_status" >&5
+  echo "$as_me:28111: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_srand_func=$cf_func
  break
@@ -28050,10 +28120,10 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:28053: result: $cf_cv_srand_func" >&5
+echo "$as_me:28123: 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:28056: checking for range of random-integers" >&5
+	echo "$as_me:28126: 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
@@ -28074,7 +28144,7 @@ else
 			;;
 		esac
 		cat >conftest.$ac_ext <<_ACEOF
-#line 28077 "configure"
+#line 28147 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -28083,6 +28153,9 @@ else
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #endif
+#ifdef HAVE_BSD_RANDOM_H
+#include <bsd/random.h>
+#endif
 
 int
 main ()
@@ -28093,16 +28166,16 @@ long x = $cf_cv_rand_max
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28096: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28169: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28099: \$? = $ac_status" >&5
+  echo "$as_me:28172: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28102: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28175: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28105: \$? = $ac_status" >&5
+  echo "$as_me:28178: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -28113,7 +28186,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:28116: result: $cf_cv_rand_max" >&5
+echo "$as_me:28189: result: $cf_cv_rand_max" >&5
 echo "${ECHO_T}$cf_cv_rand_max" >&6
 
 	cf_srand_func=`echo $cf_func | sed -e 's%/.*%%'`
@@ -28144,13 +28217,13 @@ fi
 for ac_func in strstr
 do
 
-echo "$as_me:28147: checking for $ac_func declaration" >&5
+echo "$as_me:28220: 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 28153 "configure"
+#line 28226 "configure"
 #include "confdefs.h"
 #include <string.h>
 int
@@ -28164,20 +28237,20 @@ extern	int	$ac_func();
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28167: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28240: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28170: \$? = $ac_status" >&5
+  echo "$as_me:28243: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28173: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28246: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28176: \$? = $ac_status" >&5
+  echo "$as_me:28249: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 28180 "configure"
+#line 28253 "configure"
 #include "confdefs.h"
 #include <string.h>
 int
@@ -28191,16 +28264,16 @@ int	(*p)() = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28194: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28267: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28197: \$? = $ac_status" >&5
+  echo "$as_me:28270: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28200: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28273: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28203: \$? = $ac_status" >&5
+  echo "$as_me:28276: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -28221,11 +28294,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:28224: result: yes" >&5
+  echo "$as_me:28297: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:28228: result: no" >&5
+  echo "$as_me:28301: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -28240,13 +28313,13 @@ done
 for ac_func in getgrgid getgrnam
 do
 
-echo "$as_me:28243: checking for $ac_func declaration" >&5
+echo "$as_me:28316: 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 28249 "configure"
+#line 28322 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -28262,20 +28335,20 @@ extern	int	$ac_func();
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28265: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28338: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28268: \$? = $ac_status" >&5
+  echo "$as_me:28341: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28271: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28344: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28274: \$? = $ac_status" >&5
+  echo "$as_me:28347: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 28278 "configure"
+#line 28351 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -28291,16 +28364,16 @@ int	(*p)() = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28294: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28367: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28297: \$? = $ac_status" >&5
+  echo "$as_me:28370: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28300: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28373: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28303: \$? = $ac_status" >&5
+  echo "$as_me:28376: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -28321,11 +28394,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:28324: result: yes" >&5
+  echo "$as_me:28397: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:28328: result: no" >&5
+  echo "$as_me:28401: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -28337,14 +28410,14 @@ EOF
 fi
 done
 
-echo "$as_me:28340: checking if TRUE/FALSE are defined" >&5
+echo "$as_me:28413: 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 28347 "configure"
+#line 28420 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -28358,16 +28431,16 @@ int x = TRUE, y = FALSE
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28361: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28434: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28364: \$? = $ac_status" >&5
+  echo "$as_me:28437: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28367: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28440: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28370: \$? = $ac_status" >&5
+  echo "$as_me:28443: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_bool_defs=yes
 else
@@ -28378,7 +28451,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:28381: result: $cf_cv_bool_defs" >&5
+echo "$as_me:28454: 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
@@ -28391,14 +28464,14 @@ EOF
 
 fi
 
-echo "$as_me:28394: checking if external errno is declared" >&5
+echo "$as_me:28467: 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 28401 "configure"
+#line 28474 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -28416,16 +28489,16 @@ int x = (int) errno
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28419: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28492: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28422: \$? = $ac_status" >&5
+  echo "$as_me:28495: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28425: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28498: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28428: \$? = $ac_status" >&5
+  echo "$as_me:28501: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -28436,7 +28509,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:28439: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:28512: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -28451,14 +28524,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:28454: checking if external errno exists" >&5
+echo "$as_me:28527: 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 28461 "configure"
+#line 28534 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -28473,16 +28546,16 @@ errno = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28476: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28549: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28479: \$? = $ac_status" >&5
+  echo "$as_me:28552: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28482: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28555: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28485: \$? = $ac_status" >&5
+  echo "$as_me:28558: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_errno=yes
 else
@@ -28493,7 +28566,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:28496: result: $cf_cv_have_errno" >&5
+echo "$as_me:28569: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -28506,7 +28579,7 @@ EOF
 
 fi
 
-echo "$as_me:28509: checking if we can set errno" >&5
+echo "$as_me:28582: 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
@@ -28514,7 +28587,7 @@ else
 
 if test "$cross_compiling" = yes; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 28517 "configure"
+#line 28590 "configure"
 #include "confdefs.h"
 #include <errno.h>
 int
@@ -28526,16 +28599,16 @@ errno = 255
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28529: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28602: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28532: \$? = $ac_status" >&5
+  echo "$as_me:28605: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28535: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28608: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28538: \$? = $ac_status" >&5
+  echo "$as_me:28611: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_set_errno=maybe
 else
@@ -28546,7 +28619,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 28549 "configure"
+#line 28622 "configure"
 #include "confdefs.h"
 
 #include <errno.h>
@@ -28557,15 +28630,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:28560: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28633: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28563: \$? = $ac_status" >&5
+  echo "$as_me:28636: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:28565: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28638: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28568: \$? = $ac_status" >&5
+  echo "$as_me:28641: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_set_errno=yes
 else
@@ -28578,20 +28651,20 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:28581: result: $cf_cv_set_errno" >&5
+echo "$as_me:28654: 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:28587: checking for setlocale()" >&5
+echo "$as_me:28660: 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 28594 "configure"
+#line 28667 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int
@@ -28603,16 +28676,16 @@ setlocale(LC_ALL, "")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28606: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28679: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28609: \$? = $ac_status" >&5
+  echo "$as_me:28682: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28612: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28685: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28615: \$? = $ac_status" >&5
+  echo "$as_me:28688: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_locale=yes
 else
@@ -28624,21 +28697,21 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:28627: result: $cf_cv_locale" >&5
+echo "$as_me:28700: 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:28634: checking if NGROUPS is defined" >&5
+echo "$as_me:28707: 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 28641 "configure"
+#line 28714 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -28657,23 +28730,23 @@ int x = NGROUPS
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28660: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28733: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28663: \$? = $ac_status" >&5
+  echo "$as_me:28736: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28666: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28739: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28669: \$? = $ac_status" >&5
+  echo "$as_me:28742: \$? = $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 28676 "configure"
+#line 28749 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -28692,16 +28765,16 @@ int x = NGROUPS_MAX
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28695: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28768: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28698: \$? = $ac_status" >&5
+  echo "$as_me:28771: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28701: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28774: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28704: \$? = $ac_status" >&5
+  echo "$as_me:28777: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ngroups=NGROUPS_MAX
 else
@@ -28713,7 +28786,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:28716: result: $cf_cv_ngroups" >&5
+echo "$as_me:28789: result: $cf_cv_ngroups" >&5
 echo "${ECHO_T}$cf_cv_ngroups" >&6
 
 fi
@@ -28730,14 +28803,14 @@ EOF
 
 fi
 
-echo "$as_me:28733: checking if external sys_nerr is declared" >&5
+echo "$as_me:28806: 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 28740 "configure"
+#line 28813 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -28755,16 +28828,16 @@ int x = (int) sys_nerr
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28758: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28831: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28761: \$? = $ac_status" >&5
+  echo "$as_me:28834: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28764: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28837: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28767: \$? = $ac_status" >&5
+  echo "$as_me:28840: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_nerr=yes
 else
@@ -28775,7 +28848,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:28778: result: $cf_cv_dcl_sys_nerr" >&5
+echo "$as_me:28851: 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
@@ -28790,14 +28863,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:28793: checking if external sys_nerr exists" >&5
+echo "$as_me:28866: 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 28800 "configure"
+#line 28873 "configure"
 #include "confdefs.h"
 
 #undef sys_nerr
@@ -28812,16 +28885,16 @@ sys_nerr = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28815: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28888: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28818: \$? = $ac_status" >&5
+  echo "$as_me:28891: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28821: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28894: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28824: \$? = $ac_status" >&5
+  echo "$as_me:28897: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_nerr=yes
 else
@@ -28832,7 +28905,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:28835: result: $cf_cv_have_sys_nerr" >&5
+echo "$as_me:28908: 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
@@ -28845,14 +28918,14 @@ EOF
 
 fi
 
-echo "$as_me:28848: checking if external sys_errlist is declared" >&5
+echo "$as_me:28921: 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 28855 "configure"
+#line 28928 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -28870,16 +28943,16 @@ int x = (int) sys_errlist
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28873: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28946: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28876: \$? = $ac_status" >&5
+  echo "$as_me:28949: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28879: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28952: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28882: \$? = $ac_status" >&5
+  echo "$as_me:28955: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_errlist=yes
 else
@@ -28890,7 +28963,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:28893: result: $cf_cv_dcl_sys_errlist" >&5
+echo "$as_me:28966: 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
@@ -28905,14 +28978,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:28908: checking if external sys_errlist exists" >&5
+echo "$as_me:28981: 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 28915 "configure"
+#line 28988 "configure"
 #include "confdefs.h"
 
 #undef sys_errlist
@@ -28927,16 +29000,16 @@ sys_errlist = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28930: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29003: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28933: \$? = $ac_status" >&5
+  echo "$as_me:29006: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28936: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29009: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28939: \$? = $ac_status" >&5
+  echo "$as_me:29012: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_errlist=yes
 else
@@ -28947,7 +29020,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:28950: result: $cf_cv_have_sys_errlist" >&5
+echo "$as_me:29023: 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
@@ -28963,23 +29036,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:28966: checking for $ac_header" >&5
+echo "$as_me:29039: 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 28972 "configure"
+#line 29045 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:28976: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:29049: \"$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:28982: \$? = $ac_status" >&5
+  echo "$as_me:29055: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -28998,7 +29071,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:29001: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:29074: 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
@@ -29008,14 +29081,14 @@ EOF
 fi
 done
 
-echo "$as_me:29011: checking for lastlog path" >&5
+echo "$as_me:29084: 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 29018 "configure"
+#line 29091 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -29035,16 +29108,16 @@ char *path = _PATH_LASTLOG
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29038: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29111: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29041: \$? = $ac_status" >&5
+  echo "$as_me:29114: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29044: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29117: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29047: \$? = $ac_status" >&5
+  echo "$as_me:29120: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_path_lastlog="_PATH_LASTLOG"
 else
@@ -29059,13 +29132,13 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:29062: result: $cf_cv_path_lastlog" >&5
+echo "$as_me:29135: 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:29068: checking for utmp implementation" >&5
+echo "$as_me:29141: 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
@@ -29082,7 +29155,7 @@ cf_utmp_includes="
 #endif
 "
 	cat >conftest.$ac_ext <<_ACEOF
-#line 29085 "configure"
+#line 29158 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -29096,16 +29169,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29099: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29172: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29102: \$? = $ac_status" >&5
+  echo "$as_me:29175: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29105: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29178: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29108: \$? = $ac_status" >&5
+  echo "$as_me:29181: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -29114,7 +29187,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 29117 "configure"
+#line 29190 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -29128,16 +29201,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29131: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29204: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29134: \$? = $ac_status" >&5
+  echo "$as_me:29207: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29137: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29210: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29140: \$? = $ac_status" >&5
+  echo "$as_me:29213: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -29152,7 +29225,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:29155: result: $cf_cv_have_utmp" >&5
+echo "$as_me:29228: result: $cf_cv_have_utmp" >&5
 echo "${ECHO_T}$cf_cv_have_utmp" >&6
 
 if test $cf_cv_have_utmp != no ; then
@@ -29165,14 +29238,14 @@ EOF
 EOF
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:29168: checking if ${cf_cv_have_utmp}.ut_host is declared" >&5
+echo "$as_me:29241: 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 29175 "configure"
+#line 29248 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -29186,16 +29259,16 @@ struct $cf_cv_have_utmp x; char *y = &x.ut_host[0]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29189: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29262: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29192: \$? = $ac_status" >&5
+  echo "$as_me:29265: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29195: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29268: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29198: \$? = $ac_status" >&5
+  echo "$as_me:29271: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_host=yes
 else
@@ -29207,7 +29280,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:29210: result: $cf_cv_have_utmp_ut_host" >&5
+echo "$as_me:29283: 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
@@ -29216,14 +29289,14 @@ EOF
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:29219: checking if ${cf_cv_have_utmp}.ut_syslen is declared" >&5
+echo "$as_me:29292: 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 29226 "configure"
+#line 29299 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -29237,16 +29310,16 @@ struct $cf_cv_have_utmp x; int y = x.ut_syslen
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29240: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29313: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29243: \$? = $ac_status" >&5
+  echo "$as_me:29316: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29246: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29319: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29249: \$? = $ac_status" >&5
+  echo "$as_me:29322: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_syslen=yes
 else
@@ -29258,7 +29331,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:29261: result: $cf_cv_have_utmp_ut_syslen" >&5
+echo "$as_me:29334: 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
@@ -29267,7 +29340,7 @@ EOF
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:29270: checking if ${cf_cv_have_utmp}.ut_name is declared" >&5
+echo "$as_me:29343: 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
@@ -29284,7 +29357,7 @@ cf_utmp_includes="
 "
 for cf_header in ut_name ut_user ; do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 29287 "configure"
+#line 29360 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -29298,16 +29371,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29301: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29374: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29304: \$? = $ac_status" >&5
+  echo "$as_me:29377: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29307: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29380: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29310: \$? = $ac_status" >&5
+  echo "$as_me:29383: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_name=$cf_header
 	 break
@@ -29319,12 +29392,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:29322: result: $cf_cv_have_utmp_ut_name" >&5
+echo "$as_me:29395: 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:29327: error: Cannot find declaration for ut.ut_name" >&5
+	{ { echo "$as_me:29400: 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; }; }
 	;;
@@ -29338,7 +29411,7 @@ esac
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:29341: checking for exit-status in $cf_cv_have_utmp" >&5
+echo "$as_me:29414: 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
@@ -29351,7 +29424,7 @@ for cf_result in \
 	ut_exit.ut_exit
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 29354 "configure"
+#line 29427 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -29365,16 +29438,16 @@ struct $cf_cv_have_utmp x; long y = x.$cf_result = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29368: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29441: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29371: \$? = $ac_status" >&5
+  echo "$as_me:29444: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29374: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29447: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29377: \$? = $ac_status" >&5
+  echo "$as_me:29450: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_xstatus=$cf_result
 	 break
@@ -29387,7 +29460,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:29390: result: $cf_cv_have_utmp_ut_xstatus" >&5
+echo "$as_me:29463: 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
@@ -29402,14 +29475,14 @@ fi
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:29405: checking if ${cf_cv_have_utmp}.ut_xtime is declared" >&5
+echo "$as_me:29478: 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 29412 "configure"
+#line 29485 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -29423,23 +29496,23 @@ struct $cf_cv_have_utmp x; long y = x.ut_xtime = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29426: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29499: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29429: \$? = $ac_status" >&5
+  echo "$as_me:29502: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29432: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29505: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29435: \$? = $ac_status" >&5
+  echo "$as_me:29508: \$? = $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 29442 "configure"
+#line 29515 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -29453,16 +29526,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:29456: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29529: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29459: \$? = $ac_status" >&5
+  echo "$as_me:29532: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29462: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29535: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29465: \$? = $ac_status" >&5
+  echo "$as_me:29538: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_xtime=define
 else
@@ -29476,7 +29549,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:29479: result: $cf_cv_have_utmp_ut_xtime" >&5
+echo "$as_me:29552: 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
@@ -29493,14 +29566,14 @@ fi
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:29496: checking if ${cf_cv_have_utmp}.ut_session is declared" >&5
+echo "$as_me:29569: 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 29503 "configure"
+#line 29576 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -29514,16 +29587,16 @@ struct $cf_cv_have_utmp x; long y = x.ut_session
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29517: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29590: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29520: \$? = $ac_status" >&5
+  echo "$as_me:29593: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29523: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29596: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29526: \$? = $ac_status" >&5
+  echo "$as_me:29599: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_session=yes
 else
@@ -29534,7 +29607,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:29537: result: $cf_cv_have_utmp_ut_session" >&5
+echo "$as_me:29610: 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
@@ -29544,7 +29617,7 @@ EOF
 fi
 fi
 
-echo "$as_me:29547: checking if $cf_cv_have_utmp is SYSV flavor" >&5
+echo "$as_me:29620: 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
@@ -29552,7 +29625,7 @@ else
 
 test "$cf_cv_have_utmp" = "utmp" && cf_prefix="ut" || cf_prefix="utx"
 cat >conftest.$ac_ext <<_ACEOF
-#line 29555 "configure"
+#line 29628 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -29571,16 +29644,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29574: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29647: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29577: \$? = $ac_status" >&5
+  echo "$as_me:29650: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29580: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29653: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29583: \$? = $ac_status" >&5
+  echo "$as_me:29656: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_sysv_utmp=yes
 else
@@ -29591,7 +29664,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:29594: result: $cf_cv_sysv_utmp" >&5
+echo "$as_me:29667: 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
@@ -29599,14 +29672,14 @@ EOF
 
 fi
 
-echo "$as_me:29602: checking if external h_errno exists" >&5
+echo "$as_me:29675: 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 29609 "configure"
+#line 29682 "configure"
 #include "confdefs.h"
 
 #undef h_errno
@@ -29621,16 +29694,16 @@ h_errno = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29624: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29697: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29627: \$? = $ac_status" >&5
+  echo "$as_me:29700: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29630: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29703: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29633: \$? = $ac_status" >&5
+  echo "$as_me:29706: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_h_errno=yes
 else
@@ -29641,7 +29714,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:29644: result: $cf_cv_have_h_errno" >&5
+echo "$as_me:29717: 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
@@ -29654,7 +29727,7 @@ EOF
 
 fi
 
-echo "$as_me:29657: checking if bibp: URLs should be supported" >&5
+echo "$as_me:29730: 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.
@@ -29671,13 +29744,13 @@ else
   use_bibp_urls=yes
 
 fi;
-echo "$as_me:29674: result: $use_bibp_urls" >&5
+echo "$as_me:29747: 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:29680: checking if configuration info should be browsable" >&5
+echo "$as_me:29753: 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.
@@ -29694,13 +29767,13 @@ else
   use_config_info=yes
 
 fi;
-echo "$as_me:29697: result: $use_config_info" >&5
+echo "$as_me:29770: 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:29703: checking if new-style forms-based options screen should be used" >&5
+echo "$as_me:29776: 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.
@@ -29717,13 +29790,13 @@ else
   use_forms_options=yes
 
 fi;
-echo "$as_me:29720: result: $use_forms_options" >&5
+echo "$as_me:29793: 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:29726: checking if old-style options menu should be used" >&5
+echo "$as_me:29799: 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.
@@ -29740,13 +29813,13 @@ else
   use_menu_options=yes
 
 fi;
-echo "$as_me:29743: result: $use_menu_options" >&5
+echo "$as_me:29816: 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:29749: checking if sessions code should be used" >&5
+echo "$as_me:29822: 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.
@@ -29763,7 +29836,7 @@ else
   use_sessions=yes
 
 fi;
-echo "$as_me:29766: result: $use_sessions" >&5
+echo "$as_me:29839: result: $use_sessions" >&5
 echo "${ECHO_T}$use_sessions" >&6
 if test $use_sessions != no ; then
 	cat >>confdefs.h <<\EOF
@@ -29773,7 +29846,7 @@ EOF
 	EXTRA_OBJS="$EXTRA_OBJS LYSession\$o"
 fi
 
-echo "$as_me:29776: checking if session-caching code should be used" >&5
+echo "$as_me:29849: 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.
@@ -29790,7 +29863,7 @@ else
   use_session_cache=yes
 
 fi;
-echo "$as_me:29793: result: $use_session_cache" >&5
+echo "$as_me:29866: result: $use_session_cache" >&5
 echo "${ECHO_T}$use_session_cache" >&6
 if test $use_session_cache != no ; then
     cat >>confdefs.h <<\EOF
@@ -29799,7 +29872,7 @@ EOF
 
 fi
 
-echo "$as_me:29802: checking if experimental address-list page should be used" >&5
+echo "$as_me:29875: 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.
@@ -29816,13 +29889,13 @@ else
   use_addrlist_page=no
 
 fi;
-echo "$as_me:29819: result: $use_addrlist_page" >&5
+echo "$as_me:29892: 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:29825: checking if experimental CJK logic should be used" >&5
+echo "$as_me:29898: 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.
@@ -29839,13 +29912,13 @@ else
   use_cjk=no
 
 fi;
-echo "$as_me:29842: result: $use_cjk" >&5
+echo "$as_me:29915: 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:29848: checking if experimental Japanese UTF-8 logic should be used" >&5
+echo "$as_me:29921: 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.
@@ -29862,7 +29935,7 @@ else
   use_ja_utf8=no
 
 fi;
-echo "$as_me:29865: result: $use_ja_utf8" >&5
+echo "$as_me:29938: result: $use_ja_utf8" >&5
 echo "${ECHO_T}$use_ja_utf8" >&6
 if test $use_ja_utf8 != no ; then
 	cat >>confdefs.h <<\EOF
@@ -29907,7 +29980,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 29910 "configure"
+#line 29983 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -29919,16 +29992,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29922: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29995: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29925: \$? = $ac_status" >&5
+  echo "$as_me:29998: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29928: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30001: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29931: \$? = $ac_status" >&5
+  echo "$as_me:30004: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -29945,7 +30018,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}:29948: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:30021: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -29986,7 +30059,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 29989 "configure"
+#line 30062 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -29998,16 +30071,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30001: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30074: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30004: \$? = $ac_status" >&5
+  echo "$as_me:30077: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30007: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30080: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30010: \$? = $ac_status" >&5
+  echo "$as_me:30083: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -30024,7 +30097,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}:30027: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:30100: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -30040,7 +30113,7 @@ echo "${as_me:-configure}:30027: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:30043: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:30116: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -30065,7 +30138,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}:30068: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:30141: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -30094,7 +30167,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}:30097: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:30170: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -30103,7 +30176,7 @@ echo "${as_me:-configure}:30097: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:30106: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:30179: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -30114,7 +30187,7 @@ done
 
 fi;
 
-  echo "$as_me:30117: checking for iconv" >&5
+  echo "$as_me:30190: 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
@@ -30125,12 +30198,12 @@ else
 cf_cv_header_path_iconv=
 cf_cv_library_path_iconv=
 
-echo "${as_me:-configure}:30128: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:30201: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 30133 "configure"
+#line 30206 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -30149,16 +30222,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30152: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30225: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30155: \$? = $ac_status" >&5
+  echo "$as_me:30228: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30158: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30231: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30161: \$? = $ac_status" >&5
+  echo "$as_me:30234: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -30172,7 +30245,7 @@ cat conftest.$ac_ext >&5
 LIBS="-liconv  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 30175 "configure"
+#line 30248 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -30191,16 +30264,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30194: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30267: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30197: \$? = $ac_status" >&5
+  echo "$as_me:30270: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30200: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30273: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30203: \$? = $ac_status" >&5
+  echo "$as_me:30276: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -30217,9 +30290,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for iconv library" 1>&6
 
-echo "${as_me:-configure}:30220: testing find linkage for iconv library ..." 1>&5
+echo "${as_me:-configure}:30293: testing find linkage for iconv library ..." 1>&5
 
-echo "${as_me:-configure}:30222: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:30295: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -30332,11 +30405,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}:30335: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:30408: 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 30339 "configure"
+#line 30412 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -30355,21 +30428,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30358: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30431: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30361: \$? = $ac_status" >&5
+  echo "$as_me:30434: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30364: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30437: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30367: \$? = $ac_status" >&5
+  echo "$as_me:30440: \$? = $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}:30372: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:30445: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
 
             cf_cv_find_linkage_iconv=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -30387,7 +30460,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_iconv" = maybe ; then
 
-echo "${as_me:-configure}:30390: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:30463: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -30484,13 +30557,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}:30487: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:30560: 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 30493 "configure"
+#line 30566 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -30509,21 +30582,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30512: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30585: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30515: \$? = $ac_status" >&5
+  echo "$as_me:30588: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30518: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30591: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30521: \$? = $ac_status" >&5
+  echo "$as_me:30594: \$? = $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}:30526: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:30599: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
 
                 cf_cv_find_linkage_iconv=yes
                 cf_cv_library_file_iconv="-liconv"
@@ -30563,7 +30636,7 @@ am_cv_func_iconv="no, consider installing GNU libiconv"
 fi
 
 fi
-echo "$as_me:30566: result: $am_cv_func_iconv" >&5
+echo "$as_me:30639: result: $am_cv_func_iconv" >&5
 echo "${ECHO_T}$am_cv_func_iconv" >&6
 
   if test "$am_cv_func_iconv" = yes; then
@@ -30572,14 +30645,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_ICONV 1
 EOF
 
-    echo "$as_me:30575: checking if the declaration of iconv() needs const." >&5
+    echo "$as_me:30648: 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 30582 "configure"
+#line 30655 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -30604,16 +30677,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30607: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30680: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30610: \$? = $ac_status" >&5
+  echo "$as_me:30683: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30613: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30686: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30616: \$? = $ac_status" >&5
+  echo "$as_me:30689: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_proto_iconv_const=no
 else
@@ -30623,7 +30696,7 @@ am_cv_proto_iconv_const=yes
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:30626: result: $am_cv_proto_iconv_const" >&5
+echo "$as_me:30699: 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
@@ -30665,7 +30738,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 30668 "configure"
+#line 30741 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -30677,16 +30750,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30680: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30753: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30683: \$? = $ac_status" >&5
+  echo "$as_me:30756: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30686: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30759: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30689: \$? = $ac_status" >&5
+  echo "$as_me:30762: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -30703,7 +30776,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}:30706: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:30779: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -30740,7 +30813,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}:30743: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:30816: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -30764,7 +30837,7 @@ curses|slang|ncurses*)
 esac
 
 if test "$use_dft_colors" != no ; then
-echo "$as_me:30767: checking if you want to use default-colors" >&5
+echo "$as_me:30840: 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.
@@ -30781,7 +30854,7 @@ else
   use_dft_colors=no
 
 fi;
-echo "$as_me:30784: result: $use_dft_colors" >&5
+echo "$as_me:30857: 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
@@ -30789,7 +30862,7 @@ EOF
 
 fi
 
-echo "$as_me:30792: checking if experimental keyboard-layout logic should be used" >&5
+echo "$as_me:30865: 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.
@@ -30806,13 +30879,13 @@ else
   use_kbd_layout=no
 
 fi;
-echo "$as_me:30809: result: $use_kbd_layout" >&5
+echo "$as_me:30882: 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:30815: checking if experimental nested-table logic should be used" >&5
+echo "$as_me:30888: 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.
@@ -30829,13 +30902,13 @@ else
   use_nested_tables=no
 
 fi;
-echo "$as_me:30832: result: $use_nested_tables" >&5
+echo "$as_me:30905: 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:30838: checking if alternative line-edit bindings should be used" >&5
+echo "$as_me:30911: 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.
@@ -30852,13 +30925,13 @@ else
   use_alt_bindings=yes
 
 fi;
-echo "$as_me:30855: result: $use_alt_bindings" >&5
+echo "$as_me:30928: 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:30861: checking if ascii case-conversion should be used" >&5
+echo "$as_me:30934: 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.
@@ -30875,13 +30948,13 @@ else
   use_ascii_ctypes=yes
 
 fi;
-echo "$as_me:30878: result: $use_ascii_ctypes" >&5
+echo "$as_me:30951: 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:30884: checking if you want to use extended HTML DTD logic" >&5
+echo "$as_me:30957: 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.
@@ -30898,13 +30971,13 @@ else
   use_ext_htmldtd=yes
 
 fi;
-echo "$as_me:30901: result: $use_ext_htmldtd" >&5
+echo "$as_me:30974: 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:30907: checking if file-upload logic should be used" >&5
+echo "$as_me:30980: 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.
@@ -30921,13 +30994,13 @@ else
   use_file_upload=yes
 
 fi;
-echo "$as_me:30924: result: $use_file_upload" >&5
+echo "$as_me:30997: 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:30930: checking if IDNA support should be used" >&5
+echo "$as_me:31003: 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.
@@ -30944,7 +31017,7 @@ else
   use_idna=yes
 
 fi;
-echo "$as_me:30947: result: $use_idna" >&5
+echo "$as_me:31020: result: $use_idna" >&5
 echo "${ECHO_T}$use_idna" >&6
 
 if test "$use_idna" = yes ; then
@@ -30983,7 +31056,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 30986 "configure"
+#line 31059 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -30995,16 +31068,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30998: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31071: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31001: \$? = $ac_status" >&5
+  echo "$as_me:31074: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31004: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31077: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31007: \$? = $ac_status" >&5
+  echo "$as_me:31080: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -31021,7 +31094,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}:31024: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:31097: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -31062,7 +31135,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 31065 "configure"
+#line 31138 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -31074,16 +31147,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31077: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31150: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31080: \$? = $ac_status" >&5
+  echo "$as_me:31153: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31083: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31156: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31086: \$? = $ac_status" >&5
+  echo "$as_me:31159: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -31100,7 +31173,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}:31103: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:31176: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -31116,7 +31189,7 @@ echo "${as_me:-configure}:31103: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:31119: error: cannot find  under $use_idna" >&5
+{ { echo "$as_me:31192: error: cannot find  under $use_idna" >&5
 echo "$as_me: error: cannot find  under $use_idna" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -31141,7 +31214,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}:31144: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:31217: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -31170,7 +31243,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}:31173: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:31246: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -31179,7 +31252,7 @@ echo "${as_me:-configure}:31173: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:31182: error: cannot find  under $use_idna" >&5
+{ { echo "$as_me:31255: error: cannot find  under $use_idna" >&5
 echo "$as_me: error: cannot find  under $use_idna" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -31193,12 +31266,12 @@ done
 cf_cv_header_path_idn=
 cf_cv_library_path_idn=
 
-echo "${as_me:-configure}:31196: testing Starting FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:31269: testing Starting FIND_LINKAGE(idn,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 31201 "configure"
+#line 31274 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -31216,16 +31289,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31219: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31292: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31222: \$? = $ac_status" >&5
+  echo "$as_me:31295: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31225: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31298: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31228: \$? = $ac_status" >&5
+  echo "$as_me:31301: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_idn=yes
@@ -31239,7 +31312,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lidn $LIBICONV $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 31242 "configure"
+#line 31315 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -31257,16 +31330,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31260: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31333: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31263: \$? = $ac_status" >&5
+  echo "$as_me:31336: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31266: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31339: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31269: \$? = $ac_status" >&5
+  echo "$as_me:31342: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_idn=yes
@@ -31283,9 +31356,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for idn library" 1>&6
 
-echo "${as_me:-configure}:31286: testing find linkage for idn library ..." 1>&5
+echo "${as_me:-configure}:31359: testing find linkage for idn library ..." 1>&5
 
-echo "${as_me:-configure}:31288: testing Searching for headers in FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:31361: testing Searching for headers in FIND_LINKAGE(idn,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -31398,11 +31471,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}:31401: testing ... testing $cf_cv_header_path_idn ..." 1>&5
+echo "${as_me:-configure}:31474: 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 31405 "configure"
+#line 31478 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -31420,21 +31493,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31423: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31496: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31426: \$? = $ac_status" >&5
+  echo "$as_me:31499: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31429: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31502: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31432: \$? = $ac_status" >&5
+  echo "$as_me:31505: \$? = $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}:31437: testing ... found idn headers in $cf_cv_header_path_idn ..." 1>&5
+echo "${as_me:-configure}:31510: testing ... found idn headers in $cf_cv_header_path_idn ..." 1>&5
 
             cf_cv_find_linkage_idn=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -31452,7 +31525,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_idn" = maybe ; then
 
-echo "${as_me:-configure}:31455: testing Searching for idn library in FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:31528: testing Searching for idn library in FIND_LINKAGE(idn,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -31549,13 +31622,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}:31552: testing ... testing $cf_cv_library_path_idn ..." 1>&5
+echo "${as_me:-configure}:31625: testing ... testing $cf_cv_library_path_idn ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-lidn $LIBICONV $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_idn"
             cat >conftest.$ac_ext <<_ACEOF
-#line 31558 "configure"
+#line 31631 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -31573,21 +31646,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31576: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31649: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31579: \$? = $ac_status" >&5
+  echo "$as_me:31652: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31582: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31655: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31585: \$? = $ac_status" >&5
+  echo "$as_me:31658: \$? = $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}:31590: testing ... found idn library in $cf_cv_library_path_idn ..." 1>&5
+echo "${as_me:-configure}:31663: testing ... found idn library in $cf_cv_library_path_idn ..." 1>&5
 
                 cf_cv_find_linkage_idn=yes
                 cf_cv_library_file_idn="-lidn"
@@ -31646,7 +31719,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 31649 "configure"
+#line 31722 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -31658,16 +31731,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31661: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31734: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31664: \$? = $ac_status" >&5
+  echo "$as_me:31737: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31667: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31740: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31670: \$? = $ac_status" >&5
+  echo "$as_me:31743: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -31684,7 +31757,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}:31687: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:31760: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -31718,7 +31791,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}:31721: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:31794: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -31729,7 +31802,7 @@ fi
 	LIBS="-lidn $LIBS"
 
 else
-{ echo "$as_me:31732: WARNING: Cannot find idn library" >&5
+{ echo "$as_me:31805: WARNING: Cannot find idn library" >&5
 echo "$as_me: WARNING: Cannot find idn library" >&2;}
 fi
 
@@ -31742,7 +31815,7 @@ fi
 
 fi
 
-echo "$as_me:31745: checking if element-justification logic should be used" >&5
+echo "$as_me:31818: 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.
@@ -31759,13 +31832,13 @@ else
   use_justify_elts=yes
 
 fi;
-echo "$as_me:31762: result: $use_justify_elts" >&5
+echo "$as_me:31835: 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:31768: checking if partial-display should be used" >&5
+echo "$as_me:31841: 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.
@@ -31782,13 +31855,13 @@ else
   use_partial_display=yes
 
 fi;
-echo "$as_me:31785: result: $use_partial_display" >&5
+echo "$as_me:31858: 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:31791: checking if persistent-cookie logic should be used" >&5
+echo "$as_me:31864: 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.
@@ -31805,13 +31878,13 @@ else
   use_filed_cookies=yes
 
 fi;
-echo "$as_me:31808: result: $use_filed_cookies" >&5
+echo "$as_me:31881: 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:31814: checking if html source should be colorized" >&5
+echo "$as_me:31887: 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.
@@ -31828,13 +31901,13 @@ else
   use_prettysrc=yes
 
 fi;
-echo "$as_me:31831: result: $use_prettysrc" >&5
+echo "$as_me:31904: 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:31837: checking if progress-bar code should be used" >&5
+echo "$as_me:31910: 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.
@@ -31851,13 +31924,13 @@ else
   use_progressbar=yes
 
 fi;
-echo "$as_me:31854: result: $use_progressbar" >&5
+echo "$as_me:31927: 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:31860: checking if read-progress message should show ETA" >&5
+echo "$as_me:31933: 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.
@@ -31874,13 +31947,13 @@ else
   use_read_eta=yes
 
 fi;
-echo "$as_me:31877: result: $use_read_eta" >&5
+echo "$as_me:31950: 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:31883: checking if source caching should be used" >&5
+echo "$as_me:31956: 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.
@@ -31897,13 +31970,13 @@ else
   use_source_cache=yes
 
 fi;
-echo "$as_me:31900: result: $use_source_cache" >&5
+echo "$as_me:31973: 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:31906: checking if scrollbar code should be used" >&5
+echo "$as_me:31979: 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.
@@ -31920,10 +31993,10 @@ else
   use_scrollbar=yes
 
 fi;
-echo "$as_me:31923: result: $use_scrollbar" >&5
+echo "$as_me:31996: result: $use_scrollbar" >&5
 echo "${ECHO_T}$use_scrollbar" >&6
 
-echo "$as_me:31926: checking if charset-selection logic should be used" >&5
+echo "$as_me:31999: 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.
@@ -31940,13 +32013,13 @@ else
   use_charset_choice=no
 
 fi;
-echo "$as_me:31943: result: $use_charset_choice" >&5
+echo "$as_me:32016: 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:31949: checking if you want to use external commands" >&5
+echo "$as_me:32022: 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.
@@ -31963,7 +32036,7 @@ else
   use_externs=no
 
 fi;
-echo "$as_me:31966: result: $use_externs" >&5
+echo "$as_me:32039: result: $use_externs" >&5
 echo "${ECHO_T}$use_externs" >&6
 if test $use_externs != "no" ; then
 	cat >>confdefs.h <<\EOF
@@ -31973,7 +32046,7 @@ EOF
 	EXTRA_OBJS="$EXTRA_OBJS LYExtern\$o"
 fi
 
-echo "$as_me:31976: checking if you want to use setfont support" >&5
+echo "$as_me:32049: 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.
@@ -31990,7 +32063,7 @@ else
   use_setfont=no
 
 fi;
-echo "$as_me:31993: result: $use_setfont" >&5
+echo "$as_me:32066: result: $use_setfont" >&5
 echo "${ECHO_T}$use_setfont" >&6
 if test $use_setfont = yes ; then
 	case $host_os in
@@ -32001,7 +32074,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:32004: checking for $ac_word" >&5
+echo "$as_me:32077: 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
@@ -32018,7 +32091,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:32021: found $ac_dir/$ac_word" >&5
+   echo "$as_me:32094: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -32029,10 +32102,10 @@ fi
 SETFONT=$ac_cv_path_SETFONT
 
 if test -n "$SETFONT"; then
-  echo "$as_me:32032: result: $SETFONT" >&5
+  echo "$as_me:32105: result: $SETFONT" >&5
 echo "${ECHO_T}$SETFONT" >&6
 else
-  echo "$as_me:32035: result: no" >&5
+  echo "$as_me:32108: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -32091,7 +32164,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:32094: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:32167: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define SETFONT_PATH "$cf_path_prog"
@@ -32108,19 +32181,19 @@ fi
 		SETFONT=built-in
 		test -n "$verbose" && echo "	Assume $host_os has font-switching" 1>&6
 
-echo "${as_me:-configure}:32111: testing Assume $host_os has font-switching ..." 1>&5
+echo "${as_me:-configure}:32184: 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}:32118: testing Assume $host_os has no font-switching ..." 1>&5
+echo "${as_me:-configure}:32191: testing Assume $host_os has no font-switching ..." 1>&5
 
 		;;
 	esac
 	if test -z "$SETFONT" ; then
-		{ echo "$as_me:32123: WARNING: Cannot find a font-setting program" >&5
+		{ echo "$as_me:32196: 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
@@ -32130,7 +32203,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:32133: checking if you want cgi-link support" >&5
+echo "$as_me:32206: 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.
@@ -32146,10 +32219,10 @@ EOF
 else
   enableval=no
 fi;
-echo "$as_me:32149: result: $enableval" >&5
+echo "$as_me:32222: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:32152: checking if you want change-exec support" >&5
+echo "$as_me:32225: 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.
@@ -32166,13 +32239,13 @@ else
   use_change_exec=no
 
 fi;
-echo "$as_me:32169: result: $use_change_exec" >&5
+echo "$as_me:32242: 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:32175: checking if you want exec-links support" >&5
+echo "$as_me:32248: 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.
@@ -32189,13 +32262,13 @@ else
   use_exec_links=$enableval
 
 fi;
-echo "$as_me:32192: result: $use_exec_links" >&5
+echo "$as_me:32265: 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:32198: checking if you want exec-scripts support" >&5
+echo "$as_me:32271: 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.
@@ -32212,13 +32285,13 @@ else
   use_exec_scripts=$enableval
 
 fi;
-echo "$as_me:32215: result: $use_exec_scripts" >&5
+echo "$as_me:32288: 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:32221: checking if you want internal-links feature" >&5
+echo "$as_me:32294: 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.
@@ -32235,13 +32308,13 @@ else
   use_internal_links=no
 
 fi;
-echo "$as_me:32238: result: $use_internal_links" >&5
+echo "$as_me:32311: 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:32244: checking if you want to fork NSL requests" >&5
+echo "$as_me:32317: 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.
@@ -32258,7 +32331,7 @@ else
   use_nsl_fork=no
 
 fi;
-echo "$as_me:32261: result: $use_nsl_fork" >&5
+echo "$as_me:32334: result: $use_nsl_fork" >&5
 echo "${ECHO_T}$use_nsl_fork" >&6
 if test $use_nsl_fork = yes ; then
 	case $host_os in
@@ -32277,7 +32350,7 @@ EOF
 	esac
 fi
 
-echo "$as_me:32280: checking if you want to log URL requests via syslog" >&5
+echo "$as_me:32353: 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.
@@ -32294,13 +32367,13 @@ else
   use_syslog=no
 
 fi;
-echo "$as_me:32297: result: $use_syslog" >&5
+echo "$as_me:32370: 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:32303: checking if you want to underline links" >&5
+echo "$as_me:32376: 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.
@@ -32317,7 +32390,7 @@ else
   use_underline=no
 
 fi;
-echo "$as_me:32320: result: $use_underline" >&5
+echo "$as_me:32393: result: $use_underline" >&5
 echo "${ECHO_T}$use_underline" >&6
 test $use_underline = yes && cat >>confdefs.h <<\EOF
 #define UNDERLINE_LINKS 1
@@ -32327,7 +32400,7 @@ test $use_underline = no  && cat >>confdefs.h <<\EOF
 #define UNDERLINE_LINKS 0
 EOF
 
-echo "$as_me:32330: checking if help files should be gzip'ed" >&5
+echo "$as_me:32403: 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.
@@ -32344,10 +32417,10 @@ else
   use_gzip_help=no
 
 fi;
-echo "$as_me:32347: result: $use_gzip_help" >&5
+echo "$as_me:32420: result: $use_gzip_help" >&5
 echo "${ECHO_T}$use_gzip_help" >&6
 
-echo "$as_me:32350: checking if you want to use libbz2 for decompression of some bzip2 files" >&5
+echo "$as_me:32423: 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.
@@ -32357,7 +32430,7 @@ if test "${with_bzlib+set}" = set; then
 else
   use_bzlib=no
 fi;
-echo "$as_me:32360: result: $use_bzlib" >&5
+echo "$as_me:32433: result: $use_bzlib" >&5
 echo "${ECHO_T}$use_bzlib" >&6
 
 if test ".$use_bzlib" != ".no" ; then
@@ -32396,7 +32469,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 32399 "configure"
+#line 32472 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -32408,16 +32481,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32411: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32484: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32414: \$? = $ac_status" >&5
+  echo "$as_me:32487: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32417: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32490: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32420: \$? = $ac_status" >&5
+  echo "$as_me:32493: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -32434,7 +32507,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}:32437: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:32510: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -32475,7 +32548,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 32478 "configure"
+#line 32551 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -32487,16 +32560,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32490: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32563: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32493: \$? = $ac_status" >&5
+  echo "$as_me:32566: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32496: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32569: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32499: \$? = $ac_status" >&5
+  echo "$as_me:32572: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -32513,7 +32586,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}:32516: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:32589: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -32529,7 +32602,7 @@ echo "${as_me:-configure}:32516: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:32532: error: cannot find  under $use_bzlib" >&5
+{ { echo "$as_me:32605: error: cannot find  under $use_bzlib" >&5
 echo "$as_me: error: cannot find  under $use_bzlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -32554,7 +32627,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}:32557: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:32630: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -32583,7 +32656,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}:32586: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:32659: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -32592,7 +32665,7 @@ echo "${as_me:-configure}:32586: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:32595: error: cannot find  under $use_bzlib" >&5
+{ { echo "$as_me:32668: error: cannot find  under $use_bzlib" >&5
 echo "$as_me: error: cannot find  under $use_bzlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -32606,12 +32679,12 @@ done
 cf_cv_header_path_bz2=
 cf_cv_library_path_bz2=
 
-echo "${as_me:-configure}:32609: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:32682: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 32614 "configure"
+#line 32687 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -32628,16 +32701,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32631: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32704: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32634: \$? = $ac_status" >&5
+  echo "$as_me:32707: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32637: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32710: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32640: \$? = $ac_status" >&5
+  echo "$as_me:32713: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_bz2=yes
@@ -32651,7 +32724,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lbz2  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 32654 "configure"
+#line 32727 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -32668,16 +32741,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32671: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32744: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32674: \$? = $ac_status" >&5
+  echo "$as_me:32747: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32677: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32750: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32680: \$? = $ac_status" >&5
+  echo "$as_me:32753: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_bz2=yes
@@ -32694,9 +32767,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for bz2 library" 1>&6
 
-echo "${as_me:-configure}:32697: testing find linkage for bz2 library ..." 1>&5
+echo "${as_me:-configure}:32770: testing find linkage for bz2 library ..." 1>&5
 
-echo "${as_me:-configure}:32699: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:32772: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -32809,11 +32882,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}:32812: testing ... testing $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:32885: 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 32816 "configure"
+#line 32889 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -32830,21 +32903,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32833: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32906: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32836: \$? = $ac_status" >&5
+  echo "$as_me:32909: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32839: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32912: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32842: \$? = $ac_status" >&5
+  echo "$as_me:32915: \$? = $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}:32847: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:32920: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
 
             cf_cv_find_linkage_bz2=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -32862,7 +32935,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_bz2" = maybe ; then
 
-echo "${as_me:-configure}:32865: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:32938: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -32870,7 +32943,7 @@ echo "${as_me:-configure}:32865: testing Searching for bz2 library in FIND_LINKA
         CPPFLAGS="$cf_test_CPPFLAGS"
         LIBS="-lbz2  $cf_save_LIBS"
         cat >conftest.$ac_ext <<_ACEOF
-#line 32873 "configure"
+#line 32946 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -32887,21 +32960,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32890: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32963: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32893: \$? = $ac_status" >&5
+  echo "$as_me:32966: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32896: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32969: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32899: \$? = $ac_status" >&5
+  echo "$as_me:32972: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found bz2 library in system" 1>&6
 
-echo "${as_me:-configure}:32904: testing ... found bz2 library in system ..." 1>&5
+echo "${as_me:-configure}:32977: testing ... found bz2 library in system ..." 1>&5
 
             cf_cv_find_linkage_bz2=yes
 else
@@ -33004,13 +33077,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}:33007: testing ... testing $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:33080: 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 33013 "configure"
+#line 33086 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -33027,21 +33100,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33030: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33103: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33033: \$? = $ac_status" >&5
+  echo "$as_me:33106: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33036: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33109: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33039: \$? = $ac_status" >&5
+  echo "$as_me:33112: \$? = $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}:33044: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:33117: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
 
                 cf_cv_find_linkage_bz2=yes
                 cf_cv_library_file_bz2="-lbz2"
@@ -33100,7 +33173,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 33103 "configure"
+#line 33176 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -33112,16 +33185,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33115: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33188: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33118: \$? = $ac_status" >&5
+  echo "$as_me:33191: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33121: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33194: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33124: \$? = $ac_status" >&5
+  echo "$as_me:33197: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -33138,7 +33211,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}:33141: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:33214: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -33172,7 +33245,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}:33175: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:33248: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -33183,7 +33256,7 @@ fi
 	LIBS="-lbz2 $LIBS"
 
 else
-{ echo "$as_me:33186: WARNING: Cannot find bz2 library" >&5
+{ echo "$as_me:33259: WARNING: Cannot find bz2 library" >&5
 echo "$as_me: WARNING: Cannot find bz2 library" >&2;}
 fi
 
@@ -33193,7 +33266,7 @@ EOF
 
 fi
 
-echo "$as_me:33196: checking if you want to use zlib for decompression of some gzip files" >&5
+echo "$as_me:33269: 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.
@@ -33203,7 +33276,7 @@ if test "${with_zlib+set}" = set; then
 else
   use_zlib=no
 fi;
-echo "$as_me:33206: result: $use_zlib" >&5
+echo "$as_me:33279: result: $use_zlib" >&5
 echo "${ECHO_T}$use_zlib" >&6
 
 if test ".$use_zlib" != ".no" ; then
@@ -33242,7 +33315,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 33245 "configure"
+#line 33318 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -33254,16 +33327,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33257: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33330: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33260: \$? = $ac_status" >&5
+  echo "$as_me:33333: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33263: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33336: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33266: \$? = $ac_status" >&5
+  echo "$as_me:33339: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -33280,7 +33353,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}:33283: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:33356: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -33321,7 +33394,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 33324 "configure"
+#line 33397 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -33333,16 +33406,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33336: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33409: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33339: \$? = $ac_status" >&5
+  echo "$as_me:33412: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33342: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33415: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33345: \$? = $ac_status" >&5
+  echo "$as_me:33418: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -33359,7 +33432,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}:33362: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:33435: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -33375,7 +33448,7 @@ echo "${as_me:-configure}:33362: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:33378: error: cannot find  under $use_zlib" >&5
+{ { echo "$as_me:33451: error: cannot find  under $use_zlib" >&5
 echo "$as_me: error: cannot find  under $use_zlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -33400,7 +33473,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}:33403: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:33476: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -33429,7 +33502,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}:33432: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:33505: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -33438,7 +33511,7 @@ echo "${as_me:-configure}:33432: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:33441: error: cannot find  under $use_zlib" >&5
+{ { echo "$as_me:33514: error: cannot find  under $use_zlib" >&5
 echo "$as_me: error: cannot find  under $use_zlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -33452,12 +33525,12 @@ done
 cf_cv_header_path_z=
 cf_cv_library_path_z=
 
-echo "${as_me:-configure}:33455: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:33528: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 33460 "configure"
+#line 33533 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -33473,16 +33546,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33476: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33549: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33479: \$? = $ac_status" >&5
+  echo "$as_me:33552: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33482: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33555: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33485: \$? = $ac_status" >&5
+  echo "$as_me:33558: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_z=yes
@@ -33496,7 +33569,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lz  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 33499 "configure"
+#line 33572 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -33512,16 +33585,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33515: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33588: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33518: \$? = $ac_status" >&5
+  echo "$as_me:33591: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33521: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33594: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33524: \$? = $ac_status" >&5
+  echo "$as_me:33597: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_z=yes
@@ -33538,9 +33611,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for z library" 1>&6
 
-echo "${as_me:-configure}:33541: testing find linkage for z library ..." 1>&5
+echo "${as_me:-configure}:33614: testing find linkage for z library ..." 1>&5
 
-echo "${as_me:-configure}:33543: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:33616: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -33653,11 +33726,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}:33656: testing ... testing $cf_cv_header_path_z ..." 1>&5
+echo "${as_me:-configure}:33729: 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 33660 "configure"
+#line 33733 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -33673,21 +33746,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33676: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33749: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33679: \$? = $ac_status" >&5
+  echo "$as_me:33752: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33682: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33755: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33685: \$? = $ac_status" >&5
+  echo "$as_me:33758: \$? = $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}:33690: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
+echo "${as_me:-configure}:33763: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
 
             cf_cv_find_linkage_z=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -33705,7 +33778,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_z" = maybe ; then
 
-echo "${as_me:-configure}:33708: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:33781: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -33713,7 +33786,7 @@ echo "${as_me:-configure}:33708: testing Searching for z library in FIND_LINKAGE
         CPPFLAGS="$cf_test_CPPFLAGS"
         LIBS="-lz  $cf_save_LIBS"
         cat >conftest.$ac_ext <<_ACEOF
-#line 33716 "configure"
+#line 33789 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -33729,21 +33802,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33732: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33805: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33735: \$? = $ac_status" >&5
+  echo "$as_me:33808: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33738: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33811: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33741: \$? = $ac_status" >&5
+  echo "$as_me:33814: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found z library in system" 1>&6
 
-echo "${as_me:-configure}:33746: testing ... found z library in system ..." 1>&5
+echo "${as_me:-configure}:33819: testing ... found z library in system ..." 1>&5
 
             cf_cv_find_linkage_z=yes
 else
@@ -33846,13 +33919,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}:33849: testing ... testing $cf_cv_library_path_z ..." 1>&5
+echo "${as_me:-configure}:33922: 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 33855 "configure"
+#line 33928 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -33868,21 +33941,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33871: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33944: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33874: \$? = $ac_status" >&5
+  echo "$as_me:33947: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33877: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33950: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33880: \$? = $ac_status" >&5
+  echo "$as_me:33953: \$? = $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}:33885: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
+echo "${as_me:-configure}:33958: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
 
                 cf_cv_find_linkage_z=yes
                 cf_cv_library_file_z="-lz"
@@ -33941,7 +34014,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 33944 "configure"
+#line 34017 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -33953,16 +34026,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33956: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34029: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33959: \$? = $ac_status" >&5
+  echo "$as_me:34032: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33962: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34035: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33965: \$? = $ac_status" >&5
+  echo "$as_me:34038: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -33979,7 +34052,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}:33982: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:34055: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -34013,7 +34086,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}:34016: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:34089: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -34024,7 +34097,7 @@ fi
 	LIBS="-lz $LIBS"
 
 else
-{ echo "$as_me:34027: WARNING: Cannot find z library" >&5
+{ echo "$as_me:34100: WARNING: Cannot find z library" >&5
 echo "$as_me: WARNING: Cannot find z library" >&2;}
 fi
 
@@ -34034,7 +34107,7 @@ EOF
 
 fi
 
-echo "$as_me:34037: checking if you want to exclude FINGER code" >&5
+echo "$as_me:34110: 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.
@@ -34051,13 +34124,13 @@ else
   use_finger=no
 
 fi;
-echo "$as_me:34054: result: $use_finger" >&5
+echo "$as_me:34127: 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:34060: checking if you want to exclude GOPHER code" >&5
+echo "$as_me:34133: 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.
@@ -34074,13 +34147,13 @@ else
   use_gopher=no
 
 fi;
-echo "$as_me:34077: result: $use_gopher" >&5
+echo "$as_me:34150: 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:34083: checking if you want to exclude NEWS code" >&5
+echo "$as_me:34156: 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.
@@ -34097,13 +34170,13 @@ else
   use_news=no
 
 fi;
-echo "$as_me:34100: result: $use_news" >&5
+echo "$as_me:34173: 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:34106: checking if you want to exclude FTP code" >&5
+echo "$as_me:34179: 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.
@@ -34120,13 +34193,13 @@ else
   use_ftp=no
 
 fi;
-echo "$as_me:34123: result: $use_ftp" >&5
+echo "$as_me:34196: 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:34129: checking if you want to include WAIS code" >&5
+echo "$as_me:34202: 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.
@@ -34143,13 +34216,13 @@ else
   use_wais=no
 
 fi;
-echo "$as_me:34146: result: $use_wais" >&5
+echo "$as_me:34219: result: $use_wais" >&5
 echo "${ECHO_T}$use_wais" >&6
 
 MAKE_WAIS="#"
 if test $use_wais != "no"
 then
-	echo "$as_me:34152: checking for fs_free in -lwais" >&5
+	echo "$as_me:34225: 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
@@ -34157,7 +34230,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lwais  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 34160 "configure"
+#line 34233 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -34176,16 +34249,16 @@ fs_free ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34179: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34252: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34182: \$? = $ac_status" >&5
+  echo "$as_me:34255: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:34185: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34258: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34188: \$? = $ac_status" >&5
+  echo "$as_me:34261: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_wais_fs_free=yes
 else
@@ -34196,18 +34269,18 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:34199: result: $ac_cv_lib_wais_fs_free" >&5
+echo "$as_me:34272: 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:34203: checking if -lm needed for math functions" >&5
+echo "$as_me:34276: 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 34210 "configure"
+#line 34283 "configure"
 #include "confdefs.h"
 
 	#include <stdio.h>
@@ -34222,16 +34295,16 @@ double x = rand(); printf("result = %g\n", sin(x))
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34225: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34298: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34228: \$? = $ac_status" >&5
+  echo "$as_me:34301: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:34231: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34304: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34234: \$? = $ac_status" >&5
+  echo "$as_me:34307: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_libm=no
 else
@@ -34241,7 +34314,7 @@ cf_cv_need_libm=yes
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:34244: result: $cf_cv_need_libm" >&5
+echo "$as_me:34317: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 if test "$cf_cv_need_libm" = yes
 then
@@ -34255,23 +34328,23 @@ fi
 for ac_header in wais.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:34258: checking for $ac_header" >&5
+echo "$as_me:34331: 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 34264 "configure"
+#line 34337 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:34268: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:34341: \"$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:34274: \$? = $ac_status" >&5
+  echo "$as_me:34347: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -34290,7 +34363,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:34293: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:34366: 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
@@ -34303,7 +34376,7 @@ done
 		MAKE_WAIS=
 
 else
-  { echo "$as_me:34306: WARNING: could not find WAIS library" >&5
+  { echo "$as_me:34379: WARNING: could not find WAIS library" >&5
 echo "$as_me: WARNING: could not find WAIS library" >&2;}
 fi
 
@@ -34311,7 +34384,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:34314: checking if directory-editor code should be used" >&5
+echo "$as_me:34387: 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.
@@ -34328,7 +34401,7 @@ else
   use_dired=yes
 
 fi;
-echo "$as_me:34331: result: $use_dired" >&5
+echo "$as_me:34404: result: $use_dired" >&5
 echo "${ECHO_T}$use_dired" >&6
 
 if test ".$use_dired" != ".no" ; then
@@ -34337,7 +34410,7 @@ if test ".$use_dired" != ".no" ; then
 #define DIRED_SUPPORT 1
 EOF
 
-	echo "$as_me:34340: checking if you wish to allow extracting from archives via DirEd" >&5
+	echo "$as_me:34413: 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.
@@ -34353,10 +34426,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:34356: result: $enableval" >&5
+	echo "$as_me:34429: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:34359: checking if DirEd mode should override keys" >&5
+	echo "$as_me:34432: 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.
@@ -34378,10 +34451,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:34381: result: $enableval" >&5
+	echo "$as_me:34454: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:34384: checking if you wish to allow permissions commands via DirEd" >&5
+	echo "$as_me:34457: 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.
@@ -34403,10 +34476,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:34406: result: $enableval" >&5
+	echo "$as_me:34479: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:34409: checking if you wish to allow executable-permission commands via DirEd" >&5
+	echo "$as_me:34482: 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.
@@ -34422,10 +34495,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:34425: result: $enableval" >&5
+	echo "$as_me:34498: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:34428: checking if you wish to allow \"tar\" commands from DirEd" >&5
+	echo "$as_me:34501: 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.
@@ -34447,10 +34520,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:34450: result: $enableval" >&5
+	echo "$as_me:34523: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:34453: checking if you wish to allow \"uudecode\" commands from DirEd" >&5
+	echo "$as_me:34526: 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.
@@ -34472,10 +34545,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:34475: result: $enableval" >&5
+	echo "$as_me:34548: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:34478: checking if you wish to allow \"zip\" and \"unzip\" commands from DirEd" >&5
+	echo "$as_me:34551: 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.
@@ -34497,10 +34570,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:34500: result: $enableval" >&5
+	echo "$as_me:34573: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:34503: checking if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd" >&5
+	echo "$as_me:34576: 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.
@@ -34522,11 +34595,11 @@ else
 EOF
 
 fi;
-	echo "$as_me:34525: result: $enableval" >&5
+	echo "$as_me:34598: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 fi
 
-echo "$as_me:34529: checking if you want long-directory listings" >&5
+echo "$as_me:34602: 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.
@@ -34548,10 +34621,10 @@ else
 EOF
 
 fi;
-echo "$as_me:34551: result: $enableval" >&5
+echo "$as_me:34624: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:34554: checking if parent-directory references are permitted" >&5
+echo "$as_me:34627: 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.
@@ -34567,7 +34640,7 @@ EOF
 else
   enableval=yes
 fi;
-echo "$as_me:34570: result: $enableval" >&5
+echo "$as_me:34643: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 test -z "$TELNET" && TELNET=telnet
@@ -34575,7 +34648,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:34578: checking for $ac_word" >&5
+echo "$as_me:34651: 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
@@ -34592,7 +34665,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:34595: found $ac_dir/$ac_word" >&5
+   echo "$as_me:34668: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -34603,10 +34676,10 @@ fi
 TELNET=$ac_cv_path_TELNET
 
 if test -n "$TELNET"; then
-  echo "$as_me:34606: result: $TELNET" >&5
+  echo "$as_me:34679: result: $TELNET" >&5
 echo "${ECHO_T}$TELNET" >&6
 else
-  echo "$as_me:34609: result: no" >&5
+  echo "$as_me:34682: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -34665,7 +34738,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:34668: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:34741: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define TELNET_PATH "$cf_path_prog"
@@ -34682,7 +34755,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:34685: checking for $ac_word" >&5
+echo "$as_me:34758: 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
@@ -34699,7 +34772,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:34702: found $ac_dir/$ac_word" >&5
+   echo "$as_me:34775: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -34710,10 +34783,10 @@ fi
 TN3270=$ac_cv_path_TN3270
 
 if test -n "$TN3270"; then
-  echo "$as_me:34713: result: $TN3270" >&5
+  echo "$as_me:34786: result: $TN3270" >&5
 echo "${ECHO_T}$TN3270" >&6
 else
-  echo "$as_me:34716: result: no" >&5
+  echo "$as_me:34789: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -34772,7 +34845,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:34775: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:34848: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define TN3270_PATH "$cf_path_prog"
@@ -34789,7 +34862,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:34792: checking for $ac_word" >&5
+echo "$as_me:34865: 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
@@ -34806,7 +34879,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:34809: found $ac_dir/$ac_word" >&5
+   echo "$as_me:34882: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -34817,10 +34890,10 @@ fi
 RLOGIN=$ac_cv_path_RLOGIN
 
 if test -n "$RLOGIN"; then
-  echo "$as_me:34820: result: $RLOGIN" >&5
+  echo "$as_me:34893: result: $RLOGIN" >&5
 echo "${ECHO_T}$RLOGIN" >&6
 else
-  echo "$as_me:34823: result: no" >&5
+  echo "$as_me:34896: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -34879,7 +34952,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:34882: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:34955: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define RLOGIN_PATH "$cf_path_prog"
@@ -34896,7 +34969,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:34899: checking for $ac_word" >&5
+echo "$as_me:34972: 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
@@ -34913,7 +34986,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:34916: found $ac_dir/$ac_word" >&5
+   echo "$as_me:34989: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -34924,10 +34997,10 @@ fi
 MV=$ac_cv_path_MV
 
 if test -n "$MV"; then
-  echo "$as_me:34927: result: $MV" >&5
+  echo "$as_me:35000: result: $MV" >&5
 echo "${ECHO_T}$MV" >&6
 else
-  echo "$as_me:34930: result: no" >&5
+  echo "$as_me:35003: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -34986,7 +35059,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:34989: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:35062: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define MV_PATH "$cf_path_prog"
@@ -35003,7 +35076,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:35006: checking for $ac_word" >&5
+echo "$as_me:35079: 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
@@ -35020,7 +35093,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:35023: found $ac_dir/$ac_word" >&5
+   echo "$as_me:35096: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -35031,10 +35104,10 @@ fi
 GZIP=$ac_cv_path_GZIP
 
 if test -n "$GZIP"; then
-  echo "$as_me:35034: result: $GZIP" >&5
+  echo "$as_me:35107: result: $GZIP" >&5
 echo "${ECHO_T}$GZIP" >&6
 else
-  echo "$as_me:35037: result: no" >&5
+  echo "$as_me:35110: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -35093,7 +35166,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:35096: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:35169: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define GZIP_PATH "$cf_path_prog"
@@ -35110,7 +35183,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:35113: checking for $ac_word" >&5
+echo "$as_me:35186: 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
@@ -35127,7 +35200,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:35130: found $ac_dir/$ac_word" >&5
+   echo "$as_me:35203: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -35138,10 +35211,10 @@ fi
 UNCOMPRESS=$ac_cv_path_UNCOMPRESS
 
 if test -n "$UNCOMPRESS"; then
-  echo "$as_me:35141: result: $UNCOMPRESS" >&5
+  echo "$as_me:35214: result: $UNCOMPRESS" >&5
 echo "${ECHO_T}$UNCOMPRESS" >&6
 else
-  echo "$as_me:35144: result: no" >&5
+  echo "$as_me:35217: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -35200,7 +35273,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:35203: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:35276: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define UNCOMPRESS_PATH "$cf_path_prog"
@@ -35217,7 +35290,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:35220: checking for $ac_word" >&5
+echo "$as_me:35293: 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
@@ -35234,7 +35307,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:35237: found $ac_dir/$ac_word" >&5
+   echo "$as_me:35310: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -35245,10 +35318,10 @@ fi
 UNZIP=$ac_cv_path_UNZIP
 
 if test -n "$UNZIP"; then
-  echo "$as_me:35248: result: $UNZIP" >&5
+  echo "$as_me:35321: result: $UNZIP" >&5
 echo "${ECHO_T}$UNZIP" >&6
 else
-  echo "$as_me:35251: result: no" >&5
+  echo "$as_me:35324: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -35307,7 +35380,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:35310: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:35383: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define UNZIP_PATH "$cf_path_prog"
@@ -35324,7 +35397,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:35327: checking for $ac_word" >&5
+echo "$as_me:35400: 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
@@ -35341,7 +35414,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:35344: found $ac_dir/$ac_word" >&5
+   echo "$as_me:35417: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -35352,10 +35425,10 @@ fi
 BZIP2=$ac_cv_path_BZIP2
 
 if test -n "$BZIP2"; then
-  echo "$as_me:35355: result: $BZIP2" >&5
+  echo "$as_me:35428: result: $BZIP2" >&5
 echo "${ECHO_T}$BZIP2" >&6
 else
-  echo "$as_me:35358: result: no" >&5
+  echo "$as_me:35431: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -35414,7 +35487,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:35417: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:35490: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define BZIP2_PATH "$cf_path_prog"
@@ -35431,7 +35504,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:35434: checking for $ac_word" >&5
+echo "$as_me:35507: 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
@@ -35448,7 +35521,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:35451: found $ac_dir/$ac_word" >&5
+   echo "$as_me:35524: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -35459,10 +35532,10 @@ fi
 TAR=$ac_cv_path_TAR
 
 if test -n "$TAR"; then
-  echo "$as_me:35462: result: $TAR" >&5
+  echo "$as_me:35535: result: $TAR" >&5
 echo "${ECHO_T}$TAR" >&6
 else
-  echo "$as_me:35465: result: no" >&5
+  echo "$as_me:35538: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -35521,7 +35594,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:35524: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:35597: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define TAR_PATH "$cf_path_prog"
@@ -35578,7 +35651,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:35581: checking for $ac_word" >&5
+echo "$as_me:35654: 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
@@ -35595,7 +35668,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:35598: found $ac_dir/$ac_word" >&5
+   echo "$as_me:35671: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -35606,10 +35679,10 @@ fi
 COMPRESS=$ac_cv_path_COMPRESS
 
 if test -n "$COMPRESS"; then
-  echo "$as_me:35609: result: $COMPRESS" >&5
+  echo "$as_me:35682: result: $COMPRESS" >&5
 echo "${ECHO_T}$COMPRESS" >&6
 else
-  echo "$as_me:35612: result: no" >&5
+  echo "$as_me:35685: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -35668,7 +35741,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:35671: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:35744: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define COMPRESS_PATH "$cf_path_prog"
@@ -35685,7 +35758,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:35688: checking for $ac_word" >&5
+echo "$as_me:35761: 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
@@ -35702,7 +35775,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:35705: found $ac_dir/$ac_word" >&5
+   echo "$as_me:35778: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -35713,10 +35786,10 @@ fi
 RM=$ac_cv_path_RM
 
 if test -n "$RM"; then
-  echo "$as_me:35716: result: $RM" >&5
+  echo "$as_me:35789: result: $RM" >&5
 echo "${ECHO_T}$RM" >&6
 else
-  echo "$as_me:35719: result: no" >&5
+  echo "$as_me:35792: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -35775,7 +35848,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:35778: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:35851: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define RM_PATH "$cf_path_prog"
@@ -35792,7 +35865,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:35795: checking for $ac_word" >&5
+echo "$as_me:35868: 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
@@ -35809,7 +35882,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:35812: found $ac_dir/$ac_word" >&5
+   echo "$as_me:35885: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -35820,10 +35893,10 @@ fi
 UUDECODE=$ac_cv_path_UUDECODE
 
 if test -n "$UUDECODE"; then
-  echo "$as_me:35823: result: $UUDECODE" >&5
+  echo "$as_me:35896: result: $UUDECODE" >&5
 echo "${ECHO_T}$UUDECODE" >&6
 else
-  echo "$as_me:35826: result: no" >&5
+  echo "$as_me:35899: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -35882,7 +35955,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:35885: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:35958: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define UUDECODE_PATH "$cf_path_prog"
@@ -35899,7 +35972,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:35902: checking for $ac_word" >&5
+echo "$as_me:35975: 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
@@ -35916,7 +35989,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:35919: found $ac_dir/$ac_word" >&5
+   echo "$as_me:35992: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -35927,10 +36000,10 @@ fi
 ZCAT=$ac_cv_path_ZCAT
 
 if test -n "$ZCAT"; then
-  echo "$as_me:35930: result: $ZCAT" >&5
+  echo "$as_me:36003: result: $ZCAT" >&5
 echo "${ECHO_T}$ZCAT" >&6
 else
-  echo "$as_me:35933: result: no" >&5
+  echo "$as_me:36006: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -35989,7 +36062,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:35992: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:36065: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define ZCAT_PATH "$cf_path_prog"
@@ -36006,7 +36079,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:36009: checking for $ac_word" >&5
+echo "$as_me:36082: 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
@@ -36023,7 +36096,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:36026: found $ac_dir/$ac_word" >&5
+   echo "$as_me:36099: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -36034,10 +36107,10 @@ fi
 ZIP=$ac_cv_path_ZIP
 
 if test -n "$ZIP"; then
-  echo "$as_me:36037: result: $ZIP" >&5
+  echo "$as_me:36110: result: $ZIP" >&5
 echo "${ECHO_T}$ZIP" >&6
 else
-  echo "$as_me:36040: result: no" >&5
+  echo "$as_me:36113: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -36096,7 +36169,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:36099: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:36172: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define ZIP_PATH "$cf_path_prog"
@@ -36123,7 +36196,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:36126: checking for $ac_word" >&5
+echo "$as_me:36199: 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
@@ -36140,7 +36213,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:36143: found $ac_dir/$ac_word" >&5
+   echo "$as_me:36216: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -36151,10 +36224,10 @@ fi
 INSTALL=$ac_cv_path_INSTALL
 
 if test -n "$INSTALL"; then
-  echo "$as_me:36154: result: $INSTALL" >&5
+  echo "$as_me:36227: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 else
-  echo "$as_me:36157: result: no" >&5
+  echo "$as_me:36230: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -36213,7 +36286,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:36216: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:36289: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define INSTALL_PATH "$cf_path_prog"
@@ -36239,7 +36312,7 @@ fi
 
 if test $cf_cv_screen = pdcurses ; then
 
-	echo "$as_me:36242: checking for X" >&5
+	echo "$as_me:36315: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -36336,17 +36409,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 36339 "configure"
+#line 36412 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:36343: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:36416: \"$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:36349: \$? = $ac_status" >&5
+  echo "$as_me:36422: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -36379,7 +36452,7 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >conftest.$ac_ext <<_ACEOF
-#line 36382 "configure"
+#line 36455 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -36391,16 +36464,16 @@ XtMalloc (0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36394: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36467: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36397: \$? = $ac_status" >&5
+  echo "$as_me:36470: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36400: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36473: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36403: \$? = $ac_status" >&5
+  echo "$as_me:36476: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -36438,7 +36511,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:36441: result: $have_x" >&5
+  echo "$as_me:36514: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -36448,7 +36521,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:36451: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:36524: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -36472,11 +36545,11 @@ else
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:36475: checking whether -R must be followed by a space" >&5
+      echo "$as_me:36548: 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 36479 "configure"
+#line 36552 "configure"
 #include "confdefs.h"
 
 int
@@ -36488,16 +36561,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36491: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36564: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36494: \$? = $ac_status" >&5
+  echo "$as_me:36567: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36497: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36570: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36500: \$? = $ac_status" >&5
+  echo "$as_me:36573: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_nospace=yes
 else
@@ -36507,13 +36580,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:36510: result: no" >&5
+	echo "$as_me:36583: 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 36516 "configure"
+#line 36589 "configure"
 #include "confdefs.h"
 
 int
@@ -36525,16 +36598,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36528: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36601: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36531: \$? = $ac_status" >&5
+  echo "$as_me:36604: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36534: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36607: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36537: \$? = $ac_status" >&5
+  echo "$as_me:36610: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_space=yes
 else
@@ -36544,11 +36617,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:36547: result: yes" >&5
+	  echo "$as_me:36620: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:36551: result: neither works" >&5
+	  echo "$as_me:36624: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -36568,7 +36641,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 36571 "configure"
+#line 36644 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -36587,22 +36660,22 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36590: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36663: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36593: \$? = $ac_status" >&5
+  echo "$as_me:36666: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36596: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36669: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36599: \$? = $ac_status" >&5
+  echo "$as_me:36672: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:36605: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:36678: 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
@@ -36610,7 +36683,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 36613 "configure"
+#line 36686 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -36629,16 +36702,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36632: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36705: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36635: \$? = $ac_status" >&5
+  echo "$as_me:36708: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36638: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36711: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36641: \$? = $ac_status" >&5
+  echo "$as_me:36714: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -36649,14 +36722,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:36652: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:36725: 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:36659: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:36732: 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
@@ -36664,7 +36737,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 36667 "configure"
+#line 36740 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -36683,16 +36756,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36686: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36759: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36689: \$? = $ac_status" >&5
+  echo "$as_me:36762: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36692: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36765: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36695: \$? = $ac_status" >&5
+  echo "$as_me:36768: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -36703,7 +36776,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:36706: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:36779: 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"
@@ -36722,13 +36795,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:36725: checking for gethostbyname" >&5
+    echo "$as_me:36798: 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 36731 "configure"
+#line 36804 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname (); below.  */
@@ -36759,16 +36832,16 @@ f = gethostbyname;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36762: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36835: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36765: \$? = $ac_status" >&5
+  echo "$as_me:36838: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36768: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36841: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36771: \$? = $ac_status" >&5
+  echo "$as_me:36844: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -36778,11 +36851,11 @@ ac_cv_func_gethostbyname=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:36781: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:36854: 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:36785: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:36858: 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
@@ -36790,7 +36863,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 36793 "configure"
+#line 36866 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -36809,16 +36882,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36812: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36885: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36815: \$? = $ac_status" >&5
+  echo "$as_me:36888: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36818: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36891: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36821: \$? = $ac_status" >&5
+  echo "$as_me:36894: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -36829,14 +36902,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:36832: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:36905: 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:36839: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:36912: 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
@@ -36844,7 +36917,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 36847 "configure"
+#line 36920 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -36863,16 +36936,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36866: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36939: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36869: \$? = $ac_status" >&5
+  echo "$as_me:36942: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36872: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36945: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36875: \$? = $ac_status" >&5
+  echo "$as_me:36948: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -36883,7 +36956,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:36886: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:36959: 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"
@@ -36899,13 +36972,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:36902: checking for connect" >&5
+    echo "$as_me:36975: 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 36908 "configure"
+#line 36981 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect (); below.  */
@@ -36936,16 +37009,16 @@ f = connect;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36939: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37012: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36942: \$? = $ac_status" >&5
+  echo "$as_me:37015: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36945: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37018: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36948: \$? = $ac_status" >&5
+  echo "$as_me:37021: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_connect=yes
 else
@@ -36955,11 +37028,11 @@ ac_cv_func_connect=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:36958: result: $ac_cv_func_connect" >&5
+echo "$as_me:37031: 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:36962: checking for connect in -lsocket" >&5
+      echo "$as_me:37035: 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
@@ -36967,7 +37040,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 36970 "configure"
+#line 37043 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -36986,16 +37059,16 @@ connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36989: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37062: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36992: \$? = $ac_status" >&5
+  echo "$as_me:37065: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36995: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37068: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36998: \$? = $ac_status" >&5
+  echo "$as_me:37071: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -37006,7 +37079,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:37009: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:37082: 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"
@@ -37015,13 +37088,13 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:37018: checking for remove" >&5
+    echo "$as_me:37091: 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 37024 "configure"
+#line 37097 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove (); below.  */
@@ -37052,16 +37125,16 @@ f = remove;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:37055: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37128: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37058: \$? = $ac_status" >&5
+  echo "$as_me:37131: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:37061: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37134: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37064: \$? = $ac_status" >&5
+  echo "$as_me:37137: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_remove=yes
 else
@@ -37071,11 +37144,11 @@ ac_cv_func_remove=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:37074: result: $ac_cv_func_remove" >&5
+echo "$as_me:37147: 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:37078: checking for remove in -lposix" >&5
+      echo "$as_me:37151: 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
@@ -37083,7 +37156,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 37086 "configure"
+#line 37159 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -37102,16 +37175,16 @@ remove ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:37105: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37178: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37108: \$? = $ac_status" >&5
+  echo "$as_me:37181: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:37111: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37184: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37114: \$? = $ac_status" >&5
+  echo "$as_me:37187: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -37122,7 +37195,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:37125: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:37198: 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"
@@ -37131,13 +37204,13 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:37134: checking for shmat" >&5
+    echo "$as_me:37207: 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 37140 "configure"
+#line 37213 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat (); below.  */
@@ -37168,16 +37241,16 @@ f = shmat;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:37171: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37244: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37174: \$? = $ac_status" >&5
+  echo "$as_me:37247: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:37177: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37250: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37180: \$? = $ac_status" >&5
+  echo "$as_me:37253: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -37187,11 +37260,11 @@ ac_cv_func_shmat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:37190: result: $ac_cv_func_shmat" >&5
+echo "$as_me:37263: 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:37194: checking for shmat in -lipc" >&5
+      echo "$as_me:37267: 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
@@ -37199,7 +37272,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 37202 "configure"
+#line 37275 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -37218,16 +37291,16 @@ shmat ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:37221: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37294: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37224: \$? = $ac_status" >&5
+  echo "$as_me:37297: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:37227: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37300: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37230: \$? = $ac_status" >&5
+  echo "$as_me:37303: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -37238,7 +37311,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:37241: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:37314: 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"
@@ -37256,7 +37329,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:37259: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:37332: 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
@@ -37264,7 +37337,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 37267 "configure"
+#line 37340 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -37283,16 +37356,16 @@ IceConnectionNumber ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:37286: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37359: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37289: \$? = $ac_status" >&5
+  echo "$as_me:37362: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:37292: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37365: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37295: \$? = $ac_status" >&5
+  echo "$as_me:37368: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -37303,7 +37376,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:37306: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:37379: 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"
@@ -37315,7 +37388,7 @@ fi
 
 cf_x_athena=${cf_x_athena:-Xaw}
 
-echo "$as_me:37318: checking if you want to link with Xaw 3d library" >&5
+echo "$as_me:37391: 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=
 
@@ -37326,14 +37399,14 @@ if test "${with_Xaw3d+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3d
-	echo "$as_me:37329: result: yes" >&5
+	echo "$as_me:37402: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:37332: result: no" >&5
+	echo "$as_me:37405: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:37336: checking if you want to link with neXT Athena library" >&5
+echo "$as_me:37409: 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=
 
@@ -37344,14 +37417,14 @@ if test "${with_neXtaw+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=neXtaw
-	echo "$as_me:37347: result: yes" >&5
+	echo "$as_me:37420: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:37350: result: no" >&5
+	echo "$as_me:37423: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:37354: checking if you want to link with Athena-Plus library" >&5
+echo "$as_me:37427: 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=
 
@@ -37362,10 +37435,10 @@ if test "${with_XawPlus+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=XawPlus
-	echo "$as_me:37365: result: yes" >&5
+	echo "$as_me:37438: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:37368: result: no" >&5
+	echo "$as_me:37441: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37385,17 +37458,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}:37388: testing found package $cf_athena_pkg ..." 1>&5
+echo "${as_me:-configure}:37461: 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}:37394: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:37467: 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}:37398: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:37471: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -37485,14 +37558,14 @@ cf_x_athena_LIBS=`echo "HAVE_LIB_$cf_x_athena" | sed y%abcdefghijklmnopqrstuvwxy
 #define $cf_x_athena_LIBS 1
 EOF
 
-echo "$as_me:37488: checking for usable $cf_x_athena/Xmu package" >&5
+echo "$as_me:37561: 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 37495 "configure"
+#line 37568 "configure"
 #include "confdefs.h"
 
 #include <X11/Xmu/CharSet.h>
@@ -37508,16 +37581,16 @@ int check = XmuCompareISOLatin1("big", "small")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:37511: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37584: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37514: \$? = $ac_status" >&5
+  echo "$as_me:37587: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:37517: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37590: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37520: \$? = $ac_status" >&5
+  echo "$as_me:37593: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xaw_compat=yes
 else
@@ -37527,7 +37600,7 @@ cf_cv_xaw_compat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:37530: result: $cf_cv_xaw_compat" >&5
+echo "$as_me:37603: result: $cf_cv_xaw_compat" >&5
 echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 
 			if test "$cf_cv_xaw_compat" = no
@@ -37539,22 +37612,22 @@ echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 				*)
 					test -n "$verbose" && echo "	work around broken package" 1>&6
 
-echo "${as_me:-configure}:37542: testing work around broken package ..." 1>&5
+echo "${as_me:-configure}:37615: 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}:37547: testing found package xmu ..." 1>&5
+echo "${as_me:-configure}:37620: 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}:37553: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:37626: 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}:37557: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:37630: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -37640,12 +37713,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:37643: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:37716: 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}:37648: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:37721: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -37666,17 +37739,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}:37669: testing found package Xext ..." 1>&5
+echo "${as_me:-configure}:37742: 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}:37675: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:37748: 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}:37679: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:37752: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -37760,7 +37833,7 @@ fi
 	:
 else
 
-	echo "$as_me:37763: checking for XextCreateExtension in -lXext" >&5
+	echo "$as_me:37836: 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
@@ -37768,7 +37841,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 37771 "configure"
+#line 37844 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -37787,16 +37860,16 @@ XextCreateExtension ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:37790: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37863: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37793: \$? = $ac_status" >&5
+  echo "$as_me:37866: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:37796: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37869: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37799: \$? = $ac_status" >&5
+  echo "$as_me:37872: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
@@ -37807,7 +37880,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:37810: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:37883: 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"
@@ -37820,17 +37893,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}:37823: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:37896: 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}:37829: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:37902: 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}:37833: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:37906: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -37917,14 +37990,14 @@ fi
 		;;
 	*)
 # we have an "xt" package, but it may omit Xt's dependency on X11
-echo "$as_me:37920: checking for usable X dependency" >&5
+echo "$as_me:37993: 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 37927 "configure"
+#line 38000 "configure"
 #include "confdefs.h"
 
 #include <X11/Xlib.h>
@@ -37943,16 +38016,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:37946: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38019: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37949: \$? = $ac_status" >&5
+  echo "$as_me:38022: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:37952: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38025: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37955: \$? = $ac_status" >&5
+  echo "$as_me:38028: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xt_x11_compat=yes
 else
@@ -37962,30 +38035,30 @@ cf_cv_xt_x11_compat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:37965: result: $cf_cv_xt_x11_compat" >&5
+echo "$as_me:38038: 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}:37971: testing work around broken X11 dependency ..." 1>&5
+echo "${as_me:-configure}:38044: 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}:37978: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:38051: 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}:37984: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:38057: 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}:37988: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:38061: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -38071,12 +38144,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:38074: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:38147: 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}:38079: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:38152: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -38084,14 +38157,14 @@ fi
 		;;
 	esac
 
-echo "$as_me:38087: checking for usable X Toolkit package" >&5
+echo "$as_me:38160: 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 38094 "configure"
+#line 38167 "configure"
 #include "confdefs.h"
 
 #include <X11/Shell.h>
@@ -38106,16 +38179,16 @@ int num = IceConnectionNumber(0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38109: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38182: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38112: \$? = $ac_status" >&5
+  echo "$as_me:38185: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38115: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38188: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38118: \$? = $ac_status" >&5
+  echo "$as_me:38191: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xt_ice_compat=yes
 else
@@ -38125,7 +38198,7 @@ cf_cv_xt_ice_compat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:38128: result: $cf_cv_xt_ice_compat" >&5
+echo "$as_me:38201: result: $cf_cv_xt_ice_compat" >&5
 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
 
 	if test "$cf_cv_xt_ice_compat" = no
@@ -38139,22 +38212,22 @@ echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
 			*)
 				test -n "$verbose" && echo "	work around broken ICE dependency" 1>&6
 
-echo "${as_me:-configure}:38142: testing work around broken ICE dependency ..." 1>&5
+echo "${as_me:-configure}:38215: 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}:38147: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:38220: 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}:38153: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:38226: 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}:38157: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:38230: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -38239,17 +38312,17 @@ fi
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then
 	test -n "$verbose" && echo "	found package sm" 1>&6
 
-echo "${as_me:-configure}:38242: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:38315: 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}:38248: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:38321: 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}:38252: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:38325: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -38339,12 +38412,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:38342: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:38415: 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}:38347: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:38420: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -38362,7 +38435,7 @@ else
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:38365: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:38438: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -38433,7 +38506,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}:38436: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:38509: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	CFLAGS="$CFLAGS $cf_new_cflags"
 fi
@@ -38441,7 +38514,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}:38444: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:38517: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
 fi
@@ -38449,14 +38522,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}:38452: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:38525: 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 38459 "configure"
+#line 38532 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -38468,16 +38541,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38471: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38544: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38474: \$? = $ac_status" >&5
+  echo "$as_me:38547: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38477: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38550: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38480: \$? = $ac_status" >&5
+  echo "$as_me:38553: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -38485,12 +38558,12 @@ else
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:38488: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:38561: 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}:38493: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:38566: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_flags"
@@ -38498,13 +38571,13 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-	echo "$as_me:38501: checking for XOpenDisplay" >&5
+	echo "$as_me:38574: 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 38507 "configure"
+#line 38580 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char XOpenDisplay (); below.  */
@@ -38535,16 +38608,16 @@ f = XOpenDisplay;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38538: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38611: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38541: \$? = $ac_status" >&5
+  echo "$as_me:38614: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38544: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38617: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38547: \$? = $ac_status" >&5
+  echo "$as_me:38620: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_XOpenDisplay=yes
 else
@@ -38554,13 +38627,13 @@ ac_cv_func_XOpenDisplay=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:38557: result: $ac_cv_func_XOpenDisplay" >&5
+echo "$as_me:38630: 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:38563: checking for XOpenDisplay in -lX11" >&5
+	echo "$as_me:38636: 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
@@ -38568,7 +38641,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 38571 "configure"
+#line 38644 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -38587,16 +38660,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38590: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38663: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38593: \$? = $ac_status" >&5
+  echo "$as_me:38666: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38596: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38669: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38599: \$? = $ac_status" >&5
+  echo "$as_me:38672: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -38607,7 +38680,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:38610: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:38683: 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"
@@ -38615,13 +38688,13 @@ fi
 
 fi
 
-	echo "$as_me:38618: checking for XtAppInitialize" >&5
+	echo "$as_me:38691: 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 38624 "configure"
+#line 38697 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char XtAppInitialize (); below.  */
@@ -38652,16 +38725,16 @@ f = XtAppInitialize;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38655: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38728: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38658: \$? = $ac_status" >&5
+  echo "$as_me:38731: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38661: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38734: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38664: \$? = $ac_status" >&5
+  echo "$as_me:38737: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_XtAppInitialize=yes
 else
@@ -38671,13 +38744,13 @@ ac_cv_func_XtAppInitialize=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:38674: result: $ac_cv_func_XtAppInitialize" >&5
+echo "$as_me:38747: 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:38680: checking for XtAppInitialize in -lXt" >&5
+	echo "$as_me:38753: 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
@@ -38685,7 +38758,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 38688 "configure"
+#line 38761 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -38704,16 +38777,16 @@ XtAppInitialize ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38707: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38780: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38710: \$? = $ac_status" >&5
+  echo "$as_me:38783: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38713: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38786: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38716: \$? = $ac_status" >&5
+  echo "$as_me:38789: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xt_XtAppInitialize=yes
 else
@@ -38724,7 +38797,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:38727: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:38800: 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
@@ -38740,7 +38813,7 @@ fi
 fi
 
 if test $cf_have_X_LIBS = no ; then
-	{ echo "$as_me:38743: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+	{ echo "$as_me:38816: 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
@@ -38762,14 +38835,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:38765: checking for $cf_test in $cf_path" >&5
+			echo "$as_me:38838: 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:38768: checking for $cf_test" >&5
+			echo "$as_me:38841: checking for $cf_test" >&5
 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
 		fi
 		cat >conftest.$ac_ext <<_ACEOF
-#line 38772 "configure"
+#line 38845 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -38783,16 +38856,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:38786: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:38859: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:38789: \$? = $ac_status" >&5
+  echo "$as_me:38862: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:38792: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38865: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38795: \$? = $ac_status" >&5
+  echo "$as_me:38868: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -38801,7 +38874,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-		echo "$as_me:38804: result: $cf_result" >&5
+		echo "$as_me:38877: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 		if test "$cf_result" = yes ; then
 			cf_x_athena_inc=$cf_path
@@ -38813,7 +38886,7 @@ echo "${ECHO_T}$cf_result" >&6
 done
 
 if test -z "$cf_x_athena_inc" ; then
-	{ echo "$as_me:38816: WARNING: Unable to successfully find Athena header files with test program" >&5
+	{ echo "$as_me:38889: 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"
@@ -38838,15 +38911,15 @@ do
 			cf_test=XawSimpleMenuAddGlobalActions
 			if test $cf_path != default ; then
 				LIBS="-L$cf_path/lib $cf_lib $LIBS"
-				echo "$as_me:38841: checking for $cf_lib in $cf_path" >&5
+				echo "$as_me:38914: 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:38845: checking for $cf_test in $cf_lib" >&5
+				echo "$as_me:38918: 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 38849 "configure"
+#line 38922 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -38862,16 +38935,16 @@ $cf_test((XtAppContext) 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38865: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38938: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38868: \$? = $ac_status" >&5
+  echo "$as_me:38941: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38871: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38944: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38874: \$? = $ac_status" >&5
+  echo "$as_me:38947: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -38880,7 +38953,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-			echo "$as_me:38883: result: $cf_result" >&5
+			echo "$as_me:38956: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				cf_x_athena_lib="$cf_lib"
@@ -38892,7 +38965,7 @@ echo "${ECHO_T}$cf_result" >&6
 done
 
 if test -z "$cf_x_athena_lib" ; then
-	{ { echo "$as_me:38895: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+	{ { echo "$as_me:38968: 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
@@ -38909,7 +38982,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:38912: checking for $ac_word" >&5
+echo "$as_me:38985: 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
@@ -38926,7 +38999,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:38929: found $ac_dir/$ac_word" >&5
+   echo "$as_me:39002: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -38937,10 +39010,10 @@ fi
 XCURSES_CONFIG=$ac_cv_path_XCURSES_CONFIG
 
 if test -n "$XCURSES_CONFIG"; then
-  echo "$as_me:38940: result: $XCURSES_CONFIG" >&5
+  echo "$as_me:39013: result: $XCURSES_CONFIG" >&5
 echo "${ECHO_T}$XCURSES_CONFIG" >&6
 else
-  echo "$as_me:38943: result: no" >&5
+  echo "$as_me:39016: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -38961,7 +39034,7 @@ LDFLAGS="$LDFLAGS $X_LIBS"
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:38964: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:39037: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -39032,7 +39105,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}:39035: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:39108: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	CFLAGS="$CFLAGS $cf_new_cflags"
 fi
@@ -39040,7 +39113,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}:39043: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:39116: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
 fi
@@ -39048,14 +39121,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}:39051: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:39124: 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 39058 "configure"
+#line 39131 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -39067,16 +39140,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39070: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39143: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39073: \$? = $ac_status" >&5
+  echo "$as_me:39146: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39076: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39149: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39079: \$? = $ac_status" >&5
+  echo "$as_me:39152: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -39084,12 +39157,12 @@ else
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:39087: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:39160: 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}:39092: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:39165: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_flags"
@@ -39097,7 +39170,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:39100: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:39173: 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
@@ -39105,7 +39178,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 39108 "configure"
+#line 39181 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39124,16 +39197,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39127: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39200: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39130: \$? = $ac_status" >&5
+  echo "$as_me:39203: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39133: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39206: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39136: \$? = $ac_status" >&5
+  echo "$as_me:39209: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -39144,13 +39217,13 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:39147: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:39220: 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:39153: checking for XCurses library" >&5
+echo "$as_me:39226: 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
@@ -39158,7 +39231,7 @@ else
 
 LIBS="-lXCurses $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 39161 "configure"
+#line 39234 "configure"
 #include "confdefs.h"
 
 #include <xcurses.h>
@@ -39173,16 +39246,16 @@ XCursesExit();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39176: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39249: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39179: \$? = $ac_status" >&5
+  echo "$as_me:39252: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39182: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39255: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39185: \$? = $ac_status" >&5
+  echo "$as_me:39258: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_lib_XCurses=yes
 else
@@ -39193,7 +39266,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:39196: result: $cf_cv_lib_XCurses" >&5
+echo "$as_me:39269: result: $cf_cv_lib_XCurses" >&5
 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
 
 fi
@@ -39207,23 +39280,23 @@ EOF
 #define XCURSES 1
 EOF
 
-	echo "$as_me:39210: checking for xcurses.h" >&5
+	echo "$as_me:39283: checking for xcurses.h" >&5
 echo $ECHO_N "checking for xcurses.h... $ECHO_C" >&6
 if test "${ac_cv_header_xcurses_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 39216 "configure"
+#line 39289 "configure"
 #include "confdefs.h"
 #include <xcurses.h>
 _ACEOF
-if { (eval echo "$as_me:39220: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:39293: \"$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:39226: \$? = $ac_status" >&5
+  echo "$as_me:39299: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -39242,7 +39315,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:39245: result: $ac_cv_header_xcurses_h" >&5
+echo "$as_me:39318: result: $ac_cv_header_xcurses_h" >&5
 echo "${ECHO_T}$ac_cv_header_xcurses_h" >&6
 if test $ac_cv_header_xcurses_h = yes; then
   cat >>confdefs.h <<\EOF
@@ -39252,14 +39325,14 @@ EOF
 fi
 
 else
-	{ { echo "$as_me:39255: error: Cannot link with XCurses" >&5
+	{ { echo "$as_me:39328: error: Cannot link with XCurses" >&5
 echo "$as_me: error: Cannot link with XCurses" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 else
 
-echo "$as_me:39262: checking if we can include termio.h with curses" >&5
+echo "$as_me:39335: 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
@@ -39269,7 +39342,7 @@ else
     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 39272 "configure"
+#line 39345 "configure"
 #include "confdefs.h"
 
 #include <LYCurses.h>
@@ -39283,16 +39356,16 @@ putchar(0x0a)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:39286: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:39359: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:39289: \$? = $ac_status" >&5
+  echo "$as_me:39362: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:39292: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39365: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39295: \$? = $ac_status" >&5
+  echo "$as_me:39368: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termio_and_curses=yes
 else
@@ -39305,7 +39378,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
     rm -f lynx_cfg.h
 
 fi
-echo "$as_me:39308: result: $cf_cv_termio_and_curses" >&5
+echo "$as_me:39381: 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
@@ -39320,23 +39393,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:39323: checking for $ac_header" >&5
+echo "$as_me:39396: 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 39329 "configure"
+#line 39402 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:39333: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:39406: \"$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:39339: \$? = $ac_status" >&5
+  echo "$as_me:39412: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -39355,7 +39428,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:39358: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:39431: 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
@@ -39365,7 +39438,7 @@ EOF
 fi
 done
 
-echo "$as_me:39368: checking if curses supports alternate-character set" >&5
+echo "$as_me:39441: 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
@@ -39374,7 +39447,7 @@ else
 for mapname in acs_map _acs_map
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 39377 "configure"
+#line 39450 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -39388,16 +39461,16 @@ chtype x = $mapname['l']; $mapname['m'] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39391: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39464: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39394: \$? = $ac_status" >&5
+  echo "$as_me:39467: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39397: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39470: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39400: \$? = $ac_status" >&5
+  echo "$as_me:39473: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_alt_char_set=$mapname
 	 break
@@ -39411,20 +39484,20 @@ done
 
 fi
 
-echo "$as_me:39414: result: $cf_cv_alt_char_set" >&5
+echo "$as_me:39487: 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:39420: checking if curses supports fancy attributes" >&5
+echo "$as_me:39493: 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 39427 "configure"
+#line 39500 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -39442,16 +39515,16 @@ attrset(A_UNDERLINE|A_BOLD|A_REVERSE);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39445: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39518: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39448: \$? = $ac_status" >&5
+  echo "$as_me:39521: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39451: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39524: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39454: \$? = $ac_status" >&5
+  echo "$as_me:39527: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fancy_curses=yes
 else
@@ -39463,13 +39536,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:39466: result: $cf_cv_fancy_curses" >&5
+echo "$as_me:39539: 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:39472: checking for function curses_version" >&5
+echo "$as_me:39545: 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
@@ -39479,7 +39552,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_curses_version=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 39482 "configure"
+#line 39555 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -39492,15 +39565,15 @@ int main()
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:39495: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39568: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39498: \$? = $ac_status" >&5
+  echo "$as_me:39571: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:39500: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39573: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39503: \$? = $ac_status" >&5
+  echo "$as_me:39576: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_func_curses_version=yes
 
@@ -39515,21 +39588,21 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core
 fi
-echo "$as_me:39518: result: $cf_cv_func_curses_version" >&5
+echo "$as_me:39591: 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:39525: checking for obsolete/broken version of ncurses" >&5
+echo "$as_me:39598: 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 39532 "configure"
+#line 39605 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -39548,16 +39621,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:39551: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:39624: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:39554: \$? = $ac_status" >&5
+  echo "$as_me:39627: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:39557: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39630: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39560: \$? = $ac_status" >&5
+  echo "$as_me:39633: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_broken=no
 else
@@ -39569,10 +39642,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:39572: result: $cf_cv_ncurses_broken" >&5
+echo "$as_me:39645: 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:39575: WARNING: hmm... you should get an up-to-date version of ncurses" >&5
+	{ echo "$as_me:39648: 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
@@ -39581,14 +39654,14 @@ EOF
 fi
 fi
 
-echo "$as_me:39584: checking if curses supports color attributes" >&5
+echo "$as_me:39657: 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 39591 "configure"
+#line 39664 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -39608,16 +39681,16 @@ chtype x = COLOR_BLUE;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39611: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39684: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39614: \$? = $ac_status" >&5
+  echo "$as_me:39687: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39617: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39690: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39620: \$? = $ac_status" >&5
+  echo "$as_me:39693: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_color_curses=yes
 else
@@ -39629,7 +39702,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:39632: result: $cf_cv_color_curses" >&5
+echo "$as_me:39705: 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
@@ -39649,23 +39722,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:39652: checking for $ac_header" >&5
+echo "$as_me:39725: 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 39658 "configure"
+#line 39731 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:39662: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:39735: \"$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:39668: \$? = $ac_status" >&5
+  echo "$as_me:39741: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -39684,7 +39757,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:39687: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:39760: 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
@@ -39699,23 +39772,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:39702: checking for $ac_header" >&5
+echo "$as_me:39775: 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 39708 "configure"
+#line 39781 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:39712: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:39785: \"$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:39718: \$? = $ac_status" >&5
+  echo "$as_me:39791: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -39734,7 +39807,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:39737: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:39810: 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
@@ -39752,10 +39825,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:39755: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:39828: 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 39758 "configure"
+#line 39831 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -39767,16 +39840,16 @@ struct termios foo; int x = foo.c_iflag
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:39770: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:39843: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:39773: \$? = $ac_status" >&5
+  echo "$as_me:39846: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:39776: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39849: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39779: \$? = $ac_status" >&5
+  echo "$as_me:39852: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   termios_bad=no
 else
@@ -39784,7 +39857,7 @@ else
 cat conftest.$ac_ext >&5
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 39787 "configure"
+#line 39860 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -39798,16 +39871,16 @@ struct termios foo; int x = foo.c_iflag
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:39801: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:39874: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:39804: \$? = $ac_status" >&5
+  echo "$as_me:39877: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:39807: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39880: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39810: \$? = $ac_status" >&5
+  echo "$as_me:39883: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   termios_bad=unknown
 else
@@ -39822,12 +39895,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-	echo "$as_me:39825: result: $termios_bad" >&5
+	echo "$as_me:39898: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:39830: checking declaration of size-change" >&5
+echo "$as_me:39903: 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
@@ -39842,7 +39915,7 @@ do
     CPPFLAGS="$cf_save_CPPFLAGS"
     test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
     cat >conftest.$ac_ext <<_ACEOF
-#line 39845 "configure"
+#line 39918 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -39886,16 +39959,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:39889: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:39962: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:39892: \$? = $ac_status" >&5
+  echo "$as_me:39965: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:39895: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39968: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39898: \$? = $ac_status" >&5
+  echo "$as_me:39971: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_sizechange=yes
 else
@@ -39914,7 +39987,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:39917: result: $cf_cv_sizechange" >&5
+echo "$as_me:39990: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 	cat >>confdefs.h <<\EOF
@@ -39931,14 +40004,14 @@ EOF
 	esac
 fi
 
-echo "$as_me:39934: checking if ttytype is declared in curses library" >&5
+echo "$as_me:40007: 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 39941 "configure"
+#line 40014 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -39950,16 +40023,16 @@ char *x = &ttytype[1]; *x = 1
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39953: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40026: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39956: \$? = $ac_status" >&5
+  echo "$as_me:40029: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39959: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40032: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39962: \$? = $ac_status" >&5
+  echo "$as_me:40035: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_ttytype=yes
 else
@@ -39971,7 +40044,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:39974: result: $cf_cv_have_ttytype" >&5
+echo "$as_me:40047: 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
@@ -39979,14 +40052,14 @@ EOF
 
 	if test "$use_wide_curses" = yes ; then
 
-echo "$as_me:39982: checking if curses supports wide characters" >&5
+echo "$as_me:40055: 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 39989 "configure"
+#line 40062 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -40005,16 +40078,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40008: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40081: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40011: \$? = $ac_status" >&5
+  echo "$as_me:40084: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40014: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40087: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40017: \$? = $ac_status" >&5
+  echo "$as_me:40090: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_widec_curses=yes
 else
@@ -40025,7 +40098,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:40028: result: $cf_cv_widec_curses" >&5
+echo "$as_me:40101: result: $cf_cv_widec_curses" >&5
 echo "${ECHO_T}$cf_cv_widec_curses" >&6
 
 if test "$cf_cv_widec_curses" = yes ; then
@@ -40034,14 +40107,14 @@ if test "$cf_cv_widec_curses" = yes ; then
 EOF
 
 	# This is needed on Tru64 5.0 to declare mbstate_t
-	echo "$as_me:40037: checking if we must include wchar.h to declare mbstate_t" >&5
+	echo "$as_me:40110: 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 40044 "configure"
+#line 40117 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -40055,23 +40128,23 @@ mbstate_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:40058: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:40131: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:40061: \$? = $ac_status" >&5
+  echo "$as_me:40134: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:40064: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40137: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40067: \$? = $ac_status" >&5
+  echo "$as_me:40140: \$? = $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 40074 "configure"
+#line 40147 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -40086,16 +40159,16 @@ mbstate_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:40089: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:40162: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:40092: \$? = $ac_status" >&5
+  echo "$as_me:40165: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:40095: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40168: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40098: \$? = $ac_status" >&5
+  echo "$as_me:40171: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_widec_mbstate=yes
 else
@@ -40107,7 +40180,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:40110: result: $cf_cv_widec_mbstate" >&5
+echo "$as_me:40183: result: $cf_cv_widec_mbstate" >&5
 echo "${ECHO_T}$cf_cv_widec_mbstate" >&6
 
 if test "$cf_cv_widec_mbstate" = yes ; then
@@ -40128,14 +40201,14 @@ fi
 
 	fi
 
-echo "$as_me:40131: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+echo "$as_me:40204: 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 40138 "configure"
+#line 40211 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -40157,23 +40230,23 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40160: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40233: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40163: \$? = $ac_status" >&5
+  echo "$as_me:40236: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40166: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40239: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40169: \$? = $ac_status" >&5
+  echo "$as_me:40242: \$? = $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 40176 "configure"
+#line 40249 "configure"
 #include "confdefs.h"
 
 #define _XOPEN_SOURCE_EXTENDED
@@ -40195,16 +40268,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40198: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40271: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40201: \$? = $ac_status" >&5
+  echo "$as_me:40274: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40204: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40277: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40207: \$? = $ac_status" >&5
+  echo "$as_me:40280: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_xopen_extension=yes
 else
@@ -40216,11 +40289,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:40219: result: $cf_cv_need_xopen_extension" >&5
+echo "$as_me:40292: 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:40223: checking for term.h" >&5
+echo "$as_me:40296: 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
@@ -40241,7 +40314,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 40244 "configure"
+#line 40317 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -40255,16 +40328,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:40258: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:40331: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:40261: \$? = $ac_status" >&5
+  echo "$as_me:40334: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:40264: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40337: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40267: \$? = $ac_status" >&5
+  echo "$as_me:40340: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_term_header=$cf_header
 	 break
@@ -40283,7 +40356,7 @@ no)
 	for cf_header in ncurses/term.h ncursesw/term.h
 	do
 		cat >conftest.$ac_ext <<_ACEOF
-#line 40286 "configure"
+#line 40359 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -40301,16 +40374,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:40304: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:40377: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:40307: \$? = $ac_status" >&5
+  echo "$as_me:40380: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:40310: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40383: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40313: \$? = $ac_status" >&5
+  echo "$as_me:40386: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_term_header=$cf_header
 			 break
@@ -40325,7 +40398,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 esac
 
 fi
-echo "$as_me:40328: result: $cf_cv_term_header" >&5
+echo "$as_me:40401: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 case $cf_cv_term_header in #(vi
@@ -40349,7 +40422,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:40352: checking for unctrl.h" >&5
+echo "$as_me:40425: checking for unctrl.h" >&5
 echo $ECHO_N "checking for unctrl.h... $ECHO_C" >&6
 if test "${cf_cv_unctrl_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -40370,7 +40443,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 40373 "configure"
+#line 40446 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -40384,16 +40457,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:40387: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:40460: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:40390: \$? = $ac_status" >&5
+  echo "$as_me:40463: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:40393: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40466: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40396: \$? = $ac_status" >&5
+  echo "$as_me:40469: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_unctrl_header=$cf_header
 	 break
@@ -40407,13 +40480,13 @@ done
 
 case $cf_cv_unctrl_header in #(vi
 no)
-	{ echo "$as_me:40410: WARNING: unctrl.h header not found" >&5
+	{ echo "$as_me:40483: WARNING: unctrl.h header not found" >&5
 echo "$as_me: WARNING: unctrl.h header not found" >&2;}
 	;;
 esac
 
 fi
-echo "$as_me:40416: result: $cf_cv_unctrl_header" >&5
+echo "$as_me:40489: result: $cf_cv_unctrl_header" >&5
 echo "${ECHO_T}$cf_cv_unctrl_header" >&6
 
 case $cf_cv_unctrl_header in #(vi
@@ -40464,10 +40537,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:40467: checking for ${cf_func}" >&5
+	echo "$as_me:40540: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me:-configure}:40470: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:40543: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -40476,7 +40549,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >conftest.$ac_ext <<_ACEOF
-#line 40479 "configure"
+#line 40552 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -40507,16 +40580,16 @@ ${cf_cv_main_return:-return}(foo == 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40510: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40583: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40513: \$? = $ac_status" >&5
+  echo "$as_me:40586: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40516: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40589: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40519: \$? = $ac_status" >&5
+  echo "$as_me:40592: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -40532,7 +40605,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:40535: result: $cf_result" >&5
+	echo "$as_me:40608: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test $cf_result != no; then
 		cat >>confdefs.h <<EOF
@@ -40548,13 +40621,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:40551: checking for $ac_func" >&5
+echo "$as_me:40624: 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 40557 "configure"
+#line 40630 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -40585,16 +40658,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40588: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40661: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40591: \$? = $ac_status" >&5
+  echo "$as_me:40664: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40594: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40667: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40597: \$? = $ac_status" >&5
+  echo "$as_me:40670: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -40604,7 +40677,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:40607: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:40680: 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
@@ -40618,12 +40691,12 @@ fi
 
 if test $use_color_style != no ; then
 	if test .$cf_cv_color_curses != .yes ; then
-		{ { echo "$as_me:40621: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:40694: 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:40626: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:40699: error: Configuration does not support color-styles" >&5
 echo "$as_me: error: Configuration does not support color-styles" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -40631,7 +40704,7 @@ fi
 
 if test $use_scrollbar != no ; then
 	if test .$cf_cv_fancy_curses != .yes ; then
-		{ echo "$as_me:40634: WARNING: Configuration does not support ACS_xxx definitions" >&5
+		{ echo "$as_me:40707: 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
@@ -40644,7 +40717,7 @@ fi
 # use rpath for libraries in unusual places
 
 LD_RPATH_OPT=
-echo "$as_me:40647: checking for an rpath option" >&5
+echo "$as_me:40720: 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
@@ -40675,17 +40748,17 @@ solaris2*) #(vi
 *)
 	;;
 esac
-echo "$as_me:40678: result: $LD_RPATH_OPT" >&5
+echo "$as_me:40751: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 case "x$LD_RPATH_OPT" in #(vi
 x-R*)
-	echo "$as_me:40683: checking if we need a space after rpath option" >&5
+	echo "$as_me:40756: 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 40688 "configure"
+#line 40761 "configure"
 #include "confdefs.h"
 
 int
@@ -40697,16 +40770,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40700: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40773: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40703: \$? = $ac_status" >&5
+  echo "$as_me:40776: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40706: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40779: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40709: \$? = $ac_status" >&5
+  echo "$as_me:40782: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_rpath_space=no
 else
@@ -40716,13 +40789,13 @@ cf_rpath_space=yes
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	LIBS="$cf_save_LIBS"
-	echo "$as_me:40719: result: $cf_rpath_space" >&5
+	echo "$as_me:40792: 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:40725: checking if rpath-hack should be disabled" >&5
+echo "$as_me:40798: checking if rpath-hack should be disabled" >&5
 echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6
 
 # Check whether --enable-rpath-hack or --disable-rpath-hack was given.
@@ -40739,21 +40812,21 @@ else
   cf_disable_rpath_hack=no
 
 fi;
-echo "$as_me:40742: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:40815: 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:40746: checking for updated LDFLAGS" >&5
+echo "$as_me:40819: 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:40749: result: maybe" >&5
+	echo "$as_me:40822: 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:40756: checking for $ac_word" >&5
+echo "$as_me:40829: 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
@@ -40768,7 +40841,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:40771: found $ac_dir/$ac_word" >&5
+echo "$as_me:40844: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -40776,10 +40849,10 @@ fi
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:40779: result: $cf_ldd_prog" >&5
+  echo "$as_me:40852: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:40782: result: no" >&5
+  echo "$as_me:40855: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -40793,7 +40866,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
 		cf_rpath_oops=
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 40796 "configure"
+#line 40869 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -40805,16 +40878,16 @@ printf("Hello");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40808: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40881: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40811: \$? = $ac_status" >&5
+  echo "$as_me:40884: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40814: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40887: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40817: \$? = $ac_status" >&5
+  echo "$as_me:40890: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort -u`
 		 cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort -u`
@@ -40842,7 +40915,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 					then
 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
 
-echo "${as_me:-configure}:40845: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:40918: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 
 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
 						break
@@ -40854,11 +40927,11 @@ echo "${as_me:-configure}:40845: testing ...adding -L$cf_rpath_dir/lib to LDFLAG
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:40857: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:40930: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:40861: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:40934: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -40895,7 +40968,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:40898: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:40971: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -40908,11 +40981,11 @@ LDFLAGS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:40911: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:40984: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:40915: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:40988: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -40949,7 +41022,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:40952: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:41025: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -40962,11 +41035,11 @@ LIBS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:40965: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:41038: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:40969: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:41042: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 fi
 
@@ -41067,7 +41140,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:41070: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:41143: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -41243,7 +41316,7 @@ cat >>$CONFIG_STATUS <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:41246: error: ambiguous option: $1
+    { { echo "$as_me:41319: 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;}
@@ -41262,7 +41335,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:41265: error: unrecognized option: $1
+  -*) { { echo "$as_me:41338: 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;}
@@ -41315,7 +41388,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:41318: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:41391: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -41643,7 +41716,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:41646: creating $ac_file" >&5
+    { echo "$as_me:41719: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -41661,7 +41734,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:41664: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:41737: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -41674,7 +41747,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:41677: error: cannot find input file: $f" >&5
+           { { echo "$as_me:41750: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -41740,7 +41813,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:41743: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:41816: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -41751,7 +41824,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:41754: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:41827: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -41764,7 +41837,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:41767: error: cannot find input file: $f" >&5
+           { { echo "$as_me:41840: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -41882,7 +41955,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:41885: $ac_file is unchanged" >&5
+      { echo "$as_me:41958: $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/configure.in b/configure.in
index 709b58a8..62d9cfeb 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $LynxId: configure.in,v 1.224 2011/01/10 10:22:59 tom Exp $
+dnl $LynxId: configure.in,v 1.226 2011/05/10 09:21:44 tom Exp $
 dnl
 dnl Process this file with autoconf to produce a configure script.
 dnl
@@ -491,6 +491,7 @@ if test "x$cf_cv_use_libssl"  != xno ; then
 elif test "x$cf_cv_use_libgnutls" != xno ; then
     if test "x$cf_cv_gnutls_compat" = xno ; then
         CF_GNUTLS($cf_cv_use_libgnutls,tidy_tls\$o)
+		AC_CHECK_FUNCS(gnutls_priority_set_direct)
     else
         CF_GNUTLS($cf_cv_use_libgnutls)
     fi
@@ -731,6 +732,7 @@ AC_HEADER_DIRENT
 dnl Don't check for sys/wait.h here since it is covered by another test.
 AC_CHECK_HEADERS( \
 	arpa/inet.h \
+	bsd/random.h \
 	fcntl.h \
 	limits.h \
 	stdlib.h \
diff --git a/src/tidy_tls.c b/src/tidy_tls.c
index 8ca10182..ad4ea37f 100644
--- a/src/tidy_tls.c
+++ b/src/tidy_tls.c
@@ -1,12 +1,13 @@
 /*
- * $LynxId: tidy_tls.c,v 1.6 2010/11/07 21:21:10 tom Exp $
- * Copyright 2008, Thomas E. Dickey
+ * $LynxId: tidy_tls.c,v 1.10 2011/05/11 10:49:57 tom Exp $
+ * Copyright 2008-2011,2011 Thomas E. Dickey
  * with fix Copyright 2008 by Thomas Viehmann
  *
  * Required libraries:
  *	libgnutls
  *	libcrypt
  */
+#include <HTUtils.h>
 #include <tidy_tls.h>
 
 #include <gnutls/x509.h>
@@ -14,6 +15,12 @@
 #include <libtasn1.h>		/* ASN1_SUCCESS,etc */
 #include <string.h>
 
+#ifdef HAVE_GNUTLS_PRIORITY_SET_DIRECT
+#define USE_SET_DIRECT 1
+#else
+#define USE_SET_DIRECT 0
+#endif
+
 #define typeCalloc(type) (type *) calloc(1, sizeof(type))
 
 static int last_error = 0;
@@ -249,6 +256,116 @@ void SSL_CTX_set_verify(SSL_CTX * ctx, int verify_mode,
     ctx->verify_callback = verify_callback;
 }
 
+#if USE_SET_DIRECT
+/*
+ * Functions such as this are normally part of an API; lack of planning makes
+ * these necessary in application code.
+ */
+#define IdsToString(type, func, ids) \
+	char *result = 0; \
+	size_t need = 8 + strlen(type); \
+	const char *name; \
+	int pass; \
+	int n; \
+	for (pass = 0; pass < 2; ++pass) { \
+	    for (n = 0; n < GNUTLS_MAX_ALGORITHM_NUM; ++n) { \
+		name = 0; \
+		if (ids[n] == 0) \
+		    break; \
+		if ((name = func(ids[n])) != 0) { \
+		    if (pass) { \
+			sprintf(result + strlen(result), ":+%s%s", type, name); \
+		    } else { \
+			need += 4 + strlen(type) + strlen(name); \
+		    } \
+		} \
+	    } \
+	    if (!pass) { \
+		result = malloc(need); \
+		if (!result) \
+		    break; \
+		result[0] = '\0'; \
+	    } \
+	} \
+	CTRACE((tfp, "->%s\n", result)); \
+	return result
+
+/*
+ * Given an array of compression id's, convert to string for GNUTLS.
+ */
+static char *StringOfCIPHER(int *id_ptr)
+{
+    IdsToString("", gnutls_cipher_get_name, id_ptr);
+}
+
+/*
+ * Given an array of compression id's, convert to string for GNUTLS.
+ */
+static char *StringOfCOMP(int *id_ptr)
+{
+    IdsToString("COMP-", gnutls_compression_get_name, id_ptr);
+}
+
+/*
+ * Given an array of key-exchange id's, convert to string for GNUTLS.
+ */
+static char *StringOfKX(int *id_ptr)
+{
+    IdsToString("", gnutls_kx_get_name, id_ptr);
+}
+
+/*
+ * Given an array of MAC algorithm id's, convert to string for GNUTLS.
+ */
+static char *StringOfMAC(int *id_ptr)
+{
+    IdsToString("", gnutls_mac_get_name, id_ptr);
+}
+
+/*
+ * Given an array of protocol id's, convert to string for GNUTLS.
+ */
+static char *StringOfVERS(int *vers_ptr)
+{
+    IdsToString("VERS-", gnutls_protocol_get_name, vers_ptr);
+}
+
+static void UpdatePriority(SSL * ssl)
+{
+    SSL_METHOD *method = ssl->ctx->method;
+    char *complete = 0;
+    char *pnames;
+    const char *err_pos = 0;
+    int code;
+
+    StrAllocCopy(complete, "NONE");
+    if ((pnames = StringOfVERS(method->priority.protocol)) != 0) {
+	StrAllocCat(complete, pnames);
+	free(pnames);
+    }
+    if ((pnames = StringOfCIPHER(method->priority.encrypts)) != 0) {
+	StrAllocCat(complete, pnames);
+	free(pnames);
+    }
+    if ((pnames = StringOfCOMP(method->priority.compress)) != 0) {
+	StrAllocCat(complete, pnames);
+	free(pnames);
+    }
+    if ((pnames = StringOfKX(method->priority.key_xchg)) != 0) {
+	StrAllocCat(complete, pnames);
+	free(pnames);
+    }
+    if ((pnames = StringOfMAC(method->priority.msg_code)) != 0) {
+	StrAllocCat(complete, pnames);
+	free(pnames);
+    }
+    CTRACE((tfp, "set priorities %s\n", complete));
+    code = gnutls_priority_set_direct(ssl->gnutls_state, complete, &err_pos);
+    CTRACE((tfp, "CHECK %d:%s\n", code, NonNull(err_pos)));
+    FREE(complete);
+}
+#endif /* USE_SET_DIRECT */
+
 static void RemoveProtocol(SSL * ssl, int protocol)
 {
     int j, k;
@@ -266,7 +383,12 @@ static void RemoveProtocol(SSL * ssl, int protocol)
     }
 
     if (changed) {
+#if USE_SET_DIRECT
+	CTRACE((tfp, "RemoveProtocol\n"));
+	UpdatePriority(ssl);
+#else
 	gnutls_protocol_set_priority(ssl->gnutls_state, protocols);
+#endif
     }
 }
 
@@ -341,15 +463,16 @@ SSL_CIPHER *SSL_get_current_cipher(SSL * ssl)
 /*
  * Get the X509 certificate of the peer.
  */
-X509 *SSL_get_peer_certificate(SSL * ssl)
+const X509 *SSL_get_peer_certificate(SSL * ssl)
 {
-    gnutls_datum_t *result;
+    const gnutls_datum_t *result;
     unsigned list_size = 0;
 
-    result = (gnutls_datum_t *) gnutls_certificate_get_peers(ssl->gnutls_state,
-							     &list_size);
+    result =
+	(const gnutls_datum_t *) gnutls_certificate_get_peers(ssl->gnutls_state,
+							      &list_size);
 
-    return (X509 *) result;
+    return (const X509 *) result;
 }
 
 /*
@@ -385,9 +508,13 @@ SSL *SSL_new(SSL_CTX * ctx)
 	    free(ssl);
 	    ssl = 0;
 	} else {
+	    ssl->ctx = ctx;
 
 	    gnutls_init(&ssl->gnutls_state, ctx->method->connend);
 
+#if USE_SET_DIRECT
+	    UpdatePriority(ssl);
+#else
 	    gnutls_protocol_set_priority(ssl->gnutls_state,
 					 ctx->method->priority.protocol);
 	    gnutls_cipher_set_priority(ssl->gnutls_state,
@@ -398,6 +525,7 @@ SSL *SSL_new(SSL_CTX * ctx)
 				   ctx->method->priority.key_xchg);
 	    gnutls_mac_set_priority(ssl->gnutls_state,
 				    ctx->method->priority.msg_code);
+#endif
 
 	    gnutls_credentials_set(ssl->gnutls_state, GNUTLS_CRD_CERTIFICATE,
 				   ssl->gnutls_cred);
@@ -410,7 +538,6 @@ SSL *SSL_new(SSL_CTX * ctx)
 						     ctx->certfile,
 						     ctx->keyfile,
 						     ctx->keyfile_type);
-	    ssl->ctx = ctx;
 	    ssl->verify_mode = ctx->verify_mode;
 	    ssl->verify_callback = ctx->verify_callback;