about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--CHANGES5
-rw-r--r--aclocal.m48
-rw-r--r--config.hin17
-rwxr-xr-xconfigure2402
-rw-r--r--samples/home.htm3
-rw-r--r--samples/jumps.htm1
-rw-r--r--samples/jumpsUnix.html1
-rw-r--r--samples/jumpsVMS.html1
-rw-r--r--samples/lynx_bookmarks.htm1
-rw-r--r--test/ALT88592.html1
-rw-r--r--test/ISO_LATIN1_test.html1
-rw-r--r--test/TestComment.html1
-rw-r--r--test/bad-html.html1
-rw-r--r--test/c1.html1
-rw-r--r--test/circle.html1
-rw-r--r--test/cp-1252.html1
-rw-r--r--test/cp-1252a.html1
-rw-r--r--test/idna-tr46.html1
-rw-r--r--test/iso-8859-1.html1
-rw-r--r--test/iso-8859-1a.html1
-rw-r--r--test/iso-8859-2.html1
-rw-r--r--test/iso-8859-2a.html1
-rw-r--r--test/koi8-r.html1
-rw-r--r--test/quickbrown.html1
-rw-r--r--test/raw8bit.html1
-rw-r--r--test/sgml.html1
-rw-r--r--test/spaces.html1
-rw-r--r--test/special_urls.html1
-rw-r--r--test/square.html1
-rw-r--r--test/tabtest.html1
-rw-r--r--test/tags.html1
-rw-r--r--test/test-styles.html1
-rw-r--r--test/triangle.html1
-rw-r--r--test/unicode.html1
-rw-r--r--test/utf-8-demo.html1
35 files changed, 1249 insertions, 1216 deletions
diff --git a/CHANGES b/CHANGES
index 45b7610c..2ef87bcb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,10 +1,11 @@
--- $LynxId: CHANGES,v 1.1130 2023/01/24 09:24:00 tom Exp $
+-- $LynxId: CHANGES,v 1.1132 2023/02/17 22:10:26 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
-2023-01-24 (2.9.0dev.13)
+2023-02-17 (2.9.0dev.13)
 * modify configure script to reduce implicit-function warnings -TD
+* add viewport meta-tag to documentation/test files -TD
 
 2023-01-08 (2.9.0dev.12)
 * add a rewind() call before reading existing bookmark file opened for append
diff --git a/aclocal.m4 b/aclocal.m4
index 4132f54d..93365b73 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $LynxId: aclocal.m4,v 1.321 2023/01/24 09:23:33 tom Exp $
+dnl $LynxId: aclocal.m4,v 1.322 2023/02/16 09:03:26 tom Exp $
 dnl Macros for auto-configure script.
 dnl by Thomas E. Dickey <dickey@invisible-island.net>
 dnl and Jim Spath <jspath@mail.bcpl.lib.md.us>
@@ -6065,7 +6065,7 @@ AC_MSG_RESULT($cf_use_socks5p_h)
 test "$cf_use_socks5p_h" = yes && AC_DEFINE(INCLUDE_PROTOTYPES,1,[Define to 1 if needed to declare prototypes in socks headers])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_SRAND version: 17 updated: 2022/12/02 19:55:38
+dnl CF_SRAND version: 18 updated: 2023/02/15 19:14:44
 dnl --------
 dnl Check for functions similar to srand() and rand().  lrand48() and random()
 dnl return a 31-bit value, while rand() returns a value less than RAND_MAX
@@ -6111,9 +6111,7 @@ if test "$cf_cv_srand_func" != unknown ; then
 			;;
 		esac
 		AC_TRY_COMPILE([
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
+$ac_includes_default
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #endif
diff --git a/config.hin b/config.hin
index d59f34e3..62e520f4 100644
--- a/config.hin
+++ b/config.hin
@@ -1,5 +1,5 @@
 /*
- * $LynxId: config.hin,v 1.152 2021/07/29 23:16:41 tom Exp $
+ * $LynxId: config.hin,v 1.153 2023/02/16 09:09:51 tom Exp $
  * vile:cmode
  *
  * The configure script translates "config.hin" into "lynx_cfg.h"
@@ -90,7 +90,7 @@
 #undef HAVE_H_ERRNO
 #undef HAVE_ICONV		/* AM_ICONV */
 #undef HAVE_INET_ATON		/* CF_INET_ADDR */
-#undef HAVE_INTTYPES_H
+#undef HAVE_INTTYPES_H		/* AC_CHECK_DECL(exit) */
 #undef HAVE_JCURSES_H
 #undef HAVE_KEYPAD
 #undef HAVE_LANGINFO_CODESET	/* AM_LANGINFO_CODESET */
@@ -106,6 +106,7 @@
 #undef HAVE_LSTAT		/* CF_FUNC_LSTAT */
 #undef HAVE_MALLOC_H		/* AM_GNU_GETTEXT */
 #undef HAVE_MBSTATE_T		/* CF_WIDEC_CURSES */
+#undef HAVE_MEMORY_H		/* AC_CHECK_DECL(exit) */
 #undef HAVE_MKDTEMP
 #undef HAVE_MKTEMP
 #undef HAVE_MKTIME		/* AC_REPLACE_FUNCS(mktime) */
@@ -133,13 +134,15 @@
 #undef HAVE_SIZECHANGE		/* CF_SIZECHANGE */
 #undef HAVE_SLEEP
 #undef HAVE_STDARG_H		/* CF_VARARGS */
-#undef HAVE_STDLIB_H
+#undef HAVE_STDINT_H		/* AC_CHECK_DECL(exit) */
+#undef HAVE_STDLIB_H		/* AC_CHECK_DECL(exit) */
 #undef HAVE_STDNORETURN_H	/* CF_C11_NORETURN */
 #undef HAVE_STPCPY		/* AM_GNU_GETTEXT */
 #undef HAVE_STRCASECMP		/* AM_GNU_GETTEXT */
 #undef HAVE_STRCHR		/* AM_GNU_GETTEXT */
 #undef HAVE_STRERROR
-#undef HAVE_STRING_H
+#undef HAVE_STRINGS_H		/* AC_CHECK_DECL(exit) */
+#undef HAVE_STRING_H		/* AC_CHECK_DECL(exit) */
 #undef HAVE_STRUCT_DIRENT64	/* CF_LARGEFILE */
 #undef HAVE_SYSLOG_H
 #undef HAVE_SYSV_TOUCHLINE	/* CF_CURS_TOUCHLINE */
@@ -149,8 +152,10 @@
 #undef HAVE_SYS_IOCTL_H		/* have <sys/ioctl.h> */
 #undef HAVE_SYS_NDIR_H		/* AC_HEADER_DIRENT */
 #undef HAVE_SYS_PARAM_H		/* AM_GNU_GETTEXT */
+#undef HAVE_SYS_STAT_H		/* AC_CHECK_DECL(exit) */
 #undef HAVE_SYS_TIMEB_H		/* have <sys/timeb.h> */
 #undef HAVE_SYS_TIME_H		/* have <sys/time.h> */
+#undef HAVE_SYS_TYPES_H		/* AC_CHECK_DECL(exit) */
 #undef HAVE_SYS_WAIT_H		/* have <sys/wait.h> */
 #undef HAVE_TERMIOS_H		/* have <termios.h> */
 #undef HAVE_TERMIO_H		/* have <termio.h> */
@@ -162,7 +167,7 @@
 #undef HAVE_TTYTYPE
 #undef HAVE_TYPE_CHTYPE		/* CF_CURSES_CHTYPE */
 #undef HAVE_TYPE_UNIONWAIT	/* CF_UNION_WAIT */
-#undef HAVE_UNISTD_H		/* have <unistd.h> */
+#undef HAVE_UNISTD_H		/* AC_CHECK_DECL(exit) */
 #undef HAVE_UNSETENV
 #undef HAVE_USE_DEFAULT_COLORS	/* ncurses extension */
 #undef HAVE_USE_LEGACY_CODING	/* ncurses extension */
@@ -244,7 +249,7 @@
 #undef SLsmg_Color_Type		/* CF_SLANG_UNIX_DEFS */
 #undef SLtt_Char_Type		/* CF_SLANG_UNIX_DEFS */
 #undef SOCKS			/* CF_SOCKS, CF_SOCKS5 */
-#undef STDC_HEADERS
+#undef STDC_HEADERS		/* AC_CHECK_DECL(exit) */
 #undef STDC_NORETURN		/* CF_C11_NORETURN */
 #undef SYSTEM_MAIL		/* CF_DEFINE_PROG */
 #undef SYSTEM_MAIL_FLAGS	/* CF_SYSTEM_MAIL_FLAGS */
diff --git a/configure b/configure
index 76dd0844..b5a7c057 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in 2.9.0dev.12.
+# From configure.in 2.9.0dev.13.
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20230114.
 #
@@ -35088,9 +35088,7 @@ else
 #line 35088 "configure"
 #include "confdefs.h"
 
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
+$ac_includes_default
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #endif
@@ -35104,16 +35102,16 @@ long x = $cf_cv_rand_max; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35107: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35105: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35110: \$? = $ac_status" >&5
+  echo "$as_me:35108: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35113: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35111: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35116: \$? = $ac_status" >&5
+  echo "$as_me:35114: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -35124,15 +35122,15 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:35127: result: $cf_cv_rand_max" >&5
+echo "$as_me:35125: result: $cf_cv_rand_max" >&5
 echo "${ECHO_T}$cf_cv_rand_max" >&6
 
 	case "$cf_cv_srand_func" in
 	(*/arc4random)
-		echo "$as_me:35132: checking if <bsd/stdlib.h> should be included" >&5
+		echo "$as_me:35130: checking if <bsd/stdlib.h> should be included" >&5
 echo $ECHO_N "checking if <bsd/stdlib.h> should be included... $ECHO_C" >&6
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 35135 "configure"
+#line 35133 "configure"
 #include "confdefs.h"
 #include <bsd/stdlib.h>
 int
@@ -35145,23 +35143,23 @@ void *arc4random(int);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35148: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35146: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35151: \$? = $ac_status" >&5
+  echo "$as_me:35149: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35154: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35152: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35157: \$? = $ac_status" >&5
+  echo "$as_me:35155: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_bsd_stdlib_h=no
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 35164 "configure"
+#line 35162 "configure"
 #include "confdefs.h"
 #include <bsd/stdlib.h>
 int
@@ -35173,16 +35171,16 @@ unsigned x = arc4random(); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35176: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35174: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35179: \$? = $ac_status" >&5
+  echo "$as_me:35177: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35182: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35180: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35185: \$? = $ac_status" >&5
+  echo "$as_me:35183: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_bsd_stdlib_h=yes
 else
@@ -35193,7 +35191,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	    echo "$as_me:35196: result: $cf_bsd_stdlib_h" >&5
+	    echo "$as_me:35194: result: $cf_bsd_stdlib_h" >&5
 echo "${ECHO_T}$cf_bsd_stdlib_h" >&6
 		if test "$cf_bsd_stdlib_h" = yes
 		then
@@ -35203,10 +35201,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 		else
-			echo "$as_me:35206: checking if <bsd/random.h> should be included" >&5
+			echo "$as_me:35204: checking if <bsd/random.h> should be included" >&5
 echo $ECHO_N "checking if <bsd/random.h> should be included... $ECHO_C" >&6
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 35209 "configure"
+#line 35207 "configure"
 #include "confdefs.h"
 #include <bsd/random.h>
 int
@@ -35219,23 +35217,23 @@ void *arc4random(int);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35222: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35220: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35225: \$? = $ac_status" >&5
+  echo "$as_me:35223: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35228: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35226: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35231: \$? = $ac_status" >&5
+  echo "$as_me:35229: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_bsd_random_h=no
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 35238 "configure"
+#line 35236 "configure"
 #include "confdefs.h"
 #include <bsd/random.h>
 int
@@ -35247,16 +35245,16 @@ unsigned x = arc4random(); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35250: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35248: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35253: \$? = $ac_status" >&5
+  echo "$as_me:35251: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35256: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35254: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35259: \$? = $ac_status" >&5
+  echo "$as_me:35257: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_bsd_random_h=yes
 else
@@ -35267,7 +35265,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-			echo "$as_me:35270: result: $cf_bsd_random_h" >&5
+			echo "$as_me:35268: result: $cf_bsd_random_h" >&5
 echo "${ECHO_T}$cf_bsd_random_h" >&6
 			if test "$cf_bsd_random_h" = yes
 			then
@@ -35277,7 +35275,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 			else
-				{ echo "$as_me:35280: WARNING: no header file found for arc4random" >&5
+				{ echo "$as_me:35278: WARNING: no header file found for arc4random" >&5
 echo "$as_me: WARNING: no header file found for arc4random" >&2;}
 			fi
 		fi
@@ -35312,13 +35310,13 @@ fi
 for ac_func in sleep
 do
 
-echo "$as_me:35315: checking for $ac_func declaration" >&5
+echo "$as_me:35313: 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 35321 "configure"
+#line 35319 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -35341,20 +35339,20 @@ extern	int	$ac_func(void);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35344: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35342: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35347: \$? = $ac_status" >&5
+  echo "$as_me:35345: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35350: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35348: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35353: \$? = $ac_status" >&5
+  echo "$as_me:35351: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 35357 "configure"
+#line 35355 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -35375,16 +35373,16 @@ int	(*p)(struct cf_check_funcdecl*) = $ac_func;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35378: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35376: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35381: \$? = $ac_status" >&5
+  echo "$as_me:35379: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35384: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35382: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35387: \$? = $ac_status" >&5
+  echo "$as_me:35385: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -35405,11 +35403,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:35408: result: yes" >&5
+  echo "$as_me:35406: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:35412: result: no" >&5
+  echo "$as_me:35410: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -35424,13 +35422,13 @@ done
 for ac_func in strstr
 do
 
-echo "$as_me:35427: checking for $ac_func declaration" >&5
+echo "$as_me:35425: 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 35433 "configure"
+#line 35431 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -35446,20 +35444,20 @@ extern	int	$ac_func(void);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35449: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35447: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35452: \$? = $ac_status" >&5
+  echo "$as_me:35450: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35455: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35453: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35458: \$? = $ac_status" >&5
+  echo "$as_me:35456: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 35462 "configure"
+#line 35460 "configure"
 #include "confdefs.h"
 #include <string.h>
 int
@@ -35473,16 +35471,16 @@ int	(*p)(struct cf_check_funcdecl*) = $ac_func;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35476: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35474: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35479: \$? = $ac_status" >&5
+  echo "$as_me:35477: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35482: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35480: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35485: \$? = $ac_status" >&5
+  echo "$as_me:35483: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -35503,11 +35501,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:35506: result: yes" >&5
+  echo "$as_me:35504: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:35510: result: no" >&5
+  echo "$as_me:35508: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -35522,13 +35520,13 @@ done
 for ac_func in getgrgid getgrnam
 do
 
-echo "$as_me:35525: checking for $ac_func declaration" >&5
+echo "$as_me:35523: 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 35531 "configure"
+#line 35529 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -35546,20 +35544,20 @@ extern	int	$ac_func(void);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35549: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35547: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35552: \$? = $ac_status" >&5
+  echo "$as_me:35550: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35555: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35553: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35558: \$? = $ac_status" >&5
+  echo "$as_me:35556: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 35562 "configure"
+#line 35560 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -35575,16 +35573,16 @@ int	(*p)(struct cf_check_funcdecl*) = $ac_func;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35578: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35576: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35581: \$? = $ac_status" >&5
+  echo "$as_me:35579: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35584: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35582: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35587: \$? = $ac_status" >&5
+  echo "$as_me:35585: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -35605,11 +35603,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:35608: result: yes" >&5
+  echo "$as_me:35606: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:35612: result: no" >&5
+  echo "$as_me:35610: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -35621,14 +35619,14 @@ EOF
 fi
 done
 
-echo "$as_me:35624: checking if TRUE/FALSE are defined" >&5
+echo "$as_me:35622: 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 35631 "configure"
+#line 35629 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -35642,16 +35640,16 @@ int x = TRUE, y = FALSE
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35645: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35643: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35648: \$? = $ac_status" >&5
+  echo "$as_me:35646: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35651: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35649: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35654: \$? = $ac_status" >&5
+  echo "$as_me:35652: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_bool_defs=yes
 else
@@ -35662,7 +35660,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:35665: result: $cf_cv_bool_defs" >&5
+echo "$as_me:35663: result: $cf_cv_bool_defs" >&5
 echo "${ECHO_T}$cf_cv_bool_defs" >&6
 if test "$cf_cv_bool_defs" = no ; then
 
@@ -35676,14 +35674,14 @@ EOF
 
 fi
 
-echo "$as_me:35679: checking if external errno is declared" >&5
+echo "$as_me:35677: 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 35686 "configure"
+#line 35684 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -35701,16 +35699,16 @@ int x = (int) errno; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35704: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35702: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35707: \$? = $ac_status" >&5
+  echo "$as_me:35705: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35710: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35708: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35713: \$? = $ac_status" >&5
+  echo "$as_me:35711: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -35721,7 +35719,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:35724: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:35722: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -35736,14 +35734,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:35739: checking if external errno exists" >&5
+echo "$as_me:35737: 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 35746 "configure"
+#line 35744 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -35758,16 +35756,16 @@ errno = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:35761: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35759: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35764: \$? = $ac_status" >&5
+  echo "$as_me:35762: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:35767: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35765: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35770: \$? = $ac_status" >&5
+  echo "$as_me:35768: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_errno=yes
 else
@@ -35778,7 +35776,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:35781: result: $cf_cv_have_errno" >&5
+echo "$as_me:35779: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -35791,7 +35789,7 @@ EOF
 
 fi
 
-echo "$as_me:35794: checking if we can set errno" >&5
+echo "$as_me:35792: 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
@@ -35799,7 +35797,7 @@ else
 
 if test "$cross_compiling" = yes; then
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 35802 "configure"
+#line 35800 "configure"
 #include "confdefs.h"
 #include <errno.h>
 int
@@ -35811,16 +35809,16 @@ errno = 255
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:35814: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35812: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35817: \$? = $ac_status" >&5
+  echo "$as_me:35815: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:35820: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35818: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35823: \$? = $ac_status" >&5
+  echo "$as_me:35821: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_set_errno=maybe
 else
@@ -35831,7 +35829,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 35834 "configure"
+#line 35832 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -35845,15 +35843,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:35848: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35846: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35851: \$? = $ac_status" >&5
+  echo "$as_me:35849: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:35853: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35851: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35856: \$? = $ac_status" >&5
+  echo "$as_me:35854: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_set_errno=yes
 else
@@ -35866,21 +35864,21 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:35869: result: $cf_cv_set_errno" >&5
+echo "$as_me:35867: 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:35876: checking for setlocale()" >&5
+echo "$as_me:35874: 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 35883 "configure"
+#line 35881 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -35894,16 +35892,16 @@ setlocale(LC_ALL, "")
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:35897: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35895: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35900: \$? = $ac_status" >&5
+  echo "$as_me:35898: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:35903: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35901: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35906: \$? = $ac_status" >&5
+  echo "$as_me:35904: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_locale=yes
 else
@@ -35915,7 +35913,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:35918: result: $cf_cv_locale" >&5
+echo "$as_me:35916: result: $cf_cv_locale" >&5
 echo "${ECHO_T}$cf_cv_locale" >&6
 test "$cf_cv_locale" = yes && {
 cat >>confdefs.h <<\EOF
@@ -35923,14 +35921,14 @@ cat >>confdefs.h <<\EOF
 EOF
  }
 
-echo "$as_me:35926: checking if NGROUPS is defined" >&5
+echo "$as_me:35924: 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 35933 "configure"
+#line 35931 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -35949,23 +35947,23 @@ int x = NGROUPS
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35952: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35950: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35955: \$? = $ac_status" >&5
+  echo "$as_me:35953: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35958: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35956: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35961: \$? = $ac_status" >&5
+  echo "$as_me:35959: \$? = $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 35968 "configure"
+#line 35966 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -35984,16 +35982,16 @@ int x = NGROUPS_MAX
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35987: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35985: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35990: \$? = $ac_status" >&5
+  echo "$as_me:35988: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35993: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35991: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35996: \$? = $ac_status" >&5
+  echo "$as_me:35994: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ngroups=NGROUPS_MAX
 else
@@ -36005,7 +36003,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:36008: result: $cf_cv_ngroups" >&5
+echo "$as_me:36006: result: $cf_cv_ngroups" >&5
 echo "${ECHO_T}$cf_cv_ngroups" >&6
 
 fi
@@ -36026,13 +36024,13 @@ fi
 for ac_func in strerror
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:36029: checking for $ac_func" >&5
+echo "$as_me:36027: 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 36035 "configure"
+#line 36033 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -36063,16 +36061,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:36066: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36064: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36069: \$? = $ac_status" >&5
+  echo "$as_me:36067: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:36072: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36070: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36075: \$? = $ac_status" >&5
+  echo "$as_me:36073: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -36082,7 +36080,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:36085: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:36083: 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
@@ -36091,14 +36089,14 @@ EOF
 
 else
 
-echo "$as_me:36094: checking if external sys_nerr is declared" >&5
+echo "$as_me:36092: 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 36101 "configure"
+#line 36099 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -36116,16 +36114,16 @@ int x = (int) sys_nerr; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36119: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36117: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36122: \$? = $ac_status" >&5
+  echo "$as_me:36120: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36125: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36123: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36128: \$? = $ac_status" >&5
+  echo "$as_me:36126: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_sys_nerr=yes
 else
@@ -36136,7 +36134,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:36139: result: $cf_cv_dcl_sys_nerr" >&5
+echo "$as_me:36137: 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
@@ -36151,14 +36149,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:36154: checking if external sys_nerr exists" >&5
+echo "$as_me:36152: 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 36161 "configure"
+#line 36159 "configure"
 #include "confdefs.h"
 
 #undef sys_nerr
@@ -36173,16 +36171,16 @@ sys_nerr = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:36176: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36174: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36179: \$? = $ac_status" >&5
+  echo "$as_me:36177: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:36182: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36180: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36185: \$? = $ac_status" >&5
+  echo "$as_me:36183: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_sys_nerr=yes
 else
@@ -36193,7 +36191,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:36196: result: $cf_cv_have_sys_nerr" >&5
+echo "$as_me:36194: 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
@@ -36206,14 +36204,14 @@ EOF
 
 fi
 
-echo "$as_me:36209: checking if external sys_errlist is declared" >&5
+echo "$as_me:36207: 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 36216 "configure"
+#line 36214 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -36231,16 +36229,16 @@ int x = (int) sys_errlist; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36234: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36232: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36237: \$? = $ac_status" >&5
+  echo "$as_me:36235: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36240: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36238: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36243: \$? = $ac_status" >&5
+  echo "$as_me:36241: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_sys_errlist=yes
 else
@@ -36251,7 +36249,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:36254: result: $cf_cv_dcl_sys_errlist" >&5
+echo "$as_me:36252: 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
@@ -36266,14 +36264,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:36269: checking if external sys_errlist exists" >&5
+echo "$as_me:36267: 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 36276 "configure"
+#line 36274 "configure"
 #include "confdefs.h"
 
 #undef sys_errlist
@@ -36288,16 +36286,16 @@ sys_errlist = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:36291: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36289: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36294: \$? = $ac_status" >&5
+  echo "$as_me:36292: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:36297: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36295: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36300: \$? = $ac_status" >&5
+  echo "$as_me:36298: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_sys_errlist=yes
 else
@@ -36308,7 +36306,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:36311: result: $cf_cv_have_sys_errlist" >&5
+echo "$as_me:36309: 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
@@ -36327,23 +36325,23 @@ done
 for ac_header in lastlog.h paths.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:36330: checking for $ac_header" >&5
+echo "$as_me:36328: 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 36336 "configure"
+#line 36334 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:36340: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:36338: \"$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:36346: \$? = $ac_status" >&5
+  echo "$as_me:36344: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -36362,7 +36360,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:36365: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:36363: 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
@@ -36372,14 +36370,14 @@ EOF
 fi
 done
 
-echo "$as_me:36375: checking for lastlog path" >&5
+echo "$as_me:36373: 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 36382 "configure"
+#line 36380 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -36399,16 +36397,16 @@ char *path = _PATH_LASTLOG; (void)path
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36402: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36400: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36405: \$? = $ac_status" >&5
+  echo "$as_me:36403: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36408: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36406: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36411: \$? = $ac_status" >&5
+  echo "$as_me:36409: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_path_lastlog="_PATH_LASTLOG"
 else
@@ -36423,14 +36421,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:36426: result: $cf_cv_path_lastlog" >&5
+echo "$as_me:36424: 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:36433: checking for utmp implementation" >&5
+echo "$as_me:36431: 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
@@ -36447,7 +36445,7 @@ cf_utmp_includes="
 #endif
 "
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 36450 "configure"
+#line 36448 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -36463,16 +36461,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36466: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36464: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36469: \$? = $ac_status" >&5
+  echo "$as_me:36467: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36472: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36470: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36475: \$? = $ac_status" >&5
+  echo "$as_me:36473: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -36481,7 +36479,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 36484 "configure"
+#line 36482 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -36497,16 +36495,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36500: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36498: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36503: \$? = $ac_status" >&5
+  echo "$as_me:36501: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36506: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36504: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36509: \$? = $ac_status" >&5
+  echo "$as_me:36507: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -36521,7 +36519,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:36524: result: $cf_cv_have_utmp" >&5
+echo "$as_me:36522: result: $cf_cv_have_utmp" >&5
 echo "${ECHO_T}$cf_cv_have_utmp" >&6
 
 if test "$cf_cv_have_utmp" != no ; then
@@ -36536,14 +36534,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:36539: checking if ${cf_cv_have_utmp}.ut_host is declared" >&5
+echo "$as_me:36537: 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 36546 "configure"
+#line 36544 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -36560,16 +36558,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36563: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36561: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36566: \$? = $ac_status" >&5
+  echo "$as_me:36564: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36569: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36567: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36572: \$? = $ac_status" >&5
+  echo "$as_me:36570: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_host=yes
 else
@@ -36581,7 +36579,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:36584: result: $cf_cv_have_utmp_ut_host" >&5
+echo "$as_me:36582: 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
@@ -36591,14 +36589,14 @@ EOF
 fi
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:36594: checking if ${cf_cv_have_utmp}.ut_syslen is declared" >&5
+echo "$as_me:36592: 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 36601 "configure"
+#line 36599 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -36615,16 +36613,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36618: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36616: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36621: \$? = $ac_status" >&5
+  echo "$as_me:36619: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36624: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36622: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36627: \$? = $ac_status" >&5
+  echo "$as_me:36625: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_syslen=yes
 else
@@ -36636,7 +36634,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:36639: result: $cf_cv_have_utmp_ut_syslen" >&5
+echo "$as_me:36637: 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
@@ -36646,7 +36644,7 @@ EOF
 fi
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:36649: checking if ${cf_cv_have_utmp}.ut_name is declared" >&5
+echo "$as_me:36647: 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
@@ -36663,7 +36661,7 @@ cf_utmp_includes="
 "
 for cf_header in ut_name ut_user ; do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 36666 "configure"
+#line 36664 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -36679,16 +36677,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36682: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36680: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36685: \$? = $ac_status" >&5
+  echo "$as_me:36683: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36688: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36686: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36691: \$? = $ac_status" >&5
+  echo "$as_me:36689: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_name=$cf_header
 	 break
@@ -36700,12 +36698,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:36703: result: $cf_cv_have_utmp_ut_name" >&5
+echo "$as_me:36701: 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
 (no)
-	{ { echo "$as_me:36708: error: Cannot find declaration for ut.ut_name" >&5
+	{ { echo "$as_me:36706: 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; }; }
 	;;
@@ -36720,7 +36718,7 @@ esac
 fi
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:36723: checking for exit-status in $cf_cv_have_utmp" >&5
+echo "$as_me:36721: 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
@@ -36733,7 +36731,7 @@ for cf_result in \
 	ut_exit.ut_exit
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 36736 "configure"
+#line 36734 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -36750,16 +36748,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36753: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36751: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36756: \$? = $ac_status" >&5
+  echo "$as_me:36754: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36759: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36757: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36762: \$? = $ac_status" >&5
+  echo "$as_me:36760: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_xstatus=$cf_result
 	 break
@@ -36772,7 +36770,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:36775: result: $cf_cv_have_utmp_ut_xstatus" >&5
+echo "$as_me:36773: 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
 
@@ -36788,14 +36786,14 @@ fi
 fi
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:36791: checking if ${cf_cv_have_utmp}.ut_xtime is declared" >&5
+echo "$as_me:36789: 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 36798 "configure"
+#line 36796 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -36812,23 +36810,23 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36815: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36813: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36818: \$? = $ac_status" >&5
+  echo "$as_me:36816: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36821: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36819: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36824: \$? = $ac_status" >&5
+  echo "$as_me:36822: \$? = $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 36831 "configure"
+#line 36829 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -36845,16 +36843,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36848: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36846: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36851: \$? = $ac_status" >&5
+  echo "$as_me:36849: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36854: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36852: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36857: \$? = $ac_status" >&5
+  echo "$as_me:36855: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_xtime=define
 else
@@ -36868,7 +36866,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:36871: result: $cf_cv_have_utmp_ut_xtime" >&5
+echo "$as_me:36869: 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
 
@@ -36887,14 +36885,14 @@ fi
 fi
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:36890: checking if ${cf_cv_have_utmp}.ut_session is declared" >&5
+echo "$as_me:36888: 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 36897 "configure"
+#line 36895 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -36911,16 +36909,16 @@ static struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36914: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36912: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36917: \$? = $ac_status" >&5
+  echo "$as_me:36915: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36920: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36918: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36923: \$? = $ac_status" >&5
+  echo "$as_me:36921: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_session=yes
 else
@@ -36931,7 +36929,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:36934: result: $cf_cv_have_utmp_ut_session" >&5
+echo "$as_me:36932: 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
 
@@ -36942,7 +36940,7 @@ EOF
 fi
 fi
 
-echo "$as_me:36945: checking if $cf_cv_have_utmp is SYSV flavor" >&5
+echo "$as_me:36943: 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
@@ -36950,7 +36948,7 @@ else
 
 test "$cf_cv_have_utmp" = "utmp" && cf_prefix="ut" || cf_prefix="utx"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 36953 "configure"
+#line 36951 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -36969,16 +36967,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:36972: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36970: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36975: \$? = $ac_status" >&5
+  echo "$as_me:36973: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:36978: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36976: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36981: \$? = $ac_status" >&5
+  echo "$as_me:36979: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sysv_utmp=yes
 else
@@ -36989,7 +36987,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:36992: result: $cf_cv_sysv_utmp" >&5
+echo "$as_me:36990: result: $cf_cv_sysv_utmp" >&5
 echo "${ECHO_T}$cf_cv_sysv_utmp" >&6
 test "$cf_cv_sysv_utmp" = yes &&
 cat >>confdefs.h <<\EOF
@@ -36998,14 +36996,14 @@ EOF
 
 fi
 
-echo "$as_me:37001: checking if external h_errno exists" >&5
+echo "$as_me:36999: 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 37008 "configure"
+#line 37006 "configure"
 #include "confdefs.h"
 
 #undef h_errno
@@ -37020,16 +37018,16 @@ h_errno = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:37023: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37021: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37026: \$? = $ac_status" >&5
+  echo "$as_me:37024: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:37029: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37027: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37032: \$? = $ac_status" >&5
+  echo "$as_me:37030: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_h_errno=yes
 else
@@ -37040,7 +37038,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:37043: result: $cf_cv_have_h_errno" >&5
+echo "$as_me:37041: 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
@@ -37053,7 +37051,7 @@ EOF
 
 fi
 
-echo "$as_me:37056: checking if bibp: URLs should be supported" >&5
+echo "$as_me:37054: 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.
@@ -37070,14 +37068,14 @@ else
 	use_bibp_urls=yes
 
 fi;
-echo "$as_me:37073: result: $use_bibp_urls" >&5
+echo "$as_me:37071: 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:37080: checking if configuration info should be browsable" >&5
+echo "$as_me:37078: 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.
@@ -37094,14 +37092,14 @@ else
 	use_config_info=yes
 
 fi;
-echo "$as_me:37097: result: $use_config_info" >&5
+echo "$as_me:37095: 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:37104: checking if new-style forms-based options screen should be used" >&5
+echo "$as_me:37102: 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.
@@ -37118,14 +37116,14 @@ else
 	use_forms_options=yes
 
 fi;
-echo "$as_me:37121: result: $use_forms_options" >&5
+echo "$as_me:37119: 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:37128: checking if old-style options menu should be used" >&5
+echo "$as_me:37126: 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.
@@ -37142,14 +37140,14 @@ else
 	use_menu_options=yes
 
 fi;
-echo "$as_me:37145: result: $use_menu_options" >&5
+echo "$as_me:37143: 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:37152: checking if sessions code should be used" >&5
+echo "$as_me:37150: 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.
@@ -37166,7 +37164,7 @@ else
 	use_sessions=yes
 
 fi;
-echo "$as_me:37169: result: $use_sessions" >&5
+echo "$as_me:37167: result: $use_sessions" >&5
 echo "${ECHO_T}$use_sessions" >&6
 if test "$use_sessions" != no ; then
 
@@ -37177,7 +37175,7 @@ EOF
 	EXTRA_OBJS="$EXTRA_OBJS LYSession\$o"
 fi
 
-echo "$as_me:37180: checking if session-caching code should be used" >&5
+echo "$as_me:37178: 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.
@@ -37194,7 +37192,7 @@ else
 	use_session_cache=yes
 
 fi;
-echo "$as_me:37197: result: $use_session_cache" >&5
+echo "$as_me:37195: result: $use_session_cache" >&5
 echo "${ECHO_T}$use_session_cache" >&6
 if test "$use_session_cache" != no ; then
 
@@ -37204,7 +37202,7 @@ EOF
 
 fi
 
-echo "$as_me:37207: checking if address-list page should be used" >&5
+echo "$as_me:37205: checking if address-list page should be used" >&5
 echo $ECHO_N "checking if address-list page should be used... $ECHO_C" >&6
 
 # Check whether --enable-addrlist-page or --disable-addrlist-page was given.
@@ -37221,14 +37219,14 @@ else
 	use_addrlist_page=yes
 
 fi;
-echo "$as_me:37224: result: $use_addrlist_page" >&5
+echo "$as_me:37222: result: $use_addrlist_page" >&5
 echo "${ECHO_T}$use_addrlist_page" >&6
 test "$use_addrlist_page" != no &&
 cat >>confdefs.h <<\EOF
 #define USE_ADDRLIST_PAGE 1
 EOF
 
-echo "$as_me:37231: checking if support for CJK should be used" >&5
+echo "$as_me:37229: checking if support for CJK should be used" >&5
 echo $ECHO_N "checking if support for CJK should be used... $ECHO_C" >&6
 
 # Check whether --enable-cjk or --disable-cjk was given.
@@ -37245,7 +37243,7 @@ else
 	use_cjk=yes
 
 fi;
-echo "$as_me:37248: result: $use_cjk" >&5
+echo "$as_me:37246: result: $use_cjk" >&5
 echo "${ECHO_T}$use_cjk" >&6
 test "$use_cjk" != no &&
 cat >>confdefs.h <<\EOF
@@ -37295,7 +37293,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 37298 "configure"
+#line 37296 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -37307,16 +37305,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:37310: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:37308: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:37313: \$? = $ac_status" >&5
+  echo "$as_me:37311: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:37316: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37314: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37319: \$? = $ac_status" >&5
+  echo "$as_me:37317: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -37333,7 +37331,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}:37336: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:37334: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -37379,7 +37377,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 37382 "configure"
+#line 37380 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -37391,16 +37389,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:37394: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:37392: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:37397: \$? = $ac_status" >&5
+  echo "$as_me:37395: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:37400: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37398: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37403: \$? = $ac_status" >&5
+  echo "$as_me:37401: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -37417,7 +37415,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}:37420: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:37418: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -37435,7 +37433,7 @@ echo "${as_me:-configure}:37420: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:37438: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:37436: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -37460,7 +37458,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}:37463: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:37461: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -37489,7 +37487,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}:37492: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:37490: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -37498,7 +37496,7 @@ echo "${as_me:-configure}:37492: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:37501: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:37499: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -37509,7 +37507,7 @@ esac
 
 fi;
 
-  echo "$as_me:37512: checking for iconv" >&5
+  echo "$as_me:37510: 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
@@ -37520,12 +37518,12 @@ else
 cf_cv_header_path_iconv=
 cf_cv_library_path_iconv=
 
-echo "${as_me:-configure}:37523: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:37521: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 37528 "configure"
+#line 37526 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -37544,16 +37542,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:37547: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37545: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37550: \$? = $ac_status" >&5
+  echo "$as_me:37548: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:37553: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37551: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37556: \$? = $ac_status" >&5
+  echo "$as_me:37554: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -37567,7 +37565,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-liconv  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 37570 "configure"
+#line 37568 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -37586,16 +37584,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:37589: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37587: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37592: \$? = $ac_status" >&5
+  echo "$as_me:37590: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:37595: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37593: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37598: \$? = $ac_status" >&5
+  echo "$as_me:37596: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -37612,9 +37610,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for iconv library" 1>&6
 
-echo "${as_me:-configure}:37615: testing find linkage for iconv library ..." 1>&5
+echo "${as_me:-configure}:37613: testing find linkage for iconv library ..." 1>&5
 
-echo "${as_me:-configure}:37617: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:37615: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -37705,7 +37703,7 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d "$cf_cv_header_path_iconv" ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_iconv" 1>&6
 
-echo "${as_me:-configure}:37708: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:37706: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -37713,7 +37711,7 @@ echo "${as_me:-configure}:37708: testing ... testing $cf_cv_header_path_iconv ..
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_iconv"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 37716 "configure"
+#line 37714 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -37732,21 +37730,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:37735: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:37733: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:37738: \$? = $ac_status" >&5
+  echo "$as_me:37736: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:37741: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37739: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37744: \$? = $ac_status" >&5
+  echo "$as_me:37742: \$? = $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}:37749: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:37747: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
 
 				cf_cv_find_linkage_iconv=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -37764,7 +37762,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_iconv" = maybe ; then
 
-echo "${as_me:-configure}:37767: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:37765: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -37839,13 +37837,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}:37842: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:37840: 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 37848 "configure"
+#line 37846 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -37864,21 +37862,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:37867: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37865: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37870: \$? = $ac_status" >&5
+  echo "$as_me:37868: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:37873: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37871: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37876: \$? = $ac_status" >&5
+  echo "$as_me:37874: \$? = $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}:37881: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:37879: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
 
 					cf_cv_find_linkage_iconv=yes
 					cf_cv_library_file_iconv="-liconv"
@@ -37918,7 +37916,7 @@ am_cv_func_iconv="no, consider installing GNU libiconv"
 fi
 
 fi
-echo "$as_me:37921: result: $am_cv_func_iconv" >&5
+echo "$as_me:37919: result: $am_cv_func_iconv" >&5
 echo "${ECHO_T}$am_cv_func_iconv" >&6
 
   if test "$am_cv_func_iconv" = yes; then
@@ -37927,14 +37925,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_ICONV 1
 EOF
 
-    echo "$as_me:37930: checking if the declaration of iconv() needs const." >&5
+    echo "$as_me:37928: 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 37937 "configure"
+#line 37935 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -37959,16 +37957,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:37962: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:37960: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:37965: \$? = $ac_status" >&5
+  echo "$as_me:37963: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:37968: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37966: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37971: \$? = $ac_status" >&5
+  echo "$as_me:37969: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   am_cv_proto_iconv_const=no
 else
@@ -37978,7 +37976,7 @@ am_cv_proto_iconv_const=yes
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:37981: result: $am_cv_proto_iconv_const" >&5
+echo "$as_me:37979: 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
@@ -38023,7 +38021,7 @@ if test -n "$cf_cv_header_path_iconv" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 38026 "configure"
+#line 38024 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -38035,16 +38033,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:38038: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:38036: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:38041: \$? = $ac_status" >&5
+  echo "$as_me:38039: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:38044: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38042: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38047: \$? = $ac_status" >&5
+  echo "$as_me:38045: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -38061,7 +38059,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}:38064: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:38062: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -38100,7 +38098,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}:38103: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:38101: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -38114,7 +38112,7 @@ fi
 if test "x$am_cv_func_iconv" = "xyes"
 then
 
-echo "$as_me:38117: checking if experimental support for Chinese UTF-8 should be used" >&5
+echo "$as_me:38115: checking if experimental support for Chinese UTF-8 should be used" >&5
 echo $ECHO_N "checking if experimental support for Chinese UTF-8 should be used... $ECHO_C" >&6
 
 # Check whether --enable-chinese-utf8 or --disable-chinese-utf8 was given.
@@ -38131,7 +38129,7 @@ else
 	use_cn_utf8=yes
 
 fi;
-echo "$as_me:38134: result: $use_cn_utf8" >&5
+echo "$as_me:38132: result: $use_cn_utf8" >&5
 echo "${ECHO_T}$use_cn_utf8" >&6
 if test "$use_cn_utf8" != no ; then
 
@@ -38142,7 +38140,7 @@ EOF
 	use_cjk_utf8=yes
 fi
 
-echo "$as_me:38145: checking if support for Japanese UTF-8 should be used" >&5
+echo "$as_me:38143: checking if support for Japanese UTF-8 should be used" >&5
 echo $ECHO_N "checking if support for Japanese UTF-8 should be used... $ECHO_C" >&6
 
 # Check whether --enable-japanese-utf8 or --disable-japanese-utf8 was given.
@@ -38159,7 +38157,7 @@ else
 	use_ja_utf8=yes
 
 fi;
-echo "$as_me:38162: result: $use_ja_utf8" >&5
+echo "$as_me:38160: result: $use_ja_utf8" >&5
 echo "${ECHO_T}$use_ja_utf8" >&6
 if test "$use_ja_utf8" != no ; then
 
@@ -38180,11 +38178,11 @@ fi
 else
 	test -n "$verbose" && echo "	skipping CJK features which depend on iconv" 1>&6
 
-echo "${as_me:-configure}:38183: testing skipping CJK features which depend on iconv ..." 1>&5
+echo "${as_me:-configure}:38181: testing skipping CJK features which depend on iconv ..." 1>&5
 
 fi
 
-echo "$as_me:38187: checking if experimental wcwidth/UTF-8 logic should be used" >&5
+echo "$as_me:38185: checking if experimental wcwidth/UTF-8 logic should be used" >&5
 echo $ECHO_N "checking if experimental wcwidth/UTF-8 logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-wcwidth-support or --disable-wcwidth-support was given.
@@ -38201,7 +38199,7 @@ else
 	use_wcwidth=no
 
 fi;
-echo "$as_me:38204: result: $use_wcwidth" >&5
+echo "$as_me:38202: result: $use_wcwidth" >&5
 echo "${ECHO_T}$use_wcwidth" >&6
 test "$use_wcwidth" != no &&
 cat >>confdefs.h <<\EOF
@@ -38216,7 +38214,7 @@ case "$cf_cv_screen" in
 esac
 
 if test "$use_dft_colors" != no ; then
-echo "$as_me:38219: checking if you want to use default-colors" >&5
+echo "$as_me:38217: 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.
@@ -38233,7 +38231,7 @@ else
 	use_dft_colors=no
 
 fi;
-echo "$as_me:38236: result: $use_dft_colors" >&5
+echo "$as_me:38234: result: $use_dft_colors" >&5
 echo "${ECHO_T}$use_dft_colors" >&6
 test "$use_dft_colors" = "yes" &&
 cat >>confdefs.h <<\EOF
@@ -38242,7 +38240,7 @@ EOF
 
 fi
 
-echo "$as_me:38245: checking if experimental keyboard-layout logic should be used" >&5
+echo "$as_me:38243: 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.
@@ -38259,14 +38257,14 @@ else
 	use_kbd_layout=no
 
 fi;
-echo "$as_me:38262: result: $use_kbd_layout" >&5
+echo "$as_me:38260: 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:38269: checking if experimental nested-table logic should be used" >&5
+echo "$as_me:38267: 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.
@@ -38283,14 +38281,14 @@ else
 	use_nested_tables=no
 
 fi;
-echo "$as_me:38286: result: $use_nested_tables" >&5
+echo "$as_me:38284: 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:38293: checking if alternative line-edit bindings should be used" >&5
+echo "$as_me:38291: 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.
@@ -38307,14 +38305,14 @@ else
 	use_alt_bindings=yes
 
 fi;
-echo "$as_me:38310: result: $use_alt_bindings" >&5
+echo "$as_me:38308: result: $use_alt_bindings" >&5
 echo "${ECHO_T}$use_alt_bindings" >&6
 test "$use_alt_bindings" != no &&
 cat >>confdefs.h <<\EOF
 #define USE_ALT_BINDINGS 1
 EOF
 
-echo "$as_me:38317: checking if ascii case-conversion should be used" >&5
+echo "$as_me:38315: 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.
@@ -38331,14 +38329,14 @@ else
 	use_ascii_ctypes=yes
 
 fi;
-echo "$as_me:38334: result: $use_ascii_ctypes" >&5
+echo "$as_me:38332: 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:38341: checking if you want to use extended HTML DTD logic" >&5
+echo "$as_me:38339: 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.
@@ -38355,14 +38353,14 @@ else
 	use_ext_htmldtd=yes
 
 fi;
-echo "$as_me:38358: result: $use_ext_htmldtd" >&5
+echo "$as_me:38356: 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:38365: checking if file-upload logic should be used" >&5
+echo "$as_me:38363: 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.
@@ -38379,14 +38377,14 @@ else
 	use_file_upload=yes
 
 fi;
-echo "$as_me:38382: result: $use_file_upload" >&5
+echo "$as_me:38380: 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:38389: checking if IDNA support should be used" >&5
+echo "$as_me:38387: 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.
@@ -38403,7 +38401,7 @@ else
 	use_idna=yes
 
 fi;
-echo "$as_me:38406: result: $use_idna" >&5
+echo "$as_me:38404: result: $use_idna" >&5
 echo "${ECHO_T}$use_idna" >&6
 
 if test "$use_idna" = yes ; then
@@ -38445,7 +38443,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 38448 "configure"
+#line 38446 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -38457,16 +38455,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:38460: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:38458: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:38463: \$? = $ac_status" >&5
+  echo "$as_me:38461: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:38466: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38464: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38469: \$? = $ac_status" >&5
+  echo "$as_me:38467: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -38483,7 +38481,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}:38486: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:38484: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -38529,7 +38527,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 38532 "configure"
+#line 38530 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -38541,16 +38539,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:38544: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:38542: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:38547: \$? = $ac_status" >&5
+  echo "$as_me:38545: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:38550: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38548: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38553: \$? = $ac_status" >&5
+  echo "$as_me:38551: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -38567,7 +38565,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}:38570: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:38568: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -38585,7 +38583,7 @@ echo "${as_me:-configure}:38570: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:38588: error: cannot find  under $use_idna" >&5
+{ { echo "$as_me:38586: error: cannot find  under $use_idna" >&5
 echo "$as_me: error: cannot find  under $use_idna" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -38610,7 +38608,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}:38613: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:38611: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -38639,7 +38637,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}:38642: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:38640: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -38648,7 +38646,7 @@ echo "${as_me:-configure}:38642: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:38651: error: cannot find  under $use_idna" >&5
+{ { echo "$as_me:38649: error: cannot find  under $use_idna" >&5
 echo "$as_me: error: cannot find  under $use_idna" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -38662,12 +38660,12 @@ esac
 cf_cv_header_path_idn2=
 cf_cv_library_path_idn2=
 
-echo "${as_me:-configure}:38665: testing Starting FIND_LINKAGE(idn2,) ..." 1>&5
+echo "${as_me:-configure}:38663: testing Starting FIND_LINKAGE(idn2,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 38670 "configure"
+#line 38668 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -38686,16 +38684,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:38689: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38687: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38692: \$? = $ac_status" >&5
+  echo "$as_me:38690: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:38695: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38693: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38698: \$? = $ac_status" >&5
+  echo "$as_me:38696: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_idn2=yes
@@ -38709,7 +38707,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lidn2 $LIBICONV $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 38712 "configure"
+#line 38710 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -38728,16 +38726,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:38731: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38729: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38734: \$? = $ac_status" >&5
+  echo "$as_me:38732: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:38737: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38735: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38740: \$? = $ac_status" >&5
+  echo "$as_me:38738: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_idn2=yes
@@ -38754,9 +38752,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for idn2 library" 1>&6
 
-echo "${as_me:-configure}:38757: testing find linkage for idn2 library ..." 1>&5
+echo "${as_me:-configure}:38755: testing find linkage for idn2 library ..." 1>&5
 
-echo "${as_me:-configure}:38759: testing Searching for headers in FIND_LINKAGE(idn2,) ..." 1>&5
+echo "${as_me:-configure}:38757: testing Searching for headers in FIND_LINKAGE(idn2,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -38847,7 +38845,7 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d "$cf_cv_header_path_idn2" ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_idn2" 1>&6
 
-echo "${as_me:-configure}:38850: testing ... testing $cf_cv_header_path_idn2 ..." 1>&5
+echo "${as_me:-configure}:38848: testing ... testing $cf_cv_header_path_idn2 ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -38855,7 +38853,7 @@ echo "${as_me:-configure}:38850: testing ... testing $cf_cv_header_path_idn2 ...
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_idn2"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 38858 "configure"
+#line 38856 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -38874,21 +38872,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:38877: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:38875: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:38880: \$? = $ac_status" >&5
+  echo "$as_me:38878: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:38883: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38881: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38886: \$? = $ac_status" >&5
+  echo "$as_me:38884: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 				test -n "$verbose" && echo "	... found idn2 headers in $cf_cv_header_path_idn2" 1>&6
 
-echo "${as_me:-configure}:38891: testing ... found idn2 headers in $cf_cv_header_path_idn2 ..." 1>&5
+echo "${as_me:-configure}:38889: testing ... found idn2 headers in $cf_cv_header_path_idn2 ..." 1>&5
 
 				cf_cv_find_linkage_idn2=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -38906,7 +38904,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_idn2" = maybe ; then
 
-echo "${as_me:-configure}:38909: testing Searching for idn2 library in FIND_LINKAGE(idn2,) ..." 1>&5
+echo "${as_me:-configure}:38907: testing Searching for idn2 library in FIND_LINKAGE(idn2,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -38981,13 +38979,13 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d "$cf_cv_library_path_idn2" ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_idn2" 1>&6
 
-echo "${as_me:-configure}:38984: testing ... testing $cf_cv_library_path_idn2 ..." 1>&5
+echo "${as_me:-configure}:38982: testing ... testing $cf_cv_library_path_idn2 ..." 1>&5
 
 					CPPFLAGS="$cf_test_CPPFLAGS"
 					LIBS="-lidn2 $LIBICONV $cf_save_LIBS"
 					LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_idn2"
 					cat >"conftest.$ac_ext" <<_ACEOF
-#line 38990 "configure"
+#line 38988 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -39006,21 +39004,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:39009: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39007: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39012: \$? = $ac_status" >&5
+  echo "$as_me:39010: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:39015: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39013: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39018: \$? = $ac_status" >&5
+  echo "$as_me:39016: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 					test -n "$verbose" && echo "	... found idn2 library in $cf_cv_library_path_idn2" 1>&6
 
-echo "${as_me:-configure}:39023: testing ... found idn2 library in $cf_cv_library_path_idn2 ..." 1>&5
+echo "${as_me:-configure}:39021: testing ... found idn2 library in $cf_cv_library_path_idn2 ..." 1>&5
 
 					cf_cv_find_linkage_idn2=yes
 					cf_cv_library_file_idn2="-lidn2"
@@ -39082,7 +39080,7 @@ if test -n "$cf_cv_header_path_idn2" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 39085 "configure"
+#line 39083 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -39094,16 +39092,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:39097: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:39095: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:39100: \$? = $ac_status" >&5
+  echo "$as_me:39098: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:39103: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39101: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39106: \$? = $ac_status" >&5
+  echo "$as_me:39104: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -39120,7 +39118,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}:39123: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:39121: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -39156,7 +39154,7 @@ if test -n "$cf_cv_library_path_idn2" ; 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}:39159: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:39157: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -39183,14 +39181,14 @@ LIBS="$cf_add_libs"
 else
 test -n "$verbose" && echo "	unsuccessful, will try idn (older)" 1>&6
 
-echo "${as_me:-configure}:39186: testing unsuccessful, will try idn (older) ..." 1>&5
+echo "${as_me:-configure}:39184: testing unsuccessful, will try idn (older) ..." 1>&5
 
 fi
 
 if test "x$cf_cv_find_linkage_idn2" = xyes ; then
 	test -n "$verbose" && echo "	found idn2 library" 1>&6
 
-echo "${as_me:-configure}:39193: testing found idn2 library ..." 1>&5
+echo "${as_me:-configure}:39191: testing found idn2 library ..." 1>&5
 
 cat >>confdefs.h <<\EOF
 #define USE_IDN2 1
@@ -39203,12 +39201,12 @@ else
 cf_cv_header_path_idn=
 cf_cv_library_path_idn=
 
-echo "${as_me:-configure}:39206: testing Starting FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:39204: testing Starting FIND_LINKAGE(idn,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 39211 "configure"
+#line 39209 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -39227,16 +39225,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:39230: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39228: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39233: \$? = $ac_status" >&5
+  echo "$as_me:39231: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:39236: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39234: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39239: \$? = $ac_status" >&5
+  echo "$as_me:39237: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_idn=yes
@@ -39250,7 +39248,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lidn $LIBICONV $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 39253 "configure"
+#line 39251 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -39269,16 +39267,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:39272: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39270: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39275: \$? = $ac_status" >&5
+  echo "$as_me:39273: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:39278: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39276: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39281: \$? = $ac_status" >&5
+  echo "$as_me:39279: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_idn=yes
@@ -39295,9 +39293,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for idn library" 1>&6
 
-echo "${as_me:-configure}:39298: testing find linkage for idn library ..." 1>&5
+echo "${as_me:-configure}:39296: testing find linkage for idn library ..." 1>&5
 
-echo "${as_me:-configure}:39300: testing Searching for headers in FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:39298: testing Searching for headers in FIND_LINKAGE(idn,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -39388,7 +39386,7 @@ 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}:39391: testing ... testing $cf_cv_header_path_idn ..." 1>&5
+echo "${as_me:-configure}:39389: testing ... testing $cf_cv_header_path_idn ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -39396,7 +39394,7 @@ echo "${as_me:-configure}:39391: testing ... testing $cf_cv_header_path_idn ..."
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_idn"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 39399 "configure"
+#line 39397 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -39415,21 +39413,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:39418: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:39416: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:39421: \$? = $ac_status" >&5
+  echo "$as_me:39419: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:39424: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39422: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39427: \$? = $ac_status" >&5
+  echo "$as_me:39425: \$? = $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}:39432: testing ... found idn headers in $cf_cv_header_path_idn ..." 1>&5
+echo "${as_me:-configure}:39430: testing ... found idn headers in $cf_cv_header_path_idn ..." 1>&5
 
 				cf_cv_find_linkage_idn=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -39447,7 +39445,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_idn" = maybe ; then
 
-echo "${as_me:-configure}:39450: testing Searching for idn library in FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:39448: testing Searching for idn library in FIND_LINKAGE(idn,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -39522,13 +39520,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}:39525: testing ... testing $cf_cv_library_path_idn ..." 1>&5
+echo "${as_me:-configure}:39523: 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 39531 "configure"
+#line 39529 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -39547,21 +39545,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:39550: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39548: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39553: \$? = $ac_status" >&5
+  echo "$as_me:39551: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:39556: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39554: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39559: \$? = $ac_status" >&5
+  echo "$as_me:39557: \$? = $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}:39564: testing ... found idn library in $cf_cv_library_path_idn ..." 1>&5
+echo "${as_me:-configure}:39562: testing ... found idn library in $cf_cv_library_path_idn ..." 1>&5
 
 					cf_cv_find_linkage_idn=yes
 					cf_cv_library_file_idn="-lidn"
@@ -39623,7 +39621,7 @@ if test -n "$cf_cv_header_path_idn" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 39626 "configure"
+#line 39624 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -39635,16 +39633,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:39638: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:39636: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:39641: \$? = $ac_status" >&5
+  echo "$as_me:39639: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:39644: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39642: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39647: \$? = $ac_status" >&5
+  echo "$as_me:39645: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -39661,7 +39659,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}:39664: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:39662: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -39697,7 +39695,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}:39700: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:39698: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -39722,14 +39720,14 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:39725: WARNING: Cannot find idn library" >&5
+{ echo "$as_me:39723: WARNING: Cannot find idn library" >&5
 echo "$as_me: WARNING: Cannot find idn library" >&2;}
 fi
 
 if test "x$cf_cv_find_linkage_idn" = xyes ; then
 	test -n "$verbose" && echo "	found idn library" 1>&6
 
-echo "${as_me:-configure}:39732: testing found idn library ..." 1>&5
+echo "${as_me:-configure}:39730: testing found idn library ..." 1>&5
 
 cat >>confdefs.h <<\EOF
 #define USE_IDNA 1
@@ -39740,7 +39738,7 @@ fi
 
 fi
 
-echo "$as_me:39743: checking if element-justification logic should be used" >&5
+echo "$as_me:39741: 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.
@@ -39757,14 +39755,14 @@ else
 	use_justify_elts=yes
 
 fi;
-echo "$as_me:39760: result: $use_justify_elts" >&5
+echo "$as_me:39758: 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:39767: checking if partial-display should be used" >&5
+echo "$as_me:39765: 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.
@@ -39781,14 +39779,14 @@ else
 	use_partial_display=yes
 
 fi;
-echo "$as_me:39784: result: $use_partial_display" >&5
+echo "$as_me:39782: 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:39791: checking if persistent-cookie logic should be used" >&5
+echo "$as_me:39789: 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.
@@ -39805,14 +39803,14 @@ else
 	use_filed_cookies=yes
 
 fi;
-echo "$as_me:39808: result: $use_filed_cookies" >&5
+echo "$as_me:39806: 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:39815: checking if html source should be colorized" >&5
+echo "$as_me:39813: 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.
@@ -39829,14 +39827,14 @@ else
 	use_prettysrc=yes
 
 fi;
-echo "$as_me:39832: result: $use_prettysrc" >&5
+echo "$as_me:39830: 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:39839: checking if progress-bar code should be used" >&5
+echo "$as_me:39837: 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.
@@ -39853,14 +39851,14 @@ else
 	use_progressbar=yes
 
 fi;
-echo "$as_me:39856: result: $use_progressbar" >&5
+echo "$as_me:39854: 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:39863: checking if read-progress message should show ETA" >&5
+echo "$as_me:39861: 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.
@@ -39877,14 +39875,14 @@ else
 	use_read_eta=yes
 
 fi;
-echo "$as_me:39880: result: $use_read_eta" >&5
+echo "$as_me:39878: 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:39887: checking if source caching should be used" >&5
+echo "$as_me:39885: 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.
@@ -39901,14 +39899,14 @@ else
 	use_source_cache=yes
 
 fi;
-echo "$as_me:39904: result: $use_source_cache" >&5
+echo "$as_me:39902: 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:39911: checking if scrollbar code should be used" >&5
+echo "$as_me:39909: 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.
@@ -39925,10 +39923,10 @@ else
 	use_scrollbar=yes
 
 fi;
-echo "$as_me:39928: result: $use_scrollbar" >&5
+echo "$as_me:39926: result: $use_scrollbar" >&5
 echo "${ECHO_T}$use_scrollbar" >&6
 
-echo "$as_me:39931: checking if charset-selection logic should be used" >&5
+echo "$as_me:39929: 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.
@@ -39945,14 +39943,14 @@ else
 	use_charset_choice=no
 
 fi;
-echo "$as_me:39948: result: $use_charset_choice" >&5
+echo "$as_me:39946: 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:39955: checking if you want to use external commands" >&5
+echo "$as_me:39953: 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.
@@ -39969,7 +39967,7 @@ else
 	use_externs=no
 
 fi;
-echo "$as_me:39972: result: $use_externs" >&5
+echo "$as_me:39970: result: $use_externs" >&5
 echo "${ECHO_T}$use_externs" >&6
 if test "$use_externs" != "no" ; then
 
@@ -39980,7 +39978,7 @@ EOF
 	EXTRA_OBJS="$EXTRA_OBJS LYExtern\$o"
 fi
 
-echo "$as_me:39983: checking if you want to use setfont support" >&5
+echo "$as_me:39981: 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.
@@ -39997,7 +39995,7 @@ else
 	use_setfont=no
 
 fi;
-echo "$as_me:40000: result: $use_setfont" >&5
+echo "$as_me:39998: result: $use_setfont" >&5
 echo "${ECHO_T}$use_setfont" >&6
 if test "$use_setfont" = yes ; then
 	case "$host_os" in
@@ -40008,7 +40006,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:40011: checking for $ac_word" >&5
+echo "$as_me:40009: 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
@@ -40025,7 +40023,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:40028: found $ac_dir/$ac_word" >&5
+   echo "$as_me:40026: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -40036,10 +40034,10 @@ fi
 SETFONT=$ac_cv_path_SETFONT
 
 if test -n "$SETFONT"; then
-  echo "$as_me:40039: result: $SETFONT" >&5
+  echo "$as_me:40037: result: $SETFONT" >&5
 echo "${ECHO_T}$SETFONT" >&6
 else
-  echo "$as_me:40042: result: no" >&5
+  echo "$as_me:40040: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -40098,7 +40096,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:40101: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:40099: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define SETFONT_PATH "$cf_path_prog"
@@ -40116,19 +40114,19 @@ fi
 		SETFONT=built-in
 		test -n "$verbose" && echo "	Assume $host_os has font-switching" 1>&6
 
-echo "${as_me:-configure}:40119: testing Assume $host_os has font-switching ..." 1>&5
+echo "${as_me:-configure}:40117: 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}:40126: testing Assume $host_os has no font-switching ..." 1>&5
+echo "${as_me:-configure}:40124: testing Assume $host_os has no font-switching ..." 1>&5
 
 		;;
 	esac
 	if test -z "$SETFONT" ; then
-		{ echo "$as_me:40131: WARNING: Cannot find a font-setting program" >&5
+		{ echo "$as_me:40129: WARNING: Cannot find a font-setting program" >&5
 echo "$as_me: WARNING: Cannot find a font-setting program" >&2;}
 	elif test "$SETFONT" != unknown ; then
 
@@ -40139,7 +40137,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:40142: checking if you want cgi-link support" >&5
+echo "$as_me:40140: 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.
@@ -40156,10 +40154,10 @@ EOF
 else
   enableval=no
 fi;
-echo "$as_me:40159: result: $enableval" >&5
+echo "$as_me:40157: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:40162: checking if you want change-exec support" >&5
+echo "$as_me:40160: 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.
@@ -40176,14 +40174,14 @@ else
 	use_change_exec=no
 
 fi;
-echo "$as_me:40179: result: $use_change_exec" >&5
+echo "$as_me:40177: 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:40186: checking if you want exec-links support" >&5
+echo "$as_me:40184: 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.
@@ -40200,14 +40198,14 @@ else
 	use_exec_links=$enableval
 
 fi;
-echo "$as_me:40203: result: $use_exec_links" >&5
+echo "$as_me:40201: 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:40210: checking if you want exec-scripts support" >&5
+echo "$as_me:40208: 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.
@@ -40224,14 +40222,14 @@ else
 	use_exec_scripts=$enableval
 
 fi;
-echo "$as_me:40227: result: $use_exec_scripts" >&5
+echo "$as_me:40225: 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:40234: checking if you want internal-links feature" >&5
+echo "$as_me:40232: 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.
@@ -40248,14 +40246,14 @@ else
 	use_internal_links=no
 
 fi;
-echo "$as_me:40251: result: $use_internal_links" >&5
+echo "$as_me:40249: result: $use_internal_links" >&5
 echo "${ECHO_T}$use_internal_links" >&6
 test "$use_internal_links" = yes &&
 cat >>confdefs.h <<\EOF
 #define TRACK_INTERNAL_LINKS 1
 EOF
 
-echo "$as_me:40258: checking if you want to fork NSL requests" >&5
+echo "$as_me:40256: 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.
@@ -40272,7 +40270,7 @@ else
 	use_nsl_fork=no
 
 fi;
-echo "$as_me:40275: result: $use_nsl_fork" >&5
+echo "$as_me:40273: result: $use_nsl_fork" >&5
 echo "${ECHO_T}$use_nsl_fork" >&6
 if test "$use_nsl_fork" = yes ; then
 	case "$host_os" in
@@ -40293,7 +40291,7 @@ EOF
 	esac
 fi
 
-echo "$as_me:40296: checking if you want to log URL requests via syslog" >&5
+echo "$as_me:40294: 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.
@@ -40310,14 +40308,14 @@ else
 	use_syslog=no
 
 fi;
-echo "$as_me:40313: result: $use_syslog" >&5
+echo "$as_me:40311: 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:40320: checking if you want to underline links" >&5
+echo "$as_me:40318: 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.
@@ -40334,7 +40332,7 @@ else
 	use_underline=no
 
 fi;
-echo "$as_me:40337: result: $use_underline" >&5
+echo "$as_me:40335: result: $use_underline" >&5
 echo "${ECHO_T}$use_underline" >&6
 test "$use_underline" = yes &&
 cat >>confdefs.h <<\EOF
@@ -40346,7 +40344,7 @@ cat >>confdefs.h <<\EOF
 #define UNDERLINE_LINKS 0
 EOF
 
-echo "$as_me:40349: checking if help files should be gzip'ed" >&5
+echo "$as_me:40347: 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.
@@ -40363,10 +40361,10 @@ else
 	use_gzip_help=no
 
 fi;
-echo "$as_me:40366: result: $use_gzip_help" >&5
+echo "$as_me:40364: result: $use_gzip_help" >&5
 echo "${ECHO_T}$use_gzip_help" >&6
 
-echo "$as_me:40369: checking if you want to use libbz2 for decompression of some bzip2 files" >&5
+echo "$as_me:40367: 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.
@@ -40376,7 +40374,7 @@ if test "${with_bzlib+set}" = set; then
 else
   use_bzlib=no
 fi;
-echo "$as_me:40379: result: $use_bzlib" >&5
+echo "$as_me:40377: result: $use_bzlib" >&5
 echo "${ECHO_T}$use_bzlib" >&6
 
 if test ".$use_bzlib" != ".no" ; then
@@ -40418,7 +40416,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 40421 "configure"
+#line 40419 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -40430,16 +40428,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:40433: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:40431: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:40436: \$? = $ac_status" >&5
+  echo "$as_me:40434: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:40439: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40437: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40442: \$? = $ac_status" >&5
+  echo "$as_me:40440: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -40456,7 +40454,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}:40459: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:40457: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -40502,7 +40500,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 40505 "configure"
+#line 40503 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -40514,16 +40512,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:40517: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:40515: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:40520: \$? = $ac_status" >&5
+  echo "$as_me:40518: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:40523: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40521: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40526: \$? = $ac_status" >&5
+  echo "$as_me:40524: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -40540,7 +40538,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}:40543: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:40541: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -40558,7 +40556,7 @@ echo "${as_me:-configure}:40543: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:40561: error: cannot find  under $use_bzlib" >&5
+{ { echo "$as_me:40559: error: cannot find  under $use_bzlib" >&5
 echo "$as_me: error: cannot find  under $use_bzlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -40583,7 +40581,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}:40586: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:40584: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -40612,7 +40610,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}:40615: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:40613: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -40621,7 +40619,7 @@ echo "${as_me:-configure}:40615: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:40624: error: cannot find  under $use_bzlib" >&5
+{ { echo "$as_me:40622: error: cannot find  under $use_bzlib" >&5
 echo "$as_me: error: cannot find  under $use_bzlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -40635,12 +40633,12 @@ esac
 cf_cv_header_path_bz2=
 cf_cv_library_path_bz2=
 
-echo "${as_me:-configure}:40638: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:40636: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 40643 "configure"
+#line 40641 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -40657,16 +40655,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:40660: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40658: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40663: \$? = $ac_status" >&5
+  echo "$as_me:40661: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:40666: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40664: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40669: \$? = $ac_status" >&5
+  echo "$as_me:40667: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_bz2=yes
@@ -40680,7 +40678,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lbz2  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 40683 "configure"
+#line 40681 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -40697,16 +40695,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:40700: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40698: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40703: \$? = $ac_status" >&5
+  echo "$as_me:40701: \$? = $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:40704: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40709: \$? = $ac_status" >&5
+  echo "$as_me:40707: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_bz2=yes
@@ -40723,9 +40721,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for bz2 library" 1>&6
 
-echo "${as_me:-configure}:40726: testing find linkage for bz2 library ..." 1>&5
+echo "${as_me:-configure}:40724: testing find linkage for bz2 library ..." 1>&5
 
-echo "${as_me:-configure}:40728: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:40726: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -40816,7 +40814,7 @@ 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}:40819: testing ... testing $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:40817: testing ... testing $cf_cv_header_path_bz2 ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -40824,7 +40822,7 @@ echo "${as_me:-configure}:40819: testing ... testing $cf_cv_header_path_bz2 ..."
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_bz2"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 40827 "configure"
+#line 40825 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -40841,21 +40839,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:40844: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:40842: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:40847: \$? = $ac_status" >&5
+  echo "$as_me:40845: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:40850: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40848: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40853: \$? = $ac_status" >&5
+  echo "$as_me:40851: \$? = $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}:40858: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:40856: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
 
 				cf_cv_find_linkage_bz2=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -40873,7 +40871,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_bz2" = maybe ; then
 
-echo "${as_me:-configure}:40876: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:40874: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -40881,7 +40879,7 @@ echo "${as_me:-configure}:40876: testing Searching for bz2 library in FIND_LINKA
 		CPPFLAGS="$cf_test_CPPFLAGS"
 		LIBS="-lbz2  $cf_save_LIBS"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 40884 "configure"
+#line 40882 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -40898,21 +40896,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:40901: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40899: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40904: \$? = $ac_status" >&5
+  echo "$as_me:40902: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:40907: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40905: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40910: \$? = $ac_status" >&5
+  echo "$as_me:40908: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			test -n "$verbose" && echo "	... found bz2 library in system" 1>&6
 
-echo "${as_me:-configure}:40915: testing ... found bz2 library in system ..." 1>&5
+echo "${as_me:-configure}:40913: testing ... found bz2 library in system ..." 1>&5
 
 			cf_cv_find_linkage_bz2=yes
 else
@@ -40993,13 +40991,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}:40996: testing ... testing $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:40994: 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 41002 "configure"
+#line 41000 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -41016,21 +41014,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:41019: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41017: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41022: \$? = $ac_status" >&5
+  echo "$as_me:41020: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:41025: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41023: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41028: \$? = $ac_status" >&5
+  echo "$as_me:41026: \$? = $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}:41033: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:41031: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
 
 					cf_cv_find_linkage_bz2=yes
 					cf_cv_library_file_bz2="-lbz2"
@@ -41092,7 +41090,7 @@ if test -n "$cf_cv_header_path_bz2" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 41095 "configure"
+#line 41093 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -41104,16 +41102,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:41107: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:41105: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:41110: \$? = $ac_status" >&5
+  echo "$as_me:41108: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:41113: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41111: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41116: \$? = $ac_status" >&5
+  echo "$as_me:41114: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -41130,7 +41128,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}:41133: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:41131: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -41166,7 +41164,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}:41169: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:41167: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -41191,7 +41189,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:41194: WARNING: Cannot find bz2 library" >&5
+{ echo "$as_me:41192: WARNING: Cannot find bz2 library" >&5
 echo "$as_me: WARNING: Cannot find bz2 library" >&2;}
 fi
 
@@ -41202,7 +41200,7 @@ EOF
 
 fi
 
-echo "$as_me:41205: checking if you want to use zlib for decompression of some gzip files" >&5
+echo "$as_me:41203: 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.
@@ -41212,7 +41210,7 @@ if test "${with_zlib+set}" = set; then
 else
   use_zlib=no
 fi;
-echo "$as_me:41215: result: $use_zlib" >&5
+echo "$as_me:41213: result: $use_zlib" >&5
 echo "${ECHO_T}$use_zlib" >&6
 
 if test ".$use_zlib" != ".no" ; then
@@ -41254,7 +41252,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 41257 "configure"
+#line 41255 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -41266,16 +41264,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:41269: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:41267: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:41272: \$? = $ac_status" >&5
+  echo "$as_me:41270: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:41275: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41273: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41278: \$? = $ac_status" >&5
+  echo "$as_me:41276: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -41292,7 +41290,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}:41295: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:41293: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -41338,7 +41336,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 41341 "configure"
+#line 41339 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -41350,16 +41348,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:41353: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:41351: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:41356: \$? = $ac_status" >&5
+  echo "$as_me:41354: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:41359: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41357: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41362: \$? = $ac_status" >&5
+  echo "$as_me:41360: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -41376,7 +41374,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}:41379: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:41377: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -41394,7 +41392,7 @@ echo "${as_me:-configure}:41379: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:41397: error: cannot find  under $use_zlib" >&5
+{ { echo "$as_me:41395: error: cannot find  under $use_zlib" >&5
 echo "$as_me: error: cannot find  under $use_zlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -41419,7 +41417,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}:41422: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:41420: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -41448,7 +41446,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}:41451: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:41449: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -41457,7 +41455,7 @@ echo "${as_me:-configure}:41451: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:41460: error: cannot find  under $use_zlib" >&5
+{ { echo "$as_me:41458: error: cannot find  under $use_zlib" >&5
 echo "$as_me: error: cannot find  under $use_zlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -41471,12 +41469,12 @@ esac
 cf_cv_header_path_z=
 cf_cv_library_path_z=
 
-echo "${as_me:-configure}:41474: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:41472: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 41479 "configure"
+#line 41477 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -41492,16 +41490,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:41495: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41493: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41498: \$? = $ac_status" >&5
+  echo "$as_me:41496: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:41501: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41499: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41504: \$? = $ac_status" >&5
+  echo "$as_me:41502: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_z=yes
@@ -41515,7 +41513,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lz  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 41518 "configure"
+#line 41516 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -41531,16 +41529,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:41534: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41532: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41537: \$? = $ac_status" >&5
+  echo "$as_me:41535: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:41540: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41538: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41543: \$? = $ac_status" >&5
+  echo "$as_me:41541: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_z=yes
@@ -41557,9 +41555,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for z library" 1>&6
 
-echo "${as_me:-configure}:41560: testing find linkage for z library ..." 1>&5
+echo "${as_me:-configure}:41558: testing find linkage for z library ..." 1>&5
 
-echo "${as_me:-configure}:41562: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:41560: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -41650,7 +41648,7 @@ 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}:41653: testing ... testing $cf_cv_header_path_z ..." 1>&5
+echo "${as_me:-configure}:41651: testing ... testing $cf_cv_header_path_z ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -41658,7 +41656,7 @@ echo "${as_me:-configure}:41653: testing ... testing $cf_cv_header_path_z ..." 1
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_z"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 41661 "configure"
+#line 41659 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -41674,21 +41672,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:41677: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:41675: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:41680: \$? = $ac_status" >&5
+  echo "$as_me:41678: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:41683: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41681: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41686: \$? = $ac_status" >&5
+  echo "$as_me:41684: \$? = $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}:41691: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
+echo "${as_me:-configure}:41689: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
 
 				cf_cv_find_linkage_z=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -41706,7 +41704,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_z" = maybe ; then
 
-echo "${as_me:-configure}:41709: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:41707: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -41714,7 +41712,7 @@ echo "${as_me:-configure}:41709: testing Searching for z library in FIND_LINKAGE
 		CPPFLAGS="$cf_test_CPPFLAGS"
 		LIBS="-lz  $cf_save_LIBS"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 41717 "configure"
+#line 41715 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -41730,21 +41728,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:41733: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41731: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41736: \$? = $ac_status" >&5
+  echo "$as_me:41734: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:41739: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41737: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41742: \$? = $ac_status" >&5
+  echo "$as_me:41740: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			test -n "$verbose" && echo "	... found z library in system" 1>&6
 
-echo "${as_me:-configure}:41747: testing ... found z library in system ..." 1>&5
+echo "${as_me:-configure}:41745: testing ... found z library in system ..." 1>&5
 
 			cf_cv_find_linkage_z=yes
 else
@@ -41825,13 +41823,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}:41828: testing ... testing $cf_cv_library_path_z ..." 1>&5
+echo "${as_me:-configure}:41826: 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 41834 "configure"
+#line 41832 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -41847,21 +41845,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:41850: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41848: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41853: \$? = $ac_status" >&5
+  echo "$as_me:41851: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:41856: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41854: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41859: \$? = $ac_status" >&5
+  echo "$as_me:41857: \$? = $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}:41864: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
+echo "${as_me:-configure}:41862: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
 
 					cf_cv_find_linkage_z=yes
 					cf_cv_library_file_z="-lz"
@@ -41923,7 +41921,7 @@ if test -n "$cf_cv_header_path_z" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 41926 "configure"
+#line 41924 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -41935,16 +41933,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:41938: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:41936: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:41941: \$? = $ac_status" >&5
+  echo "$as_me:41939: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:41944: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41942: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41947: \$? = $ac_status" >&5
+  echo "$as_me:41945: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -41961,7 +41959,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}:41964: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:41962: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -41997,7 +41995,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}:42000: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:41998: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -42022,7 +42020,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:42025: WARNING: Cannot find z library" >&5
+{ echo "$as_me:42023: WARNING: Cannot find z library" >&5
 echo "$as_me: WARNING: Cannot find z library" >&2;}
 fi
 
@@ -42031,13 +42029,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:42034: checking for $ac_func" >&5
+echo "$as_me:42032: 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 42040 "configure"
+#line 42038 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -42068,16 +42066,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:42071: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42069: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42074: \$? = $ac_status" >&5
+  echo "$as_me:42072: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:42077: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42075: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42080: \$? = $ac_status" >&5
+  echo "$as_me:42078: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -42087,7 +42085,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:42090: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:42088: 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
@@ -42104,7 +42102,7 @@ EOF
 
 fi
 
-echo "$as_me:42107: checking if you want to use brotli decompression" >&5
+echo "$as_me:42105: checking if you want to use brotli decompression" >&5
 echo $ECHO_N "checking if you want to use brotli decompression... $ECHO_C" >&6
 
 # Check whether --with-brotli or --without-brotli was given.
@@ -42114,7 +42112,7 @@ if test "${with_brotli+set}" = set; then
 else
   use_brotli=no
 fi;
-echo "$as_me:42117: result: $use_brotli" >&5
+echo "$as_me:42115: result: $use_brotli" >&5
 echo "${ECHO_T}$use_brotli" >&6
 
 if test ".$use_brotli" != ".no" ; then
@@ -42156,7 +42154,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 42159 "configure"
+#line 42157 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -42168,16 +42166,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:42171: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42169: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:42174: \$? = $ac_status" >&5
+  echo "$as_me:42172: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:42177: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42175: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42180: \$? = $ac_status" >&5
+  echo "$as_me:42178: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -42194,7 +42192,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}:42197: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:42195: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -42240,7 +42238,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 42243 "configure"
+#line 42241 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -42252,16 +42250,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:42255: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42253: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:42258: \$? = $ac_status" >&5
+  echo "$as_me:42256: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:42261: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42259: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42264: \$? = $ac_status" >&5
+  echo "$as_me:42262: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -42278,7 +42276,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}:42281: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:42279: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -42296,7 +42294,7 @@ echo "${as_me:-configure}:42281: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:42299: error: cannot find  under $use_brotli" >&5
+{ { echo "$as_me:42297: error: cannot find  under $use_brotli" >&5
 echo "$as_me: error: cannot find  under $use_brotli" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -42321,7 +42319,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}:42324: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:42322: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -42350,7 +42348,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}:42353: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:42351: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -42359,7 +42357,7 @@ echo "${as_me:-configure}:42353: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:42362: error: cannot find  under $use_brotli" >&5
+{ { echo "$as_me:42360: error: cannot find  under $use_brotli" >&5
 echo "$as_me: error: cannot find  under $use_brotli" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -42373,12 +42371,12 @@ esac
 cf_cv_header_path_brotlidec=
 cf_cv_library_path_brotlidec=
 
-echo "${as_me:-configure}:42376: testing Starting FIND_LINKAGE(brotlidec,brotlilib) ..." 1>&5
+echo "${as_me:-configure}:42374: testing Starting FIND_LINKAGE(brotlidec,brotlilib) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 42381 "configure"
+#line 42379 "configure"
 #include "confdefs.h"
 
 #include <brotli/decode.h>
@@ -42401,16 +42399,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:42404: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42402: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42407: \$? = $ac_status" >&5
+  echo "$as_me:42405: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:42410: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42408: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42413: \$? = $ac_status" >&5
+  echo "$as_me:42411: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_brotlidec=yes
@@ -42424,7 +42422,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lbrotlidec  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 42427 "configure"
+#line 42425 "configure"
 #include "confdefs.h"
 
 #include <brotli/decode.h>
@@ -42447,16 +42445,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:42450: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42448: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42453: \$? = $ac_status" >&5
+  echo "$as_me:42451: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:42456: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42454: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42459: \$? = $ac_status" >&5
+  echo "$as_me:42457: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_brotlidec=yes
@@ -42473,9 +42471,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for brotlidec library" 1>&6
 
-echo "${as_me:-configure}:42476: testing find linkage for brotlidec library ..." 1>&5
+echo "${as_me:-configure}:42474: testing find linkage for brotlidec library ..." 1>&5
 
-echo "${as_me:-configure}:42478: testing Searching for headers in FIND_LINKAGE(brotlidec,brotlilib) ..." 1>&5
+echo "${as_me:-configure}:42476: testing Searching for headers in FIND_LINKAGE(brotlidec,brotlilib) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -42566,7 +42564,7 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d "$cf_cv_header_path_brotlidec" ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_brotlidec" 1>&6
 
-echo "${as_me:-configure}:42569: testing ... testing $cf_cv_header_path_brotlidec ..." 1>&5
+echo "${as_me:-configure}:42567: testing ... testing $cf_cv_header_path_brotlidec ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -42574,7 +42572,7 @@ echo "${as_me:-configure}:42569: testing ... testing $cf_cv_header_path_brotlide
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_brotlidec"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 42577 "configure"
+#line 42575 "configure"
 #include "confdefs.h"
 
 #include <brotli/decode.h>
@@ -42597,21 +42595,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:42600: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42598: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:42603: \$? = $ac_status" >&5
+  echo "$as_me:42601: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:42606: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42604: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42609: \$? = $ac_status" >&5
+  echo "$as_me:42607: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 				test -n "$verbose" && echo "	... found brotlidec headers in $cf_cv_header_path_brotlidec" 1>&6
 
-echo "${as_me:-configure}:42614: testing ... found brotlidec headers in $cf_cv_header_path_brotlidec ..." 1>&5
+echo "${as_me:-configure}:42612: testing ... found brotlidec headers in $cf_cv_header_path_brotlidec ..." 1>&5
 
 				cf_cv_find_linkage_brotlidec=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -42629,7 +42627,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_brotlidec" = maybe ; then
 
-echo "${as_me:-configure}:42632: testing Searching for brotlidec library in FIND_LINKAGE(brotlidec,brotlilib) ..." 1>&5
+echo "${as_me:-configure}:42630: testing Searching for brotlidec library in FIND_LINKAGE(brotlidec,brotlilib) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -42637,7 +42635,7 @@ echo "${as_me:-configure}:42632: testing Searching for brotlidec library in FIND
 		CPPFLAGS="$cf_test_CPPFLAGS"
 		LIBS="-lbrotlidec  $cf_save_LIBS"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 42640 "configure"
+#line 42638 "configure"
 #include "confdefs.h"
 
 #include <brotli/decode.h>
@@ -42660,21 +42658,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:42663: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42661: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42666: \$? = $ac_status" >&5
+  echo "$as_me:42664: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:42669: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42667: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42672: \$? = $ac_status" >&5
+  echo "$as_me:42670: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			test -n "$verbose" && echo "	... found brotlidec library in system" 1>&6
 
-echo "${as_me:-configure}:42677: testing ... found brotlidec library in system ..." 1>&5
+echo "${as_me:-configure}:42675: testing ... found brotlidec library in system ..." 1>&5
 
 			cf_cv_find_linkage_brotlidec=yes
 else
@@ -42755,13 +42753,13 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d "$cf_cv_library_path_brotlidec" ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_brotlidec" 1>&6
 
-echo "${as_me:-configure}:42758: testing ... testing $cf_cv_library_path_brotlidec ..." 1>&5
+echo "${as_me:-configure}:42756: testing ... testing $cf_cv_library_path_brotlidec ..." 1>&5
 
 					CPPFLAGS="$cf_test_CPPFLAGS"
 					LIBS="-lbrotlidec  $cf_save_LIBS"
 					LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_brotlidec"
 					cat >"conftest.$ac_ext" <<_ACEOF
-#line 42764 "configure"
+#line 42762 "configure"
 #include "confdefs.h"
 
 #include <brotli/decode.h>
@@ -42784,21 +42782,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:42787: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42785: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42790: \$? = $ac_status" >&5
+  echo "$as_me:42788: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:42793: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42791: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42796: \$? = $ac_status" >&5
+  echo "$as_me:42794: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 					test -n "$verbose" && echo "	... found brotlidec library in $cf_cv_library_path_brotlidec" 1>&6
 
-echo "${as_me:-configure}:42801: testing ... found brotlidec library in $cf_cv_library_path_brotlidec ..." 1>&5
+echo "${as_me:-configure}:42799: testing ... found brotlidec library in $cf_cv_library_path_brotlidec ..." 1>&5
 
 					cf_cv_find_linkage_brotlidec=yes
 					cf_cv_library_file_brotlidec="-lbrotlidec"
@@ -42860,7 +42858,7 @@ if test -n "$cf_cv_header_path_brotlidec" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 42863 "configure"
+#line 42861 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -42872,16 +42870,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:42875: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42873: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:42878: \$? = $ac_status" >&5
+  echo "$as_me:42876: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:42881: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42879: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42884: \$? = $ac_status" >&5
+  echo "$as_me:42882: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -42898,7 +42896,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}:42901: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:42899: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -42934,7 +42932,7 @@ if test -n "$cf_cv_library_path_brotlidec" ; 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}:42937: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:42935: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -42959,7 +42957,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:42962: WARNING: Cannot find brotlidec library" >&5
+{ echo "$as_me:42960: WARNING: Cannot find brotlidec library" >&5
 echo "$as_me: WARNING: Cannot find brotlidec library" >&2;}
 fi
 
@@ -42970,7 +42968,7 @@ EOF
 
 fi
 
-echo "$as_me:42973: checking if you want to exclude FINGER code" >&5
+echo "$as_me:42971: 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.
@@ -42987,14 +42985,14 @@ else
 	use_finger=no
 
 fi;
-echo "$as_me:42990: result: $use_finger" >&5
+echo "$as_me:42988: 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:42997: checking if you want to exclude GOPHER code" >&5
+echo "$as_me:42995: 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.
@@ -43011,14 +43009,14 @@ else
 	use_gopher=no
 
 fi;
-echo "$as_me:43014: result: $use_gopher" >&5
+echo "$as_me:43012: 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:43021: checking if you want to exclude NEWS code" >&5
+echo "$as_me:43019: 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.
@@ -43035,14 +43033,14 @@ else
 	use_news=no
 
 fi;
-echo "$as_me:43038: result: $use_news" >&5
+echo "$as_me:43036: 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:43045: checking if you want to exclude FTP code" >&5
+echo "$as_me:43043: 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.
@@ -43059,14 +43057,14 @@ else
 	use_ftp=no
 
 fi;
-echo "$as_me:43062: result: $use_ftp" >&5
+echo "$as_me:43060: 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:43069: checking if you want to include WAIS code" >&5
+echo "$as_me:43067: 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.
@@ -43083,13 +43081,13 @@ else
 	use_wais=no
 
 fi;
-echo "$as_me:43086: result: $use_wais" >&5
+echo "$as_me:43084: result: $use_wais" >&5
 echo "${ECHO_T}$use_wais" >&6
 
 MAKE_WAIS="#"
 if test "$use_wais" != "no"
 then
-	echo "$as_me:43092: checking for fs_free in -lwais" >&5
+	echo "$as_me:43090: 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
@@ -43097,7 +43095,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lwais  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 43100 "configure"
+#line 43098 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -43116,16 +43114,16 @@ fs_free ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:43119: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43117: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43122: \$? = $ac_status" >&5
+  echo "$as_me:43120: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:43125: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43123: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43128: \$? = $ac_status" >&5
+  echo "$as_me:43126: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_wais_fs_free=yes
 else
@@ -43136,18 +43134,18 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:43139: result: $ac_cv_lib_wais_fs_free" >&5
+echo "$as_me:43137: 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:43143: checking if -lm needed for math functions" >&5
+echo "$as_me:43141: 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 43150 "configure"
+#line 43148 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -43163,16 +43161,16 @@ double x = rand(); printf("result = %g\\n", sin(x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:43166: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43164: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43169: \$? = $ac_status" >&5
+  echo "$as_me:43167: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:43172: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43170: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43175: \$? = $ac_status" >&5
+  echo "$as_me:43173: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libm=no
 else
@@ -43182,7 +43180,7 @@ cf_cv_need_libm=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:43185: result: $cf_cv_need_libm" >&5
+echo "$as_me:43183: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 
 if test "$cf_cv_need_libm" = yes
@@ -43190,14 +43188,14 @@ then
 
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lm"
-	echo "$as_me:43193: checking if -lm is available for math functions" >&5
+	echo "$as_me:43191: checking if -lm is available for math functions" >&5
 echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6
 if test "${cf_cv_have_libm+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 43200 "configure"
+#line 43198 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -43213,16 +43211,16 @@ double x = rand(); printf("result = %g\\n", sin(x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:43216: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43214: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43219: \$? = $ac_status" >&5
+  echo "$as_me:43217: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:43222: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43220: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43225: \$? = $ac_status" >&5
+  echo "$as_me:43223: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_libm=yes
 else
@@ -43232,7 +43230,7 @@ cf_cv_have_libm=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:43235: result: $cf_cv_have_libm" >&5
+echo "$as_me:43233: result: $cf_cv_have_libm" >&5
 echo "${ECHO_T}$cf_cv_have_libm" >&6
 	LIBS="$cf_save_LIBS"
 
@@ -43288,23 +43286,23 @@ LIBS="$cf_add_libs"
 for ac_header in wais.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:43291: checking for $ac_header" >&5
+echo "$as_me:43289: 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 43297 "configure"
+#line 43295 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:43301: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:43299: \"$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:43307: \$? = $ac_status" >&5
+  echo "$as_me:43305: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -43323,7 +43321,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:43326: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:43324: 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
@@ -43336,7 +43334,7 @@ done
 		MAKE_WAIS=
 
 else
-  { echo "$as_me:43339: WARNING: could not find WAIS library" >&5
+  { echo "$as_me:43337: WARNING: could not find WAIS library" >&5
 echo "$as_me: WARNING: could not find WAIS library" >&2;}
 fi
 
@@ -43344,7 +43342,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:43347: checking if directory-editor code should be used" >&5
+echo "$as_me:43345: 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.
@@ -43361,7 +43359,7 @@ else
 	use_dired=yes
 
 fi;
-echo "$as_me:43364: result: $use_dired" >&5
+echo "$as_me:43362: result: $use_dired" >&5
 echo "${ECHO_T}$use_dired" >&6
 
 if test ".$use_dired" != ".no" ; then
@@ -43371,7 +43369,7 @@ cat >>confdefs.h <<\EOF
 #define DIRED_SUPPORT 1
 EOF
 
-	echo "$as_me:43374: checking if you wish to allow extracting from archives via DirEd" >&5
+	echo "$as_me:43372: 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.
@@ -43388,10 +43386,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:43391: result: $enableval" >&5
+	echo "$as_me:43389: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:43394: checking if DirEd mode should override keys" >&5
+	echo "$as_me:43392: 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.
@@ -43415,10 +43413,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:43418: result: $enableval" >&5
+	echo "$as_me:43416: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:43421: checking if you wish to allow permissions commands via DirEd" >&5
+	echo "$as_me:43419: 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.
@@ -43442,10 +43440,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:43445: result: $enableval" >&5
+	echo "$as_me:43443: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:43448: checking if you wish to allow executable-permission commands via DirEd" >&5
+	echo "$as_me:43446: 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.
@@ -43462,10 +43460,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:43465: result: $enableval" >&5
+	echo "$as_me:43463: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:43468: checking if you wish to allow \"tar\" commands from DirEd" >&5
+	echo "$as_me:43466: 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.
@@ -43489,10 +43487,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:43492: result: $enableval" >&5
+	echo "$as_me:43490: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:43495: checking if you wish to allow \"uudecode\" commands from DirEd" >&5
+	echo "$as_me:43493: 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.
@@ -43516,10 +43514,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:43519: result: $enableval" >&5
+	echo "$as_me:43517: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:43522: checking if you wish to allow \"zip\" and \"unzip\" commands from DirEd" >&5
+	echo "$as_me:43520: 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.
@@ -43543,10 +43541,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:43546: result: $enableval" >&5
+	echo "$as_me:43544: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:43549: checking if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd" >&5
+	echo "$as_me:43547: 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.
@@ -43570,11 +43568,11 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:43573: result: $enableval" >&5
+	echo "$as_me:43571: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 fi
 
-echo "$as_me:43577: checking if you want long-directory listings" >&5
+echo "$as_me:43575: 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.
@@ -43598,10 +43596,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-echo "$as_me:43601: result: $enableval" >&5
+echo "$as_me:43599: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:43604: checking if parent-directory references are permitted" >&5
+echo "$as_me:43602: 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.
@@ -43618,7 +43616,7 @@ EOF
 else
   enableval=yes
 fi;
-echo "$as_me:43621: result: $enableval" >&5
+echo "$as_me:43619: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 test -z "$TELNET" && TELNET="telnet"
@@ -43626,7 +43624,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:43629: checking for $ac_word" >&5
+echo "$as_me:43627: 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
@@ -43643,7 +43641,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:43646: found $ac_dir/$ac_word" >&5
+   echo "$as_me:43644: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -43654,10 +43652,10 @@ fi
 TELNET=$ac_cv_path_TELNET
 
 if test -n "$TELNET"; then
-  echo "$as_me:43657: result: $TELNET" >&5
+  echo "$as_me:43655: result: $TELNET" >&5
 echo "${ECHO_T}$TELNET" >&6
 else
-  echo "$as_me:43660: result: no" >&5
+  echo "$as_me:43658: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -43716,7 +43714,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:43719: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:43717: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TELNET_PATH "$cf_path_prog"
@@ -43734,7 +43732,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:43737: checking for $ac_word" >&5
+echo "$as_me:43735: 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
@@ -43751,7 +43749,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:43754: found $ac_dir/$ac_word" >&5
+   echo "$as_me:43752: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -43762,10 +43760,10 @@ fi
 TN3270=$ac_cv_path_TN3270
 
 if test -n "$TN3270"; then
-  echo "$as_me:43765: result: $TN3270" >&5
+  echo "$as_me:43763: result: $TN3270" >&5
 echo "${ECHO_T}$TN3270" >&6
 else
-  echo "$as_me:43768: result: no" >&5
+  echo "$as_me:43766: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -43824,7 +43822,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:43827: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:43825: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TN3270_PATH "$cf_path_prog"
@@ -43842,7 +43840,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:43845: checking for $ac_word" >&5
+echo "$as_me:43843: 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
@@ -43859,7 +43857,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:43862: found $ac_dir/$ac_word" >&5
+   echo "$as_me:43860: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -43870,10 +43868,10 @@ fi
 RLOGIN=$ac_cv_path_RLOGIN
 
 if test -n "$RLOGIN"; then
-  echo "$as_me:43873: result: $RLOGIN" >&5
+  echo "$as_me:43871: result: $RLOGIN" >&5
 echo "${ECHO_T}$RLOGIN" >&6
 else
-  echo "$as_me:43876: result: no" >&5
+  echo "$as_me:43874: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -43932,7 +43930,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:43935: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:43933: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define RLOGIN_PATH "$cf_path_prog"
@@ -43950,7 +43948,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:43953: checking for $ac_word" >&5
+echo "$as_me:43951: 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
@@ -43967,7 +43965,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:43970: found $ac_dir/$ac_word" >&5
+   echo "$as_me:43968: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -43978,10 +43976,10 @@ fi
 MV=$ac_cv_path_MV
 
 if test -n "$MV"; then
-  echo "$as_me:43981: result: $MV" >&5
+  echo "$as_me:43979: result: $MV" >&5
 echo "${ECHO_T}$MV" >&6
 else
-  echo "$as_me:43984: result: no" >&5
+  echo "$as_me:43982: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44040,7 +44038,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:44043: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:44041: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define MV_PATH "$cf_path_prog"
@@ -44058,7 +44056,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:44061: checking for $ac_word" >&5
+echo "$as_me:44059: 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
@@ -44075,7 +44073,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:44078: found $ac_dir/$ac_word" >&5
+   echo "$as_me:44076: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -44086,10 +44084,10 @@ fi
 GZIP=$ac_cv_path_GZIP
 
 if test -n "$GZIP"; then
-  echo "$as_me:44089: result: $GZIP" >&5
+  echo "$as_me:44087: result: $GZIP" >&5
 echo "${ECHO_T}$GZIP" >&6
 else
-  echo "$as_me:44092: result: no" >&5
+  echo "$as_me:44090: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44148,7 +44146,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:44151: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:44149: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define GZIP_PATH "$cf_path_prog"
@@ -44166,7 +44164,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:44169: checking for $ac_word" >&5
+echo "$as_me:44167: 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
@@ -44183,7 +44181,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:44186: found $ac_dir/$ac_word" >&5
+   echo "$as_me:44184: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -44194,10 +44192,10 @@ fi
 UNCOMPRESS=$ac_cv_path_UNCOMPRESS
 
 if test -n "$UNCOMPRESS"; then
-  echo "$as_me:44197: result: $UNCOMPRESS" >&5
+  echo "$as_me:44195: result: $UNCOMPRESS" >&5
 echo "${ECHO_T}$UNCOMPRESS" >&6
 else
-  echo "$as_me:44200: result: no" >&5
+  echo "$as_me:44198: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44256,7 +44254,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:44259: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:44257: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define UNCOMPRESS_PATH "$cf_path_prog"
@@ -44274,7 +44272,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:44277: checking for $ac_word" >&5
+echo "$as_me:44275: 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
@@ -44291,7 +44289,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:44294: found $ac_dir/$ac_word" >&5
+   echo "$as_me:44292: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -44302,10 +44300,10 @@ fi
 UNZIP=$ac_cv_path_UNZIP
 
 if test -n "$UNZIP"; then
-  echo "$as_me:44305: result: $UNZIP" >&5
+  echo "$as_me:44303: result: $UNZIP" >&5
 echo "${ECHO_T}$UNZIP" >&6
 else
-  echo "$as_me:44308: result: no" >&5
+  echo "$as_me:44306: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44364,7 +44362,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:44367: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:44365: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define UNZIP_PATH "$cf_path_prog"
@@ -44382,7 +44380,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:44385: checking for $ac_word" >&5
+echo "$as_me:44383: 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
@@ -44399,7 +44397,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:44402: found $ac_dir/$ac_word" >&5
+   echo "$as_me:44400: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -44410,10 +44408,10 @@ fi
 BZIP2=$ac_cv_path_BZIP2
 
 if test -n "$BZIP2"; then
-  echo "$as_me:44413: result: $BZIP2" >&5
+  echo "$as_me:44411: result: $BZIP2" >&5
 echo "${ECHO_T}$BZIP2" >&6
 else
-  echo "$as_me:44416: result: no" >&5
+  echo "$as_me:44414: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44472,7 +44470,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:44475: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:44473: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define BZIP2_PATH "$cf_path_prog"
@@ -44490,7 +44488,7 @@ for ac_prog in $BROTLI brotli
 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:44493: checking for $ac_word" >&5
+echo "$as_me:44491: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_BROTLI+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -44507,7 +44505,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_BROTLI="$ac_dir/$ac_word"
-   echo "$as_me:44510: found $ac_dir/$ac_word" >&5
+   echo "$as_me:44508: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -44518,10 +44516,10 @@ fi
 BROTLI=$ac_cv_path_BROTLI
 
 if test -n "$BROTLI"; then
-  echo "$as_me:44521: result: $BROTLI" >&5
+  echo "$as_me:44519: result: $BROTLI" >&5
 echo "${ECHO_T}$BROTLI" >&6
 else
-  echo "$as_me:44524: result: no" >&5
+  echo "$as_me:44522: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44580,7 +44578,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:44583: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:44581: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define BROTLI_PATH "$cf_path_prog"
@@ -44598,7 +44596,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:44601: checking for $ac_word" >&5
+echo "$as_me:44599: 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
@@ -44615,7 +44613,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:44618: found $ac_dir/$ac_word" >&5
+   echo "$as_me:44616: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -44626,10 +44624,10 @@ fi
 TAR=$ac_cv_path_TAR
 
 if test -n "$TAR"; then
-  echo "$as_me:44629: result: $TAR" >&5
+  echo "$as_me:44627: result: $TAR" >&5
 echo "${ECHO_T}$TAR" >&6
 else
-  echo "$as_me:44632: result: no" >&5
+  echo "$as_me:44630: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44688,7 +44686,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:44691: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:44689: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TAR_PATH "$cf_path_prog"
@@ -44746,7 +44744,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:44749: checking for $ac_word" >&5
+echo "$as_me:44747: 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
@@ -44763,7 +44761,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:44766: found $ac_dir/$ac_word" >&5
+   echo "$as_me:44764: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -44774,10 +44772,10 @@ fi
 COMPRESS=$ac_cv_path_COMPRESS
 
 if test -n "$COMPRESS"; then
-  echo "$as_me:44777: result: $COMPRESS" >&5
+  echo "$as_me:44775: result: $COMPRESS" >&5
 echo "${ECHO_T}$COMPRESS" >&6
 else
-  echo "$as_me:44780: result: no" >&5
+  echo "$as_me:44778: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44836,7 +44834,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:44839: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:44837: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define COMPRESS_PATH "$cf_path_prog"
@@ -44854,7 +44852,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:44857: checking for $ac_word" >&5
+echo "$as_me:44855: 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
@@ -44871,7 +44869,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:44874: found $ac_dir/$ac_word" >&5
+   echo "$as_me:44872: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -44882,10 +44880,10 @@ fi
 RM=$ac_cv_path_RM
 
 if test -n "$RM"; then
-  echo "$as_me:44885: result: $RM" >&5
+  echo "$as_me:44883: result: $RM" >&5
 echo "${ECHO_T}$RM" >&6
 else
-  echo "$as_me:44888: result: no" >&5
+  echo "$as_me:44886: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44944,7 +44942,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:44947: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:44945: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define RM_PATH "$cf_path_prog"
@@ -44962,7 +44960,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:44965: checking for $ac_word" >&5
+echo "$as_me:44963: 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
@@ -44979,7 +44977,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:44982: found $ac_dir/$ac_word" >&5
+   echo "$as_me:44980: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -44990,10 +44988,10 @@ fi
 UUDECODE=$ac_cv_path_UUDECODE
 
 if test -n "$UUDECODE"; then
-  echo "$as_me:44993: result: $UUDECODE" >&5
+  echo "$as_me:44991: result: $UUDECODE" >&5
 echo "${ECHO_T}$UUDECODE" >&6
 else
-  echo "$as_me:44996: result: no" >&5
+  echo "$as_me:44994: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -45052,7 +45050,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:45055: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:45053: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define UUDECODE_PATH "$cf_path_prog"
@@ -45070,7 +45068,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:45073: checking for $ac_word" >&5
+echo "$as_me:45071: 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
@@ -45087,7 +45085,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:45090: found $ac_dir/$ac_word" >&5
+   echo "$as_me:45088: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -45098,10 +45096,10 @@ fi
 ZCAT=$ac_cv_path_ZCAT
 
 if test -n "$ZCAT"; then
-  echo "$as_me:45101: result: $ZCAT" >&5
+  echo "$as_me:45099: result: $ZCAT" >&5
 echo "${ECHO_T}$ZCAT" >&6
 else
-  echo "$as_me:45104: result: no" >&5
+  echo "$as_me:45102: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -45160,7 +45158,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:45163: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:45161: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define ZCAT_PATH "$cf_path_prog"
@@ -45178,7 +45176,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:45181: checking for $ac_word" >&5
+echo "$as_me:45179: 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
@@ -45195,7 +45193,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:45198: found $ac_dir/$ac_word" >&5
+   echo "$as_me:45196: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -45206,10 +45204,10 @@ fi
 ZIP=$ac_cv_path_ZIP
 
 if test -n "$ZIP"; then
-  echo "$as_me:45209: result: $ZIP" >&5
+  echo "$as_me:45207: result: $ZIP" >&5
 echo "${ECHO_T}$ZIP" >&6
 else
-  echo "$as_me:45212: result: no" >&5
+  echo "$as_me:45210: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -45268,7 +45266,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:45271: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:45269: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define ZIP_PATH "$cf_path_prog"
@@ -45296,7 +45294,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:45299: checking for $ac_word" >&5
+echo "$as_me:45297: 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
@@ -45313,7 +45311,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:45316: found $ac_dir/$ac_word" >&5
+   echo "$as_me:45314: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -45324,10 +45322,10 @@ fi
 INSTALL=$ac_cv_path_INSTALL
 
 if test -n "$INSTALL"; then
-  echo "$as_me:45327: result: $INSTALL" >&5
+  echo "$as_me:45325: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 else
-  echo "$as_me:45330: result: no" >&5
+  echo "$as_me:45328: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -45386,7 +45384,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:45389: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:45387: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define INSTALL_PATH "$cf_path_prog"
@@ -45416,7 +45414,7 @@ if test "$cf_cv_screen" = pdcurses ; then
 	case "$host_os" in
 	(mingw*)
 
-echo "$as_me:45419: checking for initscr in -lpdcurses" >&5
+echo "$as_me:45417: checking for initscr in -lpdcurses" >&5
 echo $ECHO_N "checking for initscr in -lpdcurses... $ECHO_C" >&6
 if test "${ac_cv_lib_pdcurses_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -45424,7 +45422,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpdcurses  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 45427 "configure"
+#line 45425 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -45443,16 +45441,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:45446: \"$ac_link\"") >&5
+if { (eval echo "$as_me:45444: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:45449: \$? = $ac_status" >&5
+  echo "$as_me:45447: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:45452: \"$ac_try\"") >&5
+  { (eval echo "$as_me:45450: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:45455: \$? = $ac_status" >&5
+  echo "$as_me:45453: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pdcurses_initscr=yes
 else
@@ -45463,7 +45461,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:45466: result: $ac_cv_lib_pdcurses_initscr" >&5
+echo "$as_me:45464: result: $ac_cv_lib_pdcurses_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_pdcurses_initscr" >&6
 if test "$ac_cv_lib_pdcurses_initscr" = yes; then
 
@@ -45485,13 +45483,13 @@ LIBS="$cf_add_libs"
 
 	cf_cv_term_header=no
 	cf_cv_unctrl_header=no
-	echo "$as_me:45488: checking for winwstr" >&5
+	echo "$as_me:45486: checking for winwstr" >&5
 echo $ECHO_N "checking for winwstr... $ECHO_C" >&6
 if test "${ac_cv_func_winwstr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 45494 "configure"
+#line 45492 "configure"
 #include "confdefs.h"
 #define winwstr autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -45522,16 +45520,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:45525: \"$ac_link\"") >&5
+if { (eval echo "$as_me:45523: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:45528: \$? = $ac_status" >&5
+  echo "$as_me:45526: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:45531: \"$ac_try\"") >&5
+  { (eval echo "$as_me:45529: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:45534: \$? = $ac_status" >&5
+  echo "$as_me:45532: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_winwstr=yes
 else
@@ -45541,7 +45539,7 @@ ac_cv_func_winwstr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:45544: result: $ac_cv_func_winwstr" >&5
+echo "$as_me:45542: result: $ac_cv_func_winwstr" >&5
 echo "${ECHO_T}$ac_cv_func_winwstr" >&6
 if test "$ac_cv_func_winwstr" = yes; then
 
@@ -45551,13 +45549,13 @@ EOF
 
 fi
 
-	echo "$as_me:45554: checking for pdcurses_dll_iname" >&5
+	echo "$as_me:45552: checking for pdcurses_dll_iname" >&5
 echo $ECHO_N "checking for pdcurses_dll_iname... $ECHO_C" >&6
 if test "${ac_cv_func_pdcurses_dll_iname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 45560 "configure"
+#line 45558 "configure"
 #include "confdefs.h"
 #define pdcurses_dll_iname autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -45588,16 +45586,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:45591: \"$ac_link\"") >&5
+if { (eval echo "$as_me:45589: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:45594: \$? = $ac_status" >&5
+  echo "$as_me:45592: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:45597: \"$ac_try\"") >&5
+  { (eval echo "$as_me:45595: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:45600: \$? = $ac_status" >&5
+  echo "$as_me:45598: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_pdcurses_dll_iname=yes
 else
@@ -45607,7 +45605,7 @@ ac_cv_func_pdcurses_dll_iname=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:45610: result: $ac_cv_func_pdcurses_dll_iname" >&5
+echo "$as_me:45608: result: $ac_cv_func_pdcurses_dll_iname" >&5
 echo "${ECHO_T}$ac_cv_func_pdcurses_dll_iname" >&6
 if test "$ac_cv_func_pdcurses_dll_iname" = yes; then
 
@@ -45624,7 +45622,7 @@ fi
 
 cf_x_athena=${cf_x_athena:-Xaw}
 
-echo "$as_me:45627: checking if you want to link with Xaw 3d library" >&5
+echo "$as_me:45625: 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=
 
@@ -45635,14 +45633,14 @@ if test "${with_Xaw3d+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3d
-	echo "$as_me:45638: result: yes" >&5
+	echo "$as_me:45636: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:45641: result: no" >&5
+	echo "$as_me:45639: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:45645: checking if you want to link with Xaw 3d xft library" >&5
+echo "$as_me:45643: checking if you want to link with Xaw 3d xft library" >&5
 echo $ECHO_N "checking if you want to link with Xaw 3d xft library... $ECHO_C" >&6
 withval=
 
@@ -45653,14 +45651,14 @@ if test "${with_Xaw3dxft+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3dxft
-	echo "$as_me:45656: result: yes" >&5
+	echo "$as_me:45654: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:45659: result: no" >&5
+	echo "$as_me:45657: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:45663: checking if you want to link with neXT Athena library" >&5
+echo "$as_me:45661: 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=
 
@@ -45671,14 +45669,14 @@ if test "${with_neXtaw+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=neXtaw
-	echo "$as_me:45674: result: yes" >&5
+	echo "$as_me:45672: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:45677: result: no" >&5
+	echo "$as_me:45675: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:45681: checking if you want to link with Athena-Plus library" >&5
+echo "$as_me:45679: 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=
 
@@ -45689,10 +45687,10 @@ if test "${with_XawPlus+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=XawPlus
-	echo "$as_me:45692: result: yes" >&5
+	echo "$as_me:45690: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:45695: result: no" >&5
+	echo "$as_me:45693: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -45712,17 +45710,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}:45715: testing found package $cf_athena_pkg ..." 1>&5
+echo "${as_me:-configure}:45713: 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}:45721: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:45719: 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}:45725: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:45723: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -45853,20 +45851,20 @@ EOF
 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
 
-echo "${as_me:-configure}:45856: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:45854: testing ..trimmed $LIBS ..." 1>&5
 
 			;;
 		esac
 	done
 
-echo "$as_me:45862: checking for usable $cf_x_athena/Xmu package" >&5
+echo "$as_me:45860: 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 45869 "configure"
+#line 45867 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -45884,16 +45882,16 @@ int check = XmuCompareISOLatin1("big", "small");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:45887: \"$ac_link\"") >&5
+if { (eval echo "$as_me:45885: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:45890: \$? = $ac_status" >&5
+  echo "$as_me:45888: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:45893: \"$ac_try\"") >&5
+  { (eval echo "$as_me:45891: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:45896: \$? = $ac_status" >&5
+  echo "$as_me:45894: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xaw_compat=yes
 else
@@ -45903,7 +45901,7 @@ cf_cv_xaw_compat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:45906: result: $cf_cv_xaw_compat" >&5
+echo "$as_me:45904: result: $cf_cv_xaw_compat" >&5
 echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 
 			if test "$cf_cv_xaw_compat" = no
@@ -45915,7 +45913,7 @@ echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 				(*)
 					test -n "$verbose" && echo "	work around broken package" 1>&6
 
-echo "${as_me:-configure}:45918: testing work around broken package ..." 1>&5
+echo "${as_me:-configure}:45916: testing work around broken package ..." 1>&5
 
 					cf_save_xmu="$LIBS"
 					cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^  *//' -e 's/ .*//'`
@@ -45923,17 +45921,17 @@ echo "${as_me:-configure}:45918: 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}:45926: testing found package xmu ..." 1>&5
+echo "${as_me:-configure}:45924: 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}:45932: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:45930: 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}:45936: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:45934: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -46053,12 +46051,12 @@ LIBS="$cf_add_libs"
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:46056: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:46054: testing ...before $LIBS ..." 1>&5
 
 LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%$cf_first_lib %$cf_first_lib $cf_pkgconfig_libs %" -e 's%  % %g'`
 test -n "$verbose" && echo "	...after  $LIBS" 1>&6
 
-echo "${as_me:-configure}:46061: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:46059: testing ...after  $LIBS ..." 1>&5
 
 else
 	cf_pkgconfig_incs=
@@ -46066,12 +46064,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:46069: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:46067: testing ...before $LIBS ..." 1>&5
 
 LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%$cf_first_lib %$cf_first_lib -lXmu %" -e 's%  % %g'`
 test -n "$verbose" && echo "	...after  $LIBS" 1>&6
 
-echo "${as_me:-configure}:46074: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:46072: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -46082,7 +46080,7 @@ fi
 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
 
-echo "${as_me:-configure}:46085: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:46083: testing ..trimmed $LIBS ..." 1>&5
 
 			;;
 		esac
@@ -46107,17 +46105,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}:46110: testing found package Xext ..." 1>&5
+echo "${as_me:-configure}:46108: 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}:46116: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:46114: 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}:46120: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:46118: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -46238,7 +46236,7 @@ else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
 
-	echo "$as_me:46241: checking for XextCreateExtension in -lXext" >&5
+	echo "$as_me:46239: 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
@@ -46246,7 +46244,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 46249 "configure"
+#line 46247 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -46265,16 +46263,16 @@ XextCreateExtension ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:46268: \"$ac_link\"") >&5
+if { (eval echo "$as_me:46266: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:46271: \$? = $ac_status" >&5
+  echo "$as_me:46269: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:46274: \"$ac_try\"") >&5
+  { (eval echo "$as_me:46272: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:46277: \$? = $ac_status" >&5
+  echo "$as_me:46275: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
@@ -46285,7 +46283,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:46288: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:46286: 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
 
@@ -46321,17 +46319,17 @@ then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then
 	test -n "$verbose" && echo "	found package x11" 1>&6
 
-echo "${as_me:-configure}:46324: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:46322: 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}:46330: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:46328: 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}:46334: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:46332: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -46451,24 +46449,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:46454: WARNING: unable to find X11 library" >&5
+	{ echo "$as_me:46452: WARNING: unable to find X11 library" >&5
 echo "$as_me: WARNING: unable to find X11 library" >&2;}
 fi
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "ice"; then
 	test -n "$verbose" && echo "	found package ice" 1>&6
 
-echo "${as_me:-configure}:46461: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:46459: 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}:46467: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:46465: 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}:46471: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:46469: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -46588,24 +46586,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:46591: WARNING: unable to find ICE library" >&5
+	{ echo "$as_me:46589: WARNING: unable to find ICE library" >&5
 echo "$as_me: WARNING: unable to find ICE library" >&2;}
 fi
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then
 	test -n "$verbose" && echo "	found package sm" 1>&6
 
-echo "${as_me:-configure}:46598: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:46596: 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}:46604: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:46602: 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}:46608: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:46606: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -46725,24 +46723,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:46728: WARNING: unable to find SM library" >&5
+	{ echo "$as_me:46726: WARNING: unable to find SM library" >&5
 echo "$as_me: WARNING: unable to find SM library" >&2;}
 fi
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then
 	test -n "$verbose" && echo "	found package xt" 1>&6
 
-echo "${as_me:-configure}:46735: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:46733: 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}:46741: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:46739: 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}:46745: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:46743: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -46862,7 +46860,7 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:46865: WARNING: unable to find Xt library" >&5
+	{ echo "$as_me:46863: WARNING: unable to find Xt library" >&5
 echo "$as_me: WARNING: unable to find Xt library" >&2;}
 fi
 
@@ -46875,17 +46873,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}:46878: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:46876: 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}:46884: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:46882: 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}:46888: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:46886: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -47006,14 +47004,14 @@ LIBS="$cf_add_libs"
 		;;
 	(*)
 # we have an "xt" package, but it may omit Xt's dependency on X11
-echo "$as_me:47009: checking for usable X dependency" >&5
+echo "$as_me:47007: 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 47016 "configure"
+#line 47014 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -47033,16 +47031,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:47036: \"$ac_link\"") >&5
+if { (eval echo "$as_me:47034: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:47039: \$? = $ac_status" >&5
+  echo "$as_me:47037: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:47042: \"$ac_try\"") >&5
+  { (eval echo "$as_me:47040: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:47045: \$? = $ac_status" >&5
+  echo "$as_me:47043: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xt_x11_compat=yes
 else
@@ -47052,30 +47050,30 @@ cf_cv_xt_x11_compat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:47055: result: $cf_cv_xt_x11_compat" >&5
+echo "$as_me:47053: 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}:47061: testing work around broken X11 dependency ..." 1>&5
+echo "${as_me:-configure}:47059: 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}:47068: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:47066: 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}:47074: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:47072: 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}:47078: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:47076: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -47198,12 +47196,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:47201: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:47199: 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}:47206: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:47204: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -47211,14 +47209,14 @@ fi
 		;;
 	esac
 
-echo "$as_me:47214: checking for usable X Toolkit package" >&5
+echo "$as_me:47212: 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 47221 "configure"
+#line 47219 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -47234,16 +47232,16 @@ int num = IceConnectionNumber(0); (void) num
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:47237: \"$ac_link\"") >&5
+if { (eval echo "$as_me:47235: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:47240: \$? = $ac_status" >&5
+  echo "$as_me:47238: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:47243: \"$ac_try\"") >&5
+  { (eval echo "$as_me:47241: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:47246: \$? = $ac_status" >&5
+  echo "$as_me:47244: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xt_ice_compat=yes
 else
@@ -47253,7 +47251,7 @@ cf_cv_xt_ice_compat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:47256: result: $cf_cv_xt_ice_compat" >&5
+echo "$as_me:47254: result: $cf_cv_xt_ice_compat" >&5
 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
 
 	if test "$cf_cv_xt_ice_compat" = no
@@ -47267,22 +47265,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}:47270: testing work around broken ICE dependency ..." 1>&5
+echo "${as_me:-configure}:47268: 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}:47275: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:47273: 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}:47281: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:47279: 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}:47285: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:47283: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -47401,17 +47399,17 @@ LIBS="$cf_add_libs"
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then
 	test -n "$verbose" && echo "	found package sm" 1>&6
 
-echo "${as_me:-configure}:47404: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:47402: 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}:47410: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:47408: 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}:47414: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:47412: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -47540,12 +47538,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:47543: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:47541: 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}:47548: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:47546: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -47565,7 +47563,7 @@ else
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:47568: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:47566: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -47650,7 +47648,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}:47653: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:47651: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -47660,7 +47658,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}:47663: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:47661: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -47670,7 +47668,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:47673: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:47671: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
 
 	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
 	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
@@ -47679,7 +47677,7 @@ fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 47682 "configure"
+#line 47680 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -47691,16 +47689,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:47694: \"$ac_link\"") >&5
+if { (eval echo "$as_me:47692: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:47697: \$? = $ac_status" >&5
+  echo "$as_me:47695: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:47700: \"$ac_try\"") >&5
+  { (eval echo "$as_me:47698: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:47703: \$? = $ac_status" >&5
+  echo "$as_me:47701: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -47708,12 +47706,12 @@ else
 cat "conftest.$ac_ext" >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:47711: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:47709: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
 
 	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:47716: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:47714: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_cflags"
@@ -47721,13 +47719,13 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
-	echo "$as_me:47724: checking for XOpenDisplay" >&5
+	echo "$as_me:47722: 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 47730 "configure"
+#line 47728 "configure"
 #include "confdefs.h"
 #define XOpenDisplay autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -47758,16 +47756,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:47761: \"$ac_link\"") >&5
+if { (eval echo "$as_me:47759: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:47764: \$? = $ac_status" >&5
+  echo "$as_me:47762: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:47767: \"$ac_try\"") >&5
+  { (eval echo "$as_me:47765: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:47770: \$? = $ac_status" >&5
+  echo "$as_me:47768: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_XOpenDisplay=yes
 else
@@ -47777,13 +47775,13 @@ ac_cv_func_XOpenDisplay=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:47780: result: $ac_cv_func_XOpenDisplay" >&5
+echo "$as_me:47778: 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:47786: checking for XOpenDisplay in -lX11" >&5
+	echo "$as_me:47784: 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
@@ -47791,7 +47789,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 47794 "configure"
+#line 47792 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -47810,16 +47808,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:47813: \"$ac_link\"") >&5
+if { (eval echo "$as_me:47811: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:47816: \$? = $ac_status" >&5
+  echo "$as_me:47814: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:47819: \"$ac_try\"") >&5
+  { (eval echo "$as_me:47817: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:47822: \$? = $ac_status" >&5
+  echo "$as_me:47820: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -47830,7 +47828,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:47833: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:47831: 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
 
@@ -47854,13 +47852,13 @@ fi
 
 fi
 
-	echo "$as_me:47857: checking for XtAppInitialize" >&5
+	echo "$as_me:47855: 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 47863 "configure"
+#line 47861 "configure"
 #include "confdefs.h"
 #define XtAppInitialize autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -47891,16 +47889,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:47894: \"$ac_link\"") >&5
+if { (eval echo "$as_me:47892: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:47897: \$? = $ac_status" >&5
+  echo "$as_me:47895: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:47900: \"$ac_try\"") >&5
+  { (eval echo "$as_me:47898: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:47903: \$? = $ac_status" >&5
+  echo "$as_me:47901: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_XtAppInitialize=yes
 else
@@ -47910,13 +47908,13 @@ ac_cv_func_XtAppInitialize=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:47913: result: $ac_cv_func_XtAppInitialize" >&5
+echo "$as_me:47911: 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:47919: checking for XtAppInitialize in -lXt" >&5
+	echo "$as_me:47917: 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
@@ -47924,7 +47922,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 47927 "configure"
+#line 47925 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -47943,16 +47941,16 @@ XtAppInitialize ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:47946: \"$ac_link\"") >&5
+if { (eval echo "$as_me:47944: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:47949: \$? = $ac_status" >&5
+  echo "$as_me:47947: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:47952: \"$ac_try\"") >&5
+  { (eval echo "$as_me:47950: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:47955: \$? = $ac_status" >&5
+  echo "$as_me:47953: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xt_XtAppInitialize=yes
 else
@@ -47963,7 +47961,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:47966: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:47964: 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
 
@@ -47980,7 +47978,7 @@ fi
 fi
 
 if test "$cf_have_X_LIBS" = no ; then
-	{ echo "$as_me:47983: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+	{ echo "$as_me:47981: 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
@@ -48021,14 +48019,14 @@ done
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}-I$cf_path/include"
 
-			echo "$as_me:48024: checking for $cf_test in $cf_path" >&5
+			echo "$as_me:48022: 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:48027: checking for $cf_test" >&5
+			echo "$as_me:48025: checking for $cf_test" >&5
 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
 		fi
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 48031 "configure"
+#line 48029 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -48042,16 +48040,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:48045: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:48043: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:48048: \$? = $ac_status" >&5
+  echo "$as_me:48046: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:48051: \"$ac_try\"") >&5
+  { (eval echo "$as_me:48049: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48054: \$? = $ac_status" >&5
+  echo "$as_me:48052: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -48060,7 +48058,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-		echo "$as_me:48063: result: $cf_result" >&5
+		echo "$as_me:48061: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 LIBS="$cf_save_LIBS_CF_X_ATHENA_CPPFLAGS"
@@ -48076,7 +48074,7 @@ CPPFLAGS="$cf_save_CPPFLAGS_CF_X_ATHENA_CPPFLAGS"
 done
 
 if test -z "$cf_x_athena_inc" ; then
-	{ echo "$as_me:48079: WARNING: Unable to find Athena header files" >&5
+	{ echo "$as_me:48077: WARNING: Unable to find Athena header files" >&5
 echo "$as_me: WARNING: Unable to find Athena header files" >&2;}
 elif test "$cf_x_athena_inc" != default ; then
 
@@ -48141,10 +48139,10 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
-		echo "$as_me:48144: checking for $cf_test in $cf_libs" >&5
+		echo "$as_me:48142: checking for $cf_test in $cf_libs" >&5
 echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 48147 "configure"
+#line 48145 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -48161,16 +48159,16 @@ $cf_test((XtAppContext) 0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:48164: \"$ac_link\"") >&5
+if { (eval echo "$as_me:48162: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:48167: \$? = $ac_status" >&5
+  echo "$as_me:48165: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:48170: \"$ac_try\"") >&5
+  { (eval echo "$as_me:48168: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48173: \$? = $ac_status" >&5
+  echo "$as_me:48171: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -48179,7 +48177,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:48182: result: $cf_result" >&5
+		echo "$as_me:48180: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 LIBS="$cf_save_LIBS_CF_X_ATHENA_LIBS"
@@ -48196,7 +48194,7 @@ CPPFLAGS="$cf_save_CPPFLAGS_CF_X_ATHENA_LIBS"
 done
 
 if test -z "$cf_x_athena_lib" ; then
-	{ { echo "$as_me:48199: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+	{ { echo "$as_me:48197: 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
@@ -48230,7 +48228,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:48233: checking for $ac_word" >&5
+echo "$as_me:48231: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_XCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -48245,7 +48243,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_XCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:48248: found $ac_dir/$ac_word" >&5
+echo "$as_me:48246: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -48253,10 +48251,10 @@ fi
 fi
 XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
 if test -n "$XCURSES_CONFIG"; then
-  echo "$as_me:48256: result: $XCURSES_CONFIG" >&5
+  echo "$as_me:48254: result: $XCURSES_CONFIG" >&5
 echo "${ECHO_T}$XCURSES_CONFIG" >&6
 else
-  echo "$as_me:48259: result: no" >&5
+  echo "$as_me:48257: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -48269,7 +48267,7 @@ if test -z "$XCURSES_CONFIG"; then
 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:48272: checking for $ac_word" >&5
+echo "$as_me:48270: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_XCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -48284,7 +48282,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_ac_ct_XCURSES_CONFIG="$ac_prog"
-echo "$as_me:48287: found $ac_dir/$ac_word" >&5
+echo "$as_me:48285: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -48292,10 +48290,10 @@ fi
 fi
 ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG
 if test -n "$ac_ct_XCURSES_CONFIG"; then
-  echo "$as_me:48295: result: $ac_ct_XCURSES_CONFIG" >&5
+  echo "$as_me:48293: result: $ac_ct_XCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6
 else
-  echo "$as_me:48298: result: no" >&5
+  echo "$as_me:48296: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -48430,7 +48428,7 @@ LDFLAGS="$LDFLAGS $X_LIBS"
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:48433: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:48431: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -48515,7 +48513,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}:48518: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:48516: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -48525,7 +48523,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}:48528: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:48526: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -48535,7 +48533,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:48538: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:48536: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
 
 	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
 	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
@@ -48544,7 +48542,7 @@ fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 48547 "configure"
+#line 48545 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -48556,16 +48554,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:48559: \"$ac_link\"") >&5
+if { (eval echo "$as_me:48557: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:48562: \$? = $ac_status" >&5
+  echo "$as_me:48560: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:48565: \"$ac_try\"") >&5
+  { (eval echo "$as_me:48563: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48568: \$? = $ac_status" >&5
+  echo "$as_me:48566: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -48573,12 +48571,12 @@ else
 cat "conftest.$ac_ext" >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:48576: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:48574: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
 
 	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:48581: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:48579: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_cflags"
@@ -48586,7 +48584,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:48589: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:48587: 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
@@ -48594,7 +48592,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 48597 "configure"
+#line 48595 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -48613,16 +48611,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:48616: \"$ac_link\"") >&5
+if { (eval echo "$as_me:48614: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:48619: \$? = $ac_status" >&5
+  echo "$as_me:48617: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:48622: \"$ac_try\"") >&5
+  { (eval echo "$as_me:48620: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48625: \$? = $ac_status" >&5
+  echo "$as_me:48623: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -48633,7 +48631,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:48636: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:48634: 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
 
@@ -48655,7 +48653,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-echo "$as_me:48658: checking for XCurses library" >&5
+echo "$as_me:48656: 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
@@ -48678,7 +48676,7 @@ done
 LIBS="$cf_add_libs"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 48681 "configure"
+#line 48679 "configure"
 #include "confdefs.h"
 
 #include <xcurses.h>
@@ -48693,16 +48691,16 @@ XCursesExit();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:48696: \"$ac_link\"") >&5
+if { (eval echo "$as_me:48694: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:48699: \$? = $ac_status" >&5
+  echo "$as_me:48697: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:48702: \"$ac_try\"") >&5
+  { (eval echo "$as_me:48700: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48705: \$? = $ac_status" >&5
+  echo "$as_me:48703: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_lib_XCurses=yes
 else
@@ -48713,7 +48711,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:48716: result: $cf_cv_lib_XCurses" >&5
+echo "$as_me:48714: result: $cf_cv_lib_XCurses" >&5
 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
 
 fi
@@ -48728,23 +48726,23 @@ cat >>confdefs.h <<\EOF
 #define XCURSES 1
 EOF
 
-	echo "$as_me:48731: checking for xcurses.h" >&5
+	echo "$as_me:48729: 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 48737 "configure"
+#line 48735 "configure"
 #include "confdefs.h"
 #include <xcurses.h>
 _ACEOF
-if { (eval echo "$as_me:48741: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:48739: \"$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:48747: \$? = $ac_status" >&5
+  echo "$as_me:48745: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -48763,7 +48761,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:48766: result: $ac_cv_header_xcurses_h" >&5
+echo "$as_me:48764: 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
 
@@ -48774,7 +48772,7 @@ EOF
 fi
 
 else
-	{ { echo "$as_me:48777: error: Cannot link with XCurses" >&5
+	{ { echo "$as_me:48775: error: Cannot link with XCurses" >&5
 echo "$as_me: error: Cannot link with XCurses" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -48783,7 +48781,7 @@ fi
 	esac
 else
 
-echo "$as_me:48786: checking if we can include termio.h with curses" >&5
+echo "$as_me:48784: 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
@@ -48793,7 +48791,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 48796 "configure"
+#line 48794 "configure"
 #include "confdefs.h"
 
 #include <LYCurses.h>
@@ -48807,16 +48805,16 @@ putchar(0x0a)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:48810: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:48808: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:48813: \$? = $ac_status" >&5
+  echo "$as_me:48811: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:48816: \"$ac_try\"") >&5
+  { (eval echo "$as_me:48814: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48819: \$? = $ac_status" >&5
+  echo "$as_me:48817: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_termio_and_curses=yes
 else
@@ -48829,7 +48827,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
     rm -f lynx_cfg.h
 
 fi
-echo "$as_me:48832: result: $cf_cv_termio_and_curses" >&5
+echo "$as_me:48830: result: $cf_cv_termio_and_curses" >&5
 echo "${ECHO_T}$cf_cv_termio_and_curses" >&6
 
 test "$cf_cv_termio_and_curses" = yes &&
@@ -48846,23 +48844,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:48849: checking for $ac_header" >&5
+echo "$as_me:48847: 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 48855 "configure"
+#line 48853 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:48859: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:48857: \"$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:48865: \$? = $ac_status" >&5
+  echo "$as_me:48863: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -48881,7 +48879,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:48884: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:48882: 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
@@ -48893,7 +48891,7 @@ done
 
 	fi
 
-echo "$as_me:48896: checking if curses supports alternate-character set" >&5
+echo "$as_me:48894: 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
@@ -48902,7 +48900,7 @@ else
 for mapname in acs_map _acs_map
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 48905 "configure"
+#line 48903 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -48916,16 +48914,16 @@ chtype x = ${mapname}['l']; ${mapname}['m'] = 0; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:48919: \"$ac_link\"") >&5
+if { (eval echo "$as_me:48917: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:48922: \$? = $ac_status" >&5
+  echo "$as_me:48920: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:48925: \"$ac_try\"") >&5
+  { (eval echo "$as_me:48923: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48928: \$? = $ac_status" >&5
+  echo "$as_me:48926: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_alt_char_set=$mapname
 	 break
@@ -48939,21 +48937,21 @@ done
 
 fi
 
-echo "$as_me:48942: result: $cf_cv_alt_char_set" >&5
+echo "$as_me:48940: 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:48949: checking if curses supports fancy attributes" >&5
+echo "$as_me:48947: 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 48956 "configure"
+#line 48954 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -48971,16 +48969,16 @@ attrset(A_UNDERLINE|A_BOLD|A_REVERSE);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:48974: \"$ac_link\"") >&5
+if { (eval echo "$as_me:48972: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:48977: \$? = $ac_status" >&5
+  echo "$as_me:48975: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:48980: \"$ac_try\"") >&5
+  { (eval echo "$as_me:48978: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48983: \$? = $ac_status" >&5
+  echo "$as_me:48981: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fancy_curses=yes
 else
@@ -48992,14 +48990,14 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:48995: result: $cf_cv_fancy_curses" >&5
+echo "$as_me:48993: 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:49002: checking for function curses_version" >&5
+echo "$as_me:49000: 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
@@ -49009,7 +49007,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_curses_version=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 49012 "configure"
+#line 49010 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -49025,15 +49023,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:49028: \"$ac_link\"") >&5
+if { (eval echo "$as_me:49026: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:49031: \$? = $ac_status" >&5
+  echo "$as_me:49029: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:49033: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49031: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49036: \$? = $ac_status" >&5
+  echo "$as_me:49034: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_curses_version=yes
 
@@ -49048,7 +49046,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 rm -f core
 fi
-echo "$as_me:49051: result: $cf_cv_func_curses_version" >&5
+echo "$as_me:49049: 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
@@ -49056,14 +49054,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test "$cf_cv_ncurses_version" != no ; then
-echo "$as_me:49059: checking for obsolete/broken version of ncurses" >&5
+echo "$as_me:49057: 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 49066 "configure"
+#line 49064 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -49082,16 +49080,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:49085: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:49083: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:49088: \$? = $ac_status" >&5
+  echo "$as_me:49086: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:49091: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49089: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49094: \$? = $ac_status" >&5
+  echo "$as_me:49092: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_broken=no
 else
@@ -49103,10 +49101,10 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:49106: result: $cf_cv_ncurses_broken" >&5
+echo "$as_me:49104: 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:49109: WARNING: hmm... you should get an up-to-date version of ncurses" >&5
+	{ echo "$as_me:49107: 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
@@ -49116,14 +49114,14 @@ EOF
 fi
 fi
 
-echo "$as_me:49119: checking if curses supports color attributes" >&5
+echo "$as_me:49117: 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 49126 "configure"
+#line 49124 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -49143,16 +49141,16 @@ chtype x = COLOR_BLUE;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:49146: \"$ac_link\"") >&5
+if { (eval echo "$as_me:49144: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:49149: \$? = $ac_status" >&5
+  echo "$as_me:49147: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:49152: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49150: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49155: \$? = $ac_status" >&5
+  echo "$as_me:49153: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_color_curses=yes
 else
@@ -49164,7 +49162,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:49167: result: $cf_cv_color_curses" >&5
+echo "$as_me:49165: result: $cf_cv_color_curses" >&5
 echo "${ECHO_T}$cf_cv_color_curses" >&6
 if test "$cf_cv_color_curses" = yes ; then
 
@@ -49188,23 +49186,23 @@ sys/termio.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:49191: checking for $ac_header" >&5
+echo "$as_me:49189: 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 49197 "configure"
+#line 49195 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:49201: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:49199: \"$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:49207: \$? = $ac_status" >&5
+  echo "$as_me:49205: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -49223,7 +49221,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:49226: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:49224: 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
@@ -49240,10 +49238,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	(*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:49243: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:49241: 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 49246 "configure"
+#line 49244 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -49255,16 +49253,16 @@ struct termios foo; int x = foo.c_iflag = 1; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:49258: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:49256: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:49261: \$? = $ac_status" >&5
+  echo "$as_me:49259: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:49264: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49262: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49267: \$? = $ac_status" >&5
+  echo "$as_me:49265: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=no
 else
@@ -49272,7 +49270,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 49275 "configure"
+#line 49273 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -49286,16 +49284,16 @@ struct termios foo; int x = foo.c_iflag = 2; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:49289: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:49287: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:49292: \$? = $ac_status" >&5
+  echo "$as_me:49290: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:49295: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49293: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49298: \$? = $ac_status" >&5
+  echo "$as_me:49296: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=unknown
 else
@@ -49311,12 +49309,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:49314: result: $termios_bad" >&5
+	echo "$as_me:49312: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:49319: checking declaration of size-change" >&5
+echo "$as_me:49317: 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
@@ -49337,7 +49335,7 @@ do
 
 	fi
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 49340 "configure"
+#line 49338 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -49387,16 +49385,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:49390: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:49388: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:49393: \$? = $ac_status" >&5
+  echo "$as_me:49391: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:49396: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49394: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49399: \$? = $ac_status" >&5
+  echo "$as_me:49397: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sizechange=yes
 else
@@ -49415,7 +49413,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:49418: result: $cf_cv_sizechange" >&5
+echo "$as_me:49416: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 
@@ -49433,14 +49431,14 @@ EOF
 	esac
 fi
 
-echo "$as_me:49436: checking if ttytype is declared in curses library" >&5
+echo "$as_me:49434: 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 49443 "configure"
+#line 49441 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -49452,16 +49450,16 @@ char *x = &ttytype[1]; *x = 1
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:49455: \"$ac_link\"") >&5
+if { (eval echo "$as_me:49453: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:49458: \$? = $ac_status" >&5
+  echo "$as_me:49456: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:49461: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49459: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49464: \$? = $ac_status" >&5
+  echo "$as_me:49462: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_ttytype=yes
 else
@@ -49473,7 +49471,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:49476: result: $cf_cv_have_ttytype" >&5
+echo "$as_me:49474: result: $cf_cv_have_ttytype" >&5
 echo "${ECHO_T}$cf_cv_have_ttytype" >&6
 test "$cf_cv_have_ttytype" = yes &&
 cat >>confdefs.h <<\EOF
@@ -49482,14 +49480,14 @@ EOF
 
 	if test "$use_wide_curses" = yes ; then
 
-echo "$as_me:49485: checking if curses supports wide characters" >&5
+echo "$as_me:49483: 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 49492 "configure"
+#line 49490 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -49508,16 +49506,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:49511: \"$ac_link\"") >&5
+if { (eval echo "$as_me:49509: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:49514: \$? = $ac_status" >&5
+  echo "$as_me:49512: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:49517: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49515: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49520: \$? = $ac_status" >&5
+  echo "$as_me:49518: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_widec_curses=yes
 else
@@ -49528,7 +49526,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:49531: result: $cf_cv_widec_curses" >&5
+echo "$as_me:49529: result: $cf_cv_widec_curses" >&5
 echo "${ECHO_T}$cf_cv_widec_curses" >&6
 
 if test "$cf_cv_widec_curses" = yes ; then
@@ -49538,14 +49536,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	# This is needed on Tru64 5.0 to declare mbstate_t
-	echo "$as_me:49541: checking if we must include wchar.h to declare mbstate_t" >&5
+	echo "$as_me:49539: 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 49548 "configure"
+#line 49546 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -49559,23 +49557,23 @@ mbstate_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:49562: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:49560: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:49565: \$? = $ac_status" >&5
+  echo "$as_me:49563: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:49568: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49566: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49571: \$? = $ac_status" >&5
+  echo "$as_me:49569: \$? = $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 49578 "configure"
+#line 49576 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -49590,16 +49588,16 @@ mbstate_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:49593: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:49591: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:49596: \$? = $ac_status" >&5
+  echo "$as_me:49594: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:49599: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49597: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49602: \$? = $ac_status" >&5
+  echo "$as_me:49600: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_widec_mbstate=yes
 else
@@ -49611,7 +49609,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:49614: result: $cf_cv_widec_mbstate" >&5
+echo "$as_me:49612: result: $cf_cv_widec_mbstate" >&5
 echo "${ECHO_T}$cf_cv_widec_mbstate" >&6
 
 if test "$cf_cv_widec_mbstate" = yes ; then
@@ -49634,7 +49632,7 @@ fi
 
 	fi
 
-echo "$as_me:49637: checking definition to turn on extended curses functions" >&5
+echo "$as_me:49635: checking definition to turn on extended curses functions" >&5
 echo $ECHO_N "checking definition to turn on extended curses functions... $ECHO_C" >&6
 if test "${cf_cv_need_xopen_extension+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -49642,7 +49640,7 @@ else
 
 cf_cv_need_xopen_extension=unknown
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 49645 "configure"
+#line 49643 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -49674,16 +49672,16 @@ make an error	/* prefer to fall-through on the second checks */
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:49677: \"$ac_link\"") >&5
+if { (eval echo "$as_me:49675: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:49680: \$? = $ac_status" >&5
+  echo "$as_me:49678: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:49683: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49681: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49686: \$? = $ac_status" >&5
+  echo "$as_me:49684: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_xopen_extension=none
 else
@@ -49693,7 +49691,7 @@ cat "conftest.$ac_ext" >&5
 	for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 49696 "configure"
+#line 49694 "configure"
 #include "confdefs.h"
 
 #define $cf_try_xopen_extension 1
@@ -49718,16 +49716,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:49721: \"$ac_link\"") >&5
+if { (eval echo "$as_me:49719: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:49724: \$? = $ac_status" >&5
+  echo "$as_me:49722: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:49727: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49725: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49730: \$? = $ac_status" >&5
+  echo "$as_me:49728: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_xopen_extension=$cf_try_xopen_extension; break
 else
@@ -49741,7 +49739,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:49744: result: $cf_cv_need_xopen_extension" >&5
+echo "$as_me:49742: result: $cf_cv_need_xopen_extension" >&5
 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
 
 case "$cf_cv_need_xopen_extension" in
@@ -49753,7 +49751,7 @@ case "$cf_cv_need_xopen_extension" in
 	;;
 esac
 
-echo "$as_me:49756: checking for term.h" >&5
+echo "$as_me:49754: 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
@@ -49774,7 +49772,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 49777 "configure"
+#line 49775 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -49788,16 +49786,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:49791: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:49789: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:49794: \$? = $ac_status" >&5
+  echo "$as_me:49792: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:49797: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49795: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49800: \$? = $ac_status" >&5
+  echo "$as_me:49798: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_term_header=$cf_header
 	 break
@@ -49816,7 +49814,7 @@ case "$cf_cv_term_header" in
 	for cf_header in ncurses/term.h ncursesw/term.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 49819 "configure"
+#line 49817 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -49834,16 +49832,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:49837: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:49835: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:49840: \$? = $ac_status" >&5
+  echo "$as_me:49838: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:49843: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49841: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49846: \$? = $ac_status" >&5
+  echo "$as_me:49844: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_term_header=$cf_header
 			 break
@@ -49858,7 +49856,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 esac
 
 fi
-echo "$as_me:49861: result: $cf_cv_term_header" >&5
+echo "$as_me:49859: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 case "$cf_cv_term_header" in
@@ -49885,7 +49883,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:49888: checking for unctrl.h" >&5
+echo "$as_me:49886: 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
@@ -49906,7 +49904,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 49909 "configure"
+#line 49907 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -49920,16 +49918,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:49923: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:49921: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:49926: \$? = $ac_status" >&5
+  echo "$as_me:49924: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:49929: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49927: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49932: \$? = $ac_status" >&5
+  echo "$as_me:49930: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_unctrl_header=$cf_header
 	 break
@@ -49942,12 +49940,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:49945: result: $cf_cv_unctrl_header" >&5
+echo "$as_me:49943: result: $cf_cv_unctrl_header" >&5
 echo "${ECHO_T}$cf_cv_unctrl_header" >&6
 
 case "$cf_cv_unctrl_header" in
 (no)
-	{ echo "$as_me:49950: WARNING: unctrl.h header not found" >&5
+	{ echo "$as_me:49948: WARNING: unctrl.h header not found" >&5
 echo "$as_me: WARNING: unctrl.h header not found" >&2;}
 	;;
 esac
@@ -50003,10 +50001,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:50006: checking for ${cf_func}" >&5
+	echo "$as_me:50004: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me:-configure}:50009: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:50007: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -50015,7 +50013,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 50018 "configure"
+#line 50016 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -50048,16 +50046,16 @@ if (foo + 1234L > 5678L)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:50051: \"$ac_link\"") >&5
+if { (eval echo "$as_me:50049: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:50054: \$? = $ac_status" >&5
+  echo "$as_me:50052: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:50057: \"$ac_try\"") >&5
+  { (eval echo "$as_me:50055: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:50060: \$? = $ac_status" >&5
+  echo "$as_me:50058: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -50073,7 +50071,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:50076: result: $cf_result" >&5
+	echo "$as_me:50074: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" != no; then
 		cat >>confdefs.h <<EOF
@@ -50090,13 +50088,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:50093: checking for $ac_func" >&5
+echo "$as_me:50091: 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 50099 "configure"
+#line 50097 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -50127,16 +50125,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:50130: \"$ac_link\"") >&5
+if { (eval echo "$as_me:50128: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:50133: \$? = $ac_status" >&5
+  echo "$as_me:50131: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:50136: \"$ac_try\"") >&5
+  { (eval echo "$as_me:50134: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:50139: \$? = $ac_status" >&5
+  echo "$as_me:50137: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -50146,7 +50144,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:50149: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:50147: 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
@@ -50160,12 +50158,12 @@ fi
 
 if test "$use_color_style" != no ; then
 	if test .$cf_cv_color_curses != .yes ; then
-		{ { echo "$as_me:50163: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:50161: 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:50168: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:50166: error: Configuration does not support color-styles" >&5
 echo "$as_me: error: Configuration does not support color-styles" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -50173,7 +50171,7 @@ fi
 
 if test "$use_scrollbar" != no ; then
 	if test .$cf_cv_fancy_curses != .yes ; then
-		{ echo "$as_me:50176: WARNING: Configuration does not support ACS_xxx definitions" >&5
+		{ echo "$as_me:50174: WARNING: Configuration does not support ACS_xxx definitions" >&5
 echo "$as_me: WARNING: Configuration does not support ACS_xxx definitions" >&2;}
 	else
 
@@ -50186,7 +50184,7 @@ fi
 
 # use rpath for libraries in unusual places
 
-echo "$as_me:50189: checking if rpath-hack should be disabled" >&5
+echo "$as_me:50187: 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.
@@ -50204,22 +50202,22 @@ else
 
 fi;
 if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi
-echo "$as_me:50207: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:50205: result: $cf_disable_rpath_hack" >&5
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 
 if test "$enable_rpath_hack" = yes ; then
 
-echo "$as_me:50212: checking for updated LDFLAGS" >&5
+echo "$as_me:50210: 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:50215: result: maybe" >&5
+	echo "$as_me:50213: 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:50222: checking for $ac_word" >&5
+echo "$as_me:50220: 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
@@ -50234,7 +50232,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:50237: found $ac_dir/$ac_word" >&5
+echo "$as_me:50235: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -50242,10 +50240,10 @@ fi
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:50245: result: $cf_ldd_prog" >&5
+  echo "$as_me:50243: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:50248: result: no" >&5
+  echo "$as_me:50246: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -50259,7 +50257,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
 		cf_rpath_oops=
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 50262 "configure"
+#line 50260 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -50271,16 +50269,16 @@ printf("Hello");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:50274: \"$ac_link\"") >&5
+if { (eval echo "$as_me:50272: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:50277: \$? = $ac_status" >&5
+  echo "$as_me:50275: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:50280: \"$ac_try\"") >&5
+  { (eval echo "$as_me:50278: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:50283: \$? = $ac_status" >&5
+  echo "$as_me:50281: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
 		 cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
@@ -50308,7 +50306,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}:50311: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:50309: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 
 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
 						break
@@ -50320,11 +50318,11 @@ echo "${as_me:-configure}:50311: testing ...adding -L$cf_rpath_dir/lib to LDFLAG
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:50323: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:50321: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:50327: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:50325: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -50361,7 +50359,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:50364: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:50362: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -50374,11 +50372,11 @@ LDFLAGS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:50377: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:50375: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:50381: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:50379: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -50415,7 +50413,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:50418: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:50416: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -50428,14 +50426,14 @@ LIBS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:50431: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:50429: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:50435: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:50433: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 else
-	echo "$as_me:50438: result: no" >&5
+	echo "$as_me:50436: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -50550,7 +50548,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:50553: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:50551: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -50731,7 +50729,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:50734: error: ambiguous option: $1
+    { { echo "$as_me:50732: 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;}
@@ -50750,7 +50748,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:50753: error: unrecognized option: $1
+  -*) { { echo "$as_me:50751: 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;}
@@ -50803,7 +50801,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:50806: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:50804: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -51167,7 +51165,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:51170: creating $ac_file" >&5
+    { echo "$as_me:51168: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -51185,7 +51183,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:51188: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:51186: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -51198,7 +51196,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:51201: error: cannot find input file: $f" >&5
+           { { echo "$as_me:51199: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -51214,7 +51212,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:51217: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:51215: WARNING: datarootdir was used implicitly but not set:
 $ac_seen" >&5
 echo "$as_me: WARNING: datarootdir was used implicitly but not set:
 $ac_seen" >&2;}
@@ -51223,7 +51221,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:51226: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:51224: WARNING: datarootdir was used explicitly but not set:
 $ac_seen" >&5
 echo "$as_me: WARNING: datarootdir was used explicitly but not set:
 $ac_seen" >&2;}
@@ -51268,7 +51266,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             ac_init=`$EGREP '[ 	]*'$ac_name'[ 	]*=' "$ac_file"`
             if test -z "$ac_init"; then
               ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'`
-              { echo "$as_me:51271: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:51269: WARNING: Variable $ac_name is used but was not set:
 $ac_seen" >&5
 echo "$as_me: WARNING: Variable $ac_name is used but was not set:
 $ac_seen" >&2;}
@@ -51279,7 +51277,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:51282: WARNING: Some variables may not be substituted:
+      { echo "$as_me:51280: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -51328,7 +51326,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:51331: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:51329: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -51339,7 +51337,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:51342: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:51340: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -51352,7 +51350,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:51355: error: cannot find input file: $f" >&5
+           { { echo "$as_me:51353: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -51470,7 +51468,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:51473: $ac_file is unchanged" >&5
+      { echo "$as_me:51471: $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/samples/home.htm b/samples/home.htm
index b2628215..f31f9a3d 100644
--- a/samples/home.htm
+++ b/samples/home.htm
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

 <!--

- $LynxId: home.htm,v 1.4 2008/01/06 20:53:04 tom Exp $

+ $LynxId: home.htm,v 1.5 2023/01/29 19:02:46 tom Exp $

  vile:dos

  -->

 <html>

@@ -9,6 +9,7 @@
       :: hello ::

     </title>

     <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">

+  <meta name="viewport" content="width=device-width, initial-scale=1">
   </head>

   <body>

     <table width="100%" summary="Lynx home page" align="right">

diff --git a/samples/jumps.htm b/samples/jumps.htm
index 57ac56cd..d4cbddd8 100644
--- a/samples/jumps.htm
+++ b/samples/jumps.htm
@@ -8,6 +8,7 @@
   "text/html; charset=us-ascii">
 
   <title>Jumps file</title>
+  <meta name="viewport" content="width=device-width, initial-scale=1">
 </head>
 
 <body>
diff --git a/samples/jumpsUnix.html b/samples/jumpsUnix.html
index 77b1fea1..10b03809 100644
--- a/samples/jumpsUnix.html
+++ b/samples/jumpsUnix.html
@@ -2,6 +2,7 @@
 <head>
 <title>Shortcut List</title>
 <link rev="made" href="mailto:WebMaster@foo.blah.dom">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
 </head>
 <body>
     <h1>Shortcut List</h1>
diff --git a/samples/jumpsVMS.html b/samples/jumpsVMS.html
index b68412fe..b9870059 100644
--- a/samples/jumpsVMS.html
+++ b/samples/jumpsVMS.html
@@ -2,6 +2,7 @@
 <head>
 <title>Shortcut List</title>
 <link rev="made" href="mailto:WebMaster@foo.blah.dom">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
 </head>
 <body>
     <h1>Shortcut List</h1>
diff --git a/samples/lynx_bookmarks.htm b/samples/lynx_bookmarks.htm
index 378f28ca..bb43e885 100644
--- a/samples/lynx_bookmarks.htm
+++ b/samples/lynx_bookmarks.htm
@@ -1,6 +1,7 @@
 <head>

 <meta http-equiv="content-type" content="text/html;charset=windows-1252">

 <title>Bookmark file</title>

+  <meta name="viewport" content="width=device-width, initial-scale=1">
 </head>

      You can delete links by the 'R' key<br>

 <ol>

diff --git a/test/ALT88592.html b/test/ALT88592.html
index 419e6997..59d86f94 100644
--- a/test/ALT88592.html
+++ b/test/ALT88592.html
@@ -9,6 +9,7 @@
      They should be inaccessible so that the ALT text will be shown in graphical browsers.
      Use file: to save network resources. -->
 <BASE HREF="file://localhost/this.path.intentionally.invalid/">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
 </HEAD>
 
 <BODY> 
diff --git a/test/ISO_LATIN1_test.html b/test/ISO_LATIN1_test.html
index d767978e..a6369b81 100644
--- a/test/ISO_LATIN1_test.html
+++ b/test/ISO_LATIN1_test.html
@@ -3,6 +3,7 @@
 <head>
 <title>Test of minimal ISO LATIN1 character set</title>
 <link rev="made" href="mailto:lynx-dev@nongnu.org">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
 </head>
 
 <body>
diff --git a/test/TestComment.html b/test/TestComment.html
index 873169f2..8bf39a9e 100644
--- a/test/TestComment.html
+++ b/test/TestComment.html
@@ -4,6 +4,7 @@
 <title>HTML Comment Parser Test</title>
 <link rev="made" href="mailto:pg@sweng.stortek.com">
 <base href="http://nyx10.cs.du.edu:8001/~pgilmart/TestComment.html">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
 </head>
 
 <body>
diff --git a/test/bad-html.html b/test/bad-html.html
index 8c0b9dc1..ab00a966 100644
--- a/test/bad-html.html
+++ b/test/bad-html.html
@@ -5,6 +5,7 @@
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
 <LINK REV="made" HREF="mailto:lynx-dev@nongnu.org">
 <LINK REV="owner" HREF="http://mail.gnu.org/mailman/listinfo/lynx-dev/">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
 </HEAD>
 
 <BODY> 
diff --git a/test/c1.html b/test/c1.html
index 6ec70aa5..c8d1eddd 100644
--- a/test/c1.html
+++ b/test/c1.html
@@ -2,6 +2,7 @@
 <HTML> 
 <HEAD> 
 <TITLE>Test of invalid NCRs 128-159</TITLE> 
+  <meta name="viewport" content="width=device-width, initial-scale=1">
 </HEAD> 
 <BODY><H2>Test of invalid NCRs 128-159</H2> 
 <P> 
diff --git a/test/circle.html b/test/circle.html
index dedf3050..acf8f456 100644
--- a/test/circle.html
+++ b/test/circle.html
@@ -6,6 +6,7 @@
   "HTML Tidy for Linux (vers 25 March 2009), see www.w3.org">
 
   <title>Test ImageMap - circle</title>
+  <meta name="viewport" content="width=device-width, initial-scale=1">
 </head>
 
 <body>
diff --git a/test/cp-1252.html b/test/cp-1252.html
index 387c92a0..f895ac7c 100644
--- a/test/cp-1252.html
+++ b/test/cp-1252.html
@@ -7,6 +7,7 @@
 <LINK REV="owner" HREF="http://mail.gnu.org/mailman/listinfo/lynx-dev/">
 <LINK REL="sibling" HREF="iso-8859-1.html" TITLE="iso-8859-1 test">
 <LINK REL="sibling" HREF="ALT88592.html"  TITLE="iso-8859-2 ALT test">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
 </HEAD>
 
 <BODY> 
diff --git a/test/cp-1252a.html b/test/cp-1252a.html
index 99800a3e..1bb5d863 100644
--- a/test/cp-1252a.html
+++ b/test/cp-1252a.html
@@ -7,6 +7,7 @@
 <LINK REV="owner" HREF="http://mail.gnu.org/mailman/listinfo/lynx-dev/">
 <LINK REL="sibling" HREF="iso-8859-1.html" TITLE="iso-8859-1 test">
 <LINK REL="sibling" HREF="ALT88592.html"  TITLE="iso-8859-2 ALT test">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
 </HEAD>
 
 <BODY> 
diff --git a/test/idna-tr46.html b/test/idna-tr46.html
index e67f2875..f1e0b0c5 100644
--- a/test/idna-tr46.html
+++ b/test/idna-tr46.html
@@ -6,6 +6,7 @@
 <head>
 <title>Sample URLs from TR-46</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
 </head>
 
 <body>
diff --git a/test/iso-8859-1.html b/test/iso-8859-1.html
index b9349fa2..61a13e4c 100644
--- a/test/iso-8859-1.html
+++ b/test/iso-8859-1.html
@@ -7,6 +7,7 @@
 <TITLE>Martin Ramsch - iso8859-1 table</TITLE>
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
 <BASE HREF="http://www.ramsch.org/martin/uni/fmi-hp/iso8859-1.html">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
 </HEAD>
 
 <BODY> 
diff --git a/test/iso-8859-1a.html b/test/iso-8859-1a.html
index 972329d3..715061a7 100644
--- a/test/iso-8859-1a.html
+++ b/test/iso-8859-1a.html
@@ -7,6 +7,7 @@
 <TITLE>Martin Ramsch - iso8859-1 table</TITLE>
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
 <BASE HREF="http://www.ramsch.org/martin/uni/fmi-hp/iso8859-1.html">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
 </HEAD>
 
 <BODY> 
diff --git a/test/iso-8859-2.html b/test/iso-8859-2.html
index 39380e3b..37c705e1 100644
--- a/test/iso-8859-2.html
+++ b/test/iso-8859-2.html
@@ -8,6 +8,7 @@
 <LINK REV="owner" HREF="http://mail.gnu.org/mailman/listinfo/lynx-dev/">
 <LINK REL="sibling" HREF="iso-8859-1.html" TITLE="iso-8859-1 test">
 <LINK REL="sibling" HREF="ALT88592.html"  TITLE="iso-8859-2 ALT test">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
 </HEAD>
 
 <BODY> 
diff --git a/test/iso-8859-2a.html b/test/iso-8859-2a.html
index 062b1a5c..9d6ce0d6 100644
--- a/test/iso-8859-2a.html
+++ b/test/iso-8859-2a.html
@@ -8,6 +8,7 @@
 <LINK REV="owner" HREF="http://mail.gnu.org/mailman/listinfo/lynx-dev/">
 <LINK REL="sibling" HREF="iso-8859-1.html" TITLE="iso-8859-1 test">
 <LINK REL="sibling" HREF="ALT88592.html"  TITLE="iso-8859-2 ALT test">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
 </HEAD>
 
 <BODY> 
diff --git a/test/koi8-r.html b/test/koi8-r.html
index d6792195..e887c1f8 100644
--- a/test/koi8-r.html
+++ b/test/koi8-r.html
@@ -2,6 +2,7 @@
 <HTML>
 <HEAD>
 <TITLE>Test of the KOI8-R symbols</TITLE>
+  <meta name="viewport" content="width=device-width, initial-scale=1">
 </HEAD>
 <BODY>
 <PRE>
diff --git a/test/quickbrown.html b/test/quickbrown.html
index e3207222..d326e9b9 100644
--- a/test/quickbrown.html
+++ b/test/quickbrown.html
@@ -4,6 +4,7 @@
 <TITLE>Markus Kuhn's quick-brown-fox UTF-8 demo</TITLE>
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
 <LINK REV="made" HREF="mailto:dickey@invisible-island.net">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
 </HEAD>
 
 <BODY> 
diff --git a/test/raw8bit.html b/test/raw8bit.html
index f0d0eeb0..9b32eaad 100644
--- a/test/raw8bit.html
+++ b/test/raw8bit.html
@@ -5,6 +5,7 @@
 <!-- you may uncomment the next line
 and set the document's charset directly via META tag -->
 <!--META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1"-->
+  <meta name="viewport" content="width=device-width, initial-scale=1">
 </HEAD>
 <BODY>
 <PRE>
diff --git a/test/sgml.html b/test/sgml.html
index 94425345..db9d2b7c 100644
--- a/test/sgml.html
+++ b/test/sgml.html
@@ -2,6 +2,7 @@
 <HTML>
 <HEAD>
 <TITLE>Test of some Unicode symbols enclosed as SGML entity names</TITLE>
+  <meta name="viewport" content="width=device-width, initial-scale=1">
 </HEAD>
 <BODY>
 <PRE>
diff --git a/test/spaces.html b/test/spaces.html
index d527a193..c3076d95 100644
--- a/test/spaces.html
+++ b/test/spaces.html
@@ -2,6 +2,7 @@
 <HTML>
 <HEAD>
 <TITLE> Test of some symbols </TITLE>
+  <meta name="viewport" content="width=device-width, initial-scale=1">
 </HEAD>
 <BODY>
 <!-- Multiple spaces are normally collapsed unless we are in a <PRE> mode
diff --git a/test/special_urls.html b/test/special_urls.html
index c9d35066..96e789eb 100644
--- a/test/special_urls.html
+++ b/test/special_urls.html
@@ -2,6 +2,7 @@
 <head>
 <title>Lynx Special URLs</title>
 <link rev="made" href="mailto:WebMaster@foo.blah.dom">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
 </head>
 <body>
 <h1>Lynx Special URLs</h1>
diff --git a/test/square.html b/test/square.html
index c8403280..5354dce2 100644
--- a/test/square.html
+++ b/test/square.html
@@ -6,6 +6,7 @@
   "HTML Tidy for Linux (vers 25 March 2009), see www.w3.org">
 
   <title>Test ImageMap - square</title>
+  <meta name="viewport" content="width=device-width, initial-scale=1">
 </head>
 
 <body>
diff --git a/test/tabtest.html b/test/tabtest.html
index 45184a88..73d62ebf 100644
--- a/test/tabtest.html
+++ b/test/tabtest.html
@@ -3,6 +3,7 @@
 <head>
 <title>Tests of TAB element.</title>
 <link rev="made" href="mailto:lynx-dev@nongnu.org">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
 </head>
 
 <body>
diff --git a/test/tags.html b/test/tags.html
index 3f405eca..697e1615 100644
--- a/test/tags.html
+++ b/test/tags.html
@@ -4,6 +4,7 @@
 <TITLE>Tags to Test Color-Style</TITLE>
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
 <link href="nobody" rev="made">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
 </HEAD>
 
 <BODY alink="green" bgcolor="yellow">
diff --git a/test/test-styles.html b/test/test-styles.html
index 728c2880..2cae2842 100644
--- a/test/test-styles.html
+++ b/test/test-styles.html
@@ -2,6 +2,7 @@
 <HTML>
 <HEAD>
 <TITLE>Test Color-Styles</TITLE>
+  <meta name="viewport" content="width=device-width, initial-scale=1">
 </HEAD>
 <BODY>
 <h1>Heading 1</h1>
diff --git a/test/triangle.html b/test/triangle.html
index abea6c72..5dcf6287 100644
--- a/test/triangle.html
+++ b/test/triangle.html
@@ -6,6 +6,7 @@
   "HTML Tidy for Linux (vers 25 March 2009), see www.w3.org">
 
   <title>Test ImageMap - triangle</title>
+  <meta name="viewport" content="width=device-width, initial-scale=1">
 </head>
 
 <body>
diff --git a/test/unicode.html b/test/unicode.html
index 7abcd1a2..903ac615 100644
--- a/test/unicode.html
+++ b/test/unicode.html
@@ -2,6 +2,7 @@
 <HTML>
 <HEAD>
 <TITLE>Test of some Unicode symbols in numeric character reference form</TITLE>
+  <meta name="viewport" content="width=device-width, initial-scale=1">
 </HEAD>
 <BODY>
 <PRE>
diff --git a/test/utf-8-demo.html b/test/utf-8-demo.html
index d792903f..fe474513 100644
--- a/test/utf-8-demo.html
+++ b/test/utf-8-demo.html
@@ -4,6 +4,7 @@
 <TITLE>Markus Kuhn's UTF-8 demo</TITLE>
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
 <LINK REV="made" HREF="mailto:dickey@invisible-island.net">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
 </HEAD>
 
 <BODY>