diff --git a/CHANGES b/CHANGES
index 27499aa1..3843f08f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,18 +1,24 @@
--- $LynxId: CHANGES,v 1.620 2012/11/08 22:33:33 tom Exp $
+-- $LynxId: CHANGES,v 1.622 2012/11/09 00:18:52 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
 2012-11-08 (2.8.8dev.15)
+* updates for configure script macros (TD):
+  + add 3rd parameter to AC_DEFINE's to allow autoheader to run
+  + remove unused macros
+* update nl.po from
+    http://translationproject.org/latest/lynx
 * improve checking of certificates in the gnutls_certificate_verify_peers2()
   by handling special case where self-signed certificates should be reported
   (patch by Jamie Strandboge).
+* update config.guess (2012-09-25), config.sub (2012-08-18)
 
 2012-08-22 (2.8.8dev.14)
 * reset anchor's actual-length calculation at the end of pumpData() to handle
   scenario where this is used for internal data movement, i.e., for
   decompressing files (report by Owen Leibman, Debian #681214) -TD
-* drop two files overlooked in previous commit:
+* drop two files overlooked in previous commit (TD):
   lynx.rsp and WWW/Library/Implementation/HTFWriter.c
 
 2012-08-15 (2.8.8dev.13)
diff --git a/aclocal.m4 b/aclocal.m4
index b479ac93..84925269 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,11 +1,11 @@
-dnl $LynxId: aclocal.m4,v 1.192 2012/08/10 15:33:46 tom Exp $
+dnl $LynxId: aclocal.m4,v 1.198 2012/11/09 10:48:49 tom Exp $
 dnl Macros for auto-configure script.
 dnl by T.E.Dickey <dickey@invisible-island.net>
 dnl and Jim Spath <jspath@mail.bcpl.lib.md.us>
 dnl and Philippe De Muyter <phdm@macqel.be>
 dnl
 dnl Created: 1997/01/28
-dnl Updated: 2012/08/10
+dnl Updated: 2012/11/09
 dnl
 dnl The autoconf used in Lynx development is GNU autoconf 2.13 or 2.52, patched
 dnl by Thomas Dickey.  See your local GNU archives, and this URL:
@@ -38,23 +38,21 @@ dnl are modified), and are part of this file due to mechanical limitations of
 dnl autoconf.
 dnl ---------------------------------------------------------------------------
 dnl ---------------------------------------------------------------------------
-dnl AM_GNU_GETTEXT version: 12 updated: 2010/06/19 07:02:11
+dnl AM_GNU_GETTEXT version: 13 updated: 2012/11/09 05:47:26
 dnl --------------
 dnl Usage: Just like AM_WITH_NLS, which see.
 AC_DEFUN([AM_GNU_GETTEXT],
   [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-   AC_REQUIRE([AC_PROG_CC])dnl
    AC_REQUIRE([AC_CANONICAL_HOST])dnl
    AC_REQUIRE([AC_PROG_RANLIB])dnl
-   AC_REQUIRE([AC_ISC_POSIX])dnl
    AC_REQUIRE([AC_HEADER_STDC])dnl
-   AC_REQUIRE([AC_C_CONST])dnl
    AC_REQUIRE([AC_C_INLINE])dnl
    AC_REQUIRE([AC_TYPE_OFF_T])dnl
    AC_REQUIRE([AC_TYPE_SIZE_T])dnl
    AC_REQUIRE([AC_FUNC_ALLOCA])dnl
    AC_REQUIRE([AC_FUNC_MMAP])dnl
    AC_REQUIRE([jm_GLIBC21])dnl
+   AC_REQUIRE([CF_PROG_CC])dnl
 
    AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
 stdlib.h string.h unistd.h sys/param.h])
@@ -289,7 +287,7 @@ fi
 AC_SUBST($1)dnl
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl AM_WITH_NLS version: 24 updated: 2010/06/20 09:24:28
+dnl AM_WITH_NLS version: 25 updated: 2012/10/06 08:57:51
 dnl -----------
 dnl Inserted as requested by gettext 0.10.40
 dnl File from /usr/share/aclocal
@@ -392,7 +390,7 @@ AC_DEFUN([AM_WITH_NLS],
       LIBS="$cf_save_LIBS_1"
 
       if test "$cf_cv_func_gettext" = yes ; then
-        AC_DEFINE(HAVE_LIBINTL_H)
+        AC_DEFINE(HAVE_LIBINTL_H,1,[Define to 1 if we have libintl.h])
 
         dnl If an already present or preinstalled GNU gettext() is found,
         dnl use it.  But if this macro is used in GNU gettext, and GNU
@@ -599,14 +597,14 @@ changequote([,])dnl
   AC_SUBST(GENCAT)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_ACVERSION_CHECK version: 2 updated: 2011/05/08 11:22:03
+dnl CF_ACVERSION_CHECK version: 3 updated: 2012/10/03 18:39:53
 dnl ------------------
 dnl Conditionally generate script according to whether we're using a given autoconf.
 dnl
 dnl $1 = version to compare against
 dnl $2 = code to use if AC_ACVERSION is at least as high as $1.
 dnl $3 = code to use if AC_ACVERSION is older than $1.
-define(CF_ACVERSION_CHECK,
+define([CF_ACVERSION_CHECK],
 [
 ifdef([m4_version_compare],
 [m4_if(m4_version_compare(m4_defn([AC_ACVERSION]), [$1]), -1, [$3], [$2])],
@@ -614,12 +612,12 @@ ifdef([m4_version_compare],
 AC_PREREQ_CANON(AC_PREREQ_SPLIT([$1])),
 AC_PREREQ_CANON(AC_PREREQ_SPLIT(AC_ACVERSION)), AC_ACVERSION, [$2], [$3])])])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_ACVERSION_COMPARE version: 2 updated: 2011/04/14 20:56:50
+dnl CF_ACVERSION_COMPARE version: 3 updated: 2012/10/03 18:39:53
 dnl --------------------
 dnl CF_ACVERSION_COMPARE(MAJOR1, MINOR1, TERNARY1,
 dnl                      MAJOR2, MINOR2, TERNARY2,
 dnl                      PRINTABLE2, not FOUND, FOUND)
-define(CF_ACVERSION_COMPARE,
+define([CF_ACVERSION_COMPARE],
 [ifelse(builtin([eval], [$2 < $5]), 1,
 [ifelse([$8], , ,[$8])],
 [ifelse([$9], , ,[$9])])])dnl
@@ -905,7 +903,7 @@ ifelse([$5],NONE,,[(test $5 = NONE || test "$4" != "$5") &&]) {
 }
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_ALT_CHAR_SET version: 7 updated: 2010/10/23 15:54:49
+dnl CF_ALT_CHAR_SET version: 8 updated: 2012/11/08 20:57:52
 dnl ---------------
 dnl Check for existence of alternate-character-set support in curses, so we
 dnl can decide to use it for box characters.
@@ -925,35 +923,16 @@ do
 done
 	])
 AC_MSG_RESULT($cf_cv_alt_char_set)
-test $cf_cv_alt_char_set != no && AC_DEFINE_UNQUOTED(ALT_CHAR_SET,$cf_cv_alt_char_set)
+test $cf_cv_alt_char_set != no && AC_DEFINE_UNQUOTED(ALT_CHAR_SET,$cf_cv_alt_char_set,[Define to 1 if if curses supports alternate-character set])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_ANSI_CC_CHECK version: 11 updated: 2011/07/01 19:47:45
+dnl CF_ANSI_CC_CHECK version: 13 updated: 2012/10/06 11:17:15
 dnl ----------------
 dnl This was originally adapted from the macros 'fp_PROG_CC_STDC' and
 dnl 'fp_C_PROTOTYPES' in the sharutils 4.2 distribution.
 AC_DEFUN([CF_ANSI_CC_CHECK],
 [
-# This should have been defined by AC_PROG_CC
-: ${CC:=cc}
-
-# Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content
-# into CC.  This will not help with broken scripts that wrap the compiler with
-# options, but eliminates a more common category of user confusion.
-AC_MSG_CHECKING(\$CC variable)
-case "$CC" in #(vi
-*[[\ \	]]-[[IUD]]*)
-	AC_MSG_RESULT(broken)
-	AC_MSG_WARN(your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options)
-	# humor him...
-	cf_flags=`echo "$CC" | sed -e 's/^[[^ 	]]*[[ 	]]//'`
-	CC=`echo "$CC" | sed -e 's/[[ 	]].*//'`
-	CF_ADD_CFLAGS($cf_flags)
-	;;
-*)
-	AC_MSG_RESULT(ok)
-	;;
-esac
+CF_CC_ENV_FLAGS
 
 AC_CACHE_CHECK(for ${CC:-cc} option to accept ANSI C, cf_cv_ansi_cc,[
 cf_cv_ansi_cc=no
@@ -996,7 +975,7 @@ if test "$cf_cv_ansi_cc" != "no"; then
 if test ".$cf_cv_ansi_cc" != ".-DCC_HAS_PROTOS"; then
 	CF_ADD_CFLAGS($cf_cv_ansi_cc)
 else
-	AC_DEFINE(CC_HAS_PROTOS)
+	AC_DEFINE(CC_HAS_PROTOS,1,[Define to 1 if C compiler supports prototypes])
 fi
 fi
 ])dnl
@@ -1107,7 +1086,7 @@ fi
 AC_SUBST(ARFLAGS)
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_BOOL_DEFS version: 4 updated: 2010/10/23 15:54:49
+dnl CF_BOOL_DEFS version: 5 updated: 2012/11/08 20:57:52
 dnl ------------
 dnl Check if curses.h defines TRUE/FALSE (it does under SVr4).
 AC_DEFUN([CF_BOOL_DEFS],
@@ -1121,12 +1100,12 @@ AC_TRY_COMPILE([
 	[cf_cv_bool_defs=no])])
 AC_MSG_RESULT($cf_cv_bool_defs)
 if test "$cf_cv_bool_defs" = no ; then
-	AC_DEFINE(TRUE,(1))
-	AC_DEFINE(FALSE,(0))
+	AC_DEFINE(TRUE,(1),[Define to TRUE if curses.h does not define])
+	AC_DEFINE(FALSE,(0),[Define to FALSE if curses.h does not define])
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_BUILD_CC version: 6 updated: 2006/10/14 15:23:15
+dnl CF_BUILD_CC version: 7 updated: 2012/10/06 15:31:55
 dnl -----------
 dnl If we're cross-compiling, allow the user to override the tools and their
 dnl options.  The configure script is oriented toward identifying the host
@@ -1136,7 +1115,8 @@ dnl
 dnl $1 = default for $CPPFLAGS
 dnl $2 = default for $LIBS
 AC_DEFUN([CF_BUILD_CC],[
-AC_REQUIRE([CF_PROG_EXT])
+CF_ACVERSION_CHECK(2.52,,
+	[AC_REQUIRE([CF_PROG_EXT])])
 if test "$cross_compiling" = yes ; then
 
 	# defaults that we might want to override
@@ -1217,7 +1197,7 @@ AC_SUBST(BUILD_EXEEXT)
 AC_SUBST(BUILD_OBJEXT)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_BUNDLED_INTL version: 16 updated: 2010/10/23 15:55:05
+dnl CF_BUNDLED_INTL version: 17 updated: 2012/10/06 08:57:51
 dnl ---------------
 dnl Top-level macro for configuring an application with a bundled copy of
 dnl the intl and po directories for gettext.
@@ -1274,7 +1254,7 @@ if test "$USE_NLS" = yes ; then
 		[  --with-textdomain=PKG   NLS text-domain (default is package name)],
 		[NLS_TEXTDOMAIN=$withval],
 		[NLS_TEXTDOMAIN=$PACKAGE])
-	AC_DEFINE_UNQUOTED(NLS_TEXTDOMAIN,"$NLS_TEXTDOMAIN")
+	AC_DEFINE_UNQUOTED(NLS_TEXTDOMAIN,"$NLS_TEXTDOMAIN",[Define to the nls textdomain value])
 	AC_SUBST(NLS_TEXTDOMAIN)
 fi
 
@@ -1294,7 +1274,7 @@ if test "$USE_INCLUDED_LIBINTL" = yes ; then
 		INTLDIR_MAKE="#"
 	fi
 	if test -z "$INTLDIR_MAKE"; then
-		AC_DEFINE(HAVE_LIBGETTEXT_H)
+		AC_DEFINE(HAVE_LIBGETTEXT_H,1,[Define to 1 if we have libgettext.h])
 		for cf_makefile in \
 			$srcdir/intl/Makefile.in \
 			$srcdir/intl/makefile.in
@@ -1337,17 +1317,43 @@ dnl own code, except ENABLE_NLS, which is too vague to be of any use.
 
 if test "$USE_INCLUDED_LIBINTL" = yes ; then
 	if test "$nls_cv_force_use_gnu_gettext" = yes ; then
-		AC_DEFINE(HAVE_GETTEXT)
+		AC_DEFINE(HAVE_GETTEXT,1,[Define to 1 if we have gettext function])
 	elif test "$nls_cv_use_gnu_gettext" = yes ; then
-		AC_DEFINE(HAVE_GETTEXT)
+		AC_DEFINE(HAVE_GETTEXT,1,[Define to 1 if we have gettext function])
 	fi
 	if test -n "$nls_cv_header_intl" ; then
-		AC_DEFINE(HAVE_LIBINTL_H)
+		AC_DEFINE(HAVE_LIBINTL_H,1,[Define to 1 if we have header-file for libintl])
 	fi
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CHECK_CACHE version: 11 updated: 2008/03/23 14:45:59
+dnl CF_CC_ENV_FLAGS version: 1 updated: 2012/10/03 05:25:49
+dnl ---------------
+dnl Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content
+dnl into CC.  This will not help with broken scripts that wrap the compiler with
+dnl options, but eliminates a more common category of user confusion.
+AC_DEFUN([CF_CC_ENV_FLAGS],
+[
+# This should have been defined by AC_PROG_CC
+: ${CC:=cc}
+
+AC_MSG_CHECKING(\$CC variable)
+case "$CC" in #(vi
+*[[\ \	]]-[[IUD]]*)
+	AC_MSG_RESULT(broken)
+	AC_MSG_WARN(your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options)
+	# humor him...
+	cf_flags=`echo "$CC" | sed -e 's/^[[^ 	]]*[[ 	]]//'`
+	CC=`echo "$CC" | sed -e 's/[[ 	]].*//'`
+	CF_ADD_CFLAGS($cf_flags)
+	;;
+*)
+	AC_MSG_RESULT(ok)
+	;;
+esac
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_CHECK_CACHE version: 12 updated: 2012/10/02 20:55:03
 dnl --------------
 dnl Check if we're accidentally using a cache from a different machine.
 dnl Derive the system name, as a check for reusing the autoconf cache.
@@ -1370,7 +1376,7 @@ else
 		system_name="`(hostname) 2>/dev/null`"
 	fi
 fi
-test -n "$system_name" && AC_DEFINE_UNQUOTED(SYSTEM_NAME,"$system_name")
+test -n "$system_name" && AC_DEFINE_UNQUOTED(SYSTEM_NAME,"$system_name",[Define to the system name.])
 AC_CACHE_VAL(cf_cv_system_name,[cf_cv_system_name="$system_name"])
 
 test -z "$system_name" && system_name="$cf_cv_system_name"
@@ -1576,7 +1582,7 @@ if test "$cf_x509_support" = yes ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CHECK_TYPE version: 2 updated: 2008/01/06 14:56:47
+dnl CF_CHECK_TYPE version: 3 updated: 2012/10/04 05:24:07
 dnl -------------
 dnl Add a 3rd parameter to AC_CHECK_TYPE, working around autoconf 2.5x's
 dnl deliberate incompatibility.
@@ -1605,7 +1611,7 @@ $3
 	AC_MSG_RESULT($ac_cv_type_$1)
 ])dnl
 if test $ac_cv_type_$1 = no; then
-	AC_DEFINE($1, $2)
+	AC_DEFINE($1, $2, Define to $2 if $1 is not declared)
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
@@ -1642,7 +1648,7 @@ cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
 fi
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_COLOR_CURSES version: 7 updated: 2010/10/23 15:54:49
+dnl CF_COLOR_CURSES version: 8 updated: 2012/11/08 20:57:52
 dnl ---------------
 dnl Check if curses supports color.  (Note that while SVr3 curses supports
 dnl color, it does this differently from SVr4 curses; more work would be needed
@@ -1667,12 +1673,12 @@ AC_CACHE_VAL(cf_cv_color_curses,[
 	])
 AC_MSG_RESULT($cf_cv_color_curses)
 if test $cf_cv_color_curses = yes ; then
-	AC_DEFINE(COLOR_CURSES)
-	test ".$cf_cv_ncurses_broken" != .yes && AC_DEFINE(HAVE_GETBKGD)
+	AC_DEFINE(COLOR_CURSES,1,[Define to 1 if if curses supports color attributes])
+	test ".$cf_cv_ncurses_broken" != .yes && AC_DEFINE(HAVE_GETBKGD,1,[Define to 1 if curses has getbkgd function])
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_CHTYPE version: 7 updated: 2010/10/23 15:54:49
+dnl CF_CURSES_CHTYPE version: 8 updated: 2012/10/06 08:57:51
 dnl ----------------
 dnl Test if curses defines 'chtype' (usually a 'long' type for SysV curses).
 AC_DEFUN([CF_CURSES_CHTYPE],
@@ -1684,14 +1690,14 @@ AC_CACHE_CHECK(for chtype typedef,cf_cv_chtype_decl,[
 		[cf_cv_chtype_decl=yes],
 		[cf_cv_chtype_decl=no])])
 if test $cf_cv_chtype_decl = yes ; then
-	AC_DEFINE(HAVE_TYPE_CHTYPE)
+	AC_DEFINE(HAVE_TYPE_CHTYPE,1,[Define to 1 if chtype is declared])
 	AC_CACHE_CHECK(if chtype is scalar or struct,cf_cv_chtype_type,[
 		AC_TRY_COMPILE([#include <${cf_cv_ncurses_header:-curses.h}>],
 			[chtype foo; long x = foo],
 			[cf_cv_chtype_type=scalar],
 			[cf_cv_chtype_type=struct])])
 	if test $cf_cv_chtype_type = scalar ; then
-		AC_DEFINE(TYPE_CHTYPE_IS_SCALAR)
+		AC_DEFINE(TYPE_CHTYPE_IS_SCALAR,1,[Define to 1 if chtype is a scaler/integer])
 	fi
 fi
 ])dnl
@@ -1931,7 +1937,7 @@ fi
 
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_TERM_H version: 9 updated: 2011/04/09 18:19:55
+dnl CF_CURSES_TERM_H version: 10 updated: 2012/10/06 08:57:51
 dnl ----------------
 dnl SVr4 curses should have term.h as well (where it puts the definitions of
 dnl the low-level interface).  This may not be true in old/broken implementations,
@@ -1990,18 +1996,18 @@ esac
 
 case $cf_cv_term_header in #(vi
 term.h) #(vi
-	AC_DEFINE(HAVE_TERM_H)
+	AC_DEFINE(HAVE_TERM_H,1,[Define to 1 if we have term.h])
 	;;
 ncurses/term.h) #(vi
-	AC_DEFINE(HAVE_NCURSES_TERM_H)
+	AC_DEFINE(HAVE_NCURSES_TERM_H,1,[Define to 1 if we have ncurses/term.h])
 	;;
 ncursesw/term.h)
-	AC_DEFINE(HAVE_NCURSESW_TERM_H)
+	AC_DEFINE(HAVE_NCURSESW_TERM_H,1,[Define to 1 if we have ncursesw/term.h])
 	;;
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_UNCTRL_H version: 1 updated: 2011/04/09 18:19:55
+dnl CF_CURSES_UNCTRL_H version: 2 updated: 2012/10/06 08:57:51
 dnl ------------------
 dnl Any X/Open curses implementation must have unctrl.h, but ncurses packages
 dnl may put it in a subdirectory (along with ncurses' other headers, of
@@ -2045,18 +2051,18 @@ esac
 
 case $cf_cv_unctrl_header in #(vi
 unctrl.h) #(vi
-	AC_DEFINE(HAVE_UNCTRL_H)
+	AC_DEFINE(HAVE_UNCTRL_H,1,[Define to 1 if we have unctrl.h])
 	;;
 ncurses/unctrl.h) #(vi
-	AC_DEFINE(HAVE_NCURSES_UNCTRL_H)
+	AC_DEFINE(HAVE_NCURSES_UNCTRL_H,1,[Define to 1 if we have ncurses/unctrl.h])
 	;;
 ncursesw/unctrl.h)
-	AC_DEFINE(HAVE_NCURSESW_UNCTRL_H)
+	AC_DEFINE(HAVE_NCURSESW_UNCTRL_H,1,[Define to 1 if we have ncursesw/unctrl.h])
 	;;
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CURS_PERFORMANCE version: 4 updated: 2010/10/23 15:54:49
+dnl CF_CURS_PERFORMANCE version: 5 updated: 2012/11/08 20:57:52
 dnl -------------------
 dnl Solaris 2.x curses provides a "performance" tradeoff according to whether
 dnl CURS_PERFORMANCE is defined.  If defined, the implementation defines macros
@@ -2084,10 +2090,10 @@ AC_CACHE_VAL(cf_cv_curs_performance,[
 #endif
 	],[cf_cv_curs_performance=yes])])])
 AC_MSG_RESULT($cf_cv_curs_performance)
-test $cf_cv_curs_performance = yes && AC_DEFINE(CURS_PERFORMANCE)
+test $cf_cv_curs_performance = yes && AC_DEFINE(CURS_PERFORMANCE,1,[Define to 1 ifr curses performance tradeoff available])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CURS_TOUCHLINE version: 3 updated: 2010/10/23 15:54:49
+dnl CF_CURS_TOUCHLINE version: 4 updated: 2012/11/08 20:57:52
 dnl -----------------
 dnl Check for the flavor of the touchline function, to distinguish between BSD
 dnl and SYSV.  This is needed on NetBSD 1.5 which has a partial implementation
@@ -2105,15 +2111,15 @@ AC_CACHE_CHECK(for curses touchline function,cf_cv_curs_touchline,[
 		[cf_cv_curs_touchline=bsd])])])
 case "$cf_cv_curs_touchline" in #(vi
 bsd) #(vi
-	AC_DEFINE(HAVE_BSD_TOUCHLINE)
+	AC_DEFINE(HAVE_BSD_TOUCHLINE,1,[Define to 1 if curses has bsd-style touchline])
 	;;
 sysv)
-	AC_DEFINE(HAVE_SYSV_TOUCHLINE)
+	AC_DEFINE(HAVE_SYSV_TOUCHLINE,1,[Define to 1 if curses has sysv-style touchline])
 	;;
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_DEFINE_PROG version: 3 updated: 2002/10/27 18:21:42
+dnl CF_DEFINE_PROG version: 4 updated: 2012/11/08 20:57:52
 dnl --------------
 dnl Check for a program in the given list $3, defining the corresponding
 dnl program variable $2.
@@ -2131,7 +2137,7 @@ AC_CACHE_VAL(cf_cv_$2,[
 	done
 	])
 AC_MSG_RESULT($cf_cv_$2)
-AC_DEFINE_UNQUOTED($2,"$cf_cv_$2")
+AC_DEFINE_UNQUOTED($2,"$cf_cv_$2",[Define to program from list])
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_DIRNAME version: 4 updated: 2002/12/21 19:25:52
@@ -2139,7 +2145,7 @@ dnl ----------
 dnl "dirname" is not portable, so we fake it with a shell script.
 AC_DEFUN([CF_DIRNAME],[$1=`echo $2 | sed -e 's%/[[^/]]*$%%'`])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_DISABLE_ECHO version: 11 updated: 2009/12/13 13:16:57
+dnl CF_DISABLE_ECHO version: 12 updated: 2012/10/06 16:30:28
 dnl ---------------
 dnl You can always use "make -n" to see the actual options, but it's hard to
 dnl pick out/analyze warning messages when the compile-line is long.
@@ -2154,7 +2160,7 @@ dnl
 AC_DEFUN([CF_DISABLE_ECHO],[
 AC_MSG_CHECKING(if you want to see long compiling messages)
 CF_ARG_DISABLE(echo,
-	[  --disable-echo          display "compiling" commands],
+	[  --disable-echo          do not display "compiling" commands],
 	[
     ECHO_LT='--silent'
     ECHO_LD='@echo linking [$]@;'
@@ -2203,7 +2209,7 @@ AC_DEFUN([CF_ERRNO],
 CF_CHECK_ERRNO(errno)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_FANCY_CURSES version: 5 updated: 2010/10/23 15:54:49
+dnl CF_FANCY_CURSES version: 6 updated: 2012/11/08 20:57:52
 dnl ---------------
 AC_DEFUN([CF_FANCY_CURSES],
 [
@@ -2221,7 +2227,7 @@ AC_CACHE_VAL(cf_cv_fancy_curses,[
 	[cf_cv_fancy_curses=no])
 	])
 AC_MSG_RESULT($cf_cv_fancy_curses)
-test $cf_cv_fancy_curses = yes && AC_DEFINE(FANCY_CURSES)
+test $cf_cv_fancy_curses = yes && AC_DEFINE(FANCY_CURSES,1,[Define to 1 if curses supports fancy attributes])
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_FIND_IPV6_LIBS version: 7 updated: 2007/07/29 13:35:20
@@ -2565,7 +2571,7 @@ ifelse([$5],,AC_MSG_WARN(Cannot find $3 library),[$5])
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_FIONBIO version: 2 updated: 1998/02/24 06:51:46
+dnl CF_FIONBIO version: 3 updated: 2012/11/08 20:57:52
 dnl ----------
 dnl Check for availability of fcntl versus ioctl(,FIONBIO,).  Lynx uses this
 dnl for Sequent (ptx), and it is needed for OS/2 EMX.
@@ -2592,10 +2598,10 @@ AC_TRY_LINK([
 	[cf_cv_fionbio=fcntl],
 	[cf_cv_fionbio=unknown])])
 ])
-test "$cf_cv_fionbio" = "fcntl" && AC_DEFINE(USE_FCNTL)
+test "$cf_cv_fionbio" = "fcntl" && AC_DEFINE(USE_FCNTL,1,[Define to 1 if we should use fcntl])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_FUNC_CURSES_VERSION version: 5 updated: 2010/10/23 15:54:49
+dnl CF_FUNC_CURSES_VERSION version: 6 updated: 2012/10/06 16:39:58
 dnl ----------------------
 dnl Solaris has a data item 'curses_version', which confuses AC_CHECK_FUNCS.
 dnl It's a character string "SVR4", not documented.
@@ -2614,10 +2620,10 @@ int main()
 ,[cf_cv_func_curses_version=no]
 ,[cf_cv_func_curses_version=unknown])
 rm -f core])
-test "$cf_cv_func_curses_version" = yes && AC_DEFINE(HAVE_CURSES_VERSION)
+test "$cf_cv_func_curses_version" = yes && AC_DEFINE(HAVE_CURSES_VERSION,1,[Define to 1 if we have curses_version function])
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_FUNC_GETADDRINFO version: 7 updated: 2010/10/23 15:52:32
+dnl CF_FUNC_GETADDRINFO version: 8 updated: 2012/11/08 20:57:52
 dnl -------------------
 dnl Look for a working version of getaddrinfo(), for IPV6 support.
 AC_DEFUN([CF_FUNC_GETADDRINFO],[
@@ -2703,12 +2709,12 @@ int main()
 [cf_cv_getaddrinfo=unknown])
 ])
 if test "$cf_cv_getaddrinfo" = yes ; then
-	AC_DEFINE(HAVE_GAI_STRERROR)
-	AC_DEFINE(HAVE_GETADDRINFO)
+	AC_DEFINE(HAVE_GAI_STRERROR,1,[Define to 1 if we have gai_strerror function])
+	AC_DEFINE(HAVE_GETADDRINFO,1,[Define to 1 if we have getaddrinfo function])
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_FUNC_LSTAT version: 2 updated: 1997/09/07 13:00:21
+dnl CF_FUNC_LSTAT version: 3 updated: 2012/11/08 20:57:52
 dnl -------------
 dnl A conventional existence-check for 'lstat' won't work with the Linux
 dnl version of gcc 2.7.0, since the symbol is defined only within <sys/stat.h>
@@ -2728,11 +2734,11 @@ AC_TRY_LINK([
 	])
 AC_MSG_RESULT($ac_cv_func_lstat )
 if test $ac_cv_func_lstat = yes; then
-	AC_DEFINE(HAVE_LSTAT)
+	AC_DEFINE(HAVE_LSTAT,1,[Define to 1 if we have lstat])
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_FUNC_SIGACTION version: 2 updated: 1999/07/28 06:09:35
+dnl CF_FUNC_SIGACTION version: 3 updated: 2012/11/08 20:57:52
 dnl -----------------
 dnl Check if we have the sigaction function and related structures.
 AC_DEFUN([CF_FUNC_SIGACTION],[
@@ -2750,10 +2756,10 @@ AC_TRY_LINK([
 	[cf_cv_func_sigaction=yes],
 	[cf_cv_func_sigaction=no])
 ])
-test "$cf_cv_func_sigaction" = yes && AC_DEFINE(HAVE_SIGACTION)
+test "$cf_cv_func_sigaction" = yes && AC_DEFINE(HAVE_SIGACTION,1,[Define to 1 if we have sigaction])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_FUNC_WAIT version: 2 updated: 1997/10/21 19:45:33
+dnl CF_FUNC_WAIT version: 3 updated: 2012/10/06 08:57:51
 dnl ------------
 dnl Test for the presence of <sys/wait.h>, 'union wait', arg-type of 'wait()'
 dnl and/or 'waitpid()'.
@@ -2778,7 +2784,7 @@ if test $cf_cv_type_unionwait = yes; then
 			[cf_cv_arg_union_wait=no])
 		])
 	AC_MSG_RESULT($cf_cv_arg_union_wait)
-	test $cf_cv_arg_union_wait = yes && AC_DEFINE(WAIT_USES_UNION)
+	test $cf_cv_arg_union_wait = yes && AC_DEFINE(WAIT_USES_UNION,1,[Define to 1 if wait() uses a union parameter])
 
 	AC_MSG_CHECKING(if union wait can be used as waitpid-arg)
 	AC_CACHE_VAL(cf_cv_arg_union_waitpid,[
@@ -2788,12 +2794,12 @@ if test $cf_cv_type_unionwait = yes; then
 			[cf_cv_arg_union_waitpid=no])
 		])
 	AC_MSG_RESULT($cf_cv_arg_union_waitpid)
-	test $cf_cv_arg_union_waitpid = yes && AC_DEFINE(WAITPID_USES_UNION)
+	test $cf_cv_arg_union_waitpid = yes && AC_DEFINE(WAITPID_USES_UNION,1,[Define to 1 if waitpid() uses a union parameter])
 
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_GCC_ATTRIBUTES version: 14 updated: 2010/10/23 15:52:32
+dnl CF_GCC_ATTRIBUTES version: 16 updated: 2012/10/02 20:55:03
 dnl -----------------
 dnl Test for availability of useful gcc __attribute__ directives to quiet
 dnl compiler warnings.  Though useful, not all are supported -- and contrary
@@ -2871,27 +2877,27 @@ EOF
 			test -n "$verbose" && AC_MSG_RESULT(... $cf_attribute)
 			cat conftest.h >>confdefs.h
 			case $cf_attribute in #(vi
+			noreturn) #(vi
+				AC_DEFINE_UNQUOTED(GCC_NORETURN,$cf_directive,[Define to noreturn-attribute for gcc])
+				;;
 			printf) #(vi
-				if test "$cf_printf_attribute" = no ; then
-					cat >>confdefs.h <<EOF
-#define GCC_PRINTFLIKE(fmt,var) /* nothing */
-EOF
-				else
-					cat >>confdefs.h <<EOF
-#define GCC_PRINTFLIKE(fmt,var) __attribute__((format(printf,fmt,var)))
-EOF
+				cf_value='/* nothing */'
+				if test "$cf_printf_attribute" != no ; then
+					cf_value='__attribute__((format(printf,fmt,var)))'
+					AC_DEFINE(GCC_PRINTF,1,[Define to 1 if the compiler supports gcc-like printf attribute.])
 				fi
+				AC_DEFINE_UNQUOTED(GCC_PRINTFLIKE(fmt,var),$cf_value,[Define to printf-attribute for gcc])
 				;;
 			scanf) #(vi
-				if test "$cf_scanf_attribute" = no ; then
-					cat >>confdefs.h <<EOF
-#define GCC_SCANFLIKE(fmt,var) /* nothing */
-EOF
-				else
-					cat >>confdefs.h <<EOF
-#define GCC_SCANFLIKE(fmt,var)  __attribute__((format(scanf,fmt,var)))
-EOF
+				cf_value='/* nothing */'
+				if test "$cf_scanf_attribute" != no ; then
+					cf_value='__attribute__((format(scanf,fmt,var)))'
+					AC_DEFINE(GCC_SCANF,1,[Define to 1 if the compiler supports gcc-like scanf attribute.])
 				fi
+				AC_DEFINE_UNQUOTED(GCC_SCANFLIKE(fmt,var),$cf_value,[Define to sscanf-attribute for gcc])
+				;;
+			unused) #(vi
+				AC_DEFINE_UNQUOTED(GCC_UNUSED,$cf_directive,[Define to unused-attribute for gcc])
 				;;
 			esac
 		fi
@@ -2903,7 +2909,7 @@ rm -rf conftest*
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_GCC_VERSION version: 5 updated: 2010/04/24 11:02:31
+dnl CF_GCC_VERSION version: 7 updated: 2012/10/18 06:46:33
 dnl --------------
 dnl Find version of gcc
 AC_DEFUN([CF_GCC_VERSION],[
@@ -2911,7 +2917,7 @@ AC_REQUIRE([AC_PROG_CC])
 GCC_VERSION=none
 if test "$GCC" = yes ; then
 	AC_MSG_CHECKING(version of $CC)
-	GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`"
+	GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC[[^)]]*) //' -e 's/^.*(Debian[[^)]]*) //' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`"
 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
 	AC_MSG_RESULT($GCC_VERSION)
 fi
@@ -3034,7 +3040,7 @@ rm -rf conftest*
 AC_SUBST(EXTRA_CFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_GNUTLS version: 21 updated: 2010/06/20 18:21:35
+dnl CF_GNUTLS version: 22 updated: 2012/11/08 20:57:52
 dnl ---------
 dnl Check for gnutls library (TLS "is" SSL)
 dnl $1 = the [optional] directory in which the library may be found
@@ -3097,7 +3103,9 @@ AC_DEFUN([CF_GNUTLS],[
 		esac
 	fi
 
-	ifelse([$2],,[AC_DEFINE(USE_GNUTLS_INCL)],[AC_DEFINE(USE_GNUTLS_FUNCS)])
+	ifelse([$2],,
+		[AC_DEFINE(USE_GNUTLS_INCL,1,[Define to 1 if we should include gnutls headers])],
+		[AC_DEFINE(USE_GNUTLS_FUNCS,1,[Define to 1 if we should use gnutls functions])])
 
 	if test "$cf_cv_have_gnutls" = no ; then
 		cf_gnutls_CPPFLAGS=$CPPFLAGS
@@ -3225,7 +3233,7 @@ AC_DEFUN([CF_HELP_MESSAGE],
 [AC_DIVERT_HELP([$1])dnl
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_INET_ADDR version: 5 updated: 2010/06/20 09:24:28
+dnl CF_INET_ADDR version: 6 updated: 2012/11/08 20:57:52
 dnl ------------
 dnl For Lynx, check if the libraries we have found give us inet_aton, or
 dnl inet_addr.  If not, try to find the latter function with -lbind or
@@ -3243,7 +3251,7 @@ AC_TRY_LINK([#include <sys/types.h>
     [cf_cv_have_inet_aton=yes],
     [cf_cv_have_inet_aton=no])])
 if test "$cf_cv_have_inet_aton" = yes ; then
-    AC_DEFINE(HAVE_INET_ATON)
+    AC_DEFINE(HAVE_INET_ATON,1,[Define to 1 if we have inet_aton])
 else
     AC_CACHE_CHECK(for inet_addr function,cf_cv_have_inet_addr,[
     AC_TRY_LINK([#include <sys/types.h>
@@ -3316,7 +3324,7 @@ cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_LARGEFILE version: 7 updated: 2007/06/02 11:58:50
+dnl CF_LARGEFILE version: 8 updated: 2012/10/06 08:57:51
 dnl ------------
 dnl Add checks for large file support.
 AC_DEFUN([CF_LARGEFILE],[
@@ -3350,12 +3358,12 @@ ifdef([AC_FUNC_FSEEKO],[
 		[cf_cv_struct_dirent64=yes],
 		[cf_cv_struct_dirent64=no])
 	])
-	test "$cf_cv_struct_dirent64" = yes && AC_DEFINE(HAVE_STRUCT_DIRENT64)
+	test "$cf_cv_struct_dirent64" = yes && AC_DEFINE(HAVE_STRUCT_DIRENT64,1,[Define to 1 if we have struct dirent64])
     fi
 ])
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_LASTLOG version: 4 updated: 2002/10/27 23:21:42
+dnl CF_LASTLOG version: 5 updated: 2012/10/04 20:12:20
 dnl ----------
 dnl Check for header defining _PATH_LASTLOG, or failing that, see if the lastlog
 dnl file exists.
@@ -3379,7 +3387,7 @@ AC_TRY_COMPILE([
 		cf_cv_path_lastlog=no
 	fi])
 ])
-test $cf_cv_path_lastlog != no && AC_DEFINE(USE_LASTLOG)
+test $cf_cv_path_lastlog != no && AC_DEFINE(USE_LASTLOG,1,[Define to 1 if we can define lastlog pathname])
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_LD_RPATH_OPT version: 5 updated: 2011/07/17 14:48:41
@@ -3465,7 +3473,7 @@ CF_SUBDIR_PATH($1,$2,lib)
 $1="$cf_library_path_list [$]$1"
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_LOCALE version: 4 updated: 2003/02/16 08:16:04
+dnl CF_LOCALE version: 5 updated: 2012/10/06 11:17:15
 dnl ---------
 dnl Check if we have setlocale() and its header, <locale.h>
 dnl The optional parameter $1 tells what to do if we do have locale support.
@@ -3479,7 +3487,7 @@ AC_TRY_LINK([#include <locale.h>],
 	[cf_cv_locale=no])
 	])
 AC_MSG_RESULT($cf_cv_locale)
-test $cf_cv_locale = yes && { ifelse($1,,AC_DEFINE(LOCALE),[$1]) }
+test $cf_cv_locale = yes && { ifelse($1,,AC_DEFINE(LOCALE,1,[Define to 1 if we have locale support]),[$1]) }
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_MAKEFLAGS version: 14 updated: 2011/03/31 19:29:46
@@ -3583,7 +3591,7 @@ ifelse($1,,[
 fi
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_MIXEDCASE_FILENAMES version: 3 updated: 2003/09/20 17:07:55
+dnl CF_MIXEDCASE_FILENAMES version: 4 updated: 2012/10/02 20:55:03
 dnl ----------------------
 dnl Check if the file-system supports mixed-case filenames.  If we're able to
 dnl create a lowercase name and see it as uppercase, it doesn't support that.
@@ -3610,7 +3618,7 @@ else
 	rm -f conftest CONFTEST
 fi
 ])
-test "$cf_cv_mixedcase" = yes && AC_DEFINE(MIXEDCASE_FILENAMES)
+test "$cf_cv_mixedcase" = yes && AC_DEFINE(MIXEDCASE_FILENAMES,1,[Define to 1 if filesystem supports mixed-case filenames.])
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_MSG_LOG version: 5 updated: 2010/10/23 15:52:32
@@ -3621,7 +3629,7 @@ AC_DEFUN([CF_MSG_LOG],[
 echo "${as_me:-configure}:__oline__: testing $* ..." 1>&AC_FD_CC
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_NCURSES_BROKEN version: 7 updated: 2010/10/23 15:54:49
+dnl CF_NCURSES_BROKEN version: 8 updated: 2012/11/08 20:57:52
 dnl -----------------
 dnl Check for pre-1.9.9g ncurses (among other problems, the most obvious is
 dnl that color combinations don't work).
@@ -3645,7 +3653,7 @@ AC_TRY_COMPILE([
 AC_MSG_RESULT($cf_cv_ncurses_broken)
 if test "$cf_cv_ncurses_broken" = yes ; then
 	AC_MSG_WARN(hmm... you should get an up-to-date version of ncurses)
-	AC_DEFINE(NCURSES_BROKEN)
+	AC_DEFINE(NCURSES_BROKEN,1,[Define to 1 if you have an obsolete version of ncurses])
 fi
 fi
 ])dnl
@@ -3683,7 +3691,7 @@ printf("old\n");
 	,[$1=no])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_NCURSES_CONFIG version: 9 updated: 2011/11/26 15:42:05
+dnl CF_NCURSES_CONFIG version: 10 updated: 2012/10/06 08:57:51
 dnl -----------------
 dnl Tie together the configure-script macros for ncurses.
 dnl Prefer the "-config" script from ncurses 6.x, to simplify analysis.
@@ -3709,7 +3717,7 @@ CF_ADD_LIBS(`$NCURSES_CONFIG --libs`)
 CF_CURSES_HEADER(ifelse($1,,ncurses,$1))
 
 dnl like CF_NCURSES_CPPFLAGS
-AC_DEFINE(NCURSES)
+AC_DEFINE(NCURSES,1,[Define to 1 if we are using ncurses headers/libraries])
 
 dnl like CF_NCURSES_LIBS
 CF_UPPER(cf_nculib_ROOT,HAVE_LIB$cf_ncuconfig_root)
@@ -3726,7 +3734,7 @@ CF_NCURSES_LIBS(ifelse($1,,ncurses,$1))
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_NCURSES_CPPFLAGS version: 20 updated: 2010/11/20 17:02:38
+dnl CF_NCURSES_CPPFLAGS version: 21 updated: 2012/10/06 08:57:51
 dnl -------------------
 dnl Look for the SVr4 curses clone 'ncurses' in the standard places, adjusting
 dnl the CPPFLAGS variable so we can include its header.
@@ -3772,12 +3780,12 @@ CF_NCURSES_HEADER
 CF_TERM_HEADER
 
 # some applications need this, but should check for NCURSES_VERSION
-AC_DEFINE(NCURSES)
+AC_DEFINE(NCURSES,1,[Define to 1 if we are using ncurses headers/libraries])
 
 CF_NCURSES_VERSION
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_NCURSES_HEADER version: 2 updated: 2008/03/23 14:48:54
+dnl CF_NCURSES_HEADER version: 3 updated: 2012/10/06 08:57:51
 dnl -----------------
 dnl Find a "curses" header file, e.g,. "curses.h", or one of the more common
 dnl variations of ncurses' installs.
@@ -3828,16 +3836,16 @@ fi
 
 case $cf_cv_ncurses_header in # (vi
 *ncurses.h)
-	AC_DEFINE(HAVE_NCURSES_H)
+	AC_DEFINE(HAVE_NCURSES_H,1,[Define to 1 if we have ncurses.h])
 	;;
 esac
 
 case $cf_cv_ncurses_header in # (vi
 ncurses/curses.h|ncurses/ncurses.h)
-	AC_DEFINE(HAVE_NCURSES_NCURSES_H)
+	AC_DEFINE(HAVE_NCURSES_NCURSES_H,1,[Define to 1 if we have ncurses/ncurses.h])
 	;;
 ncursesw/curses.h|ncursesw/ncurses.h)
-	AC_DEFINE(HAVE_NCURSESW_NCURSES_H)
+	AC_DEFINE(HAVE_NCURSESW_NCURSES_H,1,[Define to 1 if we have ncursesw/ncurses.h])
 	;;
 esac
 
@@ -3911,7 +3919,7 @@ CF_UPPER(cf_nculib_ROOT,HAVE_LIB$cf_nculib_root)
 AC_DEFINE_UNQUOTED($cf_nculib_ROOT)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_NCURSES_VERSION version: 13 updated: 2010/10/23 15:54:49
+dnl CF_NCURSES_VERSION version: 14 updated: 2012/10/06 08:57:51
 dnl ------------------
 dnl Check for the version of ncurses, to aid in reporting bugs, etc.
 dnl Call CF_CURSES_CPPFLAGS first, or CF_NCURSES_CPPFLAGS.  We don't use
@@ -3970,10 +3978,10 @@ EOF
 ])
 	rm -f $cf_tempfile
 ])
-test "$cf_cv_ncurses_version" = no || AC_DEFINE(NCURSES)
+test "$cf_cv_ncurses_version" = no || AC_DEFINE(NCURSES,1,[Define to 1 if we are using ncurses headers/libraries])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_NETLIBS version: 8 updated: 2011/10/03 05:24:34
+dnl CF_NETLIBS version: 9 updated: 2012/11/08 20:57:52
 dnl ----------
 dnl After checking for functions in the default $LIBS, make a further check
 dnl for the functions that are netlib-related (these aren't always in the
@@ -4060,7 +4068,7 @@ esac
 
 case $cf_cv_netlibs in #(vi
 *ws2_32*)
-	AC_DEFINE(USE_WINSOCK2_H)
+	AC_DEFINE(USE_WINSOCK2_H,1,[Define to 1 if we should include winsock2.h])
 	;;
 esac
 
@@ -4068,7 +4076,7 @@ CF_ADD_LIBS($cf_cv_netlibs)
 test $cf_test_netlibs = no && echo "$cf_cv_netlibs" >&AC_FD_MSG
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_NGROUPS version: 3 updated: 2001/12/27 07:55:07
+dnl CF_NGROUPS version: 4 updated: 2012/11/08 20:57:52
 dnl ----------
 dnl Check for the symbol NGROUPS
 AC_DEFUN([CF_NGROUPS],
@@ -4098,20 +4106,20 @@ AC_TRY_COMPILE([
 AC_MSG_RESULT($cf_cv_ngroups)
 ])
 if test "$cf_cv_ngroups" = no ; then
-	AC_DEFINE(NGROUPS,16)
+	AC_DEFINE(NGROUPS,16,[Define to maximum number of groups])
 elif test "$cf_cv_ngroups" = NGROUPS_MAX ; then
 	AC_DEFINE(NGROUPS,NGROUPS_MAX)
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_NO_LEAKS_OPTION version: 4 updated: 2006/12/16 14:24:05
+dnl CF_NO_LEAKS_OPTION version: 5 updated: 2012/10/02 20:55:03
 dnl ------------------
 dnl see CF_WITH_NO_LEAKS
 AC_DEFUN([CF_NO_LEAKS_OPTION],[
 AC_MSG_CHECKING(if you want to use $1 for testing)
 AC_ARG_WITH($1,
 	[$2],
-	[AC_DEFINE($3)ifelse([$4],,[
+	[AC_DEFINE_UNQUOTED($3,1,"Define to 1 if you want to use $1 for testing.")ifelse([$4],,[
 	 $4
 ])
 	: ${with_cflags:=-g}
@@ -4133,7 +4141,7 @@ case .$with_cflags in #(vi
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_NSS_COMPAT version: 3 updated: 2010/06/20 09:24:28
+dnl CF_NSS_COMPAT version: 4 updated: 2012/11/08 20:57:52
 dnl -------------
 dnl Check for NSS compatible SSL libraries
 dnl $1 = the [optional] directory in which the library may be found
@@ -4200,7 +4208,7 @@ AC_TRY_COMPILE([
 	[cf_ssl_incl=yes],
 	[cf_ssl_incl=no])
 AC_MSG_RESULT($cf_ssl_incl)
-test "$cf_ssl_incl" = yes && AC_DEFINE(USE_NSS_COMPAT_INCL)
+test "$cf_ssl_incl" = yes && AC_DEFINE(USE_NSS_COMPAT_INCL,1,[Define to 1 if we should use nss compatibility header])
 fi
 
 AC_MSG_CHECKING(if we can link to NSS compilant library)
@@ -4217,8 +4225,8 @@ AC_TRY_LINK([
 	[cf_ssl_library=no])
 AC_MSG_RESULT($cf_ssl_library)
 if test "$cf_ssl_library" = yes ; then
-	AC_DEFINE(USE_SSL)
-	AC_DEFINE(USE_X509_SUPPORT)
+	AC_DEFINE(USE_SSL,1,[Define to 1 if we should use SSL])
+	AC_DEFINE(USE_X509_SUPPORT,1,[Define to 1 if the SSL library provides X509 support])
 else
 	AC_MSG_ERROR(Cannot link with NSS compilant libraries)
 fi
@@ -4261,20 +4269,23 @@ AC_SUBST(MSG_DIR_MAKE)
 AC_SUBST(SUB_MAKEFILE)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_PATHSEP version: 5 updated: 2010/05/26 05:38:42
+dnl CF_PATHSEP version: 6 updated: 2012/09/29 18:38:12
 dnl ----------
-dnl Provide a value for the $PATH and similar separator
+dnl Provide a value for the $PATH and similar separator (or amend the value
+dnl as provided in autoconf 2.5x).
 AC_DEFUN([CF_PATHSEP],
 [
+	AC_MSG_CHECKING(for PATH separator)
 	case $cf_cv_system_name in
 	os2*)	PATH_SEPARATOR=';'  ;;
-	*)	PATH_SEPARATOR=':'  ;;
+	*)	${PATH_SEPARATOR:=':'}  ;;
 	esac
 ifelse([$1],,,[$1=$PATH_SEPARATOR])
 	AC_SUBST(PATH_SEPARATOR)
+	AC_MSG_RESULT($PATH_SEPARATOR)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_PATH_PROG version: 8 updated: 2010/10/23 16:12:25
+dnl CF_PATH_PROG version: 9 updated: 2012/10/04 20:12:20
 dnl ------------
 dnl Check for a given program, defining corresponding symbol.
 dnl	$1 = environment variable, which is suffixed by "_PATH" in the #define.
@@ -4313,8 +4324,8 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 	CF_MSG_LOG(defining path for ${cf_path_prog})
-	AC_DEFINE_UNQUOTED($1_PATH,"$cf_path_prog")
-	test -n "$cf_path_args" && AC_DEFINE_UNQUOTED($1_ARGS,"$cf_path_args")
+	AC_DEFINE_UNQUOTED($1_PATH,"$cf_path_prog",Define to pathname $1)
+	test -n "$cf_path_args" && AC_DEFINE_UNQUOTED($1_ARGS,"$cf_path_args",Define to provide args for $1)
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
@@ -4355,7 +4366,7 @@ case ".[$]$1" in #(vi
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_PDCURSES_X11 version: 12 updated: 2011/11/26 15:42:05
+dnl CF_PDCURSES_X11 version: 13 updated: 2012/10/06 16:39:58
 dnl ---------------
 dnl Configure for PDCurses' X11 library
 AC_DEFUN([CF_PDCURSES_X11],[
@@ -4392,9 +4403,9 @@ char *XCursesProgramName = "test";
 fi
 
 if test $cf_cv_lib_XCurses = yes ; then
-	AC_DEFINE(UNIX)
-	AC_DEFINE(XCURSES)
-	AC_CHECK_HEADER(xcurses.h, AC_DEFINE(HAVE_XCURSES))
+	AC_DEFINE(UNIX,1,[Define to 1 if using PDCurses on Unix])
+	AC_DEFINE(XCURSES,1,[Define to 1 if using PDCurses on Unix])
+	AC_CHECK_HEADER(xcurses.h, AC_DEFINE(HAVE_XCURSES,1,[Define to 1 if using PDCurses on Unix]))
 else
 	AC_MSG_ERROR(Cannot link with XCurses)
 fi
@@ -4514,32 +4525,20 @@ AC_DEFUN([CF_PROG_AR],[
 AC_CHECK_TOOL(AR, ar, ar)
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_PROG_CC_U_D version: 1 updated: 2005/07/14 16:59:30
-dnl --------------
-dnl Check if C (preprocessor) -U and -D options are processed in the order
-dnl given rather than by type of option.  Some compilers insist on apply all
-dnl of the -U options after all of the -D options.  Others allow mixing them,
-dnl and may predefine symbols that conflict with those we define.
-AC_DEFUN([CF_PROG_CC_U_D],
-[
-AC_CACHE_CHECK(if $CC -U and -D options work together,cf_cv_cc_u_d_options,[
-	cf_save_CPPFLAGS="$CPPFLAGS"
-	CPPFLAGS="-UU_D_OPTIONS -DU_D_OPTIONS -DD_U_OPTIONS -UD_U_OPTIONS"
-	AC_TRY_COMPILE([],[
-#ifndef U_D_OPTIONS
-make an undefined-error
-#endif
-#ifdef  D_U_OPTIONS
-make a defined-error
-#endif
-	],[
-	cf_cv_cc_u_d_options=yes],[
-	cf_cv_cc_u_d_options=no])
-	CPPFLAGS="$cf_save_CPPFLAGS"
-])
+dnl CF_PROG_CC version: 3 updated: 2012/10/06 15:31:55
+dnl ----------
+dnl standard check for CC, plus followup sanity checks
+dnl $1 = optional parameter to pass to AC_PROG_CC to specify compiler name
+AC_DEFUN([CF_PROG_CC],[
+ifelse($1,,[AC_PROG_CC],[AC_PROG_CC($1)])
+CF_GCC_VERSION
+CF_ACVERSION_CHECK(2.52,
+	[AC_PROG_CC_STDC],
+	[CF_ANSI_CC_REQD])
+CF_CC_ENV_FLAGS 
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_PROG_EXT version: 10 updated: 2004/01/03 19:28:18
+dnl CF_PROG_EXT version: 11 updated: 2012/10/06 08:57:51
 dnl -----------
 dnl Compute $PROG_EXT, used for non-Unix ports, such as OS/2 EMX.
 AC_DEFUN([CF_PROG_EXT],
@@ -4561,7 +4560,7 @@ AC_OBJEXT
 
 PROG_EXT="$EXEEXT"
 AC_SUBST(PROG_EXT)
-test -n "$PROG_EXT" && AC_DEFINE_UNQUOTED(PROG_EXT,"$PROG_EXT")
+test -n "$PROG_EXT" && AC_DEFINE_UNQUOTED(PROG_EXT,"$PROG_EXT",[Define to the program extension (normally blank)])
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_PROG_LINT version: 2 updated: 2009/08/12 04:43:14
@@ -4608,7 +4607,7 @@ AC_CHECK_LIB($2,$1,[
 	[[$]$3])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_REMOVE_BROKEN version: 3 updated: 1997/11/23 14:49:44
+dnl CF_REMOVE_BROKEN version: 4 updated: 2012/11/08 20:57:52
 dnl ----------------
 dnl Check for broken definition of 'remove()'.  This is (in particular) broken
 dnl on the older version of SCO (I'd cite version if I knew where to look) by
@@ -4635,7 +4634,7 @@ AC_TRY_LINK(
 	])
 ])
 AC_MSG_RESULT($cf_cv_baddef_remove)
-test "$cf_cv_baddef_remove" != no && AC_DEFINE(NEED_REMOVE)
+test "$cf_cv_baddef_remove" != no && AC_DEFINE(NEED_REMOVE,1,[Define to 1 if we should use remove rather than unlink])
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_REMOVE_DEFINE version: 3 updated: 2010/01/09 11:05:50
@@ -4770,7 +4769,7 @@ CF_VERBOSE(...checked $1 [$]$1)
 AC_SUBST(EXTRA_LDFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_SET_ERRNO version: 4 updated: 2010/10/23 15:52:32
+dnl CF_SET_ERRNO version: 5 updated: 2012/11/08 20:57:52
 dnl ------------
 dnl Check if 'errno' is declared in a fashion that lets us set it.
 AC_DEFUN([CF_SET_ERRNO],
@@ -4791,7 +4790,7 @@ int main()
 		[cf_cv_set_errno=maybe],
 		[cf_cv_set_errno=no])])
 ])
-test "$cf_cv_set_errno" != no && AC_DEFINE(CAN_SET_ERRNO)
+test "$cf_cv_set_errno" != no && AC_DEFINE(CAN_SET_ERRNO,1,[Define to 1 if we can set errno])
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_SIGWINCH version: 1 updated: 2006/04/02 16:41:09
@@ -4853,7 +4852,7 @@ done
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_SIZECHANGE version: 8 updated: 2000/11/04 12:22:16
+dnl CF_SIZECHANGE version: 9 updated: 2012/10/06 11:17:15
 dnl -------------
 dnl Check for definitions & structures needed for window size-changing
 dnl FIXME: check that this works with "snake" (HP-UX 10.x)
@@ -4914,7 +4913,7 @@ do
 done
 ])
 if test "$cf_cv_sizechange" != no ; then
-	AC_DEFINE(HAVE_SIZECHANGE)
+	AC_DEFINE(HAVE_SIZECHANGE,1,[Define to 1 if sizechar declarations are provided])
 	case $cf_cv_sizechange in #(vi
 	NEED*)
 		AC_DEFINE_UNQUOTED($cf_cv_sizechange )
@@ -4923,7 +4922,7 @@ if test "$cf_cv_sizechange" != no ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_SLANG_CPPFLAGS version: 9 updated: 2010/04/03 15:30:05
+dnl CF_SLANG_CPPFLAGS version: 10 updated: 2012/11/08 20:57:52
 dnl -----------------
 dnl Look for the slang header files in the standard places, adjusting the
 dnl CPPFLAGS variable.
@@ -4954,7 +4953,7 @@ AC_CACHE_CHECK(for $1 header file,cf_cv_$1_header,[
 
 if test "x$cf_cv_$1_header" != xno
 then
-	AC_DEFINE(USE_SLANG)
+	AC_DEFINE(USE_SLANG,1,[Define to 1 if we should use s-lang library])
 
 	CF_DIRNAME(cf_incdir,$cf_cv_$1_header)
 
@@ -5007,7 +5006,7 @@ AC_MSG_RESULT($cf_result)
 test $cf_result = no && LIBS="$cf_slang_LIBS3"
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_SLANG_UNIX_DEFS version: 5 updated: 2010/09/26 10:23:14
+dnl CF_SLANG_UNIX_DEFS version: 6 updated: 2012/11/08 20:57:52
 dnl ------------------
 dnl Slang's header files rely on some predefined symbols to declare variables
 dnl that we might find useful.  This check is needed, because those symbols
@@ -5045,7 +5044,7 @@ AC_CACHE_CHECK(if we must define UTF8,cf_cv_slang_utf8,[
 ])
 
 if test "$cf_cv_slang_utf8" = yes ; then
-	AC_DEFINE(UTF8)
+	AC_DEFINE(UTF8,1,[Define to 1 if we must define UTF-8 for s-lang headers])
 fi
 
 AC_CACHE_CHECK(if we must tell slang this is UNIX,cf_cv_slang_unix,[
@@ -5061,13 +5060,13 @@ SLang_TT_Baud_Rate = 1
 	[cf_cv_slang_unix=yes],
 	[cf_cv_slang_unix=no])
 ])
-test $cf_cv_slang_unix = yes && AC_DEFINE(REAL_UNIX_SYSTEM)
+test $cf_cv_slang_unix = yes && AC_DEFINE(REAL_UNIX_SYSTEM,1,[Define to 1 if we must define REAL_UNIX_SYSTEM to compile with s-lang headers])
 
 CF_CHECK_TYPE(SLsmg_Color_Type,int,[#include <slang.h>])
 CF_CHECK_TYPE(SLtt_Char_Type,unsigned long,[#include <slang.h>])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_SOCKS version: 8 updated: 2010/05/05 20:27:55
+dnl CF_SOCKS version: 9 updated: 2012/11/08 20:57:52
 dnl --------
 dnl Check for socks library
 dnl $1 = the [optional] directory in which the library may be found
@@ -5081,22 +5080,22 @@ AC_DEFUN([CF_SOCKS],[
       socks)
 
   if test "x$cf_cv_find_linkage_socks" = "xyes" ; then
-    AC_DEFINE(SOCKS)
-
-    AC_DEFINE(accept,Raccept)
-    AC_DEFINE(bind,Rbind)
-    AC_DEFINE(connect,Rconnect)
-    AC_DEFINE(getpeername,Rgetpeername)
-    AC_DEFINE(getsockname,Rgetsockname)
-    AC_DEFINE(listen,Rlisten)
-    AC_DEFINE(recvfrom,Rrecvfrom)
-    AC_DEFINE(select,Rselect)
+    AC_DEFINE(SOCKS,1,[Define to 1 if we are using socks library])
+
+    AC_DEFINE(accept,Raccept,[Define to override function name if using socks library])
+    AC_DEFINE(bind,Rbind,[Define to override function name if using socks library])
+    AC_DEFINE(connect,Rconnect,[Define to override function name if using socks library])
+    AC_DEFINE(getpeername,Rgetpeername,[Define to override function name if using socks library])
+    AC_DEFINE(getsockname,Rgetsockname,[Define to override function name if using socks library])
+    AC_DEFINE(listen,Rlisten,[Define to override function name if using socks library])
+    AC_DEFINE(recvfrom,Rrecvfrom,[Define to override function name if using socks library])
+    AC_DEFINE(select,Rselect,[Define to override function name if using socks library])
   else
     AC_MSG_ERROR(cannot link with socks library)
   fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_SOCKS5 version: 11 updated: 2010/06/20 09:24:28
+dnl CF_SOCKS5 version: 12 updated: 2012/11/08 20:57:52
 dnl ---------
 dnl Check for socks5 configuration
 dnl $1 = the [optional] directory in which the library may be found
@@ -5105,15 +5104,15 @@ AC_DEFUN([CF_SOCKS5],[
 
 CF_ADD_LIBS(-lsocks5)
 
-AC_DEFINE(USE_SOCKS5)
-AC_DEFINE(SOCKS)
+AC_DEFINE(USE_SOCKS5,1,[Define to 1 if we are using socks5 library])
+AC_DEFINE(SOCKS,1,[Define to 1 if we are using socks library])
 
 AC_MSG_CHECKING(if the socks library uses socks4 prefix)
 cf_use_socks4=error
 AC_TRY_LINK([
 #include <socks.h>],[
 	Rinit((char *)0)],
-	[AC_DEFINE(USE_SOCKS4_PREFIX)
+	[AC_DEFINE(USE_SOCKS4_PREFIX,1,[Define to 1 if socks library uses socks4 prefix])
 	 cf_use_socks4=yes],
 	[AC_TRY_LINK([#include <socks.h>],
 		[SOCKSinit((char *)0)],
@@ -5146,10 +5145,10 @@ AC_TRY_COMPILE([
 	[cf_use_socks5p_h=no])
 AC_MSG_RESULT($cf_use_socks5p_h)
 
-test "$cf_use_socks5p_h" = yes && AC_DEFINE(INCLUDE_PROTOTYPES)
+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: 10 updated: 2011/06/12 19:28:32
+dnl CF_SRAND version: 11 updated: 2012/10/31 07:00:16
 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
@@ -5157,6 +5156,10 @@ dnl which usually is only 16-bits.
 dnl
 dnl On MirOS, use arc4random_push() and arc4random().
 dnl Some systems support an asymmetric variation of this interface.
+dnl
+dnl $1 = optional prefix for resulting shell variables.  The default "my_"
+dnl      gives $my_srand and $my_rand to the caller, as well as MY_RAND_MAX.
+dnl      These are all AC_SUBST'd and AC_DEFINE'd.
 AC_DEFUN([CF_SRAND],[
 AC_CACHE_CHECK(for random-integer functions, cf_cv_srand_func,[
 cf_cv_srand_func=unknown
@@ -5217,7 +5220,7 @@ if test "$cf_cv_srand_func" != unknown ; then
 	    AC_MSG_RESULT($cf_bsd_stdlib_h)
 		if test "$cf_bsd_stdlib_h" = yes
 		then
-			AC_DEFINE(HAVE_BSD_STDLIB_H)
+			AC_DEFINE(HAVE_BSD_STDLIB_H,1,[Define to 1 if bsd/stdlib.h header should be used])
 		else
 			AC_MSG_CHECKING(if <bsd/random.h> should be included)
 			AC_TRY_COMPILE([#include <bsd/random.h>],
@@ -5231,7 +5234,7 @@ if test "$cf_cv_srand_func" != unknown ; then
 			AC_MSG_RESULT($cf_bsd_random_h)
 			if test "$cf_bsd_random_h" = yes
 			then
-				AC_DEFINE(HAVE_BSD_RANDOM_H)
+				AC_DEFINE(HAVE_BSD_RANDOM_H,1,[Define to 1 if bsd/random.h header should be used])
 			else
 				AC_MSG_WARN(no header file found for arc4random)
 			fi
@@ -5242,9 +5245,9 @@ if test "$cf_cv_srand_func" != unknown ; then
 	CF_SRAND_PARSE($cf_func,cf_srand_func,cf_rand_func)
 
 	CF_UPPER(cf_rand_max,ifelse($1,,my_,$1)rand_max)
-	AC_DEFINE_UNQUOTED(ifelse($1,,my_,$1)srand,$cf_srand_func)
-	AC_DEFINE_UNQUOTED(ifelse($1,,my_,$1)rand, $cf_rand_func)
-	AC_DEFINE_UNQUOTED([$]cf_rand_max, $cf_cv_rand_max)
+	AC_DEFINE_UNQUOTED(ifelse($1,,my_,$1)srand,$cf_srand_func,[Define to the name for the srand function])
+	AC_DEFINE_UNQUOTED(ifelse($1,,my_,$1)rand, $cf_rand_func,[Define to the name for the rand function])
+	AC_DEFINE_UNQUOTED([$]cf_rand_max, $cf_cv_rand_max,[Define to the name for the RAND_MAX constant])
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
@@ -5263,7 +5266,7 @@ define([CF_SRAND_PARSE],[
 	esac
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_SSL version: 22 updated: 2010/06/20 09:24:28
+dnl CF_SSL version: 23 updated: 2012/11/08 20:57:52
 dnl ------
 dnl Check for ssl library
 dnl $1 = [optional] directory in which the library may be found, set by AC_ARG_WITH
@@ -5373,11 +5376,11 @@ AC_DEFUN([CF_SSL],[
 	fi
 
 	if test "$cf_cv_have_ssl" = yes ; then
-		AC_DEFINE(USE_SSL)
+		AC_DEFINE(USE_SSL,1,[Define to 1 if we are using SSL])
 		if test -n "$cf_cv_header_path_ssl" ; then
 			case $cf_cv_header_path_ssl in #(vi
 			*/openssl)
-				AC_DEFINE(USE_OPENSSL_INCL)
+				AC_DEFINE(USE_OPENSSL_INCL,1,[Define to 1 if we are using OpenSSL headers])
 				;;
 			esac
 		fi
@@ -5398,7 +5401,7 @@ AC_DEFUN([CF_STRIP_O_OPT],[
 $1=`echo ${$1} | sed -e 's/-O[[1-9]]\? //' -e 's/-O[[1-9]]\?$//'`
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_STRUCT_TERMIOS version: 6 updated: 2011/04/16 11:52:53
+dnl CF_STRUCT_TERMIOS version: 7 updated: 2012/10/06 17:56:13
 dnl -----------------
 dnl Some machines require _POSIX_SOURCE to completely define struct termios.
 AC_DEFUN([CF_STRUCT_TERMIOS],[
@@ -5429,7 +5432,7 @@ if test "$ac_cv_header_termios_h" = yes ; then
 #include <termios.h>],
 			[struct termios foo; int x = foo.c_iflag],
 			termios_bad=unknown,
-			termios_bad=yes AC_DEFINE(_POSIX_SOURCE))
+			termios_bad=yes AC_DEFINE(_POSIX_SOURCE,1,[Define to 1 if we must define _POSIX_SOURCE]))
 			])
 	AC_MSG_RESULT($termios_bad)
 	fi
@@ -5453,43 +5456,7 @@ CF_ADD_SUBDIR_PATH($1,$2,$3,/opt,$prefix)
 CF_ADD_SUBDIR_PATH($1,$2,$3,[$]HOME,$prefix)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_SUBST version: 4 updated: 2006/06/17 12:33:03
-dnl --------
-dnl	Shorthand macro for substituting things that the user may override
-dnl	with an environment variable.
-dnl
-dnl	$1 = long/descriptive name
-dnl	$2 = environment variable
-dnl	$3 = default value
-AC_DEFUN([CF_SUBST],
-[AC_CACHE_VAL(cf_cv_subst_$2,[
-AC_MSG_CHECKING(for $1 (symbol $2))
-CF_SUBST_IF([-z "[$]$2"], [$2], [$3])
-cf_cv_subst_$2=[$]$2
-AC_MSG_RESULT([$]$2)
-])
-])dnl
-dnl ---------------------------------------------------------------------------
-dnl CF_SUBST_IF version: 2 updated: 2006/06/17 12:33:03
-dnl -----------
-dnl	Shorthand macro for substituting things that the user may override
-dnl	with an environment variable.
-dnl
-dnl	$1 = condition to pass to "test"
-dnl	$2 = environment variable
-dnl	$3 = value if the test succeeds
-dnl	$4 = value if the test fails
-AC_DEFUN([CF_SUBST_IF],
-[
-if test $1 ; then
-	$2=$3
-ifelse($4,,,[else
-	$2=$4])
-fi
-AC_SUBST($2)
-])dnl
-dnl ---------------------------------------------------------------------------
-dnl CF_SYSTEM_MAIL_FLAGS version: 3 updated: 1998/11/18 14:45:34
+dnl CF_SYSTEM_MAIL_FLAGS version: 4 updated: 2012/11/08 20:57:52
 dnl --------------------
 AC_DEFUN([CF_SYSTEM_MAIL_FLAGS],
 [
@@ -5504,10 +5471,10 @@ AC_CACHE_VAL(cf_cv_system_mail_flags,[
 	esac
 	])
 AC_MSG_RESULT($cf_cv_system_mail_flags)
-AC_DEFINE_UNQUOTED(SYSTEM_MAIL_FLAGS, "$cf_cv_system_mail_flags")
+AC_DEFINE_UNQUOTED(SYSTEM_MAIL_FLAGS, "$cf_cv_system_mail_flags",[Define to value used for system mail-flags])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_SYSV_UTMP version: 5 updated: 2001/12/27 12:55:07
+dnl CF_SYSV_UTMP version: 6 updated: 2012/10/04 20:12:20
 dnl ------------
 dnl Check if this is a SYSV flavor of UTMP
 AC_DEFUN([CF_SYSV_UTMP],
@@ -5525,7 +5492,7 @@ struct $cf_cv_have_utmp x;
 	[cf_cv_sysv_utmp=yes],
 	[cf_cv_sysv_utmp=no])
 ])
-test $cf_cv_sysv_utmp = yes && AC_DEFINE(USE_SYSV_UTMP)
+test $cf_cv_sysv_utmp = yes && AC_DEFINE(USE_SYSV_UTMP,1,[Define to 1 if utmp is SYSV flavor])
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_SYS_ERRLIST version: 6 updated: 2001/12/30 13:03:23
@@ -5632,7 +5599,7 @@ if test "$cf_cv_termlib" = none; then
 fi
 ])])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_TERMIO_AND_CURSES version: 4 updated: 2010/10/23 15:54:49
+dnl CF_TERMIO_AND_CURSES version: 5 updated: 2012/11/08 20:57:52
 dnl --------------------
 dnl Check if including termio.h with <curses.h> dies like on sysv68
 dnl FIXME: this is too Lynx-specific
@@ -5652,10 +5619,10 @@ AC_CACHE_CHECK(if we can include termio.h with curses,cf_cv_termio_and_curses,[
     rm -f lynx_cfg.h
 ])
 
-test $cf_cv_termio_and_curses = yes && AC_DEFINE(TERMIO_AND_CURSES)
+test $cf_cv_termio_and_curses = yes && AC_DEFINE(TERMIO_AND_CURSES,1,[Define to 1 if we can include termio.h with curses.h])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_TERMIO_AND_TERMIOS version: 2 updated: 1997/08/28 20:22:00
+dnl CF_TERMIO_AND_TERMIOS version: 3 updated: 2012/11/08 20:57:52
 dnl ---------------------
 dnl Check if including both termio.h and termios.h die like on DG.UX
 AC_DEFUN([CF_TERMIO_AND_TERMIOS],
@@ -5673,10 +5640,10 @@ AC_CACHE_VAL(cf_cv_termio_and_termios,[
     [cf_cv_termio_and_termios=yes],
     [cf_cv_termio_and_termios=no])])
 AC_MSG_RESULT($cf_cv_termio_and_termios)
-test $cf_cv_termio_and_termios = no && AC_DEFINE(TERMIO_AND_TERMIOS)
+test $cf_cv_termio_and_termios = no && AC_DEFINE(TERMIO_AND_TERMIOS,1,[Define to 1 if we can include termio.h and termios.h])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_TERM_HEADER version: 2 updated: 2010/10/23 15:54:49
+dnl CF_TERM_HEADER version: 3 updated: 2012/10/06 08:57:51
 dnl --------------
 dnl Look for term.h, which is part of X/Open curses.  It defines the interface
 dnl to terminfo database.  Usually it is in the same include-path as curses.h,
@@ -5709,21 +5676,21 @@ done
 
 case $cf_cv_term_header in # (vi
 *term.h)
-	AC_DEFINE(HAVE_TERM_H)
+	AC_DEFINE(HAVE_TERM_H,1,[Define to 1 if we have term.h])
 	;;
 esac
 
 case $cf_cv_term_header in # (vi
 ncurses/term.h) #(vi
-	AC_DEFINE(HAVE_NCURSES_TERM_H)
+	AC_DEFINE(HAVE_NCURSES_TERM_H,1,[Define to 1 if we have ncurses/term.h])
 	;;
 ncursesw/term.h)
-	AC_DEFINE(HAVE_NCURSESW_TERM_H)
+	AC_DEFINE(HAVE_NCURSESW_TERM_H,1,[Define to 1 if we have ncursesw/term.h])
 	;;
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_TM_GMTOFF version: 2 updated: 1997/08/28 23:57:55
+dnl CF_TM_GMTOFF version: 3 updated: 2012/11/08 20:57:52
 dnl ------------
 dnl Check if the tm-struct defines the '.tm_gmtoff' member (useful in decoding
 dnl dates).
@@ -5748,7 +5715,7 @@ AC_CACHE_VAL(cf_cv_tm_gmtoff,[
 	[cf_cv_tm_gmtoff=yes],
 	[cf_cv_tm_gmtoff=no])])
 AC_MSG_RESULT($cf_cv_tm_gmtoff)
-test $cf_cv_tm_gmtoff = no && AC_DEFINE(DONT_HAVE_TM_GMTOFF)
+test $cf_cv_tm_gmtoff = no && AC_DEFINE(DONT_HAVE_TM_GMTOFF,1,[Define to 1 if the tm-struct defines .tm_gmtoff member])
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_TRY_PKG_CONFIG version: 4 updated: 2010/06/14 17:42:30
@@ -5815,7 +5782,7 @@ if test "$cf_cv_xopen_source" != no ; then
 fi
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_TTYTYPE version: 5 updated: 2010/10/23 15:54:49
+dnl CF_TTYTYPE version: 6 updated: 2012/11/08 20:57:52
 dnl ----------
 AC_DEFUN([CF_TTYTYPE],
 [
@@ -5827,10 +5794,10 @@ AC_CACHE_VAL(cf_cv_have_ttytype,[
 	[cf_cv_have_ttytype=no])
 	])
 AC_MSG_RESULT($cf_cv_have_ttytype)
-test $cf_cv_have_ttytype = yes && AC_DEFINE(HAVE_TTYTYPE)
+test $cf_cv_have_ttytype = yes && AC_DEFINE(HAVE_TTYTYPE,1,[Define to 1 if ttytype is declared in curses library])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_TYPE_LONG_LONG version: 2 updated: 2010/09/23 04:08:01
+dnl CF_TYPE_LONG_LONG version: 3 updated: 2012/11/08 20:57:52
 dnl -----------------
 dnl Check for long long type.
 AC_DEFUN([CF_TYPE_LONG_LONG],[
@@ -5861,11 +5828,11 @@ _CFEOF
 ])
 
 if test "$cf_cv_type_long_long" = yes ; then
-	AC_DEFINE(HAVE_LONG_LONG)
+	AC_DEFINE(HAVE_LONG_LONG,1,[Define to 1 if compiler supports long long type])
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_UNION_WAIT version: 5 updated: 1997/11/23 14:49:44
+dnl CF_UNION_WAIT version: 6 updated: 2012/10/06 08:57:51
 dnl -------------
 dnl Check to see if the BSD-style union wait is declared.  Some platforms may
 dnl use this, though it is deprecated in favor of the 'int' type in Posix.
@@ -5908,7 +5875,7 @@ AC_CACHE_VAL(cf_cv_type_unionwait,[
 	],
 	[cf_cv_type_unionwait=no])])])
 AC_MSG_RESULT($cf_cv_type_unionwait)
-test $cf_cv_type_unionwait = yes && AC_DEFINE(HAVE_TYPE_UNIONWAIT)
+test $cf_cv_type_unionwait = yes && AC_DEFINE(HAVE_TYPE_UNIONWAIT,1,[Define to 1 if type unionwait is declared])
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_UPPER version: 5 updated: 2001/01/29 23:40:59
@@ -5920,7 +5887,7 @@ AC_DEFUN([CF_UPPER],
 $1=`echo "$2" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_UTF8_LIB version: 7 updated: 2010/06/20 09:24:28
+dnl CF_UTF8_LIB version: 8 updated: 2012/10/06 08:57:51
 dnl -----------
 dnl Check for multibyte support, and if not found, utf8 compatibility library
 AC_DEFUN([CF_UTF8_LIB],
@@ -5939,14 +5906,14 @@ AC_CACHE_CHECK(for multibyte character support,cf_cv_utf8_lib,[
 # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between
 # ncurses/ncursesw:
 if test "$cf_cv_utf8_lib" = "add-on" ; then
-	AC_DEFINE(HAVE_LIBUTF8_H)
+	AC_DEFINE(HAVE_LIBUTF8_H,1,[Define to 1 if we should include libutf8.h])
 	CF_ADD_INCDIR($cf_cv_header_path_utf8)
 	CF_ADD_LIBDIR($cf_cv_library_path_utf8)
 	CF_ADD_LIBS($cf_cv_library_file_utf8)
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_UTMP version: 9 updated: 2008/01/25 17:18:00
+dnl CF_UTMP version: 10 updated: 2012/10/04 20:12:20
 dnl -------
 dnl Check for UTMP/UTMPX headers
 AC_DEFUN([CF_UTMP],
@@ -5982,8 +5949,8 @@ done
 ])
 
 if test $cf_cv_have_utmp != no ; then
-	AC_DEFINE(HAVE_UTMP)
-	test $cf_cv_have_utmp = utmpx && AC_DEFINE(UTMPX_FOR_UTMP)
+	AC_DEFINE(HAVE_UTMP,1,[Define to 1 if the utmp interface is available])
+	test $cf_cv_have_utmp = utmpx && AC_DEFINE(UTMPX_FOR_UTMP,1,[Define if we have utmpx interface])
 	CF_UTMP_UT_HOST
 	CF_UTMP_UT_SYSLEN
 	CF_UTMP_UT_NAME
@@ -5994,7 +5961,7 @@ if test $cf_cv_have_utmp != no ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_UTMP_UT_HOST version: 7 updated: 2007/03/13 19:17:11
+dnl CF_UTMP_UT_HOST version: 8 updated: 2012/10/04 20:12:20
 dnl ---------------
 dnl Check if UTMP/UTMPX struct defines ut_host member
 AC_DEFUN([CF_UTMP_UT_HOST],
@@ -6010,11 +5977,11 @@ AC_CACHE_VAL(cf_cv_have_utmp_ut_host,[
 	[cf_cv_have_utmp_ut_host=no])
 	])
 AC_MSG_RESULT($cf_cv_have_utmp_ut_host)
-test $cf_cv_have_utmp_ut_host != no && AC_DEFINE(HAVE_UTMP_UT_HOST)
+test $cf_cv_have_utmp_ut_host != no && AC_DEFINE(HAVE_UTMP_UT_HOST,1,[Define to 1 if UTMP/UTMPX struct defines ut_host member])
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_UTMP_UT_NAME version: 4 updated: 2007/03/13 19:17:11
+dnl CF_UTMP_UT_NAME version: 5 updated: 2012/10/04 20:12:20
 dnl ---------------
 dnl Check if UTMP/UTMPX struct defines ut_name member
 AC_DEFUN([CF_UTMP_UT_NAME],
@@ -6045,13 +6012,13 @@ no) #(vi
 	AC_MSG_ERROR(Cannot find declaration for ut.ut_name)
 	;;
 ut_user)
-	AC_DEFINE(ut_name,ut_user)
+	AC_DEFINE(ut_name,ut_user,[Define to rename UTMP/UTMPX struct ut_name member])
 	;;
 esac
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_UTMP_UT_SESSION version: 5 updated: 2007/03/13 19:17:11
+dnl CF_UTMP_UT_SESSION version: 6 updated: 2012/10/04 20:12:20
 dnl ------------------
 dnl Check if UTMP/UTMPX struct defines ut_session member
 AC_DEFUN([CF_UTMP_UT_SESSION],
@@ -6066,12 +6033,12 @@ AC_CACHE_CHECK(if ${cf_cv_have_utmp}.ut_session is declared, cf_cv_have_utmp_ut_
 	[cf_cv_have_utmp_ut_session=no])
 ])
 if test $cf_cv_have_utmp_ut_session != no ; then
-	AC_DEFINE(HAVE_UTMP_UT_SESSION)
+	AC_DEFINE(HAVE_UTMP_UT_SESSION,1,[Define to 1 if UTMP/UTMPX struct defines ut_session member])
 fi
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_UTMP_UT_SYSLEN version: 1 updated: 2008/01/25 17:18:00
+dnl CF_UTMP_UT_SYSLEN version: 2 updated: 2012/10/04 20:12:20
 dnl -----------------
 dnl Check if UTMP/UTMPX struct defines ut_syslen member
 AC_DEFUN([CF_UTMP_UT_SYSLEN],
@@ -6087,11 +6054,11 @@ AC_CACHE_VAL(cf_cv_have_utmp_ut_syslen,[
 	[cf_cv_have_utmp_ut_syslen=no])
 	])
 AC_MSG_RESULT($cf_cv_have_utmp_ut_syslen)
-test $cf_cv_have_utmp_ut_syslen != no && AC_DEFINE(HAVE_UTMP_UT_SYSLEN)
+test $cf_cv_have_utmp_ut_syslen != no && AC_DEFINE(HAVE_UTMP_UT_SYSLEN,1,[Define to 1 if UTMP/UTMPX struct defines ut_syslen member])
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_UTMP_UT_XSTATUS version: 3 updated: 2001/12/27 12:55:07
+dnl CF_UTMP_UT_XSTATUS version: 4 updated: 2012/10/04 20:12:20
 dnl ------------------
 dnl Check for known variants on the UTMP/UTMPX struct's exit-status as reported
 dnl by various people:
@@ -6123,13 +6090,13 @@ AC_TRY_COMPILE([
 done
 ])
 if test $cf_cv_have_utmp_ut_xstatus != no ; then
-	AC_DEFINE(HAVE_UTMP_UT_XSTATUS)
-	AC_DEFINE_UNQUOTED(ut_xstatus,$cf_cv_have_utmp_ut_xstatus)
+	AC_DEFINE(HAVE_UTMP_UT_XSTATUS,1,[Define to 1 if UTMP/UTMPX has exit-status member])
+	AC_DEFINE_UNQUOTED(ut_xstatus,$cf_cv_have_utmp_ut_xstatus,[Define if needed to rename member ut_xstatus of UTMP/UTMPX])
 fi
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_UTMP_UT_XTIME version: 7 updated: 2007/03/13 19:17:11
+dnl CF_UTMP_UT_XTIME version: 9 updated: 2012/10/04 20:12:20
 dnl ----------------
 dnl Check if UTMP/UTMPX struct defines ut_xtime member
 AC_DEFUN([CF_UTMP_UT_XTIME],
@@ -6150,9 +6117,9 @@ AC_CACHE_CHECK(if ${cf_cv_have_utmp}.ut_xtime is declared, cf_cv_have_utmp_ut_xt
 	])
 ])
 if test $cf_cv_have_utmp_ut_xtime != no ; then
-	AC_DEFINE(HAVE_UTMP_UT_XTIME)
+	AC_DEFINE(HAVE_UTMP_UT_XTIME,1,[Define to 1 if UTMP/UTMPX struct defines ut_xtime member])
 	if test $cf_cv_have_utmp_ut_xtime = define ; then
-		AC_DEFINE(ut_xtime,ut_tv.tv_sec)
+		AC_DEFINE(ut_xtime,ut_tv.tv_sec,[Define if needed to alternate name for utmpx.ut_xtime member])
 	fi
 fi
 fi
@@ -6197,7 +6164,7 @@ fi
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WIDEC_CURSES version: 4 updated: 2010/10/23 15:54:49
+dnl CF_WIDEC_CURSES version: 5 updated: 2012/11/08 20:57:52
 dnl ---------------
 dnl Check for curses implementations that can handle wide-characters
 AC_DEFUN([CF_WIDEC_CURSES],
@@ -6216,7 +6183,7 @@ AC_TRY_LINK([
 ])
 
 if test "$cf_cv_widec_curses" = yes ; then
-	AC_DEFINE(WIDEC_CURSES)
+	AC_DEFINE(WIDEC_CURSES,1,[Define to 1 if curses supports wide characters])
 
 	# This is needed on Tru64 5.0 to declare mbstate_t
 	AC_CACHE_CHECK(if we must include wchar.h to declare mbstate_t,cf_cv_widec_mbstate,[
@@ -6234,11 +6201,11 @@ if test "$cf_cv_widec_curses" = yes ; then
 [cf_cv_widec_mbstate=unknown])])])
 
 if test "$cf_cv_widec_mbstate" = yes ; then
-	AC_DEFINE(NEED_WCHAR_H)
+	AC_DEFINE(NEED_WCHAR_H,1,[Define to 1 if we must include wchar.h])
 fi
 
 if test "$cf_cv_widec_mbstate" != unknown ; then
-	AC_DEFINE(HAVE_MBSTATE_T)
+	AC_DEFINE(HAVE_MBSTATE_T,1,[Define to 1 if we have mbstate_t type])
 fi
 
 fi
@@ -6314,7 +6281,7 @@ if test "$with_dmalloc" = yes ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_IDNA version: 8 updated: 2010/11/26 15:10:07
+dnl CF_WITH_IDNA version: 9 updated: 2012/11/08 20:57:52
 dnl ------------
 dnl Check for libidn, use it if found.
 dnl
@@ -6331,11 +6298,11 @@ AC_DEFUN([CF_WITH_IDNA],[
 ],idn,,,,[$LIBICONV])
 
 if test "x$cf_cv_find_linkage_idn" = xyes ; then
-	AC_DEFINE(USE_IDNA)
+	AC_DEFINE(USE_IDNA,1,[Define to 1 if we should use IDNA library])
 fi 
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_PATH version: 10 updated: 2010/10/23 15:44:18
+dnl CF_WITH_PATH version: 11 updated: 2012/09/29 15:04:19
 dnl ------------
 dnl Wrapper for AC_ARG_WITH to ensure that user supplies a pathname, not just
 dnl defaulting to yes/no.
@@ -6352,7 +6319,7 @@ ifelse([$4],,[withval="${$3}"],[withval="${$3:-ifelse([$5],,[$4],[$5])}"]))dnl
 if ifelse([$5],,true,[test -n "$5"]) ; then
 CF_PATH_SYNTAX(withval)
 fi
-$3="$withval"
+eval $3="$withval"
 AC_SUBST($3)dnl
 ])dnl
 dnl ---------------------------------------------------------------------------
@@ -6739,7 +6706,7 @@ CF_TRY_PKG_CONFIG(Xext,,[
 		[CF_ADD_LIB(Xext)])])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_X_TOOLKIT version: 20 updated: 2010/11/19 05:43:04
+dnl CF_X_TOOLKIT version: 21 updated: 2012/10/04 06:57:36
 dnl ------------
 dnl Check for X Toolkit libraries
 dnl
@@ -6813,7 +6780,7 @@ AC_TRY_LINK([
 
 	AC_CHECK_FUNC(XtAppInitialize,,[
 	AC_CHECK_LIB(Xt, XtAppInitialize,
-		[AC_DEFINE(HAVE_LIBXT)
+		[AC_DEFINE(HAVE_LIBXT,1,[Define to 1 if we can compile with the Xt library])
 		 cf_have_X_LIBS=Xt
 		 LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS"],,
 		[$X_PRE_LIBS $LIBS $X_EXTRA_LIBS])])
diff --git a/config.guess b/config.guess
index e4b69669..872b96a1 100755
--- a/config.guess
+++ b/config.guess
@@ -2,9 +2,9 @@
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2911 Free Software Foundation, Inc.
+#   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2011-01-01'
+timestamp='2012-09-25'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -17,9 +17,7 @@ timestamp='2011-01-01'
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -57,7 +55,7 @@ GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -145,7 +143,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:NetBSD:*:*)
 	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
 	# switched to ELF, *-*-netbsd* would select the old
 	# object file format.  This provides both forward
@@ -202,6 +200,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
 	exit ;;
+    *:Bitrig:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+	exit ;;
     *:OpenBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
@@ -220,10 +222,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	exit ;;
     alpha:OSF1:*:*)
 	case $UNAME_RELEASE in
-	    *4.0)
+	*4.0)
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 		;;
-	    *5.*)
+	*5.*)
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 		;;
 	esac
@@ -304,7 +306,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
+    arm*:riscos:*:*|arm*:RISCOS:*:*)
 	echo arm-unknown-riscos
 	exit ;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
@@ -600,50 +602,50 @@ EOF
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
 		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
 		    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      532)                      # CPU_PA_RISC2_0
+			case "${sc_kernel_bits}" in
+			  32) HP_ARCH="hppa2.0n" ;;
+			  64) HP_ARCH="hppa2.0w" ;;
 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
+			esac ;;
+		    esac
 		fi
 		if [ "${HP_ARCH}" = "" ]; then
 		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
+		    sed 's/^		//' << EOF >$dummy.c
 
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
+		#define _HPUX_SOURCE
+		#include <stdlib.h>
+		#include <unistd.h>
 
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
+		int main ()
+		{
+		#if defined(_SC_KERNEL_BITS)
+		    long bits = sysconf(_SC_KERNEL_BITS);
+		#endif
+		    long cpu  = sysconf (_SC_CPU_VERSION);
 
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
+		    switch (cpu)
+			{
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+			case CPU_PA_RISC2_0:
+		#if defined(_SC_KERNEL_BITS)
+			    switch (bits)
+				{
+				case 64: puts ("hppa2.0w"); break;
+				case 32: puts ("hppa2.0n"); break;
+				default: puts ("hppa2.0"); break;
+				} break;
+		#else  /* !defined(_SC_KERNEL_BITS) */
+			    puts ("hppa2.0"); break;
+		#endif
+			default: puts ("hppa1.0"); break;
+			}
+		    exit (0);
+		}
 EOF
 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
@@ -792,21 +794,26 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
     *:FreeBSD:*:*)
-	case ${UNAME_MACHINE} in
-	    pc98)
-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	case ${UNAME_PROCESSOR} in
 	    amd64)
 		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	    *)
-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	esac
 	exit ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit ;;
+    *:MINGW64*:*)
+	echo ${UNAME_MACHINE}-pc-mingw64
+	exit ;;
     *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
+    i*:MSYS*:*)
+	echo ${UNAME_MACHINE}-pc-msys
+	exit ;;
     i*:windows32*:*)
 	# uname -m includes "-pc" on this system.
 	echo ${UNAME_MACHINE}-mingw32
@@ -861,15 +868,22 @@ EOF
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
+    aarch64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    aarch64_be:Linux:*:*)
+	UNAME_MACHINE=aarch64_be
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	    EV5)   UNAME_MACHINE=alphaev5 ;;
-	    EV56)  UNAME_MACHINE=alphaev56 ;;
-	    PCA56) UNAME_MACHINE=alphapca56 ;;
-	    PCA57) UNAME_MACHINE=alphapca56 ;;
-	    EV6)   UNAME_MACHINE=alphaev6 ;;
-	    EV67)  UNAME_MACHINE=alphaev67 ;;
-	    EV68*) UNAME_MACHINE=alphaev68 ;;
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
 	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
@@ -877,30 +891,39 @@ EOF
 	exit ;;
     arm*:Linux:*:*)
 	eval $set_cc_for_build
-	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null | \
-	    grep -q __ARM_EABI__
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_EABI__
 	then
 	    echo ${UNAME_MACHINE}-unknown-linux-gnu
 	else
-	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep -q __ARM_PCS_VFP
+	    then
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	    else
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+	    fi
 	fi
 	exit ;;
     avr32*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     cris:Linux:*:*)
-	echo cris-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-gnu
 	exit ;;
     crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-gnu
 	exit ;;
     frv:Linux:*:*)
-	echo frv-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    hexagon:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     i*86:Linux:*:*)
 	LIBC=gnu
 	eval $set_cc_for_build
-	sed 's/^        //' << EOF >$dummy.c
+	sed 's/^	//' << EOF >$dummy.c
 	#ifdef __dietlibc__
 	LIBC=dietlibc
 	#endif
@@ -937,7 +960,7 @@ EOF
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     or32:Linux:*:*)
-	echo or32-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     padre:Linux:*:*)
 	echo sparc-unknown-linux-gnu
@@ -972,13 +995,13 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-tilera-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     vax:Linux:*:*)
 	echo ${UNAME_MACHINE}-dec-linux-gnu
 	exit ;;
     x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     xtensa*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -1096,7 +1119,7 @@ EOF
 	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	   && { echo i486-ncr-sysv4; exit; } ;;
+	  && { echo i486-ncr-sysv4; exit; } ;;
     NCR*:*:4.2:* | MPRAS*:*:4.2:*)
 	OS_REL='.3'
 	test -r /etc/.relid \
@@ -1139,8 +1162,8 @@ EOF
 		echo ns32k-sni-sysv
 	fi
 	exit ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-	              # says <Richard.M.Bartel@ccMail.Census.GOV>
+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+			# says <Richard.M.Bartel@ccMail.Census.GOV>
 	echo i586-unisys-sysv4
 	exit ;;
     *:UNIX_System_V:4*:FTX*)
@@ -1168,9 +1191,9 @@ EOF
 	exit ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
+		echo mips-nec-sysv${UNAME_RELEASE}
 	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
+		echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
 	exit ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
@@ -1185,6 +1208,9 @@ EOF
     BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
 	echo i586-pc-haiku
 	exit ;;
+    x86_64:Haiku:*:*)
+	echo x86_64-unknown-haiku
+	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
 	exit ;;
@@ -1215,12 +1241,12 @@ EOF
 	    i386)
 		eval $set_cc_for_build
 		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-		    if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-			(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-			grep IS_64BIT_ARCH >/dev/null
-		    then
-			UNAME_PROCESSOR="x86_64"
-		    fi
+		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		      grep IS_64BIT_ARCH >/dev/null
+		  then
+		      UNAME_PROCESSOR="x86_64"
+		  fi
 		fi ;;
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
@@ -1229,8 +1255,8 @@ EOF
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
 	UNAME_PROCESSOR=`uname -p`
 	if test "$UNAME_PROCESSOR" = "x86"; then
-	    UNAME_PROCESSOR=i386
-	    UNAME_MACHINE=pc
+		UNAME_PROCESSOR=i386
+		UNAME_MACHINE=pc
 	fi
 	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
 	exit ;;
@@ -1240,7 +1266,7 @@ EOF
     NEO-?:NONSTOP_KERNEL:*:*)
 	echo neo-tandem-nsk${UNAME_RELEASE}
 	exit ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
+    NSE-*:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
 	exit ;;
     NSR-?:NONSTOP_KERNEL:*:*)
@@ -1309,11 +1335,11 @@ EOF
     i*86:AROS:*:*)
 	echo ${UNAME_MACHINE}-pc-aros
 	exit ;;
+    x86_64:VMkernel:*:*)
+	echo ${UNAME_MACHINE}-unknown-esx
+	exit ;;
 esac
 
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
 eval $set_cc_for_build
 cat >$dummy.c <<EOF
 #ifdef _SEQUENT_
@@ -1331,11 +1357,11 @@ main ()
 #include <sys/param.h>
   printf ("m68k-sony-newsos%s\n",
 #ifdef NEWSOS4
-          "4"
+	"4"
 #else
-	  ""
+	""
 #endif
-         ); exit (0);
+	); exit (0);
 #endif
 #endif
 
diff --git a/config.sub b/config.sub
index 7c62c346..bdda9e4a 100755
--- a/config.sub
+++ b/config.sub
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-#   2011 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2011-04-01'
+timestamp='2012-08-18'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -21,9 +21,7 @@ timestamp='2011-04-01'
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -76,7 +74,7 @@ version="\
 GNU config.sub ($timestamp)
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -125,13 +123,17 @@ esac
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
   knetbsd*-gnu* | netbsd*-gnu* | \
   kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
+  android-linux)
+    os=-linux-android
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+    ;;
   *)
     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
     if [ $basic_machine != $1 ]
@@ -223,6 +225,12 @@ case $os in
 	-isc*)
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
+	-lynx*178)
+		os=-lynxos178
+		;;
+	-lynx*5)
+		os=-lynxos5
+		;;
 	-lynx*)
 		os=-lynxos
 		;;
@@ -247,17 +255,22 @@ case $basic_machine in
 	# Some are omitted here because they have special meanings below.
 	1750a | 580 \
 	| a29k \
+	| aarch64 | aarch64_be \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+        | be32 | be64 \
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
+	| epiphany \
 	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| hexagon \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
+	| le32 | le64 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
 	| maxq | mb | microblaze | mcore | mep | metag \
@@ -291,7 +304,7 @@ case $basic_machine in
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
-	| rx \
+	| rl78 | rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
@@ -300,7 +313,7 @@ case $basic_machine in
 	| spu \
 	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 	| ubicom32 \
-	| v850 | v850e \
+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
 	| we32k \
 	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
@@ -315,8 +328,7 @@ case $basic_machine in
 	c6x)
 		basic_machine=tic6x-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
-		# Motorola 68HC11/12.
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
@@ -325,21 +337,28 @@ case $basic_machine in
 	ms1)
 		basic_machine=mt-unknown
 		;;
+
 	strongarm | thumb | xscale)
 		basic_machine=arm-unknown
 		;;
+	xgate)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
 	xscaleeb)
 		basic_machine=armeb-unknown
 		;;
+
 	xscaleel)
 		basic_machine=armel-unknown
 		;;
+
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
 	i*86 | x86_64)
-		basic_machine=$basic_machine-pc
-		;;
+	  basic_machine=$basic_machine-pc
+	  ;;
 	# Object if more than one company name word.
 	*-*-*)
 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
@@ -348,11 +367,13 @@ case $basic_machine in
 	# Recognize the basic CPU types with company name.
 	580-* \
 	| a29k-* \
+	| aarch64-* | aarch64_be-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
+	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
 	| clipper-* | craynv-* | cydra-* \
@@ -361,8 +382,10 @@ case $basic_machine in
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| hexagon-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
+	| le32-* | le64-* \
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
@@ -396,7 +419,7 @@ case $basic_machine in
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
 	| pyramid-* \
-	| romp-* | rs6000-* | rx-* \
+	| rl78-* | romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
@@ -404,10 +427,11 @@ case $basic_machine in
 	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
 	| tahoe-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tile-* | tilegx-* \
+	| tile*-* \
 	| tron-* \
 	| ubicom32-* \
-	| v850-* | v850e-* | vax-* \
+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+	| vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
@@ -707,7 +731,6 @@ case $basic_machine in
 	i370-ibm* | ibm*)
 		basic_machine=i370-ibm
 		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
 	i*86v32)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
@@ -768,6 +791,10 @@ case $basic_machine in
 	microblaze)
 		basic_machine=microblaze-xilinx
 		;;
+	mingw64)
+		basic_machine=x86_64-pc
+		os=-mingw64
+		;;
 	mingw32)
 		basic_machine=i386-pc
 		os=-mingw32
@@ -804,10 +831,18 @@ case $basic_machine in
 	ms1-*)
 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
 		;;
+	msys)
+		basic_machine=i386-pc
+		os=-msys
+		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
 		;;
+	nacl)
+		basic_machine=le32-unknown
+		os=-nacl
+		;;
 	ncr3000)
 		basic_machine=i486-ncr
 		os=-sysv4
@@ -836,10 +871,10 @@ case $basic_machine in
 		basic_machine=v70-nec
 		os=-sysv
 		;;
-	next | m*-next)
+	next | m*-next )
 		basic_machine=m68k-next
 		case $os in
-		    -nextstep*)
+		    -nextstep* )
 			;;
 		    -ns2*)
 		      os=-nextstep2
@@ -958,11 +993,9 @@ case $basic_machine in
 	pn)
 		basic_machine=pn-gould
 		;;
-	power)
-		basic_machine=power-ibm
+	power)	basic_machine=power-ibm
 		;;
-	ppc | ppcbe)
-		basic_machine=powerpc-unknown
+	ppc | ppcbe)	basic_machine=powerpc-unknown
 		;;
 	ppc-* | ppcbe-*)
 		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
@@ -973,11 +1006,9 @@ case $basic_machine in
 	ppcle-* | powerpclittle-*)
 		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	ppc64)
-		basic_machine=powerpc64-unknown
+	ppc64)	basic_machine=powerpc64-unknown
 		;;
-	ppc64-*)
-		basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
 		basic_machine=powerpc64le-unknown
@@ -1120,13 +1151,8 @@ case $basic_machine in
 		basic_machine=t90-cray
 		os=-unicos
 		;;
-	# This must be matched before tile*.
-	tilegx*)
-		basic_machine=tilegx-unknown
-		os=-linux-gnu
-		;;
 	tile*)
-		basic_machine=tile-unknown
+		basic_machine=$basic_machine-unknown
 		os=-linux-gnu
 		;;
 	tx39)
@@ -1330,15 +1356,15 @@ case $os in
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -openbsd* | -solidbsd* \
+	      | -bitrig* | -openbsd* | -solidbsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* | -cegcc* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-android* \
-	      | -linux-newlib* | -linux-uclibc* \
+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1421,7 +1447,7 @@ case $os in
 	-nova*)
 		os=-rtmk-nova
 		;;
-	-ns2)
+	-ns2 )
 		os=-nextstep2
 		;;
 	-nsk*)
@@ -1521,6 +1547,9 @@ case $basic_machine in
 	c4x-* | tic4x-*)
 		os=-coff
 		;;
+	hexagon-*)
+		os=-elf
+		;;
 	tic54x-*)
 		os=-coff
 		;;
@@ -1548,9 +1577,6 @@ case $basic_machine in
 		;;
 	m68000-sun)
 		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
 		;;
 	m68*-cisco)
 		os=-aout
@@ -1618,7 +1644,7 @@ case $basic_machine in
 	m88k-omron*)
 		os=-luna
 		;;
-	*-next)
+	*-next )
 		os=-nextstep
 		;;
 	*-sequent)
diff --git a/configure b/configure
index 66172a5d..1778799b 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.in 2.8.8dev.12.
+# From configure.in 2.8.8dev.14.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by Autoconf 2.52.20120811.
+# Generated by Autoconf 2.52.20121002.
 #
 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -702,7 +702,7 @@ Optional Features:
   --with-build-ldflags=XXX the build linker-flags ($BUILD_LDFLAGS)
   --with-build-libs=XXX   the build libraries (${BUILD_LIBS})
 Development Options:
-  --disable-echo          display "compiling" commands
+  --disable-echo          do not display "compiling" commands
   --enable-find-leaks     logic for testing memory leaks
   --enable-debug          compile w/ debugging (if \$CFLAGS is set, add -g there, too)
   --disable-trace         disable logic for trace code
@@ -877,7 +877,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.52.20120811.  Invocation command line was
+generated by GNU Autoconf 2.52.20121002.  Invocation command line was
 
   $ $0 $@
 
@@ -1225,7 +1225,8 @@ else
 		system_name="`(hostname) 2>/dev/null`"
 	fi
 fi
-test -n "$system_name" && cat >>confdefs.h <<EOF
+test -n "$system_name" &&
+cat >>confdefs.h <<EOF
 #define SYSTEM_NAME "$system_name"
 EOF
 
@@ -1236,13 +1237,13 @@ else
 fi
 
 test -z "$system_name" && system_name="$cf_cv_system_name"
-test -n "$cf_cv_system_name" && echo "$as_me:1239: result: Configuring for $cf_cv_system_name" >&5
+test -n "$cf_cv_system_name" && echo "$as_me:1240: result: Configuring for $cf_cv_system_name" >&5
 echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6
 
 if test ".$system_name" != ".$cf_cv_system_name" ; then
-	echo "$as_me:1243: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
+	echo "$as_me:1244: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
 echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6
-	{ { echo "$as_me:1245: error: \"Please remove config.cache and try again.\"" >&5
+	{ { echo "$as_me:1246: error: \"Please remove config.cache and try again.\"" >&5
 echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1250,7 +1251,7 @@ fi
 # Check whether --with-system-type or --without-system-type was given.
 if test "${with_system_type+set}" = set; then
   withval="$with_system_type"
-  { echo "$as_me:1253: WARNING: overriding system type $host_os to $withval" >&5
+  { echo "$as_me:1254: WARNING: overriding system type $host_os to $withval" >&5
 echo "$as_me: WARNING: overriding system type $host_os to $withval" >&2;}
  host_os=$withval
 fi;
@@ -1272,7 +1273,7 @@ PACKAGE=lynx
 # $Format: "VERSION=$ProjectVersion$"$
 VERSION=2.8.8dev.14
 
-echo "$as_me:1275: checking for DESTDIR" >&5
+echo "$as_me:1276: checking for DESTDIR" >&5
 echo $ECHO_N "checking for DESTDIR... $ECHO_C" >&6
 
 # Check whether --with-destdir or --without-destdir was given.
@@ -1308,16 +1309,16 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:1311: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:1312: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
 esac
 
 fi
-DESTDIR="$withval"
+eval DESTDIR="$withval"
 
-echo "$as_me:1320: result: $DESTDIR" >&5
+echo "$as_me:1321: result: $DESTDIR" >&5
 echo "${ECHO_T}$DESTDIR" >&6
 
 case $host_os in
@@ -1336,7 +1337,7 @@ ac_main_return=return
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:1339: checking for $ac_word" >&5
+echo "$as_me:1340: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1351,7 +1352,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_CC="${ac_tool_prefix}gcc"
-echo "$as_me:1354: found $ac_dir/$ac_word" >&5
+echo "$as_me:1355: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1359,10 +1360,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1362: result: $CC" >&5
+  echo "$as_me:1363: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1365: result: no" >&5
+  echo "$as_me:1366: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1371,7 +1372,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-echo "$as_me:1374: checking for $ac_word" >&5
+echo "$as_me:1375: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1386,7 +1387,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_CC="gcc"
-echo "$as_me:1389: found $ac_dir/$ac_word" >&5
+echo "$as_me:1390: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1394,10 +1395,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1397: result: $ac_ct_CC" >&5
+  echo "$as_me:1398: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1400: result: no" >&5
+  echo "$as_me:1401: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1410,7 +1411,7 @@ if test -z "$CC"; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:1413: checking for $ac_word" >&5
+echo "$as_me:1414: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1425,7 +1426,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_CC="${ac_tool_prefix}cc"
-echo "$as_me:1428: found $ac_dir/$ac_word" >&5
+echo "$as_me:1429: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1433,10 +1434,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1436: result: $CC" >&5
+  echo "$as_me:1437: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1439: result: no" >&5
+  echo "$as_me:1440: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1445,7 +1446,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:1448: checking for $ac_word" >&5
+echo "$as_me:1449: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1460,7 +1461,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_CC="cc"
-echo "$as_me:1463: found $ac_dir/$ac_word" >&5
+echo "$as_me:1464: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1468,10 +1469,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1471: result: $ac_ct_CC" >&5
+  echo "$as_me:1472: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1474: result: no" >&5
+  echo "$as_me:1475: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1484,7 +1485,7 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:1487: checking for $ac_word" >&5
+echo "$as_me:1488: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1504,7 +1505,7 @@ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
   continue
 fi
 ac_cv_prog_CC="cc"
-echo "$as_me:1507: found $ac_dir/$ac_word" >&5
+echo "$as_me:1508: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1526,10 +1527,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1529: result: $CC" >&5
+  echo "$as_me:1530: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1532: result: no" >&5
+  echo "$as_me:1533: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1540,7 +1541,7 @@ if test -z "$CC"; 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:1543: checking for $ac_word" >&5
+echo "$as_me:1544: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1555,7 +1556,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_CC="$ac_tool_prefix$ac_prog"
-echo "$as_me:1558: found $ac_dir/$ac_word" >&5
+echo "$as_me:1559: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1563,10 +1564,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1566: result: $CC" >&5
+  echo "$as_me:1567: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1569: result: no" >&5
+  echo "$as_me:1570: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1579,7 +1580,7 @@ if test -z "$CC"; 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:1582: checking for $ac_word" >&5
+echo "$as_me:1583: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1594,7 +1595,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_CC="$ac_prog"
-echo "$as_me:1597: found $ac_dir/$ac_word" >&5
+echo "$as_me:1598: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1602,10 +1603,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1605: result: $ac_ct_CC" >&5
+  echo "$as_me:1606: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1608: result: no" >&5
+  echo "$as_me:1609: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1617,32 +1618,32 @@ fi
 
 fi
 
-test -z "$CC" && { { echo "$as_me:1620: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:1621: error: no acceptable cc found in \$PATH" >&5
 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:1625:" \
+echo "$as_me:1626:" \
      "checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:1628: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1629: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1631: \$? = $ac_status" >&5
+  echo "$as_me:1632: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:1633: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1634: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1636: \$? = $ac_status" >&5
+  echo "$as_me:1637: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:1638: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1639: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1641: \$? = $ac_status" >&5
+  echo "$as_me:1642: \$? = $ac_status" >&5
   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 1645 "configure"
+#line 1646 "configure"
 #include "confdefs.h"
 
 int
@@ -1658,13 +1659,13 @@ ac_clean_files="$ac_clean_files a.out a.exe"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-echo "$as_me:1661: checking for C compiler default output" >&5
+echo "$as_me:1662: checking for C compiler default output" >&5
 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:1664: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:1665: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5
   ac_status=$?
-  echo "$as_me:1667: \$? = $ac_status" >&5
+  echo "$as_me:1668: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # Find the output, starting from the most likely.  This scheme is
 # not robust to junk in `.', hence go to wildcards (a.*) only as a last
@@ -1687,34 +1688,34 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:1690: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:1691: error: C compiler cannot create executables" >&5
 echo "$as_me: error: C compiler cannot create executables" >&2;}
    { (exit 77); exit 77; }; }
 fi
 
 ac_exeext=$ac_cv_exeext
-echo "$as_me:1696: result: $ac_file" >&5
+echo "$as_me:1697: result: $ac_file" >&5
 echo "${ECHO_T}$ac_file" >&6
 
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:1701: checking whether the C compiler works" >&5
+echo "$as_me:1702: checking whether the C compiler works" >&5
 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
   if { ac_try='./$ac_file'
-  { (eval echo "$as_me:1707: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1708: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1710: \$? = $ac_status" >&5
+  echo "$as_me:1711: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:1717: error: cannot run C compiled programs.
+	{ { echo "$as_me:1718: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'." >&5
 echo "$as_me: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'." >&2;}
@@ -1722,24 +1723,24 @@ If you meant to cross compile, use \`--host'." >&2;}
     fi
   fi
 fi
-echo "$as_me:1725: result: yes" >&5
+echo "$as_me:1726: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 rm -f a.out a.exe conftest$ac_cv_exeext
 ac_clean_files=$ac_clean_files_save
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:1732: checking whether we are cross compiling" >&5
+echo "$as_me:1733: checking whether we are cross compiling" >&5
 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:1734: result: $cross_compiling" >&5
+echo "$as_me:1735: result: $cross_compiling" >&5
 echo "${ECHO_T}$cross_compiling" >&6
 
-echo "$as_me:1737: checking for executable suffix" >&5
+echo "$as_me:1738: checking for executable suffix" >&5
 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:1739: \"$ac_link\"") >&5
+if { (eval echo "$as_me:1740: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:1742: \$? = $ac_status" >&5
+  echo "$as_me:1743: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
@@ -1755,25 +1756,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
   esac
 done
 else
-  { { echo "$as_me:1758: error: cannot compute EXEEXT: cannot compile and link" >&5
+  { { echo "$as_me:1759: error: cannot compute EXEEXT: cannot compile and link" >&5
 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest$ac_cv_exeext
-echo "$as_me:1764: result: $ac_cv_exeext" >&5
+echo "$as_me:1765: result: $ac_cv_exeext" >&5
 echo "${ECHO_T}$ac_cv_exeext" >&6
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-echo "$as_me:1770: checking for object suffix" >&5
+echo "$as_me:1771: checking for object suffix" >&5
 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
 if test "${ac_cv_objext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 1776 "configure"
+#line 1777 "configure"
 #include "confdefs.h"
 
 int
@@ -1785,10 +1786,10 @@ main ()
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:1788: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1789: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1791: \$? = $ac_status" >&5
+  echo "$as_me:1792: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
   case $ac_file in
@@ -1800,24 +1801,24 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:1803: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:1804: error: cannot compute OBJEXT: cannot compile" >&5
 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-echo "$as_me:1810: result: $ac_cv_objext" >&5
+echo "$as_me:1811: result: $ac_cv_objext" >&5
 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:1814: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:1815: checking whether we are using the GNU C compiler" >&5
 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 1820 "configure"
+#line 1821 "configure"
 #include "confdefs.h"
 
 int
@@ -1832,16 +1833,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1835: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1836: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1838: \$? = $ac_status" >&5
+  echo "$as_me:1839: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1841: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1842: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1844: \$? = $ac_status" >&5
+  echo "$as_me:1845: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_compiler_gnu=yes
 else
@@ -1853,19 +1854,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:1856: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:1857: result: $ac_cv_c_compiler_gnu" >&5
 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
 GCC=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 CFLAGS="-g"
-echo "$as_me:1862: checking whether $CC accepts -g" >&5
+echo "$as_me:1863: checking whether $CC accepts -g" >&5
 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 1868 "configure"
+#line 1869 "configure"
 #include "confdefs.h"
 
 int
@@ -1877,16 +1878,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1880: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1881: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1883: \$? = $ac_status" >&5
+  echo "$as_me:1884: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1886: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1887: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1889: \$? = $ac_status" >&5
+  echo "$as_me:1890: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_cc_g=yes
 else
@@ -1896,7 +1897,7 @@ ac_cv_prog_cc_g=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:1899: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:1900: result: $ac_cv_prog_cc_g" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
@@ -1923,16 +1924,16 @@ cat >conftest.$ac_ext <<_ACEOF
 #endif
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1926: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1927: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1929: \$? = $ac_status" >&5
+  echo "$as_me:1930: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1932: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1933: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1935: \$? = $ac_status" >&5
+  echo "$as_me:1936: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   for ac_declaration in \
    ''\
@@ -1944,7 +1945,7 @@ if { (eval echo "$as_me:1926: \"$ac_compile\"") >&5
    'void exit (int);'
 do
   cat >conftest.$ac_ext <<_ACEOF
-#line 1947 "configure"
+#line 1948 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -1957,16 +1958,16 @@ exit (42);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1960: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1961: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1963: \$? = $ac_status" >&5
+  echo "$as_me:1964: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1966: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1967: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1969: \$? = $ac_status" >&5
+  echo "$as_me:1970: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -1976,7 +1977,7 @@ continue
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 1979 "configure"
+#line 1980 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -1988,16 +1989,16 @@ exit (42);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1991: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1992: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1994: \$? = $ac_status" >&5
+  echo "$as_me:1995: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1997: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1998: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2000: \$? = $ac_status" >&5
+  echo "$as_me:2001: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -2025,13 +2026,214 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return=return
 
+GCC_VERSION=none
+if test "$GCC" = yes ; then
+	echo "$as_me:2031: checking version of $CC" >&5
+echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
+	GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
+	test -z "$GCC_VERSION" && GCC_VERSION=unknown
+	echo "$as_me:2035: result: $GCC_VERSION" >&5
+echo "${ECHO_T}$GCC_VERSION" >&6
+fi
+
+echo "$as_me:2039: checking for $CC option to accept ANSI C" >&5
+echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
+if test "${ac_cv_prog_cc_stdc+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_prog_cc_stdc=no
+ac_save_CC=$CC
+cat >conftest.$ac_ext <<_ACEOF
+#line 2047 "configure"
+#include "confdefs.h"
+#include <stdarg.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+  ;
+  return 0;
+}
+_ACEOF
+# Don't try gcc -ansi; that turns off useful extensions and
+# breaks some systems' header files.
+# AIX			-qlanglvl=ansi
+# Ultrix and OSF/1	-std1
+# HP-UX 10.20 and later	-Ae
+# HP-UX older versions	-Aa -D_HPUX_SOURCE
+# SVR4			-Xc -D__EXTENSIONS__
+for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  rm -f conftest.$ac_objext
+if { (eval echo "$as_me:2096: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:2099: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:2102: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:2105: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_prog_cc_stdc=$ac_arg
+break
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext
+done
+rm -f conftest.$ac_ext conftest.$ac_objext
+CC=$ac_save_CC
+
+fi
+
+case "x$ac_cv_prog_cc_stdc" in
+  x|xno)
+    echo "$as_me:2122: result: none needed" >&5
+echo "${ECHO_T}none needed" >&6 ;;
+  *)
+    echo "$as_me:2125: result: $ac_cv_prog_cc_stdc" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+    CC="$CC $ac_cv_prog_cc_stdc" ;;
+esac
+
+# This should have been defined by AC_PROG_CC
+: ${CC:=cc}
+
+echo "$as_me:2133: checking \$CC variable" >&5
+echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
+case "$CC" in #(vi
+*[\ \	]-[IUD]*)
+	echo "$as_me:2137: result: broken" >&5
+echo "${ECHO_T}broken" >&6
+	{ echo "$as_me:2139: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
+echo "$as_me: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;}
+	# humor him...
+	cf_flags=`echo "$CC" | sed -e 's/^[^ 	]*[ 	]//'`
+	CC=`echo "$CC" | sed -e 's/[ 	].*//'`
+
+cf_fix_cppflags=no
+cf_new_cflags=
+cf_new_cppflags=
+cf_new_extra_cppflags=
+
+for cf_add_cflags in $cf_flags
+do
+case $cf_fix_cppflags in
+no)
+	case $cf_add_cflags in #(vi
+	-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
+		case $cf_add_cflags in
+		-D*)
+			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+
+			test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+				&& test -z "${cf_tst_cflags}" \
+				&& cf_fix_cppflags=yes
+
+			if test $cf_fix_cppflags = yes ; then
+				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+				continue
+			elif test "${cf_tst_cflags}" = "\"'" ; then
+				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+				continue
+			fi
+			;;
+		esac
+		case "$CPPFLAGS" in
+		*$cf_add_cflags) #(vi
+			;;
+		*) #(vi
+			case $cf_add_cflags in #(vi
+			-D*)
+				cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
+
+CPPFLAGS=`echo "$CPPFLAGS" | \
+	sed	-e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ 	]*\)\?[ 	]/ /g' \
+		-e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ 	]*\)\?$//g'`
+
+				;;
+			esac
+			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+			;;
+		esac
+		;;
+	*)
+		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+		;;
+	esac
+	;;
+yes)
+	cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
+
+	test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+		&& test -z "${cf_tst_cflags}" \
+		&& cf_fix_cppflags=no
+	;;
+esac
+done
+
+if test -n "$cf_new_cflags" ; then
+
+	CFLAGS="$CFLAGS $cf_new_cflags"
+fi
+
+if test -n "$cf_new_cppflags" ; then
+
+	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+fi
+
+if test -n "$cf_new_extra_cppflags" ; then
+
+	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+fi
+
+	;;
+*)
+	echo "$as_me:2225: result: ok" >&5
+echo "${ECHO_T}ok" >&6
+	;;
+esac
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return=return
-echo "$as_me:2034: checking how to run the C preprocessor" >&5
+echo "$as_me:2236: checking how to run the C preprocessor" >&5
 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
@@ -2052,18 +2254,18 @@ do
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
-#line 2055 "configure"
+#line 2257 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2060: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2262: \"$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:2066: \$? = $ac_status" >&5
+  echo "$as_me:2268: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2086,17 +2288,17 @@ rm -f conftest.err conftest.$ac_ext
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line 2089 "configure"
+#line 2291 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2093: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2295: \"$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:2099: \$? = $ac_status" >&5
+  echo "$as_me:2301: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2133,7 +2335,7 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:2136: result: $CPP" >&5
+echo "$as_me:2338: result: $CPP" >&5
 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -2143,18 +2345,18 @@ do
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
-#line 2146 "configure"
+#line 2348 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2151: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2353: \"$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:2157: \$? = $ac_status" >&5
+  echo "$as_me:2359: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2177,17 +2379,17 @@ rm -f conftest.err conftest.$ac_ext
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line 2180 "configure"
+#line 2382 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2184: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2386: \"$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:2190: \$? = $ac_status" >&5
+  echo "$as_me:2392: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2215,7 +2417,7 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:2218: error: C preprocessor \"$CPP\" fails sanity check" >&5
+  { { echo "$as_me:2420: error: C preprocessor \"$CPP\" fails sanity check" >&5
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -2227,27 +2429,27 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return=return
 
-echo "$as_me:2230: checking whether ln -s works" >&5
+echo "$as_me:2432: checking whether ln -s works" >&5
 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  echo "$as_me:2234: result: yes" >&5
+  echo "$as_me:2436: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:2237: result: no, using $LN_S" >&5
+  echo "$as_me:2439: result: no, using $LN_S" >&5
 echo "${ECHO_T}no, using $LN_S" >&6
 fi
 
 case $host_os in
 mingw*)
 LN_S="cp -p"
-echo "$as_me:2244: result: Override: No symbolic links in mingw." >&5
+echo "$as_me:2446: result: Override: No symbolic links in mingw." >&5
 echo "${ECHO_T}Override: No symbolic links in mingw." >&6
 	;;
 *)
 	;;
 esac
-echo "$as_me:2250: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:2452: checking whether ${MAKE-make} sets \${MAKE}" >&5
 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
@@ -2267,11 +2469,11 @@ fi
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:2270: result: yes" >&5
+  echo "$as_me:2472: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:2274: result: no" >&5
+  echo "$as_me:2476: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
@@ -2288,7 +2490,7 @@ fi
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:2291: checking for a BSD compatible install" >&5
+echo "$as_me:2493: checking for a BSD compatible install" >&5
 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
@@ -2337,7 +2539,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:2340: result: $INSTALL" >&5
+echo "$as_me:2542: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -2352,7 +2554,7 @@ for ac_prog in 'bison -y' byacc
 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:2355: checking for $ac_word" >&5
+echo "$as_me:2557: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_YACC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2367,7 +2569,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_YACC="$ac_prog"
-echo "$as_me:2370: found $ac_dir/$ac_word" >&5
+echo "$as_me:2572: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2375,10 +2577,10 @@ fi
 fi
 YACC=$ac_cv_prog_YACC
 if test -n "$YACC"; then
-  echo "$as_me:2378: result: $YACC" >&5
+  echo "$as_me:2580: result: $YACC" >&5
 echo "${ECHO_T}$YACC" >&6
 else
-  echo "$as_me:2381: result: no" >&5
+  echo "$as_me:2583: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2390,7 +2592,7 @@ for ac_prog in tdlint lint alint splint lclint
 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:2393: checking for $ac_word" >&5
+echo "$as_me:2595: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_LINT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2405,7 +2607,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_LINT="$ac_prog"
-echo "$as_me:2408: found $ac_dir/$ac_word" >&5
+echo "$as_me:2610: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2413,17 +2615,17 @@ fi
 fi
 LINT=$ac_cv_prog_LINT
 if test -n "$LINT"; then
-  echo "$as_me:2416: result: $LINT" >&5
+  echo "$as_me:2618: result: $LINT" >&5
 echo "${ECHO_T}$LINT" >&6
 else
-  echo "$as_me:2419: result: no" >&5
+  echo "$as_me:2621: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
   test -n "$LINT" && break
 done
 
-echo "$as_me:2426: checking for makeflags variable" >&5
+echo "$as_me:2628: checking for makeflags variable" >&5
 echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6
 if test "${cf_cv_makeflags+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2457,10 +2659,10 @@ CF_EOF
 	rm -f cf_makeflags.tmp
 
 fi
-echo "$as_me:2460: result: $cf_cv_makeflags" >&5
+echo "$as_me:2662: result: $cf_cv_makeflags" >&5
 echo "${ECHO_T}$cf_cv_makeflags" >&6
 
-echo "$as_me:2463: checking if filesystem supports mixed-case filenames" >&5
+echo "$as_me:2665: checking if filesystem supports mixed-case filenames" >&5
 echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6
 if test "${cf_cv_mixedcase+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2487,9 +2689,10 @@ else
 fi
 
 fi
-echo "$as_me:2490: result: $cf_cv_mixedcase" >&5
+echo "$as_me:2692: result: $cf_cv_mixedcase" >&5
 echo "${ECHO_T}$cf_cv_mixedcase" >&6
-test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF
+test "$cf_cv_mixedcase" = yes &&
+cat >>confdefs.h <<\EOF
 #define MIXEDCASE_FILENAMES 1
 EOF
 
@@ -2497,7 +2700,7 @@ for ac_prog in exctags ctags
 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:2500: checking for $ac_word" >&5
+echo "$as_me:2703: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CTAGS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2512,7 +2715,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_CTAGS="$ac_prog"
-echo "$as_me:2515: found $ac_dir/$ac_word" >&5
+echo "$as_me:2718: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2520,10 +2723,10 @@ fi
 fi
 CTAGS=$ac_cv_prog_CTAGS
 if test -n "$CTAGS"; then
-  echo "$as_me:2523: result: $CTAGS" >&5
+  echo "$as_me:2726: result: $CTAGS" >&5
 echo "${ECHO_T}$CTAGS" >&6
 else
-  echo "$as_me:2526: result: no" >&5
+  echo "$as_me:2729: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2534,7 +2737,7 @@ for ac_prog in exetags etags
 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:2537: checking for $ac_word" >&5
+echo "$as_me:2740: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ETAGS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2549,7 +2752,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_ETAGS="$ac_prog"
-echo "$as_me:2552: found $ac_dir/$ac_word" >&5
+echo "$as_me:2755: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2557,10 +2760,10 @@ fi
 fi
 ETAGS=$ac_cv_prog_ETAGS
 if test -n "$ETAGS"; then
-  echo "$as_me:2560: result: $ETAGS" >&5
+  echo "$as_me:2763: result: $ETAGS" >&5
 echo "${ECHO_T}$ETAGS" >&6
 else
-  echo "$as_me:2563: result: no" >&5
+  echo "$as_me:2766: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2569,7 +2772,7 @@ done
 
 # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
 set dummy ${CTAGS:-ctags}; ac_word=$2
-echo "$as_me:2572: checking for $ac_word" >&5
+echo "$as_me:2775: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2584,7 +2787,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_MAKE_LOWER_TAGS="yes"
-echo "$as_me:2587: found $ac_dir/$ac_word" >&5
+echo "$as_me:2790: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2593,17 +2796,17 @@ fi
 fi
 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
 if test -n "$MAKE_LOWER_TAGS"; then
-  echo "$as_me:2596: result: $MAKE_LOWER_TAGS" >&5
+  echo "$as_me:2799: result: $MAKE_LOWER_TAGS" >&5
 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
 else
-  echo "$as_me:2599: result: no" >&5
+  echo "$as_me:2802: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 if test "$cf_cv_mixedcase" = yes ; then
 	# Extract the first word of "${ETAGS:-etags}", so it can be a program name with args.
 set dummy ${ETAGS:-etags}; ac_word=$2
-echo "$as_me:2606: checking for $ac_word" >&5
+echo "$as_me:2809: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2618,7 +2821,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_MAKE_UPPER_TAGS="yes"
-echo "$as_me:2621: found $ac_dir/$ac_word" >&5
+echo "$as_me:2824: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2627,10 +2830,10 @@ fi
 fi
 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
 if test -n "$MAKE_UPPER_TAGS"; then
-  echo "$as_me:2630: result: $MAKE_UPPER_TAGS" >&5
+  echo "$as_me:2833: result: $MAKE_UPPER_TAGS" >&5
 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
 else
-  echo "$as_me:2633: result: no" >&5
+  echo "$as_me:2836: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2653,7 +2856,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
 set dummy ${ac_tool_prefix}windres; ac_word=$2
-echo "$as_me:2656: checking for $ac_word" >&5
+echo "$as_me:2859: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_WINDRES+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2670,7 +2873,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_WINDRES="$ac_dir/$ac_word"
-   echo "$as_me:2673: found $ac_dir/$ac_word" >&5
+   echo "$as_me:2876: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -2681,10 +2884,10 @@ fi
 WINDRES=$ac_cv_path_WINDRES
 
 if test -n "$WINDRES"; then
-  echo "$as_me:2684: result: $WINDRES" >&5
+  echo "$as_me:2887: result: $WINDRES" >&5
 echo "${ECHO_T}$WINDRES" >&6
 else
-  echo "$as_me:2687: result: no" >&5
+  echo "$as_me:2890: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2693,7 +2896,7 @@ if test -z "$ac_cv_path_WINDRES"; then
   ac_pt_WINDRES=$WINDRES
   # Extract the first word of "windres", so it can be a program name with args.
 set dummy windres; ac_word=$2
-echo "$as_me:2696: checking for $ac_word" >&5
+echo "$as_me:2899: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_ac_pt_WINDRES+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2710,7 +2913,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_ac_pt_WINDRES="$ac_dir/$ac_word"
-   echo "$as_me:2713: found $ac_dir/$ac_word" >&5
+   echo "$as_me:2916: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -2722,10 +2925,10 @@ fi
 ac_pt_WINDRES=$ac_cv_path_ac_pt_WINDRES
 
 if test -n "$ac_pt_WINDRES"; then
-  echo "$as_me:2725: result: $ac_pt_WINDRES" >&5
+  echo "$as_me:2928: result: $ac_pt_WINDRES" >&5
 echo "${ECHO_T}$ac_pt_WINDRES" >&6
 else
-  echo "$as_me:2728: result: no" >&5
+  echo "$as_me:2931: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2734,71 +2937,6 @@ else
   WINDRES="$ac_cv_path_WINDRES"
 fi
 
-echo "$as_me:2737: checking for AIX" >&5
-echo $ECHO_N "checking for AIX... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line 2740 "configure"
-#include "confdefs.h"
-#ifdef _AIX
-  yes
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "yes" >/dev/null 2>&1; then
-  echo "$as_me:2749: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-cat >>confdefs.h <<\EOF
-#define _ALL_SOURCE 1
-EOF
-
-else
-  echo "$as_me:2756: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-rm -rf conftest*
-
-echo "$as_me:2761: checking for POSIXized ISC" >&5
-echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6
-if test -d /etc/conf/kconfig.d &&
-   grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
-then
-  echo "$as_me:2766: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-  ISC=yes # If later tests want to check for ISC.
-
-cat >>confdefs.h <<\EOF
-#define _POSIX_SOURCE 1
-EOF
-
-  if test "$GCC" = yes; then
-    CC="$CC -posix"
-  else
-    CC="$CC -Xp"
-  fi
-else
-  echo "$as_me:2780: result: no" >&5
-echo "${ECHO_T}no" >&6
-  ISC=
-fi
-
-case $cf_cv_system_name in
-os2*)
-    CFLAGS="$CFLAGS -Zmt"
-    CPPFLAGS="$CPPFLAGS -D__ST_MT_ERRNO__"
-    CXXFLAGS="$CXXFLAGS -Zmt"
-    # autoconf's macro sets -Zexe and suffix both, which conflict:w
-    LDFLAGS="$LDFLAGS -Zmt -Zcrtdll"
-    ac_cv_exeext=.exe
-    ;;
-esac
-
-PROG_EXT="$EXEEXT"
-
-test -n "$PROG_EXT" && cat >>confdefs.h <<EOF
-#define PROG_EXT "$PROG_EXT"
-EOF
-
 if test "$cross_compiling" = yes ; then
 
 	# defaults that we might want to override
@@ -2818,7 +2956,7 @@ else
 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:2821: checking for $ac_word" >&5
+echo "$as_me:2959: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_BUILD_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2833,7 +2971,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_BUILD_CC="$ac_prog"
-echo "$as_me:2836: found $ac_dir/$ac_word" >&5
+echo "$as_me:2974: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2841,10 +2979,10 @@ fi
 fi
 BUILD_CC=$ac_cv_prog_BUILD_CC
 if test -n "$BUILD_CC"; then
-  echo "$as_me:2844: result: $BUILD_CC" >&5
+  echo "$as_me:2982: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 else
-  echo "$as_me:2847: result: no" >&5
+  echo "$as_me:2985: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2852,12 +2990,12 @@ fi
 done
 
 fi;
-	echo "$as_me:2855: checking for native build C compiler" >&5
+	echo "$as_me:2993: checking for native build C compiler" >&5
 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
-	echo "$as_me:2857: result: $BUILD_CC" >&5
+	echo "$as_me:2995: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 
-	echo "$as_me:2860: checking for native build C preprocessor" >&5
+	echo "$as_me:2998: checking for native build C preprocessor" >&5
 echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6
 
 # Check whether --with-build-cpp or --without-build-cpp was given.
@@ -2867,10 +3005,10 @@ if test "${with_build_cpp+set}" = set; then
 else
   BUILD_CPP='${BUILD_CC} -E'
 fi;
-	echo "$as_me:2870: result: $BUILD_CPP" >&5
+	echo "$as_me:3008: result: $BUILD_CPP" >&5
 echo "${ECHO_T}$BUILD_CPP" >&6
 
-	echo "$as_me:2873: checking for native build C flags" >&5
+	echo "$as_me:3011: checking for native build C flags" >&5
 echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6
 
 # Check whether --with-build-cflags or --without-build-cflags was given.
@@ -2878,10 +3016,10 @@ if test "${with_build_cflags+set}" = set; then
   withval="$with_build_cflags"
   BUILD_CFLAGS="$withval"
 fi;
-	echo "$as_me:2881: result: $BUILD_CFLAGS" >&5
+	echo "$as_me:3019: result: $BUILD_CFLAGS" >&5
 echo "${ECHO_T}$BUILD_CFLAGS" >&6
 
-	echo "$as_me:2884: checking for native build C preprocessor-flags" >&5
+	echo "$as_me:3022: checking for native build C preprocessor-flags" >&5
 echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6
 
 # Check whether --with-build-cppflags or --without-build-cppflags was given.
@@ -2889,10 +3027,10 @@ if test "${with_build_cppflags+set}" = set; then
   withval="$with_build_cppflags"
   BUILD_CPPFLAGS="$withval"
 fi;
-	echo "$as_me:2892: result: $BUILD_CPPFLAGS" >&5
+	echo "$as_me:3030: result: $BUILD_CPPFLAGS" >&5
 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
 
-	echo "$as_me:2895: checking for native build linker-flags" >&5
+	echo "$as_me:3033: checking for native build linker-flags" >&5
 echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6
 
 # Check whether --with-build-ldflags or --without-build-ldflags was given.
@@ -2900,10 +3038,10 @@ if test "${with_build_ldflags+set}" = set; then
   withval="$with_build_ldflags"
   BUILD_LDFLAGS="$withval"
 fi;
-	echo "$as_me:2903: result: $BUILD_LDFLAGS" >&5
+	echo "$as_me:3041: result: $BUILD_LDFLAGS" >&5
 echo "${ECHO_T}$BUILD_LDFLAGS" >&6
 
-	echo "$as_me:2906: checking for native build linker-libraries" >&5
+	echo "$as_me:3044: checking for native build linker-libraries" >&5
 echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6
 
 # Check whether --with-build-libs or --without-build-libs was given.
@@ -2911,7 +3049,7 @@ if test "${with_build_libs+set}" = set; then
   withval="$with_build_libs"
   BUILD_LIBS="$withval"
 fi;
-	echo "$as_me:2914: result: $BUILD_LIBS" >&5
+	echo "$as_me:3052: result: $BUILD_LIBS" >&5
 echo "${ECHO_T}$BUILD_LIBS" >&6
 
 	# this assumes we're on Unix.
@@ -2921,7 +3059,7 @@ echo "${ECHO_T}$BUILD_LIBS" >&6
 	: ${BUILD_CC:='${CC}'}
 
 	if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then
-		{ { echo "$as_me:2924: error: Cross-build requires two compilers.
+		{ { echo "$as_me:3062: error: Cross-build requires two compilers.
 Use --with-build-cc to specify the native compiler." >&5
 echo "$as_me: error: Cross-build requires two compilers.
 Use --with-build-cc to specify the native compiler." >&2;}
@@ -2942,7 +3080,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:2945: checking for $ac_word" >&5
+echo "$as_me:3083: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2957,7 +3095,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_RANLIB="${ac_tool_prefix}ranlib"
-echo "$as_me:2960: found $ac_dir/$ac_word" >&5
+echo "$as_me:3098: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2965,10 +3103,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:2968: result: $RANLIB" >&5
+  echo "$as_me:3106: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:2971: result: no" >&5
+  echo "$as_me:3109: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2977,7 +3115,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:2980: checking for $ac_word" >&5
+echo "$as_me:3118: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2992,7 +3130,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_RANLIB="ranlib"
-echo "$as_me:2995: found $ac_dir/$ac_word" >&5
+echo "$as_me:3133: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3001,10 +3139,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:3004: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:3142: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:3007: result: no" >&5
+  echo "$as_me:3145: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3016,7 +3154,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:3019: checking for $ac_word" >&5
+echo "$as_me:3157: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_AR+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3031,7 +3169,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_AR="${ac_tool_prefix}ar"
-echo "$as_me:3034: found $ac_dir/$ac_word" >&5
+echo "$as_me:3172: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3039,10 +3177,10 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:3042: result: $AR" >&5
+  echo "$as_me:3180: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 else
-  echo "$as_me:3045: result: no" >&5
+  echo "$as_me:3183: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3051,7 +3189,7 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-echo "$as_me:3054: checking for $ac_word" >&5
+echo "$as_me:3192: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3066,7 +3204,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_AR="ar"
-echo "$as_me:3069: found $ac_dir/$ac_word" >&5
+echo "$as_me:3207: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3075,10 +3213,10 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:3078: result: $ac_ct_AR" >&5
+  echo "$as_me:3216: result: $ac_ct_AR" >&5
 echo "${ECHO_T}$ac_ct_AR" >&6
 else
-  echo "$as_me:3081: result: no" >&5
+  echo "$as_me:3219: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3087,7 +3225,7 @@ else
   AR="$ac_cv_prog_AR"
 fi
 
-echo "$as_me:3090: checking for options to update archives" >&5
+echo "$as_me:3228: checking for options to update archives" >&5
 echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6
 if test "${cf_cv_ar_flags+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3110,13 +3248,13 @@ else
 		rm -f conftest.a
 
 		cat >conftest.$ac_ext <<EOF
-#line 3113 "configure"
+#line 3251 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-		if { (eval echo "$as_me:3116: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:3254: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3119: \$? = $ac_status" >&5
+  echo "$as_me:3257: \$? = $ac_status" >&5
   (exit $ac_status); } ; then
 			echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&5
 			$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&5 1>/dev/null
@@ -3127,7 +3265,7 @@ EOF
 		else
 			test -n "$verbose" && echo "	cannot compile test-program" 1>&6
 
-echo "${as_me:-configure}:3130: testing cannot compile test-program ..." 1>&5
+echo "${as_me:-configure}:3268: testing cannot compile test-program ..." 1>&5
 
 			break
 		fi
@@ -3135,7 +3273,7 @@ echo "${as_me:-configure}:3130: testing cannot compile test-program ..." 1>&5
 	rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext
 
 fi
-echo "$as_me:3138: result: $cf_cv_ar_flags" >&5
+echo "$as_me:3276: result: $cf_cv_ar_flags" >&5
 echo "${ECHO_T}$cf_cv_ar_flags" >&6
 
 if test -n "$ARFLAGS" ; then
@@ -3146,7 +3284,7 @@ else
 	ARFLAGS=$cf_cv_ar_flags
 fi
 
-echo "$as_me:3149: checking if you want to see long compiling messages" >&5
+echo "$as_me:3287: checking if you want to see long compiling messages" >&5
 echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6
 
 # Check whether --enable-echo or --disable-echo was given.
@@ -3180,7 +3318,7 @@ else
     ECHO_CC=''
 
 fi;
-echo "$as_me:3183: result: $enableval" >&5
+echo "$as_me:3321: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 # special case for WWW/*
@@ -3190,7 +3328,7 @@ else
 	DONT_ECHO_CC=''
 fi
 
-echo "$as_me:3193: checking if you want to check memory-leaks" >&5
+echo "$as_me:3331: checking if you want to check memory-leaks" >&5
 echo $ECHO_N "checking if you want to check memory-leaks... $ECHO_C" >&6
 
 # Check whether --enable-find-leaks or --disable-find-leaks was given.
@@ -3207,16 +3345,17 @@ else
   with_leak_checks=no
 
 fi;
-echo "$as_me:3210: result: $with_leak_checks" >&5
+echo "$as_me:3348: result: $with_leak_checks" >&5
 echo "${ECHO_T}$with_leak_checks" >&6
-test "$with_leak_checks" = "yes" && cat >>confdefs.h <<\EOF
+test "$with_leak_checks" = "yes" &&
+cat >>confdefs.h <<\EOF
 #define LY_FIND_LEAKS 1
 EOF
 
 # The comment about adding -g to $CFLAGS is unclear.  Autoconf tries to add
 # a -g flag; we remove it if the user's $CFLAGS was not set and debugging is
 # disabled.
-echo "$as_me:3219: checking if you want to enable debug-code" >&5
+echo "$as_me:3358: checking if you want to enable debug-code" >&5
 echo $ECHO_N "checking if you want to enable debug-code... $ECHO_C" >&6
 
 # Check whether --enable-debug or --disable-debug was given.
@@ -3233,7 +3372,7 @@ else
   with_debug=no
 
 fi;
-echo "$as_me:3236: result: $with_debug" >&5
+echo "$as_me:3375: result: $with_debug" >&5
 echo "${ECHO_T}$with_debug" >&6
 if test "$with_debug" = "yes" ; then
 	case $host_os in
@@ -3258,7 +3397,7 @@ else
 	esac
 fi
 
-echo "$as_me:3261: checking if you want to enable lynx trace code *recommended* " >&5
+echo "$as_me:3400: checking if you want to enable lynx trace code *recommended* " >&5
 echo $ECHO_N "checking if you want to enable lynx trace code *recommended* ... $ECHO_C" >&6
 
 # Check whether --enable-trace or --disable-trace was given.
@@ -3275,13 +3414,14 @@ else
   with_trace=yes
 
 fi;
-echo "$as_me:3278: result: $with_trace" >&5
+echo "$as_me:3417: result: $with_trace" >&5
 echo "${ECHO_T}$with_trace" >&6
-test $with_trace = no && cat >>confdefs.h <<\EOF
+test $with_trace = no &&
+cat >>confdefs.h <<\EOF
 #define NO_LYNX_TRACE 1
 EOF
 
-echo "$as_me:3284: checking if you want verbose trace code" >&5
+echo "$as_me:3424: checking if you want verbose trace code" >&5
 echo $ECHO_N "checking if you want verbose trace code... $ECHO_C" >&6
 
 # Check whether --enable-vertrace or --disable-vertrace was given.
@@ -3298,15 +3438,16 @@ else
   with_vertrace=no
 
 fi;
-echo "$as_me:3301: result: $with_vertrace" >&5
+echo "$as_me:3441: result: $with_vertrace" >&5
 echo "${ECHO_T}$with_vertrace" >&6
-test $with_vertrace = yes && cat >>confdefs.h <<\EOF
+test $with_vertrace = yes &&
+cat >>confdefs.h <<\EOF
 #define LY_TRACELINE __LINE__
 EOF
 
 if test -n "$GCC"
 then
-echo "$as_me:3309: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:3450: checking if you want to turn on gcc warnings" >&5
 echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6
 
 # Check whether --enable-warnings or --disable-warnings was given.
@@ -3323,7 +3464,7 @@ else
   with_warnings=no
 
 fi;
-echo "$as_me:3326: result: $with_warnings" >&5
+echo "$as_me:3467: result: $with_warnings" >&5
 echo "${ECHO_T}$with_warnings" >&6
 if test "$with_warnings" = "yes"
 then
@@ -3346,10 +3487,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:3349: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:3490: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > conftest.$ac_ext <<EOF
-#line 3352 "${as_me:-configure}"
+#line 3493 "${as_me:-configure}"
 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"
@@ -3398,36 +3539,60 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:3401: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:3542: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3404: \$? = $ac_status" >&5
+  echo "$as_me:3545: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-			test -n "$verbose" && echo "$as_me:3406: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:3547: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case $cf_attribute in #(vi
-			printf) #(vi
-				if test "$cf_printf_attribute" = no ; then
-					cat >>confdefs.h <<EOF
-#define GCC_PRINTFLIKE(fmt,var) /* nothing */
+			noreturn) #(vi
+
+cat >>confdefs.h <<EOF
+#define GCC_NORETURN $cf_directive
 EOF
-				else
-					cat >>confdefs.h <<EOF
-#define GCC_PRINTFLIKE(fmt,var) __attribute__((format(printf,fmt,var)))
+
+				;;
+			printf) #(vi
+				cf_value='/* nothing */'
+				if test "$cf_printf_attribute" != no ; then
+					cf_value='__attribute__((format(printf,fmt,var)))'
+
+cat >>confdefs.h <<\EOF
+#define GCC_PRINTF 1
 EOF
+
 				fi
+
+cat >>confdefs.h <<EOF
+#define GCC_PRINTFLIKE(fmt,var) $cf_value
+EOF
+
 				;;
 			scanf) #(vi
-				if test "$cf_scanf_attribute" = no ; then
-					cat >>confdefs.h <<EOF
-#define GCC_SCANFLIKE(fmt,var) /* nothing */
-EOF
-				else
-					cat >>confdefs.h <<EOF
-#define GCC_SCANFLIKE(fmt,var)  __attribute__((format(scanf,fmt,var)))
+				cf_value='/* nothing */'
+				if test "$cf_scanf_attribute" != no ; then
+					cf_value='__attribute__((format(scanf,fmt,var)))'
+
+cat >>confdefs.h <<\EOF
+#define GCC_SCANF 1
 EOF
+
 				fi
+
+cat >>confdefs.h <<EOF
+#define GCC_SCANFLIKE(fmt,var) $cf_value
+EOF
+
+				;;
+			unused) #(vi
+
+cat >>confdefs.h <<EOF
+#define GCC_UNUSED $cf_directive
+EOF
+
 				;;
 			esac
 		fi
@@ -3438,27 +3603,17 @@ fi
 rm -rf conftest*
 fi
 
-GCC_VERSION=none
-if test "$GCC" = yes ; then
-	echo "$as_me:3443: checking version of $CC" >&5
-echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
-	GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
-	test -z "$GCC_VERSION" && GCC_VERSION=unknown
-	echo "$as_me:3447: result: $GCC_VERSION" >&5
-echo "${ECHO_T}$GCC_VERSION" >&6
-fi
-
 INTEL_COMPILER=no
 
 if test "$GCC" = yes ; then
 	case $host_os in
 	linux*|gnu*)
-		echo "$as_me:3456: checking if this is really Intel C compiler" >&5
+		echo "$as_me:3611: checking if this is really Intel C compiler" >&5
 echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS -no-gcc"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 3461 "configure"
+#line 3616 "configure"
 #include "confdefs.h"
 
 int
@@ -3475,16 +3630,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3478: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3633: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3481: \$? = $ac_status" >&5
+  echo "$as_me:3636: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3484: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3639: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3487: \$? = $ac_status" >&5
+  echo "$as_me:3642: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
@@ -3495,7 +3650,7 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 		CFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:3498: result: $INTEL_COMPILER" >&5
+		echo "$as_me:3653: result: $INTEL_COMPILER" >&5
 echo "${ECHO_T}$INTEL_COMPILER" >&6
 		;;
 	esac
@@ -3504,12 +3659,12 @@ fi
 CLANG_COMPILER=no
 
 if test "$GCC" = yes ; then
-	echo "$as_me:3507: checking if this is really Clang C compiler" >&5
+	echo "$as_me:3662: checking if this is really Clang C compiler" >&5
 echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6
 	cf_save_CFLAGS="$CFLAGS"
 	CFLAGS="$CFLAGS -Qunused-arguments"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 3512 "configure"
+#line 3667 "configure"
 #include "confdefs.h"
 
 int
@@ -3526,16 +3681,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3529: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3684: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3532: \$? = $ac_status" >&5
+  echo "$as_me:3687: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3535: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3690: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3538: \$? = $ac_status" >&5
+  echo "$as_me:3693: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   CLANG_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
@@ -3546,12 +3701,12 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 	CFLAGS="$cf_save_CFLAGS"
-	echo "$as_me:3549: result: $CLANG_COMPILER" >&5
+	echo "$as_me:3704: result: $CLANG_COMPILER" >&5
 echo "${ECHO_T}$CLANG_COMPILER" >&6
 fi
 
 cat > conftest.$ac_ext <<EOF
-#line 3554 "${as_me:-configure}"
+#line 3709 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 
@@ -3568,7 +3723,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:3571: checking for $CC warning options..." >&5
+	{ echo "$as_me:3726: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="-Wall"
@@ -3584,12 +3739,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:3587: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:3742: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3590: \$? = $ac_status" >&5
+  echo "$as_me:3745: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-			test -n "$verbose" && echo "$as_me:3592: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:3747: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -3598,7 +3753,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 
 elif test "$GCC" = yes
 then
-	{ echo "$as_me:3601: checking for $CC warning options..." >&5
+	{ echo "$as_me:3756: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS=
@@ -3618,12 +3773,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef $cf_warn_CONST
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:3621: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:3776: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3624: \$? = $ac_status" >&5
+  echo "$as_me:3779: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-			test -n "$verbose" && echo "$as_me:3626: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:3781: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case $cf_opt in #(vi
 			Wcast-qual) #(vi
@@ -3634,7 +3789,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				[34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:3637: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:3792: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -3644,7 +3799,7 @@ echo "${as_me:-configure}:3637: testing feature is broken in gcc $GCC_VERSION ..
 				[12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:3647: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:3802: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -3660,13 +3815,14 @@ rm -rf conftest*
 fi
 fi
 
-echo "$as_me:3663: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:3818: checking if you want to use dbmalloc for testing" >&5
 echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6
 
 # Check whether --with-dbmalloc or --without-dbmalloc was given.
 if test "${with_dbmalloc+set}" = set; then
   withval="$with_dbmalloc"
-  cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<EOF
 #define USE_DBMALLOC 1
 EOF
 
@@ -3676,7 +3832,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:3679: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:3835: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case .$with_cflags in #(vi
@@ -3770,23 +3926,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:3773: checking for dbmalloc.h" >&5
+	echo "$as_me:3929: checking for dbmalloc.h" >&5
 echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6
 if test "${ac_cv_header_dbmalloc_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3779 "configure"
+#line 3935 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:3783: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:3939: \"$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:3789: \$? = $ac_status" >&5
+  echo "$as_me:3945: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3805,11 +3961,11 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:3808: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:3964: result: $ac_cv_header_dbmalloc_h" >&5
 echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6
 if test $ac_cv_header_dbmalloc_h = yes; then
 
-echo "$as_me:3812: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:3968: checking for debug_malloc in -ldbmalloc" >&5
 echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6
 if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3817,7 +3973,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3820 "configure"
+#line 3976 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3836,16 +3992,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3839: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3995: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3842: \$? = $ac_status" >&5
+  echo "$as_me:3998: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3845: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4001: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3848: \$? = $ac_status" >&5
+  echo "$as_me:4004: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -3856,7 +4012,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3859: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:4015: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
 if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then
   cat >>confdefs.h <<EOF
@@ -3871,13 +4027,14 @@ fi
 
 fi
 
-echo "$as_me:3874: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:4030: checking if you want to use dmalloc for testing" >&5
 echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6
 
 # Check whether --with-dmalloc or --without-dmalloc was given.
 if test "${with_dmalloc+set}" = set; then
   withval="$with_dmalloc"
-  cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<EOF
 #define USE_DMALLOC 1
 EOF
 
@@ -3887,7 +4044,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:3890: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:4047: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case .$with_cflags in #(vi
@@ -3981,23 +4138,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:3984: checking for dmalloc.h" >&5
+	echo "$as_me:4141: checking for dmalloc.h" >&5
 echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6
 if test "${ac_cv_header_dmalloc_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3990 "configure"
+#line 4147 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:3994: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4151: \"$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:4000: \$? = $ac_status" >&5
+  echo "$as_me:4157: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4016,11 +4173,11 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:4019: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:4176: result: $ac_cv_header_dmalloc_h" >&5
 echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6
 if test $ac_cv_header_dmalloc_h = yes; then
 
-echo "$as_me:4023: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:4180: checking for dmalloc_debug in -ldmalloc" >&5
 echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6
 if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4028,7 +4185,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 4031 "configure"
+#line 4188 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4047,16 +4204,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4050: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4207: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4053: \$? = $ac_status" >&5
+  echo "$as_me:4210: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4056: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4213: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4059: \$? = $ac_status" >&5
+  echo "$as_me:4216: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -4067,7 +4224,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4070: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:4227: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
 if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then
   cat >>confdefs.h <<EOF
@@ -4086,207 +4243,6 @@ cat >>confdefs.h <<\EOF
 #define UNIX 1
 EOF
 
-echo "$as_me:4089: checking for $CC option to accept ANSI C" >&5
-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_prog_cc_stdc=no
-ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-#line 4097 "configure"
-#include "confdefs.h"
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
-# AIX			-qlanglvl=ansi
-# Ultrix and OSF/1	-std1
-# HP-UX 10.20 and later	-Ae
-# HP-UX older versions	-Aa -D_HPUX_SOURCE
-# SVR4			-Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4146: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:4149: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4152: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:4155: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_prog_cc_stdc=$ac_arg
-break
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-fi
-rm -f conftest.$ac_objext
-done
-rm -f conftest.$ac_ext conftest.$ac_objext
-CC=$ac_save_CC
-
-fi
-
-case "x$ac_cv_prog_cc_stdc" in
-  x|xno)
-    echo "$as_me:4172: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6 ;;
-  *)
-    echo "$as_me:4175: result: $ac_cv_prog_cc_stdc" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-    CC="$CC $ac_cv_prog_cc_stdc" ;;
-esac
-
-echo "$as_me:4180: checking for an ANSI C-conforming const" >&5
-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
-if test "${ac_cv_c_const+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line 4186 "configure"
-#include "confdefs.h"
-
-int
-main ()
-{
-/* FIXME: Include the comments suggested by Paul. */
-#ifndef __cplusplus
-  /* Ultrix mips cc rejects this.  */
-  typedef int charset[2];
-  const charset x;
-  /* SunOS 4.1.1 cc rejects this.  */
-  char const *const *ccp;
-  char **p;
-  /* NEC SVR4.0.2 mips cc rejects this.  */
-  struct point {int x, y;};
-  static struct point const zero = {0,0};
-  /* AIX XL C 1.02.0.0 rejects this.
-     It does not let you subtract one const X* pointer from another in
-     an arm of an if-expression whose if-part is not a constant
-     expression */
-  const char *g = "string";
-  ccp = &g + (g ? g-g : 0);
-  /* HPUX 7.0 cc rejects these. */
-  ++ccp;
-  p = (char**) ccp;
-  ccp = (char const *const *) p;
-  { /* SCO 3.2v4 cc rejects this.  */
-    char *t;
-    char const *s = 0 ? (char *) 0 : (char const *) 0;
-
-    *t++ = 0;
-  }
-  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
-    int x[] = {25, 17};
-    const int *foo = &x[0];
-    ++foo;
-  }
-  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-    typedef const int *iptr;
-    iptr p = 0;
-    ++p;
-  }
-  { /* AIX XL C 1.02.0.0 rejects this saying
-       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-    struct s { int j; const int *ap[3]; };
-    struct s *b; b->j = 5;
-  }
-  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
-    const int foo = 10;
-  }
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4244: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:4247: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4250: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:4253: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_c_const=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_c_const=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:4263: result: $ac_cv_c_const" >&5
-echo "${ECHO_T}$ac_cv_c_const" >&6
-if test $ac_cv_c_const = no; then
-
-cat >>confdefs.h <<\EOF
-#define const
-EOF
-
-fi
-
-case $cf_cv_system_name in
-os2*)
-    CFLAGS="$CFLAGS -Zmt"
-    CPPFLAGS="$CPPFLAGS -D__ST_MT_ERRNO__"
-    CXXFLAGS="$CXXFLAGS -Zmt"
-    # autoconf's macro sets -Zexe and suffix both, which conflict:w
-    LDFLAGS="$LDFLAGS -Zmt -Zcrtdll"
-    ac_cv_exeext=.exe
-    ;;
-esac
-
-PROG_EXT="$EXEEXT"
-
-test -n "$PROG_EXT" && cat >>confdefs.h <<EOF
-#define PROG_EXT "$PROG_EXT"
-EOF
-
 TRY_CFLAGS=
 case $host_os in
 aix4*)
@@ -4308,7 +4264,7 @@ clix*)
 	# contributed by Alex Matulich (matuli_a@marlin.navsea.navy.mil) also
 	# references -lmalloc and -lbsd.
 
-echo "$as_me:4311: checking for strcmp in -lc_s" >&5
+echo "$as_me:4267: checking for strcmp in -lc_s" >&5
 echo $ECHO_N "checking for strcmp in -lc_s... $ECHO_C" >&6
 if test "${ac_cv_lib_c_s_strcmp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4316,7 +4272,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc_s  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 4319 "configure"
+#line 4275 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4335,16 +4291,16 @@ strcmp ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4338: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4294: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4341: \$? = $ac_status" >&5
+  echo "$as_me:4297: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4344: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4300: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4347: \$? = $ac_status" >&5
+  echo "$as_me:4303: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_c_s_strcmp=yes
 else
@@ -4355,7 +4311,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4358: result: $ac_cv_lib_c_s_strcmp" >&5
+echo "$as_me:4314: result: $ac_cv_lib_c_s_strcmp" >&5
 echo "${ECHO_T}$ac_cv_lib_c_s_strcmp" >&6
 if test $ac_cv_lib_c_s_strcmp = yes; then
   cat >>confdefs.h <<EOF
@@ -4520,14 +4476,14 @@ sco*)
 	# SCO's cc (which is reported to have broken const/volatile).
 	case "$CC" in #(vi
 	cc|*/cc)
-		{ echo "$as_me:4523: WARNING: You should consider using gcc or rcc if available" >&5
+		{ echo "$as_me:4479: WARNING: You should consider using gcc or rcc if available" >&5
 echo "$as_me: WARNING: You should consider using gcc or rcc if available" >&2;}
 		unset ac_cv_prog_CC
 		for ac_prog in gcc rcc
 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:4530: checking for $ac_word" >&5
+echo "$as_me:4486: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4542,7 +4498,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_CC="$ac_prog"
-echo "$as_me:4545: found $ac_dir/$ac_word" >&5
+echo "$as_me:4501: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4550,10 +4506,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:4553: result: $CC" >&5
+  echo "$as_me:4509: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:4556: result: no" >&5
+  echo "$as_me:4512: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4576,23 +4532,23 @@ sony-newsos*)
 for ac_header in jcurses.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:4579: checking for $ac_header" >&5
+echo "$as_me:4535: 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 4585 "configure"
+#line 4541 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:4589: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4545: \"$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:4595: \$? = $ac_status" >&5
+  echo "$as_me:4551: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4611,7 +4567,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:4614: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:4570: 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
@@ -4639,23 +4595,23 @@ ultrix*)
 for ac_header in cursesX.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:4642: checking for $ac_header" >&5
+echo "$as_me:4598: 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 4648 "configure"
+#line 4604 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:4652: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4608: \"$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:4658: \$? = $ac_status" >&5
+  echo "$as_me:4614: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4674,13 +4630,14 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:4677: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:4633: 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
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
- cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define HAVE_CURSESX_H 1
 EOF
 
@@ -4700,16 +4657,13 @@ esac
 # This should have been defined by AC_PROG_CC
 : ${CC:=cc}
 
-# Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content
-# into CC.  This will not help with broken scripts that wrap the compiler with
-# options, but eliminates a more common category of user confusion.
-echo "$as_me:4706: checking \$CC variable" >&5
+echo "$as_me:4660: checking \$CC variable" >&5
 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
 case "$CC" in #(vi
 *[\ \	]-[IUD]*)
-	echo "$as_me:4710: result: broken" >&5
+	echo "$as_me:4664: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:4712: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
+	{ echo "$as_me:4666: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
 echo "$as_me: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;}
 	# humor him...
 	cf_flags=`echo "$CC" | sed -e 's/^[^ 	]*[ 	]//'`
@@ -4795,12 +4749,12 @@ fi
 
 	;;
 *)
-	echo "$as_me:4798: result: ok" >&5
+	echo "$as_me:4752: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
 
-echo "$as_me:4803: checking for ${CC:-cc} option to accept ANSI C" >&5
+echo "$as_me:4757: checking for ${CC:-cc} option to accept ANSI C" >&5
 echo $ECHO_N "checking for ${CC:-cc} option to accept ANSI C... $ECHO_C" >&6
 if test "${cf_cv_ansi_cc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4904,7 +4858,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 4907 "configure"
+#line 4861 "configure"
 #include "confdefs.h"
 
 #ifndef CC_HAS_PROTOS
@@ -4925,16 +4879,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4928: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4882: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4931: \$? = $ac_status" >&5
+  echo "$as_me:4885: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4934: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4888: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4937: \$? = $ac_status" >&5
+  echo "$as_me:4891: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ansi_cc="$cf_arg"; break
 else
@@ -4947,7 +4901,7 @@ CFLAGS="$cf_save_CFLAGS"
 CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi
-echo "$as_me:4950: result: $cf_cv_ansi_cc" >&5
+echo "$as_me:4904: result: $cf_cv_ansi_cc" >&5
 echo "${ECHO_T}$cf_cv_ansi_cc" >&6
 
 if test "$cf_cv_ansi_cc" != "no"; then
@@ -5032,7 +4986,8 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 else
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define CC_HAS_PROTOS 1
 EOF
 
@@ -5040,7 +4995,7 @@ fi
 fi
 
 if test "$cf_cv_ansi_cc" = "no"; then
-	{ { echo "$as_me:5043: error: Your compiler does not appear to recognize prototypes.
+	{ { echo "$as_me:4998: error: Your compiler does not appear to recognize prototypes.
 You have the following choices:
 	a. adjust your compiler options
 	b. get an up-to-date compiler
@@ -5060,7 +5015,7 @@ if test "${enable_largefile+set}" = set; then
 fi;
 if test "$enable_largefile" != no; then
 
-  echo "$as_me:5063: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:5018: checking for special C compiler options needed for large files" >&5
 echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_largefile_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5072,7 +5027,7 @@ else
      	 # IRIX 6.2 and later do not support large files by default,
      	 # so use the C compiler's -n32 option if that helps.
          cat >conftest.$ac_ext <<_ACEOF
-#line 5075 "configure"
+#line 5030 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -5092,16 +5047,16 @@ main ()
 }
 _ACEOF
      	 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5095: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5050: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5098: \$? = $ac_status" >&5
+  echo "$as_me:5053: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5101: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5056: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5104: \$? = $ac_status" >&5
+  echo "$as_me:5059: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -5111,16 +5066,16 @@ fi
 rm -f conftest.$ac_objext
      	 CC="$CC -n32"
      	 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5114: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5069: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5117: \$? = $ac_status" >&5
+  echo "$as_me:5072: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5120: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5075: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5123: \$? = $ac_status" >&5
+  echo "$as_me:5078: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else
@@ -5134,13 +5089,13 @@ rm -f conftest.$ac_objext
        rm -f conftest.$ac_ext
     fi
 fi
-echo "$as_me:5137: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:5092: result: $ac_cv_sys_largefile_CC" >&5
 echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
   if test "$ac_cv_sys_largefile_CC" != no; then
     CC=$CC$ac_cv_sys_largefile_CC
   fi
 
-  echo "$as_me:5143: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:5098: checking for _FILE_OFFSET_BITS value needed for large files" >&5
 echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_file_offset_bits+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5148,7 +5103,7 @@ else
   while :; do
   ac_cv_sys_file_offset_bits=no
   cat >conftest.$ac_ext <<_ACEOF
-#line 5151 "configure"
+#line 5106 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -5168,16 +5123,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5171: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5126: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5174: \$? = $ac_status" >&5
+  echo "$as_me:5129: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5177: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5132: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5180: \$? = $ac_status" >&5
+  echo "$as_me:5135: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -5186,7 +5141,7 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 5189 "configure"
+#line 5144 "configure"
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -5207,16 +5162,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5210: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5165: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5213: \$? = $ac_status" >&5
+  echo "$as_me:5168: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5216: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5171: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5219: \$? = $ac_status" >&5
+  echo "$as_me:5174: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else
@@ -5227,7 +5182,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
   break
 done
 fi
-echo "$as_me:5230: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:5185: result: $ac_cv_sys_file_offset_bits" >&5
 echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
 if test "$ac_cv_sys_file_offset_bits" != no; then
 
@@ -5237,7 +5192,7 @@ EOF
 
 fi
 rm -rf conftest*
-  echo "$as_me:5240: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:5195: checking for _LARGE_FILES value needed for large files" >&5
 echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_large_files+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5245,7 +5200,7 @@ else
   while :; do
   ac_cv_sys_large_files=no
   cat >conftest.$ac_ext <<_ACEOF
-#line 5248 "configure"
+#line 5203 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -5265,16 +5220,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5268: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5223: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5271: \$? = $ac_status" >&5
+  echo "$as_me:5226: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5274: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5229: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5277: \$? = $ac_status" >&5
+  echo "$as_me:5232: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -5283,7 +5238,7 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 5286 "configure"
+#line 5241 "configure"
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
@@ -5304,16 +5259,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5307: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5262: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5310: \$? = $ac_status" >&5
+  echo "$as_me:5265: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5313: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5268: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5316: \$? = $ac_status" >&5
+  echo "$as_me:5271: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_large_files=1; break
 else
@@ -5324,7 +5279,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
   break
 done
 fi
-echo "$as_me:5327: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:5282: result: $ac_cv_sys_large_files" >&5
 echo "${ECHO_T}$ac_cv_sys_large_files" >&6
 if test "$ac_cv_sys_large_files" != no; then
 
@@ -5337,7 +5292,7 @@ rm -rf conftest*
 fi
 
     if test "$enable_largefile" != no ; then
-	echo "$as_me:5340: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+	echo "$as_me:5295: checking for _LARGEFILE_SOURCE value needed for large files" >&5
 echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_largefile_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5345,7 +5300,7 @@ else
   while :; do
   ac_cv_sys_largefile_source=no
   cat >conftest.$ac_ext <<_ACEOF
-#line 5348 "configure"
+#line 5303 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -5357,16 +5312,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5360: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5315: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5363: \$? = $ac_status" >&5
+  echo "$as_me:5318: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5366: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5321: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5369: \$? = $ac_status" >&5
+  echo "$as_me:5324: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -5375,7 +5330,7 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 5378 "configure"
+#line 5333 "configure"
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
@@ -5388,16 +5343,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5391: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5346: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5394: \$? = $ac_status" >&5
+  echo "$as_me:5349: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5397: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5352: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5400: \$? = $ac_status" >&5
+  echo "$as_me:5355: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_largefile_source=1; break
 else
@@ -5408,7 +5363,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
   break
 done
 fi
-echo "$as_me:5411: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:5366: result: $ac_cv_sys_largefile_source" >&5
 echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
 if test "$ac_cv_sys_largefile_source" != no; then
 
@@ -5422,13 +5377,13 @@ rm -rf conftest*
 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
 # in glibc 2.1.3, but that breaks too many other things.
 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-echo "$as_me:5425: checking for fseeko" >&5
+echo "$as_me:5380: checking for fseeko" >&5
 echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
 if test "${ac_cv_func_fseeko+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5431 "configure"
+#line 5386 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -5440,16 +5395,16 @@ return fseeko && fseeko (stdin, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5443: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5398: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5446: \$? = $ac_status" >&5
+  echo "$as_me:5401: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5449: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5404: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5452: \$? = $ac_status" >&5
+  echo "$as_me:5407: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_fseeko=yes
 else
@@ -5459,7 +5414,7 @@ ac_cv_func_fseeko=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:5462: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:5417: result: $ac_cv_func_fseeko" >&5
 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
 if test $ac_cv_func_fseeko = yes; then
 
@@ -5480,14 +5435,14 @@ fi
 	test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE "
 	test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits "
 
-	echo "$as_me:5483: checking whether to use struct dirent64" >&5
+	echo "$as_me:5438: checking whether to use struct dirent64" >&5
 echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6
 if test "${cf_cv_struct_dirent64+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 5490 "configure"
+#line 5445 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -5508,16 +5463,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5511: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5466: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5514: \$? = $ac_status" >&5
+  echo "$as_me:5469: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5517: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5472: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5520: \$? = $ac_status" >&5
+  echo "$as_me:5475: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_struct_dirent64=yes
 else
@@ -5528,9 +5483,10 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:5531: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:5486: result: $cf_cv_struct_dirent64" >&5
 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
-	test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF
+	test "$cf_cv_struct_dirent64" = yes &&
+cat >>confdefs.h <<\EOF
 #define HAVE_STRUCT_DIRENT64 1
 EOF
 
@@ -5539,15 +5495,20 @@ EOF
 if test -z "$ALL_LINGUAS" ; then
 	ALL_LINGUAS=`test -d $srcdir/po && cd $srcdir/po && echo *.po|sed -e 's/\.po//g' -e 's/*//'`
 
+	echo "$as_me:5498: checking for PATH separator" >&5
+echo $ECHO_N "checking for PATH separator... $ECHO_C" >&6
 	case $cf_cv_system_name in
 	os2*)	PATH_SEPARATOR=';'  ;;
-	*)	PATH_SEPARATOR=':'  ;;
+	*)	${PATH_SEPARATOR:=':'}  ;;
 	esac
 
+	echo "$as_me:5505: result: $PATH_SEPARATOR" >&5
+echo "${ECHO_T}$PATH_SEPARATOR" >&6
+
 # Extract the first word of "msginit", so it can be a program name with args.
 
 set dummy msginit; ac_word=$2
-echo "$as_me:5550: checking for $ac_word" >&5
+echo "$as_me:5511: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_MSGINIT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5574,17 +5535,17 @@ esac
 fi
 MSGINIT="$ac_cv_path_MSGINIT"
 if test "$MSGINIT" != ":"; then
-  echo "$as_me:5577: result: $MSGINIT" >&5
+  echo "$as_me:5538: result: $MSGINIT" >&5
 echo "${ECHO_T}$MSGINIT" >&6
 else
-  echo "$as_me:5580: result: no" >&5
+  echo "$as_me:5541: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 	if test "$MSGINIT" != ":" ; then
 		test -n "$verbose" && echo "	adding en.po" 1>&6
 
-echo "${as_me:-configure}:5587: testing adding en.po ..." 1>&5
+echo "${as_me:-configure}:5548: testing adding en.po ..." 1>&5
 
 		ALL_LINGUAS="$ALL_LINGUAS en"
 	fi
@@ -5593,7 +5554,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:5596: checking for $ac_word" >&5
+echo "$as_me:5557: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5608,7 +5569,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_RANLIB="${ac_tool_prefix}ranlib"
-echo "$as_me:5611: found $ac_dir/$ac_word" >&5
+echo "$as_me:5572: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5616,10 +5577,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:5619: result: $RANLIB" >&5
+  echo "$as_me:5580: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:5622: result: no" >&5
+  echo "$as_me:5583: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5628,7 +5589,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:5631: checking for $ac_word" >&5
+echo "$as_me:5592: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5643,7 +5604,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_RANLIB="ranlib"
-echo "$as_me:5646: found $ac_dir/$ac_word" >&5
+echo "$as_me:5607: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5652,10 +5613,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:5655: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:5616: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:5658: result: no" >&5
+  echo "$as_me:5619: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5664,13 +5625,13 @@ else
   RANLIB="$ac_cv_prog_RANLIB"
 fi
 
-echo "$as_me:5667: checking for ANSI C header files" >&5
+echo "$as_me:5628: checking for ANSI C header files" >&5
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5673 "configure"
+#line 5634 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -5678,13 +5639,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:5681: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5642: \"$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:5687: \$? = $ac_status" >&5
+  echo "$as_me:5648: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5706,7 +5667,7 @@ rm -f conftest.err conftest.$ac_ext
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 5709 "configure"
+#line 5670 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -5724,7 +5685,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 5727 "configure"
+#line 5688 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -5745,7 +5706,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5748 "configure"
+#line 5709 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -5771,15 +5732,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:5774: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5735: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5777: \$? = $ac_status" >&5
+  echo "$as_me:5738: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:5779: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5740: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5782: \$? = $ac_status" >&5
+  echo "$as_me:5743: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -5792,7 +5753,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:5795: result: $ac_cv_header_stdc" >&5
+echo "$as_me:5756: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -5802,7 +5763,7 @@ EOF
 
 fi
 
-echo "$as_me:5805: checking for inline" >&5
+echo "$as_me:5766: checking for inline" >&5
 echo $ECHO_N "checking for inline... $ECHO_C" >&6
 if test "${ac_cv_c_inline+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5810,7 +5771,7 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >conftest.$ac_ext <<_ACEOF
-#line 5813 "configure"
+#line 5774 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo () {return 0; }
@@ -5819,16 +5780,16 @@ $ac_kw int foo () {return 0; }
 
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5822: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5783: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5825: \$? = $ac_status" >&5
+  echo "$as_me:5786: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5828: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5789: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5831: \$? = $ac_status" >&5
+  echo "$as_me:5792: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
@@ -5839,7 +5800,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:5842: result: $ac_cv_c_inline" >&5
+echo "$as_me:5803: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -5860,28 +5821,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:5863: checking for $ac_header" >&5
+echo "$as_me:5824: 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 5869 "configure"
+#line 5830 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5875: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5836: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5878: \$? = $ac_status" >&5
+  echo "$as_me:5839: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5881: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5842: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5884: \$? = $ac_status" >&5
+  echo "$as_me:5845: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -5891,7 +5852,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5894: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:5855: 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
@@ -5901,13 +5862,13 @@ EOF
 fi
 done
 
-echo "$as_me:5904: checking for off_t" >&5
+echo "$as_me:5865: checking for off_t" >&5
 echo $ECHO_N "checking for off_t... $ECHO_C" >&6
 if test "${ac_cv_type_off_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5910 "configure"
+#line 5871 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -5922,16 +5883,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5925: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5886: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5928: \$? = $ac_status" >&5
+  echo "$as_me:5889: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5931: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5892: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5934: \$? = $ac_status" >&5
+  echo "$as_me:5895: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -5941,7 +5902,7 @@ ac_cv_type_off_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5944: result: $ac_cv_type_off_t" >&5
+echo "$as_me:5905: result: $ac_cv_type_off_t" >&5
 echo "${ECHO_T}$ac_cv_type_off_t" >&6
 if test $ac_cv_type_off_t = yes; then
   :
@@ -5953,13 +5914,13 @@ EOF
 
 fi
 
-echo "$as_me:5956: checking for size_t" >&5
+echo "$as_me:5917: checking for size_t" >&5
 echo $ECHO_N "checking for size_t... $ECHO_C" >&6
 if test "${ac_cv_type_size_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5962 "configure"
+#line 5923 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -5974,16 +5935,16 @@ if (sizeof (size_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5977: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5938: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5980: \$? = $ac_status" >&5
+  echo "$as_me:5941: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5983: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5944: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5986: \$? = $ac_status" >&5
+  echo "$as_me:5947: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_size_t=yes
 else
@@ -5993,7 +5954,7 @@ ac_cv_type_size_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5996: result: $ac_cv_type_size_t" >&5
+echo "$as_me:5957: result: $ac_cv_type_size_t" >&5
 echo "${ECHO_T}$ac_cv_type_size_t" >&6
 if test $ac_cv_type_size_t = yes; then
   :
@@ -6007,13 +5968,13 @@ fi
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:6010: checking for working alloca.h" >&5
+echo "$as_me:5971: checking for working alloca.h" >&5
 echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6
 if test "${ac_cv_working_alloca_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6016 "configure"
+#line 5977 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int
@@ -6025,16 +5986,16 @@ char *p = (char *) alloca (2 * sizeof (int));
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6028: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5989: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6031: \$? = $ac_status" >&5
+  echo "$as_me:5992: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6034: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5995: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6037: \$? = $ac_status" >&5
+  echo "$as_me:5998: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_working_alloca_h=yes
 else
@@ -6044,7 +6005,7 @@ ac_cv_working_alloca_h=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6047: result: $ac_cv_working_alloca_h" >&5
+echo "$as_me:6008: result: $ac_cv_working_alloca_h" >&5
 echo "${ECHO_T}$ac_cv_working_alloca_h" >&6
 if test $ac_cv_working_alloca_h = yes; then
 
@@ -6054,13 +6015,13 @@ EOF
 
 fi
 
-echo "$as_me:6057: checking for alloca" >&5
+echo "$as_me:6018: checking for alloca" >&5
 echo $ECHO_N "checking for alloca... $ECHO_C" >&6
 if test "${ac_cv_func_alloca_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6063 "configure"
+#line 6024 "configure"
 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -6092,16 +6053,16 @@ char *p = (char *) alloca (1);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6095: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6056: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6098: \$? = $ac_status" >&5
+  echo "$as_me:6059: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6101: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6062: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6104: \$? = $ac_status" >&5
+  echo "$as_me:6065: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_alloca_works=yes
 else
@@ -6111,7 +6072,7 @@ ac_cv_func_alloca_works=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6114: result: $ac_cv_func_alloca_works" >&5
+echo "$as_me:6075: result: $ac_cv_func_alloca_works" >&5
 echo "${ECHO_T}$ac_cv_func_alloca_works" >&6
 
 if test $ac_cv_func_alloca_works = yes; then
@@ -6132,13 +6093,13 @@ cat >>confdefs.h <<\EOF
 #define C_ALLOCA 1
 EOF
 
-echo "$as_me:6135: checking whether \`alloca.c' needs Cray hooks" >&5
+echo "$as_me:6096: checking whether \`alloca.c' needs Cray hooks" >&5
 echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6
 if test "${ac_cv_os_cray+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6141 "configure"
+#line 6102 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -6156,18 +6117,18 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:6159: result: $ac_cv_os_cray" >&5
+echo "$as_me:6120: result: $ac_cv_os_cray" >&5
 echo "${ECHO_T}$ac_cv_os_cray" >&6
 if test $ac_cv_os_cray = yes; then
   for ac_func in _getb67 GETB67 getb67; do
     as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:6164: checking for $ac_func" >&5
+echo "$as_me:6125: 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 6170 "configure"
+#line 6131 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -6198,16 +6159,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6201: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6162: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6204: \$? = $ac_status" >&5
+  echo "$as_me:6165: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6207: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6168: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6210: \$? = $ac_status" >&5
+  echo "$as_me:6171: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -6217,7 +6178,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6220: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:6181: 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
 
@@ -6231,7 +6192,7 @@ fi
   done
 fi
 
-echo "$as_me:6234: checking stack direction for C alloca" >&5
+echo "$as_me:6195: checking stack direction for C alloca" >&5
 echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6
 if test "${ac_cv_c_stack_direction+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6240,7 +6201,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6243 "configure"
+#line 6204 "configure"
 #include "confdefs.h"
 int
 find_stack_direction ()
@@ -6263,15 +6224,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:6266: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6227: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6269: \$? = $ac_status" >&5
+  echo "$as_me:6230: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:6271: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6232: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6274: \$? = $ac_status" >&5
+  echo "$as_me:6235: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_stack_direction=1
 else
@@ -6283,7 +6244,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:6286: result: $ac_cv_c_stack_direction" >&5
+echo "$as_me:6247: result: $ac_cv_c_stack_direction" >&5
 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
 cat >>confdefs.h <<EOF
@@ -6295,23 +6256,23 @@ fi
 for ac_header in stdlib.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6298: checking for $ac_header" >&5
+echo "$as_me:6259: 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 6304 "configure"
+#line 6265 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:6308: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:6269: \"$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:6314: \$? = $ac_status" >&5
+  echo "$as_me:6275: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6330,7 +6291,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:6333: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:6294: 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
@@ -6343,13 +6304,13 @@ done
 for ac_func in getpagesize
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:6346: checking for $ac_func" >&5
+echo "$as_me:6307: 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 6352 "configure"
+#line 6313 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -6380,16 +6341,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6383: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6344: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6386: \$? = $ac_status" >&5
+  echo "$as_me:6347: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6389: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6350: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6392: \$? = $ac_status" >&5
+  echo "$as_me:6353: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -6399,7 +6360,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6402: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:6363: 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
@@ -6409,7 +6370,7 @@ EOF
 fi
 done
 
-echo "$as_me:6412: checking for working mmap" >&5
+echo "$as_me:6373: checking for working mmap" >&5
 echo $ECHO_N "checking for working mmap... $ECHO_C" >&6
 if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6418,7 +6379,7 @@ else
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6421 "configure"
+#line 6382 "configure"
 #include "confdefs.h"
 $ac_includes_default
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -6545,15 +6506,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:6548: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6509: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6551: \$? = $ac_status" >&5
+  echo "$as_me:6512: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:6553: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6514: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6556: \$? = $ac_status" >&5
+  echo "$as_me:6517: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -6565,7 +6526,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:6568: result: $ac_cv_func_mmap_fixed_mapped" >&5
+echo "$as_me:6529: result: $ac_cv_func_mmap_fixed_mapped" >&5
 echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6
 if test $ac_cv_func_mmap_fixed_mapped = yes; then
 
@@ -6576,13 +6537,13 @@ EOF
 fi
 rm -f conftest.mmap
 
-    echo "$as_me:6579: checking whether we are using the GNU C Library 2.1 or newer" >&5
+    echo "$as_me:6540: checking whether we are using the GNU C Library 2.1 or newer" >&5
 echo $ECHO_N "checking whether we are using the GNU C Library 2.1 or newer... $ECHO_C" >&6
 if test "${ac_cv_gnu_library_2_1+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6585 "configure"
+#line 6546 "configure"
 #include "confdefs.h"
 
 #include <features.h>
@@ -6602,7 +6563,7 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:6605: result: $ac_cv_gnu_library_2_1" >&5
+echo "$as_me:6566: result: $ac_cv_gnu_library_2_1" >&5
 echo "${ECHO_T}$ac_cv_gnu_library_2_1" >&6
 
     GLIBC21="$ac_cv_gnu_library_2_1"
@@ -6615,7 +6576,7 @@ test -z "$ALL_LINGUAS" && ALL_LINGUAS=`test -d $srcdir/po && cd $srcdir/po && ec
 : ${CONFIG_H:=config.h}
 
 if test -z "$PACKAGE" ; then
-	{ { echo "$as_me:6618: error: CF_BUNDLED_INTL used without setting PACKAGE variable" >&5
+	{ { echo "$as_me:6579: error: CF_BUNDLED_INTL used without setting PACKAGE variable" >&5
 echo "$as_me: error: CF_BUNDLED_INTL used without setting PACKAGE variable" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -6632,23 +6593,23 @@ for ac_header in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
 stdlib.h string.h unistd.h sys/param.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6635: checking for $ac_header" >&5
+echo "$as_me:6596: 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 6641 "configure"
+#line 6602 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:6645: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:6606: \"$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:6651: \$? = $ac_status" >&5
+  echo "$as_me:6612: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6667,7 +6628,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:6670: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:6631: 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
@@ -6682,13 +6643,13 @@ getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \
 strdup strtoul tsearch __argz_count __argz_stringify __argz_next
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:6685: checking for $ac_func" >&5
+echo "$as_me:6646: 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 6691 "configure"
+#line 6652 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -6719,16 +6680,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6722: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6683: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6725: \$? = $ac_status" >&5
+  echo "$as_me:6686: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6728: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6689: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6731: \$? = $ac_status" >&5
+  echo "$as_me:6692: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -6738,7 +6699,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6741: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:6702: 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
@@ -6786,7 +6747,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 6789 "configure"
+#line 6750 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -6798,16 +6759,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6801: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6762: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6804: \$? = $ac_status" >&5
+  echo "$as_me:6765: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6807: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6768: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6810: \$? = $ac_status" >&5
+  echo "$as_me:6771: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -6824,7 +6785,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}:6827: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:6788: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -6865,7 +6826,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 6868 "configure"
+#line 6829 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -6877,16 +6838,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6880: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6841: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6883: \$? = $ac_status" >&5
+  echo "$as_me:6844: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6886: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6847: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6889: \$? = $ac_status" >&5
+  echo "$as_me:6850: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -6903,7 +6864,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}:6906: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:6867: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -6919,7 +6880,7 @@ echo "${as_me:-configure}:6906: testing adding $cf_add_incdir to include-path ..
 fi
 
 	else
-{ { echo "$as_me:6922: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:6883: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -6944,7 +6905,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}:6947: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:6908: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -6973,7 +6934,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}:6976: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:6937: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -6982,7 +6943,7 @@ echo "${as_me:-configure}:6976: testing adding $cf_add_libdir to library-path ..
 fi
 
 	else
-{ { echo "$as_me:6985: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:6946: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -6993,7 +6954,7 @@ done
 
 fi;
 
-  echo "$as_me:6996: checking for iconv" >&5
+  echo "$as_me:6957: 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
@@ -7004,12 +6965,12 @@ else
 cf_cv_header_path_iconv=
 cf_cv_library_path_iconv=
 
-echo "${as_me:-configure}:7007: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:6968: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 7012 "configure"
+#line 6973 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -7028,16 +6989,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7031: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6992: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7034: \$? = $ac_status" >&5
+  echo "$as_me:6995: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7037: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6998: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7040: \$? = $ac_status" >&5
+  echo "$as_me:7001: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -7051,7 +7012,7 @@ cat conftest.$ac_ext >&5
 LIBS="-liconv  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 7054 "configure"
+#line 7015 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -7070,16 +7031,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7073: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7034: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7076: \$? = $ac_status" >&5
+  echo "$as_me:7037: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7079: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7040: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7082: \$? = $ac_status" >&5
+  echo "$as_me:7043: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -7096,9 +7057,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for iconv library" 1>&6
 
-echo "${as_me:-configure}:7099: testing find linkage for iconv library ..." 1>&5
+echo "${as_me:-configure}:7060: testing find linkage for iconv library ..." 1>&5
 
-echo "${as_me:-configure}:7101: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:7062: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -7211,11 +7172,11 @@ cf_search="$cf_search $cf_header_path_list"
       if test -d $cf_cv_header_path_iconv ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_iconv" 1>&6
 
-echo "${as_me:-configure}:7214: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:7175: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_iconv"
         cat >conftest.$ac_ext <<_ACEOF
-#line 7218 "configure"
+#line 7179 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -7234,21 +7195,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7237: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7198: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7240: \$? = $ac_status" >&5
+  echo "$as_me:7201: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7243: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7204: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7246: \$? = $ac_status" >&5
+  echo "$as_me:7207: \$? = $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}:7251: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:7212: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
 
             cf_cv_find_linkage_iconv=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -7266,7 +7227,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_iconv" = maybe ; then
 
-echo "${as_me:-configure}:7269: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:7230: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -7363,13 +7324,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}:7366: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:7327: 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 7372 "configure"
+#line 7333 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -7388,21 +7349,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7391: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7352: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7394: \$? = $ac_status" >&5
+  echo "$as_me:7355: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7397: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7358: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7400: \$? = $ac_status" >&5
+  echo "$as_me:7361: \$? = $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}:7405: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:7366: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
 
                 cf_cv_find_linkage_iconv=yes
                 cf_cv_library_file_iconv="-liconv"
@@ -7442,7 +7403,7 @@ am_cv_func_iconv="no, consider installing GNU libiconv"
 fi
 
 fi
-echo "$as_me:7445: result: $am_cv_func_iconv" >&5
+echo "$as_me:7406: result: $am_cv_func_iconv" >&5
 echo "${ECHO_T}$am_cv_func_iconv" >&6
 
   if test "$am_cv_func_iconv" = yes; then
@@ -7451,14 +7412,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_ICONV 1
 EOF
 
-    echo "$as_me:7454: checking if the declaration of iconv() needs const." >&5
+    echo "$as_me:7415: 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 7461 "configure"
+#line 7422 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -7483,16 +7444,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7486: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7447: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7489: \$? = $ac_status" >&5
+  echo "$as_me:7450: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7492: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7453: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7495: \$? = $ac_status" >&5
+  echo "$as_me:7456: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_proto_iconv_const=no
 else
@@ -7502,7 +7463,7 @@ am_cv_proto_iconv_const=yes
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:7505: result: $am_cv_proto_iconv_const" >&5
+echo "$as_me:7466: 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
@@ -7544,7 +7505,7 @@ if test -n "$cf_cv_header_path_iconv" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 7547 "configure"
+#line 7508 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7556,16 +7517,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7559: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7520: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7562: \$? = $ac_status" >&5
+  echo "$as_me:7523: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7565: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7526: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7568: \$? = $ac_status" >&5
+  echo "$as_me:7529: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -7582,7 +7543,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}:7585: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:7546: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -7619,7 +7580,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}:7622: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:7583: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -7630,13 +7591,13 @@ fi
     fi
   fi
 
-  echo "$as_me:7633: checking for nl_langinfo and CODESET" >&5
+  echo "$as_me:7594: checking for nl_langinfo and CODESET" >&5
 echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
 if test "${am_cv_langinfo_codeset+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7639 "configure"
+#line 7600 "configure"
 #include "confdefs.h"
 #include <langinfo.h>
 int
@@ -7648,16 +7609,16 @@ char* cs = nl_langinfo(CODESET);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7651: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7612: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7654: \$? = $ac_status" >&5
+  echo "$as_me:7615: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7657: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7618: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7660: \$? = $ac_status" >&5
+  echo "$as_me:7621: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_langinfo_codeset=yes
 else
@@ -7668,7 +7629,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:7671: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:7632: result: $am_cv_langinfo_codeset" >&5
 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
   if test $am_cv_langinfo_codeset = yes; then
 
@@ -7679,13 +7640,13 @@ EOF
   fi
 
    if test $ac_cv_header_locale_h = yes; then
-    echo "$as_me:7682: checking for LC_MESSAGES" >&5
+    echo "$as_me:7643: checking for LC_MESSAGES" >&5
 echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6
 if test "${am_cv_val_LC_MESSAGES+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7688 "configure"
+#line 7649 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int
@@ -7697,16 +7658,16 @@ return LC_MESSAGES
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7700: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7661: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7703: \$? = $ac_status" >&5
+  echo "$as_me:7664: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7706: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7667: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7709: \$? = $ac_status" >&5
+  echo "$as_me:7670: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_val_LC_MESSAGES=yes
 else
@@ -7716,7 +7677,7 @@ am_cv_val_LC_MESSAGES=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7719: result: $am_cv_val_LC_MESSAGES" >&5
+echo "$as_me:7680: result: $am_cv_val_LC_MESSAGES" >&5
 echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6
     if test $am_cv_val_LC_MESSAGES = yes; then
 
@@ -7726,7 +7687,7 @@ EOF
 
     fi
   fi
-   echo "$as_me:7729: checking whether NLS is requested" >&5
+   echo "$as_me:7690: checking whether NLS is requested" >&5
 echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6
 
 # Check whether --enable-nls or --disable-nls was given.
@@ -7736,7 +7697,7 @@ if test "${enable_nls+set}" = set; then
 else
   USE_NLS=no
 fi;
-  echo "$as_me:7739: result: $USE_NLS" >&5
+  echo "$as_me:7700: result: $USE_NLS" >&5
 echo "${ECHO_T}$USE_NLS" >&6
 
   BUILD_INCLUDED_LIBINTL=no
@@ -7749,7 +7710,7 @@ cat >>confdefs.h <<\EOF
 #define ENABLE_NLS 1
 EOF
 
-    echo "$as_me:7752: checking whether included gettext is requested" >&5
+    echo "$as_me:7713: checking whether included gettext is requested" >&5
 echo $ECHO_N "checking whether included gettext is requested... $ECHO_C" >&6
 
 # Check whether --with-included-gettext or --without-included-gettext was given.
@@ -7759,7 +7720,7 @@ if test "${with_included_gettext+set}" = set; then
 else
   nls_cv_force_use_gnu_gettext=no
 fi;
-    echo "$as_me:7762: result: $nls_cv_force_use_gnu_gettext" >&5
+    echo "$as_me:7723: result: $nls_cv_force_use_gnu_gettext" >&5
 echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6
 
     nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
@@ -7768,7 +7729,7 @@ echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6
 
       cf_save_LIBS_1="$LIBS"
       LIBS="$LIBICONV $LIBS"
-      echo "$as_me:7771: checking for libintl.h and gettext()" >&5
+      echo "$as_me:7732: checking for libintl.h and gettext()" >&5
 echo $ECHO_N "checking for libintl.h and gettext()... $ECHO_C" >&6
 if test "${cf_cv_func_gettext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7779,12 +7740,12 @@ else
 cf_cv_header_path_intl=
 cf_cv_library_path_intl=
 
-echo "${as_me:-configure}:7782: testing Starting FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me:-configure}:7743: testing Starting FIND_LINKAGE(intl,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 7787 "configure"
+#line 7748 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -7804,16 +7765,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7807: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7768: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7810: \$? = $ac_status" >&5
+  echo "$as_me:7771: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7813: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7774: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7816: \$? = $ac_status" >&5
+  echo "$as_me:7777: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_intl=yes
@@ -7827,7 +7788,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lintl  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 7830 "configure"
+#line 7791 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -7847,16 +7808,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7850: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7811: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7853: \$? = $ac_status" >&5
+  echo "$as_me:7814: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7856: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7817: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7859: \$? = $ac_status" >&5
+  echo "$as_me:7820: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_intl=yes
@@ -7873,9 +7834,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for intl library" 1>&6
 
-echo "${as_me:-configure}:7876: testing find linkage for intl library ..." 1>&5
+echo "${as_me:-configure}:7837: testing find linkage for intl library ..." 1>&5
 
-echo "${as_me:-configure}:7878: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me:-configure}:7839: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -7988,11 +7949,11 @@ cf_search="$cf_search $cf_header_path_list"
       if test -d $cf_cv_header_path_intl ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_intl" 1>&6
 
-echo "${as_me:-configure}:7991: testing ... testing $cf_cv_header_path_intl ..." 1>&5
+echo "${as_me:-configure}:7952: testing ... testing $cf_cv_header_path_intl ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_intl"
         cat >conftest.$ac_ext <<_ACEOF
-#line 7995 "configure"
+#line 7956 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -8012,21 +7973,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8015: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7976: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8018: \$? = $ac_status" >&5
+  echo "$as_me:7979: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8021: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7982: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8024: \$? = $ac_status" >&5
+  echo "$as_me:7985: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found intl headers in $cf_cv_header_path_intl" 1>&6
 
-echo "${as_me:-configure}:8029: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5
+echo "${as_me:-configure}:7990: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5
 
             cf_cv_find_linkage_intl=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -8044,7 +8005,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_intl" = maybe ; then
 
-echo "${as_me:-configure}:8047: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me:-configure}:8008: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -8141,13 +8102,13 @@ cf_search="$cf_library_path_list $cf_search"
           if test -d $cf_cv_library_path_intl ; then
             test -n "$verbose" && echo "	... testing $cf_cv_library_path_intl" 1>&6
 
-echo "${as_me:-configure}:8144: testing ... testing $cf_cv_library_path_intl ..." 1>&5
+echo "${as_me:-configure}:8105: testing ... testing $cf_cv_library_path_intl ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-lintl  $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_intl"
             cat >conftest.$ac_ext <<_ACEOF
-#line 8150 "configure"
+#line 8111 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -8167,21 +8128,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8170: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8131: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8173: \$? = $ac_status" >&5
+  echo "$as_me:8134: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8176: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8137: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8179: \$? = $ac_status" >&5
+  echo "$as_me:8140: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
                 test -n "$verbose" && echo "	... found intl library in $cf_cv_library_path_intl" 1>&6
 
-echo "${as_me:-configure}:8184: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5
+echo "${as_me:-configure}:8145: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5
 
                 cf_cv_find_linkage_intl=yes
                 cf_cv_library_file_intl="-lintl"
@@ -8221,12 +8182,13 @@ cf_cv_func_gettext=no
 fi
 
 fi
-echo "$as_me:8224: result: $cf_cv_func_gettext" >&5
+echo "$as_me:8185: result: $cf_cv_func_gettext" >&5
 echo "${ECHO_T}$cf_cv_func_gettext" >&6
       LIBS="$cf_save_LIBS_1"
 
       if test "$cf_cv_func_gettext" = yes ; then
-        cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define HAVE_LIBINTL_H 1
 EOF
 
@@ -8260,7 +8222,7 @@ if test -n "$cf_cv_header_path_intl" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 8263 "configure"
+#line 8225 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8272,16 +8234,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8275: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8237: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8278: \$? = $ac_status" >&5
+  echo "$as_me:8240: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8281: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8243: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8284: \$? = $ac_status" >&5
+  echo "$as_me:8246: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -8298,7 +8260,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}:8301: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:8263: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -8335,7 +8297,7 @@ if test -n "$cf_cv_library_path_intl" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:8338: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:8300: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         INTLLIBS="-L$cf_add_libdir $INTLLIBS"
       fi
@@ -8351,13 +8313,13 @@ fi
 for ac_func in dcgettext
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8354: checking for $ac_func" >&5
+echo "$as_me:8316: 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 8360 "configure"
+#line 8322 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -8388,16 +8350,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8391: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8353: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8394: \$? = $ac_status" >&5
+  echo "$as_me:8356: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8397: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8359: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8400: \$? = $ac_status" >&5
+  echo "$as_me:8362: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -8407,7 +8369,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8410: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:8372: 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
@@ -8422,7 +8384,7 @@ done
                     # Extract the first word of "msgfmt", so it can be a program name with args.
 
 set dummy msgfmt; ac_word=$2
-echo "$as_me:8425: checking for $ac_word" >&5
+echo "$as_me:8387: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_MSGFMT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8449,16 +8411,16 @@ esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != ":"; then
-  echo "$as_me:8452: result: $MSGFMT" >&5
+  echo "$as_me:8414: result: $MSGFMT" >&5
 echo "${ECHO_T}$MSGFMT" >&6
 else
-  echo "$as_me:8455: result: no" >&5
+  echo "$as_me:8417: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
           # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
-echo "$as_me:8461: checking for $ac_word" >&5
+echo "$as_me:8423: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_GMSGFMT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8475,7 +8437,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_GMSGFMT="$ac_dir/$ac_word"
-   echo "$as_me:8478: found $ac_dir/$ac_word" >&5
+   echo "$as_me:8440: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -8487,17 +8449,17 @@ fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 
 if test -n "$GMSGFMT"; then
-  echo "$as_me:8490: result: $GMSGFMT" >&5
+  echo "$as_me:8452: result: $GMSGFMT" >&5
 echo "${ECHO_T}$GMSGFMT" >&6
 else
-  echo "$as_me:8493: result: no" >&5
+  echo "$as_me:8455: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
                     # Extract the first word of "xgettext", so it can be a program name with args.
 
 set dummy xgettext; ac_word=$2
-echo "$as_me:8500: checking for $ac_word" >&5
+echo "$as_me:8462: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_XGETTEXT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8524,10 +8486,10 @@ esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
-  echo "$as_me:8527: result: $XGETTEXT" >&5
+  echo "$as_me:8489: result: $XGETTEXT" >&5
 echo "${ECHO_T}$XGETTEXT" >&6
 else
-  echo "$as_me:8530: result: no" >&5
+  echo "$as_me:8492: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8542,7 +8504,7 @@ fi
 
     if test "$nls_cv_use_gnu_gettext" = "yes"; then
       if test ! -d $srcdir/intl ; then
-        { { echo "$as_me:8545: error: no NLS library is packaged with this application" >&5
+        { { echo "$as_me:8507: error: no NLS library is packaged with this application" >&5
 echo "$as_me: error: no NLS library is packaged with this application" >&2;}
    { (exit 1); exit 1; }; }
       fi
@@ -8550,7 +8512,7 @@ echo "$as_me: error: no NLS library is packaged with this application" >&2;}
       # Extract the first word of "msgfmt", so it can be a program name with args.
 
 set dummy msgfmt; ac_word=$2
-echo "$as_me:8553: checking for $ac_word" >&5
+echo "$as_me:8515: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_MSGFMT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8577,16 +8539,16 @@ esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != ":"; then
-  echo "$as_me:8580: result: $MSGFMT" >&5
+  echo "$as_me:8542: result: $MSGFMT" >&5
 echo "${ECHO_T}$MSGFMT" >&6
 else
-  echo "$as_me:8583: result: no" >&5
+  echo "$as_me:8545: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
       # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
-echo "$as_me:8589: checking for $ac_word" >&5
+echo "$as_me:8551: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_GMSGFMT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8603,7 +8565,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_GMSGFMT="$ac_dir/$ac_word"
-   echo "$as_me:8606: found $ac_dir/$ac_word" >&5
+   echo "$as_me:8568: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -8615,17 +8577,17 @@ fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 
 if test -n "$GMSGFMT"; then
-  echo "$as_me:8618: result: $GMSGFMT" >&5
+  echo "$as_me:8580: result: $GMSGFMT" >&5
 echo "${ECHO_T}$GMSGFMT" >&6
 else
-  echo "$as_me:8621: result: no" >&5
+  echo "$as_me:8583: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
       # Extract the first word of "xgettext", so it can be a program name with args.
 
 set dummy xgettext; ac_word=$2
-echo "$as_me:8628: checking for $ac_word" >&5
+echo "$as_me:8590: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_XGETTEXT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8652,10 +8614,10 @@ esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
-  echo "$as_me:8655: result: $XGETTEXT" >&5
+  echo "$as_me:8617: result: $XGETTEXT" >&5
 echo "${ECHO_T}$XGETTEXT" >&6
 else
-  echo "$as_me:8658: result: no" >&5
+  echo "$as_me:8620: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8670,7 +8632,7 @@ fi
                   if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then
         : ;
       else
-        echo "$as_me:8673: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
+        echo "$as_me:8635: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
 echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6
         GMSGFMT=":"
       fi
@@ -8680,7 +8642,7 @@ echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6
                       if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then
         : ;
       else
-        echo "$as_me:8683: result: found xgettext program is not GNU xgettext; ignore it" >&5
+        echo "$as_me:8645: result: found xgettext program is not GNU xgettext; ignore it" >&5
 echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6
         XGETTEXT=":"
       fi
@@ -8700,7 +8662,7 @@ echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6
 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:8703: checking for $ac_word" >&5
+echo "$as_me:8665: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_INTLBISON+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8715,7 +8677,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_INTLBISON="$ac_prog"
-echo "$as_me:8718: found $ac_dir/$ac_word" >&5
+echo "$as_me:8680: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -8723,10 +8685,10 @@ fi
 fi
 INTLBISON=$ac_cv_prog_INTLBISON
 if test -n "$INTLBISON"; then
-  echo "$as_me:8726: result: $INTLBISON" >&5
+  echo "$as_me:8688: result: $INTLBISON" >&5
 echo "${ECHO_T}$INTLBISON" >&6
 else
-  echo "$as_me:8729: result: no" >&5
+  echo "$as_me:8691: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8736,7 +8698,7 @@ done
     if test -z "$INTLBISON"; then
       ac_verc_fail=yes
     else
-            echo "$as_me:8739: checking version of bison" >&5
+            echo "$as_me:8701: checking version of bison" >&5
 echo $ECHO_N "checking version of bison... $ECHO_C" >&6
       ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
       case $ac_prog_version in
@@ -8745,7 +8707,7 @@ echo $ECHO_N "checking version of bison... $ECHO_C" >&6
            ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
         *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
       esac
-    echo "$as_me:8748: result: $ac_prog_version" >&5
+    echo "$as_me:8710: result: $ac_prog_version" >&5
 echo "${ECHO_T}$ac_prog_version" >&6
     fi
     if test $ac_verc_fail = yes; then
@@ -8771,7 +8733,7 @@ echo "${ECHO_T}$ac_prog_version" >&6
      if test "x$ALL_LINGUAS" = "x"; then
        LINGUAS=
      else
-       echo "$as_me:8774: checking for catalogs to be installed" >&5
+       echo "$as_me:8736: checking for catalogs to be installed" >&5
 echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
        NEW_LINGUAS=
        for presentlang in $ALL_LINGUAS; do
@@ -8791,7 +8753,7 @@ echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
          fi
        done
        LINGUAS=$NEW_LINGUAS
-       echo "$as_me:8794: result: $LINGUAS" >&5
+       echo "$as_me:8756: result: $LINGUAS" >&5
 echo "${ECHO_T}$LINGUAS" >&6
      fi
 
@@ -8811,7 +8773,8 @@ if test "${with_textdomain+set}" = set; then
 else
   NLS_TEXTDOMAIN=$PACKAGE
 fi;
-	cat >>confdefs.h <<EOF
+
+cat >>confdefs.h <<EOF
 #define NLS_TEXTDOMAIN "$NLS_TEXTDOMAIN"
 EOF
 
@@ -8826,7 +8789,7 @@ cf_makefile=makefile
 use_our_messages=no
 if test "$USE_NLS" = yes ; then
 if test -d $srcdir/po ; then
-echo "$as_me:8829: checking if we should use included message-library" >&5
+echo "$as_me:8792: checking if we should use included message-library" >&5
 echo $ECHO_N "checking if we should use included message-library... $ECHO_C" >&6
 
 # Check whether --enable-included-msgs or --disable-included-msgs was given.
@@ -8837,7 +8800,7 @@ else
   use_our_messages=yes
 fi;
 fi
-echo "$as_me:8840: result: $use_our_messages" >&5
+echo "$as_me:8803: result: $use_our_messages" >&5
 echo "${ECHO_T}$use_our_messages" >&6
 fi
 
@@ -8857,7 +8820,8 @@ if test "$USE_INCLUDED_LIBINTL" = yes ; then
 		INTLDIR_MAKE="#"
 	fi
 	if test -z "$INTLDIR_MAKE"; then
-		cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define HAVE_LIBGETTEXT_H 1
 EOF
 
@@ -8878,23 +8842,23 @@ else
 for ac_header in libintl.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:8881: checking for $ac_header" >&5
+echo "$as_me:8845: 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 8887 "configure"
+#line 8851 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8891: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:8855: \"$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:8897: \$? = $ac_status" >&5
+  echo "$as_me:8861: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8913,7 +8877,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:8916: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:8880: 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
@@ -8940,18 +8904,21 @@ fi
 
 if test "$USE_INCLUDED_LIBINTL" = yes ; then
 	if test "$nls_cv_force_use_gnu_gettext" = yes ; then
-		cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define HAVE_GETTEXT 1
 EOF
 
 	elif test "$nls_cv_use_gnu_gettext" = yes ; then
-		cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define HAVE_GETTEXT 1
 EOF
 
 	fi
 	if test -n "$nls_cv_header_intl" ; then
-		cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define HAVE_LIBINTL_H 1
 EOF
 
@@ -8996,16 +8963,16 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:8999: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:8966: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
 esac
 
 fi
-NLS_DATADIR="$withval"
+eval NLS_DATADIR="$withval"
 
-echo "$as_me:9008: checking if you want full utility pathnames" >&5
+echo "$as_me:8975: checking if you want full utility pathnames" >&5
 echo $ECHO_N "checking if you want full utility pathnames... $ECHO_C" >&6
 
 # Check whether --enable-full-paths or --disable-full-paths was given.
@@ -9022,13 +8989,14 @@ else
   with_full_paths=yes
 
 fi;
-echo "$as_me:9025: result: $with_full_paths" >&5
+echo "$as_me:8992: result: $with_full_paths" >&5
 echo "${ECHO_T}$with_full_paths" >&6
-test $with_full_paths = no && cat >>confdefs.h <<\EOF
+test $with_full_paths = no &&
+cat >>confdefs.h <<\EOF
 #define USE_EXECVP 1
 EOF
 
-echo "$as_me:9031: checking for system mailer" >&5
+echo "$as_me:8999: checking for system mailer" >&5
 echo $ECHO_N "checking for system mailer... $ECHO_C" >&6
 if test "${cf_cv_SYSTEM_MAIL+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9048,13 +9016,14 @@ else
 
 fi
 
-echo "$as_me:9051: result: $cf_cv_SYSTEM_MAIL" >&5
+echo "$as_me:9019: result: $cf_cv_SYSTEM_MAIL" >&5
 echo "${ECHO_T}$cf_cv_SYSTEM_MAIL" >&6
+
 cat >>confdefs.h <<EOF
 #define SYSTEM_MAIL "$cf_cv_SYSTEM_MAIL"
 EOF
 
-echo "$as_me:9057: checking system mail flags" >&5
+echo "$as_me:9026: checking system mail flags" >&5
 echo $ECHO_N "checking system mail flags... $ECHO_C" >&6
 if test "${cf_cv_system_mail_flags+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9070,8 +9039,9 @@ else
 
 fi
 
-echo "$as_me:9073: result: $cf_cv_system_mail_flags" >&5
+echo "$as_me:9042: result: $cf_cv_system_mail_flags" >&5
 echo "${ECHO_T}$cf_cv_system_mail_flags" >&6
+
 cat >>confdefs.h <<EOF
 #define SYSTEM_MAIL_FLAGS "$cf_cv_system_mail_flags"
 EOF
@@ -9120,14 +9090,14 @@ irix[56].*) #(vi
 	;;
 linux*|gnu*|mint*|k*bsd*-gnu) #(vi
 
-echo "$as_me:9123: checking if we must define _GNU_SOURCE" >&5
+echo "$as_me:9093: checking if we must define _GNU_SOURCE" >&5
 echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_gnu_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 9130 "configure"
+#line 9100 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -9142,16 +9112,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9145: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9115: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9148: \$? = $ac_status" >&5
+  echo "$as_me:9118: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9151: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9121: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9154: \$? = $ac_status" >&5
+  echo "$as_me:9124: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_gnu_source=no
 else
@@ -9160,7 +9130,7 @@ cat conftest.$ac_ext >&5
 cf_save="$CPPFLAGS"
 	 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 9163 "configure"
+#line 9133 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -9175,16 +9145,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9178: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9148: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9181: \$? = $ac_status" >&5
+  echo "$as_me:9151: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9184: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9154: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9187: \$? = $ac_status" >&5
+  echo "$as_me:9157: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_gnu_source=no
 else
@@ -9199,7 +9169,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:9202: result: $cf_cv_gnu_source" >&5
+echo "$as_me:9172: result: $cf_cv_gnu_source" >&5
 echo "${ECHO_T}$cf_cv_gnu_source" >&6
 test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
 
@@ -9221,16 +9191,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:9224: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:9194: checking if we should define _POSIX_C_SOURCE" >&5
 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_posix_c_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-echo "${as_me:-configure}:9230: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:9200: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 9233 "configure"
+#line 9203 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -9245,16 +9215,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9248: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9218: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9251: \$? = $ac_status" >&5
+  echo "$as_me:9221: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9254: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9224: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9257: \$? = $ac_status" >&5
+  echo "$as_me:9227: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -9275,7 +9245,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >conftest.$ac_ext <<_ACEOF
-#line 9278 "configure"
+#line 9248 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -9290,16 +9260,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9293: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9263: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9296: \$? = $ac_status" >&5
+  echo "$as_me:9266: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9299: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9269: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9302: \$? = $ac_status" >&5
+  echo "$as_me:9272: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9310,15 +9280,15 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 	 fi
 
-echo "${as_me:-configure}:9313: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:9283: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:9318: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:9288: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 9321 "configure"
+#line 9291 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -9333,16 +9303,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9336: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9306: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9339: \$? = $ac_status" >&5
+  echo "$as_me:9309: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9342: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9312: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9345: \$? = $ac_status" >&5
+  echo "$as_me:9315: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9358,7 +9328,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:9361: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:9331: result: $cf_cv_posix_c_source" >&5
 echo "${ECHO_T}$cf_cv_posix_c_source" >&6
 
 if test "$cf_cv_posix_c_source" != no ; then
@@ -9471,14 +9441,14 @@ solaris2.*) #(vi
 	;;
 *)
 
-echo "$as_me:9474: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:9444: checking if we should define _XOPEN_SOURCE" >&5
 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_xopen_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 9481 "configure"
+#line 9451 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -9497,16 +9467,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9500: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9470: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9503: \$? = $ac_status" >&5
+  echo "$as_me:9473: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9506: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9476: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9509: \$? = $ac_status" >&5
+  echo "$as_me:9479: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
@@ -9515,7 +9485,7 @@ cat conftest.$ac_ext >&5
 cf_save="$CPPFLAGS"
 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 9518 "configure"
+#line 9488 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -9534,16 +9504,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9537: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9507: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9540: \$? = $ac_status" >&5
+  echo "$as_me:9510: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9543: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9513: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9546: \$? = $ac_status" >&5
+  echo "$as_me:9516: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
@@ -9558,7 +9528,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:9561: result: $cf_cv_xopen_source" >&5
+echo "$as_me:9531: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -9666,16 +9636,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:9669: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:9639: checking if we should define _POSIX_C_SOURCE" >&5
 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_posix_c_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-echo "${as_me:-configure}:9675: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:9645: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 9678 "configure"
+#line 9648 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -9690,16 +9660,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9693: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9663: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9696: \$? = $ac_status" >&5
+  echo "$as_me:9666: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9699: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9669: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9702: \$? = $ac_status" >&5
+  echo "$as_me:9672: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -9720,7 +9690,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >conftest.$ac_ext <<_ACEOF
-#line 9723 "configure"
+#line 9693 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -9735,16 +9705,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9738: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9708: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9741: \$? = $ac_status" >&5
+  echo "$as_me:9711: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9744: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9714: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9747: \$? = $ac_status" >&5
+  echo "$as_me:9717: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9755,15 +9725,15 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 	 fi
 
-echo "${as_me:-configure}:9758: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:9728: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:9763: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:9733: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 9766 "configure"
+#line 9736 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -9778,16 +9748,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9781: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9751: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9784: \$? = $ac_status" >&5
+  echo "$as_me:9754: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9787: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9757: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9790: \$? = $ac_status" >&5
+  echo "$as_me:9760: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9803,7 +9773,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:9806: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:9776: result: $cf_cv_posix_c_source" >&5
 echo "${ECHO_T}$cf_cv_posix_c_source" >&6
 
 if test "$cf_cv_posix_c_source" != no ; then
@@ -9976,10 +9946,10 @@ fi
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-	echo "$as_me:9979: checking if _XOPEN_SOURCE really is set" >&5
+	echo "$as_me:9949: checking if _XOPEN_SOURCE really is set" >&5
 echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6
 	cat >conftest.$ac_ext <<_ACEOF
-#line 9982 "configure"
+#line 9952 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -9994,16 +9964,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9997: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9967: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10000: \$? = $ac_status" >&5
+  echo "$as_me:9970: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10003: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9973: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10006: \$? = $ac_status" >&5
+  echo "$as_me:9976: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else
@@ -10012,12 +9982,12 @@ cat conftest.$ac_ext >&5
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-	echo "$as_me:10015: result: $cf_XOPEN_SOURCE_set" >&5
+	echo "$as_me:9985: result: $cf_XOPEN_SOURCE_set" >&5
 echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6
 	if test $cf_XOPEN_SOURCE_set = yes
 	then
 		cat >conftest.$ac_ext <<_ACEOF
-#line 10020 "configure"
+#line 9990 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -10032,16 +10002,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10035: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10005: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10038: \$? = $ac_status" >&5
+  echo "$as_me:10008: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10041: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10011: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10044: \$? = $ac_status" >&5
+  echo "$as_me:10014: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_XOPEN_SOURCE_set_ok=yes
 else
@@ -10052,19 +10022,19 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 		if test $cf_XOPEN_SOURCE_set_ok = no
 		then
-			{ echo "$as_me:10055: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+			{ echo "$as_me:10025: WARNING: _XOPEN_SOURCE is lower than requested" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
 		fi
 	else
 
-echo "$as_me:10060: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:10030: checking if we should define _XOPEN_SOURCE" >&5
 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_xopen_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 10067 "configure"
+#line 10037 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -10083,16 +10053,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10086: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10056: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10089: \$? = $ac_status" >&5
+  echo "$as_me:10059: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10092: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10062: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10095: \$? = $ac_status" >&5
+  echo "$as_me:10065: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
@@ -10101,7 +10071,7 @@ cat conftest.$ac_ext >&5
 cf_save="$CPPFLAGS"
 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 10104 "configure"
+#line 10074 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -10120,16 +10090,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10123: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10093: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10126: \$? = $ac_status" >&5
+  echo "$as_me:10096: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10129: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10099: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10132: \$? = $ac_status" >&5
+  echo "$as_me:10102: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
@@ -10144,7 +10114,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:10147: result: $cf_cv_xopen_source" >&5
+echo "$as_me:10117: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -10242,14 +10212,14 @@ fi
 	fi
 fi
 
-echo "$as_me:10245: checking if SIGWINCH is defined" >&5
+echo "$as_me:10215: checking if SIGWINCH is defined" >&5
 echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6
 if test "${cf_cv_define_sigwinch+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 10252 "configure"
+#line 10222 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -10264,23 +10234,23 @@ int x = SIGWINCH
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10267: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10237: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10270: \$? = $ac_status" >&5
+  echo "$as_me:10240: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10273: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10243: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10276: \$? = $ac_status" >&5
+  echo "$as_me:10246: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_define_sigwinch=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 10283 "configure"
+#line 10253 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -10298,16 +10268,16 @@ int x = SIGWINCH
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10301: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10271: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10304: \$? = $ac_status" >&5
+  echo "$as_me:10274: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10307: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10277: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10310: \$? = $ac_status" >&5
+  echo "$as_me:10280: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_define_sigwinch=maybe
 else
@@ -10321,11 +10291,11 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:10324: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:10294: result: $cf_cv_define_sigwinch" >&5
 echo "${ECHO_T}$cf_cv_define_sigwinch" >&6
 
 if test "$cf_cv_define_sigwinch" = maybe ; then
-echo "$as_me:10328: checking for actual SIGWINCH definition" >&5
+echo "$as_me:10298: checking for actual SIGWINCH definition" >&5
 echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6
 if test "${cf_cv_fixup_sigwinch+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10336,7 +10306,7 @@ cf_sigwinch=32
 while test $cf_sigwinch != 1
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 10339 "configure"
+#line 10309 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -10358,16 +10328,16 @@ int x = SIGWINCH
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10361: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10331: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10364: \$? = $ac_status" >&5
+  echo "$as_me:10334: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10367: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10337: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10370: \$? = $ac_status" >&5
+  echo "$as_me:10340: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fixup_sigwinch=$cf_sigwinch
 	 break
@@ -10381,7 +10351,7 @@ cf_sigwinch=`expr $cf_sigwinch - 1`
 done
 
 fi
-echo "$as_me:10384: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:10354: result: $cf_cv_fixup_sigwinch" >&5
 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
 
 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
@@ -10393,7 +10363,7 @@ if test -n "$TRY_CFLAGS" ; then
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:10396: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:10366: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -10464,7 +10434,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}:10467: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:10437: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	CFLAGS="$CFLAGS $cf_new_cflags"
 fi
@@ -10472,7 +10442,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}:10475: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:10445: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
 fi
@@ -10480,14 +10450,14 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:10483: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:10453: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
 
 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
 fi
 
 if test "$cf_check_cflags" != "$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 10490 "configure"
+#line 10460 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10499,16 +10469,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10502: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10472: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10505: \$? = $ac_status" >&5
+  echo "$as_me:10475: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10508: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10478: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10511: \$? = $ac_status" >&5
+  echo "$as_me:10481: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -10516,12 +10486,12 @@ else
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:10519: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:10489: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
 
 	 if test "$cf_check_cppflags" != "$CPPFLAGS" ; then
 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:10524: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:10494: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_flags"
@@ -10533,7 +10503,7 @@ fi
 
 ### Look for network libraries first, since some functions (such as gethostname)
 ### are used in a lot of places.
-echo "$as_me:10536: checking if you want NSS compatible SSL libraries" >&5
+echo "$as_me:10506: checking if you want NSS compatible SSL libraries" >&5
 echo $ECHO_N "checking if you want NSS compatible SSL libraries... $ECHO_C" >&6
 if test "${cf_cv_use_libnss_compat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10548,10 +10518,10 @@ else
 fi;
 
 fi
-echo "$as_me:10551: result: $cf_cv_use_libnss_compat" >&5
+echo "$as_me:10521: result: $cf_cv_use_libnss_compat" >&5
 echo "${ECHO_T}$cf_cv_use_libnss_compat" >&6
 
-echo "$as_me:10554: checking if you want ssl library" >&5
+echo "$as_me:10524: checking if you want ssl library" >&5
 echo $ECHO_N "checking if you want ssl library... $ECHO_C" >&6
 if test "${cf_cv_use_libssl+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10566,10 +10536,10 @@ else
 fi;
 
 fi
-echo "$as_me:10569: result: $cf_cv_use_libssl" >&5
+echo "$as_me:10539: result: $cf_cv_use_libssl" >&5
 echo "${ECHO_T}$cf_cv_use_libssl" >&6
 
-echo "$as_me:10572: checking if you want gnutls support" >&5
+echo "$as_me:10542: checking if you want gnutls support" >&5
 echo $ECHO_N "checking if you want gnutls support... $ECHO_C" >&6
 if test "${cf_cv_use_libgnutls+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10584,11 +10554,11 @@ else
 fi;
 
 fi
-echo "$as_me:10587: result: $cf_cv_use_libgnutls" >&5
+echo "$as_me:10557: result: $cf_cv_use_libgnutls" >&5
 echo "${ECHO_T}$cf_cv_use_libgnutls" >&6
 
 # this option is mainly for comparing with/without Lynx's wrapper for GNUTLS.
-echo "$as_me:10591: checking if you want gnutls-openssl compat" >&5
+echo "$as_me:10561: checking if you want gnutls-openssl compat" >&5
 echo $ECHO_N "checking if you want gnutls-openssl compat... $ECHO_C" >&6
 if test "${cf_cv_gnutls_compat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10603,10 +10573,10 @@ else
 fi;
 
 fi
-echo "$as_me:10606: result: $cf_cv_gnutls_compat" >&5
+echo "$as_me:10576: result: $cf_cv_gnutls_compat" >&5
 echo "${ECHO_T}$cf_cv_gnutls_compat" >&6
 
-echo "$as_me:10609: checking if you want socks library" >&5
+echo "$as_me:10579: checking if you want socks library" >&5
 echo $ECHO_N "checking if you want socks library... $ECHO_C" >&6
 if test "${cf_cv_use_libsocks+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10621,10 +10591,10 @@ else
 fi;
 
 fi
-echo "$as_me:10624: result: $cf_cv_use_libsocks" >&5
+echo "$as_me:10594: result: $cf_cv_use_libsocks" >&5
 echo "${ECHO_T}$cf_cv_use_libsocks" >&6
 
-echo "$as_me:10627: checking if you want socks5 library" >&5
+echo "$as_me:10597: checking if you want socks5 library" >&5
 echo $ECHO_N "checking if you want socks5 library... $ECHO_C" >&6
 if test "${cf_cv_use_libsocks5+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10639,7 +10609,7 @@ else
 fi;
 
 fi
-echo "$as_me:10642: result: $cf_cv_use_libsocks5" >&5
+echo "$as_me:10612: result: $cf_cv_use_libsocks5" >&5
 echo "${ECHO_T}$cf_cv_use_libsocks5" >&6
 
 if test "x$cf_cv_use_libsocks" != xno ; then
@@ -10678,7 +10648,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 10681 "configure"
+#line 10651 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10690,16 +10660,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10693: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10663: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10696: \$? = $ac_status" >&5
+  echo "$as_me:10666: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10699: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10669: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10702: \$? = $ac_status" >&5
+  echo "$as_me:10672: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -10716,7 +10686,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}:10719: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:10689: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -10757,7 +10727,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 10760 "configure"
+#line 10730 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10769,16 +10739,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10772: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10742: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10775: \$? = $ac_status" >&5
+  echo "$as_me:10745: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10778: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10748: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10781: \$? = $ac_status" >&5
+  echo "$as_me:10751: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -10795,7 +10765,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}:10798: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:10768: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -10811,7 +10781,7 @@ echo "${as_me:-configure}:10798: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:10814: error: cannot find socks library under $cf_cv_use_libsocks" >&5
+{ { echo "$as_me:10784: error: cannot find socks library under $cf_cv_use_libsocks" >&5
 echo "$as_me: error: cannot find socks library under $cf_cv_use_libsocks" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -10836,7 +10806,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}:10839: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:10809: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -10865,7 +10835,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}:10868: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:10838: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -10874,7 +10844,7 @@ echo "${as_me:-configure}:10868: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:10877: error: cannot find socks library under $cf_cv_use_libsocks" >&5
+{ { echo "$as_me:10847: error: cannot find socks library under $cf_cv_use_libsocks" >&5
 echo "$as_me: error: cannot find socks library under $cf_cv_use_libsocks" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -10888,12 +10858,12 @@ done
 cf_cv_header_path_socks=
 cf_cv_library_path_socks=
 
-echo "${as_me:-configure}:10891: testing Starting FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me:-configure}:10861: testing Starting FIND_LINKAGE(socks,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 10896 "configure"
+#line 10866 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -10909,16 +10879,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10912: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10882: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10915: \$? = $ac_status" >&5
+  echo "$as_me:10885: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10918: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10888: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10921: \$? = $ac_status" >&5
+  echo "$as_me:10891: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_socks=yes
@@ -10932,7 +10902,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lsocks  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 10935 "configure"
+#line 10905 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -10948,16 +10918,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10951: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10921: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10954: \$? = $ac_status" >&5
+  echo "$as_me:10924: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10957: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10927: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10960: \$? = $ac_status" >&5
+  echo "$as_me:10930: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_socks=yes
@@ -10974,9 +10944,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for socks library" 1>&6
 
-echo "${as_me:-configure}:10977: testing find linkage for socks library ..." 1>&5
+echo "${as_me:-configure}:10947: testing find linkage for socks library ..." 1>&5
 
-echo "${as_me:-configure}:10979: testing Searching for headers in FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me:-configure}:10949: testing Searching for headers in FIND_LINKAGE(socks,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -11089,11 +11059,11 @@ cf_search="$cf_search $cf_header_path_list"
       if test -d $cf_cv_header_path_socks ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_socks" 1>&6
 
-echo "${as_me:-configure}:11092: testing ... testing $cf_cv_header_path_socks ..." 1>&5
+echo "${as_me:-configure}:11062: testing ... testing $cf_cv_header_path_socks ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_socks"
         cat >conftest.$ac_ext <<_ACEOF
-#line 11096 "configure"
+#line 11066 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -11109,21 +11079,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11112: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11082: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11115: \$? = $ac_status" >&5
+  echo "$as_me:11085: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11118: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11088: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11121: \$? = $ac_status" >&5
+  echo "$as_me:11091: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found socks headers in $cf_cv_header_path_socks" 1>&6
 
-echo "${as_me:-configure}:11126: testing ... found socks headers in $cf_cv_header_path_socks ..." 1>&5
+echo "${as_me:-configure}:11096: testing ... found socks headers in $cf_cv_header_path_socks ..." 1>&5
 
             cf_cv_find_linkage_socks=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -11141,7 +11111,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_socks" = maybe ; then
 
-echo "${as_me:-configure}:11144: testing Searching for socks library in FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me:-configure}:11114: testing Searching for socks library in FIND_LINKAGE(socks,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -11238,13 +11208,13 @@ cf_search="$cf_library_path_list $cf_search"
           if test -d $cf_cv_library_path_socks ; then
             test -n "$verbose" && echo "	... testing $cf_cv_library_path_socks" 1>&6
 
-echo "${as_me:-configure}:11241: testing ... testing $cf_cv_library_path_socks ..." 1>&5
+echo "${as_me:-configure}:11211: testing ... testing $cf_cv_library_path_socks ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-lsocks  $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_socks"
             cat >conftest.$ac_ext <<_ACEOF
-#line 11247 "configure"
+#line 11217 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -11260,21 +11230,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11263: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11233: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11266: \$? = $ac_status" >&5
+  echo "$as_me:11236: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11269: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11239: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11272: \$? = $ac_status" >&5
+  echo "$as_me:11242: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
                 test -n "$verbose" && echo "	... found socks library in $cf_cv_library_path_socks" 1>&6
 
-echo "${as_me:-configure}:11277: testing ... found socks library in $cf_cv_library_path_socks ..." 1>&5
+echo "${as_me:-configure}:11247: testing ... found socks library in $cf_cv_library_path_socks ..." 1>&5
 
                 cf_cv_find_linkage_socks=yes
                 cf_cv_library_file_socks="-lsocks"
@@ -11333,7 +11303,7 @@ if test -n "$cf_cv_header_path_socks" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 11336 "configure"
+#line 11306 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11345,16 +11315,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11348: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11318: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11351: \$? = $ac_status" >&5
+  echo "$as_me:11321: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11354: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11324: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11357: \$? = $ac_status" >&5
+  echo "$as_me:11327: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11371,7 +11341,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}:11374: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11344: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -11405,7 +11375,7 @@ if test -n "$cf_cv_library_path_socks" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:11408: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:11378: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -11416,49 +11386,50 @@ fi
 	LIBS="-lsocks $LIBS"
 
 else
-{ echo "$as_me:11419: WARNING: Cannot find socks library" >&5
+{ echo "$as_me:11389: WARNING: Cannot find socks library" >&5
 echo "$as_me: WARNING: Cannot find socks library" >&2;}
 fi
 
   if test "x$cf_cv_find_linkage_socks" = "xyes" ; then
-    cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define SOCKS 1
 EOF
 
-    cat >>confdefs.h <<\EOF
+cat >>confdefs.h <<\EOF
 #define accept Raccept
 EOF
 
-    cat >>confdefs.h <<\EOF
+cat >>confdefs.h <<\EOF
 #define bind Rbind
 EOF
 
-    cat >>confdefs.h <<\EOF
+cat >>confdefs.h <<\EOF
 #define connect Rconnect
 EOF
 
-    cat >>confdefs.h <<\EOF
+cat >>confdefs.h <<\EOF
 #define getpeername Rgetpeername
 EOF
 
-    cat >>confdefs.h <<\EOF
+cat >>confdefs.h <<\EOF
 #define getsockname Rgetsockname
 EOF
 
-    cat >>confdefs.h <<\EOF
+cat >>confdefs.h <<\EOF
 #define listen Rlisten
 EOF
 
-    cat >>confdefs.h <<\EOF
+cat >>confdefs.h <<\EOF
 #define recvfrom Rrecvfrom
 EOF
 
-    cat >>confdefs.h <<\EOF
+cat >>confdefs.h <<\EOF
 #define select Rselect
 EOF
 
   else
-    { { echo "$as_me:11461: error: cannot link with socks library" >&5
+    { { echo "$as_me:11432: error: cannot link with socks library" >&5
 echo "$as_me: error: cannot link with socks library" >&2;}
    { (exit 1); exit 1; }; }
   fi
@@ -11499,7 +11470,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 11502 "configure"
+#line 11473 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11511,16 +11482,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11514: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11485: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11517: \$? = $ac_status" >&5
+  echo "$as_me:11488: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11520: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11491: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11523: \$? = $ac_status" >&5
+  echo "$as_me:11494: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11537,7 +11508,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}:11540: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11511: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -11578,7 +11549,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 11581 "configure"
+#line 11552 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11590,16 +11561,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11593: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11564: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11596: \$? = $ac_status" >&5
+  echo "$as_me:11567: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11599: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11570: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11602: \$? = $ac_status" >&5
+  echo "$as_me:11573: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11616,7 +11587,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}:11619: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11590: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -11632,7 +11603,7 @@ echo "${as_me:-configure}:11619: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:11635: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5
+{ { echo "$as_me:11606: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5
 echo "$as_me: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -11657,7 +11628,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}:11660: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:11631: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -11686,7 +11657,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}:11689: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:11660: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -11695,7 +11666,7 @@ echo "${as_me:-configure}:11689: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:11698: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5
+{ { echo "$as_me:11669: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5
 echo "$as_me: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -11714,11 +11685,11 @@ cat >>confdefs.h <<\EOF
 #define SOCKS 1
 EOF
 
-echo "$as_me:11717: checking if the socks library uses socks4 prefix" >&5
+echo "$as_me:11688: checking if the socks library uses socks4 prefix" >&5
 echo $ECHO_N "checking if the socks library uses socks4 prefix... $ECHO_C" >&6
 cf_use_socks4=error
 cat >conftest.$ac_ext <<_ACEOF
-#line 11721 "configure"
+#line 11692 "configure"
 #include "confdefs.h"
 
 #include <socks.h>
@@ -11732,18 +11703,19 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11735: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11706: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11738: \$? = $ac_status" >&5
+  echo "$as_me:11709: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11741: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11712: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11744: \$? = $ac_status" >&5
+  echo "$as_me:11715: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define USE_SOCKS4_PREFIX 1
 EOF
 
@@ -11752,7 +11724,7 @@ else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 11755 "configure"
+#line 11727 "configure"
 #include "confdefs.h"
 #include <socks.h>
 int
@@ -11764,29 +11736,29 @@ SOCKSinit((char *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11767: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11739: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11770: \$? = $ac_status" >&5
+  echo "$as_me:11742: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11773: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11745: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11776: \$? = $ac_status" >&5
+  echo "$as_me:11748: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_use_socks4=no
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:11782: error: Cannot link with socks5 library" >&5
+{ { echo "$as_me:11754: error: Cannot link with socks5 library" >&5
 echo "$as_me: error: Cannot link with socks5 library" >&2;}
    { (exit 1); exit 1; }; }
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:11789: result: $cf_use_socks4" >&5
+echo "$as_me:11761: result: $cf_use_socks4" >&5
 echo "${ECHO_T}$cf_use_socks4" >&6
 
 if test "$cf_use_socks4" = "yes" ; then
@@ -11841,10 +11813,10 @@ EOF
 
 fi
 
-echo "$as_me:11844: checking if socks5p.h is available" >&5
+echo "$as_me:11816: checking if socks5p.h is available" >&5
 echo $ECHO_N "checking if socks5p.h is available... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 11847 "configure"
+#line 11819 "configure"
 #include "confdefs.h"
 
 #define INCLUDE_PROTOTYPES
@@ -11859,16 +11831,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11862: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11834: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11865: \$? = $ac_status" >&5
+  echo "$as_me:11837: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11868: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11840: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11871: \$? = $ac_status" >&5
+  echo "$as_me:11843: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_use_socks5p_h=yes
 else
@@ -11877,10 +11849,11 @@ cat conftest.$ac_ext >&5
 cf_use_socks5p_h=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:11880: result: $cf_use_socks5p_h" >&5
+echo "$as_me:11852: result: $cf_use_socks5p_h" >&5
 echo "${ECHO_T}$cf_use_socks5p_h" >&6
 
-test "$cf_use_socks5p_h" = yes && cat >>confdefs.h <<\EOF
+test "$cf_use_socks5p_h" = yes &&
+cat >>confdefs.h <<\EOF
 #define INCLUDE_PROTOTYPES 1
 EOF
 
@@ -11888,14 +11861,14 @@ else
 
 cf_test_netlibs=no
 
-echo "$as_me:11891: checking for network libraries" >&5
+echo "$as_me:11864: checking for network libraries" >&5
 echo $ECHO_N "checking for network libraries... $ECHO_C" >&6
 
 if test "${cf_cv_netlibs+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-echo "$as_me:11898: result: working..." >&5
+echo "$as_me:11871: result: working..." >&5
 echo "${ECHO_T}working..." >&6
 
 cf_cv_netlibs=""
@@ -11907,23 +11880,23 @@ mingw32) # (vi
 for ac_header in windows.h winsock.h winsock2.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:11910: checking for $ac_header" >&5
+echo "$as_me:11883: 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 11916 "configure"
+#line 11889 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:11920: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:11893: \"$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:11926: \$? = $ac_status" >&5
+  echo "$as_me:11899: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11942,7 +11915,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:11945: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:11918: 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
@@ -11962,7 +11935,7 @@ done
 	LIBS="$cf_winsock_lib $LIBS"
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 11965 "configure"
+#line 11938 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_WINDOWS_H
@@ -11989,22 +11962,22 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11992: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11965: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11995: \$? = $ac_status" >&5
+  echo "$as_me:11968: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11998: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11971: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12001: \$? = $ac_status" >&5
+  echo "$as_me:11974: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_netlibs="$cf_winsock_lib $cf_cv_netlibs"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:12007: error: Cannot link against winsock library" >&5
+{ { echo "$as_me:11980: error: Cannot link against winsock library" >&5
 echo "$as_me: error: Cannot link against winsock library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -12017,13 +11990,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 for ac_func in gethostname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:12020: checking for $ac_func" >&5
+echo "$as_me:11993: 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 12026 "configure"
+#line 11999 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -12054,16 +12027,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12057: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12030: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12060: \$? = $ac_status" >&5
+  echo "$as_me:12033: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12063: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12036: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12066: \$? = $ac_status" >&5
+  echo "$as_me:12039: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -12073,7 +12046,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12076: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:12049: 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
@@ -12082,7 +12055,7 @@ EOF
 
 else
 
-echo "$as_me:12085: checking for gethostname in -lnsl" >&5
+echo "$as_me:12058: checking for gethostname in -lnsl" >&5
 echo $ECHO_N "checking for gethostname in -lnsl... $ECHO_C" >&6
 if test "${ac_cv_lib_nsl_gethostname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12090,7 +12063,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12093 "configure"
+#line 12066 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12109,16 +12082,16 @@ gethostname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12112: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12085: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12115: \$? = $ac_status" >&5
+  echo "$as_me:12088: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12118: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12091: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12121: \$? = $ac_status" >&5
+  echo "$as_me:12094: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostname=yes
 else
@@ -12129,7 +12102,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12132: result: $ac_cv_lib_nsl_gethostname" >&5
+echo "$as_me:12105: result: $ac_cv_lib_nsl_gethostname" >&5
 echo "${ECHO_T}$ac_cv_lib_nsl_gethostname" >&6
 if test $ac_cv_lib_nsl_gethostname = yes; then
 
@@ -12146,7 +12119,7 @@ else
 	ac_cv_func_gethostname=unknown
 	unset ac_cv_func_gethostname 2>/dev/null
 
-echo "$as_me:12149: checking for gethostname in -lsocket" >&5
+echo "$as_me:12122: checking for gethostname in -lsocket" >&5
 echo $ECHO_N "checking for gethostname in -lsocket... $ECHO_C" >&6
 if test "${ac_cv_lib_socket_gethostname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12154,7 +12127,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12157 "configure"
+#line 12130 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12173,16 +12146,16 @@ gethostname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12176: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12149: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12179: \$? = $ac_status" >&5
+  echo "$as_me:12152: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12182: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12155: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12185: \$? = $ac_status" >&5
+  echo "$as_me:12158: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_gethostname=yes
 else
@@ -12193,7 +12166,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12196: result: $ac_cv_lib_socket_gethostname" >&5
+echo "$as_me:12169: result: $ac_cv_lib_socket_gethostname" >&5
 echo "${ECHO_T}$ac_cv_lib_socket_gethostname" >&6
 if test $ac_cv_lib_socket_gethostname = yes; then
 
@@ -12217,7 +12190,7 @@ fi
 fi
 done
 
-	echo "$as_me:12220: checking for main in -linet" >&5
+	echo "$as_me:12193: checking for main in -linet" >&5
 echo $ECHO_N "checking for main in -linet... $ECHO_C" >&6
 if test "${ac_cv_lib_inet_main+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12225,7 +12198,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-linet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12228 "configure"
+#line 12201 "configure"
 #include "confdefs.h"
 
 int
@@ -12237,16 +12210,16 @@ main ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12240: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12213: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12243: \$? = $ac_status" >&5
+  echo "$as_me:12216: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12246: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12219: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12249: \$? = $ac_status" >&5
+  echo "$as_me:12222: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_inet_main=yes
 else
@@ -12257,7 +12230,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12260: result: $ac_cv_lib_inet_main" >&5
+echo "$as_me:12233: result: $ac_cv_lib_inet_main" >&5
 echo "${ECHO_T}$ac_cv_lib_inet_main" >&6
 if test $ac_cv_lib_inet_main = yes; then
   cf_cv_netlibs="-linet $cf_cv_netlibs"
@@ -12268,13 +12241,13 @@ fi
 for ac_func in socket
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:12271: checking for $ac_func" >&5
+echo "$as_me:12244: 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 12277 "configure"
+#line 12250 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -12305,16 +12278,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12308: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12281: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12311: \$? = $ac_status" >&5
+  echo "$as_me:12284: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12314: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12287: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12317: \$? = $ac_status" >&5
+  echo "$as_me:12290: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -12324,7 +12297,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12327: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:12300: 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
@@ -12333,7 +12306,7 @@ EOF
 
 else
 
-echo "$as_me:12336: checking for socket in -lsocket" >&5
+echo "$as_me:12309: checking for socket in -lsocket" >&5
 echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6
 if test "${ac_cv_lib_socket_socket+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12341,7 +12314,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12344 "configure"
+#line 12317 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12360,16 +12333,16 @@ socket ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12363: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12336: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12366: \$? = $ac_status" >&5
+  echo "$as_me:12339: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12369: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12342: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12372: \$? = $ac_status" >&5
+  echo "$as_me:12345: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_socket=yes
 else
@@ -12380,7 +12353,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12383: result: $ac_cv_lib_socket_socket" >&5
+echo "$as_me:12356: result: $ac_cv_lib_socket_socket" >&5
 echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6
 if test $ac_cv_lib_socket_socket = yes; then
 
@@ -12397,7 +12370,7 @@ else
 	ac_cv_func_socket=unknown
 	unset ac_cv_func_socket 2>/dev/null
 
-echo "$as_me:12400: checking for socket in -lbsd" >&5
+echo "$as_me:12373: checking for socket in -lbsd" >&5
 echo $ECHO_N "checking for socket in -lbsd... $ECHO_C" >&6
 if test "${ac_cv_lib_bsd_socket+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12405,7 +12378,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12408 "configure"
+#line 12381 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12424,16 +12397,16 @@ socket ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12427: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12400: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12430: \$? = $ac_status" >&5
+  echo "$as_me:12403: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12433: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12406: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12436: \$? = $ac_status" >&5
+  echo "$as_me:12409: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_bsd_socket=yes
 else
@@ -12444,7 +12417,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12447: result: $ac_cv_lib_bsd_socket" >&5
+echo "$as_me:12420: result: $ac_cv_lib_bsd_socket" >&5
 echo "${ECHO_T}$ac_cv_lib_bsd_socket" >&6
 if test $ac_cv_lib_bsd_socket = yes; then
 
@@ -12473,13 +12446,13 @@ done
 for ac_func in gethostbyname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:12476: checking for $ac_func" >&5
+echo "$as_me:12449: 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 12482 "configure"
+#line 12455 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -12510,16 +12483,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12513: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12486: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12516: \$? = $ac_status" >&5
+  echo "$as_me:12489: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12519: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12492: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12522: \$? = $ac_status" >&5
+  echo "$as_me:12495: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -12529,7 +12502,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12532: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:12505: 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
@@ -12538,7 +12511,7 @@ EOF
 
 else
 
-echo "$as_me:12541: checking for gethostbyname in -lnsl" >&5
+echo "$as_me:12514: checking for gethostbyname in -lnsl" >&5
 echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12546,7 +12519,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12549 "configure"
+#line 12522 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12565,16 +12538,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12568: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12541: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12571: \$? = $ac_status" >&5
+  echo "$as_me:12544: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12574: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12547: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12577: \$? = $ac_status" >&5
+  echo "$as_me:12550: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -12585,7 +12558,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12588: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:12561: result: $ac_cv_lib_nsl_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
 if test $ac_cv_lib_nsl_gethostbyname = yes; then
 
@@ -12610,13 +12583,13 @@ done
 for ac_func in inet_ntoa
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:12613: checking for $ac_func" >&5
+echo "$as_me:12586: 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 12619 "configure"
+#line 12592 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -12647,16 +12620,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12650: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12623: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12653: \$? = $ac_status" >&5
+  echo "$as_me:12626: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12656: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12629: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12659: \$? = $ac_status" >&5
+  echo "$as_me:12632: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -12666,7 +12639,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12669: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:12642: 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
@@ -12675,7 +12648,7 @@ EOF
 
 else
 
-echo "$as_me:12678: checking for inet_ntoa in -lnsl" >&5
+echo "$as_me:12651: checking for inet_ntoa in -lnsl" >&5
 echo $ECHO_N "checking for inet_ntoa in -lnsl... $ECHO_C" >&6
 if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12683,7 +12656,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12686 "configure"
+#line 12659 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12702,16 +12675,16 @@ inet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12705: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12678: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12708: \$? = $ac_status" >&5
+  echo "$as_me:12681: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12711: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12684: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12714: \$? = $ac_status" >&5
+  echo "$as_me:12687: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_inet_ntoa=yes
 else
@@ -12722,7 +12695,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12725: result: $ac_cv_lib_nsl_inet_ntoa" >&5
+echo "$as_me:12698: result: $ac_cv_lib_nsl_inet_ntoa" >&5
 echo "${ECHO_T}$ac_cv_lib_nsl_inet_ntoa" >&6
 if test $ac_cv_lib_nsl_inet_ntoa = yes; then
 
@@ -12747,13 +12720,13 @@ done
 for ac_func in gethostbyname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:12750: checking for $ac_func" >&5
+echo "$as_me:12723: 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 12756 "configure"
+#line 12729 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -12784,16 +12757,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12787: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12760: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12790: \$? = $ac_status" >&5
+  echo "$as_me:12763: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12793: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12766: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12796: \$? = $ac_status" >&5
+  echo "$as_me:12769: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -12803,7 +12776,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12806: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:12779: 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
@@ -12812,7 +12785,7 @@ EOF
 
 else
 
-echo "$as_me:12815: checking for gethostbyname in -lnetwork" >&5
+echo "$as_me:12788: checking for gethostbyname in -lnetwork" >&5
 echo $ECHO_N "checking for gethostbyname in -lnetwork... $ECHO_C" >&6
 if test "${ac_cv_lib_network_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12820,7 +12793,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnetwork $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12823 "configure"
+#line 12796 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12839,16 +12812,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12842: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12815: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12845: \$? = $ac_status" >&5
+  echo "$as_me:12818: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12848: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12821: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12851: \$? = $ac_status" >&5
+  echo "$as_me:12824: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_network_gethostbyname=yes
 else
@@ -12859,7 +12832,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12862: result: $ac_cv_lib_network_gethostbyname" >&5
+echo "$as_me:12835: result: $ac_cv_lib_network_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_lib_network_gethostbyname" >&6
 if test $ac_cv_lib_network_gethostbyname = yes; then
 
@@ -12884,13 +12857,13 @@ done
 for ac_func in strcasecmp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:12887: checking for $ac_func" >&5
+echo "$as_me:12860: 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 12893 "configure"
+#line 12866 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -12921,16 +12894,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12924: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12897: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12927: \$? = $ac_status" >&5
+  echo "$as_me:12900: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12930: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12903: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12933: \$? = $ac_status" >&5
+  echo "$as_me:12906: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -12940,7 +12913,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12943: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:12916: 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
@@ -12949,7 +12922,7 @@ EOF
 
 else
 
-echo "$as_me:12952: checking for strcasecmp in -lresolv" >&5
+echo "$as_me:12925: checking for strcasecmp in -lresolv" >&5
 echo $ECHO_N "checking for strcasecmp in -lresolv... $ECHO_C" >&6
 if test "${ac_cv_lib_resolv_strcasecmp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12957,7 +12930,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12960 "configure"
+#line 12933 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12976,16 +12949,16 @@ strcasecmp ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12979: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12952: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12982: \$? = $ac_status" >&5
+  echo "$as_me:12955: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12985: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12958: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12988: \$? = $ac_status" >&5
+  echo "$as_me:12961: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_resolv_strcasecmp=yes
 else
@@ -12996,7 +12969,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12999: result: $ac_cv_lib_resolv_strcasecmp" >&5
+echo "$as_me:12972: result: $ac_cv_lib_resolv_strcasecmp" >&5
 echo "${ECHO_T}$ac_cv_lib_resolv_strcasecmp" >&6
 if test $ac_cv_lib_resolv_strcasecmp = yes; then
 
@@ -13025,7 +12998,8 @@ fi
 
 case $cf_cv_netlibs in #(vi
 *ws2_32*)
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define USE_WINSOCK2_H 1
 EOF
 
@@ -13037,14 +13011,14 @@ test $cf_test_netlibs = no && echo "$cf_cv_netlibs" >&6
 
 fi
 
-echo "$as_me:13040: checking for inet_aton function" >&5
+echo "$as_me:13014: checking for inet_aton function" >&5
 echo $ECHO_N "checking for inet_aton function... $ECHO_C" >&6
 if test "${cf_cv_have_inet_aton+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 13047 "configure"
+#line 13021 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -13060,16 +13034,16 @@ inet_aton(0, (struct in_addr *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13063: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13037: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13066: \$? = $ac_status" >&5
+  echo "$as_me:13040: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13069: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13043: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13072: \$? = $ac_status" >&5
+  echo "$as_me:13046: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_inet_aton=yes
 else
@@ -13079,22 +13053,23 @@ cf_cv_have_inet_aton=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:13082: result: $cf_cv_have_inet_aton" >&5
+echo "$as_me:13056: result: $cf_cv_have_inet_aton" >&5
 echo "${ECHO_T}$cf_cv_have_inet_aton" >&6
 if test "$cf_cv_have_inet_aton" = yes ; then
-    cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define HAVE_INET_ATON 1
 EOF
 
 else
-    echo "$as_me:13090: checking for inet_addr function" >&5
+    echo "$as_me:13065: checking for inet_addr function" >&5
 echo $ECHO_N "checking for inet_addr function... $ECHO_C" >&6
 if test "${cf_cv_have_inet_addr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 13097 "configure"
+#line 13072 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -13110,16 +13085,16 @@ inet_addr(0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13113: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13088: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13116: \$? = $ac_status" >&5
+  echo "$as_me:13091: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13119: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13094: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13122: \$? = $ac_status" >&5
+  echo "$as_me:13097: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_inet_addr=yes
 else
@@ -13129,10 +13104,10 @@ cf_cv_have_inet_addr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:13132: result: $cf_cv_have_inet_addr" >&5
+echo "$as_me:13107: result: $cf_cv_have_inet_addr" >&5
 echo "${ECHO_T}$cf_cv_have_inet_addr" >&6
     if test "$cf_cv_have_inet_addr" = no ; then
-	echo "$as_me:13135: checking for library with inet_addr" >&5
+	echo "$as_me:13110: checking for library with inet_addr" >&5
 echo $ECHO_N "checking for library with inet_addr... $ECHO_C" >&6
 if test "${cf_cv_lib_inet_addr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13143,7 +13118,7 @@ else
 	    do
 		LIBS="$cf_save_LIBS $cf_inetlib"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 13146 "configure"
+#line 13121 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -13159,16 +13134,16 @@ inet_addr(0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13162: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13137: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13165: \$? = $ac_status" >&5
+  echo "$as_me:13140: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13168: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13143: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13171: \$? = $ac_status" >&5
+  echo "$as_me:13146: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_lib_inet_addr=$cf_inetlib
 else
@@ -13182,18 +13157,18 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	    done
 
 fi
-echo "$as_me:13185: result: $cf_cv_lib_inet_addr" >&5
+echo "$as_me:13160: result: $cf_cv_lib_inet_addr" >&5
 echo "${ECHO_T}$cf_cv_lib_inet_addr" >&6
 	if test "$cf_cv_lib_inet_addr" != no ; then
 	    LIBS="$cf_cv_lib_inet_addr $LIBS"
 	else
-	    { echo "$as_me:13190: WARNING: Unable to find library for inet_addr function" >&5
+	    { echo "$as_me:13165: WARNING: Unable to find library for inet_addr function" >&5
 echo "$as_me: WARNING: Unable to find library for inet_addr function" >&2;}
 	fi
     fi
 fi
 
-echo "$as_me:13196: checking if you want to use pkg-config" >&5
+echo "$as_me:13171: checking if you want to use pkg-config" >&5
 echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6
 
 # Check whether --with-pkg-config or --without-pkg-config was given.
@@ -13203,7 +13178,7 @@ if test "${with_pkg_config+set}" = set; then
 else
   cf_pkg_config=yes
 fi;
-echo "$as_me:13206: result: $cf_pkg_config" >&5
+echo "$as_me:13181: result: $cf_pkg_config" >&5
 echo "${ECHO_T}$cf_pkg_config" >&6
 
 case $cf_pkg_config in #(vi
@@ -13215,7 +13190,7 @@ yes) #(vi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-echo "$as_me:13218: checking for $ac_word" >&5
+echo "$as_me:13193: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13232,7 +13207,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_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:13235: found $ac_dir/$ac_word" >&5
+   echo "$as_me:13210: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -13243,10 +13218,10 @@ fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:13246: result: $PKG_CONFIG" >&5
+  echo "$as_me:13221: result: $PKG_CONFIG" >&5
 echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  echo "$as_me:13249: result: no" >&5
+  echo "$as_me:13224: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -13255,7 +13230,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-echo "$as_me:13258: checking for $ac_word" >&5
+echo "$as_me:13233: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13272,7 +13247,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_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:13275: found $ac_dir/$ac_word" >&5
+   echo "$as_me:13250: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -13284,10 +13259,10 @@ fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 
 if test -n "$ac_pt_PKG_CONFIG"; then
-  echo "$as_me:13287: result: $ac_pt_PKG_CONFIG" >&5
+  echo "$as_me:13262: result: $ac_pt_PKG_CONFIG" >&5
 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
 else
-  echo "$as_me:13290: result: no" >&5
+  echo "$as_me:13265: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -13330,7 +13305,7 @@ case ".$PKG_CONFIG" in #(vi
   PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:13333: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+  { { echo "$as_me:13308: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
 echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -13379,7 +13354,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 13382 "configure"
+#line 13357 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13391,16 +13366,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13394: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13369: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13397: \$? = $ac_status" >&5
+  echo "$as_me:13372: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13400: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13375: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13403: \$? = $ac_status" >&5
+  echo "$as_me:13378: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -13417,7 +13392,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}:13420: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:13395: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -13458,7 +13433,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 13461 "configure"
+#line 13436 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13470,16 +13445,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13473: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13448: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13476: \$? = $ac_status" >&5
+  echo "$as_me:13451: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13479: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13454: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13482: \$? = $ac_status" >&5
+  echo "$as_me:13457: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -13496,7 +13471,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}:13499: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:13474: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -13512,7 +13487,7 @@ echo "${as_me:-configure}:13499: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:13515: error: cannot find ssl library under $cf_cv_use_libssl" >&5
+{ { echo "$as_me:13490: error: cannot find ssl library under $cf_cv_use_libssl" >&5
 echo "$as_me: error: cannot find ssl library under $cf_cv_use_libssl" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -13537,7 +13512,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}:13540: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:13515: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -13566,7 +13541,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}:13569: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:13544: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -13575,7 +13550,7 @@ echo "${as_me:-configure}:13569: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:13578: error: cannot find ssl library under $cf_cv_use_libssl" >&5
+{ { echo "$as_me:13553: error: cannot find ssl library under $cf_cv_use_libssl" >&5
 echo "$as_me: error: cannot find ssl library under $cf_cv_use_libssl" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -13706,7 +13681,7 @@ fi
 					esac
 					test -n "$verbose" && echo "	adding $cf_libs_ssl to LIBS" 1>&6
 
-echo "${as_me:-configure}:13709: testing adding $cf_libs_ssl to LIBS ..." 1>&5
+echo "${as_me:-configure}:13684: testing adding $cf_libs_ssl to LIBS ..." 1>&5
 
 					LIBS="$cf_libs_ssl $LIBS"
 				fi
@@ -13727,7 +13702,7 @@ echo "${as_me:-configure}:13709: testing adding $cf_libs_ssl to LIBS ..." 1>&5
 			*-ldl) #(vi
 				;;
 			*)
-				echo "$as_me:13730: checking for dlsym in -ldl" >&5
+				echo "$as_me:13705: checking for dlsym in -ldl" >&5
 echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6
 if test "${ac_cv_lib_dl_dlsym+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13735,7 +13710,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 13738 "configure"
+#line 13713 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13754,16 +13729,16 @@ dlsym ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13757: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13732: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13760: \$? = $ac_status" >&5
+  echo "$as_me:13735: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13763: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13738: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13766: \$? = $ac_status" >&5
+  echo "$as_me:13741: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dl_dlsym=yes
 else
@@ -13774,7 +13749,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13777: result: $ac_cv_lib_dl_dlsym" >&5
+echo "$as_me:13752: result: $ac_cv_lib_dl_dlsym" >&5
 echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6
 if test $ac_cv_lib_dl_dlsym = yes; then
   cf_extra_ssl_libs="$cf_extra_ssl_libs -ldl"
@@ -13790,12 +13765,12 @@ fi
 cf_cv_header_path_ssl=
 cf_cv_library_path_ssl=
 
-echo "${as_me:-configure}:13793: testing Starting FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me:-configure}:13768: testing Starting FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 13798 "configure"
+#line 13773 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -13824,16 +13799,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13827: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13802: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13830: \$? = $ac_status" >&5
+  echo "$as_me:13805: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13833: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13808: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13836: \$? = $ac_status" >&5
+  echo "$as_me:13811: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_ssl=yes
@@ -13847,7 +13822,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lssl $cf_extra_ssl_libs $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 13850 "configure"
+#line 13825 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -13876,16 +13851,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13879: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13854: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13882: \$? = $ac_status" >&5
+  echo "$as_me:13857: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13885: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13860: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13888: \$? = $ac_status" >&5
+  echo "$as_me:13863: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_ssl=yes
@@ -13902,9 +13877,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for ssl library" 1>&6
 
-echo "${as_me:-configure}:13905: testing find linkage for ssl library ..." 1>&5
+echo "${as_me:-configure}:13880: testing find linkage for ssl library ..." 1>&5
 
-echo "${as_me:-configure}:13907: testing Searching for headers in FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me:-configure}:13882: testing Searching for headers in FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -14017,11 +13992,11 @@ cf_search="$cf_search $cf_header_path_list"
       if test -d $cf_cv_header_path_ssl ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_ssl" 1>&6
 
-echo "${as_me:-configure}:14020: testing ... testing $cf_cv_header_path_ssl ..." 1>&5
+echo "${as_me:-configure}:13995: testing ... testing $cf_cv_header_path_ssl ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_ssl"
         cat >conftest.$ac_ext <<_ACEOF
-#line 14024 "configure"
+#line 13999 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14050,21 +14025,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14053: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14028: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14056: \$? = $ac_status" >&5
+  echo "$as_me:14031: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14059: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14034: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14062: \$? = $ac_status" >&5
+  echo "$as_me:14037: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found ssl headers in $cf_cv_header_path_ssl" 1>&6
 
-echo "${as_me:-configure}:14067: testing ... found ssl headers in $cf_cv_header_path_ssl ..." 1>&5
+echo "${as_me:-configure}:14042: testing ... found ssl headers in $cf_cv_header_path_ssl ..." 1>&5
 
             cf_cv_find_linkage_ssl=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -14082,7 +14057,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_ssl" = maybe ; then
 
-echo "${as_me:-configure}:14085: testing Searching for ssl library in FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me:-configure}:14060: testing Searching for ssl library in FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -14090,7 +14065,7 @@ echo "${as_me:-configure}:14085: testing Searching for ssl library in FIND_LINKA
         CPPFLAGS="$cf_test_CPPFLAGS"
         LIBS="-lssl $cf_extra_ssl_libs $cf_save_LIBS"
         cat >conftest.$ac_ext <<_ACEOF
-#line 14093 "configure"
+#line 14068 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14119,21 +14094,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14122: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14097: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14125: \$? = $ac_status" >&5
+  echo "$as_me:14100: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14128: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14103: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14131: \$? = $ac_status" >&5
+  echo "$as_me:14106: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found ssl library in system" 1>&6
 
-echo "${as_me:-configure}:14136: testing ... found ssl library in system ..." 1>&5
+echo "${as_me:-configure}:14111: testing ... found ssl library in system ..." 1>&5
 
             cf_cv_find_linkage_ssl=yes
 else
@@ -14236,13 +14211,13 @@ cf_search="$cf_library_path_list $cf_search"
           if test -d $cf_cv_library_path_ssl ; then
             test -n "$verbose" && echo "	... testing $cf_cv_library_path_ssl" 1>&6
 
-echo "${as_me:-configure}:14239: testing ... testing $cf_cv_library_path_ssl ..." 1>&5
+echo "${as_me:-configure}:14214: testing ... testing $cf_cv_library_path_ssl ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-lssl $cf_extra_ssl_libs $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_ssl"
             cat >conftest.$ac_ext <<_ACEOF
-#line 14245 "configure"
+#line 14220 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14271,21 +14246,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14274: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14249: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14277: \$? = $ac_status" >&5
+  echo "$as_me:14252: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14280: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14255: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14283: \$? = $ac_status" >&5
+  echo "$as_me:14258: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
                 test -n "$verbose" && echo "	... found ssl library in $cf_cv_library_path_ssl" 1>&6
 
-echo "${as_me:-configure}:14288: testing ... found ssl library in $cf_cv_library_path_ssl ..." 1>&5
+echo "${as_me:-configure}:14263: testing ... found ssl library in $cf_cv_library_path_ssl ..." 1>&5
 
                 cf_cv_find_linkage_ssl=yes
                 cf_cv_library_file_ssl="-lssl"
@@ -14347,7 +14322,7 @@ if test -n "$cf_cv_library_path_ssl" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:14350: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:14325: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -14387,7 +14362,7 @@ if test -n "$cf_cv_header_path_ssl" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 14390 "configure"
+#line 14365 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14399,16 +14374,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14402: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14377: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14405: \$? = $ac_status" >&5
+  echo "$as_me:14380: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14408: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14383: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14411: \$? = $ac_status" >&5
+  echo "$as_me:14386: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -14425,7 +14400,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}:14428: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:14403: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -14448,14 +14423,16 @@ fi
 	fi
 
 	if test "$cf_cv_have_ssl" = yes ; then
-		cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define USE_SSL 1
 EOF
 
 		if test -n "$cf_cv_header_path_ssl" ; then
 			case $cf_cv_header_path_ssl in #(vi
 			*/openssl)
-				cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define USE_OPENSSL_INCL 1
 EOF
 
@@ -14463,10 +14440,10 @@ EOF
 			esac
 		fi
 
-echo "$as_me:14466: checking for X509 support" >&5
+echo "$as_me:14443: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 14469 "configure"
+#line 14446 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14490,16 +14467,16 @@ X509_verify_cert_error_string(X509_STORE_CTX_get_error(NULL))
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14493: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14470: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14496: \$? = $ac_status" >&5
+  echo "$as_me:14473: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14499: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14476: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14502: \$? = $ac_status" >&5
+  echo "$as_me:14479: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_x509_support=yes
 else
@@ -14508,7 +14485,7 @@ cat conftest.$ac_ext >&5
 cf_x509_support=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:14511: result: $cf_x509_support" >&5
+echo "$as_me:14488: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 
 if test "$cf_x509_support" = yes ; then
@@ -14560,7 +14537,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 14563 "configure"
+#line 14540 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14572,16 +14549,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14575: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14552: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14578: \$? = $ac_status" >&5
+  echo "$as_me:14555: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14581: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14558: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14584: \$? = $ac_status" >&5
+  echo "$as_me:14561: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -14598,7 +14575,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}:14601: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:14578: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -14639,7 +14616,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 14642 "configure"
+#line 14619 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14651,16 +14628,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14654: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14631: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14657: \$? = $ac_status" >&5
+  echo "$as_me:14634: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14660: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14637: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14663: \$? = $ac_status" >&5
+  echo "$as_me:14640: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -14677,7 +14654,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}:14680: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:14657: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -14693,7 +14670,7 @@ echo "${as_me:-configure}:14680: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:14696: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:14673: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
 echo "$as_me: error: cannot find ssl library under $cf_cv_use_libgnutls" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -14718,7 +14695,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}:14721: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:14698: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -14747,7 +14724,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}:14750: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:14727: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -14756,7 +14733,7 @@ echo "${as_me:-configure}:14750: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:14759: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:14736: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
 echo "$as_me: error: cannot find ssl library under $cf_cv_use_libgnutls" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -14774,12 +14751,12 @@ done
 		yes) # if no explicit directory given, try pkg-config
 			test -n "$verbose" && echo "	checking pkg-config for $cf_pkg_gnutls" 1>&6
 
-echo "${as_me:-configure}:14777: testing checking pkg-config for $cf_pkg_gnutls ..." 1>&5
+echo "${as_me:-configure}:14754: testing checking pkg-config for $cf_pkg_gnutls ..." 1>&5
 
 			if "$PKG_CONFIG" --exists $cf_pkg_gnutls ; then
 				test -n "$verbose" && echo "	... found $cf_pkg_gnutls in pkg-config" 1>&6
 
-echo "${as_me:-configure}:14782: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:14759: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_cv_have_gnutls=yes
 				cf_cv_pkg_config_ssl=yes
@@ -14891,14 +14868,14 @@ fi
 					esac
 					test -n "$verbose" && echo "	adding $cf_libs_ssl to LIBS" 1>&6
 
-echo "${as_me:-configure}:14894: testing adding $cf_libs_ssl to LIBS ..." 1>&5
+echo "${as_me:-configure}:14871: testing adding $cf_libs_ssl to LIBS ..." 1>&5
 
 					LIBS="$cf_libs_ssl $LIBS"
 				fi
 			else
 				test -n "$verbose" && echo "	... did not find $cf_pkg_gnutls in pkg-config" 1>&6
 
-echo "${as_me:-configure}:14901: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:14878: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_pkg_gnutls=none
 			fi
@@ -14906,7 +14883,7 @@ echo "${as_me:-configure}:14901: testing ... did not find $cf_pkg_gnutls in pkg-
 		esac
 	fi
 
-	cat >>confdefs.h <<\EOF
+cat >>confdefs.h <<\EOF
 #define USE_GNUTLS_FUNCS 1
 EOF
 
@@ -14918,12 +14895,12 @@ EOF
 cf_cv_header_path_gnutls=
 cf_cv_library_path_gnutls=
 
-echo "${as_me:-configure}:14921: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:14898: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 14926 "configure"
+#line 14903 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14952,16 +14929,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14955: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14932: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14958: \$? = $ac_status" >&5
+  echo "$as_me:14935: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14961: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14938: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14964: \$? = $ac_status" >&5
+  echo "$as_me:14941: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -14975,7 +14952,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lgnutls -lgnutls -lgcrypt $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 14978 "configure"
+#line 14955 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -15004,16 +14981,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15007: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14984: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15010: \$? = $ac_status" >&5
+  echo "$as_me:14987: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15013: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14990: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15016: \$? = $ac_status" >&5
+  echo "$as_me:14993: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -15030,9 +15007,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for gnutls library" 1>&6
 
-echo "${as_me:-configure}:15033: testing find linkage for gnutls library ..." 1>&5
+echo "${as_me:-configure}:15010: testing find linkage for gnutls library ..." 1>&5
 
-echo "${as_me:-configure}:15035: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:15012: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -15145,11 +15122,11 @@ cf_search="$cf_search $cf_header_path_list"
       if test -d $cf_cv_header_path_gnutls ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_gnutls" 1>&6
 
-echo "${as_me:-configure}:15148: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:15125: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_gnutls"
         cat >conftest.$ac_ext <<_ACEOF
-#line 15152 "configure"
+#line 15129 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -15178,21 +15155,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15181: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15158: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15184: \$? = $ac_status" >&5
+  echo "$as_me:15161: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15187: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15164: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15190: \$? = $ac_status" >&5
+  echo "$as_me:15167: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found gnutls headers in $cf_cv_header_path_gnutls" 1>&6
 
-echo "${as_me:-configure}:15195: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:15172: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
 
             cf_cv_find_linkage_gnutls=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -15210,7 +15187,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_gnutls" = maybe ; then
 
-echo "${as_me:-configure}:15213: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:15190: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -15307,13 +15284,13 @@ cf_search="$cf_library_path_list $cf_search"
           if test -d $cf_cv_library_path_gnutls ; then
             test -n "$verbose" && echo "	... testing $cf_cv_library_path_gnutls" 1>&6
 
-echo "${as_me:-configure}:15310: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:15287: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-lgnutls -lgnutls -lgcrypt $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_gnutls"
             cat >conftest.$ac_ext <<_ACEOF
-#line 15316 "configure"
+#line 15293 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -15342,21 +15319,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15345: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15322: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15348: \$? = $ac_status" >&5
+  echo "$as_me:15325: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15351: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15328: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15354: \$? = $ac_status" >&5
+  echo "$as_me:15331: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
                 test -n "$verbose" && echo "	... found gnutls library in $cf_cv_library_path_gnutls" 1>&6
 
-echo "${as_me:-configure}:15359: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:15336: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
 
                 cf_cv_find_linkage_gnutls=yes
                 cf_cv_library_file_gnutls="-lgnutls"
@@ -15433,7 +15410,7 @@ if test -n "$cf_cv_header_path_gnutls" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 15436 "configure"
+#line 15413 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -15445,16 +15422,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15448: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15425: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15451: \$? = $ac_status" >&5
+  echo "$as_me:15428: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15454: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15431: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15457: \$? = $ac_status" >&5
+  echo "$as_me:15434: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -15471,7 +15448,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}:15474: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:15451: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -15510,7 +15487,7 @@ if test -n "$cf_cv_library_path_gnutls" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:15513: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:15490: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -15523,10 +15500,10 @@ fi
 
 		EXTRA_OBJS="$EXTRA_OBJS tidy_tls\$o"
 
-echo "$as_me:15526: checking for X509 support" >&5
+echo "$as_me:15503: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 15529 "configure"
+#line 15506 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -15550,16 +15527,16 @@ X509_verify_cert_error_string(X509_STORE_CTX_get_error(NULL))
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15553: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15530: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15556: \$? = $ac_status" >&5
+  echo "$as_me:15533: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15559: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15536: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15562: \$? = $ac_status" >&5
+  echo "$as_me:15539: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_x509_support=yes
 else
@@ -15568,7 +15545,7 @@ cat conftest.$ac_ext >&5
 cf_x509_support=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:15571: result: $cf_x509_support" >&5
+echo "$as_me:15548: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 
 if test "$cf_x509_support" = yes ; then
@@ -15583,13 +15560,13 @@ fi
 for ac_func in gnutls_priority_set_direct
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:15586: checking for $ac_func" >&5
+echo "$as_me:15563: 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 15592 "configure"
+#line 15569 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -15620,16 +15597,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15623: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15600: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15626: \$? = $ac_status" >&5
+  echo "$as_me:15603: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15629: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15606: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15632: \$? = $ac_status" >&5
+  echo "$as_me:15609: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -15639,7 +15616,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:15642: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:15619: 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
@@ -15688,7 +15665,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 15691 "configure"
+#line 15668 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -15700,16 +15677,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15703: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15680: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15706: \$? = $ac_status" >&5
+  echo "$as_me:15683: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15709: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15686: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15712: \$? = $ac_status" >&5
+  echo "$as_me:15689: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -15726,7 +15703,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}:15729: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:15706: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -15767,7 +15744,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 15770 "configure"
+#line 15747 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -15779,16 +15756,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15782: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15759: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15785: \$? = $ac_status" >&5
+  echo "$as_me:15762: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15788: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15765: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15791: \$? = $ac_status" >&5
+  echo "$as_me:15768: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -15805,7 +15782,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}:15808: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:15785: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -15821,7 +15798,7 @@ echo "${as_me:-configure}:15808: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:15824: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:15801: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
 echo "$as_me: error: cannot find ssl library under $cf_cv_use_libgnutls" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -15846,7 +15823,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}:15849: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:15826: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -15875,7 +15852,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}:15878: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:15855: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -15884,7 +15861,7 @@ echo "${as_me:-configure}:15878: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:15887: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:15864: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
 echo "$as_me: error: cannot find ssl library under $cf_cv_use_libgnutls" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -15902,12 +15879,12 @@ done
 		yes) # if no explicit directory given, try pkg-config
 			test -n "$verbose" && echo "	checking pkg-config for $cf_pkg_gnutls" 1>&6
 
-echo "${as_me:-configure}:15905: testing checking pkg-config for $cf_pkg_gnutls ..." 1>&5
+echo "${as_me:-configure}:15882: testing checking pkg-config for $cf_pkg_gnutls ..." 1>&5
 
 			if "$PKG_CONFIG" --exists $cf_pkg_gnutls ; then
 				test -n "$verbose" && echo "	... found $cf_pkg_gnutls in pkg-config" 1>&6
 
-echo "${as_me:-configure}:15910: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:15887: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_cv_have_gnutls=yes
 				cf_cv_pkg_config_ssl=yes
@@ -16019,14 +15996,14 @@ fi
 					esac
 					test -n "$verbose" && echo "	adding $cf_libs_ssl to LIBS" 1>&6
 
-echo "${as_me:-configure}:16022: testing adding $cf_libs_ssl to LIBS ..." 1>&5
+echo "${as_me:-configure}:15999: testing adding $cf_libs_ssl to LIBS ..." 1>&5
 
 					LIBS="$cf_libs_ssl $LIBS"
 				fi
 			else
 				test -n "$verbose" && echo "	... did not find $cf_pkg_gnutls in pkg-config" 1>&6
 
-echo "${as_me:-configure}:16029: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:16006: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_pkg_gnutls=none
 			fi
@@ -16034,7 +16011,7 @@ echo "${as_me:-configure}:16029: testing ... did not find $cf_pkg_gnutls in pkg-
 		esac
 	fi
 
-	cat >>confdefs.h <<\EOF
+cat >>confdefs.h <<\EOF
 #define USE_GNUTLS_INCL 1
 EOF
 
@@ -16046,12 +16023,12 @@ EOF
 cf_cv_header_path_gnutls=
 cf_cv_library_path_gnutls=
 
-echo "${as_me:-configure}:16049: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:16026: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 16054 "configure"
+#line 16031 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16080,16 +16057,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16083: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16060: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16086: \$? = $ac_status" >&5
+  echo "$as_me:16063: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16089: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16066: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16092: \$? = $ac_status" >&5
+  echo "$as_me:16069: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -16103,7 +16080,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lgnutls -lgnutls-openssl -lgnutls-extra -lgnutls -lgcrypt $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 16106 "configure"
+#line 16083 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16132,16 +16109,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16135: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16112: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16138: \$? = $ac_status" >&5
+  echo "$as_me:16115: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16141: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16118: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16144: \$? = $ac_status" >&5
+  echo "$as_me:16121: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -16158,9 +16135,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for gnutls library" 1>&6
 
-echo "${as_me:-configure}:16161: testing find linkage for gnutls library ..." 1>&5
+echo "${as_me:-configure}:16138: testing find linkage for gnutls library ..." 1>&5
 
-echo "${as_me:-configure}:16163: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:16140: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -16273,11 +16250,11 @@ cf_search="$cf_search $cf_header_path_list"
       if test -d $cf_cv_header_path_gnutls ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_gnutls" 1>&6
 
-echo "${as_me:-configure}:16276: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:16253: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_gnutls"
         cat >conftest.$ac_ext <<_ACEOF
-#line 16280 "configure"
+#line 16257 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16306,21 +16283,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16309: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16286: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16312: \$? = $ac_status" >&5
+  echo "$as_me:16289: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16315: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16292: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16318: \$? = $ac_status" >&5
+  echo "$as_me:16295: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found gnutls headers in $cf_cv_header_path_gnutls" 1>&6
 
-echo "${as_me:-configure}:16323: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:16300: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
 
             cf_cv_find_linkage_gnutls=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -16338,7 +16315,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_gnutls" = maybe ; then
 
-echo "${as_me:-configure}:16341: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:16318: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -16435,13 +16412,13 @@ cf_search="$cf_library_path_list $cf_search"
           if test -d $cf_cv_library_path_gnutls ; then
             test -n "$verbose" && echo "	... testing $cf_cv_library_path_gnutls" 1>&6
 
-echo "${as_me:-configure}:16438: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:16415: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-lgnutls -lgnutls-openssl -lgnutls-extra -lgnutls -lgcrypt $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_gnutls"
             cat >conftest.$ac_ext <<_ACEOF
-#line 16444 "configure"
+#line 16421 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16470,21 +16447,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16473: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16450: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16476: \$? = $ac_status" >&5
+  echo "$as_me:16453: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16479: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16456: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16482: \$? = $ac_status" >&5
+  echo "$as_me:16459: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
                 test -n "$verbose" && echo "	... found gnutls library in $cf_cv_library_path_gnutls" 1>&6
 
-echo "${as_me:-configure}:16487: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:16464: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
 
                 cf_cv_find_linkage_gnutls=yes
                 cf_cv_library_file_gnutls="-lgnutls"
@@ -16561,7 +16538,7 @@ if test -n "$cf_cv_header_path_gnutls" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 16564 "configure"
+#line 16541 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -16573,16 +16550,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16576: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16553: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16579: \$? = $ac_status" >&5
+  echo "$as_me:16556: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16582: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16559: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16585: \$? = $ac_status" >&5
+  echo "$as_me:16562: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -16599,7 +16576,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}:16602: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:16579: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -16638,7 +16615,7 @@ if test -n "$cf_cv_library_path_gnutls" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:16641: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:16618: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -16650,7 +16627,7 @@ fi
 		LIBS="-lgnutls -lgcrypt $LIBS"
 
 		if test "$cf_pkg_gnutls" = none ; then
-				echo "$as_me:16653: checking for SSL_connect in -lgnutls-openssl" >&5
+				echo "$as_me:16630: checking for SSL_connect in -lgnutls-openssl" >&5
 echo $ECHO_N "checking for SSL_connect in -lgnutls-openssl... $ECHO_C" >&6
 if test "${ac_cv_lib_gnutls_openssl_SSL_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16658,7 +16635,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnutls-openssl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 16661 "configure"
+#line 16638 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16677,16 +16654,16 @@ SSL_connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16680: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16657: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16683: \$? = $ac_status" >&5
+  echo "$as_me:16660: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16686: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16663: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16689: \$? = $ac_status" >&5
+  echo "$as_me:16666: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gnutls_openssl_SSL_connect=yes
 else
@@ -16697,12 +16674,12 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16700: result: $ac_cv_lib_gnutls_openssl_SSL_connect" >&5
+echo "$as_me:16677: result: $ac_cv_lib_gnutls_openssl_SSL_connect" >&5
 echo "${ECHO_T}$ac_cv_lib_gnutls_openssl_SSL_connect" >&6
 if test $ac_cv_lib_gnutls_openssl_SSL_connect = yes; then
   LIBS="-lgnutls-openssl $LIBS"
 else
-  echo "$as_me:16705: checking for SSL_connect in -lgnutls-extra" >&5
+  echo "$as_me:16682: checking for SSL_connect in -lgnutls-extra" >&5
 echo $ECHO_N "checking for SSL_connect in -lgnutls-extra... $ECHO_C" >&6
 if test "${ac_cv_lib_gnutls_extra_SSL_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16710,7 +16687,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnutls-extra  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 16713 "configure"
+#line 16690 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16729,16 +16706,16 @@ SSL_connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16732: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16709: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16735: \$? = $ac_status" >&5
+  echo "$as_me:16712: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16738: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16715: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16741: \$? = $ac_status" >&5
+  echo "$as_me:16718: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gnutls_extra_SSL_connect=yes
 else
@@ -16749,12 +16726,12 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16752: result: $ac_cv_lib_gnutls_extra_SSL_connect" >&5
+echo "$as_me:16729: result: $ac_cv_lib_gnutls_extra_SSL_connect" >&5
 echo "${ECHO_T}$ac_cv_lib_gnutls_extra_SSL_connect" >&6
 if test $ac_cv_lib_gnutls_extra_SSL_connect = yes; then
   LIBS="-lgnutls-extra $LIBS"
 else
-  { { echo "$as_me:16757: error: cannot find gnutls openssl functions" >&5
+  { { echo "$as_me:16734: error: cannot find gnutls openssl functions" >&5
 echo "$as_me: error: cannot find gnutls openssl functions" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -16763,10 +16740,10 @@ fi
 
 			fi
 
-echo "$as_me:16766: checking for X509 support" >&5
+echo "$as_me:16743: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 16769 "configure"
+#line 16746 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16790,16 +16767,16 @@ X509_verify_cert_error_string(X509_STORE_CTX_get_error(NULL))
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16793: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16770: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16796: \$? = $ac_status" >&5
+  echo "$as_me:16773: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16799: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16776: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16802: \$? = $ac_status" >&5
+  echo "$as_me:16779: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_x509_support=yes
 else
@@ -16808,7 +16785,7 @@ cat conftest.$ac_ext >&5
 cf_x509_support=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:16811: result: $cf_x509_support" >&5
+echo "$as_me:16788: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 
 if test "$cf_x509_support" = yes ; then
@@ -16840,7 +16817,7 @@ no) #(vi
 	;;
 yes) #(vi
 
-echo "$as_me:16843: checking for SSL_get_version in -lnss_compat_ossl" >&5
+echo "$as_me:16820: checking for SSL_get_version in -lnss_compat_ossl" >&5
 echo $ECHO_N "checking for SSL_get_version in -lnss_compat_ossl... $ECHO_C" >&6
 if test "${ac_cv_lib_nss_compat_ossl_SSL_get_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16848,7 +16825,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnss_compat_ossl -lnss_compat_ossl $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 16851 "configure"
+#line 16828 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16867,16 +16844,16 @@ SSL_get_version ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16870: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16847: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16873: \$? = $ac_status" >&5
+  echo "$as_me:16850: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16876: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16853: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16879: \$? = $ac_status" >&5
+  echo "$as_me:16856: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nss_compat_ossl_SSL_get_version=yes
 else
@@ -16887,7 +16864,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16890: result: $ac_cv_lib_nss_compat_ossl_SSL_get_version" >&5
+echo "$as_me:16867: result: $ac_cv_lib_nss_compat_ossl_SSL_get_version" >&5
 echo "${ECHO_T}$ac_cv_lib_nss_compat_ossl_SSL_get_version" >&6
 if test $ac_cv_lib_nss_compat_ossl_SSL_get_version = yes; then
   cat >>confdefs.h <<EOF
@@ -16902,11 +16879,11 @@ else
 		if test -d $cf_ssl_root ; then
 			test -n "$verbose" && echo "	assume it is in $cf_ssl_root" 1>&6
 
-echo "${as_me:-configure}:16905: testing assume it is in $cf_ssl_root ..." 1>&5
+echo "${as_me:-configure}:16882: testing assume it is in $cf_ssl_root ..." 1>&5
 
 			cf_ssl_library="-L$cf_ssl_root/lib $cf_ssl_library"
 		else
-			{ { echo "$as_me:16909: error: cannot find NSS compilant libraries" >&5
+			{ { echo "$as_me:16886: error: cannot find NSS compilant libraries" >&5
 echo "$as_me: error: cannot find NSS compilant libraries" >&2;}
    { (exit 1); exit 1; }; }
 		fi
@@ -16921,13 +16898,13 @@ fi
 		elif test -d $cf_cv_use_libnss_compat/../include ; then
 			cf_ssl_root=$cf_cv_use_libnss_compat/..
 		else
-			{ { echo "$as_me:16924: error: cannot find NSS compilant library under $cf_cv_use_libnss_compat" >&5
+			{ { echo "$as_me:16901: error: cannot find NSS compilant library under $cf_cv_use_libnss_compat" >&5
 echo "$as_me: error: cannot find NSS compilant library under $cf_cv_use_libnss_compat" >&2;}
    { (exit 1); exit 1; }; }
 		fi
 		cf_ssl_library="-L$cf_ssl_root/lib $cf_ssl_library"
 	else
-		{ echo "$as_me:16930: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&5
+		{ echo "$as_me:16907: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&5
 echo "$as_me: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&2;}
 	fi
 	;;
@@ -17021,10 +16998,10 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 if test "$cf_ssl_subincs" = yes ; then
-echo "$as_me:17024: checking for NSS compilant include directory" >&5
+echo "$as_me:17001: checking for NSS compilant include directory" >&5
 echo $ECHO_N "checking for NSS compilant include directory... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 17027 "configure"
+#line 17004 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17038,16 +17015,16 @@ SSL_shutdown((SSL *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17041: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17018: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17044: \$? = $ac_status" >&5
+  echo "$as_me:17021: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17047: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17024: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17050: \$? = $ac_status" >&5
+  echo "$as_me:17027: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_ssl_incl=yes
 else
@@ -17056,18 +17033,19 @@ cat conftest.$ac_ext >&5
 cf_ssl_incl=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:17059: result: $cf_ssl_incl" >&5
+echo "$as_me:17036: result: $cf_ssl_incl" >&5
 echo "${ECHO_T}$cf_ssl_incl" >&6
-test "$cf_ssl_incl" = yes && cat >>confdefs.h <<\EOF
+test "$cf_ssl_incl" = yes &&
+cat >>confdefs.h <<\EOF
 #define USE_NSS_COMPAT_INCL 1
 EOF
 
 fi
 
-echo "$as_me:17067: checking if we can link to NSS compilant library" >&5
+echo "$as_me:17045: checking if we can link to NSS compilant library" >&5
 echo $ECHO_N "checking if we can link to NSS compilant library... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 17070 "configure"
+#line 17048 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17086,16 +17064,16 @@ SSL_shutdown((SSL *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17089: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17067: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17092: \$? = $ac_status" >&5
+  echo "$as_me:17070: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17095: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17073: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17098: \$? = $ac_status" >&5
+  echo "$as_me:17076: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_ssl_library=yes
 else
@@ -17104,19 +17082,20 @@ cat conftest.$ac_ext >&5
 cf_ssl_library=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:17107: result: $cf_ssl_library" >&5
+echo "$as_me:17085: result: $cf_ssl_library" >&5
 echo "${ECHO_T}$cf_ssl_library" >&6
 if test "$cf_ssl_library" = yes ; then
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define USE_SSL 1
 EOF
 
-	cat >>confdefs.h <<\EOF
+cat >>confdefs.h <<\EOF
 #define USE_X509_SUPPORT 1
 EOF
 
 else
-	{ { echo "$as_me:17119: error: Cannot link with NSS compilant libraries" >&5
+	{ { echo "$as_me:17098: error: Cannot link with NSS compilant libraries" >&5
 echo "$as_me: error: Cannot link with NSS compilant libraries" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -17124,7 +17103,7 @@ fi
 fi
 
 ### check for ipv6 support
-echo "$as_me:17127: checking whether to enable ipv6" >&5
+echo "$as_me:17106: checking whether to enable ipv6" >&5
 echo $ECHO_N "checking whether to enable ipv6... $ECHO_C" >&6
 
 # Check whether --enable-ipv6 or --disable-ipv6 was given.
@@ -17132,7 +17111,8 @@ if test "${enable_ipv6+set}" = set; then
   enableval="$enable_ipv6"
   test "$enableval" != yes && enableval=no
   if test "$enableval" != "no" ; then
-    cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define ENABLE_IPV6 1
 EOF
 
@@ -17140,11 +17120,11 @@ EOF
 else
   enableval=no
 fi;
-echo "$as_me:17143: result: $enableval" >&5
+echo "$as_me:17123: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 if test "$enableval" = "yes"; then
 
-echo "$as_me:17147: checking ipv6 stack type" >&5
+echo "$as_me:17127: checking ipv6 stack type" >&5
 echo $ECHO_N "checking ipv6 stack type... $ECHO_C" >&6
 if test "${cf_cv_ipv6type+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17165,7 +17145,7 @@ do
 		;;
 	inria) #(vi
 				cat >conftest.$ac_ext <<_ACEOF
-#line 17168 "configure"
+#line 17148 "configure"
 #include "confdefs.h"
 
 #include <netinet/in.h>
@@ -17182,7 +17162,7 @@ rm -rf conftest*
 		;;
 	kame) #(vi
 				cat >conftest.$ac_ext <<_ACEOF
-#line 17185 "configure"
+#line 17165 "configure"
 #include "confdefs.h"
 
 #include <netinet/in.h>
@@ -17199,7 +17179,7 @@ rm -rf conftest*
 		;;
 	linux-glibc) #(vi
 				cat >conftest.$ac_ext <<_ACEOF
-#line 17202 "configure"
+#line 17182 "configure"
 #include "confdefs.h"
 
 #include <features.h>
@@ -17225,7 +17205,7 @@ rm -rf conftest*
 		;;
 	toshiba) #(vi
 		cat >conftest.$ac_ext <<_ACEOF
-#line 17228 "configure"
+#line 17208 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -17242,7 +17222,7 @@ rm -rf conftest*
 		;;
 	v6d) #(vi
 		cat >conftest.$ac_ext <<_ACEOF
-#line 17245 "configure"
+#line 17225 "configure"
 #include "confdefs.h"
 
 #include </usr/local/v6/include/sys/v6config.h>
@@ -17259,7 +17239,7 @@ rm -rf conftest*
 		;;
 	zeta)
 		cat >conftest.$ac_ext <<_ACEOF
-#line 17262 "configure"
+#line 17242 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -17281,13 +17261,13 @@ rm -rf conftest*
 done
 
 fi
-echo "$as_me:17284: result: $cf_cv_ipv6type" >&5
+echo "$as_me:17264: result: $cf_cv_ipv6type" >&5
 echo "${ECHO_T}$cf_cv_ipv6type" >&6
 
 cf_ipv6lib=none
 cf_ipv6dir=none
 
-echo "$as_me:17290: checking for IPv6 library if required" >&5
+echo "$as_me:17270: checking for IPv6 library if required" >&5
 echo $ECHO_N "checking for IPv6 library if required... $ECHO_C" >&6
 case $cf_cv_ipv6type in #(vi
 solaris) #(vi
@@ -17317,13 +17297,13 @@ zeta)
 	cf_ipv6dir=v6
 	;;
 esac
-echo "$as_me:17320: result: $cf_ipv6lib" >&5
+echo "$as_me:17300: result: $cf_ipv6lib" >&5
 echo "${ECHO_T}$cf_ipv6lib" >&6
 
 if test "$cf_ipv6lib" != "none"; then
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 17326 "configure"
+#line 17306 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -17339,16 +17319,16 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17342: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17322: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17345: \$? = $ac_status" >&5
+  echo "$as_me:17325: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17348: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17328: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17351: \$? = $ac_status" >&5
+  echo "$as_me:17331: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -17488,7 +17468,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 17491 "configure"
+#line 17471 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -17500,16 +17480,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17503: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17483: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17506: \$? = $ac_status" >&5
+  echo "$as_me:17486: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17509: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17489: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17512: \$? = $ac_status" >&5
+  echo "$as_me:17492: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -17526,7 +17506,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}:17529: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:17509: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -17552,13 +17532,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 	eval 'cf_cv_have_lib_'$cf_ipv6lib'=no'
 	cf_libdir=""
-	echo "$as_me:17555: checking for getaddrinfo" >&5
+	echo "$as_me:17535: checking for getaddrinfo" >&5
 echo $ECHO_N "checking for getaddrinfo... $ECHO_C" >&6
 if test "${ac_cv_func_getaddrinfo+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 17561 "configure"
+#line 17541 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char getaddrinfo (); below.  */
@@ -17589,16 +17569,16 @@ f = getaddrinfo; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17592: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17572: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17595: \$? = $ac_status" >&5
+  echo "$as_me:17575: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17598: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17578: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17601: \$? = $ac_status" >&5
+  echo "$as_me:17581: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_getaddrinfo=yes
 else
@@ -17608,18 +17588,18 @@ ac_cv_func_getaddrinfo=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:17611: result: $ac_cv_func_getaddrinfo" >&5
+echo "$as_me:17591: result: $ac_cv_func_getaddrinfo" >&5
 echo "${ECHO_T}$ac_cv_func_getaddrinfo" >&6
 if test $ac_cv_func_getaddrinfo = yes; then
   eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:17618: checking for getaddrinfo in -l$cf_ipv6lib" >&5
+		echo "$as_me:17598: checking for getaddrinfo in -l$cf_ipv6lib" >&5
 echo $ECHO_N "checking for getaddrinfo in -l$cf_ipv6lib... $ECHO_C" >&6
 		LIBS="-l$cf_ipv6lib $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 17622 "configure"
+#line 17602 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -17635,25 +17615,25 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17638: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17618: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17641: \$? = $ac_status" >&5
+  echo "$as_me:17621: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17644: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17624: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17647: \$? = $ac_status" >&5
+  echo "$as_me:17627: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:17649: result: yes" >&5
+  echo "$as_me:17629: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:17656: result: no" >&5
+echo "$as_me:17636: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -17743,11 +17723,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:17746: checking for -l$cf_ipv6lib in $cf_libdir" >&5
+				echo "$as_me:17726: checking for -l$cf_ipv6lib in $cf_libdir" >&5
 echo $ECHO_N "checking for -l$cf_ipv6lib in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -l$cf_ipv6lib $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 17750 "configure"
+#line 17730 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -17763,25 +17743,25 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17766: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17746: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17769: \$? = $ac_status" >&5
+  echo "$as_me:17749: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17772: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17752: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17775: \$? = $ac_status" >&5
+  echo "$as_me:17755: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:17777: result: yes" >&5
+  echo "$as_me:17757: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:17784: result: no" >&5
+echo "$as_me:17764: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -17796,7 +17776,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_ipv6lib
 
 	if test $cf_found_library = no ; then
-		{ { echo "$as_me:17799: error: No $cf_ipv6lib library found, cannot continue.  You must fetch lib$cf_ipv6lib.a
+		{ { echo "$as_me:17779: error: No $cf_ipv6lib library found, cannot continue.  You must fetch lib$cf_ipv6lib.a
 from an appropriate IPv6 kit and compile beforehand." >&5
 echo "$as_me: error: No $cf_ipv6lib library found, cannot continue.  You must fetch lib$cf_ipv6lib.a
 from an appropriate IPv6 kit and compile beforehand." >&2;}
@@ -17804,7 +17784,7 @@ from an appropriate IPv6 kit and compile beforehand." >&2;}
 	fi
 fi
 
-echo "$as_me:17807: checking working getaddrinfo" >&5
+echo "$as_me:17787: checking working getaddrinfo" >&5
 echo $ECHO_N "checking working getaddrinfo... $ECHO_C" >&6
 if test "${cf_cv_getaddrinfo+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17814,7 +17794,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_getaddrinfo=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 17817 "configure"
+#line 17797 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -17894,15 +17874,15 @@ int main()
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:17897: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17877: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17900: \$? = $ac_status" >&5
+  echo "$as_me:17880: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:17902: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17882: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17905: \$? = $ac_status" >&5
+  echo "$as_me:17885: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_getaddrinfo=yes
 else
@@ -17915,14 +17895,15 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:17918: result: $cf_cv_getaddrinfo" >&5
+echo "$as_me:17898: result: $cf_cv_getaddrinfo" >&5
 echo "${ECHO_T}$cf_cv_getaddrinfo" >&6
 if test "$cf_cv_getaddrinfo" = yes ; then
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define HAVE_GAI_STRERROR 1
 EOF
 
-	cat >>confdefs.h <<\EOF
+cat >>confdefs.h <<\EOF
 #define HAVE_GETADDRINFO 1
 EOF
 
@@ -17930,12 +17911,12 @@ fi
 
 if test "$cf_cv_getaddrinfo" != "yes"; then
 	if test "$cf_cv_ipv6type" != "linux"; then
-		{ echo "$as_me:17933: WARNING: You must get working getaddrinfo() function,
+		{ echo "$as_me:17914: WARNING: You must get working getaddrinfo() function,
 or you can specify \"--disable-ipv6\"" >&5
 echo "$as_me: WARNING: You must get working getaddrinfo() function,
 or you can specify \"--disable-ipv6\"" >&2;}
 	else
-		{ echo "$as_me:17938: WARNING: The getaddrinfo() implementation on your system seems be buggy.
+		{ echo "$as_me:17919: WARNING: The getaddrinfo() implementation on your system seems be buggy.
 You should upgrade your system library to the newest version
 of GNU C library (aka glibc)." >&5
 echo "$as_me: WARNING: The getaddrinfo() implementation on your system seems be buggy.
@@ -17946,7 +17927,7 @@ fi
 
 fi
 
-echo "$as_me:17949: checking for screen type" >&5
+echo "$as_me:17930: checking for screen type" >&5
 echo $ECHO_N "checking for screen type... $ECHO_C" >&6
 if test "${cf_cv_screen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17960,7 +17941,7 @@ case $withval in
 curses|ncurses|ncursesw|pdcurses|slang)
 	cf_cv_screen=$withval
 	;;
-*)	{ { echo "$as_me:17963: error: Unexpected value" >&5
+*)	{ { echo "$as_me:17944: error: Unexpected value" >&5
 echo "$as_me: error: Unexpected value" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -17969,13 +17950,13 @@ else
   cf_cv_screen=curses
 fi;
 fi
-echo "$as_me:17972: result: $cf_cv_screen" >&5
+echo "$as_me:17953: result: $cf_cv_screen" >&5
 echo "${ECHO_T}$cf_cv_screen" >&6
 
 case $cf_cv_screen in
 curses|ncurses*)
 
-echo "$as_me:17978: checking for specific curses-directory" >&5
+echo "$as_me:17959: checking for specific curses-directory" >&5
 echo $ECHO_N "checking for specific curses-directory... $ECHO_C" >&6
 
 # Check whether --with-curses-dir or --without-curses-dir was given.
@@ -17985,7 +17966,7 @@ if test "${with_curses_dir+set}" = set; then
 else
   cf_cv_curses_dir=no
 fi;
-echo "$as_me:17988: result: $cf_cv_curses_dir" >&5
+echo "$as_me:17969: result: $cf_cv_curses_dir" >&5
 echo "${ECHO_T}$cf_cv_curses_dir" >&6
 
 if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
@@ -18016,7 +17997,7 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:18019: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:18000: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -18049,7 +18030,7 @@ if test -n "$cf_cv_curses_dir/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 18052 "configure"
+#line 18033 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -18061,16 +18042,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18064: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18045: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18067: \$? = $ac_status" >&5
+  echo "$as_me:18048: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18070: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18051: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18073: \$? = $ac_status" >&5
+  echo "$as_me:18054: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -18087,7 +18068,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}:18090: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:18071: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -18121,7 +18102,7 @@ if test -n "$cf_cv_curses_dir/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:18124: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:18105: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -18140,7 +18121,7 @@ dft_color_style=yes
 case $cf_cv_screen in
 curses)
 
-echo "$as_me:18143: checking for extra include directories" >&5
+echo "$as_me:18124: checking for extra include directories" >&5
 echo $ECHO_N "checking for extra include directories... $ECHO_C" >&6
 if test "${cf_cv_curses_incdir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18166,11 +18147,11 @@ sunos3*|sunos4*)
 esac
 
 fi
-echo "$as_me:18169: result: $cf_cv_curses_incdir" >&5
+echo "$as_me:18150: result: $cf_cv_curses_incdir" >&5
 echo "${ECHO_T}$cf_cv_curses_incdir" >&6
 test "$cf_cv_curses_incdir" != no && CPPFLAGS="$CPPFLAGS $cf_cv_curses_incdir"
 
-echo "$as_me:18173: checking if we have identified curses headers" >&5
+echo "$as_me:18154: checking if we have identified curses headers" >&5
 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
 if test "${cf_cv_ncurses_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18182,7 +18163,7 @@ for cf_header in  \
 	curses.h ncurses/ncurses.h ncurses/curses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 18185 "configure"
+#line 18166 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -18194,16 +18175,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18197: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18178: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18200: \$? = $ac_status" >&5
+  echo "$as_me:18181: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18203: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18184: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18206: \$? = $ac_status" >&5
+  echo "$as_me:18187: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -18214,11 +18195,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:18217: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:18198: result: $cf_cv_ncurses_header" >&5
 echo "${ECHO_T}$cf_cv_ncurses_header" >&6
 
 if test "$cf_cv_ncurses_header" = none ; then
-	{ { echo "$as_me:18221: error: No curses header-files found" >&5
+	{ { echo "$as_me:18202: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -18228,23 +18209,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:18231: checking for $ac_header" >&5
+echo "$as_me:18212: 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 18237 "configure"
+#line 18218 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18241: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:18222: \"$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:18247: \$? = $ac_status" >&5
+  echo "$as_me:18228: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18263,7 +18244,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:18266: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:18247: 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
@@ -18273,7 +18254,7 @@ EOF
 fi
 done
 
-echo "$as_me:18276: checking for terminfo header" >&5
+echo "$as_me:18257: checking for terminfo header" >&5
 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
 if test "${cf_cv_term_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18291,7 +18272,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 18294 "configure"
+#line 18275 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -18306,16 +18287,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18309: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18290: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18312: \$? = $ac_status" >&5
+  echo "$as_me:18293: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18315: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18296: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18318: \$? = $ac_status" >&5
+  echo "$as_me:18299: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -18331,14 +18312,15 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:18334: result: $cf_cv_term_header" >&5
+echo "$as_me:18315: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
 
 case $cf_cv_term_header in # (vi
 *term.h)
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define HAVE_TERM_H 1
 EOF
 
@@ -18347,20 +18329,22 @@ esac
 
 case $cf_cv_term_header in # (vi
 ncurses/term.h) #(vi
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define HAVE_NCURSES_TERM_H 1
 EOF
 
 	;;
 ncursesw/term.h)
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define HAVE_NCURSESW_TERM_H 1
 EOF
 
 	;;
 esac
 
-echo "$as_me:18363: checking for ncurses version" >&5
+echo "$as_me:18347: checking for ncurses version" >&5
 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
 if test "${cf_cv_ncurses_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18386,10 +18370,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:18389: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:18373: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:18392: \$? = $ac_status" >&5
+  echo "$as_me:18376: \$? = $ac_status" >&5
   (exit $ac_status); }
 	if test -f conftest.out ; then
 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
@@ -18399,7 +18383,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 18402 "configure"
+#line 18386 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -18424,15 +18408,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:18427: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18411: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18430: \$? = $ac_status" >&5
+  echo "$as_me:18414: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:18432: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18416: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18435: \$? = $ac_status" >&5
+  echo "$as_me:18419: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -18446,16 +18430,17 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:18449: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:18433: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
-test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF
+test "$cf_cv_ncurses_version" = no ||
+cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:18455: checking if we have identified curses libraries" >&5
+echo "$as_me:18440: checking if we have identified curses libraries" >&5
 echo $ECHO_N "checking if we have identified curses libraries... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 18458 "configure"
+#line 18443 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -18467,16 +18452,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18470: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18455: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18473: \$? = $ac_status" >&5
+  echo "$as_me:18458: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18476: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18461: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18479: \$? = $ac_status" >&5
+  echo "$as_me:18464: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -18485,13 +18470,13 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:18488: result: $cf_result" >&5
+echo "$as_me:18473: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 if test "$cf_result" = no ; then
 case $host_os in #(vi
 freebsd*) #(vi
-    echo "$as_me:18494: checking for tgoto in -lmytinfo" >&5
+    echo "$as_me:18479: checking for tgoto in -lmytinfo" >&5
 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18499,7 +18484,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 18502 "configure"
+#line 18487 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18518,16 +18503,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18521: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18506: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18524: \$? = $ac_status" >&5
+  echo "$as_me:18509: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18527: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18512: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18530: \$? = $ac_status" >&5
+  echo "$as_me:18515: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -18538,7 +18523,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18541: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:18526: result: $ac_cv_lib_mytinfo_tgoto" >&5
 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
 if test $ac_cv_lib_mytinfo_tgoto = yes; then
   LIBS="-lmytinfo $LIBS"
@@ -18552,7 +18537,7 @@ hpux10.*) #(vi
 	# term.h) for cur_colr
 	if test "x$cf_cv_screen" = "xcurses_colr"
 	then
-		echo "$as_me:18555: checking for initscr in -lcur_colr" >&5
+		echo "$as_me:18540: checking for initscr in -lcur_colr" >&5
 echo $ECHO_N "checking for initscr in -lcur_colr... $ECHO_C" >&6
 if test "${ac_cv_lib_cur_colr_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18560,7 +18545,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcur_colr  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 18563 "configure"
+#line 18548 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18579,16 +18564,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18582: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18567: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18585: \$? = $ac_status" >&5
+  echo "$as_me:18570: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18588: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18573: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18591: \$? = $ac_status" >&5
+  echo "$as_me:18576: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_cur_colr_initscr=yes
 else
@@ -18599,7 +18584,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18602: result: $ac_cv_lib_cur_colr_initscr" >&5
+echo "$as_me:18587: result: $ac_cv_lib_cur_colr_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_cur_colr_initscr" >&6
 if test $ac_cv_lib_cur_colr_initscr = yes; then
 
@@ -18608,7 +18593,7 @@ if test $ac_cv_lib_cur_colr_initscr = yes; then
 
 else
 
-		echo "$as_me:18611: checking for initscr in -lHcurses" >&5
+		echo "$as_me:18596: checking for initscr in -lHcurses" >&5
 echo $ECHO_N "checking for initscr in -lHcurses... $ECHO_C" >&6
 if test "${ac_cv_lib_Hcurses_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18616,7 +18601,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lHcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 18619 "configure"
+#line 18604 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18635,16 +18620,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18638: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18623: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18641: \$? = $ac_status" >&5
+  echo "$as_me:18626: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18644: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18629: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18647: \$? = $ac_status" >&5
+  echo "$as_me:18632: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Hcurses_initscr=yes
 else
@@ -18655,7 +18640,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18658: result: $ac_cv_lib_Hcurses_initscr" >&5
+echo "$as_me:18643: result: $ac_cv_lib_Hcurses_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_Hcurses_initscr" >&6
 if test $ac_cv_lib_Hcurses_initscr = yes; then
 
@@ -18695,7 +18680,7 @@ if test -n "/lib64" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:18698: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:18683: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -18724,7 +18709,7 @@ if test -n "/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:18727: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:18712: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -18755,7 +18740,7 @@ if test -n "/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:18758: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:18743: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -18790,7 +18775,7 @@ if test -n "/usr/5lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:18793: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:18778: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -18819,13 +18804,13 @@ if test ".$ac_cv_func_initscr" != .yes ; then
 
     # Check for library containing tgoto.  Do this before curses library
     # because it may be needed to link the test-case for initscr.
-    echo "$as_me:18822: checking for tgoto" >&5
+    echo "$as_me:18807: checking for tgoto" >&5
 echo $ECHO_N "checking for tgoto... $ECHO_C" >&6
 if test "${ac_cv_func_tgoto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 18828 "configure"
+#line 18813 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char tgoto (); below.  */
@@ -18856,16 +18841,16 @@ f = tgoto; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18859: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18844: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18862: \$? = $ac_status" >&5
+  echo "$as_me:18847: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18865: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18850: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18868: \$? = $ac_status" >&5
+  echo "$as_me:18853: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_tgoto=yes
 else
@@ -18875,7 +18860,7 @@ ac_cv_func_tgoto=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:18878: result: $ac_cv_func_tgoto" >&5
+echo "$as_me:18863: result: $ac_cv_func_tgoto" >&5
 echo "${ECHO_T}$ac_cv_func_tgoto" >&6
 if test $ac_cv_func_tgoto = yes; then
   cf_term_lib=predefined
@@ -18884,7 +18869,7 @@ else
         for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown
         do
             as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh`
-echo "$as_me:18887: checking for tgoto in -l$cf_term_lib" >&5
+echo "$as_me:18872: checking for tgoto in -l$cf_term_lib" >&5
 echo $ECHO_N "checking for tgoto in -l$cf_term_lib... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18892,7 +18877,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_term_lib  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 18895 "configure"
+#line 18880 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18911,16 +18896,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18914: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18899: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18917: \$? = $ac_status" >&5
+  echo "$as_me:18902: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18920: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18905: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18923: \$? = $ac_status" >&5
+  echo "$as_me:18908: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -18931,7 +18916,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18934: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:18919: result: `eval echo '${'$as_ac_Lib'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
 if test `eval echo '${'$as_ac_Lib'}'` = yes; then
   break
@@ -18946,7 +18931,7 @@ fi
  	for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown
     do
         as_ac_Lib=`echo "ac_cv_lib_$cf_curs_lib''_initscr" | $as_tr_sh`
-echo "$as_me:18949: checking for initscr in -l$cf_curs_lib" >&5
+echo "$as_me:18934: checking for initscr in -l$cf_curs_lib" >&5
 echo $ECHO_N "checking for initscr in -l$cf_curs_lib... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18954,7 +18939,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_curs_lib  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 18957 "configure"
+#line 18942 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18973,16 +18958,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18976: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18961: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18979: \$? = $ac_status" >&5
+  echo "$as_me:18964: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18982: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18967: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18985: \$? = $ac_status" >&5
+  echo "$as_me:18970: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -18993,23 +18978,23 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18996: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:18981: result: `eval echo '${'$as_ac_Lib'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
 if test `eval echo '${'$as_ac_Lib'}'` = yes; then
   break
 fi
 
     done
-    test $cf_curs_lib = unknown && { { echo "$as_me:19003: error: no curses library found" >&5
+    test $cf_curs_lib = unknown && { { echo "$as_me:18988: error: no curses library found" >&5
 echo "$as_me: error: no curses library found" >&2;}
    { (exit 1); exit 1; }; }
 
     LIBS="-l$cf_curs_lib $cf_save_LIBS"
     if test "$cf_term_lib" = unknown ; then
-        echo "$as_me:19009: checking if we can link with $cf_curs_lib library" >&5
+        echo "$as_me:18994: checking if we can link with $cf_curs_lib library" >&5
 echo $ECHO_N "checking if we can link with $cf_curs_lib library... $ECHO_C" >&6
         cat >conftest.$ac_ext <<_ACEOF
-#line 19012 "configure"
+#line 18997 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -19021,16 +19006,16 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19024: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19009: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19027: \$? = $ac_status" >&5
+  echo "$as_me:19012: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19030: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19015: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19033: \$? = $ac_status" >&5
+  echo "$as_me:19018: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -19039,18 +19024,18 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-        echo "$as_me:19042: result: $cf_result" >&5
+        echo "$as_me:19027: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
-        test $cf_result = no && { { echo "$as_me:19044: error: Cannot link curses library" >&5
+        test $cf_result = no && { { echo "$as_me:19029: error: Cannot link curses library" >&5
 echo "$as_me: error: Cannot link curses library" >&2;}
    { (exit 1); exit 1; }; }
     elif test "$cf_curs_lib" = "$cf_term_lib" ; then
         :
     elif test "$cf_term_lib" != predefined ; then
-        echo "$as_me:19050: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+        echo "$as_me:19035: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
 echo $ECHO_N "checking if we need both $cf_curs_lib and $cf_term_lib libraries... $ECHO_C" >&6
         cat >conftest.$ac_ext <<_ACEOF
-#line 19053 "configure"
+#line 19038 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -19062,16 +19047,16 @@ initscr(); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19065: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19050: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19068: \$? = $ac_status" >&5
+  echo "$as_me:19053: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19071: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19056: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19074: \$? = $ac_status" >&5
+  echo "$as_me:19059: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=no
 else
@@ -19080,7 +19065,7 @@ cat conftest.$ac_ext >&5
 
             LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
             cat >conftest.$ac_ext <<_ACEOF
-#line 19083 "configure"
+#line 19068 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -19092,16 +19077,16 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19095: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19080: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19098: \$? = $ac_status" >&5
+  echo "$as_me:19083: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19101: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19086: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19104: \$? = $ac_status" >&5
+  echo "$as_me:19089: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -19113,13 +19098,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-        echo "$as_me:19116: result: $cf_result" >&5
+        echo "$as_me:19101: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
     fi
 fi
 fi
 
-echo "$as_me:19122: checking for curses performance tradeoff" >&5
+echo "$as_me:19107: checking for curses performance tradeoff" >&5
 echo $ECHO_N "checking for curses performance tradeoff... $ECHO_C" >&6
 if test "${cf_cv_curs_performance+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19127,7 +19112,7 @@ else
 
     cf_cv_curs_performance=no
     cat >conftest.$ac_ext <<_ACEOF
-#line 19130 "configure"
+#line 19115 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19146,20 +19131,20 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19149: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19134: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19152: \$? = $ac_status" >&5
+  echo "$as_me:19137: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19155: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19140: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19158: \$? = $ac_status" >&5
+  echo "$as_me:19143: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 19162 "configure"
+#line 19147 "configure"
 #include "confdefs.h"
 
 #define CURS_PERFORMANCE
@@ -19179,16 +19164,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19182: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19167: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19185: \$? = $ac_status" >&5
+  echo "$as_me:19170: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19188: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19173: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19191: \$? = $ac_status" >&5
+  echo "$as_me:19176: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_curs_performance=yes
 else
@@ -19203,20 +19188,21 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:19206: result: $cf_cv_curs_performance" >&5
+echo "$as_me:19191: result: $cf_cv_curs_performance" >&5
 echo "${ECHO_T}$cf_cv_curs_performance" >&6
-test $cf_cv_curs_performance = yes && cat >>confdefs.h <<\EOF
+test $cf_cv_curs_performance = yes &&
+cat >>confdefs.h <<\EOF
 #define CURS_PERFORMANCE 1
 EOF
 
-echo "$as_me:19212: checking for curses touchline function" >&5
+echo "$as_me:19198: checking for curses touchline function" >&5
 echo $ECHO_N "checking for curses touchline function... $ECHO_C" >&6
 if test "${cf_cv_curs_touchline+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 19219 "configure"
+#line 19205 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19229,23 +19215,23 @@ touchline(stdscr, 1,2,3);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19232: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19218: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19235: \$? = $ac_status" >&5
+  echo "$as_me:19221: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19238: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19224: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19241: \$? = $ac_status" >&5
+  echo "$as_me:19227: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_curs_touchline=bsd
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 19248 "configure"
+#line 19234 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19258,16 +19244,16 @@ touchline(stdscr, 1,2);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19261: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19247: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19264: \$? = $ac_status" >&5
+  echo "$as_me:19250: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19267: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19253: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19270: \$? = $ac_status" >&5
+  echo "$as_me:19256: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_curs_touchline=sysv
 else
@@ -19279,17 +19265,19 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:19282: result: $cf_cv_curs_touchline" >&5
+echo "$as_me:19268: result: $cf_cv_curs_touchline" >&5
 echo "${ECHO_T}$cf_cv_curs_touchline" >&6
 case "$cf_cv_curs_touchline" in #(vi
 bsd) #(vi
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define HAVE_BSD_TOUCHLINE 1
 EOF
 
 	;;
 sysv)
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define HAVE_SYSV_TOUCHLINE 1
 EOF
 
@@ -19308,7 +19296,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:19311: checking for $ac_word" >&5
+echo "$as_me:19299: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19323,7 +19311,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_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:19326: found $ac_dir/$ac_word" >&5
+echo "$as_me:19314: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -19331,10 +19319,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:19334: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:19322: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:19337: result: no" >&5
+  echo "$as_me:19325: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -19347,7 +19335,7 @@ if test -z "$NCURSES_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:19350: checking for $ac_word" >&5
+echo "$as_me:19338: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19362,7 +19350,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_NCURSES_CONFIG="$ac_prog"
-echo "$as_me:19365: found $ac_dir/$ac_word" >&5
+echo "$as_me:19353: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -19370,10 +19358,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
-  echo "$as_me:19373: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:19361: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:19376: result: no" >&5
+  echo "$as_me:19364: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -19391,7 +19379,7 @@ LIBS="`$NCURSES_CONFIG --libs` $LIBS"
 
 # even with config script, some packages use no-override for curses.h
 
-echo "$as_me:19394: checking if we have identified curses headers" >&5
+echo "$as_me:19382: checking if we have identified curses headers" >&5
 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
 if test "${cf_cv_ncurses_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19405,7 +19393,7 @@ for cf_header in  \
 	curses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 19408 "configure"
+#line 19396 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -19417,16 +19405,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19420: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19408: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19423: \$? = $ac_status" >&5
+  echo "$as_me:19411: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19426: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19414: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19429: \$? = $ac_status" >&5
+  echo "$as_me:19417: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -19437,11 +19425,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:19440: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:19428: result: $cf_cv_ncurses_header" >&5
 echo "${ECHO_T}$cf_cv_ncurses_header" >&6
 
 if test "$cf_cv_ncurses_header" = none ; then
-	{ { echo "$as_me:19444: error: No curses header-files found" >&5
+	{ { echo "$as_me:19432: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -19451,23 +19439,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:19454: checking for $ac_header" >&5
+echo "$as_me:19442: 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 19460 "configure"
+#line 19448 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:19464: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:19452: \"$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:19470: \$? = $ac_status" >&5
+  echo "$as_me:19458: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -19486,7 +19474,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:19489: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:19477: 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
@@ -19539,7 +19527,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 19542 "configure"
+#line 19530 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -19551,16 +19539,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19554: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19542: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19557: \$? = $ac_status" >&5
+  echo "$as_me:19545: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19560: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19548: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19563: \$? = $ac_status" >&5
+  echo "$as_me:19551: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -19577,7 +19565,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}:19580: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:19568: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -19594,7 +19582,7 @@ fi
 
 }
 
-echo "$as_me:19597: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:19585: checking for $cf_ncuhdr_root header in include-path" >&5
 echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19606,7 +19594,7 @@ else
 	do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 19609 "configure"
+#line 19597 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -19630,16 +19618,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19633: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19621: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19636: \$? = $ac_status" >&5
+  echo "$as_me:19624: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19639: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19627: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19642: \$? = $ac_status" >&5
+  echo "$as_me:19630: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -19654,14 +19642,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 	done
 
 fi
-echo "$as_me:19657: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:19645: result: $cf_cv_ncurses_h" >&5
 echo "${ECHO_T}$cf_cv_ncurses_h" >&6
 
 if test "$cf_cv_ncurses_h" != no ; then
 	cf_cv_ncurses_header=$cf_cv_ncurses_h
 else
 
-echo "$as_me:19664: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:19652: checking for $cf_ncuhdr_root include-path" >&5
 echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19801,7 +19789,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 19804 "configure"
+#line 19792 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -19813,16 +19801,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19816: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19804: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19819: \$? = $ac_status" >&5
+  echo "$as_me:19807: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19822: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19810: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19825: \$? = $ac_status" >&5
+  echo "$as_me:19813: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -19839,7 +19827,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}:19842: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:19830: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -19860,7 +19848,7 @@ fi
 		do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 19863 "configure"
+#line 19851 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -19884,16 +19872,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19887: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19875: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19890: \$? = $ac_status" >&5
+  echo "$as_me:19878: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19893: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19881: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19896: \$? = $ac_status" >&5
+  echo "$as_me:19884: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -19914,12 +19902,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:19917: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:19905: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:19922: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:19910: result: $cf_cv_ncurses_h2" >&5
 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
 
 	cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
@@ -19952,7 +19940,7 @@ if test -n "$cf_1st_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 19955 "configure"
+#line 19943 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -19964,16 +19952,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19967: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19955: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19970: \$? = $ac_status" >&5
+  echo "$as_me:19958: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19973: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19961: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19976: \$? = $ac_status" >&5
+  echo "$as_me:19964: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -19990,7 +19978,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}:19993: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:19981: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -20011,7 +19999,8 @@ fi
 
 case $cf_cv_ncurses_header in # (vi
 *ncurses.h)
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define HAVE_NCURSES_H 1
 EOF
 
@@ -20020,20 +20009,22 @@ esac
 
 case $cf_cv_ncurses_header in # (vi
 ncurses/curses.h|ncurses/ncurses.h)
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define HAVE_NCURSES_NCURSES_H 1
 EOF
 
 	;;
 ncursesw/curses.h|ncursesw/ncurses.h)
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define HAVE_NCURSESW_NCURSES_H 1
 EOF
 
 	;;
 esac
 
-echo "$as_me:20036: checking for terminfo header" >&5
+echo "$as_me:20027: checking for terminfo header" >&5
 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
 if test "${cf_cv_term_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20051,7 +20042,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 20054 "configure"
+#line 20045 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20066,16 +20057,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20069: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20060: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20072: \$? = $ac_status" >&5
+  echo "$as_me:20063: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20075: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20066: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20078: \$? = $ac_status" >&5
+  echo "$as_me:20069: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -20091,14 +20082,15 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:20094: result: $cf_cv_term_header" >&5
+echo "$as_me:20085: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
 
 case $cf_cv_term_header in # (vi
 *term.h)
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define HAVE_TERM_H 1
 EOF
 
@@ -20107,13 +20099,15 @@ esac
 
 case $cf_cv_term_header in # (vi
 ncurses/term.h) #(vi
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define HAVE_NCURSES_TERM_H 1
 EOF
 
 	;;
 ncursesw/term.h)
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define HAVE_NCURSESW_TERM_H 1
 EOF
 
@@ -20121,11 +20115,12 @@ EOF
 esac
 
 # some applications need this, but should check for NCURSES_VERSION
+
 cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:20128: checking for ncurses version" >&5
+echo "$as_me:20123: checking for ncurses version" >&5
 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
 if test "${cf_cv_ncurses_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20151,10 +20146,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:20154: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:20149: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:20157: \$? = $ac_status" >&5
+  echo "$as_me:20152: \$? = $ac_status" >&5
   (exit $ac_status); }
 	if test -f conftest.out ; then
 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
@@ -20164,7 +20159,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 20167 "configure"
+#line 20162 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20189,15 +20184,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:20192: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20187: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20195: \$? = $ac_status" >&5
+  echo "$as_me:20190: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:20197: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20192: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20200: \$? = $ac_status" >&5
+  echo "$as_me:20195: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -20211,9 +20206,10 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:20214: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:20209: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
-test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF
+test "$cf_cv_ncurses_version" = no ||
+cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
@@ -20223,7 +20219,7 @@ cf_nculib_root=ncurses
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:20226: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:20222: checking for Gpm_Open in -lgpm" >&5
 echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
 if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20231,7 +20227,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 20234 "configure"
+#line 20230 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20250,16 +20246,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20253: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20249: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20256: \$? = $ac_status" >&5
+  echo "$as_me:20252: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20259: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20255: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20262: \$? = $ac_status" >&5
+  echo "$as_me:20258: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -20270,10 +20266,10 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20273: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:20269: result: $ac_cv_lib_gpm_Gpm_Open" >&5
 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
 if test $ac_cv_lib_gpm_Gpm_Open = yes; then
-  echo "$as_me:20276: checking for initscr in -lgpm" >&5
+  echo "$as_me:20272: checking for initscr in -lgpm" >&5
 echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
 if test "${ac_cv_lib_gpm_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20281,7 +20277,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 20284 "configure"
+#line 20280 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20300,16 +20296,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20303: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20299: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20306: \$? = $ac_status" >&5
+  echo "$as_me:20302: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20309: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20305: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20312: \$? = $ac_status" >&5
+  echo "$as_me:20308: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -20320,7 +20316,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20323: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:20319: result: $ac_cv_lib_gpm_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
 if test $ac_cv_lib_gpm_initscr = yes; then
   LIBS="$cf_ncurses_SAVE"
@@ -20335,7 +20331,7 @@ freebsd*)
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it's static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:20338: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:20334: checking for tgoto in -lmytinfo" >&5
 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20343,7 +20339,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 20346 "configure"
+#line 20342 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20362,16 +20358,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20365: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20361: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20368: \$? = $ac_status" >&5
+  echo "$as_me:20364: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20371: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20367: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20374: \$? = $ac_status" >&5
+  echo "$as_me:20370: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -20382,7 +20378,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20385: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:20381: result: $ac_cv_lib_mytinfo_tgoto" >&5
 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
 if test $ac_cv_lib_mytinfo_tgoto = yes; then
   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
@@ -20401,13 +20397,13 @@ else
 
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
-	echo "$as_me:20404: checking for initscr" >&5
+	echo "$as_me:20400: checking for initscr" >&5
 echo $ECHO_N "checking for initscr... $ECHO_C" >&6
 if test "${ac_cv_func_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 20410 "configure"
+#line 20406 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */
@@ -20438,16 +20434,16 @@ f = initscr; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20441: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20437: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20444: \$? = $ac_status" >&5
+  echo "$as_me:20440: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20447: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20443: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20450: \$? = $ac_status" >&5
+  echo "$as_me:20446: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -20457,18 +20453,18 @@ ac_cv_func_initscr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:20460: result: $ac_cv_func_initscr" >&5
+echo "$as_me:20456: result: $ac_cv_func_initscr" >&5
 echo "${ECHO_T}$ac_cv_func_initscr" >&6
 if test $ac_cv_func_initscr = yes; then
   eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:20467: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:20463: checking for initscr in -l$cf_nculib_root" >&5
 echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
 		LIBS="-l$cf_nculib_root $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 20471 "configure"
+#line 20467 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -20480,25 +20476,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20483: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20479: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20486: \$? = $ac_status" >&5
+  echo "$as_me:20482: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20489: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20485: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20492: \$? = $ac_status" >&5
+  echo "$as_me:20488: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:20494: result: yes" >&5
+  echo "$as_me:20490: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:20501: result: no" >&5
+echo "$as_me:20497: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -20588,11 +20584,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:20591: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:20587: checking for -l$cf_nculib_root in $cf_libdir" >&5
 echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 20595 "configure"
+#line 20591 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -20604,25 +20600,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20607: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20603: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20610: \$? = $ac_status" >&5
+  echo "$as_me:20606: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20613: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20609: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20616: \$? = $ac_status" >&5
+  echo "$as_me:20612: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:20618: result: yes" >&5
+  echo "$as_me:20614: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:20625: result: no" >&5
+echo "$as_me:20621: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -20637,7 +20633,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:20640: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:20636: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -20645,7 +20641,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:20648: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:20644: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
 echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
 	cf_ncurses_SAVE="$LIBS"
 	for p in $cf_ncurses_LIBS ; do
@@ -20655,7 +20651,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >conftest.$ac_ext <<_ACEOF
-#line 20658 "configure"
+#line 20654 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -20667,23 +20663,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20670: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20666: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20673: \$? = $ac_status" >&5
+  echo "$as_me:20669: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20676: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20672: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20679: \$? = $ac_status" >&5
+  echo "$as_me:20675: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:20681: result: yes" >&5
+  echo "$as_me:20677: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:20686: result: no" >&5
+echo "$as_me:20682: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -20701,7 +20697,7 @@ fi
 	;;
 ncursesw)
 
-echo "$as_me:20704: checking for multibyte character support" >&5
+echo "$as_me:20700: checking for multibyte character support" >&5
 echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6
 if test "${cf_cv_utf8_lib+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20709,7 +20705,7 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 20712 "configure"
+#line 20708 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20722,16 +20718,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20725: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20721: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20728: \$? = $ac_status" >&5
+  echo "$as_me:20724: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20731: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20727: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20734: \$? = $ac_status" >&5
+  echo "$as_me:20730: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_utf8_lib=yes
 else
@@ -20743,12 +20739,12 @@ cat conftest.$ac_ext >&5
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
-echo "${as_me:-configure}:20746: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:20742: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 20751 "configure"
+#line 20747 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -20761,16 +20757,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20764: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20760: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20767: \$? = $ac_status" >&5
+  echo "$as_me:20763: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20770: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20766: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20773: \$? = $ac_status" >&5
+  echo "$as_me:20769: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -20784,7 +20780,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lutf8  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 20787 "configure"
+#line 20783 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -20797,16 +20793,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20800: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20796: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20803: \$? = $ac_status" >&5
+  echo "$as_me:20799: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20806: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20802: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20809: \$? = $ac_status" >&5
+  echo "$as_me:20805: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -20823,9 +20819,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
 
-echo "${as_me:-configure}:20826: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:20822: testing find linkage for utf8 library ..." 1>&5
 
-echo "${as_me:-configure}:20828: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:20824: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -20938,11 +20934,11 @@ cf_search="$cf_search $cf_header_path_list"
       if test -d $cf_cv_header_path_utf8 ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
 
-echo "${as_me:-configure}:20941: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:20937: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8"
         cat >conftest.$ac_ext <<_ACEOF
-#line 20945 "configure"
+#line 20941 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -20955,21 +20951,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20958: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20954: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20961: \$? = $ac_status" >&5
+  echo "$as_me:20957: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20964: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20960: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20967: \$? = $ac_status" >&5
+  echo "$as_me:20963: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found utf8 headers in $cf_cv_header_path_utf8" 1>&6
 
-echo "${as_me:-configure}:20972: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:20968: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
 
             cf_cv_find_linkage_utf8=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -20987,7 +20983,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
-echo "${as_me:-configure}:20990: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:20986: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -21084,13 +21080,13 @@ cf_search="$cf_library_path_list $cf_search"
           if test -d $cf_cv_library_path_utf8 ; then
             test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
 
-echo "${as_me:-configure}:21087: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:21083: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-lutf8  $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8"
             cat >conftest.$ac_ext <<_ACEOF
-#line 21093 "configure"
+#line 21089 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -21103,21 +21099,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21106: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21102: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21109: \$? = $ac_status" >&5
+  echo "$as_me:21105: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21112: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21108: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21115: \$? = $ac_status" >&5
+  echo "$as_me:21111: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
                 test -n "$verbose" && echo "	... found utf8 library in $cf_cv_library_path_utf8" 1>&6
 
-echo "${as_me:-configure}:21120: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:21116: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
 
                 cf_cv_find_linkage_utf8=yes
                 cf_cv_library_file_utf8="-lutf8"
@@ -21159,13 +21155,14 @@ fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:21162: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:21158: result: $cf_cv_utf8_lib" >&5
 echo "${ECHO_T}$cf_cv_utf8_lib" >&6
 
 # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between
 # ncurses/ncursesw:
 if test "$cf_cv_utf8_lib" = "add-on" ; then
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define HAVE_LIBUTF8_H 1
 EOF
 
@@ -21193,7 +21190,7 @@ if test -n "$cf_cv_header_path_utf8" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 21196 "configure"
+#line 21193 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -21205,16 +21202,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21208: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21205: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21211: \$? = $ac_status" >&5
+  echo "$as_me:21208: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21214: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21211: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21217: \$? = $ac_status" >&5
+  echo "$as_me:21214: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -21231,7 +21228,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}:21234: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:21231: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -21265,7 +21262,7 @@ if test -n "$cf_cv_library_path_utf8" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:21268: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:21265: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -21285,7 +21282,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:21288: checking for $ac_word" >&5
+echo "$as_me:21285: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21300,7 +21297,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_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:21303: found $ac_dir/$ac_word" >&5
+echo "$as_me:21300: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -21308,10 +21305,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:21311: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:21308: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:21314: result: no" >&5
+  echo "$as_me:21311: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -21324,7 +21321,7 @@ if test -z "$NCURSES_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:21327: checking for $ac_word" >&5
+echo "$as_me:21324: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21339,7 +21336,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_NCURSES_CONFIG="$ac_prog"
-echo "$as_me:21342: found $ac_dir/$ac_word" >&5
+echo "$as_me:21339: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -21347,10 +21344,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
-  echo "$as_me:21350: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:21347: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:21353: result: no" >&5
+  echo "$as_me:21350: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -21368,7 +21365,7 @@ LIBS="`$NCURSES_CONFIG --libs` $LIBS"
 
 # even with config script, some packages use no-override for curses.h
 
-echo "$as_me:21371: checking if we have identified curses headers" >&5
+echo "$as_me:21368: checking if we have identified curses headers" >&5
 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
 if test "${cf_cv_ncurses_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21382,7 +21379,7 @@ for cf_header in  \
 	curses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 21385 "configure"
+#line 21382 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -21394,16 +21391,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21397: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21394: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21400: \$? = $ac_status" >&5
+  echo "$as_me:21397: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21403: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21400: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21406: \$? = $ac_status" >&5
+  echo "$as_me:21403: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -21414,11 +21411,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:21417: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:21414: result: $cf_cv_ncurses_header" >&5
 echo "${ECHO_T}$cf_cv_ncurses_header" >&6
 
 if test "$cf_cv_ncurses_header" = none ; then
-	{ { echo "$as_me:21421: error: No curses header-files found" >&5
+	{ { echo "$as_me:21418: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -21428,23 +21425,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:21431: checking for $ac_header" >&5
+echo "$as_me:21428: 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 21437 "configure"
+#line 21434 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:21441: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:21438: \"$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:21447: \$? = $ac_status" >&5
+  echo "$as_me:21444: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -21463,7 +21460,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:21466: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:21463: 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
@@ -21516,7 +21513,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 21519 "configure"
+#line 21516 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -21528,16 +21525,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21531: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21528: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21534: \$? = $ac_status" >&5
+  echo "$as_me:21531: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21537: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21534: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21540: \$? = $ac_status" >&5
+  echo "$as_me:21537: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -21554,7 +21551,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}:21557: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:21554: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -21571,7 +21568,7 @@ fi
 
 }
 
-echo "$as_me:21574: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:21571: checking for $cf_ncuhdr_root header in include-path" >&5
 echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21583,7 +21580,7 @@ else
 	do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 21586 "configure"
+#line 21583 "configure"
 #include "confdefs.h"
 
 #define _XOPEN_SOURCE_EXTENDED
@@ -21615,16 +21612,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21618: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21615: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21621: \$? = $ac_status" >&5
+  echo "$as_me:21618: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21624: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21621: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21627: \$? = $ac_status" >&5
+  echo "$as_me:21624: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -21639,14 +21636,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 	done
 
 fi
-echo "$as_me:21642: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:21639: result: $cf_cv_ncurses_h" >&5
 echo "${ECHO_T}$cf_cv_ncurses_h" >&6
 
 if test "$cf_cv_ncurses_h" != no ; then
 	cf_cv_ncurses_header=$cf_cv_ncurses_h
 else
 
-echo "$as_me:21649: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:21646: checking for $cf_ncuhdr_root include-path" >&5
 echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21786,7 +21783,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 21789 "configure"
+#line 21786 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -21798,16 +21795,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21801: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21798: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21804: \$? = $ac_status" >&5
+  echo "$as_me:21801: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21807: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21804: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21810: \$? = $ac_status" >&5
+  echo "$as_me:21807: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -21824,7 +21821,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}:21827: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:21824: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -21845,7 +21842,7 @@ fi
 		do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 21848 "configure"
+#line 21845 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -21869,16 +21866,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21872: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21869: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21875: \$? = $ac_status" >&5
+  echo "$as_me:21872: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21878: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21875: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21881: \$? = $ac_status" >&5
+  echo "$as_me:21878: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -21899,12 +21896,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:21902: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:21899: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:21907: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:21904: result: $cf_cv_ncurses_h2" >&5
 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
 
 	cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
@@ -21937,7 +21934,7 @@ if test -n "$cf_1st_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 21940 "configure"
+#line 21937 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -21949,16 +21946,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21952: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21949: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21955: \$? = $ac_status" >&5
+  echo "$as_me:21952: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21958: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21955: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21961: \$? = $ac_status" >&5
+  echo "$as_me:21958: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -21975,7 +21972,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}:21978: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:21975: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -21996,7 +21993,8 @@ fi
 
 case $cf_cv_ncurses_header in # (vi
 *ncurses.h)
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define HAVE_NCURSES_H 1
 EOF
 
@@ -22005,13 +22003,15 @@ esac
 
 case $cf_cv_ncurses_header in # (vi
 ncurses/curses.h|ncurses/ncurses.h)
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define HAVE_NCURSES_NCURSES_H 1
 EOF
 
 	;;
 ncursesw/curses.h|ncursesw/ncurses.h)
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define HAVE_NCURSESW_NCURSES_H 1
 EOF
 
@@ -22083,7 +22083,8 @@ echo "${ECHO_T}$cf_cv_term_header" >&6
 
 case $cf_cv_term_header in # (vi
 *term.h)
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define HAVE_TERM_H 1
 EOF
 
@@ -22092,13 +22093,15 @@ esac
 
 case $cf_cv_term_header in # (vi
 ncurses/term.h) #(vi
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define HAVE_NCURSES_TERM_H 1
 EOF
 
 	;;
 ncursesw/term.h)
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define HAVE_NCURSESW_TERM_H 1
 EOF
 
@@ -22106,11 +22109,12 @@ EOF
 esac
 
 # some applications need this, but should check for NCURSES_VERSION
+
 cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:22113: checking for ncurses version" >&5
+echo "$as_me:22117: checking for ncurses version" >&5
 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
 if test "${cf_cv_ncurses_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22136,10 +22140,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:22139: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:22143: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:22142: \$? = $ac_status" >&5
+  echo "$as_me:22146: \$? = $ac_status" >&5
   (exit $ac_status); }
 	if test -f conftest.out ; then
 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
@@ -22149,7 +22153,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 22152 "configure"
+#line 22156 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -22174,15 +22178,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:22177: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22181: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22180: \$? = $ac_status" >&5
+  echo "$as_me:22184: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:22182: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22186: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22185: \$? = $ac_status" >&5
+  echo "$as_me:22189: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -22196,9 +22200,10 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:22199: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:22203: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
-test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF
+test "$cf_cv_ncurses_version" = no ||
+cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
@@ -22208,7 +22213,7 @@ cf_nculib_root=ncursesw
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:22211: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:22216: checking for Gpm_Open in -lgpm" >&5
 echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
 if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22216,7 +22221,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 22219 "configure"
+#line 22224 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22235,16 +22240,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22238: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22243: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22241: \$? = $ac_status" >&5
+  echo "$as_me:22246: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22244: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22249: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22247: \$? = $ac_status" >&5
+  echo "$as_me:22252: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -22255,10 +22260,10 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22258: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:22263: result: $ac_cv_lib_gpm_Gpm_Open" >&5
 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
 if test $ac_cv_lib_gpm_Gpm_Open = yes; then
-  echo "$as_me:22261: checking for initscr in -lgpm" >&5
+  echo "$as_me:22266: checking for initscr in -lgpm" >&5
 echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
 if test "${ac_cv_lib_gpm_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22266,7 +22271,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 22269 "configure"
+#line 22274 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22285,16 +22290,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22288: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22293: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22291: \$? = $ac_status" >&5
+  echo "$as_me:22296: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22294: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22299: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22297: \$? = $ac_status" >&5
+  echo "$as_me:22302: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -22305,7 +22310,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22308: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:22313: result: $ac_cv_lib_gpm_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
 if test $ac_cv_lib_gpm_initscr = yes; then
   LIBS="$cf_ncurses_SAVE"
@@ -22320,7 +22325,7 @@ freebsd*)
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it's static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:22323: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:22328: checking for tgoto in -lmytinfo" >&5
 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22328,7 +22333,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 22331 "configure"
+#line 22336 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22347,16 +22352,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22350: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22355: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22353: \$? = $ac_status" >&5
+  echo "$as_me:22358: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22356: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22361: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22359: \$? = $ac_status" >&5
+  echo "$as_me:22364: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -22367,7 +22372,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22370: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:22375: result: $ac_cv_lib_mytinfo_tgoto" >&5
 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
 if test $ac_cv_lib_mytinfo_tgoto = yes; then
   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
@@ -22386,13 +22391,13 @@ else
 
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
-	echo "$as_me:22389: checking for initscr" >&5
+	echo "$as_me:22394: checking for initscr" >&5
 echo $ECHO_N "checking for initscr... $ECHO_C" >&6
 if test "${ac_cv_func_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 22395 "configure"
+#line 22400 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */
@@ -22423,16 +22428,16 @@ f = initscr; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22426: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22431: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22429: \$? = $ac_status" >&5
+  echo "$as_me:22434: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22432: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22437: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22435: \$? = $ac_status" >&5
+  echo "$as_me:22440: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -22442,18 +22447,18 @@ ac_cv_func_initscr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:22445: result: $ac_cv_func_initscr" >&5
+echo "$as_me:22450: result: $ac_cv_func_initscr" >&5
 echo "${ECHO_T}$ac_cv_func_initscr" >&6
 if test $ac_cv_func_initscr = yes; then
   eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:22452: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:22457: checking for initscr in -l$cf_nculib_root" >&5
 echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
 		LIBS="-l$cf_nculib_root $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 22456 "configure"
+#line 22461 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -22465,25 +22470,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22468: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22473: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22471: \$? = $ac_status" >&5
+  echo "$as_me:22476: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22474: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22479: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22477: \$? = $ac_status" >&5
+  echo "$as_me:22482: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:22479: result: yes" >&5
+  echo "$as_me:22484: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:22486: result: no" >&5
+echo "$as_me:22491: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -22573,11 +22578,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:22576: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:22581: checking for -l$cf_nculib_root in $cf_libdir" >&5
 echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 22580 "configure"
+#line 22585 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -22589,25 +22594,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22592: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22597: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22595: \$? = $ac_status" >&5
+  echo "$as_me:22600: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22598: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22603: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22601: \$? = $ac_status" >&5
+  echo "$as_me:22606: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:22603: result: yes" >&5
+  echo "$as_me:22608: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:22610: result: no" >&5
+echo "$as_me:22615: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -22622,7 +22627,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:22625: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:22630: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -22630,7 +22635,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:22633: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:22638: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
 echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
 	cf_ncurses_SAVE="$LIBS"
 	for p in $cf_ncurses_LIBS ; do
@@ -22640,7 +22645,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >conftest.$ac_ext <<_ACEOF
-#line 22643 "configure"
+#line 22648 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -22652,23 +22657,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22655: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22660: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22658: \$? = $ac_status" >&5
+  echo "$as_me:22663: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22661: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22666: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22664: \$? = $ac_status" >&5
+  echo "$as_me:22669: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:22666: result: yes" >&5
+  echo "$as_me:22671: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:22671: result: no" >&5
+echo "$as_me:22676: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -22691,7 +22696,7 @@ pdcurses)
 	;;
 slang)
 
-echo "$as_me:22694: checking for slang header file" >&5
+echo "$as_me:22699: checking for slang header file" >&5
 echo $ECHO_N "checking for slang header file... $ECHO_C" >&6
 if test "${cf_cv_slang_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22699,7 +22704,7 @@ else
 
 	cf_cv_slang_header=no
 	cat >conftest.$ac_ext <<_ACEOF
-#line 22702 "configure"
+#line 22707 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -22711,16 +22716,16 @@ printf("%s\n", SLANG_VERSION)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22714: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22719: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22717: \$? = $ac_status" >&5
+  echo "$as_me:22722: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22720: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22725: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22723: \$? = $ac_status" >&5
+  echo "$as_me:22728: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_header=predefined
 else
@@ -22847,12 +22852,13 @@ cf_search="$cf_search $cf_header_path_list"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:22850: result: $cf_cv_slang_header" >&5
+echo "$as_me:22855: result: $cf_cv_slang_header" >&5
 echo "${ECHO_T}$cf_cv_slang_header" >&6
 
 if test "x$cf_cv_slang_header" != xno
 then
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define USE_SLANG 1
 EOF
 
@@ -22887,7 +22893,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 22890 "configure"
+#line 22896 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -22899,16 +22905,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22902: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22908: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22905: \$? = $ac_status" >&5
+  echo "$as_me:22911: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22908: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22914: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22911: \$? = $ac_status" >&5
+  echo "$as_me:22917: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -22925,7 +22931,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}:22928: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:22934: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -22955,7 +22961,7 @@ else
 
 cf_cv_termlib=none
 cat >conftest.$ac_ext <<_ACEOF
-#line 22958 "configure"
+#line 22964 "configure"
 #include "confdefs.h"
 
 int
@@ -22967,19 +22973,19 @@ char *x=(char*)tgoto("",0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22970: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22976: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22973: \$? = $ac_status" >&5
+  echo "$as_me:22979: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22976: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22982: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22979: \$? = $ac_status" >&5
+  echo "$as_me:22985: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 22982 "configure"
+#line 22988 "configure"
 #include "confdefs.h"
 
 int
@@ -22991,16 +22997,16 @@ int x=tigetstr("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22994: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23000: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22997: \$? = $ac_status" >&5
+  echo "$as_me:23003: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23000: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23006: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23003: \$? = $ac_status" >&5
+  echo "$as_me:23009: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termlib=terminfo
 else
@@ -23011,7 +23017,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	test -n "$verbose" && echo "	using functions in predefined $cf_cv_termlib LIBS" 1>&6
 
-echo "${as_me:-configure}:23014: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
+echo "${as_me:-configure}:23020: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
 
 else
   echo "$as_me: failed program was:" >&5
@@ -23026,10 +23032,10 @@ if test "$cf_cv_termlib" = none; then
 		LIBS="-l$cf_lib $cf_save_LIBS"
 		for cf_func in tigetstr tgetstr
 		do
-			echo "$as_me:23029: checking for $cf_func in -l$cf_lib" >&5
+			echo "$as_me:23035: checking for $cf_func in -l$cf_lib" >&5
 echo $ECHO_N "checking for $cf_func in -l$cf_lib... $ECHO_C" >&6
 			cat >conftest.$ac_ext <<_ACEOF
-#line 23032 "configure"
+#line 23038 "configure"
 #include "confdefs.h"
 
 int
@@ -23041,16 +23047,16 @@ int x=$cf_func("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23044: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23050: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23047: \$? = $ac_status" >&5
+  echo "$as_me:23053: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23050: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23056: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23053: \$? = $ac_status" >&5
+  echo "$as_me:23059: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -23059,7 +23065,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-			echo "$as_me:23062: result: $cf_result" >&5
+			echo "$as_me:23068: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				if test "$cf_func" = tigetstr ; then
@@ -23076,7 +23082,7 @@ echo "${ECHO_T}$cf_result" >&6
 fi
 if test "$cf_cv_termlib" = none; then
 	# allow curses library for broken AIX system.
-	echo "$as_me:23079: checking for initscr in -lcurses" >&5
+	echo "$as_me:23085: checking for initscr in -lcurses" >&5
 echo $ECHO_N "checking for initscr in -lcurses... $ECHO_C" >&6
 if test "${ac_cv_lib_curses_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -23084,7 +23090,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 23087 "configure"
+#line 23093 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23103,16 +23109,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23106: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23112: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23109: \$? = $ac_status" >&5
+  echo "$as_me:23115: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23112: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23118: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23115: \$? = $ac_status" >&5
+  echo "$as_me:23121: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_curses_initscr=yes
 else
@@ -23123,13 +23129,13 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23126: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:23132: result: $ac_cv_lib_curses_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_curses_initscr" >&6
 if test $ac_cv_lib_curses_initscr = yes; then
   LIBS="-lcurses $LIBS"
 fi
 
-	echo "$as_me:23132: checking for tgoto in -ltermcap" >&5
+	echo "$as_me:23138: checking for tgoto in -ltermcap" >&5
 echo $ECHO_N "checking for tgoto in -ltermcap... $ECHO_C" >&6
 if test "${ac_cv_lib_termcap_tgoto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -23137,7 +23143,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 23140 "configure"
+#line 23146 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23156,16 +23162,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23159: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23165: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23162: \$? = $ac_status" >&5
+  echo "$as_me:23168: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23165: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23171: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23168: \$? = $ac_status" >&5
+  echo "$as_me:23174: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_termcap_tgoto=yes
 else
@@ -23176,7 +23182,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23179: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:23185: result: $ac_cv_lib_termcap_tgoto" >&5
 echo "${ECHO_T}$ac_cv_lib_termcap_tgoto" >&6
 if test $ac_cv_lib_termcap_tgoto = yes; then
   LIBS="-ltermcap $LIBS" cf_cv_termlib=termcap
@@ -23187,20 +23193,20 @@ fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 if test "$cf_cv_termlib" = none; then
-	{ echo "$as_me:23190: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+	{ echo "$as_me:23196: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
 echo "$as_me: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&2;}
 fi
 
 fi
 
 cf_slang_LIBS2="$LIBS"
-echo "$as_me:23197: checking for acos" >&5
+echo "$as_me:23203: checking for acos" >&5
 echo $ECHO_N "checking for acos... $ECHO_C" >&6
 if test "${ac_cv_func_acos+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 23203 "configure"
+#line 23209 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char acos (); below.  */
@@ -23231,16 +23237,16 @@ f = acos; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23234: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23240: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23237: \$? = $ac_status" >&5
+  echo "$as_me:23243: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23240: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23246: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23243: \$? = $ac_status" >&5
+  echo "$as_me:23249: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_acos=yes
 else
@@ -23250,13 +23256,13 @@ ac_cv_func_acos=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:23253: result: $ac_cv_func_acos" >&5
+echo "$as_me:23259: result: $ac_cv_func_acos" >&5
 echo "${ECHO_T}$ac_cv_func_acos" >&6
 if test $ac_cv_func_acos = yes; then
   :
 else
 
-echo "$as_me:23259: checking for acos in -lm" >&5
+echo "$as_me:23265: checking for acos in -lm" >&5
 echo $ECHO_N "checking for acos in -lm... $ECHO_C" >&6
 if test "${ac_cv_lib_m_acos+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -23264,7 +23270,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm $LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 23267 "configure"
+#line 23273 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23283,16 +23289,16 @@ acos ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23286: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23292: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23289: \$? = $ac_status" >&5
+  echo "$as_me:23295: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23292: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23298: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23295: \$? = $ac_status" >&5
+  echo "$as_me:23301: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_m_acos=yes
 else
@@ -23303,7 +23309,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23306: result: $ac_cv_lib_m_acos" >&5
+echo "$as_me:23312: result: $ac_cv_lib_m_acos" >&5
 echo "${ECHO_T}$ac_cv_lib_m_acos" >&6
 if test $ac_cv_lib_m_acos = yes; then
 
@@ -23329,13 +23335,13 @@ os2*)
 
 	eval 'cf_cv_have_lib_'video'=no'
 	cf_libdir=""
-	echo "$as_me:23332: checking for v_init" >&5
+	echo "$as_me:23338: checking for v_init" >&5
 echo $ECHO_N "checking for v_init... $ECHO_C" >&6
 if test "${ac_cv_func_v_init+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 23338 "configure"
+#line 23344 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char v_init (); below.  */
@@ -23366,16 +23372,16 @@ f = v_init; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23369: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23375: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23372: \$? = $ac_status" >&5
+  echo "$as_me:23378: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23375: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23381: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23378: \$? = $ac_status" >&5
+  echo "$as_me:23384: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_v_init=yes
 else
@@ -23385,18 +23391,18 @@ ac_cv_func_v_init=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:23388: result: $ac_cv_func_v_init" >&5
+echo "$as_me:23394: result: $ac_cv_func_v_init" >&5
 echo "${ECHO_T}$ac_cv_func_v_init" >&6
 if test $ac_cv_func_v_init = yes; then
   eval 'cf_cv_have_lib_'video'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:23395: checking for v_init in -lvideo" >&5
+		echo "$as_me:23401: checking for v_init in -lvideo" >&5
 echo $ECHO_N "checking for v_init in -lvideo... $ECHO_C" >&6
 		LIBS="-lvideo $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 23399 "configure"
+#line 23405 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -23408,25 +23414,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23411: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23417: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23414: \$? = $ac_status" >&5
+  echo "$as_me:23420: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23417: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23423: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23420: \$? = $ac_status" >&5
+  echo "$as_me:23426: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:23422: result: yes" >&5
+  echo "$as_me:23428: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'video'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:23429: result: no" >&5
+echo "$as_me:23435: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -23516,11 +23522,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:23519: checking for -lvideo in $cf_libdir" >&5
+				echo "$as_me:23525: checking for -lvideo in $cf_libdir" >&5
 echo $ECHO_N "checking for -lvideo in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -lvideo $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 23523 "configure"
+#line 23529 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -23532,25 +23538,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23535: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23541: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23538: \$? = $ac_status" >&5
+  echo "$as_me:23544: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23541: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23547: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23544: \$? = $ac_status" >&5
+  echo "$as_me:23550: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:23546: result: yes" >&5
+  echo "$as_me:23552: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'video'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:23553: result: no" >&5
+echo "$as_me:23559: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -23565,7 +23571,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'video
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:23568: error: Cannot link video library" >&5
+	{ { echo "$as_me:23574: error: Cannot link video library" >&5
 echo "$as_me: error: Cannot link video library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -23575,13 +23581,13 @@ esac
 
 	eval 'cf_cv_have_lib_'slang'=no'
 	cf_libdir=""
-	echo "$as_me:23578: checking for SLtt_get_screen_size" >&5
+	echo "$as_me:23584: checking for SLtt_get_screen_size" >&5
 echo $ECHO_N "checking for SLtt_get_screen_size... $ECHO_C" >&6
 if test "${ac_cv_func_SLtt_get_screen_size+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 23584 "configure"
+#line 23590 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char SLtt_get_screen_size (); below.  */
@@ -23612,16 +23618,16 @@ f = SLtt_get_screen_size; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23615: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23621: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23618: \$? = $ac_status" >&5
+  echo "$as_me:23624: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23621: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23627: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23624: \$? = $ac_status" >&5
+  echo "$as_me:23630: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_SLtt_get_screen_size=yes
 else
@@ -23631,18 +23637,18 @@ ac_cv_func_SLtt_get_screen_size=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:23634: result: $ac_cv_func_SLtt_get_screen_size" >&5
+echo "$as_me:23640: result: $ac_cv_func_SLtt_get_screen_size" >&5
 echo "${ECHO_T}$ac_cv_func_SLtt_get_screen_size" >&6
 if test $ac_cv_func_SLtt_get_screen_size = yes; then
   eval 'cf_cv_have_lib_'slang'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:23641: checking for SLtt_get_screen_size in -lslang" >&5
+		echo "$as_me:23647: checking for SLtt_get_screen_size in -lslang" >&5
 echo $ECHO_N "checking for SLtt_get_screen_size in -lslang... $ECHO_C" >&6
 		LIBS="-lslang $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 23645 "configure"
+#line 23651 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -23654,25 +23660,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23657: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23663: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23660: \$? = $ac_status" >&5
+  echo "$as_me:23666: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23663: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23669: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23666: \$? = $ac_status" >&5
+  echo "$as_me:23672: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:23668: result: yes" >&5
+  echo "$as_me:23674: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'slang'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:23675: result: no" >&5
+echo "$as_me:23681: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -23762,11 +23768,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:23765: checking for -lslang in $cf_libdir" >&5
+				echo "$as_me:23771: checking for -lslang in $cf_libdir" >&5
 echo $ECHO_N "checking for -lslang in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -lslang $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 23769 "configure"
+#line 23775 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -23778,25 +23784,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23781: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23787: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23784: \$? = $ac_status" >&5
+  echo "$as_me:23790: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23787: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23793: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23790: \$? = $ac_status" >&5
+  echo "$as_me:23796: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:23792: result: yes" >&5
+  echo "$as_me:23798: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'slang'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:23799: result: no" >&5
+echo "$as_me:23805: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -23811,13 +23817,13 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'slang
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:23814: error: Cannot link slang library" >&5
+	{ { echo "$as_me:23820: error: Cannot link slang library" >&5
 echo "$as_me: error: Cannot link slang library" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 cf_slang_LIBS3="$LIBS"
-echo "$as_me:23820: checking if we can link slang without termcap" >&5
+echo "$as_me:23826: checking if we can link slang without termcap" >&5
 echo $ECHO_N "checking if we can link slang without termcap... $ECHO_C" >&6
 if test -n "`echo $cf_slang_LIBS1 | sed -e 's/ //g'`" ; then
 	cf_exclude=`echo ".$cf_slang_LIBS2" | sed -e "s%$cf_slang_LIBS1%%" -e 's%^.%%'`
@@ -23826,7 +23832,7 @@ else
 fi
 LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s%$cf_exclude%%" -e 's%^.%%'`
 cat >conftest.$ac_ext <<_ACEOF
-#line 23829 "configure"
+#line 23835 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -23838,16 +23844,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23841: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23847: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23844: \$? = $ac_status" >&5
+  echo "$as_me:23850: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23847: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23853: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23850: \$? = $ac_status" >&5
+  echo "$as_me:23856: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -23856,13 +23862,13 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:23859: result: $cf_result" >&5
+echo "$as_me:23865: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 test $cf_result = no && LIBS="$cf_slang_LIBS3"
 
 else
 
-echo "$as_me:23865: checking for slang2 header file" >&5
+echo "$as_me:23871: checking for slang2 header file" >&5
 echo $ECHO_N "checking for slang2 header file... $ECHO_C" >&6
 if test "${cf_cv_slang2_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -23870,7 +23876,7 @@ else
 
 	cf_cv_slang2_header=no
 	cat >conftest.$ac_ext <<_ACEOF
-#line 23873 "configure"
+#line 23879 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -23882,16 +23888,16 @@ printf("%s\n", SLANG_VERSION)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23885: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23891: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23888: \$? = $ac_status" >&5
+  echo "$as_me:23894: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23891: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23897: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23894: \$? = $ac_status" >&5
+  echo "$as_me:23900: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang2_header=predefined
 else
@@ -24018,12 +24024,13 @@ cf_search="$cf_search $cf_header_path_list"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:24021: result: $cf_cv_slang2_header" >&5
+echo "$as_me:24027: result: $cf_cv_slang2_header" >&5
 echo "${ECHO_T}$cf_cv_slang2_header" >&6
 
 if test "x$cf_cv_slang2_header" != xno
 then
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define USE_SLANG 1
 EOF
 
@@ -24058,7 +24065,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 24061 "configure"
+#line 24068 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24070,16 +24077,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24073: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24080: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24076: \$? = $ac_status" >&5
+  echo "$as_me:24083: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24079: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24086: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24082: \$? = $ac_status" >&5
+  echo "$as_me:24089: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -24096,7 +24103,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}:24099: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24106: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24126,7 +24133,7 @@ else
 
 cf_cv_termlib=none
 cat >conftest.$ac_ext <<_ACEOF
-#line 24129 "configure"
+#line 24136 "configure"
 #include "confdefs.h"
 
 int
@@ -24138,19 +24145,19 @@ char *x=(char*)tgoto("",0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24141: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24148: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24144: \$? = $ac_status" >&5
+  echo "$as_me:24151: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24147: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24154: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24150: \$? = $ac_status" >&5
+  echo "$as_me:24157: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 24153 "configure"
+#line 24160 "configure"
 #include "confdefs.h"
 
 int
@@ -24162,16 +24169,16 @@ int x=tigetstr("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24165: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24172: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24168: \$? = $ac_status" >&5
+  echo "$as_me:24175: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24171: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24178: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24174: \$? = $ac_status" >&5
+  echo "$as_me:24181: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termlib=terminfo
 else
@@ -24182,7 +24189,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	test -n "$verbose" && echo "	using functions in predefined $cf_cv_termlib LIBS" 1>&6
 
-echo "${as_me:-configure}:24185: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
+echo "${as_me:-configure}:24192: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
 
 else
   echo "$as_me: failed program was:" >&5
@@ -24197,10 +24204,10 @@ if test "$cf_cv_termlib" = none; then
 		LIBS="-l$cf_lib $cf_save_LIBS"
 		for cf_func in tigetstr tgetstr
 		do
-			echo "$as_me:24200: checking for $cf_func in -l$cf_lib" >&5
+			echo "$as_me:24207: checking for $cf_func in -l$cf_lib" >&5
 echo $ECHO_N "checking for $cf_func in -l$cf_lib... $ECHO_C" >&6
 			cat >conftest.$ac_ext <<_ACEOF
-#line 24203 "configure"
+#line 24210 "configure"
 #include "confdefs.h"
 
 int
@@ -24212,16 +24219,16 @@ int x=$cf_func("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24215: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24222: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24218: \$? = $ac_status" >&5
+  echo "$as_me:24225: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24221: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24228: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24224: \$? = $ac_status" >&5
+  echo "$as_me:24231: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -24230,7 +24237,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-			echo "$as_me:24233: result: $cf_result" >&5
+			echo "$as_me:24240: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				if test "$cf_func" = tigetstr ; then
@@ -24247,7 +24254,7 @@ echo "${ECHO_T}$cf_result" >&6
 fi
 if test "$cf_cv_termlib" = none; then
 	# allow curses library for broken AIX system.
-	echo "$as_me:24250: checking for initscr in -lcurses" >&5
+	echo "$as_me:24257: checking for initscr in -lcurses" >&5
 echo $ECHO_N "checking for initscr in -lcurses... $ECHO_C" >&6
 if test "${ac_cv_lib_curses_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -24255,7 +24262,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 24258 "configure"
+#line 24265 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24274,16 +24281,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24277: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24284: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24280: \$? = $ac_status" >&5
+  echo "$as_me:24287: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24283: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24290: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24286: \$? = $ac_status" >&5
+  echo "$as_me:24293: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_curses_initscr=yes
 else
@@ -24294,13 +24301,13 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24297: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:24304: result: $ac_cv_lib_curses_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_curses_initscr" >&6
 if test $ac_cv_lib_curses_initscr = yes; then
   LIBS="-lcurses $LIBS"
 fi
 
-	echo "$as_me:24303: checking for tgoto in -ltermcap" >&5
+	echo "$as_me:24310: checking for tgoto in -ltermcap" >&5
 echo $ECHO_N "checking for tgoto in -ltermcap... $ECHO_C" >&6
 if test "${ac_cv_lib_termcap_tgoto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -24308,7 +24315,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 24311 "configure"
+#line 24318 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24327,16 +24334,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24330: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24337: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24333: \$? = $ac_status" >&5
+  echo "$as_me:24340: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24336: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24343: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24339: \$? = $ac_status" >&5
+  echo "$as_me:24346: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_termcap_tgoto=yes
 else
@@ -24347,7 +24354,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24350: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:24357: result: $ac_cv_lib_termcap_tgoto" >&5
 echo "${ECHO_T}$ac_cv_lib_termcap_tgoto" >&6
 if test $ac_cv_lib_termcap_tgoto = yes; then
   LIBS="-ltermcap $LIBS" cf_cv_termlib=termcap
@@ -24358,20 +24365,20 @@ fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 if test "$cf_cv_termlib" = none; then
-	{ echo "$as_me:24361: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+	{ echo "$as_me:24368: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
 echo "$as_me: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&2;}
 fi
 
 fi
 
 cf_slang_LIBS2="$LIBS"
-echo "$as_me:24368: checking for acos" >&5
+echo "$as_me:24375: checking for acos" >&5
 echo $ECHO_N "checking for acos... $ECHO_C" >&6
 if test "${ac_cv_func_acos+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 24374 "configure"
+#line 24381 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char acos (); below.  */
@@ -24402,16 +24409,16 @@ f = acos; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24405: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24412: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24408: \$? = $ac_status" >&5
+  echo "$as_me:24415: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24411: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24418: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24414: \$? = $ac_status" >&5
+  echo "$as_me:24421: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_acos=yes
 else
@@ -24421,13 +24428,13 @@ ac_cv_func_acos=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:24424: result: $ac_cv_func_acos" >&5
+echo "$as_me:24431: result: $ac_cv_func_acos" >&5
 echo "${ECHO_T}$ac_cv_func_acos" >&6
 if test $ac_cv_func_acos = yes; then
   :
 else
 
-echo "$as_me:24430: checking for acos in -lm" >&5
+echo "$as_me:24437: checking for acos in -lm" >&5
 echo $ECHO_N "checking for acos in -lm... $ECHO_C" >&6
 if test "${ac_cv_lib_m_acos+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -24435,7 +24442,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm $LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 24438 "configure"
+#line 24445 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24454,16 +24461,16 @@ acos ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24457: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24464: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24460: \$? = $ac_status" >&5
+  echo "$as_me:24467: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24463: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24470: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24466: \$? = $ac_status" >&5
+  echo "$as_me:24473: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_m_acos=yes
 else
@@ -24474,7 +24481,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24477: result: $ac_cv_lib_m_acos" >&5
+echo "$as_me:24484: result: $ac_cv_lib_m_acos" >&5
 echo "${ECHO_T}$ac_cv_lib_m_acos" >&6
 if test $ac_cv_lib_m_acos = yes; then
 
@@ -24500,13 +24507,13 @@ os2*)
 
 	eval 'cf_cv_have_lib_'video'=no'
 	cf_libdir=""
-	echo "$as_me:24503: checking for v_init" >&5
+	echo "$as_me:24510: checking for v_init" >&5
 echo $ECHO_N "checking for v_init... $ECHO_C" >&6
 if test "${ac_cv_func_v_init+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 24509 "configure"
+#line 24516 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char v_init (); below.  */
@@ -24537,16 +24544,16 @@ f = v_init; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24540: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24547: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24543: \$? = $ac_status" >&5
+  echo "$as_me:24550: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24546: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24553: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24549: \$? = $ac_status" >&5
+  echo "$as_me:24556: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_v_init=yes
 else
@@ -24556,18 +24563,18 @@ ac_cv_func_v_init=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:24559: result: $ac_cv_func_v_init" >&5
+echo "$as_me:24566: result: $ac_cv_func_v_init" >&5
 echo "${ECHO_T}$ac_cv_func_v_init" >&6
 if test $ac_cv_func_v_init = yes; then
   eval 'cf_cv_have_lib_'video'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:24566: checking for v_init in -lvideo" >&5
+		echo "$as_me:24573: checking for v_init in -lvideo" >&5
 echo $ECHO_N "checking for v_init in -lvideo... $ECHO_C" >&6
 		LIBS="-lvideo $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 24570 "configure"
+#line 24577 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -24579,25 +24586,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24582: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24589: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24585: \$? = $ac_status" >&5
+  echo "$as_me:24592: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24588: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24595: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24591: \$? = $ac_status" >&5
+  echo "$as_me:24598: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:24593: result: yes" >&5
+  echo "$as_me:24600: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'video'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:24600: result: no" >&5
+echo "$as_me:24607: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -24687,11 +24694,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:24690: checking for -lvideo in $cf_libdir" >&5
+				echo "$as_me:24697: checking for -lvideo in $cf_libdir" >&5
 echo $ECHO_N "checking for -lvideo in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -lvideo $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 24694 "configure"
+#line 24701 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -24703,25 +24710,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24706: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24713: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24709: \$? = $ac_status" >&5
+  echo "$as_me:24716: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24712: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24719: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24715: \$? = $ac_status" >&5
+  echo "$as_me:24722: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:24717: result: yes" >&5
+  echo "$as_me:24724: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'video'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:24724: result: no" >&5
+echo "$as_me:24731: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -24736,7 +24743,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'video
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:24739: error: Cannot link video library" >&5
+	{ { echo "$as_me:24746: error: Cannot link video library" >&5
 echo "$as_me: error: Cannot link video library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -24746,13 +24753,13 @@ esac
 
 	eval 'cf_cv_have_lib_'slang2'=no'
 	cf_libdir=""
-	echo "$as_me:24749: checking for SLtt_get_screen_size" >&5
+	echo "$as_me:24756: checking for SLtt_get_screen_size" >&5
 echo $ECHO_N "checking for SLtt_get_screen_size... $ECHO_C" >&6
 if test "${ac_cv_func_SLtt_get_screen_size+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 24755 "configure"
+#line 24762 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char SLtt_get_screen_size (); below.  */
@@ -24783,16 +24790,16 @@ f = SLtt_get_screen_size; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24786: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24793: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24789: \$? = $ac_status" >&5
+  echo "$as_me:24796: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24792: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24799: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24795: \$? = $ac_status" >&5
+  echo "$as_me:24802: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_SLtt_get_screen_size=yes
 else
@@ -24802,18 +24809,18 @@ ac_cv_func_SLtt_get_screen_size=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:24805: result: $ac_cv_func_SLtt_get_screen_size" >&5
+echo "$as_me:24812: result: $ac_cv_func_SLtt_get_screen_size" >&5
 echo "${ECHO_T}$ac_cv_func_SLtt_get_screen_size" >&6
 if test $ac_cv_func_SLtt_get_screen_size = yes; then
   eval 'cf_cv_have_lib_'slang2'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:24812: checking for SLtt_get_screen_size in -lslang2" >&5
+		echo "$as_me:24819: checking for SLtt_get_screen_size in -lslang2" >&5
 echo $ECHO_N "checking for SLtt_get_screen_size in -lslang2... $ECHO_C" >&6
 		LIBS="-lslang2 $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 24816 "configure"
+#line 24823 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -24825,25 +24832,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24828: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24835: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24831: \$? = $ac_status" >&5
+  echo "$as_me:24838: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24834: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24841: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24837: \$? = $ac_status" >&5
+  echo "$as_me:24844: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:24839: result: yes" >&5
+  echo "$as_me:24846: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'slang2'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:24846: result: no" >&5
+echo "$as_me:24853: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -24933,11 +24940,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:24936: checking for -lslang2 in $cf_libdir" >&5
+				echo "$as_me:24943: checking for -lslang2 in $cf_libdir" >&5
 echo $ECHO_N "checking for -lslang2 in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -lslang2 $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 24940 "configure"
+#line 24947 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -24949,25 +24956,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24952: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24959: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24955: \$? = $ac_status" >&5
+  echo "$as_me:24962: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24958: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24965: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24961: \$? = $ac_status" >&5
+  echo "$as_me:24968: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:24963: result: yes" >&5
+  echo "$as_me:24970: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'slang2'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:24970: result: no" >&5
+echo "$as_me:24977: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -24982,13 +24989,13 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'slang2
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:24985: error: Cannot link slang2 library" >&5
+	{ { echo "$as_me:24992: error: Cannot link slang2 library" >&5
 echo "$as_me: error: Cannot link slang2 library" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 cf_slang_LIBS3="$LIBS"
-echo "$as_me:24991: checking if we can link slang2 without termcap" >&5
+echo "$as_me:24998: checking if we can link slang2 without termcap" >&5
 echo $ECHO_N "checking if we can link slang2 without termcap... $ECHO_C" >&6
 if test -n "`echo $cf_slang_LIBS1 | sed -e 's/ //g'`" ; then
 	cf_exclude=`echo ".$cf_slang_LIBS2" | sed -e "s%$cf_slang_LIBS1%%" -e 's%^.%%'`
@@ -24997,7 +25004,7 @@ else
 fi
 LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s%$cf_exclude%%" -e 's%^.%%'`
 cat >conftest.$ac_ext <<_ACEOF
-#line 25000 "configure"
+#line 25007 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -25009,16 +25016,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25012: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25019: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25015: \$? = $ac_status" >&5
+  echo "$as_me:25022: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25018: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25025: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25021: \$? = $ac_status" >&5
+  echo "$as_me:25028: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -25027,12 +25034,12 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:25030: result: $cf_result" >&5
+echo "$as_me:25037: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 test $cf_result = no && LIBS="$cf_slang_LIBS3"
 
 	else
-		{ { echo "$as_me:25035: error: cannot find slang headers" >&5
+		{ { echo "$as_me:25042: error: cannot find slang headers" >&5
 echo "$as_me: error: cannot find slang headers" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -25040,14 +25047,14 @@ fi
 
 # There's an unofficial set of patches for slang that gives it some limited
 # UTF8 capability.  Unfortunately it won't compile unless one defines UTF8.
-echo "$as_me:25043: checking if we must define UTF8" >&5
+echo "$as_me:25050: checking if we must define UTF8" >&5
 echo $ECHO_N "checking if we must define UTF8... $ECHO_C" >&6
 if test "${cf_cv_slang_utf8+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 25050 "configure"
+#line 25057 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -25059,16 +25066,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25062: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25069: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25065: \$? = $ac_status" >&5
+  echo "$as_me:25072: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25068: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25075: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25071: \$? = $ac_status" >&5
+  echo "$as_me:25078: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_utf8=no
 else
@@ -25076,7 +25083,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 25079 "configure"
+#line 25086 "configure"
 #include "confdefs.h"
 
 #define UTF8
@@ -25090,16 +25097,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25093: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25100: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25096: \$? = $ac_status" >&5
+  echo "$as_me:25103: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25099: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25106: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25102: \$? = $ac_status" >&5
+  echo "$as_me:25109: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_utf8=yes
 else
@@ -25112,24 +25119,25 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:25115: result: $cf_cv_slang_utf8" >&5
+echo "$as_me:25122: result: $cf_cv_slang_utf8" >&5
 echo "${ECHO_T}$cf_cv_slang_utf8" >&6
 
 if test "$cf_cv_slang_utf8" = yes ; then
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define UTF8 1
 EOF
 
 fi
 
-echo "$as_me:25125: checking if we must tell slang this is UNIX" >&5
+echo "$as_me:25133: checking if we must tell slang this is UNIX" >&5
 echo $ECHO_N "checking if we must tell slang this is UNIX... $ECHO_C" >&6
 if test "${cf_cv_slang_unix+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 25132 "configure"
+#line 25140 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -25148,16 +25156,16 @@ SLang_TT_Baud_Rate = 1
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25151: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25159: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25154: \$? = $ac_status" >&5
+  echo "$as_me:25162: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25157: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25165: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25160: \$? = $ac_status" >&5
+  echo "$as_me:25168: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_unix=yes
 else
@@ -25168,19 +25176,20 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:25171: result: $cf_cv_slang_unix" >&5
+echo "$as_me:25179: result: $cf_cv_slang_unix" >&5
 echo "${ECHO_T}$cf_cv_slang_unix" >&6
-test $cf_cv_slang_unix = yes && cat >>confdefs.h <<\EOF
+test $cf_cv_slang_unix = yes &&
+cat >>confdefs.h <<\EOF
 #define REAL_UNIX_SYSTEM 1
 EOF
 
-	echo "$as_me:25177: checking for SLsmg_Color_Type" >&5
+	echo "$as_me:25186: checking for SLsmg_Color_Type" >&5
 echo $ECHO_N "checking for SLsmg_Color_Type... $ECHO_C" >&6
 if test "${ac_cv_type_SLsmg_Color_Type+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 25183 "configure"
+#line 25192 "configure"
 #include "confdefs.h"
 #include <slang.h>
 
@@ -25196,16 +25205,16 @@ if (sizeof (SLsmg_Color_Type))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25199: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25208: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25202: \$? = $ac_status" >&5
+  echo "$as_me:25211: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25205: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25214: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25208: \$? = $ac_status" >&5
+  echo "$as_me:25217: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_SLsmg_Color_Type=yes
 else
@@ -25215,7 +25224,7 @@ ac_cv_type_SLsmg_Color_Type=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25218: result: $ac_cv_type_SLsmg_Color_Type" >&5
+echo "$as_me:25227: result: $ac_cv_type_SLsmg_Color_Type" >&5
 echo "${ECHO_T}$ac_cv_type_SLsmg_Color_Type" >&6
 if test $ac_cv_type_SLsmg_Color_Type = yes; then
   ac_cv_type_SLsmg_Color_Type=yes
@@ -25224,19 +25233,20 @@ else
 fi
 
 	if test $ac_cv_type_SLsmg_Color_Type = no; then
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define SLsmg_Color_Type int
 EOF
 
 fi
 
-	echo "$as_me:25233: checking for SLtt_Char_Type" >&5
+	echo "$as_me:25243: checking for SLtt_Char_Type" >&5
 echo $ECHO_N "checking for SLtt_Char_Type... $ECHO_C" >&6
 if test "${ac_cv_type_SLtt_Char_Type+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 25239 "configure"
+#line 25249 "configure"
 #include "confdefs.h"
 #include <slang.h>
 
@@ -25252,16 +25262,16 @@ if (sizeof (SLtt_Char_Type))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25255: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25265: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25258: \$? = $ac_status" >&5
+  echo "$as_me:25268: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25261: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25271: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25264: \$? = $ac_status" >&5
+  echo "$as_me:25274: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_SLtt_Char_Type=yes
 else
@@ -25271,7 +25281,7 @@ ac_cv_type_SLtt_Char_Type=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25274: result: $ac_cv_type_SLtt_Char_Type" >&5
+echo "$as_me:25284: result: $ac_cv_type_SLtt_Char_Type" >&5
 echo "${ECHO_T}$ac_cv_type_SLtt_Char_Type" >&6
 if test $ac_cv_type_SLtt_Char_Type = yes; then
   ac_cv_type_SLtt_Char_Type=yes
@@ -25280,7 +25290,8 @@ else
 fi
 
 	if test $ac_cv_type_SLtt_Char_Type = no; then
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define SLtt_Char_Type unsigned long
 EOF
 
@@ -25290,14 +25301,14 @@ fi
 	;;
 esac
 
-echo "$as_me:25293: checking for chtype typedef" >&5
+echo "$as_me:25304: checking for chtype typedef" >&5
 echo $ECHO_N "checking for chtype typedef... $ECHO_C" >&6
 if test "${cf_cv_chtype_decl+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 25300 "configure"
+#line 25311 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -25309,16 +25320,16 @@ chtype foo
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25312: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25323: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25315: \$? = $ac_status" >&5
+  echo "$as_me:25326: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25318: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25329: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25321: \$? = $ac_status" >&5
+  echo "$as_me:25332: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_chtype_decl=yes
 else
@@ -25328,21 +25339,22 @@ cf_cv_chtype_decl=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25331: result: $cf_cv_chtype_decl" >&5
+echo "$as_me:25342: result: $cf_cv_chtype_decl" >&5
 echo "${ECHO_T}$cf_cv_chtype_decl" >&6
 if test $cf_cv_chtype_decl = yes ; then
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define HAVE_TYPE_CHTYPE 1
 EOF
 
-	echo "$as_me:25338: checking if chtype is scalar or struct" >&5
+	echo "$as_me:25350: checking if chtype is scalar or struct" >&5
 echo $ECHO_N "checking if chtype is scalar or struct... $ECHO_C" >&6
 if test "${cf_cv_chtype_type+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 25345 "configure"
+#line 25357 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -25354,16 +25366,16 @@ chtype foo; long x = foo
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25357: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25369: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25360: \$? = $ac_status" >&5
+  echo "$as_me:25372: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25363: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25375: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25366: \$? = $ac_status" >&5
+  echo "$as_me:25378: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_chtype_type=scalar
 else
@@ -25373,17 +25385,18 @@ cf_cv_chtype_type=struct
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25376: result: $cf_cv_chtype_type" >&5
+echo "$as_me:25388: result: $cf_cv_chtype_type" >&5
 echo "${ECHO_T}$cf_cv_chtype_type" >&6
 	if test $cf_cv_chtype_type = scalar ; then
-		cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define TYPE_CHTYPE_IS_SCALAR 1
 EOF
 
 	fi
 fi
 
-echo "$as_me:25386: checking if you want the wide-curses features" >&5
+echo "$as_me:25399: checking if you want the wide-curses features" >&5
 echo $ECHO_N "checking if you want the wide-curses features... $ECHO_C" >&6
 
 # Check whether --enable-widec or --disable-widec was given.
@@ -25400,10 +25413,10 @@ else
   use_wide_curses=$cf_wide_curses
 
 fi;
-echo "$as_me:25403: result: $use_wide_curses" >&5
+echo "$as_me:25416: result: $use_wide_curses" >&5
 echo "${ECHO_T}$use_wide_curses" >&6
 
-echo "$as_me:25406: checking if color-style code should be used" >&5
+echo "$as_me:25419: checking if color-style code should be used" >&5
 echo $ECHO_N "checking if color-style code should be used... $ECHO_C" >&6
 
 # Check whether --enable-color-style or --disable-color-style was given.
@@ -25423,19 +25436,20 @@ fi;
 
 case $use_color_style in
 no)
-	echo "$as_me:25426: result: no" >&5
+	echo "$as_me:25439: result: no" >&5
 echo "${ECHO_T}no" >&6
 	INSTALL_LSS=
 	;;
 *)
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define USE_COLOR_STYLE 1
 EOF
 
-	echo "$as_me:25435: result: yes" >&5
+	echo "$as_me:25449: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-	echo "$as_me:25438: checking for location of style-sheet file" >&5
+	echo "$as_me:25452: checking for location of style-sheet file" >&5
 echo $ECHO_N "checking for location of style-sheet file... $ECHO_C" >&6
 
 # Check whether --with-lss-file or --without-lss-file was given.
@@ -25471,20 +25485,21 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:25474: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:25488: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
 esac
 
 fi
-LYNX_LSS_FILE="$withval"
+eval LYNX_LSS_FILE="$withval"
 
-	echo "$as_me:25483: result: $LYNX_LSS_FILE" >&5
+	echo "$as_me:25497: result: $LYNX_LSS_FILE" >&5
 echo "${ECHO_T}$LYNX_LSS_FILE" >&6
 
 	test "$LYNX_LSS_FILE" = no && LYNX_LSS_FILE=
-	cat >>confdefs.h <<EOF
+
+cat >>confdefs.h <<EOF
 #define LYNX_LSS_FILE "$LYNX_LSS_FILE"
 EOF
 
@@ -25492,7 +25507,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:25495: checking for the default configuration-file" >&5
+echo "$as_me:25510: checking for the default configuration-file" >&5
 echo $ECHO_N "checking for the default configuration-file... $ECHO_C" >&6
 
 # Check whether --with-cfg-file or --without-cfg-file was given.
@@ -25528,24 +25543,25 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:25531: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:25546: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
 esac
 
 fi
-LYNX_CFG_FILE="$withval"
+eval LYNX_CFG_FILE="$withval"
 
-echo "$as_me:25540: result: $LYNX_CFG_FILE" >&5
+echo "$as_me:25555: result: $LYNX_CFG_FILE" >&5
 echo "${ECHO_T}$LYNX_CFG_FILE" >&6
 
 test "$LYNX_CFG_FILE" = no && LYNX_CFG_FILE=
+
 cat >>confdefs.h <<EOF
 #define LYNX_CFG_FILE "$LYNX_CFG_FILE"
 EOF
 
-echo "$as_me:25548: checking if htmlized lynx.cfg should be built" >&5
+echo "$as_me:25564: checking if htmlized lynx.cfg should be built" >&5
 echo $ECHO_N "checking if htmlized lynx.cfg should be built... $ECHO_C" >&6
 
 # Check whether --enable-htmlized-cfg or --disable-htmlized-cfg was given.
@@ -25562,7 +25578,7 @@ else
   use_htmlized_cfg=no
 
 fi;
-echo "$as_me:25565: result: $use_htmlized_cfg" >&5
+echo "$as_me:25581: result: $use_htmlized_cfg" >&5
 echo "${ECHO_T}$use_htmlized_cfg" >&6
 
 LYNXCFG_MAKE=''
@@ -25570,7 +25586,7 @@ if test $use_htmlized_cfg = no ; then
 	LYNXCFG_MAKE='#'
 fi
 
-echo "$as_me:25573: checking if local doc directory should be linked to help page" >&5
+echo "$as_me:25589: checking if local doc directory should be linked to help page" >&5
 echo $ECHO_N "checking if local doc directory should be linked to help page... $ECHO_C" >&6
 
 # Check whether --enable-local-docs or --disable-local-docs was given.
@@ -25587,7 +25603,7 @@ else
   use_local_docs=no
 
 fi;
-echo "$as_me:25590: result: $use_local_docs" >&5
+echo "$as_me:25606: result: $use_local_docs" >&5
 echo "${ECHO_T}$use_local_docs" >&6
 
 LYNXDOC_MAKE=''
@@ -25595,7 +25611,7 @@ if test $use_local_docs = no ; then
 	LYNXDOC_MAKE='#'
 fi
 
-echo "$as_me:25598: checking for MIME library directory" >&5
+echo "$as_me:25614: checking for MIME library directory" >&5
 echo $ECHO_N "checking for MIME library directory... $ECHO_C" >&6
 
 # Check whether --with-mime-libdir or --without-mime-libdir was given.
@@ -25631,23 +25647,24 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:25634: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:25650: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
 esac
 
 fi
-MIME_LIBDIR="$withval"
+eval MIME_LIBDIR="$withval"
 
-echo "$as_me:25643: result: $MIME_LIBDIR" >&5
+echo "$as_me:25659: result: $MIME_LIBDIR" >&5
 echo "${ECHO_T}$MIME_LIBDIR" >&6
 MIME_LIBDIR=`echo "$MIME_LIBDIR" | sed -e 's,/$,,' -e 's,$,/,'`
+
 cat >>confdefs.h <<EOF
 #define MIME_LIBDIR "$MIME_LIBDIR"
 EOF
 
-echo "$as_me:25650: checking if locale-charset selection logic should be used" >&5
+echo "$as_me:25667: checking if locale-charset selection logic should be used" >&5
 echo $ECHO_N "checking if locale-charset selection logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-locale-charset or --disable-locale-charset was given.
@@ -25664,15 +25681,16 @@ else
   use_locale_charset=yes
 
 fi;
-echo "$as_me:25667: result: $use_locale_charset" >&5
+echo "$as_me:25684: result: $use_locale_charset" >&5
 echo "${ECHO_T}$use_locale_charset" >&6
-test $use_locale_charset != no && cat >>confdefs.h <<\EOF
+test $use_locale_charset != no &&
+cat >>confdefs.h <<\EOF
 #define USE_LOCALE_CHARSET 1
 EOF
 
 CHARSET_DEFS=
 
-echo "$as_me:25675: checking if you want only a few charsets" >&5
+echo "$as_me:25693: checking if you want only a few charsets" >&5
 echo $ECHO_N "checking if you want only a few charsets... $ECHO_C" >&6
 
 # Check whether --with-charsets or --without-charsets was given.
@@ -25684,9 +25702,10 @@ else
 fi;
 
 if test -n "$cf_charsets" ; then
-	echo "$as_me:25687: result: yes" >&5
+	echo "$as_me:25705: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define ALL_CHARSETS 0
 EOF
 
@@ -25697,7 +25716,7 @@ EOF
 	if test "$cf_charsets" = "minimal" ; then
 		test -n "$verbose" && echo "	using minimal list of charsets: $cf_min_charsets" 1>&6
 
-echo "${as_me:-configure}:25700: testing using minimal list of charsets: $cf_min_charsets ..." 1>&5
+echo "${as_me:-configure}:25719: testing using minimal list of charsets: $cf_min_charsets ..." 1>&5
 
 	fi
 	cf_charsets=`echo $cf_charsets | sed -e "s/minimal/$cf_min_charsets/g" -e 's/,/ /g'`
@@ -25724,28 +25743,28 @@ echo "${as_me:-configure}:25700: testing using minimal list of charsets: $cf_min
 		then
 			test -n "$verbose" && echo "	found $cf_charset" 1>&6
 
-echo "${as_me:-configure}:25727: testing found $cf_charset ..." 1>&5
+echo "${as_me:-configure}:25746: testing found $cf_charset ..." 1>&5
 
 			CHARSET_DEFS="-DNO_CHARSET_${cf_def_charset}=0 $CHARSET_DEFS"
 		else
 			test -n "$verbose" && echo "	not found $cf_charset" 1>&6
 
-echo "${as_me:-configure}:25733: testing not found $cf_charset ..." 1>&5
+echo "${as_me:-configure}:25752: testing not found $cf_charset ..." 1>&5
 
 		fi
 	done
 else
-	echo "$as_me:25738: result: no" >&5
+	echo "$as_me:25757: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:25742: checking for ANSI C header files" >&5
+echo "$as_me:25761: checking for ANSI C header files" >&5
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 25748 "configure"
+#line 25767 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -25753,13 +25772,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:25756: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:25775: \"$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:25762: \$? = $ac_status" >&5
+  echo "$as_me:25781: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -25781,7 +25800,7 @@ rm -f conftest.err conftest.$ac_ext
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 25784 "configure"
+#line 25803 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -25799,7 +25818,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 25802 "configure"
+#line 25821 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -25820,7 +25839,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 25823 "configure"
+#line 25842 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -25846,15 +25865,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:25849: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25868: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25852: \$? = $ac_status" >&5
+  echo "$as_me:25871: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:25854: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25873: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25857: \$? = $ac_status" >&5
+  echo "$as_me:25876: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -25867,7 +25886,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:25870: result: $ac_cv_header_stdc" >&5
+echo "$as_me:25889: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -25877,13 +25896,13 @@ EOF
 
 fi
 
-echo "$as_me:25880: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:25899: checking whether time.h and sys/time.h may both be included" >&5
 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
 if test "${ac_cv_header_time+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 25886 "configure"
+#line 25905 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -25899,16 +25918,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25902: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25921: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25905: \$? = $ac_status" >&5
+  echo "$as_me:25924: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25908: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25927: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25911: \$? = $ac_status" >&5
+  echo "$as_me:25930: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_header_time=yes
 else
@@ -25918,7 +25937,7 @@ ac_cv_header_time=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25921: result: $ac_cv_header_time" >&5
+echo "$as_me:25940: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -25931,13 +25950,13 @@ fi
 ac_header_dirent=no
 for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
   as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-echo "$as_me:25934: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:25953: checking for $ac_hdr that defines DIR" >&5
 echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 25940 "configure"
+#line 25959 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -25952,16 +25971,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25955: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25974: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25958: \$? = $ac_status" >&5
+  echo "$as_me:25977: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25961: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25980: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25964: \$? = $ac_status" >&5
+  echo "$as_me:25983: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -25971,7 +25990,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25974: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:25993: 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
@@ -25984,7 +26003,7 @@ fi
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  echo "$as_me:25987: checking for opendir in -ldir" >&5
+  echo "$as_me:26006: checking for opendir in -ldir" >&5
 echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
 if test "${ac_cv_lib_dir_opendir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -25992,7 +26011,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 25995 "configure"
+#line 26014 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -26011,16 +26030,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26014: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26033: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26017: \$? = $ac_status" >&5
+  echo "$as_me:26036: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26020: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26039: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26023: \$? = $ac_status" >&5
+  echo "$as_me:26042: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -26031,14 +26050,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:26034: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:26053: result: $ac_cv_lib_dir_opendir" >&5
 echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
 if test $ac_cv_lib_dir_opendir = yes; then
   LIBS="$LIBS -ldir"
 fi
 
 else
-  echo "$as_me:26041: checking for opendir in -lx" >&5
+  echo "$as_me:26060: checking for opendir in -lx" >&5
 echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
 if test "${ac_cv_lib_x_opendir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26046,7 +26065,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 26049 "configure"
+#line 26068 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -26065,16 +26084,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26068: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26087: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26071: \$? = $ac_status" >&5
+  echo "$as_me:26090: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26074: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26093: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26077: \$? = $ac_status" >&5
+  echo "$as_me:26096: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -26085,7 +26104,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:26088: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:26107: result: $ac_cv_lib_x_opendir" >&5
 echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
 if test $ac_cv_lib_x_opendir = yes; then
   LIBS="$LIBS -lx"
@@ -26113,23 +26132,23 @@ for ac_header in \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:26116: checking for $ac_header" >&5
+echo "$as_me:26135: 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 26122 "configure"
+#line 26141 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26126: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:26145: \"$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:26132: \$? = $ac_status" >&5
+  echo "$as_me:26151: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -26148,7 +26167,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:26151: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:26170: 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
@@ -26158,14 +26177,14 @@ EOF
 fi
 done
 
-echo "$as_me:26161: checking termio.h and termios.h" >&5
+echo "$as_me:26180: checking termio.h and termios.h" >&5
 echo $ECHO_N "checking termio.h and termios.h... $ECHO_C" >&6
 if test "${cf_cv_termio_and_termios+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 26168 "configure"
+#line 26187 "configure"
 #include "confdefs.h"
 
 #if HAVE_TERMIO_H
@@ -26183,16 +26202,16 @@ putchar (0x0a)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26186: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26205: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26189: \$? = $ac_status" >&5
+  echo "$as_me:26208: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26192: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26211: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26195: \$? = $ac_status" >&5
+  echo "$as_me:26214: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termio_and_termios=yes
 else
@@ -26203,20 +26222,21 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:26206: result: $cf_cv_termio_and_termios" >&5
+echo "$as_me:26225: result: $cf_cv_termio_and_termios" >&5
 echo "${ECHO_T}$cf_cv_termio_and_termios" >&6
-test $cf_cv_termio_and_termios = no && cat >>confdefs.h <<\EOF
+test $cf_cv_termio_and_termios = no &&
+cat >>confdefs.h <<\EOF
 #define TERMIO_AND_TERMIOS 1
 EOF
 
-echo "$as_me:26212: checking for sigaction and structs" >&5
+echo "$as_me:26232: checking for sigaction and structs" >&5
 echo $ECHO_N "checking for sigaction and structs... $ECHO_C" >&6
 if test "${cf_cv_func_sigaction+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 26219 "configure"
+#line 26239 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -26236,16 +26256,16 @@ struct sigaction act;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26239: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26259: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26242: \$? = $ac_status" >&5
+  echo "$as_me:26262: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26245: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26265: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26248: \$? = $ac_status" >&5
+  echo "$as_me:26268: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_func_sigaction=yes
 else
@@ -26256,32 +26276,33 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:26259: result: $cf_cv_func_sigaction" >&5
+echo "$as_me:26279: result: $cf_cv_func_sigaction" >&5
 echo "${ECHO_T}$cf_cv_func_sigaction" >&6
-test "$cf_cv_func_sigaction" = yes && cat >>confdefs.h <<\EOF
+test "$cf_cv_func_sigaction" = yes &&
+cat >>confdefs.h <<\EOF
 #define HAVE_SIGACTION 1
 EOF
 
 for ac_header in sys/wait.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:26268: checking for $ac_header" >&5
+echo "$as_me:26289: 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 26274 "configure"
+#line 26295 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26278: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:26299: \"$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:26284: \$? = $ac_status" >&5
+  echo "$as_me:26305: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -26300,7 +26321,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:26303: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:26324: 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
@@ -26321,23 +26342,23 @@ else
 for ac_header in wait.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:26324: checking for $ac_header" >&5
+echo "$as_me:26345: 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 26330 "configure"
+#line 26351 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26334: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:26355: \"$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:26340: \$? = $ac_status" >&5
+  echo "$as_me:26361: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -26356,7 +26377,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:26359: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:26380: 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
@@ -26369,23 +26390,23 @@ done
 for ac_header in waitstatus.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:26372: checking for $ac_header" >&5
+echo "$as_me:26393: 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 26378 "configure"
+#line 26399 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26382: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:26403: \"$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:26388: \$? = $ac_status" >&5
+  echo "$as_me:26409: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -26404,7 +26425,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:26407: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:26428: 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
@@ -26426,14 +26447,14 @@ cf_wait_headers="$cf_wait_headers
 fi
 fi
 
-echo "$as_me:26429: checking for union wait" >&5
+echo "$as_me:26450: checking for union wait" >&5
 echo $ECHO_N "checking for union wait... $ECHO_C" >&6
 if test "${cf_cv_type_unionwait+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 26436 "configure"
+#line 26457 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -26449,16 +26470,16 @@ int x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26452: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26473: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26455: \$? = $ac_status" >&5
+  echo "$as_me:26476: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26458: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26479: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26461: \$? = $ac_status" >&5
+  echo "$as_me:26482: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_unionwait=no
 	 echo compiles ok w/o union wait 1>&5
@@ -26468,7 +26489,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 26471 "configure"
+#line 26492 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -26488,16 +26509,16 @@ union wait x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26491: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26512: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26494: \$? = $ac_status" >&5
+  echo "$as_me:26515: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26497: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26518: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26500: \$? = $ac_status" >&5
+  echo "$as_me:26521: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_unionwait=yes
 	 echo compiles ok with union wait and possibly macros too 1>&5
@@ -26512,22 +26533,23 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:26515: result: $cf_cv_type_unionwait" >&5
+echo "$as_me:26536: result: $cf_cv_type_unionwait" >&5
 echo "${ECHO_T}$cf_cv_type_unionwait" >&6
-test $cf_cv_type_unionwait = yes && cat >>confdefs.h <<\EOF
+test $cf_cv_type_unionwait = yes &&
+cat >>confdefs.h <<\EOF
 #define HAVE_TYPE_UNIONWAIT 1
 EOF
 
 if test $cf_cv_type_unionwait = yes; then
 
-	echo "$as_me:26523: checking if union wait can be used as wait-arg" >&5
+	echo "$as_me:26545: checking if union wait can be used as wait-arg" >&5
 echo $ECHO_N "checking if union wait can be used as wait-arg... $ECHO_C" >&6
 	if test "${cf_cv_arg_union_wait+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 26530 "configure"
+#line 26552 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -26539,16 +26561,16 @@ union wait x; wait(&x)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26542: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26564: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26545: \$? = $ac_status" >&5
+  echo "$as_me:26567: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26548: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26570: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26551: \$? = $ac_status" >&5
+  echo "$as_me:26573: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_arg_union_wait=yes
 else
@@ -26560,20 +26582,21 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-	echo "$as_me:26563: result: $cf_cv_arg_union_wait" >&5
+	echo "$as_me:26585: result: $cf_cv_arg_union_wait" >&5
 echo "${ECHO_T}$cf_cv_arg_union_wait" >&6
-	test $cf_cv_arg_union_wait = yes && cat >>confdefs.h <<\EOF
+	test $cf_cv_arg_union_wait = yes &&
+cat >>confdefs.h <<\EOF
 #define WAIT_USES_UNION 1
 EOF
 
-	echo "$as_me:26569: checking if union wait can be used as waitpid-arg" >&5
+	echo "$as_me:26592: checking if union wait can be used as waitpid-arg" >&5
 echo $ECHO_N "checking if union wait can be used as waitpid-arg... $ECHO_C" >&6
 	if test "${cf_cv_arg_union_waitpid+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 26576 "configure"
+#line 26599 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -26585,16 +26608,16 @@ union wait x; waitpid(0, &x, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26588: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26611: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26591: \$? = $ac_status" >&5
+  echo "$as_me:26614: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26594: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26617: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26597: \$? = $ac_status" >&5
+  echo "$as_me:26620: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_arg_union_waitpid=yes
 else
@@ -26606,21 +26629,22 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-	echo "$as_me:26609: result: $cf_cv_arg_union_waitpid" >&5
+	echo "$as_me:26632: result: $cf_cv_arg_union_waitpid" >&5
 echo "${ECHO_T}$cf_cv_arg_union_waitpid" >&6
-	test $cf_cv_arg_union_waitpid = yes && cat >>confdefs.h <<\EOF
+	test $cf_cv_arg_union_waitpid = yes &&
+cat >>confdefs.h <<\EOF
 #define WAITPID_USES_UNION 1
 EOF
 
 fi
 
-echo "$as_me:26617: checking for uid_t in sys/types.h" >&5
+echo "$as_me:26641: checking for uid_t in sys/types.h" >&5
 echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6
 if test "${ac_cv_type_uid_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 26623 "configure"
+#line 26647 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -26634,7 +26658,7 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:26637: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:26661: result: $ac_cv_type_uid_t" >&5
 echo "${ECHO_T}$ac_cv_type_uid_t" >&6
 if test $ac_cv_type_uid_t = no; then
 
@@ -26648,7 +26672,7 @@ EOF
 
 fi
 
-echo "$as_me:26651: checking type of array argument to getgroups" >&5
+echo "$as_me:26675: checking type of array argument to getgroups" >&5
 echo $ECHO_N "checking type of array argument to getgroups... $ECHO_C" >&6
 if test "${ac_cv_type_getgroups+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26657,7 +26681,7 @@ else
   ac_cv_type_getgroups=cross
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 26660 "configure"
+#line 26684 "configure"
 #include "confdefs.h"
 /* Thanks to Mike Rendell for this test.  */
 #include <sys/types.h>
@@ -26683,15 +26707,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:26686: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26710: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26689: \$? = $ac_status" >&5
+  echo "$as_me:26713: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:26691: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26715: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26694: \$? = $ac_status" >&5
+  echo "$as_me:26718: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_getgroups=gid_t
 else
@@ -26704,7 +26728,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 if test $ac_cv_type_getgroups = cross; then
         cat >conftest.$ac_ext <<_ACEOF
-#line 26707 "configure"
+#line 26731 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 
@@ -26719,20 +26743,20 @@ rm -rf conftest*
 
 fi
 fi
-echo "$as_me:26722: result: $ac_cv_type_getgroups" >&5
+echo "$as_me:26746: result: $ac_cv_type_getgroups" >&5
 echo "${ECHO_T}$ac_cv_type_getgroups" >&6
 
 cat >>confdefs.h <<EOF
 #define GETGROUPS_T $ac_cv_type_getgroups
 EOF
 
-echo "$as_me:26729: checking for off_t" >&5
+echo "$as_me:26753: checking for off_t" >&5
 echo $ECHO_N "checking for off_t... $ECHO_C" >&6
 if test "${ac_cv_type_off_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 26735 "configure"
+#line 26759 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26747,16 +26771,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26750: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26774: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26753: \$? = $ac_status" >&5
+  echo "$as_me:26777: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26756: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26780: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26759: \$? = $ac_status" >&5
+  echo "$as_me:26783: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -26766,7 +26790,7 @@ ac_cv_type_off_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:26769: result: $ac_cv_type_off_t" >&5
+echo "$as_me:26793: result: $ac_cv_type_off_t" >&5
 echo "${ECHO_T}$ac_cv_type_off_t" >&6
 if test $ac_cv_type_off_t = yes; then
   :
@@ -26778,13 +26802,13 @@ EOF
 
 fi
 
-echo "$as_me:26781: checking for pid_t" >&5
+echo "$as_me:26805: checking for pid_t" >&5
 echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
 if test "${ac_cv_type_pid_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 26787 "configure"
+#line 26811 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26799,16 +26823,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26802: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26826: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26805: \$? = $ac_status" >&5
+  echo "$as_me:26829: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26808: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26832: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26811: \$? = $ac_status" >&5
+  echo "$as_me:26835: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -26818,7 +26842,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:26821: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:26845: result: $ac_cv_type_pid_t" >&5
 echo "${ECHO_T}$ac_cv_type_pid_t" >&6
 if test $ac_cv_type_pid_t = yes; then
   :
@@ -26830,13 +26854,13 @@ EOF
 
 fi
 
-echo "$as_me:26833: checking for uid_t in sys/types.h" >&5
+echo "$as_me:26857: checking for uid_t in sys/types.h" >&5
 echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6
 if test "${ac_cv_type_uid_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 26839 "configure"
+#line 26863 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -26850,7 +26874,7 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:26853: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:26877: result: $ac_cv_type_uid_t" >&5
 echo "${ECHO_T}$ac_cv_type_uid_t" >&6
 if test $ac_cv_type_uid_t = no; then
 
@@ -26864,13 +26888,13 @@ EOF
 
 fi
 
-echo "$as_me:26867: checking for mode_t" >&5
+echo "$as_me:26891: checking for mode_t" >&5
 echo $ECHO_N "checking for mode_t... $ECHO_C" >&6
 if test "${ac_cv_type_mode_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 26873 "configure"
+#line 26897 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26885,16 +26909,16 @@ if (sizeof (mode_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26888: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26912: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26891: \$? = $ac_status" >&5
+  echo "$as_me:26915: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26894: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26918: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26897: \$? = $ac_status" >&5
+  echo "$as_me:26921: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_mode_t=yes
 else
@@ -26904,7 +26928,7 @@ ac_cv_type_mode_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:26907: result: $ac_cv_type_mode_t" >&5
+echo "$as_me:26931: result: $ac_cv_type_mode_t" >&5
 echo "${ECHO_T}$ac_cv_type_mode_t" >&6
 if test $ac_cv_type_mode_t = yes; then
   :
@@ -26916,13 +26940,13 @@ EOF
 
 fi
 
-	echo "$as_me:26919: checking for ssize_t" >&5
+	echo "$as_me:26943: checking for ssize_t" >&5
 echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6
 if test "${ac_cv_type_ssize_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 26925 "configure"
+#line 26949 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26937,16 +26961,16 @@ if (sizeof (ssize_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26940: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26964: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26943: \$? = $ac_status" >&5
+  echo "$as_me:26967: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26946: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26970: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26949: \$? = $ac_status" >&5
+  echo "$as_me:26973: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_ssize_t=yes
 else
@@ -26956,7 +26980,7 @@ ac_cv_type_ssize_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:26959: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:26983: result: $ac_cv_type_ssize_t" >&5
 echo "${ECHO_T}$ac_cv_type_ssize_t" >&6
 if test $ac_cv_type_ssize_t = yes; then
   ac_cv_type_ssize_t=yes
@@ -26965,19 +26989,20 @@ else
 fi
 
 	if test $ac_cv_type_ssize_t = no; then
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define ssize_t int
 EOF
 
 fi
 
-	echo "$as_me:26974: checking for socklen_t" >&5
+	echo "$as_me:26999: checking for socklen_t" >&5
 echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
 if test "${ac_cv_type_socklen_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 26980 "configure"
+#line 27005 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -26995,16 +27020,16 @@ if (sizeof (socklen_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26998: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27023: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27001: \$? = $ac_status" >&5
+  echo "$as_me:27026: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27004: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27029: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27007: \$? = $ac_status" >&5
+  echo "$as_me:27032: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_socklen_t=yes
 else
@@ -27014,7 +27039,7 @@ ac_cv_type_socklen_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27017: result: $ac_cv_type_socklen_t" >&5
+echo "$as_me:27042: result: $ac_cv_type_socklen_t" >&5
 echo "${ECHO_T}$ac_cv_type_socklen_t" >&6
 if test $ac_cv_type_socklen_t = yes; then
   ac_cv_type_socklen_t=yes
@@ -27023,13 +27048,14 @@ else
 fi
 
 	if test $ac_cv_type_socklen_t = no; then
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define socklen_t int
 EOF
 
 fi
 
-echo "$as_me:27032: checking for long long type" >&5
+echo "$as_me:27058: checking for long long type" >&5
 echo $ECHO_N "checking for long long type... $ECHO_C" >&6
 if test "${cf_cv_type_long_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27060,24 +27086,25 @@ _CFEOF
 	rm -f conftest*
 
 fi
-echo "$as_me:27063: result: $cf_cv_type_long_long" >&5
+echo "$as_me:27089: result: $cf_cv_type_long_long" >&5
 echo "${ECHO_T}$cf_cv_type_long_long" >&6
 
 if test "$cf_cv_type_long_long" = yes ; then
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define HAVE_LONG_LONG 1
 EOF
 
 fi
 
-echo "$as_me:27073: checking for tm.tm_gmtoff" >&5
+echo "$as_me:27100: checking for tm.tm_gmtoff" >&5
 echo $ECHO_N "checking for tm.tm_gmtoff... $ECHO_C" >&6
 if test "${cf_cv_tm_gmtoff+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 27080 "configure"
+#line 27107 "configure"
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
@@ -27102,16 +27129,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27105: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27132: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27108: \$? = $ac_status" >&5
+  echo "$as_me:27135: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27111: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27138: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27114: \$? = $ac_status" >&5
+  echo "$as_me:27141: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_tm_gmtoff=yes
 else
@@ -27122,19 +27149,20 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:27125: result: $cf_cv_tm_gmtoff" >&5
+echo "$as_me:27152: result: $cf_cv_tm_gmtoff" >&5
 echo "${ECHO_T}$cf_cv_tm_gmtoff" >&6
-test $cf_cv_tm_gmtoff = no && cat >>confdefs.h <<\EOF
+test $cf_cv_tm_gmtoff = no &&
+cat >>confdefs.h <<\EOF
 #define DONT_HAVE_TM_GMTOFF 1
 EOF
 
-echo "$as_me:27131: checking for int" >&5
+echo "$as_me:27159: checking for int" >&5
 echo $ECHO_N "checking for int... $ECHO_C" >&6
 if test "${ac_cv_type_int+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 27137 "configure"
+#line 27165 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27149,16 +27177,16 @@ if (sizeof (int))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27152: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27180: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27155: \$? = $ac_status" >&5
+  echo "$as_me:27183: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27158: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27186: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27161: \$? = $ac_status" >&5
+  echo "$as_me:27189: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_int=yes
 else
@@ -27168,10 +27196,10 @@ ac_cv_type_int=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27171: result: $ac_cv_type_int" >&5
+echo "$as_me:27199: result: $ac_cv_type_int" >&5
 echo "${ECHO_T}$ac_cv_type_int" >&6
 
-echo "$as_me:27174: checking size of int" >&5
+echo "$as_me:27202: checking size of int" >&5
 echo $ECHO_N "checking size of int... $ECHO_C" >&6
 if test "${ac_cv_sizeof_int+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27180,7 +27208,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 27183 "configure"
+#line 27211 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27192,21 +27220,21 @@ int _array_ [1 - 2 * !((sizeof (int)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27195: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27223: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27198: \$? = $ac_status" >&5
+  echo "$as_me:27226: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27201: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27229: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27204: \$? = $ac_status" >&5
+  echo "$as_me:27232: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 27209 "configure"
+#line 27237 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27218,16 +27246,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27221: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27249: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27224: \$? = $ac_status" >&5
+  echo "$as_me:27252: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27227: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27255: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27230: \$? = $ac_status" >&5
+  echo "$as_me:27258: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -27243,7 +27271,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 27246 "configure"
+#line 27274 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27255,16 +27283,16 @@ int _array_ [1 - 2 * !((sizeof (int)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27258: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27286: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27261: \$? = $ac_status" >&5
+  echo "$as_me:27289: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27264: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27292: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27267: \$? = $ac_status" >&5
+  echo "$as_me:27295: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -27280,7 +27308,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
   cat >conftest.$ac_ext <<_ACEOF
-#line 27283 "configure"
+#line 27311 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27292,16 +27320,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27295: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27323: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27298: \$? = $ac_status" >&5
+  echo "$as_me:27326: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27301: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27329: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27304: \$? = $ac_status" >&5
+  echo "$as_me:27332: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -27314,12 +27342,12 @@ done
 ac_cv_sizeof_int=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:27317: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:27345: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 27322 "configure"
+#line 27350 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27335,15 +27363,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:27338: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27366: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27341: \$? = $ac_status" >&5
+  echo "$as_me:27369: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:27343: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27371: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27346: \$? = $ac_status" >&5
+  echo "$as_me:27374: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_int=`cat conftest.val`
 else
@@ -27359,7 +27387,7 @@ else
   ac_cv_sizeof_int=0
 fi
 fi
-echo "$as_me:27362: result: $ac_cv_sizeof_int" >&5
+echo "$as_me:27390: result: $ac_cv_sizeof_int" >&5
 echo "${ECHO_T}$ac_cv_sizeof_int" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_INT $ac_cv_sizeof_int
@@ -27367,23 +27395,23 @@ EOF
 
 if test "${ac_cv_type_int:+set}" = set; then
 	if test "${ac_cv_sizeof_int:+set}" != set; then
-		{ echo "$as_me:27370: WARNING: using 4 for sizeof int" >&5
+		{ echo "$as_me:27398: WARNING: using 4 for sizeof int" >&5
 echo "$as_me: WARNING: using 4 for sizeof int" >&2;}
 		ac_cv_sizeof_int=4
 	elif test "x${ac_cv_sizeof_int}" = x0; then
-		{ echo "$as_me:27374: WARNING: sizeof int not found, using 4" >&5
+		{ echo "$as_me:27402: WARNING: sizeof int not found, using 4" >&5
 echo "$as_me: WARNING: sizeof int not found, using 4" >&2;}
 		ac_cv_sizeof_int=4
 	fi
 fi
 
-echo "$as_me:27380: checking for long" >&5
+echo "$as_me:27408: checking for long" >&5
 echo $ECHO_N "checking for long... $ECHO_C" >&6
 if test "${ac_cv_type_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 27386 "configure"
+#line 27414 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27398,16 +27426,16 @@ if (sizeof (long))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27401: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27429: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27404: \$? = $ac_status" >&5
+  echo "$as_me:27432: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27407: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27435: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27410: \$? = $ac_status" >&5
+  echo "$as_me:27438: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_long=yes
 else
@@ -27417,10 +27445,10 @@ ac_cv_type_long=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27420: result: $ac_cv_type_long" >&5
+echo "$as_me:27448: result: $ac_cv_type_long" >&5
 echo "${ECHO_T}$ac_cv_type_long" >&6
 
-echo "$as_me:27423: checking size of long" >&5
+echo "$as_me:27451: checking size of long" >&5
 echo $ECHO_N "checking size of long... $ECHO_C" >&6
 if test "${ac_cv_sizeof_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27429,7 +27457,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 27432 "configure"
+#line 27460 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27441,21 +27469,21 @@ int _array_ [1 - 2 * !((sizeof (long)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27444: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27472: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27447: \$? = $ac_status" >&5
+  echo "$as_me:27475: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27450: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27478: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27453: \$? = $ac_status" >&5
+  echo "$as_me:27481: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 27458 "configure"
+#line 27486 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27467,16 +27495,16 @@ int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27470: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27498: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27473: \$? = $ac_status" >&5
+  echo "$as_me:27501: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27476: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27504: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27479: \$? = $ac_status" >&5
+  echo "$as_me:27507: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -27492,7 +27520,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 27495 "configure"
+#line 27523 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27504,16 +27532,16 @@ int _array_ [1 - 2 * !((sizeof (long)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27507: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27535: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27510: \$? = $ac_status" >&5
+  echo "$as_me:27538: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27513: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27541: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27516: \$? = $ac_status" >&5
+  echo "$as_me:27544: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -27529,7 +27557,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
   cat >conftest.$ac_ext <<_ACEOF
-#line 27532 "configure"
+#line 27560 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27541,16 +27569,16 @@ int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27544: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27572: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27547: \$? = $ac_status" >&5
+  echo "$as_me:27575: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27550: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27578: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27553: \$? = $ac_status" >&5
+  echo "$as_me:27581: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -27563,12 +27591,12 @@ done
 ac_cv_sizeof_long=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:27566: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:27594: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 27571 "configure"
+#line 27599 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27584,15 +27612,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:27587: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27615: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27590: \$? = $ac_status" >&5
+  echo "$as_me:27618: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:27592: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27620: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27595: \$? = $ac_status" >&5
+  echo "$as_me:27623: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_long=`cat conftest.val`
 else
@@ -27608,7 +27636,7 @@ else
   ac_cv_sizeof_long=0
 fi
 fi
-echo "$as_me:27611: result: $ac_cv_sizeof_long" >&5
+echo "$as_me:27639: result: $ac_cv_sizeof_long" >&5
 echo "${ECHO_T}$ac_cv_sizeof_long" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_LONG $ac_cv_sizeof_long
@@ -27616,23 +27644,23 @@ EOF
 
 if test "${ac_cv_type_long:+set}" = set; then
 	if test "${ac_cv_sizeof_long:+set}" != set; then
-		{ echo "$as_me:27619: WARNING: using 4 for sizeof long" >&5
+		{ echo "$as_me:27647: WARNING: using 4 for sizeof long" >&5
 echo "$as_me: WARNING: using 4 for sizeof long" >&2;}
 		ac_cv_sizeof_long=4
 	elif test "x${ac_cv_sizeof_long}" = x0; then
-		{ echo "$as_me:27623: WARNING: sizeof long not found, using 4" >&5
+		{ echo "$as_me:27651: WARNING: sizeof long not found, using 4" >&5
 echo "$as_me: WARNING: sizeof long not found, using 4" >&2;}
 		ac_cv_sizeof_long=4
 	fi
 fi
 
-echo "$as_me:27629: checking for off_t" >&5
+echo "$as_me:27657: checking for off_t" >&5
 echo $ECHO_N "checking for off_t... $ECHO_C" >&6
 if test "${ac_cv_type_off_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 27635 "configure"
+#line 27663 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27647,16 +27675,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27650: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27678: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27653: \$? = $ac_status" >&5
+  echo "$as_me:27681: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27656: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27684: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27659: \$? = $ac_status" >&5
+  echo "$as_me:27687: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -27666,10 +27694,10 @@ ac_cv_type_off_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27669: result: $ac_cv_type_off_t" >&5
+echo "$as_me:27697: result: $ac_cv_type_off_t" >&5
 echo "${ECHO_T}$ac_cv_type_off_t" >&6
 
-echo "$as_me:27672: checking size of off_t" >&5
+echo "$as_me:27700: checking size of off_t" >&5
 echo $ECHO_N "checking size of off_t... $ECHO_C" >&6
 if test "${ac_cv_sizeof_off_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27678,7 +27706,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 27681 "configure"
+#line 27709 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27690,21 +27718,21 @@ int _array_ [1 - 2 * !((sizeof (off_t)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27693: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27721: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27696: \$? = $ac_status" >&5
+  echo "$as_me:27724: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27699: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27727: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27702: \$? = $ac_status" >&5
+  echo "$as_me:27730: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 27707 "configure"
+#line 27735 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27716,16 +27744,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27719: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27747: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27722: \$? = $ac_status" >&5
+  echo "$as_me:27750: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27725: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27753: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27728: \$? = $ac_status" >&5
+  echo "$as_me:27756: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -27741,7 +27769,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 27744 "configure"
+#line 27772 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27753,16 +27781,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27756: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27784: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27759: \$? = $ac_status" >&5
+  echo "$as_me:27787: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27762: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27790: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27765: \$? = $ac_status" >&5
+  echo "$as_me:27793: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -27778,7 +27806,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
   cat >conftest.$ac_ext <<_ACEOF
-#line 27781 "configure"
+#line 27809 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27790,16 +27818,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27793: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27821: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27796: \$? = $ac_status" >&5
+  echo "$as_me:27824: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27799: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27827: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27802: \$? = $ac_status" >&5
+  echo "$as_me:27830: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -27812,12 +27840,12 @@ done
 ac_cv_sizeof_off_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:27815: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:27843: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 27820 "configure"
+#line 27848 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27833,15 +27861,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:27836: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27864: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27839: \$? = $ac_status" >&5
+  echo "$as_me:27867: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:27841: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27869: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27844: \$? = $ac_status" >&5
+  echo "$as_me:27872: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_off_t=`cat conftest.val`
 else
@@ -27857,7 +27885,7 @@ else
   ac_cv_sizeof_off_t=0
 fi
 fi
-echo "$as_me:27860: result: $ac_cv_sizeof_off_t" >&5
+echo "$as_me:27888: result: $ac_cv_sizeof_off_t" >&5
 echo "${ECHO_T}$ac_cv_sizeof_off_t" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_OFF_T $ac_cv_sizeof_off_t
@@ -27865,23 +27893,23 @@ EOF
 
 if test "${ac_cv_type_off_t:+set}" = set; then
 	if test "${ac_cv_sizeof_off_t:+set}" != set; then
-		{ echo "$as_me:27868: WARNING: using 4 for sizeof off_t" >&5
+		{ echo "$as_me:27896: WARNING: using 4 for sizeof off_t" >&5
 echo "$as_me: WARNING: using 4 for sizeof off_t" >&2;}
 		ac_cv_sizeof_off_t=4
 	elif test "x${ac_cv_sizeof_off_t}" = x0; then
-		{ echo "$as_me:27872: WARNING: sizeof off_t not found, using 4" >&5
+		{ echo "$as_me:27900: WARNING: sizeof off_t not found, using 4" >&5
 echo "$as_me: WARNING: sizeof off_t not found, using 4" >&2;}
 		ac_cv_sizeof_off_t=4
 	fi
 fi
 
-echo "$as_me:27878: checking for time_t" >&5
+echo "$as_me:27906: checking for time_t" >&5
 echo $ECHO_N "checking for time_t... $ECHO_C" >&6
 if test "${ac_cv_type_time_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 27884 "configure"
+#line 27912 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27896,16 +27924,16 @@ if (sizeof (time_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27899: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27927: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27902: \$? = $ac_status" >&5
+  echo "$as_me:27930: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27905: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27933: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27908: \$? = $ac_status" >&5
+  echo "$as_me:27936: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_time_t=yes
 else
@@ -27915,10 +27943,10 @@ ac_cv_type_time_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27918: result: $ac_cv_type_time_t" >&5
+echo "$as_me:27946: result: $ac_cv_type_time_t" >&5
 echo "${ECHO_T}$ac_cv_type_time_t" >&6
 
-echo "$as_me:27921: checking size of time_t" >&5
+echo "$as_me:27949: checking size of time_t" >&5
 echo $ECHO_N "checking size of time_t... $ECHO_C" >&6
 if test "${ac_cv_sizeof_time_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27927,7 +27955,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 27930 "configure"
+#line 27958 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27939,21 +27967,21 @@ int _array_ [1 - 2 * !((sizeof (time_t)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27942: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27970: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27945: \$? = $ac_status" >&5
+  echo "$as_me:27973: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27948: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27976: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27951: \$? = $ac_status" >&5
+  echo "$as_me:27979: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 27956 "configure"
+#line 27984 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27965,16 +27993,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27968: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27996: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27971: \$? = $ac_status" >&5
+  echo "$as_me:27999: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27974: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28002: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27977: \$? = $ac_status" >&5
+  echo "$as_me:28005: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -27990,7 +28018,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 27993 "configure"
+#line 28021 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28002,16 +28030,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28005: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28033: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28008: \$? = $ac_status" >&5
+  echo "$as_me:28036: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28011: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28039: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28014: \$? = $ac_status" >&5
+  echo "$as_me:28042: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -28027,7 +28055,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
   cat >conftest.$ac_ext <<_ACEOF
-#line 28030 "configure"
+#line 28058 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28039,16 +28067,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28042: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28070: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28045: \$? = $ac_status" >&5
+  echo "$as_me:28073: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28048: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28076: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28051: \$? = $ac_status" >&5
+  echo "$as_me:28079: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -28061,12 +28089,12 @@ done
 ac_cv_sizeof_time_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28064: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:28092: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 28069 "configure"
+#line 28097 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28082,15 +28110,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:28085: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28113: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28088: \$? = $ac_status" >&5
+  echo "$as_me:28116: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:28090: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28118: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28093: \$? = $ac_status" >&5
+  echo "$as_me:28121: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_time_t=`cat conftest.val`
 else
@@ -28106,7 +28134,7 @@ else
   ac_cv_sizeof_time_t=0
 fi
 fi
-echo "$as_me:28109: result: $ac_cv_sizeof_time_t" >&5
+echo "$as_me:28137: result: $ac_cv_sizeof_time_t" >&5
 echo "${ECHO_T}$ac_cv_sizeof_time_t" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_TIME_T $ac_cv_sizeof_time_t
@@ -28114,11 +28142,11 @@ EOF
 
 if test "${ac_cv_type_time_t:+set}" = set; then
 	if test "${ac_cv_sizeof_time_t:+set}" != set; then
-		{ echo "$as_me:28117: WARNING: using 4 for sizeof time_t" >&5
+		{ echo "$as_me:28145: WARNING: using 4 for sizeof time_t" >&5
 echo "$as_me: WARNING: using 4 for sizeof time_t" >&2;}
 		ac_cv_sizeof_time_t=4
 	elif test "x${ac_cv_sizeof_time_t}" = x0; then
-		{ echo "$as_me:28121: WARNING: sizeof time_t not found, using 4" >&5
+		{ echo "$as_me:28149: WARNING: sizeof time_t not found, using 4" >&5
 echo "$as_me: WARNING: sizeof time_t not found, using 4" >&2;}
 		ac_cv_sizeof_time_t=4
 	fi
@@ -28126,13 +28154,13 @@ fi
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:28129: checking for working alloca.h" >&5
+echo "$as_me:28157: checking for working alloca.h" >&5
 echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6
 if test "${ac_cv_working_alloca_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 28135 "configure"
+#line 28163 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int
@@ -28144,16 +28172,16 @@ char *p = (char *) alloca (2 * sizeof (int));
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28147: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28175: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28150: \$? = $ac_status" >&5
+  echo "$as_me:28178: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28153: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28181: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28156: \$? = $ac_status" >&5
+  echo "$as_me:28184: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_working_alloca_h=yes
 else
@@ -28163,7 +28191,7 @@ ac_cv_working_alloca_h=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:28166: result: $ac_cv_working_alloca_h" >&5
+echo "$as_me:28194: result: $ac_cv_working_alloca_h" >&5
 echo "${ECHO_T}$ac_cv_working_alloca_h" >&6
 if test $ac_cv_working_alloca_h = yes; then
 
@@ -28173,13 +28201,13 @@ EOF
 
 fi
 
-echo "$as_me:28176: checking for alloca" >&5
+echo "$as_me:28204: checking for alloca" >&5
 echo $ECHO_N "checking for alloca... $ECHO_C" >&6
 if test "${ac_cv_func_alloca_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 28182 "configure"
+#line 28210 "configure"
 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -28211,16 +28239,16 @@ char *p = (char *) alloca (1);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28214: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28242: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28217: \$? = $ac_status" >&5
+  echo "$as_me:28245: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28220: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28248: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28223: \$? = $ac_status" >&5
+  echo "$as_me:28251: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_alloca_works=yes
 else
@@ -28230,7 +28258,7 @@ ac_cv_func_alloca_works=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:28233: result: $ac_cv_func_alloca_works" >&5
+echo "$as_me:28261: result: $ac_cv_func_alloca_works" >&5
 echo "${ECHO_T}$ac_cv_func_alloca_works" >&6
 
 if test $ac_cv_func_alloca_works = yes; then
@@ -28251,13 +28279,13 @@ cat >>confdefs.h <<\EOF
 #define C_ALLOCA 1
 EOF
 
-echo "$as_me:28254: checking whether \`alloca.c' needs Cray hooks" >&5
+echo "$as_me:28282: checking whether \`alloca.c' needs Cray hooks" >&5
 echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6
 if test "${ac_cv_os_cray+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 28260 "configure"
+#line 28288 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -28275,18 +28303,18 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:28278: result: $ac_cv_os_cray" >&5
+echo "$as_me:28306: result: $ac_cv_os_cray" >&5
 echo "${ECHO_T}$ac_cv_os_cray" >&6
 if test $ac_cv_os_cray = yes; then
   for ac_func in _getb67 GETB67 getb67; do
     as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:28283: checking for $ac_func" >&5
+echo "$as_me:28311: 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 28289 "configure"
+#line 28317 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -28317,16 +28345,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28320: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28348: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28323: \$? = $ac_status" >&5
+  echo "$as_me:28351: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28326: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28354: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28329: \$? = $ac_status" >&5
+  echo "$as_me:28357: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -28336,7 +28364,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:28339: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:28367: 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
 
@@ -28350,7 +28378,7 @@ fi
   done
 fi
 
-echo "$as_me:28353: checking stack direction for C alloca" >&5
+echo "$as_me:28381: checking stack direction for C alloca" >&5
 echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6
 if test "${ac_cv_c_stack_direction+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -28359,7 +28387,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 28362 "configure"
+#line 28390 "configure"
 #include "confdefs.h"
 int
 find_stack_direction ()
@@ -28382,15 +28410,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:28385: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28413: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28388: \$? = $ac_status" >&5
+  echo "$as_me:28416: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:28390: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28418: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28393: \$? = $ac_status" >&5
+  echo "$as_me:28421: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_stack_direction=1
 else
@@ -28402,7 +28430,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:28405: result: $ac_cv_c_stack_direction" >&5
+echo "$as_me:28433: result: $ac_cv_c_stack_direction" >&5
 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
 cat >>confdefs.h <<EOF
@@ -28414,23 +28442,23 @@ fi
 for ac_header in unistd.h vfork.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:28417: checking for $ac_header" >&5
+echo "$as_me:28445: 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 28423 "configure"
+#line 28451 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:28427: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:28455: \"$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:28433: \$? = $ac_status" >&5
+  echo "$as_me:28461: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -28449,7 +28477,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:28452: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:28480: 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
@@ -28462,13 +28490,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:28465: checking for $ac_func" >&5
+echo "$as_me:28493: 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 28471 "configure"
+#line 28499 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -28499,16 +28527,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28502: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28530: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28505: \$? = $ac_status" >&5
+  echo "$as_me:28533: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28508: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28536: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28511: \$? = $ac_status" >&5
+  echo "$as_me:28539: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -28518,7 +28546,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:28521: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:28549: 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
@@ -28530,7 +28558,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:28533: checking for working fork" >&5
+  echo "$as_me:28561: checking for working fork" >&5
 echo $ECHO_N "checking for working fork... $ECHO_C" >&6
 if test "${ac_cv_func_fork_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -28553,15 +28581,15 @@ else
       }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:28556: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28584: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28559: \$? = $ac_status" >&5
+  echo "$as_me:28587: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:28561: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28589: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28564: \$? = $ac_status" >&5
+  echo "$as_me:28592: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -28573,7 +28601,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:28576: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:28604: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -28587,12 +28615,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:28590: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:28618: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
 echo "$as_me: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&2;}
 fi
 ac_cv_func_vfork_works=$ac_cv_func_vfork
 if test "x$ac_cv_func_vfork" = xyes; then
-  echo "$as_me:28595: checking for working vfork" >&5
+  echo "$as_me:28623: checking for working vfork" >&5
 echo $ECHO_N "checking for working vfork... $ECHO_C" >&6
 if test "${ac_cv_func_vfork_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -28601,7 +28629,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 28604 "configure"
+#line 28632 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -28698,15 +28726,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:28701: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28729: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28704: \$? = $ac_status" >&5
+  echo "$as_me:28732: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:28706: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28734: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28709: \$? = $ac_status" >&5
+  echo "$as_me:28737: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -28718,13 +28746,13 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:28721: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:28749: result: $ac_cv_func_vfork_works" >&5
 echo "${ECHO_T}$ac_cv_func_vfork_works" >&6
 
 fi;
 if test "x$ac_cv_func_fork_works" = xcross; then
   ac_cv_func_vfork_works=ac_cv_func_vfork
-  { echo "$as_me:28727: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:28755: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
 echo "$as_me: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&2;}
 fi
 
@@ -28749,14 +28777,14 @@ EOF
 
 fi
 
-echo "$as_me:28752: checking if we should use fcntl or ioctl" >&5
+echo "$as_me:28780: checking if we should use fcntl or ioctl" >&5
 echo $ECHO_N "checking if we should use fcntl or ioctl... $ECHO_C" >&6
 if test "${cf_cv_fionbio+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 28759 "configure"
+#line 28787 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -28773,16 +28801,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28776: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28804: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28779: \$? = $ac_status" >&5
+  echo "$as_me:28807: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28782: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28810: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28785: \$? = $ac_status" >&5
+  echo "$as_me:28813: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fionbio=ioctl
 else
@@ -28790,7 +28818,7 @@ else
 cat conftest.$ac_ext >&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 28793 "configure"
+#line 28821 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -28812,16 +28840,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28815: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28843: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28818: \$? = $ac_status" >&5
+  echo "$as_me:28846: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28821: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28849: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28824: \$? = $ac_status" >&5
+  echo "$as_me:28852: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fionbio=fcntl
 else
@@ -28834,20 +28862,21 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:28837: result: $cf_cv_fionbio" >&5
+echo "$as_me:28865: result: $cf_cv_fionbio" >&5
 echo "${ECHO_T}$cf_cv_fionbio" >&6
-test "$cf_cv_fionbio" = "fcntl" && cat >>confdefs.h <<\EOF
+test "$cf_cv_fionbio" = "fcntl" &&
+cat >>confdefs.h <<\EOF
 #define USE_FCNTL 1
 EOF
 
-echo "$as_me:28843: checking for broken/missing definition of remove" >&5
+echo "$as_me:28872: checking for broken/missing definition of remove" >&5
 echo $ECHO_N "checking for broken/missing definition of remove... $ECHO_C" >&6
 if test "${cf_cv_baddef_remove+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 28850 "configure"
+#line 28879 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -28859,23 +28888,23 @@ remove("dummy")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28862: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28891: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28865: \$? = $ac_status" >&5
+  echo "$as_me:28894: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28868: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28897: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28871: \$? = $ac_status" >&5
+  echo "$as_me:28900: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_baddef_remove=no
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 28878 "configure"
+#line 28907 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 		int __unlink(name) { return unlink(name); }
@@ -28888,16 +28917,16 @@ remove("dummy")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28891: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28920: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28894: \$? = $ac_status" >&5
+  echo "$as_me:28923: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28897: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28926: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28900: \$? = $ac_status" >&5
+  echo "$as_me:28929: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_baddef_remove=yes
 else
@@ -28912,20 +28941,21 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:28915: result: $cf_cv_baddef_remove" >&5
+echo "$as_me:28944: result: $cf_cv_baddef_remove" >&5
 echo "${ECHO_T}$cf_cv_baddef_remove" >&6
-test "$cf_cv_baddef_remove" != no && cat >>confdefs.h <<\EOF
+test "$cf_cv_baddef_remove" != no &&
+cat >>confdefs.h <<\EOF
 #define NEED_REMOVE 1
 EOF
 
-echo "$as_me:28921: checking for lstat" >&5
+echo "$as_me:28951: checking for lstat" >&5
 echo $ECHO_N "checking for lstat... $ECHO_C" >&6
 if test "${ac_cv_func_lstat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 28928 "configure"
+#line 28958 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -28939,16 +28969,16 @@ lstat(".", (struct stat *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28942: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28972: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28945: \$? = $ac_status" >&5
+  echo "$as_me:28975: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28948: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28978: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28951: \$? = $ac_status" >&5
+  echo "$as_me:28981: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_lstat=yes
 else
@@ -28960,10 +28990,11 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:28963: result: $ac_cv_func_lstat " >&5
+echo "$as_me:28993: result: $ac_cv_func_lstat " >&5
 echo "${ECHO_T}$ac_cv_func_lstat " >&6
 if test $ac_cv_func_lstat = yes; then
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define HAVE_LSTAT 1
 EOF
 
@@ -28994,13 +29025,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:28997: checking for $ac_func" >&5
+echo "$as_me:29028: 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 29003 "configure"
+#line 29034 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -29031,16 +29062,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29034: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29065: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29037: \$? = $ac_status" >&5
+  echo "$as_me:29068: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29040: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29071: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29043: \$? = $ac_status" >&5
+  echo "$as_me:29074: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -29050,7 +29081,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:29053: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:29084: 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
@@ -29066,13 +29097,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:29069: checking for $ac_func" >&5
+echo "$as_me:29100: 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 29075 "configure"
+#line 29106 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -29103,16 +29134,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29106: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29137: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29109: \$? = $ac_status" >&5
+  echo "$as_me:29140: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29112: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29143: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29115: \$? = $ac_status" >&5
+  echo "$as_me:29146: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -29122,7 +29153,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:29125: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:29156: 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
@@ -29134,7 +29165,7 @@ else
 fi
 done
 
-echo "$as_me:29137: checking for random-integer functions" >&5
+echo "$as_me:29168: checking for random-integer functions" >&5
 echo $ECHO_N "checking for random-integer functions... $ECHO_C" >&6
 if test "${cf_cv_srand_func+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29154,7 +29185,7 @@ do
 	esac
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 29157 "configure"
+#line 29188 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -29173,16 +29204,16 @@ long seed = 1; $cf_srand_func(seed); seed = $cf_rand_func()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29176: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29207: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29179: \$? = $ac_status" >&5
+  echo "$as_me:29210: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29182: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29213: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29185: \$? = $ac_status" >&5
+  echo "$as_me:29216: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_srand_func=$cf_func
  break
@@ -29194,10 +29225,10 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:29197: result: $cf_cv_srand_func" >&5
+echo "$as_me:29228: result: $cf_cv_srand_func" >&5
 echo "${ECHO_T}$cf_cv_srand_func" >&6
 if test "$cf_cv_srand_func" != unknown ; then
-	echo "$as_me:29200: checking for range of random-integers" >&5
+	echo "$as_me:29231: checking for range of random-integers" >&5
 echo $ECHO_N "checking for range of random-integers... $ECHO_C" >&6
 if test "${cf_cv_rand_max+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29218,7 +29249,7 @@ else
 			;;
 		esac
 		cat >conftest.$ac_ext <<_ACEOF
-#line 29221 "configure"
+#line 29252 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -29237,16 +29268,16 @@ long x = $cf_cv_rand_max
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29240: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29271: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29243: \$? = $ac_status" >&5
+  echo "$as_me:29274: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29246: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29277: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29249: \$? = $ac_status" >&5
+  echo "$as_me:29280: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -29257,15 +29288,15 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:29260: result: $cf_cv_rand_max" >&5
+echo "$as_me:29291: result: $cf_cv_rand_max" >&5
 echo "${ECHO_T}$cf_cv_rand_max" >&6
 
 	case $cf_cv_srand_func in
 	*/arc4random)
-		echo "$as_me:29265: checking if <bsd/stdlib.h> should be included" >&5
+		echo "$as_me:29296: 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 29268 "configure"
+#line 29299 "configure"
 #include "confdefs.h"
 #include <bsd/stdlib.h>
 int
@@ -29278,23 +29309,23 @@ void *arc4random(int);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29281: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29312: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29284: \$? = $ac_status" >&5
+  echo "$as_me:29315: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29287: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29318: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29290: \$? = $ac_status" >&5
+  echo "$as_me:29321: \$? = $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 29297 "configure"
+#line 29328 "configure"
 #include "confdefs.h"
 #include <bsd/stdlib.h>
 int
@@ -29306,16 +29337,16 @@ unsigned x = arc4random()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29309: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29340: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29312: \$? = $ac_status" >&5
+  echo "$as_me:29343: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29315: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29346: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29318: \$? = $ac_status" >&5
+  echo "$as_me:29349: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_bsd_stdlib_h=yes
 else
@@ -29326,19 +29357,20 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-	    echo "$as_me:29329: result: $cf_bsd_stdlib_h" >&5
+	    echo "$as_me:29360: result: $cf_bsd_stdlib_h" >&5
 echo "${ECHO_T}$cf_bsd_stdlib_h" >&6
 		if test "$cf_bsd_stdlib_h" = yes
 		then
-			cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define HAVE_BSD_STDLIB_H 1
 EOF
 
 		else
-			echo "$as_me:29338: checking if <bsd/random.h> should be included" >&5
+			echo "$as_me:29370: 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 29341 "configure"
+#line 29373 "configure"
 #include "confdefs.h"
 #include <bsd/random.h>
 int
@@ -29351,23 +29383,23 @@ void *arc4random(int);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29354: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29386: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29357: \$? = $ac_status" >&5
+  echo "$as_me:29389: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29360: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29392: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29363: \$? = $ac_status" >&5
+  echo "$as_me:29395: \$? = $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 29370 "configure"
+#line 29402 "configure"
 #include "confdefs.h"
 #include <bsd/random.h>
 int
@@ -29379,16 +29411,16 @@ unsigned x = arc4random()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29382: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29414: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29385: \$? = $ac_status" >&5
+  echo "$as_me:29417: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29388: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29420: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29391: \$? = $ac_status" >&5
+  echo "$as_me:29423: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_bsd_random_h=yes
 else
@@ -29399,16 +29431,17 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-			echo "$as_me:29402: result: $cf_bsd_random_h" >&5
+			echo "$as_me:29434: result: $cf_bsd_random_h" >&5
 echo "${ECHO_T}$cf_bsd_random_h" >&6
 			if test "$cf_bsd_random_h" = yes
 			then
-				cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define HAVE_BSD_RANDOM_H 1
 EOF
 
 			else
-				{ echo "$as_me:29411: WARNING: no header file found for arc4random" >&5
+				{ echo "$as_me:29444: WARNING: no header file found for arc4random" >&5
 echo "$as_me: WARNING: no header file found for arc4random" >&2;}
 			fi
 		fi
@@ -29426,15 +29459,15 @@ echo "$as_me: WARNING: no header file found for arc4random" >&2;}
 
 cf_rand_max=`echo "lynx_rand_max" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	cat >>confdefs.h <<EOF
+cat >>confdefs.h <<EOF
 #define lynx_srand $cf_srand_func
 EOF
 
-	cat >>confdefs.h <<EOF
+cat >>confdefs.h <<EOF
 #define lynx_rand $cf_rand_func
 EOF
 
-	cat >>confdefs.h <<EOF
+cat >>confdefs.h <<EOF
 #define $cf_rand_max $cf_cv_rand_max
 EOF
 
@@ -29443,13 +29476,13 @@ fi
 for ac_func in strstr
 do
 
-echo "$as_me:29446: checking for $ac_func declaration" >&5
+echo "$as_me:29479: 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 29452 "configure"
+#line 29485 "configure"
 #include "confdefs.h"
 #include <string.h>
 int
@@ -29463,20 +29496,20 @@ extern	int	$ac_func();
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29466: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29499: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29469: \$? = $ac_status" >&5
+  echo "$as_me:29502: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29472: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29505: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29475: \$? = $ac_status" >&5
+  echo "$as_me:29508: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 29479 "configure"
+#line 29512 "configure"
 #include "confdefs.h"
 #include <string.h>
 int
@@ -29490,16 +29523,16 @@ int	(*p)() = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29493: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29526: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29496: \$? = $ac_status" >&5
+  echo "$as_me:29529: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29499: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29532: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29502: \$? = $ac_status" >&5
+  echo "$as_me:29535: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -29520,11 +29553,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:29523: result: yes" >&5
+  echo "$as_me:29556: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:29527: result: no" >&5
+  echo "$as_me:29560: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -29539,13 +29572,13 @@ done
 for ac_func in getgrgid getgrnam
 do
 
-echo "$as_me:29542: checking for $ac_func declaration" >&5
+echo "$as_me:29575: 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 29548 "configure"
+#line 29581 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -29561,20 +29594,20 @@ extern	int	$ac_func();
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29564: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29597: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29567: \$? = $ac_status" >&5
+  echo "$as_me:29600: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29570: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29603: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29573: \$? = $ac_status" >&5
+  echo "$as_me:29606: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 29577 "configure"
+#line 29610 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -29590,16 +29623,16 @@ int	(*p)() = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29593: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29626: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29596: \$? = $ac_status" >&5
+  echo "$as_me:29629: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29599: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29632: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29602: \$? = $ac_status" >&5
+  echo "$as_me:29635: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -29620,11 +29653,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:29623: result: yes" >&5
+  echo "$as_me:29656: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:29627: result: no" >&5
+  echo "$as_me:29660: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -29636,14 +29669,14 @@ EOF
 fi
 done
 
-echo "$as_me:29639: checking if TRUE/FALSE are defined" >&5
+echo "$as_me:29672: 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 29646 "configure"
+#line 29679 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -29657,16 +29690,16 @@ int x = TRUE, y = FALSE
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29660: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29693: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29663: \$? = $ac_status" >&5
+  echo "$as_me:29696: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29666: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29699: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29669: \$? = $ac_status" >&5
+  echo "$as_me:29702: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_bool_defs=yes
 else
@@ -29677,27 +29710,28 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:29680: result: $cf_cv_bool_defs" >&5
+echo "$as_me:29713: result: $cf_cv_bool_defs" >&5
 echo "${ECHO_T}$cf_cv_bool_defs" >&6
 if test "$cf_cv_bool_defs" = no ; then
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define TRUE (1)
 EOF
 
-	cat >>confdefs.h <<\EOF
+cat >>confdefs.h <<\EOF
 #define FALSE (0)
 EOF
 
 fi
 
-echo "$as_me:29693: checking if external errno is declared" >&5
+echo "$as_me:29727: 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 29700 "configure"
+#line 29734 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -29715,16 +29749,16 @@ int x = (int) errno
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29718: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29752: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29721: \$? = $ac_status" >&5
+  echo "$as_me:29755: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29724: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29758: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29727: \$? = $ac_status" >&5
+  echo "$as_me:29761: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -29735,7 +29769,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:29738: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:29772: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -29750,14 +29784,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:29753: checking if external errno exists" >&5
+echo "$as_me:29787: 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 29760 "configure"
+#line 29794 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -29772,16 +29806,16 @@ errno = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29775: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29809: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29778: \$? = $ac_status" >&5
+  echo "$as_me:29812: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29781: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29815: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29784: \$? = $ac_status" >&5
+  echo "$as_me:29818: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_errno=yes
 else
@@ -29792,7 +29826,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:29795: result: $cf_cv_have_errno" >&5
+echo "$as_me:29829: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -29805,7 +29839,7 @@ EOF
 
 fi
 
-echo "$as_me:29808: checking if we can set errno" >&5
+echo "$as_me:29842: 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
@@ -29813,7 +29847,7 @@ else
 
 if test "$cross_compiling" = yes; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 29816 "configure"
+#line 29850 "configure"
 #include "confdefs.h"
 #include <errno.h>
 int
@@ -29825,16 +29859,16 @@ errno = 255
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29828: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29862: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29831: \$? = $ac_status" >&5
+  echo "$as_me:29865: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29834: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29868: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29837: \$? = $ac_status" >&5
+  echo "$as_me:29871: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_set_errno=maybe
 else
@@ -29845,7 +29879,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 29848 "configure"
+#line 29882 "configure"
 #include "confdefs.h"
 
 #include <errno.h>
@@ -29856,15 +29890,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:29859: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29893: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29862: \$? = $ac_status" >&5
+  echo "$as_me:29896: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:29864: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29898: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29867: \$? = $ac_status" >&5
+  echo "$as_me:29901: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_set_errno=yes
 else
@@ -29877,20 +29911,21 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:29880: result: $cf_cv_set_errno" >&5
+echo "$as_me:29914: result: $cf_cv_set_errno" >&5
 echo "${ECHO_T}$cf_cv_set_errno" >&6
-test "$cf_cv_set_errno" != no && cat >>confdefs.h <<\EOF
+test "$cf_cv_set_errno" != no &&
+cat >>confdefs.h <<\EOF
 #define CAN_SET_ERRNO 1
 EOF
 
-echo "$as_me:29886: checking for setlocale()" >&5
+echo "$as_me:29921: 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 29893 "configure"
+#line 29928 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int
@@ -29902,16 +29937,16 @@ setlocale(LC_ALL, "")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29905: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29940: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29908: \$? = $ac_status" >&5
+  echo "$as_me:29943: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29911: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29946: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29914: \$? = $ac_status" >&5
+  echo "$as_me:29949: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_locale=yes
 else
@@ -29923,21 +29958,22 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:29926: result: $cf_cv_locale" >&5
+echo "$as_me:29961: result: $cf_cv_locale" >&5
 echo "${ECHO_T}$cf_cv_locale" >&6
-test $cf_cv_locale = yes && { cat >>confdefs.h <<\EOF
+test $cf_cv_locale = yes && {
+cat >>confdefs.h <<\EOF
 #define LOCALE 1
 EOF
  }
 
-echo "$as_me:29933: checking if NGROUPS is defined" >&5
+echo "$as_me:29969: 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 29940 "configure"
+#line 29976 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -29956,23 +29992,23 @@ int x = NGROUPS
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29959: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29995: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29962: \$? = $ac_status" >&5
+  echo "$as_me:29998: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29965: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30001: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29968: \$? = $ac_status" >&5
+  echo "$as_me:30004: \$? = $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 29975 "configure"
+#line 30011 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -29991,16 +30027,16 @@ int x = NGROUPS_MAX
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29994: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30030: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29997: \$? = $ac_status" >&5
+  echo "$as_me:30033: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30000: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30036: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30003: \$? = $ac_status" >&5
+  echo "$as_me:30039: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ngroups=NGROUPS_MAX
 else
@@ -30012,13 +30048,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:30015: result: $cf_cv_ngroups" >&5
+echo "$as_me:30051: result: $cf_cv_ngroups" >&5
 echo "${ECHO_T}$cf_cv_ngroups" >&6
 
 fi
 
 if test "$cf_cv_ngroups" = no ; then
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define NGROUPS 16
 EOF
 
@@ -30029,14 +30066,14 @@ EOF
 
 fi
 
-echo "$as_me:30032: checking if external sys_nerr is declared" >&5
+echo "$as_me:30069: 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 30039 "configure"
+#line 30076 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -30054,16 +30091,16 @@ int x = (int) sys_nerr
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30057: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30094: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30060: \$? = $ac_status" >&5
+  echo "$as_me:30097: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30063: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30100: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30066: \$? = $ac_status" >&5
+  echo "$as_me:30103: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_nerr=yes
 else
@@ -30074,7 +30111,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:30077: result: $cf_cv_dcl_sys_nerr" >&5
+echo "$as_me:30114: 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
@@ -30089,14 +30126,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:30092: checking if external sys_nerr exists" >&5
+echo "$as_me:30129: 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 30099 "configure"
+#line 30136 "configure"
 #include "confdefs.h"
 
 #undef sys_nerr
@@ -30111,16 +30148,16 @@ sys_nerr = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30114: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30151: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30117: \$? = $ac_status" >&5
+  echo "$as_me:30154: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30120: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30157: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30123: \$? = $ac_status" >&5
+  echo "$as_me:30160: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_nerr=yes
 else
@@ -30131,7 +30168,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:30134: result: $cf_cv_have_sys_nerr" >&5
+echo "$as_me:30171: 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
@@ -30144,14 +30181,14 @@ EOF
 
 fi
 
-echo "$as_me:30147: checking if external sys_errlist is declared" >&5
+echo "$as_me:30184: 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 30154 "configure"
+#line 30191 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -30169,16 +30206,16 @@ int x = (int) sys_errlist
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30172: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30209: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30175: \$? = $ac_status" >&5
+  echo "$as_me:30212: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30178: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30215: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30181: \$? = $ac_status" >&5
+  echo "$as_me:30218: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_errlist=yes
 else
@@ -30189,7 +30226,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:30192: result: $cf_cv_dcl_sys_errlist" >&5
+echo "$as_me:30229: 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
@@ -30204,14 +30241,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:30207: checking if external sys_errlist exists" >&5
+echo "$as_me:30244: 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 30214 "configure"
+#line 30251 "configure"
 #include "confdefs.h"
 
 #undef sys_errlist
@@ -30226,16 +30263,16 @@ sys_errlist = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30229: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30266: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30232: \$? = $ac_status" >&5
+  echo "$as_me:30269: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30235: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30272: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30238: \$? = $ac_status" >&5
+  echo "$as_me:30275: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_errlist=yes
 else
@@ -30246,7 +30283,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:30249: result: $cf_cv_have_sys_errlist" >&5
+echo "$as_me:30286: 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
@@ -30262,23 +30299,23 @@ fi
 for ac_header in lastlog.h paths.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:30265: checking for $ac_header" >&5
+echo "$as_me:30302: 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 30271 "configure"
+#line 30308 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:30275: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:30312: \"$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:30281: \$? = $ac_status" >&5
+  echo "$as_me:30318: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -30297,7 +30334,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:30300: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:30337: 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
@@ -30307,14 +30344,14 @@ EOF
 fi
 done
 
-echo "$as_me:30310: checking for lastlog path" >&5
+echo "$as_me:30347: 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 30317 "configure"
+#line 30354 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -30334,16 +30371,16 @@ char *path = _PATH_LASTLOG
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30337: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30374: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30340: \$? = $ac_status" >&5
+  echo "$as_me:30377: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30343: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30380: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30346: \$? = $ac_status" >&5
+  echo "$as_me:30383: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_path_lastlog="_PATH_LASTLOG"
 else
@@ -30358,13 +30395,14 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:30361: result: $cf_cv_path_lastlog" >&5
+echo "$as_me:30398: result: $cf_cv_path_lastlog" >&5
 echo "${ECHO_T}$cf_cv_path_lastlog" >&6
-test $cf_cv_path_lastlog != no && cat >>confdefs.h <<\EOF
+test $cf_cv_path_lastlog != no &&
+cat >>confdefs.h <<\EOF
 #define USE_LASTLOG 1
 EOF
 
-echo "$as_me:30367: checking for utmp implementation" >&5
+echo "$as_me:30405: 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
@@ -30381,7 +30419,7 @@ cf_utmp_includes="
 #endif
 "
 	cat >conftest.$ac_ext <<_ACEOF
-#line 30384 "configure"
+#line 30422 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -30395,16 +30433,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30398: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30436: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30401: \$? = $ac_status" >&5
+  echo "$as_me:30439: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30404: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30442: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30407: \$? = $ac_status" >&5
+  echo "$as_me:30445: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -30413,7 +30451,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 30416 "configure"
+#line 30454 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -30427,16 +30465,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30430: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30468: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30433: \$? = $ac_status" >&5
+  echo "$as_me:30471: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30436: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30474: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30439: \$? = $ac_status" >&5
+  echo "$as_me:30477: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -30451,27 +30489,29 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:30454: result: $cf_cv_have_utmp" >&5
+echo "$as_me:30492: result: $cf_cv_have_utmp" >&5
 echo "${ECHO_T}$cf_cv_have_utmp" >&6
 
 if test $cf_cv_have_utmp != no ; then
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define HAVE_UTMP 1
 EOF
 
-	test $cf_cv_have_utmp = utmpx && cat >>confdefs.h <<\EOF
+	test $cf_cv_have_utmp = utmpx &&
+cat >>confdefs.h <<\EOF
 #define UTMPX_FOR_UTMP 1
 EOF
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:30467: checking if ${cf_cv_have_utmp}.ut_host is declared" >&5
+echo "$as_me:30507: 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 30474 "configure"
+#line 30514 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -30485,16 +30525,16 @@ struct $cf_cv_have_utmp x; char *y = &x.ut_host[0]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30488: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30528: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30491: \$? = $ac_status" >&5
+  echo "$as_me:30531: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30494: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30534: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30497: \$? = $ac_status" >&5
+  echo "$as_me:30537: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_host=yes
 else
@@ -30506,23 +30546,24 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:30509: result: $cf_cv_have_utmp_ut_host" >&5
+echo "$as_me:30549: 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
+test $cf_cv_have_utmp_ut_host != no &&
+cat >>confdefs.h <<\EOF
 #define HAVE_UTMP_UT_HOST 1
 EOF
 
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:30518: checking if ${cf_cv_have_utmp}.ut_syslen is declared" >&5
+echo "$as_me:30559: 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 30525 "configure"
+#line 30566 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -30536,16 +30577,16 @@ struct $cf_cv_have_utmp x; int y = x.ut_syslen
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30539: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30580: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30542: \$? = $ac_status" >&5
+  echo "$as_me:30583: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30545: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30586: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30548: \$? = $ac_status" >&5
+  echo "$as_me:30589: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_syslen=yes
 else
@@ -30557,16 +30598,17 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:30560: result: $cf_cv_have_utmp_ut_syslen" >&5
+echo "$as_me:30601: 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
+test $cf_cv_have_utmp_ut_syslen != no &&
+cat >>confdefs.h <<\EOF
 #define HAVE_UTMP_UT_SYSLEN 1
 EOF
 
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:30569: checking if ${cf_cv_have_utmp}.ut_name is declared" >&5
+echo "$as_me:30611: 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
@@ -30583,7 +30625,7 @@ cf_utmp_includes="
 "
 for cf_header in ut_name ut_user ; do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 30586 "configure"
+#line 30628 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -30597,16 +30639,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30600: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30642: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30603: \$? = $ac_status" >&5
+  echo "$as_me:30645: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30606: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30648: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30609: \$? = $ac_status" >&5
+  echo "$as_me:30651: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_name=$cf_header
 	 break
@@ -30618,17 +30660,18 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:30621: result: $cf_cv_have_utmp_ut_name" >&5
+echo "$as_me:30663: result: $cf_cv_have_utmp_ut_name" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_name" >&6
 
 case $cf_cv_have_utmp_ut_name in #(vi
 no) #(vi
-	{ { echo "$as_me:30626: error: Cannot find declaration for ut.ut_name" >&5
+	{ { echo "$as_me:30668: 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; }; }
 	;;
 ut_user)
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define ut_name ut_user
 EOF
 
@@ -30637,7 +30680,7 @@ esac
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:30640: checking for exit-status in $cf_cv_have_utmp" >&5
+echo "$as_me:30683: 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
@@ -30650,7 +30693,7 @@ for cf_result in \
 	ut_exit.ut_exit
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 30653 "configure"
+#line 30696 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -30664,16 +30707,16 @@ struct $cf_cv_have_utmp x; long y = x.$cf_result = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30667: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30710: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30670: \$? = $ac_status" >&5
+  echo "$as_me:30713: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30673: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30716: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30676: \$? = $ac_status" >&5
+  echo "$as_me:30719: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_xstatus=$cf_result
 	 break
@@ -30686,14 +30729,15 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:30689: result: $cf_cv_have_utmp_ut_xstatus" >&5
+echo "$as_me:30732: result: $cf_cv_have_utmp_ut_xstatus" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_xstatus" >&6
 if test $cf_cv_have_utmp_ut_xstatus != no ; then
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define HAVE_UTMP_UT_XSTATUS 1
 EOF
 
-	cat >>confdefs.h <<EOF
+cat >>confdefs.h <<EOF
 #define ut_xstatus $cf_cv_have_utmp_ut_xstatus
 EOF
 
@@ -30701,14 +30745,14 @@ fi
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:30704: checking if ${cf_cv_have_utmp}.ut_xtime is declared" >&5
+echo "$as_me:30748: 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 30711 "configure"
+#line 30755 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -30722,23 +30766,23 @@ struct $cf_cv_have_utmp x; long y = x.ut_xtime = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30725: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30769: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30728: \$? = $ac_status" >&5
+  echo "$as_me:30772: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30731: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30775: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30734: \$? = $ac_status" >&5
+  echo "$as_me:30778: \$? = $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 30741 "configure"
+#line 30785 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -30752,16 +30796,16 @@ struct $cf_cv_have_utmp x; long y = x.ut_tv.tv_sec
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30755: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30799: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30758: \$? = $ac_status" >&5
+  echo "$as_me:30802: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30761: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30805: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30764: \$? = $ac_status" >&5
+  echo "$as_me:30808: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_xtime=define
 else
@@ -30775,15 +30819,17 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:30778: result: $cf_cv_have_utmp_ut_xtime" >&5
+echo "$as_me:30822: result: $cf_cv_have_utmp_ut_xtime" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_xtime" >&6
 if test $cf_cv_have_utmp_ut_xtime != no ; then
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define HAVE_UTMP_UT_XTIME 1
 EOF
 
 	if test $cf_cv_have_utmp_ut_xtime = define ; then
-		cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define ut_xtime ut_tv.tv_sec
 EOF
 
@@ -30792,14 +30838,14 @@ fi
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:30795: checking if ${cf_cv_have_utmp}.ut_session is declared" >&5
+echo "$as_me:30841: 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 30802 "configure"
+#line 30848 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -30813,16 +30859,16 @@ struct $cf_cv_have_utmp x; long y = x.ut_session
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30816: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30862: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30819: \$? = $ac_status" >&5
+  echo "$as_me:30865: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30822: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30868: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30825: \$? = $ac_status" >&5
+  echo "$as_me:30871: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_session=yes
 else
@@ -30833,17 +30879,18 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:30836: result: $cf_cv_have_utmp_ut_session" >&5
+echo "$as_me:30882: result: $cf_cv_have_utmp_ut_session" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_session" >&6
 if test $cf_cv_have_utmp_ut_session != no ; then
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define HAVE_UTMP_UT_SESSION 1
 EOF
 
 fi
 fi
 
-echo "$as_me:30846: checking if $cf_cv_have_utmp is SYSV flavor" >&5
+echo "$as_me:30893: 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
@@ -30851,7 +30898,7 @@ else
 
 test "$cf_cv_have_utmp" = "utmp" && cf_prefix="ut" || cf_prefix="utx"
 cat >conftest.$ac_ext <<_ACEOF
-#line 30854 "configure"
+#line 30901 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -30870,16 +30917,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30873: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30920: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30876: \$? = $ac_status" >&5
+  echo "$as_me:30923: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30879: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30926: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30882: \$? = $ac_status" >&5
+  echo "$as_me:30929: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_sysv_utmp=yes
 else
@@ -30890,22 +30937,23 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:30893: result: $cf_cv_sysv_utmp" >&5
+echo "$as_me:30940: result: $cf_cv_sysv_utmp" >&5
 echo "${ECHO_T}$cf_cv_sysv_utmp" >&6
-test $cf_cv_sysv_utmp = yes && cat >>confdefs.h <<\EOF
+test $cf_cv_sysv_utmp = yes &&
+cat >>confdefs.h <<\EOF
 #define USE_SYSV_UTMP 1
 EOF
 
 fi
 
-echo "$as_me:30901: checking if external h_errno exists" >&5
+echo "$as_me:30949: 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 30908 "configure"
+#line 30956 "configure"
 #include "confdefs.h"
 
 #undef h_errno
@@ -30920,16 +30968,16 @@ h_errno = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30923: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30971: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30926: \$? = $ac_status" >&5
+  echo "$as_me:30974: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30929: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30977: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30932: \$? = $ac_status" >&5
+  echo "$as_me:30980: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_h_errno=yes
 else
@@ -30940,7 +30988,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:30943: result: $cf_cv_have_h_errno" >&5
+echo "$as_me:30991: 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
@@ -30953,7 +31001,7 @@ EOF
 
 fi
 
-echo "$as_me:30956: checking if bibp: URLs should be supported" >&5
+echo "$as_me:31004: 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.
@@ -30970,13 +31018,14 @@ else
   use_bibp_urls=yes
 
 fi;
-echo "$as_me:30973: result: $use_bibp_urls" >&5
+echo "$as_me:31021: result: $use_bibp_urls" >&5
 echo "${ECHO_T}$use_bibp_urls" >&6
-test $use_bibp_urls = no && cat >>confdefs.h <<\EOF
+test $use_bibp_urls = no &&
+cat >>confdefs.h <<\EOF
 #define DISABLE_BIBP 1
 EOF
 
-echo "$as_me:30979: checking if configuration info should be browsable" >&5
+echo "$as_me:31028: 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.
@@ -30993,13 +31042,14 @@ else
   use_config_info=yes
 
 fi;
-echo "$as_me:30996: result: $use_config_info" >&5
+echo "$as_me:31045: result: $use_config_info" >&5
 echo "${ECHO_T}$use_config_info" >&6
-test $use_config_info = no && cat >>confdefs.h <<\EOF
+test $use_config_info = no &&
+cat >>confdefs.h <<\EOF
 #define NO_CONFIG_INFO 1
 EOF
 
-echo "$as_me:31002: checking if new-style forms-based options screen should be used" >&5
+echo "$as_me:31052: 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.
@@ -31016,13 +31066,14 @@ else
   use_forms_options=yes
 
 fi;
-echo "$as_me:31019: result: $use_forms_options" >&5
+echo "$as_me:31069: result: $use_forms_options" >&5
 echo "${ECHO_T}$use_forms_options" >&6
-test $use_forms_options = no && cat >>confdefs.h <<\EOF
+test $use_forms_options = no &&
+cat >>confdefs.h <<\EOF
 #define NO_OPTION_FORMS 1
 EOF
 
-echo "$as_me:31025: checking if old-style options menu should be used" >&5
+echo "$as_me:31076: 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.
@@ -31039,13 +31090,14 @@ else
   use_menu_options=yes
 
 fi;
-echo "$as_me:31042: result: $use_menu_options" >&5
+echo "$as_me:31093: result: $use_menu_options" >&5
 echo "${ECHO_T}$use_menu_options" >&6
-test $use_menu_options = no && cat >>confdefs.h <<\EOF
+test $use_menu_options = no &&
+cat >>confdefs.h <<\EOF
 #define NO_OPTION_MENU 1
 EOF
 
-echo "$as_me:31048: checking if sessions code should be used" >&5
+echo "$as_me:31100: 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.
@@ -31062,17 +31114,18 @@ else
   use_sessions=yes
 
 fi;
-echo "$as_me:31065: result: $use_sessions" >&5
+echo "$as_me:31117: result: $use_sessions" >&5
 echo "${ECHO_T}$use_sessions" >&6
 if test $use_sessions != no ; then
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define USE_SESSIONS 1
 EOF
 
 	EXTRA_OBJS="$EXTRA_OBJS LYSession\$o"
 fi
 
-echo "$as_me:31075: checking if session-caching code should be used" >&5
+echo "$as_me:31128: 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.
@@ -31089,16 +31142,17 @@ else
   use_session_cache=yes
 
 fi;
-echo "$as_me:31092: result: $use_session_cache" >&5
+echo "$as_me:31145: result: $use_session_cache" >&5
 echo "${ECHO_T}$use_session_cache" >&6
 if test $use_session_cache != no ; then
-    cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define USE_CACHEJAR 1
 EOF
 
 fi
 
-echo "$as_me:31101: checking if address-list page should be used" >&5
+echo "$as_me:31155: 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.
@@ -31115,13 +31169,14 @@ else
   use_addrlist_page=yes
 
 fi;
-echo "$as_me:31118: result: $use_addrlist_page" >&5
+echo "$as_me:31172: result: $use_addrlist_page" >&5
 echo "${ECHO_T}$use_addrlist_page" >&6
-test $use_addrlist_page != no && cat >>confdefs.h <<\EOF
+test $use_addrlist_page != no &&
+cat >>confdefs.h <<\EOF
 #define USE_ADDRLIST_PAGE 1
 EOF
 
-echo "$as_me:31124: checking if experimental CJK logic should be used" >&5
+echo "$as_me:31179: checking if experimental CJK logic should be used" >&5
 echo $ECHO_N "checking if experimental CJK logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-cjk or --disable-cjk was given.
@@ -31138,13 +31193,14 @@ else
   use_cjk=no
 
 fi;
-echo "$as_me:31141: result: $use_cjk" >&5
+echo "$as_me:31196: result: $use_cjk" >&5
 echo "${ECHO_T}$use_cjk" >&6
-test $use_cjk != no && cat >>confdefs.h <<\EOF
+test $use_cjk != no &&
+cat >>confdefs.h <<\EOF
 #define CJK_EX 1
 EOF
 
-echo "$as_me:31147: checking if experimental Japanese UTF-8 logic should be used" >&5
+echo "$as_me:31203: checking if experimental Japanese UTF-8 logic should be used" >&5
 echo $ECHO_N "checking if experimental Japanese UTF-8 logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-japanese-utf8 or --disable-japanese-utf8 was given.
@@ -31161,10 +31217,11 @@ else
   use_ja_utf8=no
 
 fi;
-echo "$as_me:31164: result: $use_ja_utf8" >&5
+echo "$as_me:31220: result: $use_ja_utf8" >&5
 echo "${ECHO_T}$use_ja_utf8" >&6
 if test $use_ja_utf8 != no ; then
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define EXP_JAPANESEUTF8_SUPPORT 1
 EOF
 
@@ -31206,7 +31263,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 31209 "configure"
+#line 31266 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -31218,16 +31275,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31221: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31278: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31224: \$? = $ac_status" >&5
+  echo "$as_me:31281: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31227: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31284: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31230: \$? = $ac_status" >&5
+  echo "$as_me:31287: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -31244,7 +31301,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}:31247: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:31304: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -31285,7 +31342,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 31288 "configure"
+#line 31345 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -31297,16 +31354,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31300: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31357: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31303: \$? = $ac_status" >&5
+  echo "$as_me:31360: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31306: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31363: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31309: \$? = $ac_status" >&5
+  echo "$as_me:31366: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -31323,7 +31380,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}:31326: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:31383: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -31339,7 +31396,7 @@ echo "${as_me:-configure}:31326: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:31342: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:31399: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -31364,7 +31421,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}:31367: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:31424: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -31393,7 +31450,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}:31396: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:31453: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -31402,7 +31459,7 @@ echo "${as_me:-configure}:31396: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:31405: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:31462: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -31413,7 +31470,7 @@ done
 
 fi;
 
-  echo "$as_me:31416: checking for iconv" >&5
+  echo "$as_me:31473: 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
@@ -31424,12 +31481,12 @@ else
 cf_cv_header_path_iconv=
 cf_cv_library_path_iconv=
 
-echo "${as_me:-configure}:31427: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:31484: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 31432 "configure"
+#line 31489 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -31448,16 +31505,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31451: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31508: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31454: \$? = $ac_status" >&5
+  echo "$as_me:31511: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31457: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31514: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31460: \$? = $ac_status" >&5
+  echo "$as_me:31517: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -31471,7 +31528,7 @@ cat conftest.$ac_ext >&5
 LIBS="-liconv  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 31474 "configure"
+#line 31531 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -31490,16 +31547,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31493: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31550: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31496: \$? = $ac_status" >&5
+  echo "$as_me:31553: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31499: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31556: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31502: \$? = $ac_status" >&5
+  echo "$as_me:31559: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -31516,9 +31573,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for iconv library" 1>&6
 
-echo "${as_me:-configure}:31519: testing find linkage for iconv library ..." 1>&5
+echo "${as_me:-configure}:31576: testing find linkage for iconv library ..." 1>&5
 
-echo "${as_me:-configure}:31521: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:31578: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -31631,11 +31688,11 @@ cf_search="$cf_search $cf_header_path_list"
       if test -d $cf_cv_header_path_iconv ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_iconv" 1>&6
 
-echo "${as_me:-configure}:31634: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:31691: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_iconv"
         cat >conftest.$ac_ext <<_ACEOF
-#line 31638 "configure"
+#line 31695 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -31654,21 +31711,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31657: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31714: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31660: \$? = $ac_status" >&5
+  echo "$as_me:31717: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31663: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31720: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31666: \$? = $ac_status" >&5
+  echo "$as_me:31723: \$? = $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}:31671: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:31728: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
 
             cf_cv_find_linkage_iconv=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -31686,7 +31743,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_iconv" = maybe ; then
 
-echo "${as_me:-configure}:31689: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:31746: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -31783,13 +31840,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}:31786: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:31843: 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 31792 "configure"
+#line 31849 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -31808,21 +31865,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31811: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31868: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31814: \$? = $ac_status" >&5
+  echo "$as_me:31871: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31817: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31874: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31820: \$? = $ac_status" >&5
+  echo "$as_me:31877: \$? = $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}:31825: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:31882: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
 
                 cf_cv_find_linkage_iconv=yes
                 cf_cv_library_file_iconv="-liconv"
@@ -31862,7 +31919,7 @@ am_cv_func_iconv="no, consider installing GNU libiconv"
 fi
 
 fi
-echo "$as_me:31865: result: $am_cv_func_iconv" >&5
+echo "$as_me:31922: result: $am_cv_func_iconv" >&5
 echo "${ECHO_T}$am_cv_func_iconv" >&6
 
   if test "$am_cv_func_iconv" = yes; then
@@ -31871,14 +31928,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_ICONV 1
 EOF
 
-    echo "$as_me:31874: checking if the declaration of iconv() needs const." >&5
+    echo "$as_me:31931: 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 31881 "configure"
+#line 31938 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -31903,16 +31960,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31906: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31963: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31909: \$? = $ac_status" >&5
+  echo "$as_me:31966: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31912: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31969: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31915: \$? = $ac_status" >&5
+  echo "$as_me:31972: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_proto_iconv_const=no
 else
@@ -31922,7 +31979,7 @@ am_cv_proto_iconv_const=yes
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:31925: result: $am_cv_proto_iconv_const" >&5
+echo "$as_me:31982: 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
@@ -31964,7 +32021,7 @@ if test -n "$cf_cv_header_path_iconv" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 31967 "configure"
+#line 32024 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -31976,16 +32033,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31979: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32036: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31982: \$? = $ac_status" >&5
+  echo "$as_me:32039: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31985: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32042: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31988: \$? = $ac_status" >&5
+  echo "$as_me:32045: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -32002,7 +32059,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}:32005: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:32062: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -32039,7 +32096,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}:32042: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:32099: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -32063,7 +32120,7 @@ curses|slang|ncurses*)
 esac
 
 if test "$use_dft_colors" != no ; then
-echo "$as_me:32066: checking if you want to use default-colors" >&5
+echo "$as_me:32123: 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.
@@ -32080,15 +32137,16 @@ else
   use_dft_colors=no
 
 fi;
-echo "$as_me:32083: result: $use_dft_colors" >&5
+echo "$as_me:32140: result: $use_dft_colors" >&5
 echo "${ECHO_T}$use_dft_colors" >&6
-test $use_dft_colors = "yes" && cat >>confdefs.h <<\EOF
+test $use_dft_colors = "yes" &&
+cat >>confdefs.h <<\EOF
 #define USE_DEFAULT_COLORS 1
 EOF
 
 fi
 
-echo "$as_me:32091: checking if experimental keyboard-layout logic should be used" >&5
+echo "$as_me:32149: 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.
@@ -32105,13 +32163,14 @@ else
   use_kbd_layout=no
 
 fi;
-echo "$as_me:32108: result: $use_kbd_layout" >&5
+echo "$as_me:32166: result: $use_kbd_layout" >&5
 echo "${ECHO_T}$use_kbd_layout" >&6
-test $use_kbd_layout != no && cat >>confdefs.h <<\EOF
+test $use_kbd_layout != no &&
+cat >>confdefs.h <<\EOF
 #define EXP_KEYBOARD_LAYOUT 1
 EOF
 
-echo "$as_me:32114: checking if experimental nested-table logic should be used" >&5
+echo "$as_me:32173: 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.
@@ -32128,13 +32187,14 @@ else
   use_nested_tables=no
 
 fi;
-echo "$as_me:32131: result: $use_nested_tables" >&5
+echo "$as_me:32190: result: $use_nested_tables" >&5
 echo "${ECHO_T}$use_nested_tables" >&6
-test $use_nested_tables != no && cat >>confdefs.h <<\EOF
+test $use_nested_tables != no &&
+cat >>confdefs.h <<\EOF
 #define EXP_NESTED_TABLES 1
 EOF
 
-echo "$as_me:32137: checking if alternative line-edit bindings should be used" >&5
+echo "$as_me:32197: 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.
@@ -32151,13 +32211,14 @@ else
   use_alt_bindings=yes
 
 fi;
-echo "$as_me:32154: result: $use_alt_bindings" >&5
+echo "$as_me:32214: result: $use_alt_bindings" >&5
 echo "${ECHO_T}$use_alt_bindings" >&6
-test $use_alt_bindings != no && cat >>confdefs.h <<\EOF
+test $use_alt_bindings != no &&
+cat >>confdefs.h <<\EOF
 #define USE_ALT_BINDINGS 1
 EOF
 
-echo "$as_me:32160: checking if ascii case-conversion should be used" >&5
+echo "$as_me:32221: 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.
@@ -32174,13 +32235,14 @@ else
   use_ascii_ctypes=yes
 
 fi;
-echo "$as_me:32177: result: $use_ascii_ctypes" >&5
+echo "$as_me:32238: result: $use_ascii_ctypes" >&5
 echo "${ECHO_T}$use_ascii_ctypes" >&6
-test $use_ascii_ctypes != no && cat >>confdefs.h <<\EOF
+test $use_ascii_ctypes != no &&
+cat >>confdefs.h <<\EOF
 #define USE_ASCII_CTYPES 1
 EOF
 
-echo "$as_me:32183: checking if you want to use extended HTML DTD logic" >&5
+echo "$as_me:32245: 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.
@@ -32197,13 +32259,14 @@ else
   use_ext_htmldtd=yes
 
 fi;
-echo "$as_me:32200: result: $use_ext_htmldtd" >&5
+echo "$as_me:32262: result: $use_ext_htmldtd" >&5
 echo "${ECHO_T}$use_ext_htmldtd" >&6
-test $use_ext_htmldtd = "no" && cat >>confdefs.h <<\EOF
+test $use_ext_htmldtd = "no" &&
+cat >>confdefs.h <<\EOF
 #define NO_EXTENDED_HTMLDTD 1
 EOF
 
-echo "$as_me:32206: checking if file-upload logic should be used" >&5
+echo "$as_me:32269: 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.
@@ -32220,13 +32283,14 @@ else
   use_file_upload=yes
 
 fi;
-echo "$as_me:32223: result: $use_file_upload" >&5
+echo "$as_me:32286: result: $use_file_upload" >&5
 echo "${ECHO_T}$use_file_upload" >&6
-test $use_file_upload != no && cat >>confdefs.h <<\EOF
+test $use_file_upload != no &&
+cat >>confdefs.h <<\EOF
 #define USE_FILE_UPLOAD 1
 EOF
 
-echo "$as_me:32229: checking if IDNA support should be used" >&5
+echo "$as_me:32293: 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.
@@ -32243,7 +32307,7 @@ else
   use_idna=yes
 
 fi;
-echo "$as_me:32246: result: $use_idna" >&5
+echo "$as_me:32310: result: $use_idna" >&5
 echo "${ECHO_T}$use_idna" >&6
 
 if test "$use_idna" = yes ; then
@@ -32282,7 +32346,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 32285 "configure"
+#line 32349 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -32294,16 +32358,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32297: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32361: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32300: \$? = $ac_status" >&5
+  echo "$as_me:32364: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32303: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32367: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32306: \$? = $ac_status" >&5
+  echo "$as_me:32370: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -32320,7 +32384,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:32323: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:32387: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -32361,7 +32425,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 32364 "configure"
+#line 32428 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -32373,16 +32437,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32376: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32440: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32379: \$? = $ac_status" >&5
+  echo "$as_me:32443: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32382: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32446: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32385: \$? = $ac_status" >&5
+  echo "$as_me:32449: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -32399,7 +32463,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}:32402: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:32466: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -32415,7 +32479,7 @@ echo "${as_me:-configure}:32402: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:32418: error: cannot find  under $use_idna" >&5
+{ { echo "$as_me:32482: error: cannot find  under $use_idna" >&5
 echo "$as_me: error: cannot find  under $use_idna" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -32440,7 +32504,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}:32443: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:32507: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -32469,7 +32533,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}:32472: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:32536: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -32478,7 +32542,7 @@ echo "${as_me:-configure}:32472: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:32481: error: cannot find  under $use_idna" >&5
+{ { echo "$as_me:32545: error: cannot find  under $use_idna" >&5
 echo "$as_me: error: cannot find  under $use_idna" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -32492,12 +32556,12 @@ done
 cf_cv_header_path_idn=
 cf_cv_library_path_idn=
 
-echo "${as_me:-configure}:32495: testing Starting FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:32559: testing Starting FIND_LINKAGE(idn,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 32500 "configure"
+#line 32564 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -32515,16 +32579,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32518: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32582: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32521: \$? = $ac_status" >&5
+  echo "$as_me:32585: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32524: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32588: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32527: \$? = $ac_status" >&5
+  echo "$as_me:32591: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_idn=yes
@@ -32538,7 +32602,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lidn $LIBICONV $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 32541 "configure"
+#line 32605 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -32556,16 +32620,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32559: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32623: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32562: \$? = $ac_status" >&5
+  echo "$as_me:32626: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32565: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32629: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32568: \$? = $ac_status" >&5
+  echo "$as_me:32632: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_idn=yes
@@ -32582,9 +32646,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for idn library" 1>&6
 
-echo "${as_me:-configure}:32585: testing find linkage for idn library ..." 1>&5
+echo "${as_me:-configure}:32649: testing find linkage for idn library ..." 1>&5
 
-echo "${as_me:-configure}:32587: testing Searching for headers in FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:32651: testing Searching for headers in FIND_LINKAGE(idn,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -32697,11 +32761,11 @@ cf_search="$cf_search $cf_header_path_list"
       if test -d $cf_cv_header_path_idn ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_idn" 1>&6
 
-echo "${as_me:-configure}:32700: testing ... testing $cf_cv_header_path_idn ..." 1>&5
+echo "${as_me:-configure}:32764: testing ... testing $cf_cv_header_path_idn ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_idn"
         cat >conftest.$ac_ext <<_ACEOF
-#line 32704 "configure"
+#line 32768 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -32719,21 +32783,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32722: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32786: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32725: \$? = $ac_status" >&5
+  echo "$as_me:32789: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32728: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32792: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32731: \$? = $ac_status" >&5
+  echo "$as_me:32795: \$? = $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}:32736: testing ... found idn headers in $cf_cv_header_path_idn ..." 1>&5
+echo "${as_me:-configure}:32800: testing ... found idn headers in $cf_cv_header_path_idn ..." 1>&5
 
             cf_cv_find_linkage_idn=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -32751,7 +32815,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_idn" = maybe ; then
 
-echo "${as_me:-configure}:32754: testing Searching for idn library in FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:32818: testing Searching for idn library in FIND_LINKAGE(idn,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -32848,13 +32912,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}:32851: testing ... testing $cf_cv_library_path_idn ..." 1>&5
+echo "${as_me:-configure}:32915: 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 32857 "configure"
+#line 32921 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -32872,21 +32936,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32875: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32939: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32878: \$? = $ac_status" >&5
+  echo "$as_me:32942: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32881: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32945: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32884: \$? = $ac_status" >&5
+  echo "$as_me:32948: \$? = $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}:32889: testing ... found idn library in $cf_cv_library_path_idn ..." 1>&5
+echo "${as_me:-configure}:32953: testing ... found idn library in $cf_cv_library_path_idn ..." 1>&5
 
                 cf_cv_find_linkage_idn=yes
                 cf_cv_library_file_idn="-lidn"
@@ -32945,7 +33009,7 @@ if test -n "$cf_cv_header_path_idn" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 32948 "configure"
+#line 33012 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -32957,16 +33021,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32960: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33024: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32963: \$? = $ac_status" >&5
+  echo "$as_me:33027: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32966: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33030: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32969: \$? = $ac_status" >&5
+  echo "$as_me:33033: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -32983,7 +33047,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}:32986: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:33050: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -33017,7 +33081,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}:33020: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:33084: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -33028,12 +33092,13 @@ fi
 	LIBS="-lidn $LIBS"
 
 else
-{ echo "$as_me:33031: WARNING: Cannot find idn library" >&5
+{ echo "$as_me:33095: 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
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define USE_IDNA 1
 EOF
 
@@ -33041,7 +33106,7 @@ fi
 
 fi
 
-echo "$as_me:33044: checking if element-justification logic should be used" >&5
+echo "$as_me:33109: 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.
@@ -33058,13 +33123,14 @@ else
   use_justify_elts=yes
 
 fi;
-echo "$as_me:33061: result: $use_justify_elts" >&5
+echo "$as_me:33126: result: $use_justify_elts" >&5
 echo "${ECHO_T}$use_justify_elts" >&6
-test $use_justify_elts != no && cat >>confdefs.h <<\EOF
+test $use_justify_elts != no &&
+cat >>confdefs.h <<\EOF
 #define USE_JUSTIFY_ELTS 1
 EOF
 
-echo "$as_me:33067: checking if partial-display should be used" >&5
+echo "$as_me:33133: 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.
@@ -33081,13 +33147,14 @@ else
   use_partial_display=yes
 
 fi;
-echo "$as_me:33084: result: $use_partial_display" >&5
+echo "$as_me:33150: result: $use_partial_display" >&5
 echo "${ECHO_T}$use_partial_display" >&6
-test $use_partial_display != no && cat >>confdefs.h <<\EOF
+test $use_partial_display != no &&
+cat >>confdefs.h <<\EOF
 #define DISP_PARTIAL 1
 EOF
 
-echo "$as_me:33090: checking if persistent-cookie logic should be used" >&5
+echo "$as_me:33157: 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.
@@ -33104,13 +33171,14 @@ else
   use_filed_cookies=yes
 
 fi;
-echo "$as_me:33107: result: $use_filed_cookies" >&5
+echo "$as_me:33174: result: $use_filed_cookies" >&5
 echo "${ECHO_T}$use_filed_cookies" >&6
-test $use_filed_cookies != no && cat >>confdefs.h <<\EOF
+test $use_filed_cookies != no &&
+cat >>confdefs.h <<\EOF
 #define USE_PERSISTENT_COOKIES 1
 EOF
 
-echo "$as_me:33113: checking if html source should be colorized" >&5
+echo "$as_me:33181: 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.
@@ -33127,13 +33195,14 @@ else
   use_prettysrc=yes
 
 fi;
-echo "$as_me:33130: result: $use_prettysrc" >&5
+echo "$as_me:33198: result: $use_prettysrc" >&5
 echo "${ECHO_T}$use_prettysrc" >&6
-test $use_prettysrc != no && cat >>confdefs.h <<\EOF
+test $use_prettysrc != no &&
+cat >>confdefs.h <<\EOF
 #define USE_PRETTYSRC 1
 EOF
 
-echo "$as_me:33136: checking if progress-bar code should be used" >&5
+echo "$as_me:33205: 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.
@@ -33150,13 +33219,14 @@ else
   use_progressbar=yes
 
 fi;
-echo "$as_me:33153: result: $use_progressbar" >&5
+echo "$as_me:33222: result: $use_progressbar" >&5
 echo "${ECHO_T}$use_progressbar" >&6
-test $use_progressbar != no && cat >>confdefs.h <<\EOF
+test $use_progressbar != no &&
+cat >>confdefs.h <<\EOF
 #define USE_PROGRESSBAR 1
 EOF
 
-echo "$as_me:33159: checking if read-progress message should show ETA" >&5
+echo "$as_me:33229: 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.
@@ -33173,13 +33243,14 @@ else
   use_read_eta=yes
 
 fi;
-echo "$as_me:33176: result: $use_read_eta" >&5
+echo "$as_me:33246: result: $use_read_eta" >&5
 echo "${ECHO_T}$use_read_eta" >&6
-test $use_read_eta != no && cat >>confdefs.h <<\EOF
+test $use_read_eta != no &&
+cat >>confdefs.h <<\EOF
 #define USE_READPROGRESS 1
 EOF
 
-echo "$as_me:33182: checking if source caching should be used" >&5
+echo "$as_me:33253: 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.
@@ -33196,13 +33267,14 @@ else
   use_source_cache=yes
 
 fi;
-echo "$as_me:33199: result: $use_source_cache" >&5
+echo "$as_me:33270: result: $use_source_cache" >&5
 echo "${ECHO_T}$use_source_cache" >&6
-test $use_source_cache != no && cat >>confdefs.h <<\EOF
+test $use_source_cache != no &&
+cat >>confdefs.h <<\EOF
 #define USE_SOURCE_CACHE 1
 EOF
 
-echo "$as_me:33205: checking if scrollbar code should be used" >&5
+echo "$as_me:33277: 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.
@@ -33219,10 +33291,10 @@ else
   use_scrollbar=yes
 
 fi;
-echo "$as_me:33222: result: $use_scrollbar" >&5
+echo "$as_me:33294: result: $use_scrollbar" >&5
 echo "${ECHO_T}$use_scrollbar" >&6
 
-echo "$as_me:33225: checking if charset-selection logic should be used" >&5
+echo "$as_me:33297: 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.
@@ -33239,13 +33311,14 @@ else
   use_charset_choice=no
 
 fi;
-echo "$as_me:33242: result: $use_charset_choice" >&5
+echo "$as_me:33314: result: $use_charset_choice" >&5
 echo "${ECHO_T}$use_charset_choice" >&6
-test $use_charset_choice != no && cat >>confdefs.h <<\EOF
+test $use_charset_choice != no &&
+cat >>confdefs.h <<\EOF
 #define USE_CHARSET_CHOICE 1
 EOF
 
-echo "$as_me:33248: checking if you want to use external commands" >&5
+echo "$as_me:33321: 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.
@@ -33262,17 +33335,18 @@ else
   use_externs=no
 
 fi;
-echo "$as_me:33265: result: $use_externs" >&5
+echo "$as_me:33338: result: $use_externs" >&5
 echo "${ECHO_T}$use_externs" >&6
 if test $use_externs != "no" ; then
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define USE_EXTERNALS 1
 EOF
 
 	EXTRA_OBJS="$EXTRA_OBJS LYExtern\$o"
 fi
 
-echo "$as_me:33275: checking if you want to use setfont support" >&5
+echo "$as_me:33349: 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.
@@ -33289,7 +33363,7 @@ else
   use_setfont=no
 
 fi;
-echo "$as_me:33292: result: $use_setfont" >&5
+echo "$as_me:33366: result: $use_setfont" >&5
 echo "${ECHO_T}$use_setfont" >&6
 if test $use_setfont = yes ; then
 	case $host_os in
@@ -33300,7 +33374,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:33303: checking for $ac_word" >&5
+echo "$as_me:33377: 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
@@ -33317,7 +33391,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:33320: found $ac_dir/$ac_word" >&5
+   echo "$as_me:33394: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -33328,10 +33402,10 @@ fi
 SETFONT=$ac_cv_path_SETFONT
 
 if test -n "$SETFONT"; then
-  echo "$as_me:33331: result: $SETFONT" >&5
+  echo "$as_me:33405: result: $SETFONT" >&5
 echo "${ECHO_T}$SETFONT" >&6
 else
-  echo "$as_me:33334: result: no" >&5
+  echo "$as_me:33408: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -33390,13 +33464,14 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:33393: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:33467: testing defining path for ${cf_path_prog} ..." 1>&5
 
-	cat >>confdefs.h <<EOF
+cat >>confdefs.h <<EOF
 #define SETFONT_PATH "$cf_path_prog"
 EOF
 
-	test -n "$cf_path_args" && cat >>confdefs.h <<EOF
+	test -n "$cf_path_args" &&
+cat >>confdefs.h <<EOF
 #define SETFONT_ARGS "$cf_path_args"
 EOF
 
@@ -33407,29 +33482,30 @@ fi
 		SETFONT=built-in
 		test -n "$verbose" && echo "	Assume $host_os has font-switching" 1>&6
 
-echo "${as_me:-configure}:33410: testing Assume $host_os has font-switching ..." 1>&5
+echo "${as_me:-configure}:33485: 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}:33417: testing Assume $host_os has no font-switching ..." 1>&5
+echo "${as_me:-configure}:33492: testing Assume $host_os has no font-switching ..." 1>&5
 
 		;;
 	esac
 	if test -z "$SETFONT" ; then
-		{ echo "$as_me:33422: WARNING: Cannot find a font-setting program" >&5
+		{ echo "$as_me:33497: WARNING: Cannot find a font-setting program" >&5
 echo "$as_me: WARNING: Cannot find a font-setting program" >&2;}
 	elif test "$SETFONT" != unknown ; then
-		cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define EXP_CHARTRANS_AUTOSWITCH 1
 EOF
 
 	fi
 fi
 
-echo "$as_me:33432: checking if you want cgi-link support" >&5
+echo "$as_me:33508: 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.
@@ -33437,7 +33513,8 @@ if test "${enable_cgi_links+set}" = set; then
   enableval="$enable_cgi_links"
   test "$enableval" != yes && enableval=no
   if test "$enableval" != "no" ; then
-    cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define LYNXCGI_LINKS 1
 EOF
 
@@ -33445,10 +33522,10 @@ EOF
 else
   enableval=no
 fi;
-echo "$as_me:33448: result: $enableval" >&5
+echo "$as_me:33525: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:33451: checking if you want change-exec support" >&5
+echo "$as_me:33528: 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.
@@ -33465,13 +33542,14 @@ else
   use_change_exec=no
 
 fi;
-echo "$as_me:33468: result: $use_change_exec" >&5
+echo "$as_me:33545: result: $use_change_exec" >&5
 echo "${ECHO_T}$use_change_exec" >&6
-test $use_change_exec = yes && cat >>confdefs.h <<\EOF
+test $use_change_exec = yes &&
+cat >>confdefs.h <<\EOF
 #define ENABLE_OPTS_CHANGE_EXEC 1
 EOF
 
-echo "$as_me:33474: checking if you want exec-links support" >&5
+echo "$as_me:33552: 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.
@@ -33488,13 +33566,14 @@ else
   use_exec_links=$enableval
 
 fi;
-echo "$as_me:33491: result: $use_exec_links" >&5
+echo "$as_me:33569: result: $use_exec_links" >&5
 echo "${ECHO_T}$use_exec_links" >&6
-test $use_exec_links = yes && cat >>confdefs.h <<\EOF
+test $use_exec_links = yes &&
+cat >>confdefs.h <<\EOF
 #define EXEC_LINKS 1
 EOF
 
-echo "$as_me:33497: checking if you want exec-scripts support" >&5
+echo "$as_me:33576: 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.
@@ -33511,13 +33590,14 @@ else
   use_exec_scripts=$enableval
 
 fi;
-echo "$as_me:33514: result: $use_exec_scripts" >&5
+echo "$as_me:33593: result: $use_exec_scripts" >&5
 echo "${ECHO_T}$use_exec_scripts" >&6
-test $use_exec_scripts = yes && cat >>confdefs.h <<\EOF
+test $use_exec_scripts = yes &&
+cat >>confdefs.h <<\EOF
 #define EXEC_SCRIPTS 1
 EOF
 
-echo "$as_me:33520: checking if you want internal-links feature" >&5
+echo "$as_me:33600: 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.
@@ -33534,13 +33614,14 @@ else
   use_internal_links=no
 
 fi;
-echo "$as_me:33537: result: $use_internal_links" >&5
+echo "$as_me:33617: result: $use_internal_links" >&5
 echo "${ECHO_T}$use_internal_links" >&6
-test $use_internal_links = no && cat >>confdefs.h <<\EOF
+test $use_internal_links = no &&
+cat >>confdefs.h <<\EOF
 #define DONT_TRACK_INTERNAL_LINKS 1
 EOF
 
-echo "$as_me:33543: checking if you want to fork NSL requests" >&5
+echo "$as_me:33624: 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.
@@ -33557,18 +33638,20 @@ else
   use_nsl_fork=no
 
 fi;
-echo "$as_me:33560: result: $use_nsl_fork" >&5
+echo "$as_me:33641: result: $use_nsl_fork" >&5
 echo "${ECHO_T}$use_nsl_fork" >&6
 if test $use_nsl_fork = yes ; then
 	case $host_os in
 	mingw*)
-		cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define _WINDOWS_NSL 1
 EOF
 
 		;;
 	*)
-		cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define NSL_FORK 1
 EOF
 
@@ -33576,7 +33659,7 @@ EOF
 	esac
 fi
 
-echo "$as_me:33579: checking if you want to log URL requests via syslog" >&5
+echo "$as_me:33662: 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.
@@ -33593,13 +33676,14 @@ else
   use_syslog=no
 
 fi;
-echo "$as_me:33596: result: $use_syslog" >&5
+echo "$as_me:33679: result: $use_syslog" >&5
 echo "${ECHO_T}$use_syslog" >&6
-test $use_syslog = yes && cat >>confdefs.h <<\EOF
+test $use_syslog = yes &&
+cat >>confdefs.h <<\EOF
 #define SYSLOG_REQUESTED_URLS 1
 EOF
 
-echo "$as_me:33602: checking if you want to underline links" >&5
+echo "$as_me:33686: 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.
@@ -33616,17 +33700,19 @@ else
   use_underline=no
 
 fi;
-echo "$as_me:33619: result: $use_underline" >&5
+echo "$as_me:33703: result: $use_underline" >&5
 echo "${ECHO_T}$use_underline" >&6
-test $use_underline = yes && cat >>confdefs.h <<\EOF
+test $use_underline = yes &&
+cat >>confdefs.h <<\EOF
 #define UNDERLINE_LINKS 1
 EOF
 
-test $use_underline = no  && cat >>confdefs.h <<\EOF
+test $use_underline = no  &&
+cat >>confdefs.h <<\EOF
 #define UNDERLINE_LINKS 0
 EOF
 
-echo "$as_me:33629: checking if help files should be gzip'ed" >&5
+echo "$as_me:33715: 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.
@@ -33643,10 +33729,10 @@ else
   use_gzip_help=no
 
 fi;
-echo "$as_me:33646: result: $use_gzip_help" >&5
+echo "$as_me:33732: result: $use_gzip_help" >&5
 echo "${ECHO_T}$use_gzip_help" >&6
 
-echo "$as_me:33649: checking if you want to use libbz2 for decompression of some bzip2 files" >&5
+echo "$as_me:33735: 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.
@@ -33656,7 +33742,7 @@ if test "${with_bzlib+set}" = set; then
 else
   use_bzlib=no
 fi;
-echo "$as_me:33659: result: $use_bzlib" >&5
+echo "$as_me:33745: result: $use_bzlib" >&5
 echo "${ECHO_T}$use_bzlib" >&6
 
 if test ".$use_bzlib" != ".no" ; then
@@ -33695,7 +33781,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 33698 "configure"
+#line 33784 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -33707,16 +33793,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33710: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33796: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33713: \$? = $ac_status" >&5
+  echo "$as_me:33799: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33716: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33802: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33719: \$? = $ac_status" >&5
+  echo "$as_me:33805: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -33733,7 +33819,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}:33736: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:33822: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -33774,7 +33860,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 33777 "configure"
+#line 33863 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -33786,16 +33872,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33789: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33875: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33792: \$? = $ac_status" >&5
+  echo "$as_me:33878: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33795: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33881: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33798: \$? = $ac_status" >&5
+  echo "$as_me:33884: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -33812,7 +33898,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}:33815: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:33901: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -33828,7 +33914,7 @@ echo "${as_me:-configure}:33815: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:33831: error: cannot find  under $use_bzlib" >&5
+{ { echo "$as_me:33917: error: cannot find  under $use_bzlib" >&5
 echo "$as_me: error: cannot find  under $use_bzlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -33853,7 +33939,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}:33856: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:33942: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -33882,7 +33968,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}:33885: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:33971: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -33891,7 +33977,7 @@ echo "${as_me:-configure}:33885: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:33894: error: cannot find  under $use_bzlib" >&5
+{ { echo "$as_me:33980: error: cannot find  under $use_bzlib" >&5
 echo "$as_me: error: cannot find  under $use_bzlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -33905,12 +33991,12 @@ done
 cf_cv_header_path_bz2=
 cf_cv_library_path_bz2=
 
-echo "${as_me:-configure}:33908: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:33994: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 33913 "configure"
+#line 33999 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -33927,16 +34013,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33930: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34016: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33933: \$? = $ac_status" >&5
+  echo "$as_me:34019: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33936: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34022: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33939: \$? = $ac_status" >&5
+  echo "$as_me:34025: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_bz2=yes
@@ -33950,7 +34036,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lbz2  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 33953 "configure"
+#line 34039 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -33967,16 +34053,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33970: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34056: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33973: \$? = $ac_status" >&5
+  echo "$as_me:34059: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33976: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34062: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33979: \$? = $ac_status" >&5
+  echo "$as_me:34065: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_bz2=yes
@@ -33993,9 +34079,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for bz2 library" 1>&6
 
-echo "${as_me:-configure}:33996: testing find linkage for bz2 library ..." 1>&5
+echo "${as_me:-configure}:34082: testing find linkage for bz2 library ..." 1>&5
 
-echo "${as_me:-configure}:33998: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:34084: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -34108,11 +34194,11 @@ cf_search="$cf_search $cf_header_path_list"
       if test -d $cf_cv_header_path_bz2 ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_bz2" 1>&6
 
-echo "${as_me:-configure}:34111: testing ... testing $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:34197: testing ... testing $cf_cv_header_path_bz2 ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_bz2"
         cat >conftest.$ac_ext <<_ACEOF
-#line 34115 "configure"
+#line 34201 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -34129,21 +34215,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34132: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34218: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34135: \$? = $ac_status" >&5
+  echo "$as_me:34221: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:34138: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34224: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34141: \$? = $ac_status" >&5
+  echo "$as_me:34227: \$? = $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}:34146: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:34232: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
 
             cf_cv_find_linkage_bz2=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -34161,7 +34247,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_bz2" = maybe ; then
 
-echo "${as_me:-configure}:34164: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:34250: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -34169,7 +34255,7 @@ echo "${as_me:-configure}:34164: testing Searching for bz2 library in FIND_LINKA
         CPPFLAGS="$cf_test_CPPFLAGS"
         LIBS="-lbz2  $cf_save_LIBS"
         cat >conftest.$ac_ext <<_ACEOF
-#line 34172 "configure"
+#line 34258 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -34186,21 +34272,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34189: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34275: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34192: \$? = $ac_status" >&5
+  echo "$as_me:34278: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:34195: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34281: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34198: \$? = $ac_status" >&5
+  echo "$as_me:34284: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found bz2 library in system" 1>&6
 
-echo "${as_me:-configure}:34203: testing ... found bz2 library in system ..." 1>&5
+echo "${as_me:-configure}:34289: testing ... found bz2 library in system ..." 1>&5
 
             cf_cv_find_linkage_bz2=yes
 else
@@ -34303,13 +34389,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}:34306: testing ... testing $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:34392: 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 34312 "configure"
+#line 34398 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -34326,21 +34412,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34329: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34415: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34332: \$? = $ac_status" >&5
+  echo "$as_me:34418: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:34335: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34421: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34338: \$? = $ac_status" >&5
+  echo "$as_me:34424: \$? = $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}:34343: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:34429: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
 
                 cf_cv_find_linkage_bz2=yes
                 cf_cv_library_file_bz2="-lbz2"
@@ -34399,7 +34485,7 @@ if test -n "$cf_cv_header_path_bz2" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 34402 "configure"
+#line 34488 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -34411,16 +34497,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34414: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34500: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34417: \$? = $ac_status" >&5
+  echo "$as_me:34503: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:34420: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34506: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34423: \$? = $ac_status" >&5
+  echo "$as_me:34509: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -34437,7 +34523,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}:34440: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:34526: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -34471,7 +34557,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}:34474: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:34560: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -34482,17 +34568,18 @@ fi
 	LIBS="-lbz2 $LIBS"
 
 else
-{ echo "$as_me:34485: WARNING: Cannot find bz2 library" >&5
+{ echo "$as_me:34571: WARNING: Cannot find bz2 library" >&5
 echo "$as_me: WARNING: Cannot find bz2 library" >&2;}
 fi
 
-	test "x$cf_cv_find_linkage_bz2" = "xyes" && cat >>confdefs.h <<\EOF
+	test "x$cf_cv_find_linkage_bz2" = "xyes" &&
+cat >>confdefs.h <<\EOF
 #define USE_BZLIB 1
 EOF
 
 fi
 
-echo "$as_me:34495: checking if you want to use zlib for decompression of some gzip files" >&5
+echo "$as_me:34582: 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.
@@ -34502,7 +34589,7 @@ if test "${with_zlib+set}" = set; then
 else
   use_zlib=no
 fi;
-echo "$as_me:34505: result: $use_zlib" >&5
+echo "$as_me:34592: result: $use_zlib" >&5
 echo "${ECHO_T}$use_zlib" >&6
 
 if test ".$use_zlib" != ".no" ; then
@@ -34541,7 +34628,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 34544 "configure"
+#line 34631 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -34553,16 +34640,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34556: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34643: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34559: \$? = $ac_status" >&5
+  echo "$as_me:34646: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:34562: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34649: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34565: \$? = $ac_status" >&5
+  echo "$as_me:34652: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -34579,7 +34666,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}:34582: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:34669: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -34620,7 +34707,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 34623 "configure"
+#line 34710 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -34632,16 +34719,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34635: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34722: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34638: \$? = $ac_status" >&5
+  echo "$as_me:34725: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:34641: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34728: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34644: \$? = $ac_status" >&5
+  echo "$as_me:34731: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -34658,7 +34745,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}:34661: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:34748: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -34674,7 +34761,7 @@ echo "${as_me:-configure}:34661: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:34677: error: cannot find  under $use_zlib" >&5
+{ { echo "$as_me:34764: error: cannot find  under $use_zlib" >&5
 echo "$as_me: error: cannot find  under $use_zlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -34699,7 +34786,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}:34702: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:34789: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -34728,7 +34815,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}:34731: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:34818: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -34737,7 +34824,7 @@ echo "${as_me:-configure}:34731: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:34740: error: cannot find  under $use_zlib" >&5
+{ { echo "$as_me:34827: error: cannot find  under $use_zlib" >&5
 echo "$as_me: error: cannot find  under $use_zlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -34751,12 +34838,12 @@ done
 cf_cv_header_path_z=
 cf_cv_library_path_z=
 
-echo "${as_me:-configure}:34754: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:34841: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 34759 "configure"
+#line 34846 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -34772,16 +34859,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34775: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34862: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34778: \$? = $ac_status" >&5
+  echo "$as_me:34865: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:34781: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34868: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34784: \$? = $ac_status" >&5
+  echo "$as_me:34871: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_z=yes
@@ -34795,7 +34882,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lz  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 34798 "configure"
+#line 34885 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -34811,16 +34898,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34814: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34901: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34817: \$? = $ac_status" >&5
+  echo "$as_me:34904: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:34820: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34907: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34823: \$? = $ac_status" >&5
+  echo "$as_me:34910: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_z=yes
@@ -34837,9 +34924,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for z library" 1>&6
 
-echo "${as_me:-configure}:34840: testing find linkage for z library ..." 1>&5
+echo "${as_me:-configure}:34927: testing find linkage for z library ..." 1>&5
 
-echo "${as_me:-configure}:34842: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:34929: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -34952,11 +35039,11 @@ cf_search="$cf_search $cf_header_path_list"
       if test -d $cf_cv_header_path_z ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_z" 1>&6
 
-echo "${as_me:-configure}:34955: testing ... testing $cf_cv_header_path_z ..." 1>&5
+echo "${as_me:-configure}:35042: testing ... testing $cf_cv_header_path_z ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_z"
         cat >conftest.$ac_ext <<_ACEOF
-#line 34959 "configure"
+#line 35046 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -34972,21 +35059,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34975: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35062: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34978: \$? = $ac_status" >&5
+  echo "$as_me:35065: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:34981: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35068: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34984: \$? = $ac_status" >&5
+  echo "$as_me:35071: \$? = $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}:34989: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
+echo "${as_me:-configure}:35076: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
 
             cf_cv_find_linkage_z=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -35004,7 +35091,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_z" = maybe ; then
 
-echo "${as_me:-configure}:35007: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:35094: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -35012,7 +35099,7 @@ echo "${as_me:-configure}:35007: testing Searching for z library in FIND_LINKAGE
         CPPFLAGS="$cf_test_CPPFLAGS"
         LIBS="-lz  $cf_save_LIBS"
         cat >conftest.$ac_ext <<_ACEOF
-#line 35015 "configure"
+#line 35102 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -35028,21 +35115,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35031: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35118: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35034: \$? = $ac_status" >&5
+  echo "$as_me:35121: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35037: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35124: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35040: \$? = $ac_status" >&5
+  echo "$as_me:35127: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found z library in system" 1>&6
 
-echo "${as_me:-configure}:35045: testing ... found z library in system ..." 1>&5
+echo "${as_me:-configure}:35132: testing ... found z library in system ..." 1>&5
 
             cf_cv_find_linkage_z=yes
 else
@@ -35145,13 +35232,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}:35148: testing ... testing $cf_cv_library_path_z ..." 1>&5
+echo "${as_me:-configure}:35235: 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 35154 "configure"
+#line 35241 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -35167,21 +35254,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35170: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35257: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35173: \$? = $ac_status" >&5
+  echo "$as_me:35260: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35176: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35263: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35179: \$? = $ac_status" >&5
+  echo "$as_me:35266: \$? = $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}:35184: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
+echo "${as_me:-configure}:35271: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
 
                 cf_cv_find_linkage_z=yes
                 cf_cv_library_file_z="-lz"
@@ -35240,7 +35327,7 @@ if test -n "$cf_cv_header_path_z" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 35243 "configure"
+#line 35330 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -35252,16 +35339,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:35255: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35342: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35258: \$? = $ac_status" >&5
+  echo "$as_me:35345: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:35261: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35348: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35264: \$? = $ac_status" >&5
+  echo "$as_me:35351: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -35278,7 +35365,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}:35281: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:35368: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -35312,7 +35399,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}:35315: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:35402: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -35323,7 +35410,7 @@ fi
 	LIBS="-lz $LIBS"
 
 else
-{ echo "$as_me:35326: WARNING: Cannot find z library" >&5
+{ echo "$as_me:35413: WARNING: Cannot find z library" >&5
 echo "$as_me: WARNING: Cannot find z library" >&2;}
 fi
 
@@ -35332,13 +35419,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:35335: checking for $ac_func" >&5
+echo "$as_me:35422: 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 35341 "configure"
+#line 35428 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -35369,16 +35456,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35372: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35459: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35375: \$? = $ac_status" >&5
+  echo "$as_me:35462: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35378: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35465: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35381: \$? = $ac_status" >&5
+  echo "$as_me:35468: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -35388,7 +35475,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:35391: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:35478: 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
@@ -35398,13 +35485,14 @@ EOF
 fi
 done
 
-	test "x$cf_cv_find_linkage_z" = "xyes" && cat >>confdefs.h <<\EOF
+	test "x$cf_cv_find_linkage_z" = "xyes" &&
+cat >>confdefs.h <<\EOF
 #define USE_ZLIB 1
 EOF
 
 fi
 
-echo "$as_me:35407: checking if you want to exclude FINGER code" >&5
+echo "$as_me:35495: 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.
@@ -35421,13 +35509,14 @@ else
   use_finger=no
 
 fi;
-echo "$as_me:35424: result: $use_finger" >&5
+echo "$as_me:35512: result: $use_finger" >&5
 echo "${ECHO_T}$use_finger" >&6
-test $use_finger != "no" && cat >>confdefs.h <<\EOF
+test $use_finger != "no" &&
+cat >>confdefs.h <<\EOF
 #define DISABLE_FINGER 1
 EOF
 
-echo "$as_me:35430: checking if you want to exclude GOPHER code" >&5
+echo "$as_me:35519: 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.
@@ -35444,13 +35533,14 @@ else
   use_gopher=no
 
 fi;
-echo "$as_me:35447: result: $use_gopher" >&5
+echo "$as_me:35536: result: $use_gopher" >&5
 echo "${ECHO_T}$use_gopher" >&6
-test $use_gopher != "no" && cat >>confdefs.h <<\EOF
+test $use_gopher != "no" &&
+cat >>confdefs.h <<\EOF
 #define DISABLE_GOPHER 1
 EOF
 
-echo "$as_me:35453: checking if you want to exclude NEWS code" >&5
+echo "$as_me:35543: 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.
@@ -35467,13 +35557,14 @@ else
   use_news=no
 
 fi;
-echo "$as_me:35470: result: $use_news" >&5
+echo "$as_me:35560: result: $use_news" >&5
 echo "${ECHO_T}$use_news" >&6
-test $use_news != "no" && cat >>confdefs.h <<\EOF
+test $use_news != "no" &&
+cat >>confdefs.h <<\EOF
 #define DISABLE_NEWS 1
 EOF
 
-echo "$as_me:35476: checking if you want to exclude FTP code" >&5
+echo "$as_me:35567: 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.
@@ -35490,13 +35581,14 @@ else
   use_ftp=no
 
 fi;
-echo "$as_me:35493: result: $use_ftp" >&5
+echo "$as_me:35584: result: $use_ftp" >&5
 echo "${ECHO_T}$use_ftp" >&6
-test $use_ftp != "no" && cat >>confdefs.h <<\EOF
+test $use_ftp != "no" &&
+cat >>confdefs.h <<\EOF
 #define DISABLE_FTP 1
 EOF
 
-echo "$as_me:35499: checking if you want to include WAIS code" >&5
+echo "$as_me:35591: 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.
@@ -35513,13 +35605,13 @@ else
   use_wais=no
 
 fi;
-echo "$as_me:35516: result: $use_wais" >&5
+echo "$as_me:35608: result: $use_wais" >&5
 echo "${ECHO_T}$use_wais" >&6
 
 MAKE_WAIS="#"
 if test $use_wais != "no"
 then
-	echo "$as_me:35522: checking for fs_free in -lwais" >&5
+	echo "$as_me:35614: 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
@@ -35527,7 +35619,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lwais  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 35530 "configure"
+#line 35622 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -35546,16 +35638,16 @@ fs_free ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35549: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35641: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35552: \$? = $ac_status" >&5
+  echo "$as_me:35644: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35555: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35647: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35558: \$? = $ac_status" >&5
+  echo "$as_me:35650: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_wais_fs_free=yes
 else
@@ -35566,18 +35658,18 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:35569: result: $ac_cv_lib_wais_fs_free" >&5
+echo "$as_me:35661: 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:35573: checking if -lm needed for math functions" >&5
+echo "$as_me:35665: 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 35580 "configure"
+#line 35672 "configure"
 #include "confdefs.h"
 
 	#include <stdio.h>
@@ -35592,16 +35684,16 @@ double x = rand(); printf("result = %g\n", sin(x))
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35595: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35687: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35598: \$? = $ac_status" >&5
+  echo "$as_me:35690: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35601: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35693: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35604: \$? = $ac_status" >&5
+  echo "$as_me:35696: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_libm=no
 else
@@ -35611,7 +35703,7 @@ cf_cv_need_libm=yes
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:35614: result: $cf_cv_need_libm" >&5
+echo "$as_me:35706: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 if test "$cf_cv_need_libm" = yes
 then
@@ -35625,23 +35717,23 @@ fi
 for ac_header in wais.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:35628: checking for $ac_header" >&5
+echo "$as_me:35720: 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 35634 "configure"
+#line 35726 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:35638: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:35730: \"$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:35644: \$? = $ac_status" >&5
+  echo "$as_me:35736: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -35660,7 +35752,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:35663: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:35755: 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
@@ -35673,7 +35765,7 @@ done
 		MAKE_WAIS=
 
 else
-  { echo "$as_me:35676: WARNING: could not find WAIS library" >&5
+  { echo "$as_me:35768: WARNING: could not find WAIS library" >&5
 echo "$as_me: WARNING: could not find WAIS library" >&2;}
 fi
 
@@ -35681,7 +35773,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:35684: checking if directory-editor code should be used" >&5
+echo "$as_me:35776: 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.
@@ -35698,16 +35790,17 @@ else
   use_dired=yes
 
 fi;
-echo "$as_me:35701: result: $use_dired" >&5
+echo "$as_me:35793: result: $use_dired" >&5
 echo "${ECHO_T}$use_dired" >&6
 
 if test ".$use_dired" != ".no" ; then
 	EXTRA_OBJS="$EXTRA_OBJS LYLocal\$o"
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define DIRED_SUPPORT 1
 EOF
 
-	echo "$as_me:35710: checking if you wish to allow extracting from archives via DirEd" >&5
+	echo "$as_me:35803: 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.
@@ -35715,7 +35808,8 @@ if test "${enable_dired_dearchive+set}" = set; then
   enableval="$enable_dired_dearchive"
   test "$enableval" != no && enableval=yes
   if test "$enableval" != "yes" ; then
-    cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define ARCHIVE_ONLY 1
 EOF
 
@@ -35723,10 +35817,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:35726: result: $enableval" >&5
+	echo "$as_me:35820: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:35729: checking if DirEd mode should override keys" >&5
+	echo "$as_me:35823: 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.
@@ -35736,22 +35830,24 @@ if test "${enable_dired_override+set}" = set; then
   if test "$enableval" != "yes" ; then
     :
   else
-    cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define OK_OVERRIDE 1
 EOF
 
   fi
 else
   enableval=yes
-  cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define OK_OVERRIDE 1
 EOF
 
 fi;
-	echo "$as_me:35751: result: $enableval" >&5
+	echo "$as_me:35847: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:35754: checking if you wish to allow permissions commands via DirEd" >&5
+	echo "$as_me:35850: 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.
@@ -35761,22 +35857,24 @@ if test "${enable_dired_permit+set}" = set; then
   if test "$enableval" != "yes" ; then
     :
   else
-    cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define OK_PERMIT 1
 EOF
 
   fi
 else
   enableval=yes
-  cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define OK_PERMIT 1
 EOF
 
 fi;
-	echo "$as_me:35776: result: $enableval" >&5
+	echo "$as_me:35874: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:35779: checking if you wish to allow executable-permission commands via DirEd" >&5
+	echo "$as_me:35877: 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.
@@ -35784,7 +35882,8 @@ if test "${enable_dired_xpermit+set}" = set; then
   enableval="$enable_dired_xpermit"
   test "$enableval" != no && enableval=yes
   if test "$enableval" != "yes" ; then
-    cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define NO_CHANGE_EXECUTE_PERMS 1
 EOF
 
@@ -35792,10 +35891,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:35795: result: $enableval" >&5
+	echo "$as_me:35894: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:35798: checking if you wish to allow \"tar\" commands from DirEd" >&5
+	echo "$as_me:35897: 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.
@@ -35805,22 +35904,24 @@ if test "${enable_dired_tar+set}" = set; then
   if test "$enableval" != "yes" ; then
     :
   else
-    cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define OK_TAR 1
 EOF
 
   fi
 else
   enableval=yes
-  cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define OK_TAR 1
 EOF
 
 fi;
-	echo "$as_me:35820: result: $enableval" >&5
+	echo "$as_me:35921: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:35823: checking if you wish to allow \"uudecode\" commands from DirEd" >&5
+	echo "$as_me:35924: 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.
@@ -35830,22 +35931,24 @@ if test "${enable_dired_uudecode+set}" = set; then
   if test "$enableval" != "yes" ; then
     :
   else
-    cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define OK_UUDECODE 1
 EOF
 
   fi
 else
   enableval=yes
-  cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define OK_UUDECODE 1
 EOF
 
 fi;
-	echo "$as_me:35845: result: $enableval" >&5
+	echo "$as_me:35948: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:35848: checking if you wish to allow \"zip\" and \"unzip\" commands from DirEd" >&5
+	echo "$as_me:35951: 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.
@@ -35855,22 +35958,24 @@ if test "${enable_dired_zip+set}" = set; then
   if test "$enableval" != "yes" ; then
     :
   else
-    cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define OK_ZIP 1
 EOF
 
   fi
 else
   enableval=yes
-  cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define OK_ZIP 1
 EOF
 
 fi;
-	echo "$as_me:35870: result: $enableval" >&5
+	echo "$as_me:35975: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:35873: checking if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd" >&5
+	echo "$as_me:35978: 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.
@@ -35880,23 +35985,25 @@ if test "${enable_dired_gzip+set}" = set; then
   if test "$enableval" != "yes" ; then
     :
   else
-    cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define OK_GZIP 1
 EOF
 
   fi
 else
   enableval=yes
-  cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define OK_GZIP 1
 EOF
 
 fi;
-	echo "$as_me:35895: result: $enableval" >&5
+	echo "$as_me:36002: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 fi
 
-echo "$as_me:35899: checking if you want long-directory listings" >&5
+echo "$as_me:36006: 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.
@@ -35906,22 +36013,24 @@ if test "${enable_long_list+set}" = set; then
   if test "$enableval" != "yes" ; then
     :
   else
-    cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define LONG_LIST 1
 EOF
 
   fi
 else
   enableval=yes
-  cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define LONG_LIST 1
 EOF
 
 fi;
-echo "$as_me:35921: result: $enableval" >&5
+echo "$as_me:36030: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:35924: checking if parent-directory references are permitted" >&5
+echo "$as_me:36033: 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.
@@ -35929,7 +36038,8 @@ if test "${enable_parent_dir_refs+set}" = set; then
   enableval="$enable_parent_dir_refs"
   test "$enableval" != no && enableval=yes
   if test "$enableval" != "yes" ; then
-    cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define NO_PARENT_DIR_REFERENCE 1
 EOF
 
@@ -35937,7 +36047,7 @@ EOF
 else
   enableval=yes
 fi;
-echo "$as_me:35940: result: $enableval" >&5
+echo "$as_me:36050: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 test -z "$TELNET" && TELNET=telnet
@@ -35945,7 +36055,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:35948: checking for $ac_word" >&5
+echo "$as_me:36058: 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
@@ -35962,7 +36072,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:35965: found $ac_dir/$ac_word" >&5
+   echo "$as_me:36075: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -35973,10 +36083,10 @@ fi
 TELNET=$ac_cv_path_TELNET
 
 if test -n "$TELNET"; then
-  echo "$as_me:35976: result: $TELNET" >&5
+  echo "$as_me:36086: result: $TELNET" >&5
 echo "${ECHO_T}$TELNET" >&6
 else
-  echo "$as_me:35979: result: no" >&5
+  echo "$as_me:36089: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -36035,13 +36145,14 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:36038: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:36148: testing defining path for ${cf_path_prog} ..." 1>&5
 
-	cat >>confdefs.h <<EOF
+cat >>confdefs.h <<EOF
 #define TELNET_PATH "$cf_path_prog"
 EOF
 
-	test -n "$cf_path_args" && cat >>confdefs.h <<EOF
+	test -n "$cf_path_args" &&
+cat >>confdefs.h <<EOF
 #define TELNET_ARGS "$cf_path_args"
 EOF
 
@@ -36052,7 +36163,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:36055: checking for $ac_word" >&5
+echo "$as_me:36166: 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
@@ -36069,7 +36180,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:36072: found $ac_dir/$ac_word" >&5
+   echo "$as_me:36183: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -36080,10 +36191,10 @@ fi
 TN3270=$ac_cv_path_TN3270
 
 if test -n "$TN3270"; then
-  echo "$as_me:36083: result: $TN3270" >&5
+  echo "$as_me:36194: result: $TN3270" >&5
 echo "${ECHO_T}$TN3270" >&6
 else
-  echo "$as_me:36086: result: no" >&5
+  echo "$as_me:36197: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -36142,13 +36253,14 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:36145: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:36256: testing defining path for ${cf_path_prog} ..." 1>&5
 
-	cat >>confdefs.h <<EOF
+cat >>confdefs.h <<EOF
 #define TN3270_PATH "$cf_path_prog"
 EOF
 
-	test -n "$cf_path_args" && cat >>confdefs.h <<EOF
+	test -n "$cf_path_args" &&
+cat >>confdefs.h <<EOF
 #define TN3270_ARGS "$cf_path_args"
 EOF
 
@@ -36159,7 +36271,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:36162: checking for $ac_word" >&5
+echo "$as_me:36274: 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
@@ -36176,7 +36288,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:36179: found $ac_dir/$ac_word" >&5
+   echo "$as_me:36291: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -36187,10 +36299,10 @@ fi
 RLOGIN=$ac_cv_path_RLOGIN
 
 if test -n "$RLOGIN"; then
-  echo "$as_me:36190: result: $RLOGIN" >&5
+  echo "$as_me:36302: result: $RLOGIN" >&5
 echo "${ECHO_T}$RLOGIN" >&6
 else
-  echo "$as_me:36193: result: no" >&5
+  echo "$as_me:36305: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -36249,13 +36361,14 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:36252: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:36364: testing defining path for ${cf_path_prog} ..." 1>&5
 
-	cat >>confdefs.h <<EOF
+cat >>confdefs.h <<EOF
 #define RLOGIN_PATH "$cf_path_prog"
 EOF
 
-	test -n "$cf_path_args" && cat >>confdefs.h <<EOF
+	test -n "$cf_path_args" &&
+cat >>confdefs.h <<EOF
 #define RLOGIN_ARGS "$cf_path_args"
 EOF
 
@@ -36266,7 +36379,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:36269: checking for $ac_word" >&5
+echo "$as_me:36382: 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
@@ -36283,7 +36396,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:36286: found $ac_dir/$ac_word" >&5
+   echo "$as_me:36399: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -36294,10 +36407,10 @@ fi
 MV=$ac_cv_path_MV
 
 if test -n "$MV"; then
-  echo "$as_me:36297: result: $MV" >&5
+  echo "$as_me:36410: result: $MV" >&5
 echo "${ECHO_T}$MV" >&6
 else
-  echo "$as_me:36300: result: no" >&5
+  echo "$as_me:36413: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -36356,13 +36469,14 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:36359: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:36472: testing defining path for ${cf_path_prog} ..." 1>&5
 
-	cat >>confdefs.h <<EOF
+cat >>confdefs.h <<EOF
 #define MV_PATH "$cf_path_prog"
 EOF
 
-	test -n "$cf_path_args" && cat >>confdefs.h <<EOF
+	test -n "$cf_path_args" &&
+cat >>confdefs.h <<EOF
 #define MV_ARGS "$cf_path_args"
 EOF
 
@@ -36373,7 +36487,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:36376: checking for $ac_word" >&5
+echo "$as_me:36490: 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
@@ -36390,7 +36504,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:36393: found $ac_dir/$ac_word" >&5
+   echo "$as_me:36507: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -36401,10 +36515,10 @@ fi
 GZIP=$ac_cv_path_GZIP
 
 if test -n "$GZIP"; then
-  echo "$as_me:36404: result: $GZIP" >&5
+  echo "$as_me:36518: result: $GZIP" >&5
 echo "${ECHO_T}$GZIP" >&6
 else
-  echo "$as_me:36407: result: no" >&5
+  echo "$as_me:36521: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -36463,13 +36577,14 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:36466: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:36580: testing defining path for ${cf_path_prog} ..." 1>&5
 
-	cat >>confdefs.h <<EOF
+cat >>confdefs.h <<EOF
 #define GZIP_PATH "$cf_path_prog"
 EOF
 
-	test -n "$cf_path_args" && cat >>confdefs.h <<EOF
+	test -n "$cf_path_args" &&
+cat >>confdefs.h <<EOF
 #define GZIP_ARGS "$cf_path_args"
 EOF
 
@@ -36480,7 +36595,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:36483: checking for $ac_word" >&5
+echo "$as_me:36598: 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
@@ -36497,7 +36612,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:36500: found $ac_dir/$ac_word" >&5
+   echo "$as_me:36615: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -36508,10 +36623,10 @@ fi
 UNCOMPRESS=$ac_cv_path_UNCOMPRESS
 
 if test -n "$UNCOMPRESS"; then
-  echo "$as_me:36511: result: $UNCOMPRESS" >&5
+  echo "$as_me:36626: result: $UNCOMPRESS" >&5
 echo "${ECHO_T}$UNCOMPRESS" >&6
 else
-  echo "$as_me:36514: result: no" >&5
+  echo "$as_me:36629: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -36570,13 +36685,14 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:36573: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:36688: testing defining path for ${cf_path_prog} ..." 1>&5
 
-	cat >>confdefs.h <<EOF
+cat >>confdefs.h <<EOF
 #define UNCOMPRESS_PATH "$cf_path_prog"
 EOF
 
-	test -n "$cf_path_args" && cat >>confdefs.h <<EOF
+	test -n "$cf_path_args" &&
+cat >>confdefs.h <<EOF
 #define UNCOMPRESS_ARGS "$cf_path_args"
 EOF
 
@@ -36587,7 +36703,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:36590: checking for $ac_word" >&5
+echo "$as_me:36706: 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
@@ -36604,7 +36720,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:36607: found $ac_dir/$ac_word" >&5
+   echo "$as_me:36723: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -36615,10 +36731,10 @@ fi
 UNZIP=$ac_cv_path_UNZIP
 
 if test -n "$UNZIP"; then
-  echo "$as_me:36618: result: $UNZIP" >&5
+  echo "$as_me:36734: result: $UNZIP" >&5
 echo "${ECHO_T}$UNZIP" >&6
 else
-  echo "$as_me:36621: result: no" >&5
+  echo "$as_me:36737: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -36677,13 +36793,14 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:36680: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:36796: testing defining path for ${cf_path_prog} ..." 1>&5
 
-	cat >>confdefs.h <<EOF
+cat >>confdefs.h <<EOF
 #define UNZIP_PATH "$cf_path_prog"
 EOF
 
-	test -n "$cf_path_args" && cat >>confdefs.h <<EOF
+	test -n "$cf_path_args" &&
+cat >>confdefs.h <<EOF
 #define UNZIP_ARGS "$cf_path_args"
 EOF
 
@@ -36694,7 +36811,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:36697: checking for $ac_word" >&5
+echo "$as_me:36814: 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
@@ -36711,7 +36828,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:36714: found $ac_dir/$ac_word" >&5
+   echo "$as_me:36831: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -36722,10 +36839,10 @@ fi
 BZIP2=$ac_cv_path_BZIP2
 
 if test -n "$BZIP2"; then
-  echo "$as_me:36725: result: $BZIP2" >&5
+  echo "$as_me:36842: result: $BZIP2" >&5
 echo "${ECHO_T}$BZIP2" >&6
 else
-  echo "$as_me:36728: result: no" >&5
+  echo "$as_me:36845: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -36784,13 +36901,14 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:36787: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:36904: testing defining path for ${cf_path_prog} ..." 1>&5
 
-	cat >>confdefs.h <<EOF
+cat >>confdefs.h <<EOF
 #define BZIP2_PATH "$cf_path_prog"
 EOF
 
-	test -n "$cf_path_args" && cat >>confdefs.h <<EOF
+	test -n "$cf_path_args" &&
+cat >>confdefs.h <<EOF
 #define BZIP2_ARGS "$cf_path_args"
 EOF
 
@@ -36801,7 +36919,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:36804: checking for $ac_word" >&5
+echo "$as_me:36922: 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
@@ -36818,7 +36936,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:36821: found $ac_dir/$ac_word" >&5
+   echo "$as_me:36939: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -36829,10 +36947,10 @@ fi
 TAR=$ac_cv_path_TAR
 
 if test -n "$TAR"; then
-  echo "$as_me:36832: result: $TAR" >&5
+  echo "$as_me:36950: result: $TAR" >&5
 echo "${ECHO_T}$TAR" >&6
 else
-  echo "$as_me:36835: result: no" >&5
+  echo "$as_me:36953: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -36891,13 +37009,14 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:36894: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37012: testing defining path for ${cf_path_prog} ..." 1>&5
 
-	cat >>confdefs.h <<EOF
+cat >>confdefs.h <<EOF
 #define TAR_PATH "$cf_path_prog"
 EOF
 
-	test -n "$cf_path_args" && cat >>confdefs.h <<EOF
+	test -n "$cf_path_args" &&
+cat >>confdefs.h <<EOF
 #define TAR_ARGS "$cf_path_args"
 EOF
 
@@ -36948,7 +37067,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:36951: checking for $ac_word" >&5
+echo "$as_me:37070: 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
@@ -36965,7 +37084,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:36968: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37087: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -36976,10 +37095,10 @@ fi
 COMPRESS=$ac_cv_path_COMPRESS
 
 if test -n "$COMPRESS"; then
-  echo "$as_me:36979: result: $COMPRESS" >&5
+  echo "$as_me:37098: result: $COMPRESS" >&5
 echo "${ECHO_T}$COMPRESS" >&6
 else
-  echo "$as_me:36982: result: no" >&5
+  echo "$as_me:37101: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37038,13 +37157,14 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37041: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37160: testing defining path for ${cf_path_prog} ..." 1>&5
 
-	cat >>confdefs.h <<EOF
+cat >>confdefs.h <<EOF
 #define COMPRESS_PATH "$cf_path_prog"
 EOF
 
-	test -n "$cf_path_args" && cat >>confdefs.h <<EOF
+	test -n "$cf_path_args" &&
+cat >>confdefs.h <<EOF
 #define COMPRESS_ARGS "$cf_path_args"
 EOF
 
@@ -37055,7 +37175,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:37058: checking for $ac_word" >&5
+echo "$as_me:37178: 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
@@ -37072,7 +37192,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:37075: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37195: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37083,10 +37203,10 @@ fi
 RM=$ac_cv_path_RM
 
 if test -n "$RM"; then
-  echo "$as_me:37086: result: $RM" >&5
+  echo "$as_me:37206: result: $RM" >&5
 echo "${ECHO_T}$RM" >&6
 else
-  echo "$as_me:37089: result: no" >&5
+  echo "$as_me:37209: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37145,13 +37265,14 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37148: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37268: testing defining path for ${cf_path_prog} ..." 1>&5
 
-	cat >>confdefs.h <<EOF
+cat >>confdefs.h <<EOF
 #define RM_PATH "$cf_path_prog"
 EOF
 
-	test -n "$cf_path_args" && cat >>confdefs.h <<EOF
+	test -n "$cf_path_args" &&
+cat >>confdefs.h <<EOF
 #define RM_ARGS "$cf_path_args"
 EOF
 
@@ -37162,7 +37283,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:37165: checking for $ac_word" >&5
+echo "$as_me:37286: 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
@@ -37179,7 +37300,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:37182: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37303: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37190,10 +37311,10 @@ fi
 UUDECODE=$ac_cv_path_UUDECODE
 
 if test -n "$UUDECODE"; then
-  echo "$as_me:37193: result: $UUDECODE" >&5
+  echo "$as_me:37314: result: $UUDECODE" >&5
 echo "${ECHO_T}$UUDECODE" >&6
 else
-  echo "$as_me:37196: result: no" >&5
+  echo "$as_me:37317: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37252,13 +37373,14 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37255: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37376: testing defining path for ${cf_path_prog} ..." 1>&5
 
-	cat >>confdefs.h <<EOF
+cat >>confdefs.h <<EOF
 #define UUDECODE_PATH "$cf_path_prog"
 EOF
 
-	test -n "$cf_path_args" && cat >>confdefs.h <<EOF
+	test -n "$cf_path_args" &&
+cat >>confdefs.h <<EOF
 #define UUDECODE_ARGS "$cf_path_args"
 EOF
 
@@ -37269,7 +37391,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:37272: checking for $ac_word" >&5
+echo "$as_me:37394: 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
@@ -37286,7 +37408,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:37289: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37411: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37297,10 +37419,10 @@ fi
 ZCAT=$ac_cv_path_ZCAT
 
 if test -n "$ZCAT"; then
-  echo "$as_me:37300: result: $ZCAT" >&5
+  echo "$as_me:37422: result: $ZCAT" >&5
 echo "${ECHO_T}$ZCAT" >&6
 else
-  echo "$as_me:37303: result: no" >&5
+  echo "$as_me:37425: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37359,13 +37481,14 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37362: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37484: testing defining path for ${cf_path_prog} ..." 1>&5
 
-	cat >>confdefs.h <<EOF
+cat >>confdefs.h <<EOF
 #define ZCAT_PATH "$cf_path_prog"
 EOF
 
-	test -n "$cf_path_args" && cat >>confdefs.h <<EOF
+	test -n "$cf_path_args" &&
+cat >>confdefs.h <<EOF
 #define ZCAT_ARGS "$cf_path_args"
 EOF
 
@@ -37376,7 +37499,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:37379: checking for $ac_word" >&5
+echo "$as_me:37502: 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
@@ -37393,7 +37516,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:37396: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37519: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37404,10 +37527,10 @@ fi
 ZIP=$ac_cv_path_ZIP
 
 if test -n "$ZIP"; then
-  echo "$as_me:37407: result: $ZIP" >&5
+  echo "$as_me:37530: result: $ZIP" >&5
 echo "${ECHO_T}$ZIP" >&6
 else
-  echo "$as_me:37410: result: no" >&5
+  echo "$as_me:37533: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37466,13 +37589,14 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37469: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37592: testing defining path for ${cf_path_prog} ..." 1>&5
 
-	cat >>confdefs.h <<EOF
+cat >>confdefs.h <<EOF
 #define ZIP_PATH "$cf_path_prog"
 EOF
 
-	test -n "$cf_path_args" && cat >>confdefs.h <<EOF
+	test -n "$cf_path_args" &&
+cat >>confdefs.h <<EOF
 #define ZIP_ARGS "$cf_path_args"
 EOF
 
@@ -37493,7 +37617,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:37496: checking for $ac_word" >&5
+echo "$as_me:37620: 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
@@ -37510,7 +37634,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:37513: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37637: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37521,10 +37645,10 @@ fi
 INSTALL=$ac_cv_path_INSTALL
 
 if test -n "$INSTALL"; then
-  echo "$as_me:37524: result: $INSTALL" >&5
+  echo "$as_me:37648: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 else
-  echo "$as_me:37527: result: no" >&5
+  echo "$as_me:37651: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37583,13 +37707,14 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37586: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37710: testing defining path for ${cf_path_prog} ..." 1>&5
 
-	cat >>confdefs.h <<EOF
+cat >>confdefs.h <<EOF
 #define INSTALL_PATH "$cf_path_prog"
 EOF
 
-	test -n "$cf_path_args" && cat >>confdefs.h <<EOF
+	test -n "$cf_path_args" &&
+cat >>confdefs.h <<EOF
 #define INSTALL_ARGS "$cf_path_args"
 EOF
 
@@ -37609,7 +37734,7 @@ fi
 
 if test $cf_cv_screen = pdcurses ; then
 
-	echo "$as_me:37612: checking for X" >&5
+	echo "$as_me:37737: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -37706,17 +37831,17 @@ if test "$ac_x_includes" = no; then
   # Guess where to find include files, by looking for Intrinsic.h.
   # First, try using that file with no special directory specified.
   cat >conftest.$ac_ext <<_ACEOF
-#line 37709 "configure"
+#line 37834 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:37713: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:37838: \"$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:37719: \$? = $ac_status" >&5
+  echo "$as_me:37844: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -37749,7 +37874,7 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >conftest.$ac_ext <<_ACEOF
-#line 37752 "configure"
+#line 37877 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -37761,16 +37886,16 @@ XtMalloc (0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:37764: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37889: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37767: \$? = $ac_status" >&5
+  echo "$as_me:37892: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:37770: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37895: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37773: \$? = $ac_status" >&5
+  echo "$as_me:37898: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -37808,7 +37933,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:37811: result: $have_x" >&5
+  echo "$as_me:37936: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -37818,7 +37943,7 @@ else
   # Update the cache value to reflect the command line values.
   ac_cv_have_x="have_x=yes \
 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  echo "$as_me:37821: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:37946: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -37842,11 +37967,11 @@ else
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:37845: checking whether -R must be followed by a space" >&5
+      echo "$as_me:37970: checking whether -R must be followed by a space" >&5
 echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
       ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
       cat >conftest.$ac_ext <<_ACEOF
-#line 37849 "configure"
+#line 37974 "configure"
 #include "confdefs.h"
 
 int
@@ -37858,16 +37983,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:37861: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37986: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37864: \$? = $ac_status" >&5
+  echo "$as_me:37989: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:37867: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37992: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37870: \$? = $ac_status" >&5
+  echo "$as_me:37995: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_nospace=yes
 else
@@ -37877,13 +38002,13 @@ ac_R_nospace=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
       if test $ac_R_nospace = yes; then
-	echo "$as_me:37880: result: no" >&5
+	echo "$as_me:38005: result: no" >&5
 echo "${ECHO_T}no" >&6
 	X_LIBS="$X_LIBS -R$x_libraries"
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 37886 "configure"
+#line 38011 "configure"
 #include "confdefs.h"
 
 int
@@ -37895,16 +38020,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:37898: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38023: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37901: \$? = $ac_status" >&5
+  echo "$as_me:38026: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:37904: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38029: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37907: \$? = $ac_status" >&5
+  echo "$as_me:38032: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_space=yes
 else
@@ -37914,11 +38039,11 @@ ac_R_space=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	if test $ac_R_space = yes; then
-	  echo "$as_me:37917: result: yes" >&5
+	  echo "$as_me:38042: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:37921: result: neither works" >&5
+	  echo "$as_me:38046: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -37938,7 +38063,7 @@ echo "${ECHO_T}neither works" >&6
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
     cat >conftest.$ac_ext <<_ACEOF
-#line 37941 "configure"
+#line 38066 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -37957,22 +38082,22 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:37960: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38085: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37963: \$? = $ac_status" >&5
+  echo "$as_me:38088: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:37966: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38091: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37969: \$? = $ac_status" >&5
+  echo "$as_me:38094: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:37975: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:38100: checking for dnet_ntoa in -ldnet" >&5
 echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
 if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -37980,7 +38105,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 37983 "configure"
+#line 38108 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -37999,16 +38124,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38002: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38127: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38005: \$? = $ac_status" >&5
+  echo "$as_me:38130: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38008: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38133: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38011: \$? = $ac_status" >&5
+  echo "$as_me:38136: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -38019,14 +38144,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:38022: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:38147: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
 echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
 if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
 fi
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-      echo "$as_me:38029: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:38154: checking for dnet_ntoa in -ldnet_stub" >&5
 echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
 if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -38034,7 +38159,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 38037 "configure"
+#line 38162 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -38053,16 +38178,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38056: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38181: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38059: \$? = $ac_status" >&5
+  echo "$as_me:38184: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38062: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38187: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38065: \$? = $ac_status" >&5
+  echo "$as_me:38190: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -38073,7 +38198,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:38076: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:38201: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
 echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
 if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
@@ -38092,13 +38217,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     # on Irix 5.2, according to T.E. Dickey.
     # The functions gethostbyname, getservbyname, and inet_addr are
     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-    echo "$as_me:38095: checking for gethostbyname" >&5
+    echo "$as_me:38220: checking for gethostbyname" >&5
 echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
 if test "${ac_cv_func_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 38101 "configure"
+#line 38226 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname (); below.  */
@@ -38129,16 +38254,16 @@ f = gethostbyname; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38132: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38257: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38135: \$? = $ac_status" >&5
+  echo "$as_me:38260: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38138: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38263: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38141: \$? = $ac_status" >&5
+  echo "$as_me:38266: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -38148,11 +38273,11 @@ ac_cv_func_gethostbyname=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:38151: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:38276: result: $ac_cv_func_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
 
     if test $ac_cv_func_gethostbyname = no; then
-      echo "$as_me:38155: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:38280: checking for gethostbyname in -lnsl" >&5
 echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -38160,7 +38285,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 38163 "configure"
+#line 38288 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -38179,16 +38304,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38182: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38307: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38185: \$? = $ac_status" >&5
+  echo "$as_me:38310: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38188: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38313: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38191: \$? = $ac_status" >&5
+  echo "$as_me:38316: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -38199,14 +38324,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:38202: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:38327: result: $ac_cv_lib_nsl_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
 if test $ac_cv_lib_nsl_gethostbyname = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
 fi
 
       if test $ac_cv_lib_nsl_gethostbyname = no; then
-        echo "$as_me:38209: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:38334: checking for gethostbyname in -lbsd" >&5
 echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
 if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -38214,7 +38339,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 38217 "configure"
+#line 38342 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -38233,16 +38358,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38236: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38361: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38239: \$? = $ac_status" >&5
+  echo "$as_me:38364: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38242: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38367: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38245: \$? = $ac_status" >&5
+  echo "$as_me:38370: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -38253,7 +38378,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:38256: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:38381: result: $ac_cv_lib_bsd_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
 if test $ac_cv_lib_bsd_gethostbyname = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
@@ -38269,13 +38394,13 @@ fi
     # variants that don't use the nameserver (or something).  -lsocket
     # must be given before -lnsl if both are needed.  We assume that
     # if connect needs -lnsl, so does gethostbyname.
-    echo "$as_me:38272: checking for connect" >&5
+    echo "$as_me:38397: checking for connect" >&5
 echo $ECHO_N "checking for connect... $ECHO_C" >&6
 if test "${ac_cv_func_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 38278 "configure"
+#line 38403 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect (); below.  */
@@ -38306,16 +38431,16 @@ f = connect; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38309: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38434: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38312: \$? = $ac_status" >&5
+  echo "$as_me:38437: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38315: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38440: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38318: \$? = $ac_status" >&5
+  echo "$as_me:38443: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_connect=yes
 else
@@ -38325,11 +38450,11 @@ ac_cv_func_connect=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:38328: result: $ac_cv_func_connect" >&5
+echo "$as_me:38453: result: $ac_cv_func_connect" >&5
 echo "${ECHO_T}$ac_cv_func_connect" >&6
 
     if test $ac_cv_func_connect = no; then
-      echo "$as_me:38332: checking for connect in -lsocket" >&5
+      echo "$as_me:38457: checking for connect in -lsocket" >&5
 echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
 if test "${ac_cv_lib_socket_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -38337,7 +38462,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 38340 "configure"
+#line 38465 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -38356,16 +38481,16 @@ connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38359: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38484: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38362: \$? = $ac_status" >&5
+  echo "$as_me:38487: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38365: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38490: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38368: \$? = $ac_status" >&5
+  echo "$as_me:38493: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -38376,7 +38501,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:38379: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:38504: result: $ac_cv_lib_socket_connect" >&5
 echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
 if test $ac_cv_lib_socket_connect = yes; then
   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
@@ -38385,13 +38510,13 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:38388: checking for remove" >&5
+    echo "$as_me:38513: checking for remove" >&5
 echo $ECHO_N "checking for remove... $ECHO_C" >&6
 if test "${ac_cv_func_remove+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 38394 "configure"
+#line 38519 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove (); below.  */
@@ -38422,16 +38547,16 @@ f = remove; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38425: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38550: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38428: \$? = $ac_status" >&5
+  echo "$as_me:38553: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38431: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38556: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38434: \$? = $ac_status" >&5
+  echo "$as_me:38559: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_remove=yes
 else
@@ -38441,11 +38566,11 @@ ac_cv_func_remove=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:38444: result: $ac_cv_func_remove" >&5
+echo "$as_me:38569: result: $ac_cv_func_remove" >&5
 echo "${ECHO_T}$ac_cv_func_remove" >&6
 
     if test $ac_cv_func_remove = no; then
-      echo "$as_me:38448: checking for remove in -lposix" >&5
+      echo "$as_me:38573: checking for remove in -lposix" >&5
 echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
 if test "${ac_cv_lib_posix_remove+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -38453,7 +38578,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 38456 "configure"
+#line 38581 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -38472,16 +38597,16 @@ remove ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38475: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38600: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38478: \$? = $ac_status" >&5
+  echo "$as_me:38603: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38481: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38606: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38484: \$? = $ac_status" >&5
+  echo "$as_me:38609: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -38492,7 +38617,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:38495: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:38620: result: $ac_cv_lib_posix_remove" >&5
 echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
 if test $ac_cv_lib_posix_remove = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
@@ -38501,13 +38626,13 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:38504: checking for shmat" >&5
+    echo "$as_me:38629: checking for shmat" >&5
 echo $ECHO_N "checking for shmat... $ECHO_C" >&6
 if test "${ac_cv_func_shmat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 38510 "configure"
+#line 38635 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat (); below.  */
@@ -38538,16 +38663,16 @@ f = shmat; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38541: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38666: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38544: \$? = $ac_status" >&5
+  echo "$as_me:38669: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38547: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38672: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38550: \$? = $ac_status" >&5
+  echo "$as_me:38675: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -38557,11 +38682,11 @@ ac_cv_func_shmat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:38560: result: $ac_cv_func_shmat" >&5
+echo "$as_me:38685: result: $ac_cv_func_shmat" >&5
 echo "${ECHO_T}$ac_cv_func_shmat" >&6
 
     if test $ac_cv_func_shmat = no; then
-      echo "$as_me:38564: checking for shmat in -lipc" >&5
+      echo "$as_me:38689: checking for shmat in -lipc" >&5
 echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
 if test "${ac_cv_lib_ipc_shmat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -38569,7 +38694,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 38572 "configure"
+#line 38697 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -38588,16 +38713,16 @@ shmat ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38591: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38716: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38594: \$? = $ac_status" >&5
+  echo "$as_me:38719: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38597: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38722: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38600: \$? = $ac_status" >&5
+  echo "$as_me:38725: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -38608,7 +38733,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:38611: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:38736: result: $ac_cv_lib_ipc_shmat" >&5
 echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
 if test $ac_cv_lib_ipc_shmat = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
@@ -38626,7 +38751,7 @@ fi
   # These have to be linked with before -lX11, unlike the other
   # libraries we check for below, so use a different variable.
   # John Interrante, Karl Berry
-  echo "$as_me:38629: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:38754: checking for IceConnectionNumber in -lICE" >&5
 echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
 if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -38634,7 +38759,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 38637 "configure"
+#line 38762 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -38653,16 +38778,16 @@ IceConnectionNumber ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38656: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38781: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38659: \$? = $ac_status" >&5
+  echo "$as_me:38784: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38662: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38787: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38665: \$? = $ac_status" >&5
+  echo "$as_me:38790: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -38673,7 +38798,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:38676: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:38801: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
 echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
 if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
@@ -38685,7 +38810,7 @@ fi
 
 cf_x_athena=${cf_x_athena:-Xaw}
 
-echo "$as_me:38688: checking if you want to link with Xaw 3d library" >&5
+echo "$as_me:38813: 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=
 
@@ -38696,14 +38821,14 @@ if test "${with_Xaw3d+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3d
-	echo "$as_me:38699: result: yes" >&5
+	echo "$as_me:38824: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:38702: result: no" >&5
+	echo "$as_me:38827: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:38706: checking if you want to link with neXT Athena library" >&5
+echo "$as_me:38831: 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=
 
@@ -38714,14 +38839,14 @@ if test "${with_neXtaw+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=neXtaw
-	echo "$as_me:38717: result: yes" >&5
+	echo "$as_me:38842: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:38720: result: no" >&5
+	echo "$as_me:38845: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:38724: checking if you want to link with Athena-Plus library" >&5
+echo "$as_me:38849: 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=
 
@@ -38732,10 +38857,10 @@ if test "${with_XawPlus+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=XawPlus
-	echo "$as_me:38735: result: yes" >&5
+	echo "$as_me:38860: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:38738: result: no" >&5
+	echo "$as_me:38863: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -38755,17 +38880,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}:38758: testing found package $cf_athena_pkg ..." 1>&5
+echo "${as_me:-configure}:38883: 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}:38764: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:38889: 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}:38768: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:38893: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -38855,14 +38980,14 @@ cf_x_athena_LIBS=`echo "HAVE_LIB_$cf_x_athena" | sed y%abcdefghijklmnopqrstuvwxy
 #define $cf_x_athena_LIBS 1
 EOF
 
-echo "$as_me:38858: checking for usable $cf_x_athena/Xmu package" >&5
+echo "$as_me:38983: 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 38865 "configure"
+#line 38990 "configure"
 #include "confdefs.h"
 
 #include <X11/Xmu/CharSet.h>
@@ -38878,16 +39003,16 @@ int check = XmuCompareISOLatin1("big", "small")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38881: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39006: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38884: \$? = $ac_status" >&5
+  echo "$as_me:39009: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38887: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39012: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38890: \$? = $ac_status" >&5
+  echo "$as_me:39015: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xaw_compat=yes
 else
@@ -38897,7 +39022,7 @@ cf_cv_xaw_compat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:38900: result: $cf_cv_xaw_compat" >&5
+echo "$as_me:39025: result: $cf_cv_xaw_compat" >&5
 echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 
 			if test "$cf_cv_xaw_compat" = no
@@ -38909,22 +39034,22 @@ echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 				*)
 					test -n "$verbose" && echo "	work around broken package" 1>&6
 
-echo "${as_me:-configure}:38912: testing work around broken package ..." 1>&5
+echo "${as_me:-configure}:39037: 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}:38917: testing found package xmu ..." 1>&5
+echo "${as_me:-configure}:39042: 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}:38923: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:39048: 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}:38927: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:39052: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -39010,12 +39135,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:39013: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:39138: testing ...before $LIBS ..." 1>&5
 
 LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s,-lXt ,-lXt -lXmu ," -e 's/  / /g'`
 test -n "$verbose" && echo "	...after  $LIBS" 1>&6
 
-echo "${as_me:-configure}:39018: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:39143: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -39036,17 +39161,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}:39039: testing found package Xext ..." 1>&5
+echo "${as_me:-configure}:39164: 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}:39045: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:39170: 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}:39049: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:39174: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -39130,7 +39255,7 @@ fi
 	:
 else
 
-	echo "$as_me:39133: checking for XextCreateExtension in -lXext" >&5
+	echo "$as_me:39258: 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
@@ -39138,7 +39263,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 39141 "configure"
+#line 39266 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39157,16 +39282,16 @@ XextCreateExtension ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39160: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39285: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39163: \$? = $ac_status" >&5
+  echo "$as_me:39288: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39166: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39291: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39169: \$? = $ac_status" >&5
+  echo "$as_me:39294: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
@@ -39177,7 +39302,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:39180: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:39305: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
 echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6
 if test $ac_cv_lib_Xext_XextCreateExtension = yes; then
   LIBS="-lXext $LIBS"
@@ -39190,17 +39315,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}:39193: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:39318: 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}:39199: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:39324: 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}:39203: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:39328: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -39287,14 +39412,14 @@ fi
 		;;
 	*)
 # we have an "xt" package, but it may omit Xt's dependency on X11
-echo "$as_me:39290: checking for usable X dependency" >&5
+echo "$as_me:39415: 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 39297 "configure"
+#line 39422 "configure"
 #include "confdefs.h"
 
 #include <X11/Xlib.h>
@@ -39313,16 +39438,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39316: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39441: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39319: \$? = $ac_status" >&5
+  echo "$as_me:39444: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39322: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39447: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39325: \$? = $ac_status" >&5
+  echo "$as_me:39450: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xt_x11_compat=yes
 else
@@ -39332,30 +39457,30 @@ cf_cv_xt_x11_compat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:39335: result: $cf_cv_xt_x11_compat" >&5
+echo "$as_me:39460: 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}:39341: testing work around broken X11 dependency ..." 1>&5
+echo "${as_me:-configure}:39466: 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}:39348: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:39473: 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}:39354: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:39479: 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}:39358: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:39483: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -39441,12 +39566,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:39444: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:39569: 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}:39449: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:39574: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -39454,14 +39579,14 @@ fi
 		;;
 	esac
 
-echo "$as_me:39457: checking for usable X Toolkit package" >&5
+echo "$as_me:39582: 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 39464 "configure"
+#line 39589 "configure"
 #include "confdefs.h"
 
 #include <X11/Shell.h>
@@ -39476,16 +39601,16 @@ int num = IceConnectionNumber(0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39479: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39604: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39482: \$? = $ac_status" >&5
+  echo "$as_me:39607: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39485: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39610: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39488: \$? = $ac_status" >&5
+  echo "$as_me:39613: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xt_ice_compat=yes
 else
@@ -39495,7 +39620,7 @@ cf_cv_xt_ice_compat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:39498: result: $cf_cv_xt_ice_compat" >&5
+echo "$as_me:39623: result: $cf_cv_xt_ice_compat" >&5
 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
 
 	if test "$cf_cv_xt_ice_compat" = no
@@ -39509,22 +39634,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}:39512: testing work around broken ICE dependency ..." 1>&5
+echo "${as_me:-configure}:39637: 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}:39517: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:39642: 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}:39523: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:39648: 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}:39527: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:39652: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -39609,17 +39734,17 @@ fi
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then
 	test -n "$verbose" && echo "	found package sm" 1>&6
 
-echo "${as_me:-configure}:39612: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:39737: 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}:39618: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:39743: 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}:39622: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:39747: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -39709,12 +39834,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:39712: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:39837: 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}:39717: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:39842: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -39732,7 +39857,7 @@ else
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:39735: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:39860: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -39803,7 +39928,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}:39806: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:39931: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	CFLAGS="$CFLAGS $cf_new_cflags"
 fi
@@ -39811,7 +39936,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}:39814: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:39939: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
 fi
@@ -39819,14 +39944,14 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:39822: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:39947: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
 
 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
 fi
 
 if test "$cf_check_cflags" != "$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 39829 "configure"
+#line 39954 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -39838,16 +39963,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39841: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39966: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39844: \$? = $ac_status" >&5
+  echo "$as_me:39969: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39847: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39972: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39850: \$? = $ac_status" >&5
+  echo "$as_me:39975: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -39855,12 +39980,12 @@ else
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:39858: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:39983: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
 
 	 if test "$cf_check_cppflags" != "$CPPFLAGS" ; then
 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:39863: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:39988: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_flags"
@@ -39868,13 +39993,13 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-	echo "$as_me:39871: checking for XOpenDisplay" >&5
+	echo "$as_me:39996: 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 39877 "configure"
+#line 40002 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char XOpenDisplay (); below.  */
@@ -39905,16 +40030,16 @@ f = XOpenDisplay; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39908: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40033: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39911: \$? = $ac_status" >&5
+  echo "$as_me:40036: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39914: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40039: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39917: \$? = $ac_status" >&5
+  echo "$as_me:40042: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_XOpenDisplay=yes
 else
@@ -39924,13 +40049,13 @@ ac_cv_func_XOpenDisplay=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:39927: result: $ac_cv_func_XOpenDisplay" >&5
+echo "$as_me:40052: 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:39933: checking for XOpenDisplay in -lX11" >&5
+	echo "$as_me:40058: 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
@@ -39938,7 +40063,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 39941 "configure"
+#line 40066 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39957,16 +40082,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39960: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40085: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39963: \$? = $ac_status" >&5
+  echo "$as_me:40088: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39966: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40091: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39969: \$? = $ac_status" >&5
+  echo "$as_me:40094: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -39977,7 +40102,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:39980: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:40105: result: $ac_cv_lib_X11_XOpenDisplay" >&5
 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
 if test $ac_cv_lib_X11_XOpenDisplay = yes; then
   LIBS="-lX11 $LIBS"
@@ -39985,13 +40110,13 @@ fi
 
 fi
 
-	echo "$as_me:39988: checking for XtAppInitialize" >&5
+	echo "$as_me:40113: 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 39994 "configure"
+#line 40119 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char XtAppInitialize (); below.  */
@@ -40022,16 +40147,16 @@ f = XtAppInitialize; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40025: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40150: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40028: \$? = $ac_status" >&5
+  echo "$as_me:40153: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40031: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40156: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40034: \$? = $ac_status" >&5
+  echo "$as_me:40159: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_XtAppInitialize=yes
 else
@@ -40041,13 +40166,13 @@ ac_cv_func_XtAppInitialize=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:40044: result: $ac_cv_func_XtAppInitialize" >&5
+echo "$as_me:40169: 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:40050: checking for XtAppInitialize in -lXt" >&5
+	echo "$as_me:40175: 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
@@ -40055,7 +40180,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 40058 "configure"
+#line 40183 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -40074,16 +40199,16 @@ XtAppInitialize ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40077: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40202: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40080: \$? = $ac_status" >&5
+  echo "$as_me:40205: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40083: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40208: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40086: \$? = $ac_status" >&5
+  echo "$as_me:40211: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xt_XtAppInitialize=yes
 else
@@ -40094,10 +40219,11 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:40097: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:40222: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
 echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6
 if test $ac_cv_lib_Xt_XtAppInitialize = yes; then
-  cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define HAVE_LIBXT 1
 EOF
 
@@ -40110,7 +40236,7 @@ fi
 fi
 
 if test $cf_have_X_LIBS = no ; then
-	{ echo "$as_me:40113: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+	{ echo "$as_me:40239: 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
@@ -40132,14 +40258,14 @@ do
 		cf_test=X11/$cf_x_athena_root/SimpleMenu.h
 		if test $cf_path != default ; then
 			CPPFLAGS="$cf_save -I$cf_path/include"
-			echo "$as_me:40135: checking for $cf_test in $cf_path" >&5
+			echo "$as_me:40261: 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:40138: checking for $cf_test" >&5
+			echo "$as_me:40264: checking for $cf_test" >&5
 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
 		fi
 		cat >conftest.$ac_ext <<_ACEOF
-#line 40142 "configure"
+#line 40268 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -40153,16 +40279,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:40156: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:40282: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:40159: \$? = $ac_status" >&5
+  echo "$as_me:40285: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:40162: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40288: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40165: \$? = $ac_status" >&5
+  echo "$as_me:40291: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -40171,7 +40297,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-		echo "$as_me:40174: result: $cf_result" >&5
+		echo "$as_me:40300: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 		if test "$cf_result" = yes ; then
 			cf_x_athena_inc=$cf_path
@@ -40183,7 +40309,7 @@ echo "${ECHO_T}$cf_result" >&6
 done
 
 if test -z "$cf_x_athena_inc" ; then
-	{ echo "$as_me:40186: WARNING: Unable to successfully find Athena header files with test program" >&5
+	{ echo "$as_me:40312: WARNING: Unable to successfully find Athena header files with test program" >&5
 echo "$as_me: WARNING: Unable to successfully find Athena header files with test program" >&2;}
 elif test "$cf_x_athena_inc" != default ; then
 	CPPFLAGS="$CPPFLAGS -I$cf_x_athena_inc"
@@ -40213,15 +40339,15 @@ do
 			cf_test=XawSimpleMenuAddGlobalActions
 			if test $cf_path != default ; then
 				LIBS="-L$cf_path/lib $cf_libs $LIBS"
-				echo "$as_me:40216: checking for $cf_libs in $cf_path" >&5
+				echo "$as_me:40342: checking for $cf_libs in $cf_path" >&5
 echo $ECHO_N "checking for $cf_libs in $cf_path... $ECHO_C" >&6
 			else
 				LIBS="$cf_libs $LIBS"
-				echo "$as_me:40220: checking for $cf_test in $cf_libs" >&5
+				echo "$as_me:40346: checking for $cf_test in $cf_libs" >&5
 echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6
 			fi
 			cat >conftest.$ac_ext <<_ACEOF
-#line 40224 "configure"
+#line 40350 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -40237,16 +40363,16 @@ $cf_test((XtAppContext) 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40240: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40366: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40243: \$? = $ac_status" >&5
+  echo "$as_me:40369: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40246: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40372: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40249: \$? = $ac_status" >&5
+  echo "$as_me:40375: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -40255,7 +40381,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-			echo "$as_me:40258: result: $cf_result" >&5
+			echo "$as_me:40384: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				cf_x_athena_lib="$cf_libs"
@@ -40269,7 +40395,7 @@ echo "${ECHO_T}$cf_result" >&6
 done
 
 if test -z "$cf_x_athena_lib" ; then
-	{ { echo "$as_me:40272: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+	{ { echo "$as_me:40398: 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
@@ -40287,7 +40413,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:40290: checking for $ac_word" >&5
+echo "$as_me:40416: 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
@@ -40302,7 +40428,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:40305: found $ac_dir/$ac_word" >&5
+echo "$as_me:40431: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -40310,10 +40436,10 @@ fi
 fi
 XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
 if test -n "$XCURSES_CONFIG"; then
-  echo "$as_me:40313: result: $XCURSES_CONFIG" >&5
+  echo "$as_me:40439: result: $XCURSES_CONFIG" >&5
 echo "${ECHO_T}$XCURSES_CONFIG" >&6
 else
-  echo "$as_me:40316: result: no" >&5
+  echo "$as_me:40442: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -40326,7 +40452,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:40329: checking for $ac_word" >&5
+echo "$as_me:40455: 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
@@ -40341,7 +40467,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:40344: found $ac_dir/$ac_word" >&5
+echo "$as_me:40470: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -40349,10 +40475,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:40352: result: $ac_ct_XCURSES_CONFIG" >&5
+  echo "$as_me:40478: result: $ac_ct_XCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6
 else
-  echo "$as_me:40355: result: no" >&5
+  echo "$as_me:40481: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -40376,7 +40502,7 @@ LDFLAGS="$LDFLAGS $X_LIBS"
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:40379: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:40505: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -40447,7 +40573,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}:40450: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:40576: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	CFLAGS="$CFLAGS $cf_new_cflags"
 fi
@@ -40455,7 +40581,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}:40458: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:40584: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
 fi
@@ -40463,14 +40589,14 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:40466: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:40592: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
 
 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
 fi
 
 if test "$cf_check_cflags" != "$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 40473 "configure"
+#line 40599 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -40482,16 +40608,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40485: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40611: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40488: \$? = $ac_status" >&5
+  echo "$as_me:40614: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40491: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40617: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40494: \$? = $ac_status" >&5
+  echo "$as_me:40620: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -40499,12 +40625,12 @@ else
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:40502: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:40628: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
 
 	 if test "$cf_check_cppflags" != "$CPPFLAGS" ; then
 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:40507: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:40633: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_flags"
@@ -40512,7 +40638,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:40515: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:40641: 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
@@ -40520,7 +40646,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 40523 "configure"
+#line 40649 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -40539,16 +40665,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40542: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40668: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40545: \$? = $ac_status" >&5
+  echo "$as_me:40671: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40548: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40674: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40551: \$? = $ac_status" >&5
+  echo "$as_me:40677: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -40559,13 +40685,13 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:40562: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:40688: result: $ac_cv_lib_X11_XOpenDisplay" >&5
 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
 if test $ac_cv_lib_X11_XOpenDisplay = yes; then
   LIBS="-lX11 $LIBS"
 fi
 
-echo "$as_me:40568: checking for XCurses library" >&5
+echo "$as_me:40694: 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
@@ -40573,7 +40699,7 @@ else
 
 LIBS="-lXCurses $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 40576 "configure"
+#line 40702 "configure"
 #include "confdefs.h"
 
 #include <xcurses.h>
@@ -40588,16 +40714,16 @@ XCursesExit();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40591: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40717: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40594: \$? = $ac_status" >&5
+  echo "$as_me:40720: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40597: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40723: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40600: \$? = $ac_status" >&5
+  echo "$as_me:40726: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_lib_XCurses=yes
 else
@@ -40608,37 +40734,38 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:40611: result: $cf_cv_lib_XCurses" >&5
+echo "$as_me:40737: result: $cf_cv_lib_XCurses" >&5
 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
 
 fi
 
 if test $cf_cv_lib_XCurses = yes ; then
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define UNIX 1
 EOF
 
-	cat >>confdefs.h <<\EOF
+cat >>confdefs.h <<\EOF
 #define XCURSES 1
 EOF
 
-	echo "$as_me:40625: checking for xcurses.h" >&5
+	echo "$as_me:40752: 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 40631 "configure"
+#line 40758 "configure"
 #include "confdefs.h"
 #include <xcurses.h>
 _ACEOF
-if { (eval echo "$as_me:40635: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:40762: \"$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:40641: \$? = $ac_status" >&5
+  echo "$as_me:40768: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -40657,24 +40784,25 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:40660: result: $ac_cv_header_xcurses_h" >&5
+echo "$as_me:40787: result: $ac_cv_header_xcurses_h" >&5
 echo "${ECHO_T}$ac_cv_header_xcurses_h" >&6
 if test $ac_cv_header_xcurses_h = yes; then
-  cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define HAVE_XCURSES 1
 EOF
 
 fi
 
 else
-	{ { echo "$as_me:40670: error: Cannot link with XCurses" >&5
+	{ { echo "$as_me:40798: error: Cannot link with XCurses" >&5
 echo "$as_me: error: Cannot link with XCurses" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 else
 
-echo "$as_me:40677: checking if we can include termio.h with curses" >&5
+echo "$as_me:40805: 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
@@ -40684,7 +40812,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 40687 "configure"
+#line 40815 "configure"
 #include "confdefs.h"
 
 #include <LYCurses.h>
@@ -40698,16 +40826,16 @@ putchar(0x0a)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:40701: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:40829: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:40704: \$? = $ac_status" >&5
+  echo "$as_me:40832: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:40707: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40835: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40710: \$? = $ac_status" >&5
+  echo "$as_me:40838: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termio_and_curses=yes
 else
@@ -40720,10 +40848,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
     rm -f lynx_cfg.h
 
 fi
-echo "$as_me:40723: result: $cf_cv_termio_and_curses" >&5
+echo "$as_me:40851: result: $cf_cv_termio_and_curses" >&5
 echo "${ECHO_T}$cf_cv_termio_and_curses" >&6
 
-test $cf_cv_termio_and_curses = yes && cat >>confdefs.h <<\EOF
+test $cf_cv_termio_and_curses = yes &&
+cat >>confdefs.h <<\EOF
 #define TERMIO_AND_CURSES 1
 EOF
 
@@ -40735,23 +40864,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:40738: checking for $ac_header" >&5
+echo "$as_me:40867: 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 40744 "configure"
+#line 40873 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:40748: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:40877: \"$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:40754: \$? = $ac_status" >&5
+  echo "$as_me:40883: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -40770,7 +40899,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:40773: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:40902: 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
@@ -40780,7 +40909,7 @@ EOF
 fi
 done
 
-echo "$as_me:40783: checking if curses supports alternate-character set" >&5
+echo "$as_me:40912: 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
@@ -40789,7 +40918,7 @@ else
 for mapname in acs_map _acs_map
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 40792 "configure"
+#line 40921 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -40803,16 +40932,16 @@ chtype x = $mapname['l']; $mapname['m'] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40806: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40935: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40809: \$? = $ac_status" >&5
+  echo "$as_me:40938: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40812: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40941: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40815: \$? = $ac_status" >&5
+  echo "$as_me:40944: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_alt_char_set=$mapname
 	 break
@@ -40826,20 +40955,21 @@ done
 
 fi
 
-echo "$as_me:40829: result: $cf_cv_alt_char_set" >&5
+echo "$as_me:40958: 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
+test $cf_cv_alt_char_set != no &&
+cat >>confdefs.h <<EOF
 #define ALT_CHAR_SET $cf_cv_alt_char_set
 EOF
 
-echo "$as_me:40835: checking if curses supports fancy attributes" >&5
+echo "$as_me:40965: 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 40842 "configure"
+#line 40972 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -40857,16 +40987,16 @@ attrset(A_UNDERLINE|A_BOLD|A_REVERSE);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40860: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40990: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40863: \$? = $ac_status" >&5
+  echo "$as_me:40993: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40866: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40996: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40869: \$? = $ac_status" >&5
+  echo "$as_me:40999: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fancy_curses=yes
 else
@@ -40878,13 +41008,14 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:40881: result: $cf_cv_fancy_curses" >&5
+echo "$as_me:41011: result: $cf_cv_fancy_curses" >&5
 echo "${ECHO_T}$cf_cv_fancy_curses" >&6
-test $cf_cv_fancy_curses = yes && cat >>confdefs.h <<\EOF
+test $cf_cv_fancy_curses = yes &&
+cat >>confdefs.h <<\EOF
 #define FANCY_CURSES 1
 EOF
 
-echo "$as_me:40887: checking for function curses_version" >&5
+echo "$as_me:41018: 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
@@ -40894,7 +41025,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_curses_version=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 40897 "configure"
+#line 41028 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -40907,15 +41038,15 @@ int main()
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:40910: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41041: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40913: \$? = $ac_status" >&5
+  echo "$as_me:41044: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:40915: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41046: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40918: \$? = $ac_status" >&5
+  echo "$as_me:41049: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_func_curses_version=yes
 
@@ -40930,21 +41061,22 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core
 fi
-echo "$as_me:40933: result: $cf_cv_func_curses_version" >&5
+echo "$as_me:41064: 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
+test "$cf_cv_func_curses_version" = yes &&
+cat >>confdefs.h <<\EOF
 #define HAVE_CURSES_VERSION 1
 EOF
 
 if test "$cf_cv_ncurses_version" != no ; then
-echo "$as_me:40940: checking for obsolete/broken version of ncurses" >&5
+echo "$as_me:41072: 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 40947 "configure"
+#line 41079 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -40963,16 +41095,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:40966: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:41098: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:40969: \$? = $ac_status" >&5
+  echo "$as_me:41101: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:40972: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41104: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40975: \$? = $ac_status" >&5
+  echo "$as_me:41107: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_broken=no
 else
@@ -40984,26 +41116,27 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:40987: result: $cf_cv_ncurses_broken" >&5
+echo "$as_me:41119: 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:40990: WARNING: hmm... you should get an up-to-date version of ncurses" >&5
+	{ echo "$as_me:41122: 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
+
+cat >>confdefs.h <<\EOF
 #define NCURSES_BROKEN 1
 EOF
 
 fi
 fi
 
-echo "$as_me:40999: checking if curses supports color attributes" >&5
+echo "$as_me:41132: 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 41006 "configure"
+#line 41139 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -41023,16 +41156,16 @@ chtype x = COLOR_BLUE;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:41026: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41159: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41029: \$? = $ac_status" >&5
+  echo "$as_me:41162: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:41032: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41165: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41035: \$? = $ac_status" >&5
+  echo "$as_me:41168: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_color_curses=yes
 else
@@ -41044,14 +41177,16 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:41047: result: $cf_cv_color_curses" >&5
+echo "$as_me:41180: result: $cf_cv_color_curses" >&5
 echo "${ECHO_T}$cf_cv_color_curses" >&6
 if test $cf_cv_color_curses = yes ; then
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define COLOR_CURSES 1
 EOF
 
-	test ".$cf_cv_ncurses_broken" != .yes && cat >>confdefs.h <<\EOF
+	test ".$cf_cv_ncurses_broken" != .yes &&
+cat >>confdefs.h <<\EOF
 #define HAVE_GETBKGD 1
 EOF
 
@@ -41064,23 +41199,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:41067: checking for $ac_header" >&5
+echo "$as_me:41202: 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 41073 "configure"
+#line 41208 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:41077: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:41212: \"$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:41083: \$? = $ac_status" >&5
+  echo "$as_me:41218: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -41099,7 +41234,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:41102: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:41237: 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
@@ -41114,23 +41249,23 @@ if test "$ISC" = yes ; then
 for ac_header in sys/termio.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:41117: checking for $ac_header" >&5
+echo "$as_me:41252: 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 41123 "configure"
+#line 41258 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:41127: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:41262: \"$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:41133: \$? = $ac_status" >&5
+  echo "$as_me:41268: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -41149,7 +41284,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:41152: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:41287: 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
@@ -41167,10 +41302,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:41170: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:41305: 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 41173 "configure"
+#line 41308 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -41182,16 +41317,16 @@ struct termios foo; int x = foo.c_iflag
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:41185: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:41320: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:41188: \$? = $ac_status" >&5
+  echo "$as_me:41323: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:41191: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41326: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41194: \$? = $ac_status" >&5
+  echo "$as_me:41329: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   termios_bad=no
 else
@@ -41199,7 +41334,7 @@ else
 cat conftest.$ac_ext >&5
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 41202 "configure"
+#line 41337 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -41213,22 +41348,23 @@ struct termios foo; int x = foo.c_iflag
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:41216: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:41351: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:41219: \$? = $ac_status" >&5
+  echo "$as_me:41354: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:41222: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41357: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41225: \$? = $ac_status" >&5
+  echo "$as_me:41360: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   termios_bad=unknown
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-termios_bad=yes cat >>confdefs.h <<\EOF
+termios_bad=yes
+cat >>confdefs.h <<\EOF
 #define _POSIX_SOURCE 1
 EOF
 
@@ -41237,12 +41373,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-	echo "$as_me:41240: result: $termios_bad" >&5
+	echo "$as_me:41376: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:41245: checking declaration of size-change" >&5
+echo "$as_me:41381: 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
@@ -41257,7 +41393,7 @@ do
     CPPFLAGS="$cf_save_CPPFLAGS"
     test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
     cat >conftest.$ac_ext <<_ACEOF
-#line 41260 "configure"
+#line 41396 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -41301,16 +41437,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:41304: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:41440: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:41307: \$? = $ac_status" >&5
+  echo "$as_me:41443: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:41310: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41446: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41313: \$? = $ac_status" >&5
+  echo "$as_me:41449: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_sizechange=yes
 else
@@ -41329,10 +41465,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:41332: result: $cf_cv_sizechange" >&5
+echo "$as_me:41468: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define HAVE_SIZECHANGE 1
 EOF
 
@@ -41346,14 +41483,14 @@ EOF
 	esac
 fi
 
-echo "$as_me:41349: checking if ttytype is declared in curses library" >&5
+echo "$as_me:41486: 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 41356 "configure"
+#line 41493 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -41365,16 +41502,16 @@ char *x = &ttytype[1]; *x = 1
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:41368: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41505: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41371: \$? = $ac_status" >&5
+  echo "$as_me:41508: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:41374: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41511: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41377: \$? = $ac_status" >&5
+  echo "$as_me:41514: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_ttytype=yes
 else
@@ -41386,22 +41523,23 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:41389: result: $cf_cv_have_ttytype" >&5
+echo "$as_me:41526: result: $cf_cv_have_ttytype" >&5
 echo "${ECHO_T}$cf_cv_have_ttytype" >&6
-test $cf_cv_have_ttytype = yes && cat >>confdefs.h <<\EOF
+test $cf_cv_have_ttytype = yes &&
+cat >>confdefs.h <<\EOF
 #define HAVE_TTYTYPE 1
 EOF
 
 	if test "$use_wide_curses" = yes ; then
 
-echo "$as_me:41397: checking if curses supports wide characters" >&5
+echo "$as_me:41535: 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 41404 "configure"
+#line 41542 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -41420,16 +41558,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:41423: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41561: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41426: \$? = $ac_status" >&5
+  echo "$as_me:41564: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:41429: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41567: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41432: \$? = $ac_status" >&5
+  echo "$as_me:41570: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_widec_curses=yes
 else
@@ -41440,23 +41578,24 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:41443: result: $cf_cv_widec_curses" >&5
+echo "$as_me:41581: result: $cf_cv_widec_curses" >&5
 echo "${ECHO_T}$cf_cv_widec_curses" >&6
 
 if test "$cf_cv_widec_curses" = yes ; then
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define WIDEC_CURSES 1
 EOF
 
 	# This is needed on Tru64 5.0 to declare mbstate_t
-	echo "$as_me:41452: checking if we must include wchar.h to declare mbstate_t" >&5
+	echo "$as_me:41591: 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 41459 "configure"
+#line 41598 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -41470,23 +41609,23 @@ mbstate_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:41473: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:41612: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:41476: \$? = $ac_status" >&5
+  echo "$as_me:41615: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:41479: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41618: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41482: \$? = $ac_status" >&5
+  echo "$as_me:41621: \$? = $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 41489 "configure"
+#line 41628 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -41501,16 +41640,16 @@ mbstate_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:41504: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:41643: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:41507: \$? = $ac_status" >&5
+  echo "$as_me:41646: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:41510: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41649: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41513: \$? = $ac_status" >&5
+  echo "$as_me:41652: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_widec_mbstate=yes
 else
@@ -41522,18 +41661,20 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:41525: result: $cf_cv_widec_mbstate" >&5
+echo "$as_me:41664: result: $cf_cv_widec_mbstate" >&5
 echo "${ECHO_T}$cf_cv_widec_mbstate" >&6
 
 if test "$cf_cv_widec_mbstate" = yes ; then
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define NEED_WCHAR_H 1
 EOF
 
 fi
 
 if test "$cf_cv_widec_mbstate" != unknown ; then
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define HAVE_MBSTATE_T 1
 EOF
 
@@ -41543,14 +41684,14 @@ fi
 
 	fi
 
-echo "$as_me:41546: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+echo "$as_me:41687: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
 echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6
 if test "${cf_cv_need_xopen_extension+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 41553 "configure"
+#line 41694 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -41572,23 +41713,23 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:41575: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41716: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41578: \$? = $ac_status" >&5
+  echo "$as_me:41719: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:41581: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41722: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41584: \$? = $ac_status" >&5
+  echo "$as_me:41725: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_xopen_extension=no
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 41591 "configure"
+#line 41732 "configure"
 #include "confdefs.h"
 
 #define _XOPEN_SOURCE_EXTENDED
@@ -41610,16 +41751,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:41613: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41754: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41616: \$? = $ac_status" >&5
+  echo "$as_me:41757: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:41619: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41760: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41622: \$? = $ac_status" >&5
+  echo "$as_me:41763: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_xopen_extension=yes
 else
@@ -41631,11 +41772,11 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:41634: result: $cf_cv_need_xopen_extension" >&5
+echo "$as_me:41775: result: $cf_cv_need_xopen_extension" >&5
 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
 test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
 
-echo "$as_me:41638: checking for term.h" >&5
+echo "$as_me:41779: 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
@@ -41656,7 +41797,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 41659 "configure"
+#line 41800 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -41670,16 +41811,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:41673: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:41814: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:41676: \$? = $ac_status" >&5
+  echo "$as_me:41817: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:41679: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41820: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41682: \$? = $ac_status" >&5
+  echo "$as_me:41823: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_term_header=$cf_header
 	 break
@@ -41698,7 +41839,7 @@ no)
 	for cf_header in ncurses/term.h ncursesw/term.h
 	do
 		cat >conftest.$ac_ext <<_ACEOF
-#line 41701 "configure"
+#line 41842 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -41716,16 +41857,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:41719: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:41860: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:41722: \$? = $ac_status" >&5
+  echo "$as_me:41863: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:41725: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41866: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41728: \$? = $ac_status" >&5
+  echo "$as_me:41869: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_term_header=$cf_header
 			 break
@@ -41740,31 +41881,34 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 esac
 
 fi
-echo "$as_me:41743: result: $cf_cv_term_header" >&5
+echo "$as_me:41884: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 case $cf_cv_term_header in #(vi
 term.h) #(vi
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define HAVE_TERM_H 1
 EOF
 
 	;;
 ncurses/term.h) #(vi
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define HAVE_NCURSES_TERM_H 1
 EOF
 
 	;;
 ncursesw/term.h)
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define HAVE_NCURSESW_TERM_H 1
 EOF
 
 	;;
 esac
 
-echo "$as_me:41767: checking for unctrl.h" >&5
+echo "$as_me:41911: 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
@@ -41785,7 +41929,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 41788 "configure"
+#line 41932 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -41799,16 +41943,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:41802: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:41946: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:41805: \$? = $ac_status" >&5
+  echo "$as_me:41949: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:41808: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41952: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41811: \$? = $ac_status" >&5
+  echo "$as_me:41955: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_unctrl_header=$cf_header
 	 break
@@ -41822,30 +41966,33 @@ done
 
 case $cf_cv_unctrl_header in #(vi
 no)
-	{ echo "$as_me:41825: WARNING: unctrl.h header not found" >&5
+	{ echo "$as_me:41969: WARNING: unctrl.h header not found" >&5
 echo "$as_me: WARNING: unctrl.h header not found" >&2;}
 	;;
 esac
 
 fi
-echo "$as_me:41831: result: $cf_cv_unctrl_header" >&5
+echo "$as_me:41975: result: $cf_cv_unctrl_header" >&5
 echo "${ECHO_T}$cf_cv_unctrl_header" >&6
 
 case $cf_cv_unctrl_header in #(vi
 unctrl.h) #(vi
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define HAVE_UNCTRL_H 1
 EOF
 
 	;;
 ncurses/unctrl.h) #(vi
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define HAVE_NCURSES_UNCTRL_H 1
 EOF
 
 	;;
 ncursesw/unctrl.h)
-	cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define HAVE_NCURSESW_UNCTRL_H 1
 EOF
 
@@ -41879,10 +42026,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:41882: checking for ${cf_func}" >&5
+	echo "$as_me:42029: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me:-configure}:41885: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:42032: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -41891,7 +42038,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >conftest.$ac_ext <<_ACEOF
-#line 41894 "configure"
+#line 42041 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -41923,16 +42070,16 @@ if (foo + 1234 > 5678)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:41926: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42073: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41929: \$? = $ac_status" >&5
+  echo "$as_me:42076: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:41932: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42079: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41935: \$? = $ac_status" >&5
+  echo "$as_me:42082: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -41948,7 +42095,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:41951: result: $cf_result" >&5
+	echo "$as_me:42098: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test $cf_result != no; then
 		cat >>confdefs.h <<EOF
@@ -41964,13 +42111,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:41967: checking for $ac_func" >&5
+echo "$as_me:42114: 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 41973 "configure"
+#line 42120 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -42001,16 +42148,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42004: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42151: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42007: \$? = $ac_status" >&5
+  echo "$as_me:42154: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42010: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42157: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42013: \$? = $ac_status" >&5
+  echo "$as_me:42160: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -42020,7 +42167,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:42023: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:42170: 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
@@ -42034,12 +42181,12 @@ fi
 
 if test $use_color_style != no ; then
 	if test .$cf_cv_color_curses != .yes ; then
-		{ { echo "$as_me:42037: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:42184: 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:42042: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:42189: error: Configuration does not support color-styles" >&5
 echo "$as_me: error: Configuration does not support color-styles" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -42047,10 +42194,11 @@ fi
 
 if test $use_scrollbar != no ; then
 	if test .$cf_cv_fancy_curses != .yes ; then
-		{ echo "$as_me:42050: WARNING: Configuration does not support ACS_xxx definitions" >&5
+		{ echo "$as_me:42197: WARNING: Configuration does not support ACS_xxx definitions" >&5
 echo "$as_me: WARNING: Configuration does not support ACS_xxx definitions" >&2;}
 	else
-		cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define USE_SCROLLBAR 1
 EOF
 
@@ -42060,7 +42208,7 @@ fi
 # use rpath for libraries in unusual places
 
 LD_RPATH_OPT=
-echo "$as_me:42063: checking for an rpath option" >&5
+echo "$as_me:42211: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 case $cf_cv_system_name in #(vi
 irix*) #(vi
@@ -42091,17 +42239,17 @@ solaris2*) #(vi
 *)
 	;;
 esac
-echo "$as_me:42094: result: $LD_RPATH_OPT" >&5
+echo "$as_me:42242: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 case "x$LD_RPATH_OPT" in #(vi
 x-R*)
-	echo "$as_me:42099: checking if we need a space after rpath option" >&5
+	echo "$as_me:42247: checking if we need a space after rpath option" >&5
 echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
 	cf_save_LIBS="$LIBS"
 	LIBS="${LD_RPATH_OPT}$libdir $LIBS"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 42104 "configure"
+#line 42252 "configure"
 #include "confdefs.h"
 
 int
@@ -42113,16 +42261,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42116: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42264: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42119: \$? = $ac_status" >&5
+  echo "$as_me:42267: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42122: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42270: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42125: \$? = $ac_status" >&5
+  echo "$as_me:42273: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_rpath_space=no
 else
@@ -42132,13 +42280,13 @@ cf_rpath_space=yes
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	LIBS="$cf_save_LIBS"
-	echo "$as_me:42135: result: $cf_rpath_space" >&5
+	echo "$as_me:42283: result: $cf_rpath_space" >&5
 echo "${ECHO_T}$cf_rpath_space" >&6
 	test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
 	;;
 esac
 
-echo "$as_me:42141: checking if rpath-hack should be disabled" >&5
+echo "$as_me:42289: 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.
@@ -42155,21 +42303,21 @@ else
   cf_disable_rpath_hack=no
 
 fi;
-echo "$as_me:42158: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:42306: result: $cf_disable_rpath_hack" >&5
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 if test "$cf_disable_rpath_hack" = no ; then
 
-echo "$as_me:42162: checking for updated LDFLAGS" >&5
+echo "$as_me:42310: 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:42165: result: maybe" >&5
+	echo "$as_me:42313: 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:42172: checking for $ac_word" >&5
+echo "$as_me:42320: 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
@@ -42184,7 +42332,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:42187: found $ac_dir/$ac_word" >&5
+echo "$as_me:42335: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -42192,10 +42340,10 @@ fi
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:42195: result: $cf_ldd_prog" >&5
+  echo "$as_me:42343: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:42198: result: no" >&5
+  echo "$as_me:42346: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -42209,7 +42357,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
 		cf_rpath_oops=
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 42212 "configure"
+#line 42360 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -42221,16 +42369,16 @@ printf("Hello");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42224: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42372: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42227: \$? = $ac_status" >&5
+  echo "$as_me:42375: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42230: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42378: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42233: \$? = $ac_status" >&5
+  echo "$as_me:42381: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort -u`
 		 cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort -u`
@@ -42258,7 +42406,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}:42261: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:42409: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 
 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
 						break
@@ -42270,11 +42418,11 @@ echo "${as_me:-configure}:42261: testing ...adding -L$cf_rpath_dir/lib to LDFLAG
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:42273: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:42421: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:42277: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:42425: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -42311,7 +42459,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:42314: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:42462: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -42324,11 +42472,11 @@ LDFLAGS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:42327: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:42475: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:42331: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:42479: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -42365,7 +42513,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:42368: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:42516: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -42378,11 +42526,11 @@ LIBS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:42381: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:42529: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:42385: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:42533: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 fi
 
@@ -42483,7 +42631,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:42486: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:42634: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -42615,7 +42763,7 @@ EOF
 cat >>$CONFIG_STATUS <<EOF
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.52.20120811,
+configured by $0, generated by GNU Autoconf 2.52.20121002,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
@@ -42659,7 +42807,7 @@ cat >>$CONFIG_STATUS <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:42662: error: ambiguous option: $1
+    { { echo "$as_me:42810: 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;}
@@ -42678,7 +42826,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:42681: error: unrecognized option: $1
+  -*) { { echo "$as_me:42829: 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;}
@@ -42697,7 +42845,7 @@ cat >&5 << _ACEOF
 ## Running config.status.  ##
 ## ----------------------- ##
 
-This file was extended by $as_me 2.52.20120811, executed with
+This file was extended by $as_me 2.52.20121002, executed with
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
   CONFIG_LINKS    = $CONFIG_LINKS
@@ -42731,7 +42879,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:42734: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:42882: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -42837,6 +42985,7 @@ s,@CPPFLAGS@,$CPPFLAGS,;t t
 s,@ac_ct_CC@,$ac_ct_CC,;t t
 s,@EXEEXT@,$EXEEXT,;t t
 s,@OBJEXT@,$OBJEXT,;t t
+s,@EXTRA_CPPFLAGS@,$EXTRA_CPPFLAGS,;t t
 s,@CPP@,$CPP,;t t
 s,@LN_S@,$LN_S,;t t
 s,@SET_MAKE@,$SET_MAKE,;t t
@@ -42853,7 +43002,6 @@ s,@MAKE_LOWER_TAGS@,$MAKE_LOWER_TAGS,;t t
 s,@MAKE_UPPER_TAGS@,$MAKE_UPPER_TAGS,;t t
 s,@WINDRES@,$WINDRES,;t t
 s,@ac_pt_WINDRES@,$ac_pt_WINDRES,;t t
-s,@PROG_EXT@,$PROG_EXT,;t t
 s,@BUILD_CC@,$BUILD_CC,;t t
 s,@BUILD_CPP@,$BUILD_CPP,;t t
 s,@BUILD_CFLAGS@,$BUILD_CFLAGS,;t t
@@ -42874,7 +43022,6 @@ s,@SHOW_CC@,$SHOW_CC,;t t
 s,@ECHO_CC@,$ECHO_CC,;t t
 s,@DONT_ECHO_CC@,$DONT_ECHO_CC,;t t
 s,@EXTRA_CFLAGS@,$EXTRA_CFLAGS,;t t
-s,@EXTRA_CPPFLAGS@,$EXTRA_CPPFLAGS,;t t
 s,@MSGINIT@,$MSGINIT,;t t
 s,@ALLOCA@,$ALLOCA,;t t
 s,@GLIBC21@,$GLIBC21,;t t
@@ -43065,7 +43212,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:43068: creating $ac_file" >&5
+    { echo "$as_me:43215: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -43083,7 +43230,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:43086: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:43233: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -43096,13 +43243,45 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:43099: error: cannot find input file: $f" >&5
+           { { echo "$as_me:43246: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
       esac
     done` || { (exit 1); exit 1; }
 EOF
+cat >>$CONFIG_STATUS <<\EOF
+  ac_warn_datarootdir=no
+  if test x"$ac_file" != x-; then
+    for ac_item in $ac_file_inputs
+    do
+      ac_seen=`grep '@\(datadir\|mandir\|infodir\)@' $ac_item`
+      if test -n "$ac_seen"; then
+        ac_used=`grep '@datarootdir@' $ac_item`
+        if test -z "$ac_used"; then
+          { echo "$as_me:43262: 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;}
+          ac_warn_datarootdir=yes
+        fi
+      fi
+      ac_seen=`grep '${datarootdir}' $ac_item`
+      if test -n "$ac_seen"; then
+        { echo "$as_me:43271: 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;}
+        ac_warn_datarootdir=yes
+      fi
+    done
+  fi
+
+if test "x$ac_warn_datarootdir" = xyes; then
+  ac_sed_cmds="$ac_sed_cmds | sed -e 's,@datarootdir@,\${prefix}/share,g' -e 's,\${datarootdir},\${prefix}/share,g'"
+fi
+
+EOF
 cat >>$CONFIG_STATUS <<EOF
   sed "$ac_vpsub
 $extrasub
@@ -43117,11 +43296,35 @@ s,@INSTALL@,$ac_INSTALL,;t t
 " $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
   rm -f $tmp/stdin
   if test x"$ac_file" != x-; then
-    mv $tmp/out $ac_file
+    cp $tmp/out $ac_file
+
+    for ac_name in prefix exec_prefix datarootdir
+    do
+        ac_seen=`fgrep -n '${'$ac_name'[:=].*}' $ac_file`
+        if test -n "$ac_seen"; then
+            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:43308: 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;}
+            fi
+        fi
+    done
+    egrep -n '@[a-z_][a-z_0-9]+@' $ac_file >$tmp/out
+    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:43319: WARNING: Some variables may not be substituted:
+$ac_seen" >&5
+echo "$as_me: WARNING: Some variables may not be substituted:
+$ac_seen" >&2;}
+    fi
   else
     cat $tmp/out
-    rm -f $tmp/out
   fi
+  rm -f $tmp/out
 
 done
 EOF
@@ -43162,7 +43365,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:43165: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:43368: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -43173,7 +43376,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:43176: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:43379: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -43186,7 +43389,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:43189: error: cannot find input file: $f" >&5
+           { { echo "$as_me:43392: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -43304,7 +43507,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:43307: $ac_file is unchanged" >&5
+      { echo "$as_me:43510: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
diff --git a/configure.in b/configure.in
index f738a82f..6691fbec 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $LynxId: configure.in,v 1.241 2012/08/22 11:11:26 tom Exp $
+dnl $LynxId: configure.in,v 1.244 2012/11/09 10:28:16 tom Exp $
 dnl
 dnl Process this file with autoconf to produce a configure script.
 dnl
@@ -92,7 +92,7 @@ openedition)
 	;;
 esac
 
-AC_PROG_CC
+CF_PROG_CC
 AC_PROG_CPP
 AC_PROG_LN_S
 case $host_os in
@@ -114,9 +114,6 @@ CF_ACVERSION_CHECK(2.52,
 	[AC_PATH_TOOL(WINDRES, windres, none)],
 	[AC_PATH_PROG(WINDRES, windres, none)])
 
-AC_AIX
-AC_ISC_POSIX
-
 CF_BUILD_CC([#],[])
 
 CF_PROG_RANLIB
@@ -145,7 +142,7 @@ CF_ARG_ENABLE(find-leaks,
 	[with_leak_checks=yes],
 	[with_leak_checks=no])
 AC_MSG_RESULT($with_leak_checks)
-test "$with_leak_checks" = "yes" && AC_DEFINE(LY_FIND_LEAKS)
+test "$with_leak_checks" = "yes" && AC_DEFINE(LY_FIND_LEAKS,1,[Define to 1 if you want to check memory-leaks])
 
 # The comment about adding -g to $CFLAGS is unclear.  Autoconf tries to add
 # a -g flag; we remove it if the user's $CFLAGS was not set and debugging is
@@ -183,7 +180,7 @@ CF_ARG_DISABLE(trace,
 	[with_trace=$enableval],
 	[with_trace=yes])
 AC_MSG_RESULT($with_trace)
-test $with_trace = no && AC_DEFINE(NO_LYNX_TRACE)
+test $with_trace = no && AC_DEFINE(NO_LYNX_TRACE,1,[Define to 1 if you want to enable lynx trace code])
 
 AC_MSG_CHECKING(if you want verbose trace code)
 CF_ARG_ENABLE(vertrace,
@@ -191,7 +188,7 @@ CF_ARG_ENABLE(vertrace,
 	[with_vertrace=yes],
 	[with_vertrace=no])
 AC_MSG_RESULT($with_vertrace)
-test $with_vertrace = yes && AC_DEFINE(LY_TRACELINE,__LINE__)
+test $with_vertrace = yes && AC_DEFINE(LY_TRACELINE,__LINE__,[Define to __LINE__ if you want verbose trace code])
 
 if test -n "$GCC"
 then
@@ -216,12 +213,9 @@ dnl Checks for compiler & standard-library characteristics
 dnl --------------------------------------------------------------------------
 
 dnl If we're able to run this script, this is true!
-AC_DEFINE(UNIX)
-
-AC_C_CONST
+AC_DEFINE(UNIX,1,[Define to 1 if we can run a configure script])
 
 dnl Only add to this case statement things that we cannot design tests for.
-CF_PROG_EXT
 TRY_CFLAGS=
 case $host_os in
 aix4*)
@@ -349,7 +343,7 @@ ultrix*)
 	test -z "$GCC" && TRY_CFLAGS="$TRY_CFLAGS -O -Olimit 600 -G 7"
 	TRY_CFLAGS="$TRY_CFLAGS -DULTRIX"
 	AC_CHECK_HEADERS(cursesX.h,
-		[AC_DEFINE(HAVE_CURSESX_H)
+		[AC_DEFINE(HAVE_CURSESX_H,1,[Define to 1 if we have cursesX.h])
 		 cf_cv_ncurses_header=cursesX.h])
 	;;
 esac
@@ -407,7 +401,7 @@ CF_ARG_DISABLE(full-paths,
 	[with_full_paths=no],
 	[with_full_paths=yes])
 AC_MSG_RESULT($with_full_paths)
-test $with_full_paths = no && AC_DEFINE(USE_EXECVP)
+test $with_full_paths = no && AC_DEFINE(USE_EXECVP,1,[Define to 1 if you want full utility pathnames])
 
 CF_DEFINE_PROG(system mailer, SYSTEM_MAIL,
 	/usr/mmdf/bin/submit \
@@ -509,7 +503,7 @@ dnl --------------------------------------------------------------------------
 AC_MSG_CHECKING([whether to enable ipv6])
 CF_ARG_ENABLE(ipv6,
 [  --enable-ipv6           use ipv6 (with ipv4) support],
-	[AC_DEFINE(ENABLE_IPV6)])
+	[AC_DEFINE(ENABLE_IPV6,1,[Define to 1 if we should enable ipv6])])
 AC_MSG_RESULT($enableval)
 if test "$enableval" = "yes"; then
 	CF_CHECK_IPV6
@@ -585,7 +579,7 @@ no)
 	INSTALL_LSS=
 	;;
 *)
-	AC_DEFINE(USE_COLOR_STYLE)
+	AC_DEFINE(USE_COLOR_STYLE,1,[Define to 1 if we should enable color-style])
 	AC_MSG_RESULT(yes)
 
 	AC_MSG_CHECKING(for location of style-sheet file)
@@ -600,7 +594,7 @@ $sysconfdir/lynx.lss)
 	AC_MSG_RESULT($LYNX_LSS_FILE)
 
 	test "$LYNX_LSS_FILE" = no && LYNX_LSS_FILE=
-	AC_DEFINE_UNQUOTED(LYNX_LSS_FILE,"$LYNX_LSS_FILE")
+	AC_DEFINE_UNQUOTED(LYNX_LSS_FILE,"$LYNX_LSS_FILE",[Define to default path for Lynx lss-file])
 
 	INSTALL_LSS=install-lss
 	;;
@@ -623,7 +617,7 @@ dnl --------------------------------------------------------------------------
 AC_MSG_RESULT($LYNX_CFG_FILE)
 
 test "$LYNX_CFG_FILE" = no && LYNX_CFG_FILE=
-AC_DEFINE_UNQUOTED(LYNX_CFG_FILE,"$LYNX_CFG_FILE")
+AC_DEFINE_UNQUOTED(LYNX_CFG_FILE,"$LYNX_CFG_FILE",[Define to default path for Lynx cfg-file])
 
 dnl --------------------------------------------------------------------------
 AC_MSG_CHECKING(if htmlized lynx.cfg should be built)
@@ -662,7 +656,7 @@ MIME_LIBDIR,
 [/etc])
 AC_MSG_RESULT($MIME_LIBDIR)
 MIME_LIBDIR=`echo "$MIME_LIBDIR" | sed -e 's,/$,,' -e 's,$,/,'`
-AC_DEFINE_UNQUOTED(MIME_LIBDIR,"$MIME_LIBDIR")
+AC_DEFINE_UNQUOTED(MIME_LIBDIR,"$MIME_LIBDIR",[Define to default path for MIME library])
 
 dnl --------------------------------------------------------------------------
 AC_MSG_CHECKING(if locale-charset selection logic should be used)
@@ -671,7 +665,7 @@ CF_ARG_ENABLE(locale-charset,
 	[use_locale_charset=$enableval],
 	[use_locale_charset=yes])
 AC_MSG_RESULT($use_locale_charset)
-test $use_locale_charset != no && AC_DEFINE(USE_LOCALE_CHARSET)
+test $use_locale_charset != no && AC_DEFINE(USE_LOCALE_CHARSET,1,[Define to 1 if locale-charset selection logic should be used])
 
 dnl --------------------------------------------------------------------------
 dnl Check for subsets of compiled-in tables.
@@ -687,7 +681,7 @@ AC_ARG_WITH(charsets,
 
 if test -n "$cf_charsets" ; then
 	AC_MSG_RESULT(yes)
-	AC_DEFINE(ALL_CHARSETS,0)
+	AC_DEFINE(ALL_CHARSETS,0,[Define to 0 if xxx])
 	cf_min_charsets=us-ascii,iso-8859-1,utf-8
 	if test "$cf_charsets" = "no" ; then
 		cf_charsets=minimal
@@ -846,7 +840,7 @@ CF_ARG_DISABLE(bibp-urls,
 	[use_bibp_urls=$enableval],
 	[use_bibp_urls=yes])
 AC_MSG_RESULT($use_bibp_urls)
-test $use_bibp_urls = no && AC_DEFINE(DISABLE_BIBP)
+test $use_bibp_urls = no && AC_DEFINE(DISABLE_BIBP,1,[Define to 1 if bibp: URLs should be supported])
 
 dnl --------------------------------------------------------------------------
 AC_MSG_CHECKING(if configuration info should be browsable)
@@ -855,7 +849,7 @@ CF_ARG_DISABLE(config-info,
 	[use_config_info=$enableval],
 	[use_config_info=yes])
 AC_MSG_RESULT($use_config_info)
-test $use_config_info = no && AC_DEFINE(NO_CONFIG_INFO)
+test $use_config_info = no && AC_DEFINE(NO_CONFIG_INFO,1,[Define to 1 if configuration info should be browsable])
 
 dnl --------------------------------------------------------------------------
 AC_MSG_CHECKING(if new-style forms-based options screen should be used)
@@ -864,7 +858,7 @@ CF_ARG_DISABLE(forms-options,
 	[use_forms_options=$enableval],
 	[use_forms_options=yes])
 AC_MSG_RESULT($use_forms_options)
-test $use_forms_options = no && AC_DEFINE(NO_OPTION_FORMS)
+test $use_forms_options = no && AC_DEFINE(NO_OPTION_FORMS,1,[Define to 1 if new-style forms-based options screen should be used])
 
 dnl --------------------------------------------------------------------------
 AC_MSG_CHECKING(if old-style options menu should be used)
@@ -873,7 +867,7 @@ CF_ARG_DISABLE(menu-options,
 	[use_menu_options=$enableval],
 	[use_menu_options=yes])
 AC_MSG_RESULT($use_menu_options)
-test $use_menu_options = no && AC_DEFINE(NO_OPTION_MENU)
+test $use_menu_options = no && AC_DEFINE(NO_OPTION_MENU,1,[Define to 1 if old-style options menu should be used])
 
 dnl --------------------------------------------------------------------------
 AC_MSG_CHECKING(if sessions code should be used)
@@ -883,7 +877,7 @@ CF_ARG_DISABLE(sessions,
 	[use_sessions=yes])
 AC_MSG_RESULT($use_sessions)
 if test $use_sessions != no ; then
-	AC_DEFINE(USE_SESSIONS)
+	AC_DEFINE(USE_SESSIONS,1,[Define to 1 if sessions code should be used])
 	EXTRA_OBJS="$EXTRA_OBJS LYSession\$o"
 fi
 
@@ -895,7 +889,7 @@ CF_ARG_DISABLE(session-cache,
 	[use_session_cache=yes])
 AC_MSG_RESULT($use_session_cache)
 if test $use_session_cache != no ; then
-    AC_DEFINE(USE_CACHEJAR)
+    AC_DEFINE(USE_CACHEJAR,1,[Define to 1 if session-caching code should be used])
 fi
 
 dnl --------------------------------------------------------------------------
@@ -905,7 +899,7 @@ CF_ARG_DISABLE(addrlist-page,
 	[use_addrlist_page=$enableval],
 	[use_addrlist_page=yes])
 AC_MSG_RESULT($use_addrlist_page)
-test $use_addrlist_page != no && AC_DEFINE(USE_ADDRLIST_PAGE)
+test $use_addrlist_page != no && AC_DEFINE(USE_ADDRLIST_PAGE,1,[Define to 1 if address-list page should be used])
 
 dnl --------------------------------------------------------------------------
 AC_MSG_CHECKING(if experimental CJK logic should be used)
@@ -914,7 +908,7 @@ CF_ARG_ENABLE(cjk,
 	[use_cjk=$enableval],
 	[use_cjk=no])
 AC_MSG_RESULT($use_cjk)
-test $use_cjk != no && AC_DEFINE(CJK_EX)
+test $use_cjk != no && AC_DEFINE(CJK_EX,1,[Define to 1 if experimental CJK logic should be used])
 
 dnl --------------------------------------------------------------------------
 AC_MSG_CHECKING(if experimental Japanese UTF-8 logic should be used)
@@ -924,7 +918,7 @@ CF_ARG_ENABLE(japanese-utf8,
 	[use_ja_utf8=no])
 AC_MSG_RESULT($use_ja_utf8)
 if test $use_ja_utf8 != no ; then
-	AC_DEFINE(EXP_JAPANESEUTF8_SUPPORT)
+	AC_DEFINE(EXP_JAPANESEUTF8_SUPPORT,1,[Define to 1 if experimental Japanese UTF-8 logic should be used])
 	AM_ICONV
 	if test "$USE_NLS" != yes ; then
 	  LIBS="$LIBICONV $LIBS"
@@ -946,7 +940,7 @@ CF_ARG_ENABLE(default-colors,
 	[use_dft_colors=yes],
 	[use_dft_colors=no])
 AC_MSG_RESULT($use_dft_colors)
-test $use_dft_colors = "yes" && AC_DEFINE(USE_DEFAULT_COLORS)
+test $use_dft_colors = "yes" && AC_DEFINE(USE_DEFAULT_COLORS,1,[Define to 1 if you want to use default-colors])
 fi
 
 dnl --------------------------------------------------------------------------
@@ -956,7 +950,7 @@ CF_ARG_ENABLE(kbd-layout,
 	[use_kbd_layout=$enableval],
 	[use_kbd_layout=no])
 AC_MSG_RESULT($use_kbd_layout)
-test $use_kbd_layout != no && AC_DEFINE(EXP_KEYBOARD_LAYOUT)
+test $use_kbd_layout != no && AC_DEFINE(EXP_KEYBOARD_LAYOUT,1,[Define to 1 if experimental keyboard-layout logic should be used])
 
 dnl --------------------------------------------------------------------------
 AC_MSG_CHECKING(if experimental nested-table logic should be used)
@@ -965,7 +959,7 @@ CF_ARG_ENABLE(nested-tables,
 	[use_nested_tables=$enableval],
 	[use_nested_tables=no])
 AC_MSG_RESULT($use_nested_tables)
-test $use_nested_tables != no && AC_DEFINE(EXP_NESTED_TABLES)
+test $use_nested_tables != no && AC_DEFINE(EXP_NESTED_TABLES,1,[Define to 1 if experimental nested-table logic should be used])
 
 dnl --------------------------------------------------------------------------
 dnl Miscellaneous options that don't need to test system features
@@ -981,7 +975,7 @@ CF_ARG_ENABLE(alt-bindings,
 	[use_alt_bindings=$enableval],
 	[use_alt_bindings=yes])
 AC_MSG_RESULT($use_alt_bindings)
-test $use_alt_bindings != no && AC_DEFINE(USE_ALT_BINDINGS)
+test $use_alt_bindings != no && AC_DEFINE(USE_ALT_BINDINGS,1,[Define to 1 if alternative line-edit bindings should be used])
 
 dnl --------------------------------------------------------------------------
 AC_MSG_CHECKING(if ascii case-conversion should be used)
@@ -990,7 +984,7 @@ CF_ARG_DISABLE(ascii-ctypes,
 	[use_ascii_ctypes=$enableval],
 	[use_ascii_ctypes=yes])
 AC_MSG_RESULT($use_ascii_ctypes)
-test $use_ascii_ctypes != no && AC_DEFINE(USE_ASCII_CTYPES)
+test $use_ascii_ctypes != no && AC_DEFINE(USE_ASCII_CTYPES,1,[Define to 1 if ascii case-conversion should be used])
 
 dnl --------------------------------------------------------------------------
 AC_MSG_CHECKING(if you want to use extended HTML DTD logic)
@@ -999,7 +993,7 @@ CF_ARG_DISABLE(extended-dtd,
 	[use_ext_htmldtd=no],
 	[use_ext_htmldtd=yes])
 AC_MSG_RESULT($use_ext_htmldtd)
-test $use_ext_htmldtd = "no" && AC_DEFINE(NO_EXTENDED_HTMLDTD)
+test $use_ext_htmldtd = "no" && AC_DEFINE(NO_EXTENDED_HTMLDTD,1,[Define to 1 if you want to use extended HTML DTD logic])
 
 dnl --------------------------------------------------------------------------
 AC_MSG_CHECKING(if file-upload logic should be used)
@@ -1008,7 +1002,7 @@ CF_ARG_DISABLE(file-upload,
 	[use_file_upload=$enableval],
 	[use_file_upload=yes])
 AC_MSG_RESULT($use_file_upload)
-test $use_file_upload != no && AC_DEFINE(USE_FILE_UPLOAD)
+test $use_file_upload != no && AC_DEFINE(USE_FILE_UPLOAD,1,[Define to 1 if file-upload logic should be used])
 
 dnl --------------------------------------------------------------------------
 AC_MSG_CHECKING(if IDNA support should be used)
@@ -1029,7 +1023,7 @@ CF_ARG_DISABLE(justify-elts,
 	[use_justify_elts=$enableval],
 	[use_justify_elts=yes])
 AC_MSG_RESULT($use_justify_elts)
-test $use_justify_elts != no && AC_DEFINE(USE_JUSTIFY_ELTS)
+test $use_justify_elts != no && AC_DEFINE(USE_JUSTIFY_ELTS,1,[Define to 1 if element-justification logic should be used])
 
 dnl --------------------------------------------------------------------------
 AC_MSG_CHECKING(if partial-display should be used)
@@ -1038,7 +1032,7 @@ CF_ARG_DISABLE(partial,
 	[use_partial_display=$enableval],
 	[use_partial_display=yes])
 AC_MSG_RESULT($use_partial_display)
-test $use_partial_display != no && AC_DEFINE(DISP_PARTIAL)
+test $use_partial_display != no && AC_DEFINE(DISP_PARTIAL,1,[Define to 1 if partial-display should be used])
 
 dnl --------------------------------------------------------------------------
 AC_MSG_CHECKING(if persistent-cookie logic should be used)
@@ -1047,7 +1041,7 @@ CF_ARG_DISABLE(persistent-cookies,
 	[use_filed_cookies=$enableval],
 	[use_filed_cookies=yes])
 AC_MSG_RESULT($use_filed_cookies)
-test $use_filed_cookies != no && AC_DEFINE(USE_PERSISTENT_COOKIES)
+test $use_filed_cookies != no && AC_DEFINE(USE_PERSISTENT_COOKIES,1,[Define to 1 if persistent-cookie logic should be used])
 
 dnl --------------------------------------------------------------------------
 AC_MSG_CHECKING(if html source should be colorized)
@@ -1056,7 +1050,7 @@ CF_ARG_DISABLE(prettysrc,
 	[use_prettysrc=$enableval],
 	[use_prettysrc=yes])
 AC_MSG_RESULT($use_prettysrc)
-test $use_prettysrc != no && AC_DEFINE(USE_PRETTYSRC)
+test $use_prettysrc != no && AC_DEFINE(USE_PRETTYSRC,1,[Define to 1 if html source should be colorized])
 
 dnl --------------------------------------------------------------------------
 AC_MSG_CHECKING(if progress-bar code should be used)
@@ -1065,7 +1059,7 @@ CF_ARG_DISABLE(progressbar,
 	[use_progressbar=$enableval],
 	[use_progressbar=yes])
 AC_MSG_RESULT($use_progressbar)
-test $use_progressbar != no && AC_DEFINE(USE_PROGRESSBAR)
+test $use_progressbar != no && AC_DEFINE(USE_PROGRESSBAR,1,[Define to 1 if progress-bar code should be used])
 
 dnl --------------------------------------------------------------------------
 AC_MSG_CHECKING(if read-progress message should show ETA)
@@ -1074,7 +1068,7 @@ CF_ARG_DISABLE(read-eta,
 	[use_read_eta=$enableval],
 	[use_read_eta=yes])
 AC_MSG_RESULT($use_read_eta)
-test $use_read_eta != no && AC_DEFINE(USE_READPROGRESS)
+test $use_read_eta != no && AC_DEFINE(USE_READPROGRESS,1,[Define to 1 if read-progress message should show ETA])
 
 dnl --------------------------------------------------------------------------
 AC_MSG_CHECKING(if source caching should be used)
@@ -1083,7 +1077,7 @@ CF_ARG_DISABLE(source-cache,
 	[use_source_cache=$enableval],
 	[use_source_cache=yes])
 AC_MSG_RESULT($use_source_cache)
-test $use_source_cache != no && AC_DEFINE(USE_SOURCE_CACHE)
+test $use_source_cache != no && AC_DEFINE(USE_SOURCE_CACHE,1,[Define to 1 if source caching should be used])
 
 dnl --------------------------------------------------------------------------
 AC_MSG_CHECKING(if scrollbar code should be used)
@@ -1100,7 +1094,7 @@ CF_ARG_ENABLE(charset-choice,
 	[use_charset_choice=$enableval],
 	[use_charset_choice=no])
 AC_MSG_RESULT($use_charset_choice)
-test $use_charset_choice != no && AC_DEFINE(USE_CHARSET_CHOICE)
+test $use_charset_choice != no && AC_DEFINE(USE_CHARSET_CHOICE,1,[Define to 1 if charset-selection logic should be used])
 
 dnl --------------------------------------------------------------------------
 AC_MSG_CHECKING(if you want to use external commands)
@@ -1110,7 +1104,7 @@ CF_ARG_ENABLE(externs,
 	[use_externs=no])
 AC_MSG_RESULT($use_externs)
 if test $use_externs != "no" ; then
-	AC_DEFINE(USE_EXTERNALS)
+	AC_DEFINE(USE_EXTERNALS,1,[Define to 1 if you want to use external commands])
 	EXTRA_OBJS="$EXTRA_OBJS LYExtern\$o"
 fi
 
@@ -1138,7 +1132,7 @@ if test $use_setfont = yes ; then
 	if test -z "$SETFONT" ; then
 		AC_MSG_WARN(Cannot find a font-setting program)
 	elif test "$SETFONT" != unknown ; then
-		AC_DEFINE(EXP_CHARTRANS_AUTOSWITCH)
+		AC_DEFINE(EXP_CHARTRANS_AUTOSWITCH,1,[Define to 1 if you want to use setfont support])
 	fi
 fi
 
@@ -1146,7 +1140,7 @@ dnl --------------------------------------------------------------------------
 AC_MSG_CHECKING(if you want cgi-link support)
 CF_ARG_ENABLE(cgi-links,
 [  --enable-cgi-links      support cgi links w/o a http daemon],
-	[AC_DEFINE(LYNXCGI_LINKS)])
+	[AC_DEFINE(LYNXCGI_LINKS,1,[Define to 1 if you want cgi-link support])])
 AC_MSG_RESULT($enableval)
 
 dnl --------------------------------------------------------------------------
@@ -1156,7 +1150,7 @@ CF_ARG_ENABLE(change-exec,
 	[use_change_exec=yes],
 	[use_change_exec=no])
 AC_MSG_RESULT($use_change_exec)
-test $use_change_exec = yes && AC_DEFINE(ENABLE_OPTS_CHANGE_EXEC)
+test $use_change_exec = yes && AC_DEFINE(ENABLE_OPTS_CHANGE_EXEC,1,[Define to 1 if you want change-exec support])
 
 dnl --------------------------------------------------------------------------
 AC_MSG_CHECKING(if you want exec-links support)
@@ -1166,7 +1160,7 @@ CF_ARG_OPTION(exec-links,
 	[use_exec_links=$enableval],
 	[$use_change_exec])
 AC_MSG_RESULT($use_exec_links)
-test $use_exec_links = yes && AC_DEFINE(EXEC_LINKS)
+test $use_exec_links = yes && AC_DEFINE(EXEC_LINKS,1,[Define to 1 if you want exec-links support])
 
 dnl --------------------------------------------------------------------------
 AC_MSG_CHECKING(if you want exec-scripts support)
@@ -1176,7 +1170,7 @@ CF_ARG_OPTION(exec-scripts,
 	[use_exec_scripts=$enableval],
 	[$use_change_exec])
 AC_MSG_RESULT($use_exec_scripts)
-test $use_exec_scripts = yes && AC_DEFINE(EXEC_SCRIPTS)
+test $use_exec_scripts = yes && AC_DEFINE(EXEC_SCRIPTS,1,[Define to 1 if you want exec-scripts support])
 
 dnl --------------------------------------------------------------------------
 AC_MSG_CHECKING(if you want internal-links feature)
@@ -1185,7 +1179,7 @@ CF_ARG_ENABLE(internal-links,
 	[use_internal_links=yes],
 	[use_internal_links=no])
 AC_MSG_RESULT($use_internal_links)
-test $use_internal_links = no && AC_DEFINE(DONT_TRACK_INTERNAL_LINKS)
+test $use_internal_links = no && AC_DEFINE(DONT_TRACK_INTERNAL_LINKS,1,[Define to 1 if you want internal-links feature])
 
 dnl --------------------------------------------------------------------------
 AC_MSG_CHECKING(if you want to fork NSL requests)
@@ -1197,10 +1191,10 @@ AC_MSG_RESULT($use_nsl_fork)
 if test $use_nsl_fork = yes ; then
 	case $host_os in
 	mingw*)
-		AC_DEFINE(_WINDOWS_NSL)
+		AC_DEFINE(_WINDOWS_NSL,1,[Define to 1 if we want NSL-fork with Windows])
 		;;
 	*)
-		AC_DEFINE(NSL_FORK)
+		AC_DEFINE(NSL_FORK,1,[Define to 1 if we want NSL-fork])
 		;;
 	esac
 fi
@@ -1212,7 +1206,7 @@ CF_ARG_ENABLE(syslog,
 	[use_syslog=yes],
 	[use_syslog=no])
 AC_MSG_RESULT($use_syslog)
-test $use_syslog = yes && AC_DEFINE(SYSLOG_REQUESTED_URLS)
+test $use_syslog = yes && AC_DEFINE(SYSLOG_REQUESTED_URLS,1,[Define to 1 if you want to log URL requests via syslog])
 
 dnl --------------------------------------------------------------------------
 AC_MSG_CHECKING(if you want to underline links)
@@ -1221,8 +1215,8 @@ CF_ARG_ENABLE(underlines,
 	[use_underline=yes],
 	[use_underline=no])
 AC_MSG_RESULT($use_underline)
-test $use_underline = yes && AC_DEFINE(UNDERLINE_LINKS,1)
-test $use_underline = no  && AC_DEFINE(UNDERLINE_LINKS,0)
+test $use_underline = yes && AC_DEFINE(UNDERLINE_LINKS,1,[Define to 1 if xxx])
+test $use_underline = no  && AC_DEFINE(UNDERLINE_LINKS,0,[Define to 0 if xxx])
 
 dnl --------------------------------------------------------------------------
 AC_MSG_CHECKING(if help files should be gzip'ed)
@@ -1242,7 +1236,7 @@ AC_MSG_RESULT($use_bzlib)
 
 if test ".$use_bzlib" != ".no" ; then
 	CF_WITH_BZLIB($use_bzlib)
-	test "x$cf_cv_find_linkage_bz2" = "xyes" && AC_DEFINE(USE_BZLIB)
+	test "x$cf_cv_find_linkage_bz2" = "xyes" && AC_DEFINE(USE_BZLIB,1,[Define to 1 if you want to use libbz2 for decompression of some bzip2 files])
 fi
 
 dnl --------------------------------------------------------------------------
@@ -1255,7 +1249,7 @@ AC_MSG_RESULT($use_zlib)
 
 if test ".$use_zlib" != ".no" ; then
 	CF_WITH_ZLIB($use_zlib)
-	test "x$cf_cv_find_linkage_z" = "xyes" && AC_DEFINE(USE_ZLIB)
+	test "x$cf_cv_find_linkage_z" = "xyes" && AC_DEFINE(USE_ZLIB,1,[Define to 1 if you want to use zlib for decompression of some gzip files])
 fi
 
 dnl --------------------------------------------------------------------------
@@ -1269,7 +1263,7 @@ CF_ARG_DISABLE(finger,
 	[use_finger=yes],
 	[use_finger=no])
 AC_MSG_RESULT($use_finger)
-test $use_finger != "no" && AC_DEFINE(DISABLE_FINGER)
+test $use_finger != "no" && AC_DEFINE(DISABLE_FINGER,1,[Define to 1 if you want to exclude FINGER code])
 
 dnl --------------------------------------------------------------------------
 AC_MSG_CHECKING(if you want to exclude GOPHER code)
@@ -1278,7 +1272,7 @@ CF_ARG_DISABLE(gopher,
 	[use_gopher=yes],
 	[use_gopher=no])
 AC_MSG_RESULT($use_gopher)
-test $use_gopher != "no" && AC_DEFINE(DISABLE_GOPHER)
+test $use_gopher != "no" && AC_DEFINE(DISABLE_GOPHER,1,[Define to 1 if you want to exclude GOPHER code])
 
 dnl --------------------------------------------------------------------------
 AC_MSG_CHECKING(if you want to exclude NEWS code)
@@ -1287,7 +1281,7 @@ CF_ARG_DISABLE(news,
       [use_news=yes],
       [use_news=no])
 AC_MSG_RESULT($use_news)
-test $use_news != "no" && AC_DEFINE(DISABLE_NEWS)
+test $use_news != "no" && AC_DEFINE(DISABLE_NEWS,1,[Define to 1 if you want to exclude NEWS code])
 
 dnl --------------------------------------------------------------------------
 AC_MSG_CHECKING(if you want to exclude FTP code)
@@ -1296,7 +1290,7 @@ CF_ARG_DISABLE(ftp,
       [use_ftp=yes],
       [use_ftp=no])
 AC_MSG_RESULT($use_ftp)
-test $use_ftp != "no" && AC_DEFINE(DISABLE_FTP)
+test $use_ftp != "no" && AC_DEFINE(DISABLE_FTP,1,[Define to 1 if you want to exclude FTP code])
 
 dnl --------------------------------------------------------------------------
 AC_MSG_CHECKING(if you want to include WAIS code)
@@ -1336,46 +1330,46 @@ AC_MSG_RESULT($use_dired)
 
 if test ".$use_dired" != ".no" ; then
 	EXTRA_OBJS="$EXTRA_OBJS LYLocal\$o"
-	AC_DEFINE(DIRED_SUPPORT)
+	AC_DEFINE(DIRED_SUPPORT,1,[Define to 1 if we want dired support])
 
 	AC_MSG_CHECKING(if you wish to allow extracting from archives via DirEd)
 	CF_ARG_DISABLE(dired-dearchive,
-	[  --disable-dired-dearchive disable dearchiving commands],[AC_DEFINE(ARCHIVE_ONLY)])
+	[  --disable-dired-dearchive disable dearchiving commands],[AC_DEFINE(ARCHIVE_ONLY,1,[Define to 1 if you wish to allow extracting from archives via DirEd])])
 	AC_MSG_RESULT($enableval)
 
 	AC_MSG_CHECKING(if DirEd mode should override keys)
 	CF_ARG_DISABLE(dired-override,
-	[  --disable-dired-override disable DirEd override keymap],,[AC_DEFINE(OK_OVERRIDE)])
+	[  --disable-dired-override disable DirEd override keymap],,[AC_DEFINE(OK_OVERRIDE,1,[Define to 1 if DirEd mode should override keys])])
 	AC_MSG_RESULT($enableval)
 
 	AC_MSG_CHECKING(if you wish to allow permissions commands via DirEd)
 	CF_ARG_DISABLE(dired-permit,
-	[  --disable-dired-permit  disable chmod/attrib commands],,[AC_DEFINE(OK_PERMIT)])
+	[  --disable-dired-permit  disable chmod/attrib commands],,[AC_DEFINE(OK_PERMIT,1,[Define to 1 if you wish to allow permissions commands via DirEd])])
 	AC_MSG_RESULT($enableval)
 
 	AC_MSG_CHECKING(if you wish to allow executable-permission commands via DirEd)
 	CF_ARG_DISABLE(dired-xpermit,
-	[  --disable-dired-xpermit disable chmod/attrib commands],[AC_DEFINE(NO_CHANGE_EXECUTE_PERMS)])
+	[  --disable-dired-xpermit disable chmod/attrib commands],[AC_DEFINE(NO_CHANGE_EXECUTE_PERMS,1,[Define to 1 if you wish to allow executable-permission commands via DirEd])])
 	AC_MSG_RESULT($enableval)
 
 	AC_MSG_CHECKING(if you wish to allow "tar" commands from DirEd)
 	CF_ARG_DISABLE(dired-tar,
-	[  --disable-dired-tar     disable "tar" command],,[AC_DEFINE(OK_TAR)])
+	[  --disable-dired-tar     disable "tar" command],,[AC_DEFINE(OK_TAR,1,[Define to 1 if if you wish to allow "tar" commands from DirEd])])
 	AC_MSG_RESULT($enableval)
 
 	AC_MSG_CHECKING(if you wish to allow "uudecode" commands from DirEd)
 	CF_ARG_DISABLE(dired-uudecode,
-	[  --disable-dired-uudecode disable "uudecode" command],,[AC_DEFINE(OK_UUDECODE)])
+	[  --disable-dired-uudecode disable "uudecode" command],,[AC_DEFINE(OK_UUDECODE,1,[Define to 1 if you wish to allow "uudecode" commands from DirEd])])
 	AC_MSG_RESULT($enableval)
 
 	AC_MSG_CHECKING(if you wish to allow "zip" and "unzip" commands from DirEd)
 	CF_ARG_DISABLE(dired-zip,
-	[  --disable-dired-zip     disable "zip", "unzip"  commands],,[AC_DEFINE(OK_ZIP)])
+	[  --disable-dired-zip     disable "zip", "unzip"  commands],,[AC_DEFINE(OK_ZIP,1,[Define to 1 if you wish to allow "zip" and "unzip" commands from DirEd])])
 	AC_MSG_RESULT($enableval)
 
 	AC_MSG_CHECKING(if you wish to allow "gzip" and "gunzip" commands from DirEd)
 	CF_ARG_DISABLE(dired-gzip,
-	[  --disable-dired-gzip    disable "gzip", "gunzip" commands],,[AC_DEFINE(OK_GZIP)])
+	[  --disable-dired-gzip    disable "gzip", "gunzip" commands],,[AC_DEFINE(OK_GZIP,1,[Define to 1 if you wish to allow "gzip" and "gunzip" commands from DirEd])])
 	AC_MSG_RESULT($enableval)
 fi
 
@@ -1383,7 +1377,7 @@ dnl --------------------------------------------------------------------------
 AC_MSG_CHECKING(if you want long-directory listings)
 CF_ARG_DISABLE(long-list,
 [  --disable-long-list     disable long "ls -l" directory listings],,
-	[AC_DEFINE(LONG_LIST)])
+	[AC_DEFINE(LONG_LIST,1,[Define to 1 if you want long-directory listings])])
 AC_MSG_RESULT($enableval)
 
 dnl --------------------------------------------------------------------------
@@ -1391,7 +1385,7 @@ AC_MSG_CHECKING(if parent-directory references are permitted)
 CF_ARG_DISABLE(parent-dir-refs,
 [  --disable-parent-dir-refs
                           disable "Up-to" links in directory listings],
-	[AC_DEFINE(NO_PARENT_DIR_REFERENCE)])
+	[AC_DEFINE(NO_PARENT_DIR_REFERENCE,1,[Define to 1 if parent-directory references are permitted])])
 AC_MSG_RESULT($enableval)
 
 dnl --------------------------------------------------------------------------
@@ -1408,10 +1402,10 @@ CF_PATH_PROG(BZIP2,	bzip2)
 
 CF_PATH_PROG(TAR,	tar, pax gtar gnutar bsdtar star)
 CF_TAR_OPTIONS($TAR)
-AC_DEFINE_UNQUOTED(TAR_UP_OPTIONS,   "$TAR_UP_OPTIONS")
-AC_DEFINE_UNQUOTED(TAR_DOWN_OPTIONS, "$TAR_DOWN_OPTIONS")
-AC_DEFINE_UNQUOTED(TAR_FILE_OPTIONS, "$TAR_FILE_OPTIONS")
-AC_DEFINE_UNQUOTED(TAR_PIPE_OPTIONS, "$TAR_PIPE_OPTIONS")
+AC_DEFINE_UNQUOTED(TAR_UP_OPTIONS,   "$TAR_UP_OPTIONS",[Define to command for tar'ing up files])
+AC_DEFINE_UNQUOTED(TAR_DOWN_OPTIONS, "$TAR_DOWN_OPTIONS",[Define to command for untar'ing files])
+AC_DEFINE_UNQUOTED(TAR_FILE_OPTIONS, "$TAR_FILE_OPTIONS",[Define to options for tar to work with files])
+AC_DEFINE_UNQUOTED(TAR_PIPE_OPTIONS, "$TAR_PIPE_OPTIONS",[Define to options for tar to work with pipes])
 
 dnl --------------------------------------------------------------------------
 dnl Test features that rely on configure-definitions
@@ -1509,7 +1503,7 @@ if test $use_scrollbar != no ; then
 	if test .$cf_cv_fancy_curses != .yes ; then
 		AC_MSG_WARN(Configuration does not support ACS_xxx definitions)
 	else
-		AC_DEFINE(USE_SCROLLBAR)
+		AC_DEFINE(USE_SCROLLBAR,1,[Define to 1 if configuration supports ACS_xxx definitions])
 	fi
 fi
 
diff --git a/po/nl.po b/po/nl.po
index be694c04..b683c839 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -4,12 +4,13 @@
 # Tijs van Bakel <smoke@casema.net>, 1999, 2000.
 # Luk Claes <luk.claes@ugent.be>, 2004.
 # Benno Schulenberg <benno@vertaalt.nl>, 2008.
+# Erwin Poeze <erwin.poeze@gmail.com>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: lynx-2.8.7-dev12\n"
+"Project-Id-Version: lynx-2.8.8-dev9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-26 20:04-0500\n"
-"PO-Revision-Date: 2011-05-28 18:16+0200\n"
+"POT-Creation-Date: 2012-02-12 19:13-0500\n"
+"PO-Revision-Date: 2012-08-25 16:49+0200\n"
 "Last-Translator: Erwin Poeze <erwin.poeze@gmail.com>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "Language: nl\n"
@@ -28,2010 +29,2024 @@ msgstr ""
 #. * debugging (CTRACE) or (b) are constants used in interaction with
 #. * other programs.
 #. *
-#. * Links to collections of alternate definitions, developed by the Lynx
-#. * User Community, are maintained in Lynx links:
-#. *
-#. *    http://www.subir.com/lynx.html
-#. *
 #. * See ABOUT-NLS and po/readme for details and location of contributed
 #. * translations.  When no translation is available, the English default is
 #. * used.
 #.
-#: LYMessages.c:32
+#: LYMessages.c:27
 #, c-format
 msgid "Alert!: %s"
 msgstr "Let op!: %s"
 
-#: LYMessages.c:33
+#: LYMessages.c:28
 msgid "Welcome"
 msgstr "Welkom"
 
-#: LYMessages.c:34
+#: LYMessages.c:29
 msgid "Are you sure you want to quit?"
 msgstr "Afsluiten?"
 
-#: LYMessages.c:36
+#: LYMessages.c:31
 msgid "Really exit from Lynx?"
 msgstr "Lynx afsluiten?"
 
-#: LYMessages.c:38
+#: LYMessages.c:33
 msgid "Connection interrupted."
 msgstr "Verbinding is onderbroken."
 
-#: LYMessages.c:39
+#: LYMessages.c:34
 msgid "Data transfer interrupted."
 msgstr "Gegevensoverdracht is onderbroken."
 
-#: LYMessages.c:40
+#: LYMessages.c:35
 msgid "Cancelled!!!"
 msgstr "Geannuleerd!"
 
-#: LYMessages.c:41
+#: LYMessages.c:36
 msgid "Cancelling!"
 msgstr "Annuleren..."
 
-#: LYMessages.c:42
+#: LYMessages.c:37
 msgid "Excellent!!!"
 msgstr "Prima!"
 
-#: LYMessages.c:43
+#: LYMessages.c:38
 msgid "OK"
 msgstr "OK"
 
-#: LYMessages.c:44
+#: LYMessages.c:39
 msgid "Done!"
 msgstr "Klaar!"
 
-#: LYMessages.c:45
+#: LYMessages.c:40
 msgid "Bad request!"
 msgstr "Ongeldig verzoek!"
 
-#: LYMessages.c:46
+#: LYMessages.c:41
 msgid "previous"
 msgstr "vorige"
 
-#: LYMessages.c:47
+#: LYMessages.c:42
 msgid "next screen"
 msgstr "volgend scherm"
 
-#: LYMessages.c:48
+#: LYMessages.c:43
 msgid "HELP!"
 msgstr "HELP!"
 
-#: LYMessages.c:49
+#: LYMessages.c:44
 msgid ", help on "
 msgstr ", hulp bij "
 
 #. #define HELP
-#: LYMessages.c:51
+#: LYMessages.c:46
 msgid "Commands: Use arrow keys to move, '?' for help, 'q' to quit, '<-' to go back."
-msgstr "Commando's: pijltjes verplaatsen, '?'=hulp, 'q'=afsluiten, '<-'=terug."
+msgstr "Opdrachten: pijltjes verplaatsen, '?'=hulp, 'q'=afsluiten, '<-'=terug."
 
 #. #define MOREHELP
-#: LYMessages.c:53
+#: LYMessages.c:48
 msgid "-- press space for more, use arrow keys to move, '?' for help, 'q' to quit."
-msgstr "-- spatiebalk=volgend blad, pijltjes verplaatsen, '?'=help, 'q'=afsluiten."
+msgstr "-- spatiebalk=volgend blad, pijltjes verplaatsen, '?'=hulp, 'q'=afsluiten."
 
-#: LYMessages.c:54
+#: LYMessages.c:49
 msgid "-- press space for next page --"
 msgstr "-- druk op spatiebalk voor volgend blad --"
 
-#: LYMessages.c:55
+#: LYMessages.c:50
 msgid "URL too long"
 msgstr "URL is te lang"
 
 #. Inactive input fields, messages used with -tna option - kw
 #. #define FORM_LINK_TEXT_MESSAGE_INA
-#: LYMessages.c:61
+#: LYMessages.c:56
 msgid "(Text entry field) Inactive.  Press <return> to activate."
 msgstr "(Tekstinvoerveld) Niet actief.  Druk op <Enter> om te activeren."
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE_INA
-#: LYMessages.c:63
+#: LYMessages.c:58
 msgid "(Textarea) Inactive.  Press <return> to activate."
 msgstr "(Tekstgebied) Niet actief.  Druk op <Enter> om te activeren."
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE_INA_E
-#: LYMessages.c:65
+#: LYMessages.c:60
 #, c-format
 msgid "(Textarea) Inactive.  Press <return> to activate (%s for editor)."
 msgstr "(Tekstgebied) Niet actief.  Druk op <Enter> om te activeren (%s voor editor)."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_INA
-#: LYMessages.c:67
+#: LYMessages.c:62
 msgid "(Form field) Inactive.  Use <return> to edit."
 msgstr "(Formulierveld) Niet actief.  Gebruik <Enter> om te wijzigen."
 
 #. #define FORM_TEXT_SUBMIT_MESSAGE_INA_X
-#: LYMessages.c:69
+#: LYMessages.c:64
 #, c-format
 msgid "(Form field) Inactive.  Use <return> to edit (%s to submit with no cache)."
 msgstr "(Form.veld) Niet actief.  Wijzig met <Enter> (%s = verzenden zonder cache)."
 
 #. #define FORM_TEXT_RESUBMIT_MESSAGE_INA
-#: LYMessages.c:71
+#: LYMessages.c:66
 msgid "(Form field) Inactive. Press <return> to edit, press <return> twice to submit."
 msgstr "(Form.veld) Niet actief.  Wijzig met <Enter>, verzenden met twee keer <Enter>."
 
 #. #define FORM_TEXT_SUBMIT_MAILTO_MSG_INA
-#: LYMessages.c:73
+#: LYMessages.c:68
 msgid "(mailto form field) Inactive.  Press <return> to change."
 msgstr "(E-mailformulierveld) Niet actief.  Gebruik <Enter> om te wijzigen."
 
 #. #define FORM_LINK_PASSWORD_MESSAGE_INA
-#: LYMessages.c:75
+#: LYMessages.c:70
 msgid "(Password entry field) Inactive.  Press <return> to activate."
 msgstr "(Wachtwoordveld) Niet actief.  Gebruik <Enter> om te activeren."
 
 #. #define FORM_LINK_FILE_UNM_MSG
-#: LYMessages.c:78
+#: LYMessages.c:73
 msgid "UNMODIFIABLE file entry field.  Use UP or DOWN arrows or tab to move off."
 msgstr "ONVERANDERBAAR bestandsnaaminvoerveld.  Ga weg met pijltjes of <Tab>."
 
 #. #define FORM_LINK_FILE_MESSAGE
-#: LYMessages.c:80
+#: LYMessages.c:75
 msgid "(File entry field) Enter filename.  Use UP or DOWN arrows or tab to move off."
 msgstr "(Bestandsnaamveld) Voer een bestandsnaam in.  Ga weg met pijltjes of <Tab>."
 
 #. #define FORM_LINK_TEXT_MESSAGE
-#: LYMessages.c:82
+#: LYMessages.c:77
 msgid "(Text entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
 msgstr "(Tekstinvoerveld) Voer tekst in.  Ga weg met pijltjes of <Tab>."
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE
-#: LYMessages.c:84
+#: LYMessages.c:79
 msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off."
 msgstr "(Tekstgebied) Voer tekst in.  Ga weg met pijltjes of <Tab>."
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE_E
-#: LYMessages.c:86
+#: LYMessages.c:81
 #, c-format
 msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off (%s for editor)."
 msgstr "(Tekstgebied) Voer tekst in.  Ga weg met pijltjes of <Tab> (%s voor editor)."
 
 #. #define FORM_LINK_TEXT_UNM_MSG
-#: LYMessages.c:88
+#: LYMessages.c:83
 msgid "UNMODIFIABLE form text field.  Use UP or DOWN arrows or tab to move off."
 msgstr "ONVERANDERBAAR formuliertekstveld.  Ga weg met pijltjes of <Tab>."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE
-#: LYMessages.c:90
+#: LYMessages.c:85
 msgid "(Form field) Enter text.  Use <return> to submit."
 msgstr "(Formulierveld) Voer tekst in.  Verzend met <Enter>."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_X
-#: LYMessages.c:92
+#: LYMessages.c:87
 #, c-format
 msgid "(Form field) Enter text.  Use <return> to submit (%s for no cache)."
 msgstr "(Formulierveld) Voer tekst in.  Verzend met <Enter> (%s = geen cache)."
 
 #. #define FORM_LINK_TEXT_RESUBMIT_MESSAGE
-#: LYMessages.c:94
+#: LYMessages.c:89
 msgid "(Form field) Enter text.  Use <return> to submit, arrows or tab to move off."
 msgstr "(Form.veld) Voer tekst in.  <Enter>=verzenden, ga weg met pijltjes of <Tab>."
 
 #. #define FORM_LINK_TEXT_SUBMIT_UNM_MSG
-#: LYMessages.c:96
+#: LYMessages.c:91
 msgid "UNMODIFIABLE form field.  Use UP or DOWN arrows or tab to move off."
 msgstr "ONVERANDERBAAR formulierveld.  Ga weg met pijltjes of <Tab>."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MAILTO_MSG
-#: LYMessages.c:98
+#: LYMessages.c:93
 msgid "(mailto form field) Enter text.  Use <return> to submit, arrows to move off."
 msgstr "(E-mailformulierveld) Voer tekst in.  Verzend met <Enter>, ga weg met pijltjes."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MAILTO_DIS_MSG
-#: LYMessages.c:100
+#: LYMessages.c:95
 msgid "(mailto form field) Mail is disallowed so you cannot submit."
 msgstr "(E-mailformulierveld) Post verzenden is niet toegestaan; u kunt niets versturen."
 
 #. #define FORM_LINK_PASSWORD_MESSAGE
-#: LYMessages.c:102
+#: LYMessages.c:97
 msgid "(Password entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
 msgstr "(Wachtwoordveld) Voer tekst in.  Ga weg met pijltjes of <Tab>."
 
 #. #define FORM_LINK_PASSWORD_UNM_MSG
-#: LYMessages.c:104
+#: LYMessages.c:99
 msgid "UNMODIFIABLE form password.  Use UP or DOWN arrows or tab to move off."
 msgstr "ONVERANDERBAAR formulierwachtwoord.  Ga weg met pijltjes of <Tab>."
 
 #. #define FORM_LINK_CHECKBOX_MESSAGE
-#: LYMessages.c:106
+#: LYMessages.c:101
 msgid "(Checkbox Field)   Use right-arrow or <return> to toggle."
-msgstr "(Aanvinkveld)   Gebruik pijltje-naar-rechts of <Enter> om te veranderen."
+msgstr "(Aanvinkveld)   Gebruik pijltje-rechts of <Enter> om te veranderen."
 
 #. #define FORM_LINK_CHECKBOX_UNM_MSG
-#: LYMessages.c:108
+#: LYMessages.c:103
 msgid "UNMODIFIABLE form checkbox.  Use UP or DOWN arrows or tab to move off."
 msgstr "ONVERANDERBAAR formulieraanvinkveld.  Ga weg met pijltjes of <Tab>."
 
 #. #define FORM_LINK_RADIO_MESSAGE
-#: LYMessages.c:110
+#: LYMessages.c:105
 msgid "(Radio Button)   Use right-arrow or <return> to toggle."
-msgstr "(Drukknop)   Gebruik pijltje-naar-rechts of <Enter> om te veranderen."
+msgstr "(Drukknop)   Gebruik pijltje-rechts of <Enter> om te veranderen."
 
 #. #define FORM_LINK_RADIO_UNM_MSG
-#: LYMessages.c:112
+#: LYMessages.c:107
 msgid "UNMODIFIABLE form radio button.  Use UP or DOWN arrows or tab to move off."
 msgstr "ONVERANDERBARE formulierdrukknop.  Ga weg met pijltjes of <Tab>."
 
 #. #define FORM_LINK_SUBMIT_PREFIX
-#: LYMessages.c:114
+#: LYMessages.c:109
 msgid "Submit ('x' for no cache) to "
 msgstr "Verzenden ('x' voor geen cache) naar "
 
 #. #define FORM_LINK_RESUBMIT_PREFIX
-#: LYMessages.c:116
+#: LYMessages.c:111
 msgid "Submit to "
 msgstr "Verzenden naar "
 
 #. #define FORM_LINK_SUBMIT_MESSAGE
-#: LYMessages.c:118
+#: LYMessages.c:113
 msgid "(Form submit button) Use right-arrow or <return> to submit ('x' for no cache)."
 msgstr "(Form.verzendknop)  Verzend met pijltje-rechts of <Enter> ('x'-geen cache)."
 
 #. #define FORM_LINK_RESUBMIT_MESSAGE
-#: LYMessages.c:120
+#: LYMessages.c:115
 msgid "(Form submit button) Use right-arrow or <return> to submit."
 msgstr "(Formulierverzendknop)  Verzend met pijltje-rechts of <Enter>."
 
 #. #define FORM_LINK_SUBMIT_DIS_MSG
-#: LYMessages.c:122
+#: LYMessages.c:117
 msgid "DISABLED form submit button.  Use UP or DOWN arrows or tab to move off."
 msgstr "UITGESCHAKELDE formulierverzendknop.  Ga weg met pijltjes of <Tab>."
 
 #. #define FORM_LINK_SUBMIT_MAILTO_PREFIX
-#: LYMessages.c:124
+#: LYMessages.c:119
 msgid "Submit mailto form to "
 msgstr "E-mailformulier verzenden naar "
 
 #. #define FORM_LINK_SUBMIT_MAILTO_MSG
-#: LYMessages.c:126
+#: LYMessages.c:121
 msgid "(mailto form submit button) Use right-arrow or <return> to submit."
 msgstr "(E-mailformulierverzendknop)  Verzend met pijltje-rechts of <Enter>."
 
 #. #define FORM_LINK_SUBMIT_MAILTO_DIS_MSG
-#: LYMessages.c:128
+#: LYMessages.c:123
 msgid "(mailto form submit button) Mail is disallowed so you cannot submit."
 msgstr "(E-mailformulierverzendknop)  Post is niet toegestaan; u kunt niet verzenden."
 
 #. #define FORM_LINK_RESET_MESSAGE
-#: LYMessages.c:130
+#: LYMessages.c:125
 msgid "(Form reset button)   Use right-arrow or <return> to reset form to defaults."
 msgstr "(Formulierherstelknop)  Herstel standaardwaarden met pijltje-rechts of <Enter>."
 
 #. #define FORM_LINK_RESET_DIS_MSG
-#: LYMessages.c:132
+#: LYMessages.c:127
 msgid "DISABLED form reset button.  Use UP or DOWN arrows or tab to move off."
 msgstr "UITGESCHAKELDE formulierherstelknop.  Ga weg met pijltjes of <Tab>."
 
+#. #define FORM_LINK_BUTTON_MESSAGE
+#: LYMessages.c:129
+msgid "(Script button)   Use UP or DOWN arrows or tab to move off."
+msgstr "(Scriptknop)   Ga weg met pijl-op of -neer of <Tab>."
+
+#. #define FORM_LINK_BUTTON_DIS_MSG
+#: LYMessages.c:131
+msgid "DISABLED Script button.  Use UP or DOWN arrows or tab to move off."
+msgstr "UITGESCHAKELDE scriptknop.  Ga weg met pijl-op of -neer, of <Tab>."
+
 #. #define FORM_LINK_OPTION_LIST_MESSAGE
-#: LYMessages.c:134
+#: LYMessages.c:133
 msgid "(Option list) Hit return and use arrow keys and return to select option."
-msgstr "(Lijst van opties) Druk op <Enter>, dan pijltjes en <Enter> om te kiezen."
+msgstr "(Optielijst) Druk op <Enter>, dan pijltjes en vervolgens <Enter> om te kiezen."
 
 #. #define CHOICE_LIST_MESSAGE
-#: LYMessages.c:136
+#: LYMessages.c:135
 msgid "(Choice list) Hit return and use arrow keys and return to select option."
-msgstr "(Keuzelijst) Druk op <Enter>, dan pijltjes en <Enter> om een optie te kiezen."
+msgstr "(Keuzelijst) Druk op <Enter>, dan pijltjes en vervolgens <Enter> om een optie te kiezen."
 
 #. #define FORM_LINK_OPTION_LIST_UNM_MSG
-#: LYMessages.c:138
+#: LYMessages.c:137
 msgid "UNMODIFIABLE option list.  Use return or arrow keys to review or leave."
 msgstr "ONVERANDERBARE optielijst.  <Enter> en pijltjes om te bekijken of weg te gaan."
 
 #. #define CHOICE_LIST_UNM_MSG
-#: LYMessages.c:140
+#: LYMessages.c:139
 msgid "UNMODIFIABLE choice list.  Use return or arrow keys to review or leave."
 msgstr "ONVERANDERBARE keuzelijst.  <Enter> of pijltjes om te bekijken of weg te gaan."
 
-#: LYMessages.c:141
+#: LYMessages.c:140
 msgid "Submitting form..."
 msgstr "Verzenden van formulier..."
 
-#: LYMessages.c:142
+#: LYMessages.c:141
 msgid "Resetting form..."
 msgstr "Herstellen van oningevuld formulier..."
 
 #. #define RELOADING_FORM
-#: LYMessages.c:144
+#: LYMessages.c:143
 msgid "Reloading document.  Any form entries will be lost!"
 msgstr "Bezig document te herladen.  Alle formulierinvoer gaat verloren!"
 
+#. #define LINK_NOT_IN_FORM
 #: LYMessages.c:145
+msgid "The current link is not in a FORM"
+msgstr "De huidige koppeling zit niet in een formulier"
+
+#: LYMessages.c:146
 #, c-format
 msgid "Warning: Cannot transcode form data to charset %s!"
 msgstr "Waarschuwing: kan de formuliergegevens niet omzetten naar tekenset %s!"
 
 #. #define NORMAL_LINK_MESSAGE
-#: LYMessages.c:148
+#: LYMessages.c:149
 msgid "(NORMAL LINK)   Use right-arrow or <return> to activate."
-msgstr "(GEWONE LINK)   Activeer met pijltje-naar-rechts of <Enter>."
+msgstr "(Gewone link)   Activeer met pijltje-rechts of <Enter>."
 
-#: LYMessages.c:149
+#: LYMessages.c:150
 msgid "The resource requested is not available at this time."
 msgstr "De gevraagde hulpbron is op dit moment niet beschikbaar."
 
-#: LYMessages.c:150
+#: LYMessages.c:151
 msgid "Enter Lynx keystroke command: "
 msgstr "Voer een Lynx-sneltoetscommando in: "
 
-#: LYMessages.c:151
+#: LYMessages.c:152
 msgid "Looking up "
 msgstr "Opzoeken van "
 
-#: LYMessages.c:152
+#: LYMessages.c:153
 #, c-format
 msgid "Getting %s"
 msgstr "%s wordt opgehaald"
 
-#: LYMessages.c:153
+#: LYMessages.c:154
 #, c-format
 msgid "Skipping %s"
 msgstr "%s wordt overgeslagen"
 
-#: LYMessages.c:154
+#: LYMessages.c:155
 #, c-format
 msgid "Using %s"
 msgstr "%s wordt gebruikt"
 
-#: LYMessages.c:155
+#: LYMessages.c:156
 #, c-format
 msgid "Illegal URL: %s"
 msgstr "Ongeldige URL: %s"
 
-#: LYMessages.c:156
+#: LYMessages.c:157
 #, c-format
 msgid "Badly formed address %s"
 msgstr "Foutief adres %s"
 
-#: LYMessages.c:157
+#: LYMessages.c:158
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: LYMessages.c:158
+#: LYMessages.c:159
 msgid "Unable to access WWW file!!!"
 msgstr "Kan WWW-bestand niet vinden!!!"
 
-#: LYMessages.c:159
+#: LYMessages.c:160
 #, c-format
 msgid "This is a searchable index.  Use %s to search."
 msgstr "Deze index kan doorzocht worden.  Gebruik %s om te zoeken."
 
 #. #define WWW_INDEX_MORE_MESSAGE
-#: LYMessages.c:161
+#: LYMessages.c:162
 #, c-format
 msgid "--More--  This is a searchable index.  Use %s to search."
 msgstr "--Meer--  Deze index kan doorzocht worden.  Gebruik %s om te zoeken."
 
-#: LYMessages.c:162
+#: LYMessages.c:163
 msgid "You have entered an invalid link number."
 msgstr "U hebt een ongeldig linknummer ingevoerd."
 
 #. #define SOURCE_HELP
-#: LYMessages.c:164
+#: LYMessages.c:165
 msgid "Currently viewing document source.  Press '\\' to return to rendered version."
 msgstr "Dit is de brontekst van het document.  Druk op '\\' voor de verwerkte versie."
 
 #. #define NOVICE_LINE_ONE
-#: LYMessages.c:166
+#: LYMessages.c:167
 msgid "  Arrow keys: Up and Down to move.  Right to follow a link; Left to go back.  \n"
-msgstr "Pijltjes omhoog en omlaag=verplaatsen; Rechts=link volgen; Links=terug.\n"
+msgstr "  Pijltje-op/neer=verplaatsen; rechts=link volgen; links=terug.\n"
 
 #. #define NOVICE_LINE_TWO
-#: LYMessages.c:168
+#: LYMessages.c:169
 msgid " H)elp O)ptions P)rint G)o M)ain screen Q)uit /=search [delete]=history list \n"
-msgstr "H)elp O)pties P)rint G)a naar M)-beginscherm Q)-stop /=zoek [bkspc]=historie\n"
+msgstr " H)ulp O)pties P)rint G)a naar M)-beginscherm Q)-stop /=zoek [bkspc]=historie\n"
 
 #. #define NOVICE_LINE_TWO_A
-#: LYMessages.c:170
+#: LYMessages.c:171
 msgid "  O)ther cmds  H)elp  K)eymap  G)oto  P)rint  M)ain screen  o)ptions  Q)uit  \n"
-msgstr "O)verige cmds H)elp K)eymap G)a naar P)rint M)-beginscherm o)pties Q)-stop\n"
+msgstr "  O)verige opdr H)ulp K)eymap G)a naar P)rint M)-beginscherm o)pties Q)-stop\n"
 
 #. #define NOVICE_LINE_TWO_B
-#: LYMessages.c:172
+#: LYMessages.c:173
 msgid "  O)ther cmds  B)ack  E)dit  D)ownload ^R)eload ^W)ipe screen  search doc: / \n"
-msgstr "O)verige cmds B)-terug E)dit D)ownload ^R)-herladen ^W)is scherm  doorzoeken: /\n"
+msgstr "  O)verige opdr B)-terug E)dit D)ownload ^R)-herladen ^W)is scherm  doorzoeken: /\n"
 
 #. #define NOVICE_LINE_TWO_C
-#: LYMessages.c:174
+#: LYMessages.c:175
 msgid "O)ther cmds  C)omment  History: <backspace>  Bookmarks: V)iew, A)dd, R)emove \n"
 msgstr "O)verige C)ommentaar <backspace>-Historie Boekenleggers: V)-inzien A)-toevoegen R)-wissen\n"
 
 #. #define FORM_NOVICELINE_ONE
-#: LYMessages.c:176
+#: LYMessages.c:177
 msgid "            Enter text into the field by typing on the keyboard              "
-msgstr "Voer tekst in door te typen."
+msgstr "            Voer tekst in door te typen                                       "
 
 #. #define FORM_NOVICELINE_TWO
-#: LYMessages.c:178
+#: LYMessages.c:179
 msgid "    Ctrl-U to delete all text in field, [Backspace] to delete a character    "
-msgstr "Ctrl-U wist alle tekst in het invoerveld, [Backspace] wist één teken."
+msgstr "    Ctrl-U wist alle tekst in het invoerveld, [Backspace] wist één teken.    "
 
 #. #define FORM_NOVICELINE_TWO_DELBL
-#: LYMessages.c:180
+#: LYMessages.c:181
 msgid "      Ctrl-U to delete text in field, [Backspace] to delete a character    "
-msgstr "Ctrl-U wist tekst in het invoerveld, [Backspace] wist één teken."
+msgstr "      Ctrl-U wist tekst in het invoerveld, [Backspace] wist één teken.     "
 
 #. #define FORM_NOVICELINE_TWO_VAR
-#: LYMessages.c:182
+#: LYMessages.c:183
 #, c-format
 msgid "    %s to delete all text in field, [Backspace] to delete a character    "
 msgstr "%s wist alle tekst in het invoerveld, [Backspace] wist één teken."
 
 #. #define FORM_NOVICELINE_TWO_DELBL_VAR
-#: LYMessages.c:184
+#: LYMessages.c:185
 #, c-format
 msgid "      %s to delete text in field, [Backspace] to delete a character    "
-msgstr "%s wist tekst in het invoerveld, [Backspace] wist één teken."
+msgstr "      %s wist tekst in het invoerveld, [Backspace] wist één teken."
 
 #. mailto
-#: LYMessages.c:187
+#: LYMessages.c:188
 msgid "Malformed mailto form submission!  Cancelled!"
 msgstr "Verkeerd geformuleerde mailto-formulierverzending!  Geannuleerd!"
 
-#: LYMessages.c:188
+#: LYMessages.c:189
 msgid "Warning!  Control codes in mail address replaced by ?"
 msgstr "Waarschuwing!  Stuurcodes in mailadres zijn vervangen door ?"
 
-#: LYMessages.c:189
+#: LYMessages.c:190
 msgid "Mail disallowed!  Cannot submit."
 msgstr "U mag niet e-mailen!  Gegevens kunnen niet worden verzonden."
 
-#: LYMessages.c:190
+#: LYMessages.c:191
 msgid "Mailto form submission failed!"
 msgstr "Mailto-formulierverzending is mislukt!"
 
-#: LYMessages.c:191
+#: LYMessages.c:192
 msgid "Mailto form submission Cancelled!!!"
 msgstr "Mailto-formulierverzending is geannuleerd!"
 
-#: LYMessages.c:192
+#: LYMessages.c:193
 msgid "Sending form content..."
 msgstr "Gegevens worden verzonden..."
 
-#: LYMessages.c:193
+#: LYMessages.c:194
 msgid "No email address is present in mailto URL!"
 msgstr "Er staat geen e-mailadres in de mailto-URL!"
 
 #. #define MAILTO_URL_TEMPOPEN_FAILED
-#: LYMessages.c:195
+#: LYMessages.c:196
 msgid "Unable to open temporary file for mailto URL!"
 msgstr "Kan geen tijdelijk bestand voor mailto-URL openen!"
 
 #. #define INC_ORIG_MSG_PROMPT
-#: LYMessages.c:197
+#: LYMessages.c:198
 msgid "Do you wish to include the original message?"
 msgstr "Wilt u het originele bericht opnemen?"
 
 #. #define INC_PREPARSED_MSG_PROMPT
-#: LYMessages.c:199
+#: LYMessages.c:200
 msgid "Do you wish to include the preparsed source?"
 msgstr "Wilt u de voorverwerkte brontekst opnemen?"
 
 #. #define SPAWNING_EDITOR_FOR_MAIL
-#: LYMessages.c:201
+#: LYMessages.c:202
 msgid "Spawning your selected editor to edit mail message"
 msgstr "Uw editor wordt gestart om het e-mailbericht te maken"
 
 #. #define ERROR_SPAWNING_EDITOR
-#: LYMessages.c:203
+#: LYMessages.c:204
 msgid "Error spawning editor, check your editor definition in the options menu"
 msgstr "De editor wil niet starten; controleer de instellingen in het Optiesmenu"
 
-#: LYMessages.c:204
+#: LYMessages.c:205
 msgid "Send this comment?"
 msgstr "Dit commentaar verzenden?"
 
-#: LYMessages.c:205
+#: LYMessages.c:206
 msgid "Send this message?"
 msgstr "Dit bericht verzenden?"
 
-#: LYMessages.c:206
+#: LYMessages.c:207
 msgid "Sending your message..."
 msgstr "Uw bericht wordt verzonden..."
 
-#: LYMessages.c:207
+#: LYMessages.c:208
 msgid "Sending your comment:"
 msgstr "Uw commentaar wordt verzonden:"
 
 #. textarea
-#: LYMessages.c:210
+#: LYMessages.c:211
 msgid "Not in a TEXTAREA; cannot use external editor."
 msgstr "Niet in een TEKSTVELD; kan geen externe editor gebruiken."
 
-#: LYMessages.c:211
+#: LYMessages.c:212
 msgid "Not in a TEXTAREA; cannot use command."
 msgstr "Niet in een TEKSTVELD; dit commando heeft hier geen zin."
 
-#: LYMessages.c:213
+#: LYMessages.c:214
 msgid "file: ACTIONs are disallowed!"
 msgstr "bestand: ACTIEs zijn niet toegestaan!"
 
 #. #define FILE_SERVED_LINKS_DISALLOWED
-#: LYMessages.c:215
+#: LYMessages.c:216
 msgid "file: URLs via served links are disallowed!"
 msgstr "bestand: URL's via aangeboden links zijn niet toegestaan!"
 
-#: LYMessages.c:216
+#: LYMessages.c:217
 msgid "Access to local files denied."
 msgstr "Toegang tot lokale bestanden is geweigerd."
 
-#: LYMessages.c:217
+#: LYMessages.c:218
 msgid "file: URLs via bookmarks are disallowed!"
 msgstr "bestand: URL's via boekenleggers zijn niet toegestaan!"
 
 #. #define SPECIAL_VIA_EXTERNAL_DISALLOWED
-#: LYMessages.c:219
+#: LYMessages.c:220
 msgid "This special URL is not allowed in external documents!"
 msgstr "Deze specifieke URL is niet toegestaan in externe documenten!"
 
-#: LYMessages.c:220
+#: LYMessages.c:221
 msgid "Press <return> to return to Lynx."
 msgstr "Druk op <Enter> om terug te keren naar Lynx."
 
 #. #define SPAWNING_MSG
-#: LYMessages.c:223
+#: LYMessages.c:224
 msgid "Spawning DCL subprocess.  Use 'logout' to return to Lynx.\n"
 msgstr "DCL-subproces wordt gestart.  Gebruik 'logout' om terug te keren naar Lynx.\n"
 
 #. #define SPAWNING_MSG
-#: LYMessages.c:227
+#: LYMessages.c:228
 msgid "Type EXIT to return to Lynx.\n"
 msgstr "Typ 'exit' om terug te keren naar Lynx.\n"
 
 #. #define SPAWNING_MSG
-#: LYMessages.c:230
+#: LYMessages.c:231
 msgid "Spawning your default shell.  Use 'exit' to return to Lynx.\n"
 msgstr "Uw standaardshell wordt aangeroepen.  Typ 'exit' om terug te keren naar Lynx.\n"
 
-#: LYMessages.c:233
+#: LYMessages.c:234
 msgid "Spawning is currently disabled."
 msgstr "Het starten van externe programma's is uitgeschakeld."
 
-#: LYMessages.c:234
+#: LYMessages.c:235
 msgid "The 'd'ownload command is currently disabled."
 msgstr "Het 'd'ownload-commando is momenteel uitgeschakeld."
 
-#: LYMessages.c:235
+#: LYMessages.c:236
 msgid "You cannot download an input field."
 msgstr "U kunt niet downloaden in een invoerveld."
 
-#: LYMessages.c:236
+#: LYMessages.c:237
 msgid "Form has a mailto action!  Cannot download."
 msgstr "Formulier heeft een mailto-actie!  Kan niet downloaden."
 
-#: LYMessages.c:237
+#: LYMessages.c:238
 msgid "You cannot download a mailto: link."
 msgstr "U kunt een 'mailto:'-koppeling niet downloaden."
 
-#: LYMessages.c:238
+#: LYMessages.c:239
 msgid "You cannot download cookies."
 msgstr "U kunt koekjes niet downloaden."
 
-#: LYMessages.c:239
+#: LYMessages.c:240
 msgid "You cannot download a printing option."
 msgstr "U kunt een printopdracht niet downloaden."
 
-#: LYMessages.c:240
+#: LYMessages.c:241
 msgid "You cannot download an upload option."
 msgstr "U kunt een upload-optie niet downloaden."
 
-#: LYMessages.c:241
+#: LYMessages.c:242
 msgid "You cannot download an permit option."
 msgstr "U kunt een toestemmingsoptie niet downloaden."
 
-#: LYMessages.c:242
+#: LYMessages.c:243
 msgid "This special URL cannot be downloaded!"
 msgstr "Deze specifieke URL kan niet worden gedownload!"
 
-#: LYMessages.c:243
+#: LYMessages.c:244
 msgid "Nothing to download."
 msgstr "Er is niets om te downloaden."
 
-#: LYMessages.c:244
+#: LYMessages.c:245
 msgid "Trace ON!"
 msgstr "Traceren AAN!"
 
-#: LYMessages.c:245
+#: LYMessages.c:246
 msgid "Trace OFF!"
 msgstr "Traceren UIT!"
 
 #. #define CLICKABLE_IMAGES_ON
-#: LYMessages.c:247
+#: LYMessages.c:248
 msgid "Links will be included for all images!  Reloading..."
 msgstr "Links voor alle afbeeldingen worden opgenomen!  Herladen..."
 
 #. #define CLICKABLE_IMAGES_OFF
-#: LYMessages.c:249
+#: LYMessages.c:250
 msgid "Standard image handling restored!  Reloading..."
 msgstr "Normale afhandeling van afbeeldingen is hersteld!  Herladen..."
 
 #. #define PSEUDO_INLINE_ALTS_ON
-#: LYMessages.c:251
+#: LYMessages.c:252
 msgid "Pseudo_ALTs will be inserted for inlines without ALT strings!  Reloading..."
 msgstr "Pseudo-ALT's worden ingevoegd voor inlines zonder ALT-strings!  Herladen..."
 
 #. #define PSEUDO_INLINE_ALTS_OFF
-#: LYMessages.c:253
+#: LYMessages.c:254
 msgid "Inlines without an ALT string specified will be ignored!  Reloading..."
 msgstr "Inlines zonder ALT-strings worden genegeerd!  Herladen..."
 
-#: LYMessages.c:254
+#: LYMessages.c:255
 msgid "Raw 8-bit or CJK mode toggled OFF!  Reloading..."
 msgstr "Ruwe 8-bit- of CJK-modus is UITgezet!  Herladen..."
 
-#: LYMessages.c:255
+#: LYMessages.c:256
 msgid "Raw 8-bit or CJK mode toggled ON!  Reloading..."
 msgstr "Ruwe 8-bit- of CJK-modus is AANgezet!  Herladen..."
 
 #. #define HEAD_D_L_OR_CANCEL
-#: LYMessages.c:257
+#: LYMessages.c:258
 msgid "Send HEAD request for D)ocument or L)ink, or C)ancel? (d,l,c): "
 msgstr "'HEAD'-verzoek verzenden voor D)ocument, L)ink of C)-annuleren? (d,l,c): "
 
 #. #define HEAD_D_OR_CANCEL
-#: LYMessages.c:259
+#: LYMessages.c:260
 msgid "Send HEAD request for D)ocument, or C)ancel? (d,c): "
 msgstr "'HEAD'-verzoek verzenden voor D)ocument of C)-annuleren? (d,c): "
 
-#: LYMessages.c:260
+#: LYMessages.c:261
 msgid "Sorry, the document is not an http URL."
 msgstr "Sorry, het document is geen http-URL."
 
-#: LYMessages.c:261
+#: LYMessages.c:262
 msgid "Sorry, the link is not an http URL."
 msgstr "Sorry, de link is geen http-URL."
 
-#: LYMessages.c:262
+#: LYMessages.c:263
 msgid "Sorry, the ACTION for this form is disabled."
 msgstr "Sorry, de ACTIE voor dit formulier is uitgeschakeld."
 
 #. #define FORM_ACTION_NOT_HTTP_URL
-#: LYMessages.c:264
+#: LYMessages.c:265
 msgid "Sorry, the ACTION for this form is not an http URL."
 msgstr "Sorry, de ACTIE voor dit formulier is geen http-URL."
 
-#: LYMessages.c:265
+#: LYMessages.c:266
 msgid "Not an http URL or form ACTION!"
 msgstr "Niet een http-URL of formulier-ACTIE!"
 
-#: LYMessages.c:266
+#: LYMessages.c:267
 msgid "This special URL cannot be a form ACTION!"
 msgstr "Deze specifieke URL kan geen formulier-ACTIE zijn!"
 
-#: LYMessages.c:267
+#: LYMessages.c:268
 msgid "URL is not in starting realm!"
 msgstr "URL is niet in begin-omgeving!"
 
-#: LYMessages.c:268
+#: LYMessages.c:269
 msgid "News posting is disabled!"
 msgstr "Nieuwsberichten zenden is uitgeschakeld!"
 
-#: LYMessages.c:269
+#: LYMessages.c:270
 msgid "File management support is disabled!"
 msgstr "Bestandsbeheer is uitgeschakeld!"
 
-#: LYMessages.c:270
+#: LYMessages.c:271
 msgid "No jump file is currently available."
 msgstr "Er is momenteel geen snelkoppelingenbestand beschikbaar."
 
-#: LYMessages.c:271
+#: LYMessages.c:272
 msgid "Jump to (use '?' for list): "
 msgstr "Spring naar ('?' toont een lijst): "
 
-#: LYMessages.c:272
+#: LYMessages.c:273
 msgid "Jumping to a shortcut URL is disallowed!"
 msgstr "Springen naar een snelkoppeling-URL is niet toegestaan!"
 
-#: LYMessages.c:273
+#: LYMessages.c:274
 msgid "Random URL is disallowed!  Use a shortcut."
 msgstr "Willekeurige URL is niet toegestaan!  Gebruik een sneltoets."
 
-#: LYMessages.c:274
+#: LYMessages.c:275
 msgid "No random URLs have been used thus far."
 msgstr "Tot nog toe zijn er geen willeukeurige URL's gebruikt."
 
-#: LYMessages.c:275
+#: LYMessages.c:276
 msgid "Bookmark features are currently disabled."
 msgstr "Boekenleggerfuncties zijn momenteel uitgeschakeld."
 
-#: LYMessages.c:276
+#: LYMessages.c:277
 msgid "Execution via bookmarks is disabled."
 msgstr "Uitvoeren via boekenleggers is uitgeschakeld."
 
 #. #define BOOKMARK_FILE_NOT_DEFINED
-#: LYMessages.c:278
+#: LYMessages.c:279
 #, c-format
 msgid "Bookmark file is not defined. Use %s to see options."
 msgstr "Boekenleggerbestand is niet opgegeven.  Gebruik %s om de opties te zien."
 
 #. #define NO_TEMP_FOR_HOTLIST
-#: LYMessages.c:280
+#: LYMessages.c:281
 msgid "Unable to open tempfile for X Mosaic hotlist conversion."
 msgstr "Kan geen tijdelijk bestand openen voor 'X Mosaic hotlist'-conversie."
 
-#: LYMessages.c:281
+#: LYMessages.c:282
 msgid "ERROR - unable to open bookmark file."
 msgstr "FOUT -- Kan boekenleggerbestand niet openen."
 
 #. #define BOOKMARK_OPEN_FAILED_FOR_DEL
-#: LYMessages.c:283
+#: LYMessages.c:284
 msgid "Unable to open bookmark file for deletion of link."
 msgstr "Kan boekenleggerbestand niet openen om link te verwijderen."
 
 #. #define BOOKSCRA_OPEN_FAILED_FOR_DEL
-#: LYMessages.c:285
+#: LYMessages.c:286
 msgid "Unable to open scratch file for deletion of link."
 msgstr "Kan geen kladbestand openen om link te verwijderen."
 
-#: LYMessages.c:287
+#: LYMessages.c:288
 msgid "Error renaming scratch file."
 msgstr "Fout bij het hernoemen van kladbestand."
 
-#: LYMessages.c:289
+#: LYMessages.c:290
 msgid "Error renaming temporary file."
 msgstr "Fout bij het hernoemen van tijdelijk bestand."
 
 #. #define BOOKTEMP_COPY_FAIL
-#: LYMessages.c:291
+#: LYMessages.c:292
 msgid "Unable to copy temporary file for deletion of link."
 msgstr "Kan tijdelijk bestand niet kopiëren om link te verwijderen."
 
 #. #define BOOKTEMP_REOPEN_FAIL_FOR_DEL
-#: LYMessages.c:293
+#: LYMessages.c:294
 msgid "Unable to reopen temporary file for deletion of link."
 msgstr "Kan tijdelijk bestand niet heropenen om link te verwijderen."
 
 #. #define BOOKMARK_LINK_NOT_ONE_LINE
-#: LYMessages.c:296
+#: LYMessages.c:297
 msgid "Link is not by itself all on one line in bookmark file."
 msgstr "De link gebruikt meer dan één regel in het boekenleggerbestand."
 
-#: LYMessages.c:297
+#: LYMessages.c:298
 msgid "Bookmark deletion failed."
 msgstr "Wissen van boekenlegger is mislukt."
 
 #. #define BOOKMARKS_NOT_TRAVERSED
-#: LYMessages.c:299
+#: LYMessages.c:300
 msgid "Bookmark files cannot be traversed (only http URLs)."
 msgstr "Boekenleggerbestanden kunnen niet doorkruist worden (alleen http-URL's)."
 
 #. #define BOOKMARKS_NOT_OPEN
-#: LYMessages.c:301
+#: LYMessages.c:302
 msgid "Unable to open bookmark file, use 'a' to save a link first"
 msgstr "Kan boekenleggerbestand niet openen; gebruik 'a' om de link eerst op te slaan"
 
-#: LYMessages.c:302
+#: LYMessages.c:303
 msgid "There are no links in this bookmark file!"
 msgstr "Er zijn geen links in dit boekenleggerbestand!"
 
 #. #define CACHE_D_OR_CANCEL
-#: LYMessages.c:304
+#: LYMessages.c:305
 msgid "D)elete cached document or C)ancel? (d,c): "
 msgstr "Gecachet document D)-verwijderen of C)-annuleren? (d,c): "
 
 #. #define BOOK_D_L_OR_CANCEL
-#: LYMessages.c:306
+#: LYMessages.c:307
 msgid "Save D)ocument or L)ink to bookmark file or C)ancel? (d,l,c): "
 msgstr "Opslaan in boekenleggerbestand: D)ocument, L)ink of C)-annuleren? (d,l,c): "
 
-#: LYMessages.c:307
+#: LYMessages.c:308
 msgid "Save D)ocument to bookmark file or C)ancel? (d,c): "
 msgstr "Opslaan in boekenleggerbestand: D)ocument of C)-annuleren? (d,c): "
 
-#: LYMessages.c:308
+#: LYMessages.c:309
 msgid "Save L)ink to bookmark file or C)ancel? (l,c): "
 msgstr "Opslaan in boekenleggerbestand: L)ink of C)-annuleren? (l,c): "
 
 #. #define NOBOOK_POST_FORM
-#: LYMessages.c:310
+#: LYMessages.c:311
 msgid "Documents from forms with POST content cannot be saved as bookmarks."
 msgstr "Kan geen boekenlegger maken van document van formulier met POST-informatie."
 
-#: LYMessages.c:311
+#: LYMessages.c:312
 msgid "Cannot save form fields/links"
 msgstr "Kan formuliervelden/links niet opslaan"
 
 #. #define NOBOOK_HSML
-#: LYMessages.c:313
+#: LYMessages.c:314
 msgid "History, showinfo, menu and list files cannot be saved as bookmarks."
 msgstr "Kan geen boekenleggers maken van historie, info-overzicht, menu of lijsten."
 
 #. #define CONFIRM_BOOKMARK_DELETE
-#: LYMessages.c:315
+#: LYMessages.c:316
 msgid "Do you really want to delete this link from your bookmark file?"
 msgstr "Deze link echt uit het boekenleggerbestand verwijderen?"
 
-#: LYMessages.c:316
+#: LYMessages.c:317
 msgid "Malformed address."
 msgstr "Ongeldig adres."
 
 #. #define HISTORICAL_ON_MINIMAL_OFF
-#: LYMessages.c:318
+#: LYMessages.c:319
 msgid "Historical comment parsing ON (Minimal is overridden)!"
 msgstr "Oorspronkelijke commentaarverwerking AAN (Minimale methode is onderdrukt)!"
 
 #. #define HISTORICAL_OFF_MINIMAL_ON
-#: LYMessages.c:320
+#: LYMessages.c:321
 msgid "Historical comment parsing OFF (Minimal is in effect)!"
 msgstr "Oorspronkelijke commentaarverwerking UIT (Minimale methode is actief)!"
 
 #. #define HISTORICAL_ON_VALID_OFF
-#: LYMessages.c:322
+#: LYMessages.c:323
 msgid "Historical comment parsing ON (Valid is overridden)!"
 msgstr "Oorspronkelijke commentaarverwerking AAN (Geldige methode is onderdrukt)!"
 
 #. #define HISTORICAL_OFF_VALID_ON
-#: LYMessages.c:324
+#: LYMessages.c:325
 msgid "Historical comment parsing OFF (Valid is in effect)!"
 msgstr "Oorspronkelijke commentaarverwerking UIT (Geldige methode is actief)!"
 
 #. #define MINIMAL_ON_IN_EFFECT
-#: LYMessages.c:326
+#: LYMessages.c:327
 msgid "Minimal comment parsing ON (and in effect)!"
 msgstr "Minimale verwerking van commentaar AAN (en actief)!"
 
 #. #define MINIMAL_OFF_VALID_ON
-#: LYMessages.c:328
+#: LYMessages.c:329
 msgid "Minimal comment parsing OFF (Valid is in effect)!"
 msgstr "Minimale verwerking van commentaar UIT (Geldige methode is actief)!"
 
 #. #define MINIMAL_ON_BUT_HISTORICAL
-#: LYMessages.c:330
+#: LYMessages.c:331
 msgid "Minimal comment parsing ON (but Historical is in effect)!"
 msgstr "Minimale verwerking van commentaar AAN (Oorspronkelijke methode is actief)!"
 
 #. #define MINIMAL_OFF_HISTORICAL_ON
-#: LYMessages.c:332
+#: LYMessages.c:333
 msgid "Minimal comment parsing OFF (Historical is in effect)!"
 msgstr "Minimale verwerking van commentaar UIT (Oorspronkelijke methode is actief)!"
 
-#: LYMessages.c:333
+#: LYMessages.c:334
 msgid "Soft double-quote parsing ON!"
 msgstr "'Soft double-quote' ontleden AAN!"
 
-#: LYMessages.c:334
+#: LYMessages.c:335
 msgid "Soft double-quote parsing OFF!"
 msgstr "'Soft double-quote' ontleden UIT!"
 
-#: LYMessages.c:335
+#: LYMessages.c:336
 msgid "Now using TagSoup parsing of HTML."
 msgstr "Vanaf nu wordt 'TagSoup' gebruikt om HTML te ontleden."
 
-#: LYMessages.c:336
+#: LYMessages.c:337
 msgid "Now using SortaSGML parsing of HTML!"
 msgstr "Vanaf nu wordt 'SortaSGML' gebruikt om HTML te ontleden."
 
-#: LYMessages.c:337
+#: LYMessages.c:338
 msgid "You are already at the end of this document."
 msgstr "Dit is het einde van het document."
 
-#: LYMessages.c:338
+#: LYMessages.c:339
 msgid "You are already at the beginning of this document."
 msgstr "Dit is het begin van het document."
 
-#: LYMessages.c:339
+#: LYMessages.c:340
 #, c-format
 msgid "You are already at page %d of this document."
 msgstr "Dit is pagina %d van dit document."
 
-#: LYMessages.c:340
+#: LYMessages.c:341
 #, c-format
 msgid "Link number %d already is current."
 msgstr "Linknummer %d is al geselecteerd."
 
-#: LYMessages.c:341
+#: LYMessages.c:342
 msgid "You are already at the first document"
 msgstr "Dit is het eerste document."
 
-#: LYMessages.c:342
+#: LYMessages.c:343
 msgid "There are no links above this line of the document."
 msgstr "Boven deze regel zijn er geen links in dit document."
 
-#: LYMessages.c:343
+#: LYMessages.c:344
 msgid "There are no links below this line of the document."
 msgstr "Beneden deze regel zijn er geen links in dit document."
 
 #. #define MAXLEN_REACHED_DEL_OR_MOV
-#: LYMessages.c:345
+#: LYMessages.c:346
 msgid "Maximum length reached!  Delete text or move off field."
 msgstr "Maximale lengte is bereikt!  Verwijder tekst of ga hier weg."
 
 #. #define NOT_ON_SUBMIT_OR_LINK
-#: LYMessages.c:347
+#: LYMessages.c:348
 msgid "You are not on a form submission button or normal link."
 msgstr "U staat niet op een formulierverzendknop of op een normale link."
 
 #. #define NEED_CHECKED_RADIO_BUTTON
-#: LYMessages.c:349
+#: LYMessages.c:350
 msgid "One radio button must be checked at all times!"
 msgstr "Er moet altijd één drukknop ingedrukt zijn!"
 
-#: LYMessages.c:350
+#: LYMessages.c:351
 msgid "No submit button for this form, submit single text field?"
 msgstr "Geen invoerknop aanwezig voor dit formulier; het enige tekstveld verzenden?"
 
-#: LYMessages.c:351
+#: LYMessages.c:352
 msgid "Do you want to go back to the previous document?"
 msgstr "Wilt u teruggaan naar het vorige document?"
 
-#: LYMessages.c:352
+#: LYMessages.c:353
 msgid "Use arrows or tab to move off of field."
 msgstr "Gebruik pijltjes of <Tab> om weg te gaan van dit veld."
 
 #. #define ENTER_TEXT_ARROWS_OR_TAB
-#: LYMessages.c:354
+#: LYMessages.c:355
 msgid "Enter text.  Use arrows or tab to move off of field."
 msgstr "Voer tekst in.  Ga weg met pijltjes of <Tab>."
 
-#: LYMessages.c:355
+#: LYMessages.c:356
 msgid "** Bad HTML!!  No form action defined. **"
 msgstr "** Onjuiste HTML!!  Geen formulieractie gedefinieerd. **"
 
-#: LYMessages.c:356
+#: LYMessages.c:357
 msgid "Bad HTML!!  Unable to create popup window!"
 msgstr "Onjuiste HTML!!  Kan geen popup-venster aanmaken!"
 
-#: LYMessages.c:357
+#: LYMessages.c:358
 msgid "Unable to create popup window!"
 msgstr "Kan geen popup-venster aanmaken!"
 
-#: LYMessages.c:358
+#: LYMessages.c:359
 msgid "Goto a random URL is disallowed!"
 msgstr "Naar een willekeurige URL gaan is niet toegestaan!"
 
-#: LYMessages.c:359
+#: LYMessages.c:360
 msgid "Goto a non-http URL is disallowed!"
 msgstr "Naar een niet-http-URL gaan is niet toegestaan!"
 
-#: LYMessages.c:360
+#: LYMessages.c:361
 #, c-format
 msgid "You are not allowed to goto \"%s\" URLs"
 msgstr "Het is niet toegestaan naar \"%s\"-URL's te gaan"
 
-#: LYMessages.c:361
+#: LYMessages.c:362
 msgid "URL to open: "
 msgstr "Te openen URL: "
 
-#: LYMessages.c:362
+#: LYMessages.c:363
 msgid "Edit the current Goto URL: "
 msgstr "Wijzig de huidige Ga-naar URL: "
 
-#: LYMessages.c:363
+#: LYMessages.c:364
 msgid "Edit the previous Goto URL: "
 msgstr "Wijzig de vorige Ga-naar URL: "
 
-#: LYMessages.c:364
+#: LYMessages.c:365
 msgid "Edit a previous Goto URL: "
 msgstr "Wijzig een voorgaande Ga-naar URL: "
 
-#: LYMessages.c:365
+#: LYMessages.c:366
 msgid "Current document has POST data."
 msgstr "Huidige document bevat geen POST-informatie."
 
-#: LYMessages.c:366
+#: LYMessages.c:367
 msgid "Edit this document's URL: "
 msgstr "Wijzig de URL van dit document: "
 
-#: LYMessages.c:367
+#: LYMessages.c:368
 msgid "Edit the current link's URL: "
 msgstr "Wijzig de URL van de huidige link: "
 
-#: LYMessages.c:368
+#: LYMessages.c:369
+msgid "Edit the form's submit-URL: "
+msgstr "Wijzig het verzendadres van dit formulier: "
+
+#: LYMessages.c:370
 msgid "You cannot edit File Management URLs"
-msgstr "U kunt Bestandsbeheer-URL's niet wijzigen"
+msgstr "U kunt Bestandsbeheeradressen niet wijzigen"
 
-#: LYMessages.c:369
+#: LYMessages.c:371
 msgid "Enter a database query: "
 msgstr "Voer een databankopdracht in: "
 
-#: LYMessages.c:370
+#: LYMessages.c:372
 msgid "Enter a whereis query: "
 msgstr "Voer een zoekopdracht in: "
 
-#: LYMessages.c:371
+#: LYMessages.c:373
 msgid "Edit the current query: "
 msgstr "Wijzig de huidige opdracht: "
 
-#: LYMessages.c:372
+#: LYMessages.c:374
 msgid "Edit the previous query: "
 msgstr "Wijzig de vorige opdracht: "
 
-#: LYMessages.c:373
+#: LYMessages.c:375
 msgid "Edit a previous query: "
 msgstr "Wijzig een voorgaande opdracht: "
 
 #. #define USE_C_R_TO_RESUB_CUR_QUERY
-#: LYMessages.c:375
+#: LYMessages.c:377
 msgid "Use Control-R to resubmit the current query."
 msgstr "Gebruik Ctrl-R om de huidige opdracht nog eens te verzenden."
 
-#: LYMessages.c:376
+#: LYMessages.c:378
 msgid "Edit the current shortcut: "
 msgstr "Wijzig de huidige snelkoppeling: "
 
-#: LYMessages.c:377
+#: LYMessages.c:379
 msgid "Edit the previous shortcut: "
 msgstr "Wijzig de vorige snelkoppeling: "
 
-#: LYMessages.c:378
+#: LYMessages.c:380
 msgid "Edit a previous shortcut: "
 msgstr "Wijzig een voorgaande snelkoppeling: "
 
-#: LYMessages.c:379
+#: LYMessages.c:381
 #, c-format
 msgid "Key '%c' is not mapped to a jump file!"
 msgstr "Toets '%c' is niet gebonden aan een snelkoppelingenbestand!"
 
-#: LYMessages.c:380
+#: LYMessages.c:382
 msgid "Cannot locate jump file!"
 msgstr "Kan snelkoppelingenbestand niet vinden!"
 
-#: LYMessages.c:381
+#: LYMessages.c:383
 msgid "Cannot open jump file!"
 msgstr "Kan snelkoppelingenbestand niet openen!"
 
-#: LYMessages.c:382
+#: LYMessages.c:384
 msgid "Error reading jump file!"
 msgstr "Fout bij lezen van snelkoppelingenbestand!"
 
-#: LYMessages.c:383
+#: LYMessages.c:385
 msgid "Out of memory reading jump file!"
 msgstr "Geen geheugen meer beschikbaar tijdens lezen van snelkoppelingenbestand!"
 
-#: LYMessages.c:384
+#: LYMessages.c:386
 msgid "Out of memory reading jump table!"
 msgstr "Geen geheugen meer beschikbaar tijdens lezen van snelkoppelingentabel!"
 
-#: LYMessages.c:385
+#: LYMessages.c:387
 msgid "No index is currently available."
 msgstr "Er is momenteel geen index beschikbaar."
 
 #. #define CONFIRM_MAIN_SCREEN
-#: LYMessages.c:387
+#: LYMessages.c:389
 msgid "Do you really want to go to the Main screen?"
 msgstr "Wilt u echt naar het beginscherm gaan?"
 
-#: LYMessages.c:388
+#: LYMessages.c:390
 msgid "You are already at main screen!"
 msgstr "U bent al in het beginscherm!"
 
 #. #define NOT_ISINDEX
-#: LYMessages.c:390
+#: LYMessages.c:392
 msgid "Not a searchable indexed document -- press '/' to search for a text string"
 msgstr "Dit is geen geïndexeerd document -- gebruik '/' om een tekenreeks te zoeken"
 
 #. #define NO_OWNER
-#: LYMessages.c:392
+#: LYMessages.c:394
 msgid "No owner is defined for this file so you cannot send a comment"
 msgstr "Er is geen eigenaar genoemd voor dit bestand, dus u kunt geen commentaar zenden"
 
-#: LYMessages.c:393
+#: LYMessages.c:395
 #, c-format
 msgid "No owner is defined. Use %s?"
 msgstr "Er is geen eigenaar gedefinieerd.  %s gebruiken?"
 
-#: LYMessages.c:394
+#: LYMessages.c:396
 msgid "Do you wish to send a comment?"
 msgstr "Wilt u commentaar versturen?"
 
-#: LYMessages.c:395
+#: LYMessages.c:397
 msgid "Mail is disallowed so you cannot send a comment"
 msgstr "E-mail is niet toegestaan, dus u kunt geen commentaar zenden"
 
-#: LYMessages.c:396
+#: LYMessages.c:398
 msgid "The 'e'dit command is currently disabled."
 msgstr "Het 'e'dit-commando is momenteel uitgeschakeld."
 
-#: LYMessages.c:397
+#: LYMessages.c:399
 msgid "External editing is currently disabled."
 msgstr "Extern editen is momenteel uitgeschakeld."
 
-#: LYMessages.c:398
+#: LYMessages.c:400
 msgid "System error - failure to get status."
 msgstr "Systeemfout -- status opvragen is mislukt."
 
-#: LYMessages.c:399
+#: LYMessages.c:401
 msgid "No editor is defined!"
 msgstr "Er is geen editor opgegeven!"
 
-#: LYMessages.c:400
+#: LYMessages.c:402
 msgid "The 'p'rint command is currently disabled."
 msgstr "Het 'p'rint-commando is momenteel uitgeschakeld."
 
-#: LYMessages.c:401
+#: LYMessages.c:403
 msgid "Document has no Toolbar links or Banner."
 msgstr "Het document heeft geen Werkbalk-links of koptekst."
 
-#: LYMessages.c:402
+#: LYMessages.c:404
 msgid "Unable to open traversal file."
 msgstr "Kan bestand met doorkruisingen niet openen."
 
-#: LYMessages.c:403
+#: LYMessages.c:405
 msgid "Unable to open traversal found file."
 msgstr "Kan bestand met gevonden doorkruisingen niet openen."
 
-#: LYMessages.c:404
+#: LYMessages.c:406
 msgid "Unable to open reject file."
 msgstr "Kan bestand met verwerpingen niet openen."
 
-#: LYMessages.c:405
+#: LYMessages.c:407
 msgid "Unable to open traversal errors output file"
 msgstr "Kan bestand met fouten van doorkruisingen niet vinden"
 
-#: LYMessages.c:406
+#: LYMessages.c:408
 msgid "TRAVERSAL WAS INTERRUPTED"
 msgstr "DOORKRUISING WERD ONDERBROKEN"
 
-#: LYMessages.c:407
+#: LYMessages.c:409
 msgid "Follow link (or goto link or page) number: "
 msgstr "Volg link (of ga naar link of pagina) met nummer: "
 
-#: LYMessages.c:408
+#: LYMessages.c:410
 msgid "Select option (or page) number: "
 msgstr "Selecteer optie (of pagina) met nummer: "
 
-#: LYMessages.c:409
+#: LYMessages.c:411
 #, c-format
 msgid "Option number %d already is current."
 msgstr "Optienummer %d is al het huidige."
 
 #. #define ALREADY_AT_OPTION_END
-#: LYMessages.c:411
+#: LYMessages.c:413
 msgid "You are already at the end of this option list."
 msgstr "Dit is het einde van deze optielijst."
 
 #. #define ALREADY_AT_OPTION_BEGIN
-#: LYMessages.c:413
+#: LYMessages.c:415
 msgid "You are already at the beginning of this option list."
 msgstr "Dit is het begin van deze optielijst."
 
 #. #define ALREADY_AT_OPTION_PAGE
-#: LYMessages.c:415
+#: LYMessages.c:417
 #, c-format
 msgid "You are already at page %d of this option list."
 msgstr "Dit is pagina %d van deze optielijst."
 
-#: LYMessages.c:416
+#: LYMessages.c:418
 msgid "You have entered an invalid option number."
 msgstr "U hebt een ongeldig optienummer ingevoerd."
 
-#: LYMessages.c:417
+#: LYMessages.c:419
 msgid "** Bad HTML!!  Use -trace to diagnose. **"
 msgstr "** Ongeldige HTML!!  Gebruik -trace om een diagnose op te maken. **"
 
-#: LYMessages.c:418
+#: LYMessages.c:420
 msgid "Give name of file to save in"
 msgstr "Voer de naam in van het bestand om in op te slaan"
 
-#: LYMessages.c:419
+#: LYMessages.c:421
 msgid "Can't save data to file -- please run WWW locally"
 msgstr "Kan gegevens niet opslaan in bestand -- draai WWW lokaal"
 
-#: LYMessages.c:420
+#: LYMessages.c:422
 msgid "Can't open temporary file!"
 msgstr "Kan tijdelijk bestand niet openen!"
 
-#: LYMessages.c:421
+#: LYMessages.c:423
 msgid "Can't open output file!  Cancelling!"
 msgstr "Kan uitvoerbestand niet openen!  Bezig met annuleren!"
 
-#: LYMessages.c:422
+#: LYMessages.c:424
 msgid "Execution is disabled."
 msgstr "Uitvoeren is uitgeschakeld."
 
 #. #define EXECUTION_DISABLED_FOR_FILE
-#: LYMessages.c:424
+#: LYMessages.c:426
 #, c-format
 msgid "Execution is not enabled for this file.  See the Options menu (use %s)."
 msgstr "Uitvoeren is niet aangezet voor dit bestand.  Zie het Optiesmenu (gebruik %s)."
 
 #. #define EXECUTION_NOT_COMPILED
-#: LYMessages.c:426
+#: LYMessages.c:428
 msgid "Execution capabilities are not compiled into this version."
 msgstr "Uitvoermogelijkheden zijn niet ingebouwd in deze versie."
 
-#: LYMessages.c:427
+#: LYMessages.c:429
 msgid "This file cannot be displayed on this terminal."
 msgstr "Dit bestand kan niet op deze terminal getoond worden."
 
 #. #define CANNOT_DISPLAY_FILE_D_OR_C
-#: LYMessages.c:429
+#: LYMessages.c:431
 msgid "This file cannot be displayed on this terminal:  D)ownload, or C)ancel"
 msgstr "Dit bestand kan niet op deze terminal getoond worden:  D)ownload, C)-annuleren"
 
-#: LYMessages.c:430
+#: LYMessages.c:432
 #, c-format
 msgid "%s  D)ownload, or C)ancel"
 msgstr "%s  D)ownloaden, of C)-annuleren"
 
-#: LYMessages.c:431
+#: LYMessages.c:433
 msgid "Cancelling file."
 msgstr "Bestand wordt geannuleerd."
 
-#: LYMessages.c:432
+#: LYMessages.c:434
 msgid "Retrieving file.  - PLEASE WAIT -"
 msgstr "Bestand wordt opgehaald.  Even geduld..."
 
-#: LYMessages.c:433
+#: LYMessages.c:435
 msgid "Enter a filename: "
 msgstr "Voer een bestandsnaam in: "
 
-#: LYMessages.c:434
+#: LYMessages.c:436
 msgid "Edit the previous filename: "
 msgstr "Wijzig de vorige bestandsnaam: "
 
-#: LYMessages.c:435
+#: LYMessages.c:437
 msgid "Edit a previous filename: "
 msgstr "Wijzig een voorgaande bestandsnaam: "
 
-#: LYMessages.c:436
+#: LYMessages.c:438
 msgid "Enter a new filename: "
 msgstr "Voer een nieuwe bestandsnaam in: "
 
-#: LYMessages.c:437
+#: LYMessages.c:439
 msgid "File name may not begin with a dot."
 msgstr "Bestandsnaam mag niet met een punt beginnen."
 
-#: LYMessages.c:439
+#: LYMessages.c:441
 msgid "File exists.  Create higher version?"
 msgstr "Bestand bestaat al.  Hogere versie aanmaken?"
 
-#: LYMessages.c:441
+#: LYMessages.c:443
 msgid "File exists.  Overwrite?"
 msgstr "Bestand bestaat al.  Overschrijven?"
 
-#: LYMessages.c:443
+#: LYMessages.c:445
 msgid "Cannot write to file."
 msgstr "Kan niet naar bestand schrijven."
 
-#: LYMessages.c:444
+#: LYMessages.c:446
 msgid "ERROR! - download command is misconfigured."
 msgstr "FOUT -- Downloadcommando is onjuist ingesteld."
 
-#: LYMessages.c:445
+#: LYMessages.c:447
 msgid "Unable to download file."
 msgstr "Kan bestand niet downloaden."
 
-#: LYMessages.c:446
+#: LYMessages.c:448
 msgid "Reading directory..."
 msgstr "Lezen van mapinhoud..."
 
-#: LYMessages.c:447
+#: LYMessages.c:449
 msgid "Building directory listing..."
 msgstr "Opbouwen van bestandenoverzicht voor map..."
 
-#: LYMessages.c:448
+#: LYMessages.c:450
 msgid "Saving..."
 msgstr "Bezig met opslaan..."
 
-#: LYMessages.c:449
+#: LYMessages.c:451
 #, c-format
 msgid "Could not edit file '%s'."
 msgstr "Kan bestand '%s' niet wijzigen."
 
-#: LYMessages.c:450
+#: LYMessages.c:452
 msgid "Unable to access document!"
 msgstr "Geen toegang tot document!"
 
-#: LYMessages.c:451
+#: LYMessages.c:453
 msgid "Could not access file."
 msgstr "Geen toegang tot bestand."
 
-#: LYMessages.c:452
+#: LYMessages.c:454
 msgid "Could not access directory."
 msgstr "Geen toegang tot map."
 
-#: LYMessages.c:453
+#: LYMessages.c:455
 msgid "Could not load data."
 msgstr "Kan gegevens niet inlezen."
 
 #. #define CANNOT_EDIT_REMOTE_FILES
-#: LYMessages.c:455
+#: LYMessages.c:457
 msgid "Lynx cannot currently (e)dit remote WWW files."
 msgstr "Lynx kan momenteel geen WWW-bestanden op een andere computer wijzigen."
 
 #. #define CANNOT_EDIT_FIELD
-#: LYMessages.c:457
+#: LYMessages.c:459
 msgid "This field cannot be (e)dited with an external editor."
 msgstr "Dit veld kan niet gewijzigd worden met een externe editor."
 
-#: LYMessages.c:458
+#: LYMessages.c:460
 msgid "Bad rule"
 msgstr "Foutieve regel"
 
-#: LYMessages.c:459
+#: LYMessages.c:461
 msgid "Insufficient operands:"
 msgstr "Onvoldoende argumenten:"
 
-#: LYMessages.c:460
+#: LYMessages.c:462
 msgid "You are not authorized to edit this file."
 msgstr "U bent niet geautoriseerd om dit bestand te wijzigen."
 
-#: LYMessages.c:461
+#: LYMessages.c:463
 msgid "Title: "
 msgstr "Titel: "
 
-#: LYMessages.c:462
+#: LYMessages.c:464
 msgid "Subject: "
 msgstr "Onderwerp: "
 
-#: LYMessages.c:463
+#: LYMessages.c:465
 msgid "Username: "
 msgstr "Gebruikersnaam: "
 
-#: LYMessages.c:464
+#: LYMessages.c:466
 msgid "Password: "
 msgstr "Wachtwoord: "
 
-#: LYMessages.c:465
+#: LYMessages.c:467
 msgid "lynx: Username and Password required!!!"
 msgstr "lynx: Gebruikersnaam en wachtwoord zijn vereist!"
 
-#: LYMessages.c:466
+#: LYMessages.c:468
 msgid "lynx: Password required!!!"
 msgstr "lynx: Wachtwoord is vereist!"
 
-#: LYMessages.c:467
+#: LYMessages.c:469
 msgid "Clear all authorization info for this session?"
 msgstr "Alle autorisatie-informatie voor deze sessie wissen?"
 
-#: LYMessages.c:468
+#: LYMessages.c:470
 msgid "Authorization info cleared."
 msgstr "Autorisatie-informatie is gewist."
 
-#: LYMessages.c:469
+#: LYMessages.c:471
 msgid "Authorization failed.  Retry?"
 msgstr "Autorisatie is mislukt.  Nog eens proberen?"
 
-#: LYMessages.c:470
+#: LYMessages.c:472
 msgid "cgi support has been disabled."
 msgstr "CGI-ondersteuning is uitgeschakeld."
 
 #. #define CGI_NOT_COMPILED
-#: LYMessages.c:472
+#: LYMessages.c:474
 msgid "Lynxcgi capabilities are not compiled into this version."
 msgstr "Lynx-CGI-functies zijn niet ingebouwd in deze versie."
 
-#: LYMessages.c:473
+#: LYMessages.c:475
 #, c-format
 msgid "Sorry, no known way of converting %s to %s."
 msgstr "Sorry, er is geen bekende manier om %s naar %s te converteren."
 
-#: LYMessages.c:474
+#: LYMessages.c:476
 msgid "Unable to set up connection."
 msgstr "Kan verbinding niet voorbereiden."
 
-#: LYMessages.c:475
+#: LYMessages.c:477
 msgid "Unable to make connection"
 msgstr "Kan verbinding niet maken"
 
 #. #define MALFORMED_EXEC_REQUEST
-#: LYMessages.c:477
+#: LYMessages.c:479
 msgid "Executable link rejected due to malformed request."
 msgstr "Uitvoerbare link is verworpen vanwege een verkeerd geformuleerde opdracht."
 
 #. #define BADCHAR_IN_EXEC_LINK
-#: LYMessages.c:479
+#: LYMessages.c:481
 #, c-format
 msgid "Executable link rejected due to `%c' character."
 msgstr "Uitvoerbare link is verworpen vanwege '%c'-teken."
 
 #. #define RELPATH_IN_EXEC_LINK
-#: LYMessages.c:481
+#: LYMessages.c:483
 msgid "Executable link rejected due to relative path string ('../')."
 msgstr "Uitvoerbare link is verworpen vanwege een relatief pad ('../')."
 
 #. #define BADLOCPATH_IN_EXEC_LINK
-#: LYMessages.c:483
+#: LYMessages.c:485
 msgid "Executable link rejected due to location or path."
 msgstr "Uitvoerbare link is verworpen vanwege locatie of pad."
 
-#: LYMessages.c:484
+#: LYMessages.c:486
 msgid "Mail access is disabled!"
 msgstr "E-mailtoegang is uitgeschakeld!"
 
 #. #define ACCESS_ONLY_LOCALHOST
-#: LYMessages.c:486
+#: LYMessages.c:488
 msgid "Only files and servers on the local host can be accessed."
 msgstr "Er is alleen toegang tot bestanden en servers op de lokale computer."
 
-#: LYMessages.c:487
+#: LYMessages.c:489
 msgid "Telnet access is disabled!"
 msgstr "Toegang via telnet is uitgeschakeld!"
 
 #. #define TELNET_PORT_SPECS_DISABLED
-#: LYMessages.c:489
+#: LYMessages.c:491
 msgid "Telnet port specifications are disabled."
 msgstr "Telnet-poortspecificaties zijn uitgeschakeld."
 
-#: LYMessages.c:490
+#: LYMessages.c:492
 msgid "USENET news access is disabled!"
 msgstr "Toegang tot USENET-nieuws is uitgeschakeld!"
 
-#: LYMessages.c:491
+#: LYMessages.c:493
 msgid "Rlogin access is disabled!"
 msgstr "Toegang via 'rlogin' is uitgeschakeld!"
 
-#: LYMessages.c:492
+#: LYMessages.c:494
 msgid "Ftp access is disabled!"
 msgstr "Toegang via FTP is uitgeschakeld!"
 
-#: LYMessages.c:493
+#: LYMessages.c:495
 msgid "There are no references from this document."
 msgstr "Er zijn geen referenties vanuit dit document."
 
-#: LYMessages.c:494
+#: LYMessages.c:496
 msgid "There are only hidden links from this document."
 msgstr "Er zijn alleen verborgen links vanuit dit document."
 
-#: LYMessages.c:496
+#: LYMessages.c:498
 msgid "Unable to open command file."
 msgstr "Kan opdrachtenbestand niet openen."
 
-#: LYMessages.c:498
+#: LYMessages.c:500
 msgid "News Post Cancelled!!!"
 msgstr "Nieuwsverzending is geannuleerd!!!"
 
 #. #define SPAWNING_EDITOR_FOR_NEWS
-#: LYMessages.c:500
+#: LYMessages.c:502
 msgid "Spawning your selected editor to edit news message"
 msgstr "Uw geselecteerde editor wordt opgestart om een nieuwsbericht in te voeren"
 
-#: LYMessages.c:501
+#: LYMessages.c:503
 msgid "Post this message?"
 msgstr "Dit bericht posten?"
 
-#: LYMessages.c:502
+#: LYMessages.c:504
 #, c-format
 msgid "Append '%s'?"
 msgstr "'%s' aan einde toevoegen?"
 
-#: LYMessages.c:503
+#: LYMessages.c:505
 msgid "Posting to newsgroup(s)..."
 msgstr "Posten naar nieuwsgroep(en)..."
 
-#: LYMessages.c:505
+#: LYMessages.c:507
 msgid "*** You have unread mail. ***"
 msgstr "*** U hebt ongelezen e-mail. ***"
 
-#: LYMessages.c:507
+#: LYMessages.c:509
 msgid "*** You have mail. ***"
 msgstr "*** U hebt e-mail. ***"
 
-#: LYMessages.c:509
+#: LYMessages.c:511
 msgid "*** You have new mail. ***"
 msgstr "*** U hebt nieuwe e-mail. ***"
 
-#: LYMessages.c:510
+#: LYMessages.c:512
 msgid "File insert cancelled!!!"
 msgstr "Opname van bestand is geannuleerd!!!"
 
-#: LYMessages.c:511
+#: LYMessages.c:513
 msgid "Not enough memory for file!"
 msgstr "Niet genoeg geheugen beschikbaar voor bestand!"
 
-#: LYMessages.c:512
+#: LYMessages.c:514
 msgid "Can't open file for reading."
 msgstr "Kan bestand niet openen om te lezen."
 
-#: LYMessages.c:513
+#: LYMessages.c:515
 msgid "File does not exist."
 msgstr "Bestand bestaat niet."
 
-#: LYMessages.c:514
+#: LYMessages.c:516
 msgid "File does not exist - reenter or cancel:"
 msgstr "Bestand bestaat niet -- voer opnieuw in of annuleer:"
 
-#: LYMessages.c:515
+#: LYMessages.c:517
 msgid "File is not readable."
 msgstr "Bestand is niet leesbaar."
 
-#: LYMessages.c:516
+#: LYMessages.c:518
 msgid "File is not readable - reenter or cancel:"
 msgstr "Bestand is niet leesbaar -- voer opnieuw in of annuleer:"
 
-#: LYMessages.c:517
+#: LYMessages.c:519
 msgid "Nothing to insert - file is 0-length."
 msgstr "Er is niets om in te voegen -- bestand heeft lengte 0."
 
-#: LYMessages.c:518
+#: LYMessages.c:520
 msgid "Save request cancelled!!!"
 msgstr "Opslagverzoek is geannuleerd!"
 
-#: LYMessages.c:519
+#: LYMessages.c:521
 msgid "Mail request cancelled!!!"
 msgstr "E-mailopdracht is geannuleerd!"
 
 #. #define CONFIRM_MAIL_SOURCE_PREPARSED
-#: LYMessages.c:521
+#: LYMessages.c:523
 msgid "Viewing preparsed source.  Are you sure you want to mail it?"
 msgstr "Voorverwerkte brontekst wordt getoond.  Verzenden?"
 
-#: LYMessages.c:522
+#: LYMessages.c:524
 msgid "Please wait..."
 msgstr "Even geduld..."
 
-#: LYMessages.c:523
+#: LYMessages.c:525
 msgid "Mailing file.  Please wait..."
 msgstr "Bestand wordt verzonden.  Even geduld..."
 
-#: LYMessages.c:524
+#: LYMessages.c:526
 msgid "ERROR - Unable to mail file"
 msgstr "FOUT -- Kan e-mailbestand niet openen."
 
 #. #define CONFIRM_LONG_SCREEN_PRINT
-#: LYMessages.c:526
+#: LYMessages.c:528
 #, c-format
 msgid "File is %d screens long.  Are you sure you want to print?"
 msgstr "Bestand is %d schermen lang.  Toch afdrukken?"
 
-#: LYMessages.c:527
+#: LYMessages.c:529
 msgid "Print request cancelled!!!"
 msgstr "Adrukverzoek is geannuleerd!"
 
-#: LYMessages.c:528
+#: LYMessages.c:530
 msgid "Press <return> to begin: "
 msgstr "Druk op <Enter> om te beginnen: "
 
-#: LYMessages.c:529
+#: LYMessages.c:531
 msgid "Press <return> to finish: "
 msgstr "Druk op <Enter> om te voltooien: "
 
 #. #define CONFIRM_LONG_PAGE_PRINT
-#: LYMessages.c:531
+#: LYMessages.c:533
 #, c-format
 msgid "File is %d pages long.  Are you sure you want to print?"
 msgstr "Bestand is %d pagina's lang.  Toch afdrukken?"
 
 #. #define CHECK_PRINTER
-#: LYMessages.c:533
+#: LYMessages.c:535
 msgid "Be sure your printer is on-line.  Press <return> to start printing:"
 msgstr "Zorg dat de printer aan staat.  Druk op <Enter> om het afdrukken te beginnen:"
 
-#: LYMessages.c:534
+#: LYMessages.c:536
 msgid "ERROR - Unable to allocate file space!!!"
 msgstr "FOUT -- Kan geen ruimte voor bestand reserveren."
 
-#: LYMessages.c:535
+#: LYMessages.c:537
 msgid "Unable to open tempfile"
 msgstr "Kan tijdelijk bestand niet openen"
 
-#: LYMessages.c:536
+#: LYMessages.c:538
 msgid "Unable to open print options file"
 msgstr "Kan optiesbestand niet afdrukken"
 
-#: LYMessages.c:537
+#: LYMessages.c:539
 msgid "Printing file.  Please wait..."
 msgstr "Bestand wordt afgedrukt.  Even geduld..."
 
-#: LYMessages.c:538
+#: LYMessages.c:540
 msgid "Please enter a valid internet mail address: "
 msgstr "Voer een geldig e-mailadres in: "
 
-#: LYMessages.c:539
+#: LYMessages.c:541
 msgid "ERROR! - printer is misconfigured!"
 msgstr "FOUT -- Printer is niet goed ingesteld."
 
-#: LYMessages.c:540
+#: LYMessages.c:542
 msgid "Image map from POST response not available!"
 msgstr "Menuplaatje van POST-antwoord is niet beschikbaar!"
 
-#: LYMessages.c:541
+#: LYMessages.c:543
 msgid "Misdirected client-side image MAP request!"
 msgstr "Verkeerd gerichte opdracht voor menuplaatje aan cliëntzijde!"
 
-#: LYMessages.c:542
+#: LYMessages.c:544
 msgid "Client-side image MAP is not accessible!"
 msgstr "Menuplaatje aan cliëntzijde is niet bereikbaar!"
 
-#: LYMessages.c:543
+#: LYMessages.c:545
 msgid "No client-side image MAPs are available!"
 msgstr "Er zijn aan cliëntzijde geen menuplaatjes beschikbaar!"
 
-#: LYMessages.c:544
+#: LYMessages.c:546
 msgid "Client-side image MAP is not available!"
 msgstr "Menuplaatje aan cliëntzijde is niet beschikbaar!"
 
 #. #define OPTION_SCREEN_NEEDS_24
-#: LYMessages.c:547
+#: LYMessages.c:549
 msgid "Screen height must be at least 24 lines for the Options menu!"
 msgstr "Voor het Optiesmenu moet de schermhoogte minimaal 24 regels zijn."
 
 #. #define OPTION_SCREEN_NEEDS_23
-#: LYMessages.c:549
+#: LYMessages.c:551
 msgid "Screen height must be at least 23 lines for the Options menu!"
 msgstr "Voor het Optiesmenu moet de schermhoogte minimaal 23 regels zijn."
 
 #. #define OPTION_SCREEN_NEEDS_22
-#: LYMessages.c:551
+#: LYMessages.c:553
 msgid "Screen height must be at least 22 lines for the Options menu!"
 msgstr "Voor het Optiesmenu moet de schermhoogte minimaal 22 regels zijn."
 
-#: LYMessages.c:553
+#: LYMessages.c:555
 msgid "That key requires Advanced User mode."
 msgstr "Die toets werkt alleen in de 'expert'-gebruikersmodus."
 
-#: LYMessages.c:554
+#: LYMessages.c:556
 #, c-format
 msgid "Content-type: %s"
 msgstr "Inhoudstype: %s"
 
-#: LYMessages.c:555
+#: LYMessages.c:557
 msgid "Command: "
-msgstr "Commando: "
+msgstr "Opdracht: "
 
-#: LYMessages.c:556
+#: LYMessages.c:558
 msgid "Unknown or ambiguous command"
-msgstr "Onbekend of meerduidig commando"
+msgstr "Onbekende of meerduidige opdracht"
 
-#: LYMessages.c:557
+#: LYMessages.c:559
 msgid " Version "
 msgstr " versie "
 
-#: LYMessages.c:558
+#: LYMessages.c:560
 msgid " first"
 msgstr " eerst"
 
-#: LYMessages.c:559
+#: LYMessages.c:561
 msgid ", guessing..."
 msgstr ", er naar raden..."
 
-#: LYMessages.c:560
+#: LYMessages.c:562
 msgid "Permissions for "
 msgstr "Toegangsrechten voor "
 
-#: LYMessages.c:561
+#: LYMessages.c:563
 msgid "Select "
 msgstr "Selecteer "
 
-#: LYMessages.c:562
+#: LYMessages.c:564
 msgid "capital letter"
 msgstr "hoofdletter"
 
-#: LYMessages.c:563
+#: LYMessages.c:565
 msgid " of option line,"
 msgstr " van optieregel,"
 
-#: LYMessages.c:564
+#: LYMessages.c:566
 msgid " to save,"
 msgstr " om op te slaan,"
 
-#: LYMessages.c:565
+#: LYMessages.c:567
 msgid " to "
 msgstr " aan "
 
-#: LYMessages.c:566
+#: LYMessages.c:568
 msgid " or "
 msgstr " of "
 
-#: LYMessages.c:567
+#: LYMessages.c:569
 msgid " index"
 msgstr " index"
 
-#: LYMessages.c:568
+#: LYMessages.c:570
 msgid " to return to Lynx."
 msgstr " om terug te keren naar Lynx."
 
-#: LYMessages.c:569
+#: LYMessages.c:571
 msgid "Accept Changes"
-msgstr "Bevestigen"
+msgstr "Wijzigen bevestigen"
 
-#: LYMessages.c:570
+#: LYMessages.c:572
 msgid "Reset Changes"
-msgstr "Annuleren"
+msgstr "Wijzigingen annuleren"
 
-#: LYMessages.c:571
+#: LYMessages.c:573
 msgid "Left Arrow cancels changes"
-msgstr "(pijltje naar links annuleert ook)"
+msgstr "(pijltje links annuleert ook)"
 
-#: LYMessages.c:572
+#: LYMessages.c:574
 msgid "Save options to disk"
 msgstr "Opties op schijf opslaan"
 
-#: LYMessages.c:573
+#: LYMessages.c:575
 msgid "Hit RETURN to accept entered data."
 msgstr "Druk op <Enter> om ingevoerde gegevens te accepteren."
 
 #. #define ACCEPT_DATA_OR_DEFAULT
-#: LYMessages.c:575
+#: LYMessages.c:577
 msgid "Hit RETURN to accept entered data.  Delete data to invoke the default."
 msgstr "Druk op <Enter> om gegevens te accepteren.  Wis gegevens om te herstellen."
 
-#: LYMessages.c:576
+#: LYMessages.c:578
 msgid "Value accepted!"
 msgstr "Waarde is geaccepteerd!"
 
 #. #define VALUE_ACCEPTED_WARNING_X
-#: LYMessages.c:578
+#: LYMessages.c:580
 msgid "Value accepted! -- WARNING: Lynx is configured for XWINDOWS!"
 msgstr "Waarde is geaccepteerd! -- WAARSCHUWING: Lynx is geconfigureerd voor X Windows!"
 
 #. #define VALUE_ACCEPTED_WARNING_NONX
-#: LYMessages.c:580
+#: LYMessages.c:582
 msgid "Value accepted! -- WARNING: Lynx is NOT configured for XWINDOWS!"
 msgstr "Waarde is geaccepteerd! -- WAARSCHUWING: Lynx is NIET geconfigureerd voor X Windows!"
 
-#: LYMessages.c:581
+#: LYMessages.c:583
 msgid "You are not allowed to change which editor to use!"
 msgstr "U mag niet opgeven welke editor u wilt gebruiken!"
 
-#: LYMessages.c:582
+#: LYMessages.c:584
 msgid "Failed to set DISPLAY variable!"
 msgstr "Zetten van variabele DISPLAY is mislukt!"
 
-#: LYMessages.c:583
+#: LYMessages.c:585
 msgid "Failed to clear DISPLAY variable!"
 msgstr "Wissen van variabele DISPLAY is mislukt!"
 
 #. #define BOOKMARK_CHANGE_DISALLOWED
-#: LYMessages.c:585
+#: LYMessages.c:587
 msgid "You are not allowed to change the bookmark file!"
 msgstr "U mag het boekenleggerbestand niet veranderen!"
 
-#: LYMessages.c:586
+#: LYMessages.c:588
 msgid "Terminal does not support color"
 msgstr "De terminal ondersteunt geen kleur"
 
-#: LYMessages.c:587
+#: LYMessages.c:589
 #, c-format
 msgid "Your '%s' terminal does not support color."
 msgstr "Uw '%s'-terminal ondersteunt geen kleur."
 
-#: LYMessages.c:588
+#: LYMessages.c:590
 msgid "Access to dot files is disabled!"
 msgstr "Toegang tot puntbestanden is uitgeschakeld!"
 
 #. #define UA_NO_LYNX_WARNING
-#: LYMessages.c:590
+#: LYMessages.c:592
 msgid "User-Agent string does not contain \"Lynx\" or \"L_y_n_x\""
 msgstr "Waarde van 'User-Agent' bevat geen \"Lynx\" of \"L_y_n_x\""
 
 #. #define UA_PLEASE_USE_LYNX
-#: LYMessages.c:592
+#: LYMessages.c:594
 msgid "Use \"L_y_n_x\" or \"Lynx\" in User-Agent, or it looks like intentional deception!"
 msgstr "Gebruik \"L_y_n_x\" of \"Lynx\" in 'User-Agent', anders lijkt het op bedrog."
 
 #. #define UA_CHANGE_DISABLED
-#: LYMessages.c:594
+#: LYMessages.c:596
 msgid "Changing of the User-Agent string is disabled!"
 msgstr "Wijzigen van de waarde van 'User-Agent' is uitgeschakeld!"
 
 #. #define CHANGE_OF_SETTING_DISALLOWED
-#: LYMessages.c:596
+#: LYMessages.c:598
 msgid "You are not allowed to change this setting."
 msgstr "U mag deze instelling niet wijzigen."
 
-#: LYMessages.c:597
+#: LYMessages.c:599
 msgid "Saving Options..."
 msgstr "Opslaan van opties..."
 
-#: LYMessages.c:598
+#: LYMessages.c:600
 msgid "Options saved!"
 msgstr "Opties zijn opgeslagen."
 
-#: LYMessages.c:599
+#: LYMessages.c:601
 msgid "Unable to save Options!"
 msgstr "Kan opties niet opslaan!"
 
-#: LYMessages.c:600
+#: LYMessages.c:602
 msgid " 'r' to return to Lynx "
 msgstr " 'r' om terug te keren naar Lynx "
 
-#: LYMessages.c:601
+#: LYMessages.c:603
 msgid " '>' to save, or 'r' to return to Lynx "
 msgstr " '>' om op te slaan, of 'r' om terug te keren naar Lynx "
 
 #. #define ANY_KEY_CHANGE_RET_ACCEPT
-#: LYMessages.c:603
+#: LYMessages.c:605
 msgid "Hit any key to change value; RETURN to accept."
 msgstr "Druk op een toets om de waarde te veranderen; <Enter> om te accepteren."
 
-#: LYMessages.c:604
+#: LYMessages.c:606
 msgid "Error uncompressing temporary file!"
 msgstr "Fout bij decomprimeren van tijdelijk bestand!"
 
-#: LYMessages.c:605
+#: LYMessages.c:607
 msgid "Unsupported URL scheme!"
 msgstr "Niet-ondersteunde URL-methode!"
 
-#: LYMessages.c:606
+#: LYMessages.c:608
 msgid "Unsupported data: URL!  Use SHOWINFO, for now."
 msgstr "Niet-ondersteunde 'data:'-URL!  Gebruik voorlopig SHOWINFO."
 
-#: LYMessages.c:607
+#: LYMessages.c:609
 msgid "Redirection limit of 10 URL's reached."
 msgstr "Doorverwijzingslimiet van 10 URL's is bereikt."
 
-#: LYMessages.c:608
+#: LYMessages.c:610
 msgid "Illegal redirection URL received from server!"
 msgstr "Ongeldige doorverwijzing-URL ontvangen van server!"
 
 #. #define SERVER_ASKED_FOR_REDIRECTION
-#: LYMessages.c:610
+#: LYMessages.c:612
 #, c-format
 msgid "Server asked for %d redirection of POST content to"
 msgstr "Server vroeg om %d-doorverwijzing van POST-inhoud naar"
 
-#: LYMessages.c:613
+#: LYMessages.c:615
 msgid "P)roceed, use G)ET or C)ancel "
 msgstr "P)-doorgaan, G)ET gebruiken of C)-annuleren "
 
-#: LYMessages.c:614
+#: LYMessages.c:616
 msgid "P)roceed, or C)ancel "
 msgstr "P)-doorgaan, of C)-annuleren "
 
 #. #define ADVANCED_POST_GET_REDIRECT
-#: LYMessages.c:616
+#: LYMessages.c:618
 msgid "Redirection of POST content.  P)roceed, see U)RL, use G)ET or C)ancel"
 msgstr "Doorverwezen POST-inhoud.  P)-doorgaan, U)RL zien, G)ET of C)-annuleren"
 
 #. #define ADVANCED_POST_REDIRECT
-#: LYMessages.c:618
+#: LYMessages.c:620
 msgid "Redirection of POST content.  P)roceed, see U)RL, or C)ancel"
 msgstr "Doorverwezen POST-inhoud.  P)-doorgaan, U)RL bekijken, of C)-annuleren"
 
 #. #define CONFIRM_POST_RESUBMISSION
-#: LYMessages.c:620
+#: LYMessages.c:622
 msgid "Document from Form with POST content.  Resubmit?"
 msgstr "Document van formulier met POST-inhoud.  Opnieuw verzenden?"
 
 #. #define CONFIRM_POST_RESUBMISSION_TO
-#: LYMessages.c:622
+#: LYMessages.c:624
 #, c-format
 msgid "Resubmit POST content to %s ?"
 msgstr "Opnieuw POST-inhoud naar %s verzenden?"
 
 #. #define CONFIRM_POST_LIST_RELOAD
-#: LYMessages.c:624
+#: LYMessages.c:626
 #, c-format
 msgid "List from document with POST data.  Reload %s ?"
 msgstr "Lijst van document met POST-informatie.  Opnieuw %s laden?"
 
 #. #define CONFIRM_POST_DOC_HEAD
-#: LYMessages.c:626
+#: LYMessages.c:628
 msgid "Document from POST action, HEAD may not be understood.  Proceed?"
 msgstr "Document met POST-actie, HEAD wordt mogelijk niet begrepen.  Doorgaan?"
 
 #. #define CONFIRM_POST_LINK_HEAD
-#: LYMessages.c:628
+#: LYMessages.c:630
 msgid "Form submit action is POST, HEAD may not be understood.  Proceed?"
 msgstr "Formulierverzendactie is POST, HEAD wordt mogelijk niet begrepen.  Doorgaan?"
 
-#: LYMessages.c:629
+#: LYMessages.c:631
 msgid "Proceed without a username and password?"
 msgstr "Doorgaan zonder gebruikersnaam en wachtwoord?"
 
-#: LYMessages.c:630
+#: LYMessages.c:632
 #, c-format
 msgid "Proceed (%s)?"
 msgstr "Doorgaan (%s)?"
 
-#: LYMessages.c:631
+#: LYMessages.c:633
 msgid "Cannot POST to this host."
 msgstr "Kan geen 'POST' verzenden naar deze host."
 
-#: LYMessages.c:632
+#: LYMessages.c:634
 msgid "POST not supported for this URL - ignoring POST data!"
 msgstr "POST wordt niet ondersteund voor deze URL -- POST-informatie wordt genegeerd!"
 
-#: LYMessages.c:633
+#: LYMessages.c:635
 msgid "Discarding POST data..."
 msgstr "Weggooien van POST-informatie..."
 
-#: LYMessages.c:634
+#: LYMessages.c:636
 msgid "Document will not be reloaded!"
 msgstr "Document zal niet opnieuw geladen worden!"
 
-#: LYMessages.c:635
+#: LYMessages.c:637
 msgid "Location: "
 msgstr "Locatie: "
 
-#: LYMessages.c:636
+#: LYMessages.c:638
 #, c-format
 msgid "'%s' not found!"
 msgstr "'%s' niet gevonden!"
 
-#: LYMessages.c:637
+#: LYMessages.c:639
 msgid "Default Bookmark File"
 msgstr "Standaard boekenleggerbestand"
 
-#: LYMessages.c:638
+#: LYMessages.c:640
 msgid "Screen too small! (8x35 min)"
 msgstr "Scherm is te klein! (minimaal 8x35)"
 
-#: LYMessages.c:639
+#: LYMessages.c:641
 msgid "Select destination or ^G to Cancel: "
 msgstr "Selecteer bestemming of Ctrl-G om te annuleren: "
 
 #. #define MULTIBOOKMARKS_SELECT
-#: LYMessages.c:641
+#: LYMessages.c:643
 msgid "Select subbookmark, '=' for menu, or ^G to cancel: "
 msgstr "Selecteer subboekenlegger, '=' = menu, Ctrl-G = annuleren: "
 
 #. #define MULTIBOOKMARKS_SELF
-#: LYMessages.c:643
+#: LYMessages.c:645
 msgid "Reproduce L)ink in this bookmark file or C)ancel? (l,c): "
 msgstr "L)ink reproduceren in dit boekenleggerbestand of C)-annuleren? (l,c): "
 
-#: LYMessages.c:644
+#: LYMessages.c:646
 msgid "Multiple bookmark support is not available."
 msgstr "Meervoudige boekenleggerondersteuning is niet beschikbaar."
 
-#: LYMessages.c:645
+#: LYMessages.c:647
 #, c-format
 msgid " Select Bookmark (screen %d of %d)"
 msgstr " Selecteer boekenlegger (scherm %d van %d)"
 
-#: LYMessages.c:646
+#: LYMessages.c:648
 msgid "       Select Bookmark"
 msgstr "       Selecteer boekenlegger"
 
 #. #define MULTIBOOKMARKS_EHEAD_MASK
-#: LYMessages.c:648
+#: LYMessages.c:650
 #, c-format
 msgid "Editing Bookmark DESCRIPTION and FILEPATH (%d of 2)"
 msgstr "Wijzigen van boekenlegger-OMSCHRIJVING en -BESTANDSPAD (%d van 2)"
 
 #. #define MULTIBOOKMARKS_EHEAD
-#: LYMessages.c:650
+#: LYMessages.c:652
 msgid "         Editing Bookmark DESCRIPTION and FILEPATH"
 msgstr "        Wijzigen van boekenlegger-OMSCHRIJVING en -BESTANDSPAD"
 
-#: LYMessages.c:651
+#: LYMessages.c:653
 msgid "Letter: "
 msgstr "Letter: "
 
 #. #define USE_PATH_OFF_HOME
-#: LYMessages.c:654
+#: LYMessages.c:656
 msgid "Use a filepath off your login directory in SHELL syntax!"
 msgstr "Gebruik een bestandspad vanuit uw login-map in shell-syntaxis!"
 
-#: LYMessages.c:656
+#: LYMessages.c:658
 msgid "Use a filepath off your home directory!"
 msgstr "Gebruik een bestandspad vanuit uw persoonlijke map!"
 
 #. #define MAXLINKS_REACHED
-#: LYMessages.c:659
+#: LYMessages.c:661
 msgid "Maximum links per page exceeded!  Use half-page or two-line scrolling."
 msgstr "Te veel links per pagina!  Blader per halve pagina of tweeregelig."
 
-#: LYMessages.c:660
+#: LYMessages.c:662
 msgid "No previously visited links available!"
 msgstr "Geen voorgaande bezochte links beschikbaar!"
 
-#: LYMessages.c:661
+#: LYMessages.c:663
 msgid "Memory exhausted!  Program aborted!"
 msgstr "Geen geheugen meer beschikbaar!  Programma is afgebroken!"
 
-#: LYMessages.c:662
+#: LYMessages.c:664
 msgid "Memory exhausted!  Aborting..."
 msgstr "Geen geheugen meer beschikbaar!  Programma wordt afgebroken..."
 
-#: LYMessages.c:663
+#: LYMessages.c:665
 msgid "Not enough memory!"
 msgstr "Onvoldoende geheugen beschikbaar!"
 
-#: LYMessages.c:664
+#: LYMessages.c:666
 msgid "Directory/File Manager not available"
 msgstr "Bestandsbeheer is niet beschikbaar"
 
-#: LYMessages.c:665
+#: LYMessages.c:667
 msgid "HREF in BASE tag is not an absolute URL."
 msgstr "HREF in 'BASE'-element is niet een absolute URL."
 
-#: LYMessages.c:666
+#: LYMessages.c:668
 msgid "Location URL is not absolute."
 msgstr "Locatie-URL is niet absoluut."
 
-#: LYMessages.c:667
+#: LYMessages.c:669
 msgid "Refresh URL is not absolute."
 msgstr "Verversings-URL is niet absoluut."
 
 #. #define SENDING_MESSAGE_WITH_BODY_TO
-#: LYMessages.c:669
+#: LYMessages.c:671
 msgid ""
 "You are sending a message with body to:\n"
 "  "
@@ -2039,7 +2054,7 @@ msgstr ""
 "U zendt een bericht met inhoud naar:\n"
 "  "
 
-#: LYMessages.c:670
+#: LYMessages.c:672
 msgid ""
 "You are sending a comment to:\n"
 "  "
@@ -2047,7 +2062,7 @@ msgstr ""
 "U zendt commentaar naar:\n"
 "  "
 
-#: LYMessages.c:671
+#: LYMessages.c:673
 msgid ""
 "\n"
 " With copy to:\n"
@@ -2057,7 +2072,7 @@ msgstr ""
 " Met kopie naar:\n"
 "  "
 
-#: LYMessages.c:672
+#: LYMessages.c:674
 msgid ""
 "\n"
 " With copies to:\n"
@@ -2068,7 +2083,7 @@ msgstr ""
 "  "
 
 #. #define CTRL_G_TO_CANCEL_SEND
-#: LYMessages.c:674
+#: LYMessages.c:676
 msgid ""
 "\n"
 "\n"
@@ -2079,7 +2094,7 @@ msgstr ""
 "Gebruik Ctrl-G om te annuleren (bericht niet verzenden).\n"
 
 #. #define ENTER_NAME_OR_BLANK
-#: LYMessages.c:676
+#: LYMessages.c:678
 msgid ""
 "\n"
 " Please enter your name, or leave it blank to remain anonymous\n"
@@ -2088,7 +2103,7 @@ msgstr ""
 " Voer uw naam in, of laat het leeg om anoniem te blijven\n"
 
 #. #define ENTER_MAIL_ADDRESS_OR_OTHER
-#: LYMessages.c:678
+#: LYMessages.c:680
 msgid ""
 "\n"
 " Please enter a mail address or some other\n"
@@ -2097,11 +2112,11 @@ msgstr ""
 " Vul een e-mailadres in of een andere manier om\n"
 
 #. #define MEANS_TO_CONTACT_FOR_RESPONSE
-#: LYMessages.c:680
+#: LYMessages.c:682
 msgid " means to contact you, if you desire a response.\n"
 msgstr " u te bereiken, als u antwoord wenst te ontvangen.\n"
 
-#: LYMessages.c:681
+#: LYMessages.c:683
 msgid ""
 "\n"
 " Please enter a subject line.\n"
@@ -2110,7 +2125,7 @@ msgstr ""
 " Vul een onderwerp in.\n"
 
 #. #define ENTER_ADDRESS_FOR_CC
-#: LYMessages.c:683
+#: LYMessages.c:685
 msgid ""
 "\n"
 " Enter a mail address for a CC of your message.\n"
@@ -2118,11 +2133,11 @@ msgstr ""
 "\n"
 " Voer een e-mailadres in om een kopie van het bericht naar toe te sturen.\n"
 
-#: LYMessages.c:684
+#: LYMessages.c:686
 msgid " (Leave blank if you don't want a copy.)\n"
 msgstr " (Laat dit leeg indien u geen kopie wilt.)\n"
 
-#: LYMessages.c:685
+#: LYMessages.c:687
 msgid ""
 "\n"
 " Please review the message body:\n"
@@ -2132,7 +2147,7 @@ msgstr ""
 " Controleer de inhoud van het bericht:\n"
 "\n"
 
-#: LYMessages.c:686
+#: LYMessages.c:688
 msgid ""
 "\n"
 "Press RETURN to continue: "
@@ -2140,7 +2155,7 @@ msgstr ""
 "\n"
 "Druk op <Enter> om door te gaan: "
 
-#: LYMessages.c:687
+#: LYMessages.c:689
 msgid ""
 "\n"
 "Press RETURN to clean up: "
@@ -2148,11 +2163,11 @@ msgstr ""
 "\n"
 "Druk op <Enter> om op te ruimen: "
 
-#: LYMessages.c:688
+#: LYMessages.c:690
 msgid " Use Control-U to erase the default.\n"
 msgstr " Gebruik Ctrl-U om de huidige regel te wissen.\n"
 
-#: LYMessages.c:689
+#: LYMessages.c:691
 msgid ""
 "\n"
 " Please enter your message below."
@@ -2161,7 +2176,7 @@ msgstr ""
 " Schrijf uw bericht hieronder."
 
 #. #define ENTER_PERIOD_WHEN_DONE_A
-#: LYMessages.c:691 src/LYNews.c:360
+#: LYMessages.c:693 src/LYNews.c:360
 msgid ""
 "\n"
 " When you are done, press enter and put a single period (.)"
@@ -2170,7 +2185,7 @@ msgstr ""
 " Wanneer u klaar bent, druk dan op <Enter> en plaats vervolgens"
 
 #. #define ENTER_PERIOD_WHEN_DONE_B
-#: LYMessages.c:693 src/LYNews.c:361
+#: LYMessages.c:695 src/LYNews.c:361
 msgid ""
 "\n"
 " on a line and press enter again."
@@ -2180,257 +2195,257 @@ msgstr ""
 
 #. Cookies messages
 #. #define ADVANCED_COOKIE_CONFIRMATION
-#: LYMessages.c:697
+#: LYMessages.c:699
 #, c-format
 msgid "%s cookie: %.*s=%.*s  Allow? (Y/N/Always/neVer)"
 msgstr "%s koekje: %.*s=%.*s  Toestaan? (Ja, Nee, Altijd, nOoit)"
 
 #. #define INVALID_COOKIE_DOMAIN_CONFIRMATION
-#: LYMessages.c:699
+#: LYMessages.c:701
 #, c-format
 msgid "Accept invalid cookie domain=%s for '%s'?"
 msgstr "Ongeldig koekjesdomein=%s voor '%s' accepteren?"
 
 #. #define INVALID_COOKIE_PATH_CONFIRMATION
-#: LYMessages.c:701
+#: LYMessages.c:703
 #, c-format
 msgid "Accept invalid cookie path=%s as a prefix of '%s'?"
 msgstr "Ongeldig koekjespad=%s als een prefix voor '%s' accepteren?"
 
-#: LYMessages.c:702
+#: LYMessages.c:704
 msgid "Allowing this cookie."
 msgstr "Dit koekje wordt toegelaten."
 
-#: LYMessages.c:703
+#: LYMessages.c:705
 msgid "Rejecting this cookie."
 msgstr "Dit koekje wordt verworpen."
 
-#: LYMessages.c:704
+#: LYMessages.c:706
 msgid "The Cookie Jar is empty."
 msgstr "De koekjestrommel is leeg."
 
-#: LYMessages.c:705
+#: LYMessages.c:707
 msgid "The Cache Jar is empty."
 msgstr "De cachetrommel is leeg."
 
 #. #define ACTIVATE_TO_GOBBLE
-#: LYMessages.c:707
+#: LYMessages.c:709
 msgid "Activate links to gobble up cookies or entire domains,"
 msgstr "Activeer de links om koekjes over hun houdbaarheidsdatum heen te helpen,"
 
-#: LYMessages.c:708
+#: LYMessages.c:710
 msgid "or to change a domain's 'allow' setting."
 msgstr "of om de 'toelaatbaarheids'-instelling van een domein te wijzigen."
 
-#: LYMessages.c:709
+#: LYMessages.c:711
 msgid "(Cookies never allowed.)"
 msgstr "(Koekjes nooit toegestaan.)"
 
-#: LYMessages.c:710
+#: LYMessages.c:712
 msgid "(Cookies always allowed.)"
 msgstr "(Koekjes altijd toegestaan.)"
 
-#: LYMessages.c:711
+#: LYMessages.c:713
 msgid "(Cookies allowed via prompt.)"
 msgstr "(Koekjes toegestaan met prompt.)"
 
-#: LYMessages.c:712
+#: LYMessages.c:714
 msgid "(Persistent Cookies.)"
 msgstr "(Persistente koekjes.)"
 
-#: LYMessages.c:713
+#: LYMessages.c:715
 msgid "(No title.)"
 msgstr "(Geen titel.)"
 
-#: LYMessages.c:714
+#: LYMessages.c:716
 msgid "(No name.)"
 msgstr "(Geen naam.)"
 
-#: LYMessages.c:715
+#: LYMessages.c:717
 msgid "(No value.)"
 msgstr "(Geen waarde.)"
 
-#: LYMessages.c:716 src/LYOptions.c:2402
+#: LYMessages.c:718 src/LYOptions.c:2409
 msgid "None"
 msgstr "geen"
 
-#: LYMessages.c:717
+#: LYMessages.c:719
 msgid "(End of session.)"
 msgstr "(Einde van sessie.)"
 
-#: LYMessages.c:718
+#: LYMessages.c:720
 msgid "Delete this cookie?"
 msgstr "Dit koekje verwijderen?"
 
-#: LYMessages.c:719
+#: LYMessages.c:721
 msgid "The cookie has been eaten!"
 msgstr "Het koekje is opgegeten!"
 
-#: LYMessages.c:720
+#: LYMessages.c:722
 msgid "Delete this empty domain?"
 msgstr "Dit lege domein verwijderen?"
 
-#: LYMessages.c:721
+#: LYMessages.c:723
 msgid "The domain has been eaten!"
 msgstr "Het domein is opgegeten!"
 
 #. #define DELETE_COOKIES_SET_ALLOW_OR_CANCEL
-#: LYMessages.c:723
+#: LYMessages.c:725
 msgid "D)elete domain's cookies, set allow A)lways/P)rompt/neV)er, or C)ancel? "
 msgstr "D)omein wissen; zet toelaten op A)ltijd/P)rompt/V)-nooit, of C)-annuleren? "
 
 #. #define DELETE_DOMAIN_SET_ALLOW_OR_CANCEL
-#: LYMessages.c:725
+#: LYMessages.c:727
 msgid "D)elete domain, set allow A)lways/P)rompt/neV)er, or C)ancel? "
 msgstr "D)omein wissen; zet toestaan op A)ltijd/P)rompt/V)-nooit, of C)-annuleren? "
 
-#: LYMessages.c:726
+#: LYMessages.c:728
 msgid "All cookies in the domain have been eaten!"
 msgstr "Alle koekjes in het domein zijn opgegeten!"
 
-#: LYMessages.c:727
+#: LYMessages.c:729
 #, c-format
 msgid "'A'lways allowing from domain '%s'."
 msgstr "(A) altijd toelaten van domein '%s'."
 
-#: LYMessages.c:728
+#: LYMessages.c:730
 #, c-format
 msgid "ne'V'er allowing from domain '%s'."
 msgstr "(V) nooit toelaten van domein '%s'."
 
-#: LYMessages.c:729
+#: LYMessages.c:731
 #, c-format
 msgid "'P'rompting to allow from domain '%s'."
 msgstr "(P) prompten voor toestaan van domein '%s'."
 
-#: LYMessages.c:730
+#: LYMessages.c:732
 msgid "Delete all cookies in this domain?"
 msgstr "Alle koekjes in dit domein verwijderen?"
 
-#: LYMessages.c:731
+#: LYMessages.c:733
 msgid "All of the cookies in the jar have been eaten!"
 msgstr "Alle koekjes in de trommel zijn opgegeten!"
 
-#: LYMessages.c:733
+#: LYMessages.c:735
 msgid "Port 19 not permitted in URLs."
 msgstr "Poort 19 is niet toegestaan in URL's."
 
-#: LYMessages.c:734
+#: LYMessages.c:736
 msgid "Port 25 not permitted in URLs."
 msgstr "Poort 25 is niet toegestaan in URL's."
 
-#: LYMessages.c:735
+#: LYMessages.c:737
 #, c-format
 msgid "Port %lu not permitted in URLs."
 msgstr "Poort %lu is niet toegestaan in URL's."
 
-#: LYMessages.c:736
+#: LYMessages.c:738
 msgid "URL has a bad port field."
 msgstr "URL heeft een foutief poortveld."
 
-#: LYMessages.c:737
+#: LYMessages.c:739
 msgid "Maximum nesting of HTML elements exceeded."
 msgstr "Maximale nestingsdiepte van HTML-elementen is overschreden."
 
-#: LYMessages.c:738
+#: LYMessages.c:740
 msgid "Bad partial reference!  Stripping lead dots."
 msgstr "Foutieve gedeeltelijke referentie!  Voorafgaande puntjes worden weggelaten."
 
-#: LYMessages.c:739
+#: LYMessages.c:741
 msgid "Trace Log open failed.  Trace off!"
 msgstr "Kan trace-logbestand niet openen.  Traceren is uitgezet!"
 
-#: LYMessages.c:740
+#: LYMessages.c:742
 msgid "Lynx Trace Log"
 msgstr "Lynx-trace-logbestand"
 
-#: LYMessages.c:741
+#: LYMessages.c:743
 msgid "No trace log has been started for this session."
 msgstr "Er is geen trace-logbestand gestart voor deze sessie."
 
 #. #define MAX_TEMPCOUNT_REACHED
-#: LYMessages.c:743
+#: LYMessages.c:745
 msgid "The maximum temporary file count has been reached!"
 msgstr "Het maximale aantal tijdelijke bestanden is bereikt!"
 
 #. #define FORM_VALUE_TOO_LONG
-#: LYMessages.c:745
+#: LYMessages.c:747
 msgid "Form field value exceeds buffer length!  Trim the tail."
 msgstr "Waarde in formulierveld overschrijdt lengte van de buffer!  Staart wordt afgeknipt."
 
 #. #define FORM_TAIL_COMBINED_WITH_HEAD
-#: LYMessages.c:747
+#: LYMessages.c:749
 msgid "Modified tail combined with head of form field value."
 msgstr "Veranderde staart samengevoegd met kop van waarde uit formulierveld."
 
 #. HTFile.c
-#: LYMessages.c:750
+#: LYMessages.c:752
 msgid "Directory"
 msgstr "Map"
 
-#: LYMessages.c:751
+#: LYMessages.c:753
 msgid "Directory browsing is not allowed."
 msgstr "Bladeren door mappen is niet toegestaan."
 
-#: LYMessages.c:752
+#: LYMessages.c:754
 msgid "Selective access is not enabled for this directory"
 msgstr "Selectieve toegang is niet aangezet voor deze map"
 
-#: LYMessages.c:753
+#: LYMessages.c:755
 msgid "Multiformat: directory scan failed."
 msgstr "Multiformat: doorzoeken van map mislukt."
 
-#: LYMessages.c:754
+#: LYMessages.c:756
 msgid "This directory is not readable."
 msgstr "Deze map is niet leesbaar."
 
-#: LYMessages.c:755
+#: LYMessages.c:757
 msgid "Can't access requested file."
 msgstr "Geen toegang tot opgevraagd bestand."
 
-#: LYMessages.c:756
+#: LYMessages.c:758
 msgid "Could not find suitable representation for transmission."
 msgstr "Kan geen passende representatie vinden voor overdracht."
 
-#: LYMessages.c:757
+#: LYMessages.c:759
 msgid "Could not open file for decompression!"
 msgstr "Kan bestand niet openen voor decompressie!"
 
-#: LYMessages.c:758
+#: LYMessages.c:760
 msgid "Files:"
 msgstr "Bestanden:"
 
-#: LYMessages.c:759
+#: LYMessages.c:761
 msgid "Subdirectories:"
 msgstr "Submappen:"
 
-#: LYMessages.c:760
+#: LYMessages.c:762
 msgid " directory"
 msgstr " map"
 
-#: LYMessages.c:761
+#: LYMessages.c:763
 msgid "Up to "
 msgstr "Terug naar "
 
-#: LYMessages.c:762
+#: LYMessages.c:764
 msgid "Current directory is "
 msgstr "Huidige map is "
 
 #. HTFTP.c
-#: LYMessages.c:765
+#: LYMessages.c:767
 msgid "Symbolic Link"
 msgstr "Symbolische koppeling"
 
 #. HTGopher.c
-#: LYMessages.c:768
+#: LYMessages.c:770
 msgid "No response from server!"
 msgstr "Geen reactie van die server!"
 
-#: LYMessages.c:769
+#: LYMessages.c:771
 msgid "CSO index"
 msgstr "CSO-index"
 
-#: LYMessages.c:770
+#: LYMessages.c:772
 msgid ""
 "\n"
 "This is a searchable index of a CSO database.\n"
@@ -2438,16 +2453,16 @@ msgstr ""
 "\n"
 "Dit is een doorzoekbare index van een CSO-databank.\n"
 
-#: LYMessages.c:771
+#: LYMessages.c:773
 msgid "CSO Search Results"
 msgstr "CSO-zoekresultaten"
 
-#: LYMessages.c:772
+#: LYMessages.c:774
 #, c-format
 msgid "Seek fail on %s\n"
 msgstr "Zoekopdracht is mislukt op %s\n"
 
-#: LYMessages.c:773
+#: LYMessages.c:775
 msgid ""
 "\n"
 "Press the 's' key and enter search keywords.\n"
@@ -2455,7 +2470,7 @@ msgstr ""
 "\n"
 "Druk op de 's'-toets en voer zoektermen in.\n"
 
-#: LYMessages.c:774
+#: LYMessages.c:776
 msgid ""
 "\n"
 "This is a searchable Gopher index.\n"
@@ -2463,35 +2478,35 @@ msgstr ""
 "\n"
 "Dit is een doorzoekbare Gopher-index.\n"
 
-#: LYMessages.c:775
+#: LYMessages.c:777
 msgid "Gopher index"
 msgstr "Gopher-index"
 
-#: LYMessages.c:776
+#: LYMessages.c:778
 msgid "Gopher Menu"
 msgstr "Gopher-menu"
 
-#: LYMessages.c:777
+#: LYMessages.c:779
 msgid " Search Results"
 msgstr " Zoekresultaten"
 
-#: LYMessages.c:778
+#: LYMessages.c:780
 msgid "Sending CSO/PH request."
 msgstr "Verzenden van CSO/PH-verzoek."
 
-#: LYMessages.c:779
+#: LYMessages.c:781
 msgid "Sending Gopher request."
 msgstr "Verzenden van Gopher-verzoek."
 
-#: LYMessages.c:780
+#: LYMessages.c:782
 msgid "CSO/PH request sent; waiting for response."
 msgstr "CSO/PH-verzoek is verzonden; wacht op antwoord."
 
-#: LYMessages.c:781
+#: LYMessages.c:783
 msgid "Gopher request sent; waiting for response."
 msgstr "Gopher-verzoek is verzonden; wacht op antwoord."
 
-#: LYMessages.c:782
+#: LYMessages.c:784
 msgid ""
 "\n"
 "Please enter search keywords.\n"
@@ -2499,7 +2514,7 @@ msgstr ""
 "\n"
 "Voer zoektermen in.\n"
 
-#: LYMessages.c:783
+#: LYMessages.c:785
 msgid ""
 "\n"
 "The keywords that you enter will allow you to search on a"
@@ -2507,201 +2522,201 @@ msgstr ""
 "\n"
 "De zoektermen die u opgeeft maken het mogelijk te zoeken op"
 
-#: LYMessages.c:784
+#: LYMessages.c:786
 msgid " person's name in the database.\n"
 msgstr " een persoonsnaam in de databank.\n"
 
 #. HTNews.c
-#: LYMessages.c:787
+#: LYMessages.c:789
 msgid "Connection closed ???"
 msgstr "Verbinding gesloten???"
 
-#: LYMessages.c:788
+#: LYMessages.c:790
 msgid "Cannot open temporary file for news POST."
 msgstr "Kan tijdelijk bestand niet openen voor nieuws-POST."
 
-#: LYMessages.c:789
+#: LYMessages.c:791
 msgid "This client does not contain support for posting to news with SSL."
 msgstr "Dit programma ondersteunt versturen van nieuwsberichten met SSL niet."
 
 #. HTStyle.c
-#: LYMessages.c:792
+#: LYMessages.c:794
 #, c-format
 msgid "Style %d `%s' SGML:%s.  Font %s %.1f point.\n"
 msgstr "Stijl %d '%s' SGML:%s.  Lettertype %s %.1f-punts.\n"
 
-#: LYMessages.c:794
+#: LYMessages.c:796
 #, c-format
 msgid "\tAlign=%d, %d tabs. (%.0f before, %.0f after)\n"
 msgstr "        Uitlijnen=%d, %d tabs. (%.0f voor, %.0f na)\n"
 
-#: LYMessages.c:795
+#: LYMessages.c:797
 #, c-format
 msgid "\t\tTab kind=%d at %.0f\n"
 msgstr "                Tabsoort=%d op %.0f\n"
 
 #. HTTP.c
-#: LYMessages.c:798
+#: LYMessages.c:800
 msgid "Can't proceed without a username and password."
 msgstr "Kan niet verder zonder gebruikersnaam en wachtwoord."
 
-#: LYMessages.c:799
+#: LYMessages.c:801
 msgid "Can't retry with authorization!  Contact the server's WebMaster."
 msgstr "Herhalen gaat niet met autorisatie!  Vraag beheerder van de webserver."
 
-#: LYMessages.c:800
+#: LYMessages.c:802
 msgid "Can't retry with proxy authorization!  Contact the server's WebMaster."
 msgstr "Herhalen gaat niet met proxy-autorisatie!  Vraag beheerder van de webserver."
 
-#: LYMessages.c:801
+#: LYMessages.c:803
 msgid "Retrying with proxy authorization information."
 msgstr "Nieuwe poging met proxy-autorisatie-informatie."
 
-#: LYMessages.c:802
+#: LYMessages.c:804
 #, c-format
 msgid "SSL error:%s-Continue?"
 msgstr "SSL-fout: %s -- Verdergaan?"
 
 #. HTWAIS.c
-#: LYMessages.c:805
+#: LYMessages.c:807
 msgid "HTWAIS: Return message too large."
 msgstr "HTWAIS: Geretourneerd bericht is te groot."
 
-#: LYMessages.c:806
+#: LYMessages.c:808
 msgid "Enter WAIS query: "
 msgstr "Voer een WAIS-verzoek in: "
 
 #. Miscellaneous status
-#: LYMessages.c:809
+#: LYMessages.c:811
 msgid "Retrying as HTTP0 request."
 msgstr "Nieuwe poging als HTTP0-verzoek."
 
-#: LYMessages.c:810
+#: LYMessages.c:812
 #, c-format
 msgid "Transferred %d bytes"
 msgstr "%d bytes overgezet"
 
-#: LYMessages.c:811
+#: LYMessages.c:813
 msgid "Data transfer complete"
 msgstr "Gegevensoverdracht is voltooid"
 
-#: LYMessages.c:812
+#: LYMessages.c:814
 #, c-format
 msgid "Error processing line %d of %s\n"
 msgstr "Fout bij verwerking van regel %d van %s\n"
 
 #. Lynx internal page titles
-#: LYMessages.c:815
+#: LYMessages.c:817
 msgid "Address List Page"
 msgstr "Adreslijst Pagina"
 
-#: LYMessages.c:816
+#: LYMessages.c:818
 msgid "Bookmark file"
 msgstr "Boekenleggerbestand"
 
-#: LYMessages.c:817
+#: LYMessages.c:819
 msgid "Configuration Definitions"
 msgstr "Instellingen"
 
-#: LYMessages.c:818
+#: LYMessages.c:820
 msgid "Cookie Jar"
 msgstr "Koekjestrommel"
 
-#: LYMessages.c:819
+#: LYMessages.c:821
 msgid "Current Key Map"
 msgstr "Huidige toetsenbordindeling"
 
-#: LYMessages.c:820
+#: LYMessages.c:822
 msgid "File Management Options"
 msgstr "Bestandsbeheeropties"
 
-#: LYMessages.c:821
+#: LYMessages.c:823
 msgid "Download Options"
 msgstr "Downloadopties"
 
-#: LYMessages.c:822
+#: LYMessages.c:824
 msgid "History Page"
 msgstr "Historiepagina"
 
-#: LYMessages.c:823
+#: LYMessages.c:825
 msgid "Cache Jar"
 msgstr "Cachetrommel"
 
-#: LYMessages.c:824
+#: LYMessages.c:826
 msgid "List Page"
 msgstr "Lijstenpagina"
 
-#: LYMessages.c:825
+#: LYMessages.c:827
 msgid "Lynx.cfg Information"
 msgstr "Lynx.cfg-informatie"
 
-#: LYMessages.c:826
+#: LYMessages.c:828
 msgid "Converted Mosaic Hotlist"
 msgstr "Geconverteerde Mosaic-hotlist"
 
-#: LYMessages.c:827
+#: LYMessages.c:829
 msgid "Options Menu"
 msgstr "Optiesmenu"
 
-#: LYMessages.c:828
+#: LYMessages.c:830
 msgid "File Permission Options"
 msgstr "Opties voor bestandstoegangsrechten"
 
-#: LYMessages.c:829
+#: LYMessages.c:831
 msgid "Printing Options"
 msgstr "Afdrukopties"
 
-#: LYMessages.c:830
+#: LYMessages.c:832
 msgid "Information about the current document"
 msgstr "Informatie over het huidige document"
 
-#: LYMessages.c:831
+#: LYMessages.c:833
 msgid "Your recent statusline messages"
 msgstr "Recente berichten van de statusregel"
 
-#: LYMessages.c:832
+#: LYMessages.c:834
 msgid "Upload Options"
 msgstr "Uploadopties"
 
-#: LYMessages.c:833
+#: LYMessages.c:835
 msgid "Visited Links Page"
 msgstr "Bezochte links-pagina"
 
 #. CONFIG_DEF_TITLE subtitles
-#: LYMessages.c:836
+#: LYMessages.c:838
 msgid "See also"
 msgstr "Zie ook"
 
-#: LYMessages.c:837
+#: LYMessages.c:839
 msgid "your"
 msgstr "uw"
 
-#: LYMessages.c:838
+#: LYMessages.c:840
 msgid "for runtime options"
 msgstr "voor uitvoeropties"
 
-#: LYMessages.c:839
+#: LYMessages.c:841
 msgid "compile time options"
 msgstr "compilatieopties"
 
-#: LYMessages.c:840
+#: LYMessages.c:842
 msgid "color-style configuration"
 msgstr "instellingen van kleurstijl"
 
-#: LYMessages.c:841
+#: LYMessages.c:843
 msgid "latest release"
 msgstr "laatste versie"
 
-#: LYMessages.c:842
+#: LYMessages.c:844
 msgid "pre-release version"
 msgstr "testversie"
 
-#: LYMessages.c:843
+#: LYMessages.c:845
 msgid "development version"
 msgstr "ontwikkelversie"
 
 #. #define AUTOCONF_CONFIG_CACHE
-#: LYMessages.c:845
+#: LYMessages.c:847
 msgid ""
 "The following data were derived during the automatic configuration/build\n"
 "process of this copy of Lynx.  When reporting a bug, please include a copy\n"
@@ -2712,7 +2727,7 @@ msgstr ""
 "een programmafout rapporteert."
 
 #. #define AUTOCONF_LYNXCFG_H
-#: LYMessages.c:849
+#: LYMessages.c:851
 msgid ""
 "The following data were used as automatically-configured compile-time\n"
 "definitions when this copy of Lynx was built."
@@ -2721,110 +2736,116 @@ msgstr ""
 "definities tijdens het compileren van dit exemplaar van Lynx."
 
 #. #define DIRED_NOVICELINE
-#: LYMessages.c:854
+#: LYMessages.c:856
 msgid "  C)reate  D)ownload  E)dit  F)ull menu  M)odify  R)emove  T)ag  U)pload     \n"
 msgstr "C)reëer D)ownload E)dit F)-volledig menu M)-wijzig R)-wis T)-vink U)pload\n"
 
-#: LYMessages.c:855
+#: LYMessages.c:857
 msgid "Failed to obtain status of current link!"
 msgstr "Kan status van de huidige link niet verkrijgen!"
 
 #. #define INVALID_PERMIT_URL
-#: LYMessages.c:858
+#: LYMessages.c:860
 msgid "Special URL only valid from current File Permission menu!"
 msgstr "Speciale URL is alleen geldig vanuit huidige Bestandstoegangsrechten-menu!"
 
-#: LYMessages.c:862
+#: LYMessages.c:864
 msgid "External support is currently disabled."
 msgstr "Externe ondersteuning is momenteel uitgeschakeld."
 
 #. new with 2.8.4dev.21
-#: LYMessages.c:866
+#: LYMessages.c:868
 msgid "Changing working-directory is currently disabled."
 msgstr "De werkmap wijzigen is momenteel uitgeschakeld."
 
-#: LYMessages.c:867
+#: LYMessages.c:869
 msgid "Linewrap OFF!"
 msgstr "Regelvouwen UIT!"
 
-#: LYMessages.c:868
+#: LYMessages.c:870
 msgid "Linewrap ON!"
 msgstr "Regelvouwen AAN!"
 
-#: LYMessages.c:869
+#: LYMessages.c:871
 msgid "Parsing nested-tables toggled OFF!  Reloading..."
 msgstr "Ontleden van geneste tabellen is UIT gezet!  Herladen..."
 
-#: LYMessages.c:870
+#: LYMessages.c:872
 msgid "Parsing nested-tables toggled ON!  Reloading..."
 msgstr "Ontleden van geneste tabellen is AAN gezet!  Herladen..."
 
-#: LYMessages.c:871
+#: LYMessages.c:873
 msgid "Shifting is disabled while line-wrap is in effect"
 msgstr "Gebruik van shift is uitgeschakeld als regelvouwen in gebruik is"
 
-#: LYMessages.c:872
+#: LYMessages.c:874
 msgid "Trace not supported"
 msgstr "Traceren wordt niet ondersteund"
 
-#: LYMessages.c:793
+#: LYMessages.c:795
 #, c-format
 msgid "\tIndents: first=%.0f others=%.0f, Height=%.1f Desc=%.1f\n"
 msgstr "        Inspringen: eerste=%.0f overigen=%.0f, hoogte=%.1f omschr=%.1f\n"
 
-#: WWW/Library/Implementation/HTAABrow.c:626
+#.
+#. * Set up the message for the username prompt, and then issue the
+#. * prompt.  The default username is included in the call to the
+#. * prompting function, but the password is NULL-ed and always replaced.
+#. * - FM
+#.
+#: WWW/Library/Implementation/HTAABrow.c:634
 #, c-format
 msgid "Username for '%s' at %s '%s%s':"
 msgstr "Gebruikersnaam voor '%s' op %s '%s%s':"
 
-#: WWW/Library/Implementation/HTAABrow.c:894
+#: WWW/Library/Implementation/HTAABrow.c:904
 msgid "This client doesn't know how to compose proxy authorization information for scheme"
 msgstr "Dit programma weet niet hoe proxy-autorisatie-informatie te maken voor schema"
 
-#: WWW/Library/Implementation/HTAABrow.c:971
+#: WWW/Library/Implementation/HTAABrow.c:983
 msgid "This client doesn't know how to compose authorization information for scheme"
 msgstr "Dit programma weet niet hoe autorisatie-informatie te maken voor schema"
 
-#: WWW/Library/Implementation/HTAABrow.c:1079
+#: WWW/Library/Implementation/HTAABrow.c:1093
 #, c-format
 msgid "Invalid header '%s%s%s%s%s'"
 msgstr "Foutieve kop '%s%s%s%s%s'"
 
-#: WWW/Library/Implementation/HTAABrow.c:1181
+#: WWW/Library/Implementation/HTAABrow.c:1198
 msgid "Proxy authorization required -- retrying"
 msgstr "Proxy-autorisatie is vereist -- nieuwe poging"
 
-#: WWW/Library/Implementation/HTAABrow.c:1239
+#: WWW/Library/Implementation/HTAABrow.c:1256
 msgid "Access without authorization denied -- retrying"
 msgstr "Toegang zonder autorisatie is geweigerd -- nieuwe poging"
 
-#: WWW/Library/Implementation/HTAccess.c:688
+#: WWW/Library/Implementation/HTAccess.c:698
 msgid "Access forbidden by rule"
 msgstr "Toegang is verboden volgens regel"
 
-#: WWW/Library/Implementation/HTAccess.c:783
+#: WWW/Library/Implementation/HTAccess.c:793
 msgid "Document with POST content not found in cache.  Resubmit?"
 msgstr "Document met POST inhoud niet gevonden in cache.  Nog eens verzenden?"
 
-#: WWW/Library/Implementation/HTAccess.c:938
+#: WWW/Library/Implementation/HTAccess.c:949
 msgid "Loading failed, use a previous copy."
 msgstr "Het laden is mislukt, gebruik een vroegere kopie."
 
-#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8542
+#: WWW/Library/Implementation/HTAccess.c:1058 src/GridText.c:8867
 msgid "Loading incomplete."
 msgstr "Laden niet voltooid."
 
-#: WWW/Library/Implementation/HTAccess.c:1078
+#: WWW/Library/Implementation/HTAccess.c:1089
 #, c-format
 msgid "**** HTAccess: socket or file number returned by obsolete load routine!\n"
 msgstr "**** HTAccess: socket of bestandsnummer teruggegeven door verouderde laadroutine!\n"
 
-#: WWW/Library/Implementation/HTAccess.c:1080
+#: WWW/Library/Implementation/HTAccess.c:1091
 #, c-format
 msgid "**** HTAccess: Internal software error.  Please mail lynx-dev@nongnu.org!\n"
 msgstr "**** HTAccess: Interne fout.  Meld dit aan <lynx-dev@nongnu.org>!\n"
 
-#: WWW/Library/Implementation/HTAccess.c:1081
+#: WWW/Library/Implementation/HTAccess.c:1092
 #, c-format
 msgid "**** HTAccess: Status returned was: %d\n"
 msgstr "**** HTAccess: Geretourneerde status was: %d\n"
@@ -2833,96 +2854,96 @@ msgstr "**** HTAccess: Geretourneerde status was: %d\n"
 #. * hack: if we fail in HTAccess.c
 #. * avoid duplicating URL, oh.
 #.
-#: WWW/Library/Implementation/HTAccess.c:1087 src/LYMainLoop.c:7756
+#: WWW/Library/Implementation/HTAccess.c:1098 src/LYMainLoop.c:8050
 msgid "Can't Access"
 msgstr "Kan geen toegang krijgen"
 
-#: WWW/Library/Implementation/HTAccess.c:1095
+#: WWW/Library/Implementation/HTAccess.c:1106
 msgid "Unable to access document."
 msgstr "Kan geen toegang krijgen tot document."
 
-#: WWW/Library/Implementation/HTFTP.c:843
+#: WWW/Library/Implementation/HTFTP.c:849
 #, c-format
 msgid "Enter password for user %s@%s:"
 msgstr "Voer wachtwoord in voor gebruiker %s@%s:"
 
-#: WWW/Library/Implementation/HTFTP.c:871
+#: WWW/Library/Implementation/HTFTP.c:877
 msgid "Unable to connect to FTP host."
 msgstr "Kan geen verbinding maken met FTP-host."
 
-#: WWW/Library/Implementation/HTFTP.c:1152
+#: WWW/Library/Implementation/HTFTP.c:1158
 msgid "close master socket"
 msgstr "hoofdsocket sluiten"
 
-#: WWW/Library/Implementation/HTFTP.c:1214
+#: WWW/Library/Implementation/HTFTP.c:1220
 msgid "socket for master socket"
 msgstr "socket voor hoofdsocket"
 
-#: WWW/Library/Implementation/HTFTP.c:2977
+#: WWW/Library/Implementation/HTFTP.c:2986
 msgid "Receiving FTP directory."
 msgstr "Ophalen van FTP-bestandenoverzicht."
 
-#: WWW/Library/Implementation/HTFTP.c:3113
+#: WWW/Library/Implementation/HTFTP.c:3122
 #, c-format
 msgid "Transferred %d bytes (%5d)"
 msgstr "%d bytes overgezet (%5d)"
 
-#: WWW/Library/Implementation/HTFTP.c:3467
+#: WWW/Library/Implementation/HTFTP.c:3480
 msgid "connect for data"
 msgstr "verbinden voor datastroom"
 
-#: WWW/Library/Implementation/HTFTP.c:4128
+#: WWW/Library/Implementation/HTFTP.c:4141
 msgid "Receiving FTP file."
 msgstr "Ophalen van FTP-bestand."
 
-#: WWW/Library/Implementation/HTFinger.c:273
+#: WWW/Library/Implementation/HTFinger.c:278
 msgid "Could not set up finger connection."
 msgstr "Kan finger-verbinding niet maken."
 
-#: WWW/Library/Implementation/HTFinger.c:320
+#: WWW/Library/Implementation/HTFinger.c:325
 msgid "Could not load data (no sitename in finger URL)"
 msgstr "Kan gegevens niet laden (geen site-naam in finger-URL)"
 
-#: WWW/Library/Implementation/HTFinger.c:326
+#: WWW/Library/Implementation/HTFinger.c:329
 msgid "Invalid port number - will only use port 79!"
 msgstr "Ongeldig poortnummer -- zal alleen poort 79 gebruiken!"
 
-#: WWW/Library/Implementation/HTFinger.c:392
+#: WWW/Library/Implementation/HTFinger.c:395
 msgid "Could not access finger host."
 msgstr "Kan finger-host niet bereiken."
 
-#: WWW/Library/Implementation/HTFinger.c:400
+#: WWW/Library/Implementation/HTFinger.c:403
 msgid "No response from finger server."
 msgstr "Geen antwoord van finger-server."
 
-#: WWW/Library/Implementation/HTNews.c:426
+#: WWW/Library/Implementation/HTNews.c:421
 #, c-format
 msgid "Username for news host '%s':"
 msgstr "Gebruikersnaam voor nieuws-host '%s':"
 
-#: WWW/Library/Implementation/HTNews.c:479
+#: WWW/Library/Implementation/HTNews.c:474
 msgid "Change username?"
 msgstr "Gebruikersnaam wijzigen?"
 
-#: WWW/Library/Implementation/HTNews.c:483
+#: WWW/Library/Implementation/HTNews.c:478
 msgid "Username:"
 msgstr "Gebruikersnaam:"
 
-#: WWW/Library/Implementation/HTNews.c:508
+#: WWW/Library/Implementation/HTNews.c:503
 #, c-format
 msgid "Password for news host '%s':"
 msgstr "Wachtwoord voor nieuws-host '%s':"
 
-#: WWW/Library/Implementation/HTNews.c:591
+#: WWW/Library/Implementation/HTNews.c:586
 msgid "Change password?"
 msgstr "Wachtwoord wijzigen?"
 
-#: WWW/Library/Implementation/HTNews.c:1711
+#: WWW/Library/Implementation/HTNews.c:1707
 #, c-format
 msgid "No matches for: %s"
 msgstr "Geen overeenkomsten voor: %s"
 
-#: WWW/Library/Implementation/HTNews.c:1761
+#: WWW/Library/Implementation/HTNews.c:1757
 msgid ""
 "\n"
 "No articles in this group.\n"
@@ -2930,7 +2951,7 @@ msgstr ""
 "\n"
 "Geen artikelen gevonden in deze groep.\n"
 
-#: WWW/Library/Implementation/HTNews.c:1773
+#: WWW/Library/Implementation/HTNews.c:1769
 msgid ""
 "\n"
 "No articles in this range.\n"
@@ -2941,16 +2962,16 @@ msgstr ""
 #.
 #. * Set window title.
 #.
-#: WWW/Library/Implementation/HTNews.c:1786
+#: WWW/Library/Implementation/HTNews.c:1782
 #, c-format
 msgid "%s,  Articles %d-%d"
 msgstr "%s,  Artikelen %d-%d"
 
-#: WWW/Library/Implementation/HTNews.c:1809
+#: WWW/Library/Implementation/HTNews.c:1805
 msgid "Earlier articles"
 msgstr "Eerdere artikelen"
 
-#: WWW/Library/Implementation/HTNews.c:1822
+#: WWW/Library/Implementation/HTNews.c:1818
 #, c-format
 msgid ""
 "\n"
@@ -2960,41 +2981,41 @@ msgstr ""
 "\n"
 "Er zijn momenteel ongeveer %d artikelen beschikbaar in %s, met volgende ID's:\n"
 
-#: WWW/Library/Implementation/HTNews.c:1884
+#: WWW/Library/Implementation/HTNews.c:1880
 msgid "All available articles in "
 msgstr "Alle beschikbare artikelen in "
 
-#: WWW/Library/Implementation/HTNews.c:2098
+#: WWW/Library/Implementation/HTNews.c:2094
 msgid "Later articles"
 msgstr "Latere artikelen"
 
-#: WWW/Library/Implementation/HTNews.c:2121
+#: WWW/Library/Implementation/HTNews.c:2117
 msgid "Post to "
 msgstr "Posten naar "
 
-#: WWW/Library/Implementation/HTNews.c:2342
+#: WWW/Library/Implementation/HTNews.c:2338
 msgid "This client does not contain support for SNEWS URLs."
 msgstr "Dit programma ondersteunt geen SNEWS-URL's."
 
-#: WWW/Library/Implementation/HTNews.c:2550
+#: WWW/Library/Implementation/HTNews.c:2545
 msgid "No target for raw text!"
 msgstr "Geen bestemming voor ruwe tekst!"
 
-#: WWW/Library/Implementation/HTNews.c:2581
+#: WWW/Library/Implementation/HTNews.c:2575
 msgid "Connecting to NewsHost ..."
 msgstr "Verbinden met nieuws-host ..."
 
-#: WWW/Library/Implementation/HTNews.c:2633
+#: WWW/Library/Implementation/HTNews.c:2627
 #, c-format
 msgid "Could not access %s."
 msgstr "Geen toegang tot %s."
 
-#: WWW/Library/Implementation/HTNews.c:2739
+#: WWW/Library/Implementation/HTNews.c:2733
 #, c-format
 msgid "Can't read news info.  News host %.20s responded: %.200s"
 msgstr "Kan nieuwsinformatie niet lezen.  Nieuws-host %.20s antwoordde: %.200s"
 
-#: WWW/Library/Implementation/HTNews.c:2743
+#: WWW/Library/Implementation/HTNews.c:2737
 #, c-format
 msgid "Can't read news info, empty response from host %s"
 msgstr "Kan nieuwsinformatie niet lezen; loos antwoord van host %s"
@@ -3002,35 +3023,35 @@ msgstr "Kan nieuwsinformatie niet lezen; loos antwoord van host %s"
 #.
 #. * List available newsgroups.  - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2947
+#: WWW/Library/Implementation/HTNews.c:2941
 msgid "Reading list of available newsgroups."
 msgstr "Lezen van lijst met beschikbare nieuwsgroepen."
 
-#: WWW/Library/Implementation/HTNews.c:2968
+#: WWW/Library/Implementation/HTNews.c:2962
 msgid "Reading list of articles in newsgroup."
 msgstr "Lezen van lijst met artikelen in nieuwsgroep."
 
 #.
 #. * Get an article from a news group.  - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2974
+#: WWW/Library/Implementation/HTNews.c:2968
 msgid "Reading news article."
 msgstr "Lezen van nieuwsartikel."
 
-#: WWW/Library/Implementation/HTNews.c:3004
+#: WWW/Library/Implementation/HTNews.c:2998
 msgid "Sorry, could not load requested news."
 msgstr "Sorry, kan het opgevraagde nieuws niet laden."
 
-#: WWW/Library/Implementation/HTTCP.c:1282
+#: WWW/Library/Implementation/HTTCP.c:1286
 msgid "Address has invalid port"
 msgstr "Adres bevat ongeldige poort"
 
-#: WWW/Library/Implementation/HTTCP.c:1358
+#: WWW/Library/Implementation/HTTCP.c:1362
 msgid "Address length looks invalid"
 msgstr "Adreslengte ziet er ongeldig uit"
 
-#: WWW/Library/Implementation/HTTCP.c:1618
-#: WWW/Library/Implementation/HTTCP.c:1636
+#: WWW/Library/Implementation/HTTCP.c:1622
+#: WWW/Library/Implementation/HTTCP.c:1640
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr "Kan gindse computer %s niet vinden."
@@ -3039,131 +3060,132 @@ msgstr "Kan gindse computer %s niet vinden."
 #. * but not HTAlert, because typically there will be other
 #. * alerts from the callers.  - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1633
+#: WWW/Library/Implementation/HTTCP.c:1637
 #: WWW/Library/Implementation/HTTelnet.c:115
 #, c-format
 msgid "Invalid hostname %s"
 msgstr "Ongeldige hostnaam %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1647
+#: WWW/Library/Implementation/HTTCP.c:1651
 #, c-format
 msgid "Making %s connection to %s"
 msgstr "Maken van %s-verbinding met %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1658
+#: WWW/Library/Implementation/HTTCP.c:1662
 msgid "socket failed."
 msgstr "socket is mislukt."
 
-#: WWW/Library/Implementation/HTTCP.c:1671
+#: WWW/Library/Implementation/HTTCP.c:1676
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
 msgstr "socket is mislukt: familie %d adres %s poort %s."
 
-#: WWW/Library/Implementation/HTTCP.c:1695
+#: WWW/Library/Implementation/HTTCP.c:1700
 msgid "Could not make connection non-blocking."
 msgstr "Kan verbinding niet niet-blokkerend maken."
 
-#: WWW/Library/Implementation/HTTCP.c:1763
+#: WWW/Library/Implementation/HTTCP.c:1768
 msgid "Connection failed (too many retries)."
 msgstr "Verbinden is mislukt (te vaak opnieuw geprobeerd)."
 
-#: WWW/Library/Implementation/HTTCP.c:1950
+#: WWW/Library/Implementation/HTTCP.c:1955
 msgid "Could not restore socket to blocking."
 msgstr "Kan socket niet naar blokkerende modus herstellen."
 
-#: WWW/Library/Implementation/HTTCP.c:2016
+#: WWW/Library/Implementation/HTTCP.c:2021
 msgid "Socket read failed (too many tries)."
 msgstr "Socket uitlezen is mislukt (te vaak opnieuw geprobeerd)."
 
-#: WWW/Library/Implementation/HTTP.c:84
+#: WWW/Library/Implementation/HTTP.c:81
 #, c-format
 msgid "SSL callback:%s, preverify_ok=%d, ssl_okay=%d"
 msgstr "SSL callback:%s, preverify_ok=%d, ssl_okay=%d"
 
-#: WWW/Library/Implementation/HTTP.c:406
+#: WWW/Library/Implementation/HTTP.c:432
 #, c-format
 msgid "Address contains a username: %s"
 msgstr "Adres bevat een gebruikersnaam: %s"
 
-#: WWW/Library/Implementation/HTTP.c:460
+#: WWW/Library/Implementation/HTTP.c:486
 #, c-format
 msgid "Certificate issued by: %s"
 msgstr "Certificaat is uitgeven door: %s"
 
-#: WWW/Library/Implementation/HTTP.c:643
+#: WWW/Library/Implementation/HTTP.c:673
 msgid "This client does not contain support for HTTPS URLs."
 msgstr "Dit programma ondersteunt geen HTTPS-URL's."
 
-#: WWW/Library/Implementation/HTTP.c:668
+#: WWW/Library/Implementation/HTTP.c:698
 msgid "Unable to connect to remote host."
 msgstr "Kan geen verbinding maken met gindse computer."
 
-#: WWW/Library/Implementation/HTTP.c:692
+#: WWW/Library/Implementation/HTTP.c:730
 msgid "Retrying connection without TLS."
 msgstr "Verbinding wordt opnieuw geprobeerd zonder TLS."
 
-#: WWW/Library/Implementation/HTTP.c:737
+#: WWW/Library/Implementation/HTTP.c:773
 msgid "no issuer was found"
 msgstr "geen uitgever gevonden"
 
-#: WWW/Library/Implementation/HTTP.c:739
+#: WWW/Library/Implementation/HTTP.c:775
 msgid "issuer is not a CA"
 msgstr "uitgever is geen CA"
 
-#: WWW/Library/Implementation/HTTP.c:741
+#: WWW/Library/Implementation/HTTP.c:777
 msgid "the certificate has no known issuer"
 msgstr "het certificaat heeft geen bekende uitgever"
 
-#: WWW/Library/Implementation/HTTP.c:743
+#: WWW/Library/Implementation/HTTP.c:779
 msgid "the certificate has been revoked"
 msgstr "het certificaat is herroepen"
 
-#: WWW/Library/Implementation/HTTP.c:745
+#: WWW/Library/Implementation/HTTP.c:781
 msgid "the certificate is not trusted"
 msgstr "het certificaat wordt niet vertrouwd"
 
-#: WWW/Library/Implementation/HTTP.c:821
+#: WWW/Library/Implementation/HTTP.c:855
 #, c-format
 msgid "Verified connection to %s (cert=%s)"
 msgstr "Geverifieerde verbinding met %s (cert=%s)"
 
-#: WWW/Library/Implementation/HTTP.c:869 WWW/Library/Implementation/HTTP.c:911
+#: WWW/Library/Implementation/HTTP.c:903 WWW/Library/Implementation/HTTP.c:945
 #, c-format
 msgid "Verified connection to %s (subj=%s)"
 msgstr "Geverifieerde verbinding met %s (subj=%s)"
 
-#: WWW/Library/Implementation/HTTP.c:941
+#: WWW/Library/Implementation/HTTP.c:975
 msgid "Can't find common name in certificate"
 msgstr "Kan in certificaat geen gewone naam vinden"
 
-#: WWW/Library/Implementation/HTTP.c:944
+#: WWW/Library/Implementation/HTTP.c:978
 #, c-format
 msgid "SSL error:host(%s)!=cert(%s)-Continue?"
 msgstr "SSL-fout: computer(%s)!=certificaat(%s).  Verdergaan?"
 
-#: WWW/Library/Implementation/HTTP.c:957
+#: WWW/Library/Implementation/HTTP.c:991
 #, c-format
 msgid "UNVERIFIED connection to %s (cert=%s)"
 msgstr "ONGEVERIFIEERDE verbinding met %s (cert=%s)"
 
-#: WWW/Library/Implementation/HTTP.c:966
+#: WWW/Library/Implementation/HTTP.c:1000
 #, c-format
 msgid "Secure %d-bit %s (%s) HTTP connection"
 msgstr "Veilige %d-bits %s (%s) HTTP-verbinding"
 
-#: WWW/Library/Implementation/HTTP.c:1433
+#: WWW/Library/Implementation/HTTP.c:1467
 msgid "Sending HTTP request."
 msgstr "Zenden van HTTP-verzoek."
 
-#: WWW/Library/Implementation/HTTP.c:1472
+#: WWW/Library/Implementation/HTTP.c:1509
 msgid "Unexpected network write error; connection aborted."
 msgstr "Onverwachte fout bij schrijven naar netwerk; verbinding is verbroken."
 
-#: WWW/Library/Implementation/HTTP.c:1478
+#: WWW/Library/Implementation/HTTP.c:1515
 msgid "HTTP request sent; waiting for response."
 msgstr "HTTP-verzoek is verzonden; wacht op antwoord."
 
-#: WWW/Library/Implementation/HTTP.c:1546
+#: WWW/Library/Implementation/HTTP.c:1588
+#: WWW/Library/Implementation/HTTP.c:1598
 msgid "Unexpected network read error; connection aborted."
 msgstr "Onverwachte fout bij lezen uit netwerk; verbinding is verbroken."
 
@@ -3176,7 +3198,7 @@ msgstr "Onverwachte fout bij lezen uit netwerk; verbinding is verbroken."
 #. * line and possibly other headers, so we'll deal with them by
 #. * showing the full header to the user as text/plain.  - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1740
+#: WWW/Library/Implementation/HTTP.c:1800
 msgid "Got unexpected Informational Status."
 msgstr "Onverwachte informatieve status ontvangen."
 
@@ -3186,7 +3208,7 @@ msgstr "Onverwachte informatieve status ontvangen."
 #. * content.  We'll instruct the user to do that, and
 #. * restore the current document.  - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1774
+#: WWW/Library/Implementation/HTTP.c:1834
 msgid "Request fulfilled.  Reset Content."
 msgstr "Verzoek is volbracht.  Herstellen van inhoud."
 
@@ -3196,27 +3218,27 @@ msgstr "Verzoek is volbracht.  Herstellen van inhoud."
 #. * status is inappropriate.  We'll deal with it by showing
 #. * the full header to the user as text/plain.  - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1891
+#: WWW/Library/Implementation/HTTP.c:1949
 msgid "Got unexpected 304 Not Modified status."
 msgstr "Kreeg een onverwachte '304 Niet gewijzigd'-statusmelding."
 
-#: WWW/Library/Implementation/HTTP.c:1954
+#: WWW/Library/Implementation/HTTP.c:2012
 msgid "Redirection of POST content requires user approval."
 msgstr "Doorverwijzing van POST-inhoud vereist toestemming van de gebruiker."
 
-#: WWW/Library/Implementation/HTTP.c:1969
+#: WWW/Library/Implementation/HTTP.c:2027
 msgid "Have POST content.  Treating Permanent Redirection as Temporary.\n"
 msgstr "Heb POST-inhoud.  Permanente doorverwijzing wordt behandeld als een tijdelijke.\n"
 
-#: WWW/Library/Implementation/HTTP.c:2011
+#: WWW/Library/Implementation/HTTP.c:2071
 msgid "Retrying with access authorization information."
 msgstr "Bezig opnieuw te proberen met toegangsautorisatie-informatie."
 
-#: WWW/Library/Implementation/HTTP.c:2023
+#: WWW/Library/Implementation/HTTP.c:2083
 msgid "Show the 401 message body?"
 msgstr "Inhoud van het 401-bericht laten zien?"
 
-#: WWW/Library/Implementation/HTTP.c:2066
+#: WWW/Library/Implementation/HTTP.c:2127
 msgid "Show the 407 message body?"
 msgstr "Inhoud van het 407-bericht laten zien?"
 
@@ -3224,7 +3246,7 @@ msgstr "Inhoud van het 407-bericht laten zien?"
 #. * Bad or unknown server_status number.  Take a chance and hope
 #. * there is something to display.  - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:2166
+#: WWW/Library/Implementation/HTTP.c:2227
 msgid "Unknown status reply from server!"
 msgstr "Onbekende statusmelding van server!"
 
@@ -3233,15 +3255,15 @@ msgstr "Onbekende statusmelding van server!"
 msgid "remote %s session:"
 msgstr "sessie %s op andere computer:"
 
-#: WWW/Library/Implementation/HTWAIS.c:162
+#: WWW/Library/Implementation/HTWAIS.c:163
 msgid "Could not connect to WAIS server."
 msgstr "Kan verbinding met WAIS-server niet tot stand brengen."
 
-#: WWW/Library/Implementation/HTWAIS.c:170
+#: WWW/Library/Implementation/HTWAIS.c:171
 msgid "Could not open WAIS connection for reading."
 msgstr "Kan WAIS-verbinding voor lezen niet tot stand brengen."
 
-#: WWW/Library/Implementation/HTWAIS.c:192
+#: WWW/Library/Implementation/HTWAIS.c:193
 msgid "Diagnostic code is "
 msgstr "Diagnostische code is "
 
@@ -3332,7 +3354,7 @@ msgid ""
 "Enter the 's'earch command and then specify search words.\n"
 msgstr ""
 "\n"
-"Typ het 's'-zoekcommando en specificeer dan zoektermen.\n"
+"Typ de zoekopdracht ('s') en specificeer dan zoektermen.\n"
 
 #: WWW/Library/Implementation/HTWAIS.c:836
 msgid " (in "
@@ -3379,143 +3401,143 @@ msgstr "Ophalen van WAIS-document..."
 msgid "No text was returned!\n"
 msgstr "Er is geen tekst geretourneerd!\n"
 
-#: WWW/Library/Implementation/HTWSRC.c:296
+#: WWW/Library/Implementation/HTWSRC.c:301
 msgid " NOT GIVEN in source file; "
 msgstr " NIET OPGEGEVEN in bronbestand; "
 
-#: WWW/Library/Implementation/HTWSRC.c:319
+#: WWW/Library/Implementation/HTWSRC.c:324
 msgid " WAIS source file"
 msgstr " WAIS-bronbestand"
 
-#: WWW/Library/Implementation/HTWSRC.c:326
+#: WWW/Library/Implementation/HTWSRC.c:331
 msgid " description"
 msgstr " omschrijving"
 
-#: WWW/Library/Implementation/HTWSRC.c:336
+#: WWW/Library/Implementation/HTWSRC.c:341
 msgid "Access links"
 msgstr "Toegangs-links"
 
-#: WWW/Library/Implementation/HTWSRC.c:357
+#: WWW/Library/Implementation/HTWSRC.c:362
 msgid "Direct access"
 msgstr "Directe toegang"
 
 #. * Proxy will be used if defined, so let user know that - FM *
-#: WWW/Library/Implementation/HTWSRC.c:360
+#: WWW/Library/Implementation/HTWSRC.c:365
 msgid " (or via proxy server, if defined)"
 msgstr " (of via een proxy-server, indien opgegeven)"
 
-#: WWW/Library/Implementation/HTWSRC.c:375
+#: WWW/Library/Implementation/HTWSRC.c:380
 msgid "Maintainer"
 msgstr "Beheerder"
 
-#: WWW/Library/Implementation/HTWSRC.c:383
+#: WWW/Library/Implementation/HTWSRC.c:388
 msgid "Host"
 msgstr "Computer"
 
-#: src/GridText.c:705
+#: src/GridText.c:699
 msgid "Memory exhausted, display interrupted!"
 msgstr "Geen geheugen meer beschikbar, weergave is onderbroken!"
 
-#: src/GridText.c:710
+#: src/GridText.c:704
 msgid "Memory exhausted, will interrupt transfer!"
 msgstr "Geen geheugen meer beschikbaar, overdracht wordt afgebroken!"
 
-#: src/GridText.c:3654
+#: src/GridText.c:3685
 msgid " *** MEMORY EXHAUSTED ***"
 msgstr " *** ONVOLDOENDE GEHEUGEN BESCHIKBAAR ***"
 
-#: src/GridText.c:6089 src/GridText.c:6096 src/LYList.c:239
-msgid "unknown field or link"
-msgstr "onbekend veld of link"
-
-#: src/GridText.c:6105
+#: src/GridText.c:6146
 msgid "text entry field"
 msgstr "tekstinvoerveld"
 
-#: src/GridText.c:6108
+#: src/GridText.c:6149
 msgid "password entry field"
 msgstr "wachtwoordinvoerveld"
 
-#: src/GridText.c:6111
+#: src/GridText.c:6152
 msgid "checkbox"
 msgstr "aanvinkvakje"
 
-#: src/GridText.c:6114
+#: src/GridText.c:6155
 msgid "radio button"
 msgstr "drukknop"
 
-#: src/GridText.c:6117
+#: src/GridText.c:6158
 msgid "submit button"
 msgstr "verzendknop"
 
-#: src/GridText.c:6120
+#: src/GridText.c:6161
 msgid "reset button"
 msgstr "herstelknop"
 
-#: src/GridText.c:6123
+#: src/GridText.c:6164
+msgid "script button"
+msgstr "scriptknop"
+
+#: src/GridText.c:6167
 msgid "popup menu"
 msgstr "popup-menu"
 
-#: src/GridText.c:6126
+#: src/GridText.c:6170
 msgid "hidden form field"
 msgstr "verborgen formulierveld"
 
-#: src/GridText.c:6129
+#: src/GridText.c:6173
 msgid "text entry area"
 msgstr "tekstinvoergebied"
 
-#: src/GridText.c:6132
+#: src/GridText.c:6176
 msgid "range entry field"
 msgstr "bereikinvoerveld"
 
-#: src/GridText.c:6135
+#: src/GridText.c:6179
 msgid "file entry field"
 msgstr "bestandsnaaminvoerveld"
 
-#: src/GridText.c:6138
+#: src/GridText.c:6182
 msgid "text-submit field"
 msgstr "tekst-verzendveld"
 
-#: src/GridText.c:6141
+#: src/GridText.c:6185
 msgid "image-submit button"
 msgstr "afbeelding-verzendknop"
 
-#: src/GridText.c:6144
+#: src/GridText.c:6188
 msgid "keygen field"
 msgstr "sleutelaanmaakveld"
 
-#: src/GridText.c:6147
+#: src/GridText.c:6191
 msgid "unknown form field"
 msgstr "onbekend formulierveld"
 
-#: src/GridText.c:10275
+#: src/GridText.c:6211 src/GridText.c:6218 src/LYList.c:248
+msgid "unknown field or link"
+msgstr "onbekend veld of link"
+
+#: src/GridText.c:10649
 msgid "Can't open file for uploading"
 msgstr "Kan bestand niet openen voor upload"
 
-#: src/GridText.c:11434
+#: src/GridText.c:11837
 #, c-format
 msgid "Submitting %s"
 msgstr "Verzenden van %s"
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12487
+#: src/GridText.c:12894
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr "Ophanging Gedetecteerd: TextAnchor-struct is corrupt - stel voor te onderbreken!"
 
 #. don't show previous state
-#: src/GridText.c:12624
+#: src/GridText.c:13056
 msgid "Wrap lines to fit displayed area?"
 msgstr "Regels omvouwen zodat alles zichtbaar is?"
 
-#: src/GridText.c:12676
-msgid "Very long lines have been wrapped!"
-msgstr "Erg lange regels zijn omgevouwen!"
-
-#: src/GridText.c:13181
+#: src/GridText.c:13696
 msgid "Very long lines have been truncated!"
 msgstr "Erg lange regels zijn afgekapt!"
 
-#: src/HTAlert.c:164 src/LYShowInfo.c:360 src/LYShowInfo.c:364
+#: src/HTAlert.c:164 src/LYShowInfo.c:364 src/LYShowInfo.c:368
 msgid "bytes"
 msgstr "bytes"
 
@@ -3523,32 +3545,32 @@ msgstr "bytes"
 #. * If we know the total size of the file, we can compute
 #. * a percentage, and show a corresponding progress bar.
 #.
-#: src/HTAlert.c:300 src/HTAlert.c:324
+#: src/HTAlert.c:303 src/HTAlert.c:329
 #, c-format
 msgid "Read %s of data"
 msgstr "%s aan gegevens gelezen"
 
-#: src/HTAlert.c:321
+#: src/HTAlert.c:326
 #, c-format
 msgid "Read %s of %s of data"
 msgstr "%s van %s aan gegevens gelezen"
 
-#: src/HTAlert.c:330
+#: src/HTAlert.c:335
 #, c-format
 msgid ", %s/sec"
 msgstr ", %s/s"
 
-#: src/HTAlert.c:342
+#: src/HTAlert.c:347
 #, c-format
 msgid " (stalled for %s)"
 msgstr " (gestopt voor %s)"
 
-#: src/HTAlert.c:346
+#: src/HTAlert.c:351
 #, c-format
 msgid ", ETA %s"
 msgstr ", ETA %s"
 
-#: src/HTAlert.c:368
+#: src/HTAlert.c:373
 msgid " (Press 'z' to abort)"
 msgstr " (Druk op 'z' om te stoppen)"
 
@@ -3577,11 +3599,11 @@ msgstr " (Druk op 'z' om te stoppen)"
 #. * Lynx will also accept y Y n N as responses unless there is a conflict
 #. * with the first letter of the "yes" or "no" translation.
 #.
-#: src/HTAlert.c:406 src/HTAlert.c:454
+#: src/HTAlert.c:411 src/HTAlert.c:459
 msgid "yes"
 msgstr "ja"
 
-#: src/HTAlert.c:409 src/HTAlert.c:455
+#: src/HTAlert.c:414 src/HTAlert.c:460
 msgid "no"
 msgstr "nee"
 
@@ -3601,40 +3623,40 @@ msgstr "nee"
 #. * (Y/N/Always/neVer)              - English (original)
 #. * (O/N/Toujours/Jamais)           - French
 #.
-#: src/HTAlert.c:911
+#: src/HTAlert.c:913
 msgid "Y/N/A/V"
 msgstr "(J/N/A/V)"
 
-#: src/HTML.c:5913
+#: src/HTML.c:5915
 msgid "Description:"
 msgstr "Omschrijving:"
 
-#: src/HTML.c:5918
+#: src/HTML.c:5920
 msgid "(none)"
 msgstr "(geen)"
 
-#: src/HTML.c:5922
+#: src/HTML.c:5924
 msgid "Filepath:"
 msgstr "Bestandspad:"
 
-#: src/HTML.c:5928
+#: src/HTML.c:5930
 msgid "(unknown)"
 msgstr "(onbekend)"
 
-#: src/HTML.c:7355
+#: src/HTML.c:7370
 msgid "Document has only hidden links.  Use the 'l'ist command."
 msgstr "Document heeft slechts verborgen links.  Gebruik het 'l'ijst commando."
 
 # Source?
-#: src/HTML.c:7854
+#: src/HTML.c:7869
 msgid "Source cache error - disk full?"
 msgstr "Cache fout - schijf vol?"
 
-#: src/HTML.c:7867
+#: src/HTML.c:7882
 msgid "Source cache error - not enough memory!"
 msgstr "Cache fout - niet genoeg geheugen!"
 
-#: src/LYBookmark.c:164
+#: src/LYBookmark.c:167
 msgid ""
 "     This file is an HTML representation of the X Mosaic hotlist file.\n"
 "     Outdated or invalid links may be removed by using the\n"
@@ -3646,7 +3668,7 @@ msgstr ""
 "     het 'verwijder boekenlegger', welke doorgaans gekoppeld is aan\n"
 "     de 'R' toets, maar uw systeembeheerder heeft dit wellicht gewijzigd."
 
-#: src/LYBookmark.c:371
+#: src/LYBookmark.c:376
 #, c-format
 msgid ""
 "     You can delete links by the 'R' key<br>\n"
@@ -3655,7 +3677,7 @@ msgstr ""
 "     U kunt links verwijderen met de 'R' toets<br>\n"
 "<ol>\n"
 
-#: src/LYBookmark.c:374
+#: src/LYBookmark.c:379
 msgid ""
 "     You can delete links using the remove bookmark command.  It is usually\n"
 "     the 'R' key but may have been remapped by you or your system\n"
@@ -3665,7 +3687,7 @@ msgstr ""
 "     Dit is doorgaans de 'R' toets, maar uw systeembeheerder kan dit\n"
 "     gewijzigd hebben."
 
-#: src/LYBookmark.c:378
+#: src/LYBookmark.c:383
 msgid ""
 "     This file also may be edited with a standard text editor to delete\n"
 "     outdated or invalid links, or to change their order."
@@ -3673,7 +3695,7 @@ msgstr ""
 "     Dit bestand kan ook met een doorsnee tekst-editor worden gewijzigd om\n"
 "     verlopen of foutieve links te wissen, of om de volgorde aan te passen."
 
-#: src/LYBookmark.c:381
+#: src/LYBookmark.c:386
 msgid ""
 "Note: if you edit this file manually\n"
 "      you should not change the format within the lines\n"
@@ -3685,12 +3707,12 @@ msgstr ""
 "      of andere HTML opmaak toevoegen.\n"
 "      Boekenlegger-links dienen als één regel te worden opgeslagen."
 
-#: src/LYBookmark.c:677
+#: src/LYBookmark.c:684
 #, c-format
 msgid "File may be recoverable from %s during this session"
 msgstr "Het bestand is gedurende deze sessie wellicht terug te halen uit %s"
 
-#: src/LYCgi.c:161
+#: src/LYCgi.c:158
 #, c-format
 msgid "Do you want to execute \"%s\"?"
 msgstr "Wilt u \"%s\" uitvoeren?"
@@ -3699,23 +3721,23 @@ msgstr "Wilt u \"%s\" uitvoeren?"
 #. * Neither the path as given nor any components examined by backing up
 #. * were stat()able.  - kw
 #.
-#: src/LYCgi.c:276
+#: src/LYCgi.c:273
 msgid "Unable to access cgi script"
 msgstr "Geen toegang tot cgi script"
 
-#: src/LYCgi.c:701 src/LYCgi.c:704
+#: src/LYCgi.c:707 src/LYCgi.c:710
 msgid "Good Advice"
 msgstr "Goede Raad"
 
-#: src/LYCgi.c:708
+#: src/LYCgi.c:714
 msgid "An excellent http server for VMS is available via"
 msgstr "Een uitstekende http server voor VMS is bereikbaar via"
 
-#: src/LYCgi.c:715
+#: src/LYCgi.c:721
 msgid "this link"
 msgstr "deze link"
 
-#: src/LYCgi.c:719
+#: src/LYCgi.c:725
 msgid "It provides state of the art CGI script support.\n"
 msgstr "Het biedt voortreffelijke CGI script ondersteuning.\n"
 
@@ -3723,47 +3745,47 @@ msgstr "Het biedt voortreffelijke CGI script ondersteuning.\n"
 msgid "Exiting via interrupt:"
 msgstr "Beëindiging via interrupt:"
 
-#: src/LYCookie.c:2477
+#: src/LYCookie.c:2537
 msgid "(from a previous session)"
 msgstr "(van een eerdere sessie)"
 
-#: src/LYCookie.c:2538
+#: src/LYCookie.c:2598
 msgid "Maximum Gobble Date:"
 msgstr "Uiterste Houdbaarheidsdatum:"
 
-#: src/LYCookie.c:2577
+#: src/LYCookie.c:2637
 msgid "Internal"
 msgstr "Intern"
 
-#: src/LYCookie.c:2578
+#: src/LYCookie.c:2638
 msgid "cookie_domain_flag_set error, aborting program"
 msgstr "cookie_domain_flag_set fout, programma wordt afgebroken"
 
-#: src/LYCurses.c:1088
+#: src/LYCurses.c:1297
 msgid "Terminal initialisation failed - unknown terminal type?"
 msgstr "Terminal initialisatie mislukt - onbekend terminal type?"
 
-#: src/LYCurses.c:1546
+#: src/LYCurses.c:1780
 msgid "Terminal ="
 msgstr "Terminal ="
 
-#: src/LYCurses.c:1550
+#: src/LYCurses.c:1784
 msgid "You must use a vt100, 200, etc. terminal with this program."
 msgstr "U mout een vt100, 200, enz. terminal gebruiken met dit programma."
 
-#: src/LYCurses.c:1599
+#: src/LYCurses.c:1833
 msgid "Your Terminal type is unknown!"
 msgstr "Uw terminal type is onbekend!"
 
-#: src/LYCurses.c:1600
+#: src/LYCurses.c:1834
 msgid "Enter a terminal type:"
 msgstr "Voer een terminal type in:"
 
-#: src/LYCurses.c:1614
+#: src/LYCurses.c:1848
 msgid "TERMINAL TYPE IS SET TO"
 msgstr "TERMINAL TYPE IS GEZET OP"
 
-#: src/LYCurses.c:2127
+#: src/LYCurses.c:2398
 #, c-format
 msgid ""
 "\n"
@@ -3772,7 +3794,7 @@ msgstr ""
 "\n"
 "Een fatale fout is opgetreden in %s Ver. %s\n"
 
-#: src/LYCurses.c:2130
+#: src/LYCurses.c:2401
 #, c-format
 msgid ""
 "\n"
@@ -3790,480 +3812,472 @@ msgstr ""
 "besturingssysteem, de TCP/IP-implementatie, de BACKTRACE (indien beschikbaar),\n"
 "en alle andere relevante informatie.\n"
 
-#: src/LYEdit.c:266
+#: src/LYEdit.c:272
 #, c-format
 msgid "Error starting editor, %s"
 msgstr "Fout bij starten van editor, %s"
 
-#: src/LYEdit.c:269
+#: src/LYEdit.c:275
 msgid "Editor killed by signal"
 msgstr "Editor is geëlimineerd door signaal"
 
-#: src/LYEdit.c:274
+#: src/LYEdit.c:280
 #, c-format
 msgid "Editor returned with error status %s"
 msgstr "Editor gaf afsluitwaarde %s terug"
 
-#: src/LYDownload.c:506
+#: src/LYDownload.c:509
 msgid "Downloaded link:"
 msgstr "Gedownloade link:"
 
-#: src/LYDownload.c:511
+#: src/LYDownload.c:514
 msgid "Suggested file name:"
 msgstr "Voorgestelde bestandsnaam:"
 
-#: src/LYDownload.c:516
+#: src/LYDownload.c:519
 msgid "Standard download options:"
 msgstr "Standaard downloadmogelijkheden:"
 
-#: src/LYDownload.c:517
+#: src/LYDownload.c:520
 msgid "Download options:"
 msgstr "Downloadmogelijkheden:"
 
-#: src/LYDownload.c:533
+#: src/LYDownload.c:536
 msgid "Save to disk"
 msgstr "Opslaan op schijf"
 
-#: src/LYDownload.c:547
+#: src/LYDownload.c:550
 msgid "View temporary file"
 msgstr "Tijdelijk bestand bekijken"
 
-#: src/LYDownload.c:554
+#: src/LYDownload.c:557
 msgid "Save to disk disabled."
 msgstr "Opslaan op schijf is uitgeschakeld."
 
-#: src/LYDownload.c:558 src/LYPrint.c:1310
+#: src/LYDownload.c:561 src/LYPrint.c:1322
 msgid "Local additions:"
 msgstr "Lokale toevoegingen:"
 
-#: src/LYDownload.c:569 src/LYUpload.c:211
+#: src/LYDownload.c:572 src/LYUpload.c:209
 msgid "No Name Given"
 msgstr "Geen naam opgegeven"
 
-#: src/LYHistory.c:672
+#: src/LYHistory.c:679
 msgid "You selected:"
 msgstr "U selecteerde:"
 
-#: src/LYHistory.c:696 src/LYHistory.c:925
+#: src/LYHistory.c:703 src/LYHistory.c:932
 msgid "(no address)"
 msgstr "(geen adres)"
 
-#: src/LYHistory.c:700
+#: src/LYHistory.c:707
 msgid " (internal)"
 msgstr " (intern)"
 
-#: src/LYHistory.c:702
+#: src/LYHistory.c:709
 msgid " (was internal)"
 msgstr " (was intern)"
 
-#: src/LYHistory.c:800
+#: src/LYHistory.c:807
 msgid " (From History)"
 msgstr " (Uit historie)"
 
-#: src/LYHistory.c:845
+#: src/LYHistory.c:852
 msgid "You visited (POSTs, bookmark, menu and list files excluded):"
 msgstr "U bezocht (m.u.v. POST's, boekenlegger, menu en lijstbestanden):"
 
-#: src/LYHistory.c:1138
+#: src/LYHistory.c:1154
 msgid "(No messages yet)"
 msgstr "(Nog geen vermeldingen)"
 
-#: src/LYLeaks.c:220
+#: src/LYLeaks.c:222
 msgid "Invalid pointer detected."
 msgstr "Foutieve verwijzing gevonden."
 
-#: src/LYLeaks.c:222 src/LYLeaks.c:260
+#: src/LYLeaks.c:224 src/LYLeaks.c:262
 msgid "Sequence:"
 msgstr "Sequentie:"
 
-#: src/LYLeaks.c:225 src/LYLeaks.c:263
+#: src/LYLeaks.c:227 src/LYLeaks.c:265
 msgid "Pointer:"
 msgstr "Verwijzing:"
 
-#: src/LYLeaks.c:234 src/LYLeaks.c:241 src/LYLeaks.c:282
+#: src/LYLeaks.c:236 src/LYLeaks.c:243 src/LYLeaks.c:284
 msgid "FileName:"
 msgstr "BestandsNaam:"
 
-#: src/LYLeaks.c:237 src/LYLeaks.c:244 src/LYLeaks.c:285 src/LYLeaks.c:296
+#: src/LYLeaks.c:239 src/LYLeaks.c:246 src/LYLeaks.c:287 src/LYLeaks.c:298
 msgid "LineCount:"
 msgstr "RegelAantal:"
 
-#: src/LYLeaks.c:258
+#: src/LYLeaks.c:260
 msgid "Memory leak detected."
 msgstr "Geheugenlek ontdekt."
 
-#: src/LYLeaks.c:266
+#: src/LYLeaks.c:268
 msgid "Contains:"
 msgstr "Bevat:"
 
-#: src/LYLeaks.c:279
+#: src/LYLeaks.c:281
 msgid "ByteSize:"
 msgstr "ByteGrootte:"
 
-#: src/LYLeaks.c:293
+#: src/LYLeaks.c:295
 msgid "realloced:"
 msgstr "Geherreserveerd:"
 
-#: src/LYLeaks.c:314
+#: src/LYLeaks.c:316
 msgid "Total memory leakage this run:"
 msgstr "Totale geheugenlekkage tijdens deze uitvoering:"
 
-#: src/LYLeaks.c:317
+#: src/LYLeaks.c:320
 msgid "Peak allocation"
 msgstr "Piekreserveringen"
 
-#: src/LYLeaks.c:318
+#: src/LYLeaks.c:322
 msgid "Bytes allocated"
 msgstr "Aantal gereserveerde bytes"
 
-#: src/LYLeaks.c:319
+#: src/LYLeaks.c:324
 msgid "Total mallocs"
 msgstr "Totaal aantal reserveringen"
 
-#: src/LYLeaks.c:320
+#: src/LYLeaks.c:326
 msgid "Total frees"
 msgstr "Totaal aantal vrijgevingen"
 
-#: src/LYList.c:84
+#: src/LYList.c:88
 msgid "References in "
 msgstr "Referenties in "
 
-#: src/LYList.c:87
+#: src/LYList.c:91
 msgid "this document:"
 msgstr "dit document:"
 
-#: src/LYList.c:93
+#: src/LYList.c:97
 msgid "Visible links:"
 msgstr "Zichtbare links:"
 
-#: src/LYList.c:194 src/LYList.c:295
+#: src/LYList.c:201 src/LYList.c:312
 msgid "Hidden links:"
 msgstr "Verborgen links:"
 
-#: src/LYList.c:332
+#: src/LYList.c:349
 msgid "References"
 msgstr "Referenties"
 
-#: src/LYList.c:336
+#: src/LYList.c:353
 msgid "Visible links"
 msgstr "Zichtbare links"
 
-#: src/LYLocal.c:271
+#: src/LYLocal.c:289
 #, c-format
 msgid "Unable to get status of '%s'."
 msgstr "Kan status van '%s' niet opvragen."
 
-#: src/LYLocal.c:305
+#: src/LYLocal.c:354
 msgid "The selected item is not a file or a directory!  Request ignored."
 msgstr "Het geselecteerde item is geen bestand of map!  Verzoek is genegeerd."
 
-#: src/LYLocal.c:373
+#: src/LYLocal.c:455
 #, c-format
 msgid "Unable to %s due to system error!"
 msgstr "Het %s is mislukt vanwege systeemfout!"
 
-#: src/LYLocal.c:407
+#: src/LYLocal.c:489
 #, c-format
 msgid "Probable failure to %s due to system error!"
 msgstr "Waarschijnlijke fout tijdens het %s vanwege systeemfout!"
 
-#: src/LYLocal.c:469 src/LYLocal.c:490
+#: src/LYLocal.c:554 src/LYLocal.c:577
 #, c-format
 msgid "remove %s"
 msgstr "verwijderen van %s"
 
-#: src/LYLocal.c:508
+#: src/LYLocal.c:597
 #, c-format
 msgid "touch %s"
 msgstr "aanraken van %s"
 
-#: src/LYLocal.c:536
+#: src/LYLocal.c:627
 #, c-format
 msgid "move %s to %s"
 msgstr "verplaatsen van %s naar %s"
 
-#: src/LYLocal.c:577
+#: src/LYLocal.c:675
 msgid "There is already a directory with that name!  Request ignored."
 msgstr "Er is al een map met die naam!  Verzoek is genegeerd."
 
-#: src/LYLocal.c:579
+#: src/LYLocal.c:677
 msgid "There is already a file with that name!  Request ignored."
 msgstr "Er is al een bestand met die naam!  Verzoek is genegeerd."
 
-#: src/LYLocal.c:581
+#: src/LYLocal.c:679
 msgid "The specified name is already in use!  Request ignored."
 msgstr "De opgegeven naam is al in gebruik!  Verzoek is genegeerd."
 
-#: src/LYLocal.c:592
+#: src/LYLocal.c:691
 msgid "Destination has different owner!  Request denied."
 msgstr "Bestemming heeft een andere eigenaar!  Verzoek is genegeerd."
 
-#: src/LYLocal.c:595
+#: src/LYLocal.c:694
 msgid "Destination is not a valid directory!  Request denied."
 msgstr "Bestemming is geen geldige map!  Verzoek is genegeerd."
 
-#: src/LYLocal.c:617
+#: src/LYLocal.c:710
+msgid "Source and destination are the same location!  Request ignored!"
+msgstr "Bron en bestemming zijn dezelfde locatie!  Verzoek is genegeerd!"
+
+#: src/LYLocal.c:734
 msgid "Remove all tagged files and directories?"
 msgstr "Alle aangevinkte bestand en mappen verwijderen?"
 
-#: src/LYLocal.c:675
+#: src/LYLocal.c:807
 msgid "Enter new location for tagged items: "
 msgstr "Voer een nieuwe bestemming in voor aangevinkte items: "
 
-#: src/LYLocal.c:745
-msgid "Path too long"
-msgstr "Pad is te lang"
-
-#: src/LYLocal.c:776
-msgid "Source and destination are the same location - request ignored!"
-msgstr "Bron en bestemming zijn dezelfde locatie -- verzoek is genegeerd!"
-
-#: src/LYLocal.c:833
+#: src/LYLocal.c:905
 msgid "Enter new name for directory: "
 msgstr "Voer een nieuwe naam in voor map: "
 
-#: src/LYLocal.c:835
+#: src/LYLocal.c:907
 msgid "Enter new name for file: "
 msgstr "Voer een nieuwe naam in voor bestand: "
 
-#: src/LYLocal.c:847
+#: src/LYLocal.c:919
 msgid "Illegal character (path-separator) found! Request ignored."
 msgstr "Ongeldig teken (padscheidingsteken) gevonden!  Verzoek is genegeerd."
 
-#: src/LYLocal.c:897
+#: src/LYLocal.c:969
 msgid "Enter new location for directory: "
 msgstr "Voer een nieuwe locatie in voor map: "
 
-#: src/LYLocal.c:903
+#: src/LYLocal.c:971
 msgid "Enter new location for file: "
 msgstr "Voer een nieuwe locatie voor bestand in: "
 
-#: src/LYLocal.c:930
+#: src/LYLocal.c:998
 msgid "Unexpected failure - unable to find trailing path separator"
 msgstr "Onverwachte mislukking - kan nakomend padscheidingsteken niet vinden"
 
-#: src/LYLocal.c:950
-msgid "Source and destination are the same location!  Request ignored!"
-msgstr "Bron en bestemming zijn dezelfde locatie!  Verzoek is genegeerd!"
-
-#: src/LYLocal.c:997
+#: src/LYLocal.c:1060
 msgid "Modify name, location, or permission (n, l, or p): "
 msgstr "Wijzig N)aam, L)ocatie, of P)ermissies (n,l, of p): "
 
-#: src/LYLocal.c:999
+#: src/LYLocal.c:1062
 msgid "Modify name or location (n or l): "
 msgstr "Wijzig N)aam of L)ocatie (n of l): "
 
 #.
 #. * Code for changing ownership needed here.
 #.
-#: src/LYLocal.c:1028
+#: src/LYLocal.c:1091
 msgid "This feature not yet implemented!"
 msgstr "Deze optie is nog niet geïmplementeerd!"
 
-#: src/LYLocal.c:1048
+#: src/LYLocal.c:1112
 msgid "Enter name of file to create: "
 msgstr "Voer een bestandsnaam in om aan te maken: "
 
-#: src/LYLocal.c:1052 src/LYLocal.c:1088
+#: src/LYLocal.c:1115 src/LYLocal.c:1152
 msgid "Illegal redirection \"//\" found! Request ignored."
 msgstr "Foutieve verwijzing \"/\"gevonden!  Verzoek is genegeerd."
 
-#: src/LYLocal.c:1084
+#: src/LYLocal.c:1149
 msgid "Enter name for new directory: "
 msgstr "Voer een naam in voor een nieuwe map: "
 
-#: src/LYLocal.c:1124
+#: src/LYLocal.c:1190
 msgid "Create file or directory (f or d): "
 msgstr "Maak F)-bestand of D)-map (f of d): "
 
-#: src/LYLocal.c:1166
+#: src/LYLocal.c:1232
 #, c-format
 msgid "Remove directory '%s'?"
 msgstr "Map '%s' verwijderen?"
 
-#: src/LYLocal.c:1169
+#: src/LYLocal.c:1235
 msgid "Remove directory?"
 msgstr "Map verwijderen?"
 
-#: src/LYLocal.c:1174
+#: src/LYLocal.c:1240
 #, c-format
 msgid "Remove file '%s'?"
 msgstr "Verwijder bestand '%s'?"
 
-#: src/LYLocal.c:1176
+#: src/LYLocal.c:1242
 msgid "Remove file?"
 msgstr "Verwijder bestand?"
 
-#: src/LYLocal.c:1181
+#: src/LYLocal.c:1247
 #, c-format
 msgid "Remove symbolic link '%s'?"
 msgstr "Verwijder symbolische koppeling '%s'?"
 
-#: src/LYLocal.c:1183
+#: src/LYLocal.c:1249
 msgid "Remove symbolic link?"
 msgstr "Verwijder symbolische koppeling?"
 
-#: src/LYLocal.c:1278
+#: src/LYLocal.c:1347
 msgid "Sorry, don't know how to permit non-UNIX files yet."
 msgstr "Sorry, weet nog niet hoe met permissies van niet-UNIX bestanden om te gaan."
 
-#: src/LYLocal.c:1308
+#: src/LYLocal.c:1376
 msgid "Unable to open permit options file"
 msgstr "Kan bestand met permissie-opties niet openen"
 
-#: src/LYLocal.c:1338
+#: src/LYLocal.c:1404
 msgid "Specify permissions below:"
 msgstr "Specificeer permissies hieronder:"
 
-#: src/LYLocal.c:1339 src/LYShowInfo.c:261
+#: src/LYLocal.c:1405 src/LYShowInfo.c:265
 msgid "Owner:"
 msgstr "Eigenaar:"
 
-#: src/LYLocal.c:1355
+#: src/LYLocal.c:1421
 msgid "Group"
 msgstr "Groep"
 
-#: src/LYLocal.c:1371
+#: src/LYLocal.c:1437
 msgid "Others:"
 msgstr "Anderen:"
 
-#: src/LYLocal.c:1389
+#: src/LYLocal.c:1455
 msgid "form to permit"
 msgstr "formulier voor permissies"
 
-#: src/LYLocal.c:1484
+#: src/LYLocal.c:1551
 msgid "Invalid mode format."
 msgstr "Onjuist formaat voor modus."
 
-#: src/LYLocal.c:1488
+#: src/LYLocal.c:1555
 msgid "Invalid syntax format."
 msgstr "Onjuiste syntaxis."
 
-#: src/LYLocal.c:1670
+#: src/LYLocal.c:1742
 msgid "Warning!  UUDecoded file will exist in the directory you started Lynx."
 msgstr "Let op!  UUDecoded bestand blijft bestaan in de map waarin u Lynx startte."
 
-#: src/LYLocal.c:1860
+#: src/LYLocal.c:1932
 msgid "NULL URL pointer"
 msgstr "NULL URL verwijzing"
 
-#: src/LYLocal.c:1942
+#: src/LYLocal.c:2014
 #, c-format
 msgid "Executing %s "
 msgstr "Bezig met uitvoeren van %s "
 
-#: src/LYLocal.c:1945
+#: src/LYLocal.c:2017
 msgid "Executing system command. This might take a while."
 msgstr "Bezig met uitvoeren van systeemcommando.  Dit kan even duren."
 
-#: src/LYLocal.c:2017
+#: src/LYLocal.c:2091
 msgid "Current directory:"
 msgstr "Huidige map:"
 
-#: src/LYLocal.c:2020 src/LYLocal.c:2038
+#: src/LYLocal.c:2094 src/LYLocal.c:2112
 msgid "Current selection:"
 msgstr "Geselecteerd:"
 
-#: src/LYLocal.c:2024
+#: src/LYLocal.c:2098
 msgid "Nothing currently selected."
 msgstr "Er is momenteel niets geselecteerd."
 
-#: src/LYLocal.c:2040
+#: src/LYLocal.c:2114
 msgid "tagged item:"
 msgstr "aangevinkt item:"
 
-#: src/LYLocal.c:2041
+#: src/LYLocal.c:2115
 msgid "tagged items:"
 msgstr "aangevinkte items:"
 
-#: src/LYLocal.c:2138 src/LYLocal.c:2149
+#: src/LYLocal.c:2215 src/LYLocal.c:2224
 msgid "Illegal filename; request ignored."
 msgstr "Onjuiste bestandsnaam; verzoek is genegeerd."
 
 #. directory not writable
-#: src/LYLocal.c:2247 src/LYLocal.c:2306
+#: src/LYLocal.c:2322 src/LYLocal.c:2381
 msgid "Install in the selected directory not permitted."
 msgstr "Installatie in de geselecteerde map is niet toegestaan."
 
-#: src/LYLocal.c:2302
+#: src/LYLocal.c:2377
 msgid "The selected item is not a directory!  Request ignored."
 msgstr "Het geselecteerde item is geen map!  Verzoek is genegeerd."
 
-#: src/LYLocal.c:2311
+#: src/LYLocal.c:2386
 msgid "Just a moment, ..."
 msgstr "Een ogenblik geduld..."
 
-#: src/LYLocal.c:2328
+#: src/LYLocal.c:2403
 msgid "Error building install args"
 msgstr "Fout bij opbouwen van installatie-argumenten"
 
-#: src/LYLocal.c:2343 src/LYLocal.c:2374
+#: src/LYLocal.c:2418 src/LYLocal.c:2449
 #, c-format
 msgid "Source and target are the same: %s"
 msgstr "Bron en bestemming zijn gelijk: %s"
 
-#: src/LYLocal.c:2350 src/LYLocal.c:2381
+#: src/LYLocal.c:2425 src/LYLocal.c:2456
 #, c-format
 msgid "Already in target directory: %s"
 msgstr "Al in bestemmingsmap: %s"
 
-#: src/LYLocal.c:2399
+#: src/LYLocal.c:2474
 msgid "Installation complete"
 msgstr "Installatie is voltooid"
 
-#: src/LYLocal.c:2586
+#: src/LYLocal.c:2666
 msgid "Temporary URL or list would be too long."
 msgstr "Tijdelijke URL of lijst zou te lang zijn."
 
-#: src/LYMail.c:520
+#: src/LYMail.c:544
 msgid "Sending"
 msgstr "Bezig met zenden"
 
-#: src/LYMail.c:1006
+#: src/LYMail.c:1030
 #, c-format
 msgid "The link   %s :?: %s \n"
 msgstr "De link   %s :?: %s\n"
 
-#: src/LYMail.c:1008
+#: src/LYMail.c:1032
 #, c-format
 msgid "called \"%s\"\n"
 msgstr "genaamd \"%s\"\n"
 
-#: src/LYMail.c:1009
+#: src/LYMail.c:1033
 #, c-format
 msgid "in the file \"%s\" called \"%s\"\n"
 msgstr "in het bestand \"%s\" genaamd \"%s\"\n"
 
-#: src/LYMail.c:1010
+#: src/LYMail.c:1034
 msgid "was requested but was not available."
 msgstr "is opgevraagd maar niet beschikbaar."
 
-#: src/LYMail.c:1011
+#: src/LYMail.c:1035
 msgid "Thought you might want to know."
 msgstr "Het leek me dat u dat zou willen weten."
 
-#: src/LYMail.c:1013
+#: src/LYMail.c:1037
 msgid "This message was automatically generated by"
 msgstr "Dit bericht is automatisch gegenereerd door"
 
-#: src/LYMail.c:1728
+#: src/LYMail.c:1751
 msgid "No system mailer configured"
 msgstr "Geen systeemmailer geconfigureerd"
 
-#: src/LYMain.c:1025
+#: src/LYMain.c:1049
 msgid "No Winsock found, sorry."
 msgstr "Geen Winsock gevonden, sorry."
 
-#: src/LYMain.c:1222
+#: src/LYMain.c:1240
 msgid "You MUST define a valid TMP or TEMP area!"
 msgstr "U MOET een geldig TMP- of TEMP-gebied opgeven!"
 
-#: src/LYMain.c:1275 src/LYMainLoop.c:5051
+#: src/LYMain.c:1293 src/LYMainLoop.c:5260
 msgid "No such directory"
 msgstr "Map bestaat niet"
 
-#: src/LYMain.c:1460
+#: src/LYMain.c:1487
 #, c-format
 msgid ""
 "\n"
@@ -4274,7 +4288,7 @@ msgstr ""
 "Configuratiebestand '%s' is niet beschikbaar.\n"
 "\n"
 
-#: src/LYMain.c:1470
+#: src/LYMain.c:1497
 #, c-format
 msgid ""
 "\n"
@@ -4285,7 +4299,7 @@ msgstr ""
 "Lynx-tekensets zijn niet opgegeven.\n"
 "\n"
 
-#: src/LYMain.c:1499
+#: src/LYMain.c:1526
 #, c-format
 msgid ""
 "\n"
@@ -4296,7 +4310,7 @@ msgstr ""
 "Lynx-editkaart is niet opgegeven.\n"
 "\n"
 
-#: src/LYMain.c:1575
+#: src/LYMain.c:1608
 #, c-format
 msgid ""
 "\n"
@@ -4307,172 +4321,177 @@ msgstr ""
 "Lynx-bestand '%s' is niet beschikbaar.\n"
 "\n"
 
-#: src/LYMain.c:1650
+#: src/LYMain.c:1683
 #, c-format
 msgid "Ignored %d characters from standard input.\n"
 msgstr "Er zijn %d tekens van standaardinvoer genegeerd.\n"
 
-#: src/LYMain.c:1652
+#: src/LYMain.c:1685
 #, c-format
 msgid "Use \"-stdin\" or \"-\" to tell how to handle piped input.\n"
 msgstr "Gebruik \"-stdin\" of \"-\" om aan te geven hoe doorgesluisde invoer behandeld moet worden.\n"
 
-#: src/LYMain.c:1800
+#: src/LYMain.c:1843
 msgid "Warning:"
 msgstr "Waarschuwing:"
 
-#: src/LYMain.c:2365
+#: src/LYMain.c:2408
 msgid "persistent cookies state will be changed in next session only."
 msgstr "Voortbestaande stand van koekjes wordt pas in volgende sessie gewijzigd."
 
-#: src/LYMain.c:2610 src/LYMain.c:2655
+#: src/LYMain.c:2644 src/LYMain.c:2689
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr "Lynx: onbekende tekenset '%s' wordt genegeerd\n"
 
-#: src/LYMain.c:3174
+#: src/LYMain.c:3208
 #, c-format
 msgid "%s Version %s (%s)"
 msgstr "%s versie %s (%s)"
 
-#: src/LYMain.c:3212
+#: src/LYMain.c:3246
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr "Gecompileerd op %s op %s om %s\n"
 
-#: src/LYMain.c:3234
+#: src/LYMain.c:3268
 msgid "Copyrights held by the Lynx Developers Group,"
 msgstr "De auteursrechten zijn in handen van de Lynx-ontwikkelaarsgroep,"
 
-#: src/LYMain.c:3235
+#: src/LYMain.c:3269
 msgid "the University of Kansas, CERN, and other contributors."
 msgstr "de Universiteit van Kansas, CERN, en andere medewerkers."
 
-#: src/LYMain.c:3236
+#: src/LYMain.c:3270
 msgid "Distributed under the GNU General Public License (Version 2)."
 msgstr "Gedistribueerd onder de GPL (GNU General Public License), versie 2."
 
-#: src/LYMain.c:3237
+#: src/LYMain.c:3271
 msgid "See http://lynx.isc.org/ and the online help for more information."
-msgstr "Zie http://lynx.isc.org/ en de online help voor meer informatie."
+msgstr "Zie http://lynx.isc.org/ en de online hulp voor meer informatie."
 
-#: src/LYMain.c:4056
+#: src/LYMain.c:4104
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "Gebruik:  %s [opties] [bestand]\n"
 
-#: src/LYMain.c:4057
+#: src/LYMain.c:4105
 #, c-format
 msgid "Options are:\n"
 msgstr "Mogelijke opties zijn:\n"
 
-#: src/LYMain.c:4356
+#: src/LYMain.c:4406
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s: Ongeldige optie: %s\n"
 
-#: src/LYMainLoop.c:571
+#: src/LYMainLoop.c:575
 #, c-format
 msgid "Internal error: Invalid mouse link %d!"
 msgstr "**Interne fout**: Ongeldige muiskoppeling %d!"
 
-#: src/LYMainLoop.c:691 src/LYMainLoop.c:5073
+#: src/LYMainLoop.c:696 src/LYMainLoop.c:5282
 msgid "A URL specified by the user"
 msgstr "Een door de gebruiker opgegeven URL"
 
-#: src/LYMainLoop.c:1150
+#: src/LYMainLoop.c:1148
 msgid "Enctype multipart/form-data not yet supported!  Cannot submit."
 msgstr "Het Enctype 'multipart/form-data' wordt nog niet ondersteund!  Kan niet verzenden."
 
 #.
 #. * Make a name for this help file.
 #.
-#: src/LYMainLoop.c:3082
+#: src/LYMainLoop.c:3177
 msgid "Help Screen"
 msgstr "Hulpscherm"
 
-#: src/LYMainLoop.c:3203
+#: src/LYMainLoop.c:3308
 msgid "System Index"
 msgstr "Systeemindex"
 
-#: src/LYMainLoop.c:3562 src/LYMainLoop.c:5297
+#: src/LYMainLoop.c:3556
+#, c-format
+msgid "Query parameter %d: "
+msgstr "Bevraagparameter %d: "
+
+#: src/LYMainLoop.c:3781 src/LYMainLoop.c:5558
 msgid "Entry into main screen"
 msgstr "Ingang naar beginscherm"
 
-#: src/LYMainLoop.c:3820
+#: src/LYMainLoop.c:4039
 msgid "No next document present"
 msgstr "Geen volgend document aanwezig"
 
-#: src/LYMainLoop.c:4116
+#: src/LYMainLoop.c:4334
 msgid "charset for this document specified explicitly, sorry..."
 msgstr "de tekenset voor dit document is expliciet opgegeven, sorry..."
 
-#: src/LYMainLoop.c:5029
+#: src/LYMainLoop.c:5240
 msgid "cd to:"
 msgstr "cd naar:"
 
-#: src/LYMainLoop.c:5054
+#: src/LYMainLoop.c:5263
 msgid "A component of path is not a directory"
 msgstr "Een component van het pad is geen map"
 
-#: src/LYMainLoop.c:5057
+#: src/LYMainLoop.c:5266
 msgid "failed to change directory"
 msgstr "Map wijzigen is mislukt"
 
-#: src/LYMainLoop.c:6229
+#: src/LYMainLoop.c:6496
 msgid "Reparsing document under current settings..."
 msgstr "Document wordt opnieuw ontleed met huidige instellingen..."
 
-#: src/LYMainLoop.c:6520
+#: src/LYMainLoop.c:6790
 #, c-format
 msgid "Fatal error - could not open output file %s\n"
 msgstr "Fatale fout: kan uitvoerbestand %s niet openen\n"
 
-#: src/LYMainLoop.c:6857
+#: src/LYMainLoop.c:7128
 msgid "TABLE center enable."
 msgstr "TABLE centreren ingeschakeld."
 
-#: src/LYMainLoop.c:6860
+#: src/LYMainLoop.c:7131
 msgid "TABLE center disable."
 msgstr "TABLE centreren uitgeschakeld."
 
-#: src/LYMainLoop.c:6937
+#: src/LYMainLoop.c:7211
 msgid "Current URL is empty."
 msgstr "Huidige URL is leeg."
 
-#: src/LYMainLoop.c:6939 src/LYUtils.c:1828
+#: src/LYMainLoop.c:7213 src/LYUtils.c:1881
 msgid "Copy to clipboard failed."
 msgstr "Kopiëren naar klembord is mislukt."
 
-#: src/LYMainLoop.c:6941
+#: src/LYMainLoop.c:7215
 msgid "Document URL put to clipboard."
 msgstr "Document-URL is op klembord geplaatst."
 
-#: src/LYMainLoop.c:6943
+#: src/LYMainLoop.c:7217
 msgid "Link URL put to clipboard."
 msgstr "Link-URL is op klembord geplaatst."
 
-#: src/LYMainLoop.c:6970
+#: src/LYMainLoop.c:7244
 msgid "No URL in the clipboard."
 msgstr "Geen URL op het klembord."
 
-#: src/LYMainLoop.c:7641 src/LYMainLoop.c:7811
+#: src/LYMainLoop.c:7936 src/LYMainLoop.c:8105
 msgid "-index-"
 msgstr "-index-"
 
-#: src/LYMainLoop.c:7751
+#: src/LYMainLoop.c:8045
 msgid "lynx: Can't access startfile"
-msgstr "lynx: Geen toegang tot startbestand"
+msgstr "lynx: geen toegang tot startbestand"
 
-#: src/LYMainLoop.c:7763
+#: src/LYMainLoop.c:8057
 msgid "lynx: Start file could not be found or is not text/html or text/plain"
-msgstr "lynx: Startbestand kan niet gevonden worden of is geen tekst/html of tekst/plain"
+msgstr "lynx: startbestand kan niet gevonden worden of is geen tekst/html of tekst/plain"
 
-#: src/LYMainLoop.c:7764
+#: src/LYMainLoop.c:8058
 msgid "      Exiting..."
 msgstr "      Afsluiten..."
 
-#: src/LYMainLoop.c:7805
+#: src/LYMainLoop.c:8099
 msgid "-more-"
 msgstr "-meer-"
 
@@ -4536,349 +4555,369 @@ msgstr ""
 msgid "Message has no original text!"
 msgstr "Bericht bevat geen oorspronkelijke tekst!"
 
-#: src/LYOptions.c:765
+#: src/LYOptions.c:770
 msgid "review/edit B)ookmarks files"
 msgstr "B)ladwijzerbestanden bekijken/wijzigen"
 
-#: src/LYOptions.c:767
+#: src/LYOptions.c:772
 msgid "B)ookmark file: "
 msgstr "B)ladwijzerbestand: "
 
-#: src/LYOptions.c:2127 src/LYOptions.c:2134
+#: src/LYOptions.c:2120 src/LYOptions.c:2127
 msgid "ON"
 msgstr "AAN"
 
 #. verbose_img variable
-#: src/LYOptions.c:2128 src/LYOptions.c:2133 src/LYOptions.c:2285
-#: src/LYOptions.c:2296
+#: src/LYOptions.c:2121 src/LYOptions.c:2126 src/LYOptions.c:2289
+#: src/LYOptions.c:2300
 msgid "OFF"
 msgstr "UIT"
 
-#: src/LYOptions.c:2129
+#: src/LYOptions.c:2122
 msgid "NEVER"
 msgstr "NOOIT"
 
-#: src/LYOptions.c:2130
+#: src/LYOptions.c:2123
 msgid "ALWAYS"
 msgstr "ALTIJD"
 
-#: src/LYOptions.c:2146 src/LYOptions.c:2277
+#: src/LYOptions.c:2139 src/LYOptions.c:2281
 msgid "ignore"
 msgstr "negeren"
 
-#: src/LYOptions.c:2147
+#: src/LYOptions.c:2140
 msgid "ask user"
 msgstr "gebruiker vragen"
 
-#: src/LYOptions.c:2148
+#: src/LYOptions.c:2141
 msgid "accept all"
 msgstr "alles aanvaarden"
 
-#: src/LYOptions.c:2160
+#: src/LYOptions.c:2153
 msgid "ALWAYS OFF"
 msgstr "ALTIJD UIT"
 
-#: src/LYOptions.c:2161
+#: src/LYOptions.c:2154
 msgid "FOR LOCAL FILES ONLY"
 msgstr "ALLEEN VOOR LOKALE BESTANDEN"
 
-#: src/LYOptions.c:2163
+#: src/LYOptions.c:2156
 msgid "ALWAYS ON"
 msgstr "ALTIJD AAN"
 
-#: src/LYOptions.c:2175
+#: src/LYOptions.c:2168
 msgid "Numbers act as arrows"
-msgstr "cijfers doen als pijltjes"
+msgstr "cijfers werken als pijltjes"
 
-#: src/LYOptions.c:2177
+#: src/LYOptions.c:2170
 msgid "Links are numbered"
 msgstr "cijfers kiezen koppelingen"
 
-#: src/LYOptions.c:2180
+#: src/LYOptions.c:2173
 msgid "Links and form fields are numbered"
 msgstr "cijfers kiezen koppelingen/formuliervelden"
 
-#: src/LYOptions.c:2183
+#: src/LYOptions.c:2176
 msgid "Form fields are numbered"
 msgstr "cijfers kiezen formuliervelden"
 
-#: src/LYOptions.c:2197
+#: src/LYOptions.c:2191
 msgid "Case insensitive"
 msgstr "hoofdletterongevoelig"
 
-#: src/LYOptions.c:2198
+#: src/LYOptions.c:2192
 msgid "Case sensitive"
 msgstr "hoofdlettergevoelig"
 
-#: src/LYOptions.c:2222
+#: src/LYOptions.c:2216
 msgid "prompt normally"
 msgstr "normaal prompten"
 
-#: src/LYOptions.c:2223
+#: src/LYOptions.c:2217
 msgid "force yes-response"
 msgstr "ja-antwoord afdwingen"
 
-#: src/LYOptions.c:2224
+#: src/LYOptions.c:2218
 msgid "force no-response"
 msgstr "nee-antwoord afdwingen"
 
-#: src/LYOptions.c:2242
+#: src/LYOptions.c:2236
 msgid "Novice"
 msgstr "beginner"
 
-#: src/LYOptions.c:2243
+#: src/LYOptions.c:2237
 msgid "Intermediate"
 msgstr "gevorderd"
 
-#: src/LYOptions.c:2244
+#: src/LYOptions.c:2238
 msgid "Advanced"
 msgstr "expert"
 
-#: src/LYOptions.c:2253
+#: src/LYOptions.c:2247
 msgid "By First Visit"
 msgstr "op eerstbezocht"
 
-#: src/LYOptions.c:2255
+#: src/LYOptions.c:2249
 msgid "By First Visit Reversed"
 msgstr "omgekeerd eerstbezocht"
 
-#: src/LYOptions.c:2256
+#: src/LYOptions.c:2250
 msgid "As Visit Tree"
 msgstr "als bezoekboom"
 
-#: src/LYOptions.c:2257
+#: src/LYOptions.c:2251
 msgid "By Last Visit"
 msgstr "op laatstbezocht"
 
-#: src/LYOptions.c:2259
+#: src/LYOptions.c:2253
 msgid "By Last Visit Reversed"
 msgstr "omgekeerd laatstbezocht"
 
 #. Old_DTD variable
-#: src/LYOptions.c:2270
+#: src/LYOptions.c:2264
 msgid "relaxed (TagSoup mode)"
 msgstr "versoepeld (TagSoup-modus)"
 
-#: src/LYOptions.c:2271
+#: src/LYOptions.c:2265
 msgid "strict (SortaSGML mode)"
 msgstr "strikt (SortaSGML-modus)"
 
-#: src/LYOptions.c:2278
+#: src/LYOptions.c:2272
+msgid "Ignore"
+msgstr "Negeren"
+
+#: src/LYOptions.c:2273
+msgid "Add to trace-file"
+msgstr "Aan volgbestand toevoegen"
+
+#: src/LYOptions.c:2274
+msgid "Add to LYNXMESSAGES"
+msgstr "Aan LYNXBERICHT toevoegen"
+
+#: src/LYOptions.c:2275
+msgid "Warn, point to trace-file"
+msgstr "Waarschuwing, verwijst naar volgbestand:"
+
+#: src/LYOptions.c:2282
 msgid "as labels"
 msgstr "tonen als labels"
 
-#: src/LYOptions.c:2279
+#: src/LYOptions.c:2283
 msgid "as links"
 msgstr "tonen als koppelingen"
 
-#: src/LYOptions.c:2286
+#: src/LYOptions.c:2290
 msgid "show filename"
 msgstr "bestandsnaam tonen"
 
-#: src/LYOptions.c:2297
+#: src/LYOptions.c:2301
 msgid "STANDARD"
 msgstr "STANDAARD"
 
-#: src/LYOptions.c:2298
+#: src/LYOptions.c:2302
 msgid "ADVANCED"
 msgstr "GEAVANCEERD"
 
-#: src/LYOptions.c:2329
+#: src/LYOptions.c:2336
 msgid "Directories first"
 msgstr "mappen eerst"
 
-#: src/LYOptions.c:2330
+#: src/LYOptions.c:2337
 msgid "Files first"
 msgstr "bestanden eerst"
 
-#: src/LYOptions.c:2331
+#: src/LYOptions.c:2338
 msgid "Mixed style"
 msgstr "gemengd"
 
-#: src/LYOptions.c:2339 src/LYOptions.c:2359
+#: src/LYOptions.c:2346 src/LYOptions.c:2366
 msgid "By Name"
 msgstr "op naam"
 
-#: src/LYOptions.c:2340 src/LYOptions.c:2360
+#: src/LYOptions.c:2347 src/LYOptions.c:2367
 msgid "By Type"
 msgstr "op type"
 
-#: src/LYOptions.c:2341 src/LYOptions.c:2361
+#: src/LYOptions.c:2348 src/LYOptions.c:2368
 msgid "By Size"
 msgstr "op grootte"
 
-#: src/LYOptions.c:2342 src/LYOptions.c:2362
+#: src/LYOptions.c:2349 src/LYOptions.c:2369
 msgid "By Date"
 msgstr "op datum"
 
-#: src/LYOptions.c:2343
+#: src/LYOptions.c:2350
 msgid "By Mode"
 msgstr "op modus"
 
-#: src/LYOptions.c:2345
+#: src/LYOptions.c:2352
 msgid "By User"
 msgstr "op gebruiker"
 
-#: src/LYOptions.c:2346
+#: src/LYOptions.c:2353
 msgid "By Group"
 msgstr "op groep"
 
-#: src/LYOptions.c:2371
+#: src/LYOptions.c:2378
 msgid "Do not show rate"
 msgstr "niet tonen"
 
-#: src/LYOptions.c:2372 src/LYOptions.c:2373
+#: src/LYOptions.c:2379 src/LYOptions.c:2380
 #, c-format
 msgid "Show %s/sec rate"
 msgstr "als %s/s tonen"
 
-#: src/LYOptions.c:2375 src/LYOptions.c:2376
+#: src/LYOptions.c:2382 src/LYOptions.c:2383
 #, c-format
 msgid "Show %s/sec, ETA"
 msgstr "als %s/s plus ETA tonen"
 
-#: src/LYOptions.c:2379
+#: src/LYOptions.c:2386
 msgid "Show progressbar"
 msgstr "als voortgangsbalk"
 
-#: src/LYOptions.c:2391
+#: src/LYOptions.c:2398
 msgid "Accept lynx's internal types"
 msgstr "interne types van Lynx accepteren"
 
-#: src/LYOptions.c:2392
+#: src/LYOptions.c:2399
 msgid "Also accept lynx.cfg's types"
 msgstr "ook types uit lynx.cfg accepteren"
 
-#: src/LYOptions.c:2393
+#: src/LYOptions.c:2400
 msgid "Also accept user's types"
 msgstr "ook gebruikertypes accepteren"
 
-#: src/LYOptions.c:2394
+#: src/LYOptions.c:2401
 msgid "Also accept system's types"
 msgstr "ook systeemtypes accepteren"
 
-#: src/LYOptions.c:2395
+#: src/LYOptions.c:2402
 msgid "Accept all types"
 msgstr "alle types accepteren"
 
-#: src/LYOptions.c:2404
+#: src/LYOptions.c:2411
 msgid "gzip"
 msgstr "gzip"
 
-#: src/LYOptions.c:2405
+#: src/LYOptions.c:2412
 msgid "deflate"
 msgstr "deflate"
 
-#: src/LYOptions.c:2408
+#: src/LYOptions.c:2415
 msgid "compress"
 msgstr "compress"
 
-#: src/LYOptions.c:2411
+#: src/LYOptions.c:2418
 msgid "bzip2"
 msgstr "bzip2"
 
-#: src/LYOptions.c:2413
+#: src/LYOptions.c:2420
 msgid "All"
 msgstr "allemaal"
 
-#: src/LYOptions.c:2681 src/LYOptions.c:2705
+#: src/LYOptions.c:2699 src/LYOptions.c:2728
 #, c-format
 msgid "Use %s to invoke the Options menu!"
 msgstr "Gebruik %s om naar het Optiesmenu te gaan!"
 
-#: src/LYOptions.c:3477
+#: src/LYOptions.c:3541
 msgid "(options marked with (!) will not be saved)"
 msgstr "(opties gemarkeerd met (!) worden niet opgeslagen)"
 
-#: src/LYOptions.c:3485
+#: src/LYOptions.c:3549
 msgid "General Preferences"
 msgstr "Algemene voorkeuren"
 
 #. ***************************************************************
 #. User Mode: SELECT
-#: src/LYOptions.c:3489
+#: src/LYOptions.c:3553
 msgid "User mode"
 msgstr "Gebruikersmodus"
 
 #. Editor: INPUT
-#: src/LYOptions.c:3495
+#: src/LYOptions.c:3559
 msgid "Editor"
 msgstr "Editor"
 
 #. Search Type: SELECT
-#: src/LYOptions.c:3500
+#: src/LYOptions.c:3564
 msgid "Type of Search"
 msgstr "Zoekmethode"
 
-#: src/LYOptions.c:3505
+#: src/LYOptions.c:3569
 msgid "Security and Privacy"
 msgstr "Veiligheid en privacy"
 
 #. ***************************************************************
 #. Cookies: SELECT
-#: src/LYOptions.c:3509
+#: src/LYOptions.c:3573
 msgid "Cookies"
 msgstr "Koekjes"
 
 #. Cookie Prompting: SELECT
-#: src/LYOptions.c:3523
+#: src/LYOptions.c:3587
 msgid "Invalid-Cookie Prompting"
 msgstr "Prompt bij ongeldige koekjes"
 
 #. SSL Prompting: SELECT
-#: src/LYOptions.c:3530
+#: src/LYOptions.c:3594
 msgid "SSL Prompting"
 msgstr "SSL-prompt"
 
-#: src/LYOptions.c:3536
+#: src/LYOptions.c:3600
 msgid "Keyboard Input"
 msgstr "Toetsenbordinvoer"
 
 #. ***************************************************************
 #. Keypad Mode: SELECT
-#: src/LYOptions.c:3540
+#: src/LYOptions.c:3604
 msgid "Keypad mode"
 msgstr "Gedrag van cijfertoetsen"
 
 #. Emacs keys: ON/OFF
-#: src/LYOptions.c:3546
+#: src/LYOptions.c:3610
 msgid "Emacs keys"
 msgstr "Emacs-toetsen"
 
 #. VI Keys: ON/OFF
-#: src/LYOptions.c:3552
+#: src/LYOptions.c:3616
 msgid "VI keys"
 msgstr "VI-toetsen"
 
 #. Line edit style: SELECT
 #. well, at least 2 line edit styles available
-#: src/LYOptions.c:3559
+#: src/LYOptions.c:3623
 msgid "Line edit style"
 msgstr "Regelbewerkingsstijl"
 
 #. Keyboard layout: SELECT
-#: src/LYOptions.c:3571
+#: src/LYOptions.c:3635
 msgid "Keyboard layout"
 msgstr "Toetsenbordindeling"
 
 #.
 #. * Display and Character Set
 #.
-#: src/LYOptions.c:3585
+#: src/LYOptions.c:3649
 msgid "Display and Character Set"
 msgstr "Weergave en tekenset"
 
 #. Use locale-based character set: ON/OFF
-#: src/LYOptions.c:3590
+#: src/LYOptions.c:3654
 msgid "Use locale-based character set"
 msgstr "Tekenset van taalregio nemen"
 
+#: src/LYOptions.c:3661
+msgid "Use HTML5 charset replacements"
+msgstr "Vervangende HTML5-tekenset"
+
 #. Display Character Set: SELECT
-#: src/LYOptions.c:3599
+#: src/LYOptions.c:3667
 msgid "Display character set"
 msgstr "Gebruikte tekenset op scherm"
 
-#: src/LYOptions.c:3630
+#: src/LYOptions.c:3698
 msgid "Assumed document character set"
 msgstr "Tekenset van huidig document"
 
@@ -4887,251 +4926,268 @@ msgstr "Tekenset van huidig document"
 #. * we split the header to make it more readable:
 #. * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others.
 #.
-#: src/LYOptions.c:3650
+#: src/LYOptions.c:3718
 msgid "CJK mode"
 msgstr "CJK-modus"
 
-#: src/LYOptions.c:3652
+#: src/LYOptions.c:3720
 msgid "Raw 8-bit"
 msgstr "Kale 8-bit"
 
 #. X Display: INPUT
-#: src/LYOptions.c:3660
+#: src/LYOptions.c:3728
 msgid "X Display"
 msgstr "X-display"
 
 #.
 #. * Document Appearance
 #.
-#: src/LYOptions.c:3666
+#: src/LYOptions.c:3734
 msgid "Document Appearance"
 msgstr "Uiterlijk van document"
 
-#: src/LYOptions.c:3672
+#: src/LYOptions.c:3740
 msgid "Show color"
 msgstr "Kleur tonen"
 
 #. Show cursor: ON/OFF
-#: src/LYOptions.c:3696
+#: src/LYOptions.c:3764
 msgid "Show cursor"
 msgstr "Cursor tonen"
 
 #. Underline links: ON/OFF
-#: src/LYOptions.c:3702
+#: src/LYOptions.c:3770
 msgid "Underline links"
 msgstr "Koppelingen onderstrepen"
 
 #. Show scrollbar: ON/OFF
-#: src/LYOptions.c:3709
+#: src/LYOptions.c:3777
 msgid "Show scrollbar"
 msgstr "Schuifbalk tonen"
 
 #. Select Popups: ON/OFF
-#: src/LYOptions.c:3716
+#: src/LYOptions.c:3784
 msgid "Popups for select fields"
 msgstr "Menuutjes voor keuzevelden"
 
 #. HTML error recovery: SELECT
-#: src/LYOptions.c:3722
+#: src/LYOptions.c:3790
 msgid "HTML error recovery"
 msgstr "HTML-foutcorrectie"
 
+#. Bad HTML messages: SELECT
+#: src/LYOptions.c:3796
+msgid "Bad HTML messages"
+msgstr "HTML-berichten ongeldig"
+
 #. Show Images: SELECT
-#: src/LYOptions.c:3728
+#: src/LYOptions.c:3802
 msgid "Show images"
 msgstr "Afbeeldingen"
 
 #. Verbose Images: ON/OFF
-#: src/LYOptions.c:3742
+#: src/LYOptions.c:3816
 msgid "Verbose images"
 msgstr "Details van afbeeldingen"
 
 #.
 #. * Headers Transferred to Remote Servers
 #.
-#: src/LYOptions.c:3750
+#: src/LYOptions.c:3824
 msgid "Headers Transferred to Remote Servers"
 msgstr "Naar servers verzonden kopregels"
 
 #. ***************************************************************
 #. Mail Address: INPUT
-#: src/LYOptions.c:3754
+#: src/LYOptions.c:3828
 msgid "Personal mail address"
 msgstr "Persoonlijk e-mailadres"
 
-#: src/LYOptions.c:3760
+#: src/LYOptions.c:3833
+msgid "Personal name for mail"
+msgstr "Persoonlijke naam voor e-mail"
+
+#: src/LYOptions.c:3840
 msgid "Password for anonymous ftp"
 msgstr "Wachtwoord voor anonieme FTP"
 
 #. Preferred media type: SELECT
-#: src/LYOptions.c:3766
+#: src/LYOptions.c:3846
 msgid "Preferred media type"
 msgstr "Voorkeursmediatype"
 
 # Het gaat over compressiemethodes, niet over codering.
 #. Preferred encoding: SELECT
-#: src/LYOptions.c:3772
+#: src/LYOptions.c:3852
 msgid "Preferred encoding"
 msgstr "Voorkeurscompressie"
 
 #. Preferred Document Character Set: INPUT
-#: src/LYOptions.c:3778
+#: src/LYOptions.c:3858
 msgid "Preferred document character set"
 msgstr "Voorkeurstekenset van document"
 
 #. Preferred Document Language: INPUT
-#: src/LYOptions.c:3783
+#: src/LYOptions.c:3863
 msgid "Preferred document language"
 msgstr "Voorkeurstaal van document"
 
-#: src/LYOptions.c:3789
+#: src/LYOptions.c:3869
+msgid "Send User-Agent header"
+msgstr "User-Agent-kopregel versturen"
+
+#: src/LYOptions.c:3871
 msgid "User-Agent header"
 msgstr "User-Agent-kopregel"
 
 #.
 #. * Listing and Accessing Files
 #.
-#: src/LYOptions.c:3797
+#: src/LYOptions.c:3879
 msgid "Listing and Accessing Files"
 msgstr "Bestandslijsten en snelheid"
 
 #. FTP sort: SELECT
-#: src/LYOptions.c:3802
+#: src/LYOptions.c:3884
 msgid "Use Passive FTP"
-msgstr "passieve FTP gebruiken"
+msgstr "Passieve FTP gebruiken"
 
 #. FTP sort: SELECT
-#: src/LYOptions.c:3808
+#: src/LYOptions.c:3890
 msgid "FTP sort criteria"
 msgstr "Sortering voor FTP"
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:3816
+#: src/LYOptions.c:3898
 msgid "Local directory sort criteria"
 msgstr "Groepering in lokale mappen"
 
 #. Local Directory Order: SELECT
-#: src/LYOptions.c:3822
+#: src/LYOptions.c:3904
 msgid "Local directory sort order"
 msgstr "Sortering van lokale bestanden"
 
-#: src/LYOptions.c:3831
+#: src/LYOptions.c:3913
 msgid "Show dot files"
 msgstr "puntbestanden tonen"
 
-#: src/LYOptions.c:3839
+#: src/LYOptions.c:3921
 msgid "Execution links"
 msgstr "verwijzingen die programma's starten"
 
+#: src/LYOptions.c:3939
+msgid "Pause when showing message"
+msgstr "Onderbreek bij tonen bericht"
+
 #. Show transfer rate: SELECT
-#: src/LYOptions.c:3859
+#: src/LYOptions.c:3946
 msgid "Show transfer rate"
 msgstr "Overdrachtssnelheid tonen"
 
 #.
 #. * Special Files and Screens
 #.
-#: src/LYOptions.c:3879
+#: src/LYOptions.c:3966
 msgid "Special Files and Screens"
 msgstr "Speciale bestanden en schermen"
 
-#: src/LYOptions.c:3884
+#: src/LYOptions.c:3971
 msgid "Multi-bookmarks"
 msgstr "Meervoudige boekenleggers"
 
-#: src/LYOptions.c:3892
+#: src/LYOptions.c:3979
 msgid "Review/edit Bookmarks files"
 msgstr "Boekenleggerbestanden bekijken/wijzigen"
 
-#: src/LYOptions.c:3894
+#: src/LYOptions.c:3982
 msgid "Goto multi-bookmark menu"
 msgstr "Naar multiboekenleggermenu"
 
-#: src/LYOptions.c:3896
+#: src/LYOptions.c:3984
 msgid "Bookmarks file"
 msgstr "Boekenleggerbestand"
 
 #. Auto Session: ON/OFF
-#: src/LYOptions.c:3903
+#: src/LYOptions.c:3991
 msgid "Auto Session"
 msgstr "Automatische sessie"
 
 #. Session File Menu: INPUT
-#: src/LYOptions.c:3909
+#: src/LYOptions.c:3997
 msgid "Session file"
 msgstr "Sessiebestand"
 
 #. Visited Pages: SELECT
-#: src/LYOptions.c:3915
+#: src/LYOptions.c:4003
 msgid "Visited Pages"
 msgstr "Bezochte pagina's"
 
-#: src/LYOptions.c:3920
+#: src/LYOptions.c:4008
 msgid "View the file "
 msgstr "Instellingenbestand bekijken: "
 
-#: src/LYPrint.c:937
+#: src/LYPrint.c:947
 #, c-format
 msgid " Print job complete.\n"
 msgstr " Printopdracht is voltooid.\n"
 
-#: src/LYPrint.c:1262
+#: src/LYPrint.c:1274
 msgid "Document:"
 msgstr "Document:"
 
-#: src/LYPrint.c:1263
+#: src/LYPrint.c:1275
 msgid "Number of lines:"
 msgstr "Aantal regels:"
 
-#: src/LYPrint.c:1264
+#: src/LYPrint.c:1276
 msgid "Number of pages:"
 msgstr "Aantal pagina's:"
 
-#: src/LYPrint.c:1265
+#: src/LYPrint.c:1277
 msgid "pages"
 msgstr "pagina's"
 
-#: src/LYPrint.c:1265
+#: src/LYPrint.c:1277
 msgid "page"
 msgstr "pagina"
 
-#: src/LYPrint.c:1266
+#: src/LYPrint.c:1278
 msgid "(approximately)"
 msgstr "(bij benadering)"
 
-#: src/LYPrint.c:1273
+#: src/LYPrint.c:1285
 msgid "Some print functions have been disabled!"
 msgstr "Enkele afdrukinstellingen zijn uitgeschakeld."
 
-#: src/LYPrint.c:1277
+#: src/LYPrint.c:1289
 msgid "Standard print options:"
 msgstr "Standaard afdrukinstellingen:"
 
-#: src/LYPrint.c:1278
+#: src/LYPrint.c:1290
 msgid "Print options:"
 msgstr "Afdrukinstellingen:"
 
-#: src/LYPrint.c:1285
+#: src/LYPrint.c:1297
 msgid "Save to a local file"
 msgstr "Opslaan naar een lokaal bestand"
 
-#: src/LYPrint.c:1287
+#: src/LYPrint.c:1299
 msgid "Save to disk disabled"
 msgstr "Opslaan naar schijf is uitgeschakeld"
 
-#: src/LYPrint.c:1294
+#: src/LYPrint.c:1306
 msgid "Mail the file"
 msgstr "Het bestand mailen"
 
-#: src/LYPrint.c:1301
+#: src/LYPrint.c:1313
 msgid "Print to the screen"
 msgstr "Afdrukken naar het scherm"
 
-#: src/LYPrint.c:1306
+#: src/LYPrint.c:1318
 msgid "Print out on a printer attached to your vt100 terminal"
 msgstr "Afdrukken naar een printer die verbonden is aan uw vt100-terminal"
 
-#: src/LYReadCFG.c:371
+#: src/LYReadCFG.c:441
 #, c-format
 msgid ""
 "Syntax Error parsing COLOR in configuration file:\n"
@@ -5148,295 +5204,295 @@ msgstr ""
 "Hier kunnen VOORGROND en ACHTERGROND één van de volgende zijn:\n"
 "De uitzonderingen 'nocolor' of 'default', of\n"
 
-#: src/LYReadCFG.c:384
+#: src/LYReadCFG.c:454
 msgid "Offending line:"
 msgstr "Regel waar het mis ging:"
 
-#: src/LYReadCFG.c:681
+#: src/LYReadCFG.c:757
 #, c-format
 msgid "key remapping of %s to %s for %s failed\n"
 msgstr "toetsherdefinitie van %s naar %s voor %s is mislukt\n"
 
-#: src/LYReadCFG.c:688
+#: src/LYReadCFG.c:764
 #, c-format
 msgid "key remapping of %s to %s failed\n"
 msgstr "toetsherdefinitie van %s naar %s is mislukt\n"
 
-#: src/LYReadCFG.c:709
+#: src/LYReadCFG.c:785
 #, c-format
 msgid "invalid line-editor selection %s for key %s, selecting all\n"
 msgstr "ongeldige selectie %s voor toets %s; alles wordt geselecteerd\n"
 
-#: src/LYReadCFG.c:734 src/LYReadCFG.c:746
+#: src/LYReadCFG.c:810 src/LYReadCFG.c:822
 #, c-format
 msgid "setting of line-editor binding for key %s (0x%x) to 0x%x for %s failed\n"
 msgstr "maken van koppeling voor toets %s (0x%x) naar 0x%x voor %s mislukt\n"
 
-#: src/LYReadCFG.c:750
+#: src/LYReadCFG.c:826
 #, c-format
 msgid "setting of line-editor binding for key %s (0x%x) for %s failed\n"
 msgstr "maken van koppeling voor toets %s (0x%x) voor %s mislukt\n"
 
-#: src/LYReadCFG.c:846
+#: src/LYReadCFG.c:922
 #, c-format
 msgid "Lynx: cannot start, CERN rules file %s is not available\n"
 msgstr "Lynx: kan niet starten, CERN reglement bestand %s is niet beschikbaar\n"
 
-#: src/LYReadCFG.c:847
+#: src/LYReadCFG.c:923
 msgid "(no name)"
 msgstr "(naamloos)"
 
-#: src/LYReadCFG.c:1882
+#: src/LYReadCFG.c:2044
 #, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
 msgstr "Meer dan %d geneste insluitingen in lynx.cfg -- misschien een lus?!?\n"
 
-#: src/LYReadCFG.c:1884
+#: src/LYReadCFG.c:2046
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr "De laatst geprobeerde insluiting was '%s',\n"
 
-#: src/LYReadCFG.c:1885
+#: src/LYReadCFG.c:2047
 #, c-format
 msgid "included from '%s'.\n"
 msgstr "ingevoegd vanuit '%s'.\n"
 
-#: src/LYReadCFG.c:2289 src/LYReadCFG.c:2302 src/LYReadCFG.c:2360
+#: src/LYReadCFG.c:2450 src/LYReadCFG.c:2463 src/LYReadCFG.c:2521
 msgid "The following is read from your lynx.cfg file."
 msgstr "Onderstaande gegevens werden gelezen uit uw lynx.cfg-bestand."
 
-#: src/LYReadCFG.c:2290 src/LYReadCFG.c:2303
+#: src/LYReadCFG.c:2451 src/LYReadCFG.c:2464
 msgid "Please read the distribution"
 msgstr "Lees de meegeleverde versie van"
 
-#: src/LYReadCFG.c:2296 src/LYReadCFG.c:2306
+#: src/LYReadCFG.c:2457 src/LYReadCFG.c:2467
 msgid "for more comments."
 msgstr "voor meer opmerkingen."
 
-#: src/LYReadCFG.c:2342
+#: src/LYReadCFG.c:2503
 msgid "RELOAD THE CHANGES"
 msgstr "DE VERANDERINGEN HERLADEN"
 
-#: src/LYReadCFG.c:2350
+#: src/LYReadCFG.c:2511
 msgid "Your primary configuration"
 msgstr "Uw primaire instellingenbestand is:"
 
-#: src/LYShowInfo.c:173
+#: src/LYShowInfo.c:177
 msgid "Directory that you are currently viewing"
 msgstr "De map die u op dit moment bekijkt"
 
-#: src/LYShowInfo.c:176
+#: src/LYShowInfo.c:180
 msgid "Name:"
 msgstr "Naam:"
 
-#: src/LYShowInfo.c:179
+#: src/LYShowInfo.c:183
 msgid "URL:"
 msgstr "URL:"
 
-#: src/LYShowInfo.c:193
+#: src/LYShowInfo.c:197
 msgid "Directory that you have currently selected"
 msgstr "Geselecteerde map"
 
-#: src/LYShowInfo.c:195
+#: src/LYShowInfo.c:199
 msgid "File that you have currently selected"
 msgstr "Geselecteerd bestand"
 
-#: src/LYShowInfo.c:198
+#: src/LYShowInfo.c:202
 msgid "Symbolic link that you have currently selected"
 msgstr "Geselecteerde symbolische verwijzing"
 
-#: src/LYShowInfo.c:201
+#: src/LYShowInfo.c:205
 msgid "Item that you have currently selected"
 msgstr "Geselecteerd item"
 
-#: src/LYShowInfo.c:203
+#: src/LYShowInfo.c:207
 msgid "Full name:"
 msgstr "Volledige naam:"
 
-#: src/LYShowInfo.c:213
+#: src/LYShowInfo.c:217
 msgid "Unable to follow link"
 msgstr "De verwijzing kan niet vervolgd worden"
 
-#: src/LYShowInfo.c:215
+#: src/LYShowInfo.c:219
 msgid "Points to file:"
 msgstr "Wijst naar bestand:"
 
-#: src/LYShowInfo.c:220
+#: src/LYShowInfo.c:224
 msgid "Name of owner:"
 msgstr "Naam van eigenaar:"
 
-#: src/LYShowInfo.c:223
+#: src/LYShowInfo.c:227
 msgid "Group name:"
 msgstr "Groepsnaam:"
 
-#: src/LYShowInfo.c:225
+#: src/LYShowInfo.c:229
 msgid "File size:"
 msgstr "Bestandsgrootte:"
 
-#: src/LYShowInfo.c:227
+#: src/LYShowInfo.c:231
 msgid "(bytes)"
 msgstr "(bytes)"
 
 #.
 #. * Include date and time information.
 #.
-#: src/LYShowInfo.c:232
+#: src/LYShowInfo.c:236
 msgid "Creation date:"
 msgstr "Aanmaakdatum:"
 
-#: src/LYShowInfo.c:235
+#: src/LYShowInfo.c:239
 msgid "Last modified:"
 msgstr "Laatst gewijzigd op:"
 
-#: src/LYShowInfo.c:238
+#: src/LYShowInfo.c:242
 msgid "Last accessed:"
 msgstr "Laatst bezocht op:"
 
-#: src/LYShowInfo.c:244
+#: src/LYShowInfo.c:248
 msgid "Access Permissions"
 msgstr "Toegangsrechten"
 
-#: src/LYShowInfo.c:279
+#: src/LYShowInfo.c:283
 msgid "Group:"
 msgstr "Groep:"
 
-#: src/LYShowInfo.c:299
+#: src/LYShowInfo.c:303
 msgid "World:"
 msgstr "Wereld:"
 
-#: src/LYShowInfo.c:306
+#: src/LYShowInfo.c:310
 msgid "File that you are currently viewing"
 msgstr "Het bestand dat u op dit moment bekijkt"
 
-#: src/LYShowInfo.c:314 src/LYShowInfo.c:418
+#: src/LYShowInfo.c:318 src/LYShowInfo.c:422
 msgid "Linkname:"
 msgstr "Linknaam:"
 
-#: src/LYShowInfo.c:320 src/LYShowInfo.c:335
+#: src/LYShowInfo.c:324 src/LYShowInfo.c:339
 msgid "Charset:"
 msgstr "Tekenset:"
 
-#: src/LYShowInfo.c:334
+#: src/LYShowInfo.c:338
 msgid "(assumed)"
 msgstr "(verondersteld)"
 
-#: src/LYShowInfo.c:341
+#: src/LYShowInfo.c:345
 msgid "Server:"
 msgstr "Server:"
 
-#: src/LYShowInfo.c:344
+#: src/LYShowInfo.c:348
 msgid "Date:"
 msgstr "Datum:"
 
-#: src/LYShowInfo.c:347
+#: src/LYShowInfo.c:351
 msgid "Last Mod:"
 msgstr "Laatst veranderd:"
 
-#: src/LYShowInfo.c:352
+#: src/LYShowInfo.c:356
 msgid "Expires:"
 msgstr "Vervalt:"
 
-#: src/LYShowInfo.c:355
+#: src/LYShowInfo.c:359
 msgid "Cache-Control:"
 msgstr "Cache-besturing:"
 
-#: src/LYShowInfo.c:358
+#: src/LYShowInfo.c:362
 msgid "Content-Length:"
 msgstr "Inhoudslengte:"
 
-#: src/LYShowInfo.c:362
+#: src/LYShowInfo.c:366
 msgid "Length:"
 msgstr "Lengte:"
 
-#: src/LYShowInfo.c:367
+#: src/LYShowInfo.c:371
 msgid "Language:"
 msgstr "Taal:"
 
-#: src/LYShowInfo.c:374
+#: src/LYShowInfo.c:378
 msgid "Post Data:"
 msgstr "POST-informatie:"
 
-#: src/LYShowInfo.c:377
+#: src/LYShowInfo.c:381
 msgid "Post Content Type:"
 msgstr "POST-inhoudstype:"
 
-#: src/LYShowInfo.c:380
+#: src/LYShowInfo.c:384
 msgid "Owner(s):"
 msgstr "Eigenaar:"
 
-#: src/LYShowInfo.c:385
+#: src/LYShowInfo.c:389
 msgid "size:"
 msgstr "grootte:"
 
-#: src/LYShowInfo.c:387
+#: src/LYShowInfo.c:391
 msgid "lines"
 msgstr "regels"
 
-#: src/LYShowInfo.c:391
+#: src/LYShowInfo.c:395
 msgid "forms mode"
 msgstr "formuliermodus"
 
-#: src/LYShowInfo.c:393
+#: src/LYShowInfo.c:397
 msgid "source"
 msgstr "bron"
 
-#: src/LYShowInfo.c:394
+#: src/LYShowInfo.c:398
 msgid "normal"
 msgstr "normaal"
 
-#: src/LYShowInfo.c:396
+#: src/LYShowInfo.c:400
 msgid ", safe"
 msgstr ", veilig"
 
-#: src/LYShowInfo.c:398
+#: src/LYShowInfo.c:402
 msgid ", via internal link"
 msgstr ", via interne link"
 
-#: src/LYShowInfo.c:403
+#: src/LYShowInfo.c:407
 msgid ", no-cache"
 msgstr ", geen cache"
 
-#: src/LYShowInfo.c:405
+#: src/LYShowInfo.c:409
 msgid ", ISMAP script"
 msgstr ", ISMAP-script"
 
-#: src/LYShowInfo.c:407
+#: src/LYShowInfo.c:411
 msgid ", bookmark file"
 msgstr ", boekenleggerbestand"
 
-#: src/LYShowInfo.c:411
+#: src/LYShowInfo.c:415
 msgid "mode:"
 msgstr "modus:"
 
-#: src/LYShowInfo.c:417
+#: src/LYShowInfo.c:421
 msgid "Link that you currently have selected"
 msgstr "Link die nu geselecteerd is"
 
-#: src/LYShowInfo.c:426
+#: src/LYShowInfo.c:430
 msgid "Method:"
 msgstr "Methode:"
 
-#: src/LYShowInfo.c:430
+#: src/LYShowInfo.c:434
 msgid "Enctype:"
 msgstr "Enctype:"
 
-#: src/LYShowInfo.c:436
+#: src/LYShowInfo.c:440
 msgid "Action:"
 msgstr "Actie:"
 
-#: src/LYShowInfo.c:441
+#: src/LYShowInfo.c:446
 msgid "(Form field)"
 msgstr "(formulierveld)"
 
-#: src/LYShowInfo.c:450
+#: src/LYShowInfo.c:457
 msgid "No Links on the current page"
 msgstr "Er zijn geen verwijzingen op de huidige pagina"
 
-#: src/LYShowInfo.c:455
+#: src/LYShowInfo.c:463
 msgid "Server Headers:"
 msgstr "Serverkopregels:"
 
-#: src/LYStyle.c:312
+#: src/LYStyle.c:331
 #, c-format
 msgid ""
 "Syntax Error parsing style in lss file:\n"
@@ -5453,65 +5509,65 @@ msgstr ""
 "waar OBJECT een van de volgende is: EM,STRONG,B,I,U,BLINK enz.\n"
 "\n"
 
-#: src/LYTraversal.c:108
+#: src/LYTraversal.c:111
 msgid "here is a list of the history stack so that you may rebuild"
 msgstr "hier is een lijst van de logs, zodat u opnieuw kunt bouwen"
 
-#: src/LYUpload.c:75
+#: src/LYUpload.c:77
 msgid "ERROR! - upload command is misconfigured"
 msgstr "FOUT! -- upload-commando is niet goed ingesteld"
 
-#: src/LYUpload.c:96
+#: src/LYUpload.c:98
 msgid "Illegal redirection \"../\" found! Request ignored."
 msgstr "Ongeldige doorverwijzing \"../\" gevonden!  Verzoek is genegeerd."
 
-#: src/LYUpload.c:99
+#: src/LYUpload.c:101
 msgid "Illegal character \"/\" found! Request ignored."
 msgstr "Ongeldig teken \"/\" gevonden!  Verzoek is genegeerd."
 
-#: src/LYUpload.c:102
+#: src/LYUpload.c:104
 msgid "Illegal redirection using \"~\" found! Request ignored."
 msgstr "Ongeldige doorverwijzing met \"~\" gevonden!  Verzoek is genegeerd."
 
-#: src/LYUpload.c:159
+#: src/LYUpload.c:157
 msgid "Unable to upload file."
 msgstr "Kan bestand niet uploaden."
 
-#: src/LYUpload.c:201
+#: src/LYUpload.c:199
 msgid "Upload To:"
 msgstr "Zenden naar:"
 
-#: src/LYUpload.c:202
+#: src/LYUpload.c:200
 msgid "Upload options:"
 msgstr "Zendopties:"
 
-#: src/LYUtils.c:1830
+#: src/LYUtils.c:1883
 msgid "Download document URL put to clipboard."
 msgstr "Document afhalings-URL op klembord geplaatst."
 
-#: src/LYUtils.c:2615
+#: src/LYUtils.c:2668
 msgid "Unexpected access protocol for this URL scheme."
 msgstr "Onverwacht toegangsprotocol voor deze URL-methode."
 
-#: src/LYUtils.c:3423
+#: src/LYUtils.c:3492
 msgid "Too many tempfiles"
 msgstr "Te veel tijdelijke bestanden"
 
-#: src/LYUtils.c:3723
+#: src/LYUtils.c:3792
 msgid "unknown restriction"
 msgstr "Onbekende beperking"
 
-#: src/LYUtils.c:3754
+#: src/LYUtils.c:3823
 #, c-format
 msgid "No restrictions set.\n"
 msgstr "Er zijn geen beperkingen gesteld.\n"
 
-#: src/LYUtils.c:3757
+#: src/LYUtils.c:3826
 #, c-format
 msgid "Restrictions set:\n"
 msgstr "Gestelde beperkingen:\n"
 
-#: src/LYUtils.c:5135
+#: src/LYUtils.c:5212
 msgid "Cannot find HOME directory"
 msgstr "Kan persoonlijke map niet vinden"
 
@@ -5519,7 +5575,7 @@ msgstr "Kan persoonlijke map niet vinden"
 msgid "Normally disabled.  See ENABLE_LYNXRC in lynx.cfg\n"
 msgstr "Normaliter uitgeschakeld.  Zie ENABLE_LYNXRC in lynx.cfg\n"
 
-#: src/LYrcFile.c:317
+#: src/LYrcFile.c:325
 msgid ""
 "accept_all_cookies allows the user to tell Lynx to automatically\n"
 "accept all cookies if desired.  The default is \"FALSE\" which will\n"
@@ -5531,7 +5587,7 @@ msgstr ""
 "\"FALSE\", zodat voor elk koekje om bevestiging zal worden gevraagd.\n"
 "Zet accept_all_cookies op \"TRUE\" om alle koekjes te accepteren.\n"
 
-#: src/LYrcFile.c:325
+#: src/LYrcFile.c:333
 msgid ""
 "anonftp_password allows the user to tell Lynx to use the personal\n"
 "email address as the password for anonymous ftp.  If no value is given,\n"
@@ -5541,7 +5597,7 @@ msgstr ""
 "anonftp_password geeft de gebruiker de gelegenheid op het e-mailadres\n"
 "op te geven dat gebruikt wordt als wachtwoord bij anonieme FTP-toegang.n Als geen waarde gegeven wordt, gebruikt Lynx het persoonlijke e-mailadres.\n"
 
-#: src/LYrcFile.c:332
+#: src/LYrcFile.c:342
 msgid ""
 "bookmark_file specifies the name and location of the default bookmark\n"
 "file into which the user can paste links for easy access at a later\n"
@@ -5551,7 +5607,7 @@ msgstr ""
 "boekenleggerbestand waarin de gebruiker links kan plaatsen om deze\n"
 "op een later tijdstip eenvoudig te kunnen bereiken.\n"
 
-#: src/LYrcFile.c:337
+#: src/LYrcFile.c:347
 msgid ""
 "If case_sensitive_searching is \"on\" then when the user invokes a search\n"
 "using the 's' or '/' keys, the search performed will be case sensitive\n"
@@ -5562,7 +5618,7 @@ msgstr ""
 "en kleine letters, in plaats van ongevoelig voor kast.  De standaard is\n"
 "meestal \"off\".\n"
 
-#: src/LYrcFile.c:342
+#: src/LYrcFile.c:352
 msgid ""
 "The character_set definition controls the representation of 8 bit\n"
 "characters for your terminal.  If 8 bit characters do not show up\n"
@@ -5575,7 +5631,7 @@ msgstr ""
 "scherm, kunt u een andere 8 bit verzameling proberen of 7 bit benaderingen.\n"
 "Huidig geldige tekenverzamelingen zijn:\n"
 
-#: src/LYrcFile.c:349
+#: src/LYrcFile.c:359
 msgid ""
 "cookie_accept_domains and cookie_reject_domains are comma-delimited\n"
 "lists of domains from which Lynx should automatically accept or reject\n"
@@ -5584,7 +5640,7 @@ msgid ""
 "settings made here.\n"
 msgstr "cookie_accept_domains en cookie_reject_domains zijn door komma's gescheiden lijsten van domeinen voor welke Lynx automatisch alle koekjes respectievelijk toelaat of weigert.  Als een domein opgegeven wordt voor beide opties zal verwerping het winnen van toelaten.  De accept_all_cookies parameter doet deze instellingen teniet.\n"
 
-#: src/LYrcFile.c:357
+#: src/LYrcFile.c:367
 msgid ""
 "cookie_file specifies the file from which to read persistent cookies.\n"
 "The default is ~/"
@@ -5592,7 +5648,7 @@ msgstr ""
 "'cookie_file' specificeert het bestand waaruit blijvende koekjes worden\n"
 "gelezen.  Standaard is dit ~/"
 
-#: src/LYrcFile.c:362
+#: src/LYrcFile.c:372
 msgid ""
 "cookie_loose_invalid_domains, cookie_strict_invalid_domains, and\n"
 "cookie_query_invalid_domains are comma-delimited lists of which domains\n"
@@ -5611,7 +5667,7 @@ msgstr ""
 "domein-attribuut te plaatsen.  Alle domeinen zullen standaard de\n"
 "gebruiker vragen (query) in geval van ongeldig pad of domein.\n"
 
-#: src/LYrcFile.c:376
+#: src/LYrcFile.c:386
 msgid ""
 "dir_list_order specifies the directory list order under DIRED_SUPPORT\n"
 "(if implemented).  The default is \"ORDER_BY_NAME\"\n"
@@ -5619,7 +5675,7 @@ msgstr ""
 "dir_list_order bepaalt de volgorde van de mappenlijst onder DIRED_SUPPORT\n"
 "(als geïmplementeerd).  De standaard is \"ORDER_BY_NAME\"\n"
 
-#: src/LYrcFile.c:381
+#: src/LYrcFile.c:391
 msgid ""
 "dir_list_styles specifies the directory list style under DIRED_SUPPORT\n"
 "(if implemented).  The default is \"MIXED_STYLE\", which sorts both\n"
@@ -5631,7 +5687,7 @@ msgstr ""
 "bestanden en mappen samen worden gesorteerd.  \"FILES_FIRST\" plaatst\n"
 "bestanden eerst, \"DIRECTORIES_FIRST\" plaatst mappen eerst.\n"
 
-#: src/LYrcFile.c:389
+#: src/LYrcFile.c:399
 msgid ""
 "If emacs_keys is to \"on\" then the normal EMACS movement keys:\n"
 "  ^N = down    ^P = up\n"
@@ -5643,7 +5699,7 @@ msgstr ""
 "  ^B = links (backward-char)   ^F = rechts (forward-char)\n"
 "in gebruik zijn.\n"
 
-#: src/LYrcFile.c:395
+#: src/LYrcFile.c:405
 msgid ""
 "file_editor specifies the editor to be invoked when editing local files\n"
 "or sending mail.  If no editor is specified, then file editing is disabled\n"
@@ -5656,7 +5712,7 @@ msgstr ""
 "wordt opgegeven.  De ingebouwde editor zal worden gebruikt om e-mail te\n"
 "verzenden.\n"
 
-#: src/LYrcFile.c:402
+#: src/LYrcFile.c:412
 msgid ""
 "The file_sorting_method specifies which value to sort on when viewing\n"
 "file lists such as FTP directories.  The options are:\n"
@@ -5672,7 +5728,7 @@ msgstr ""
 "  BY_SIZE     -- sorteert op de grootte van het bestand\n"
 "  BY_DATE     -- sorteert op de datum van het bestand\n"
 
-#: src/LYrcFile.c:424
+#: src/LYrcFile.c:435
 msgid ""
 "lineedit_mode specifies the key binding used for inputting strings in\n"
 "prompts and forms.  If lineedit_mode is set to \"Default Binding\" then\n"
@@ -5695,7 +5751,7 @@ msgstr ""
 "\n"
 "Huidige mogelijkheden voor lineedit_mode zijn:\n"
 
-#: src/LYrcFile.c:442
+#: src/LYrcFile.c:453
 msgid ""
 "The following allow you to define sub-bookmark files and descriptions.\n"
 "The format is multi_bookmark<capital_letter>=<filename>,<description>\n"
@@ -5708,7 +5764,7 @@ msgstr ""
 "Er kunnen 26 boekenleggerbestanden zijn, voor elke hoofdletter A-Z.\n"
 "We beginnen met \"multi_bookmarkB\" omdat 'A' de gewone is (zie boven).\n"
 
-#: src/LYrcFile.c:448
+#: src/LYrcFile.c:459
 msgid ""
 "personal_mail_address specifies your personal mail address.  The\n"
 "address will be sent during HTTP file transfers for authorization and\n"
@@ -5726,7 +5782,27 @@ msgstr ""
 "ook dit veld leeg laten, maar dan wordt het ook niet opgenomen in\n"
 "uw e-mailcommentaren.\n"
 
-#: src/LYrcFile.c:457
+#: src/LYrcFile.c:468
+msgid ""
+"personal_mail_name specifies your personal name, for mail.  The\n"
+"name is sent for mailed comments.  Lynx will prompt for this,\n"
+"showing the configured value as a default when sending mail.\n"
+"This is not necessarily the same as a name provided as part of the\n"
+"personal_mail_address.\n"
+"Lynx does not save your changes to that default value as a side-effect\n"
+"of sending email.  To update the default value, you must use the options\n"
+"menu, or modify this file directly.\n"
+msgstr ""
+"personal_mail_name specificeert uw persoonlijke naam, gebruikt voor e-mail.\n"
+"De naam wordt verzonden voor e-mailcommentaren.  Lynx zal hiernaar\n"
+"vragen, daarbij de ingestelde waarde als standaard bij het versturen van\n"
+"berichten wordt getoond. Het is niet noodzakelijk dezelfde naam als\n"
+"gebruikt in het personal_mail_address.\n"
+"Lynx zal uw veranderingen van de standaardnaam bij het verzenden van het\n"
+"bericht niet opslaan. Om de standaardwaarde te veranderen kunt u het\n"
+"optiemenu gebruiken of dit bestand direct bewerken.\n"
+
+#: src/LYrcFile.c:478
 msgid ""
 "preferred_charset specifies the character set in MIME notation (e.g.,\n"
 "ISO-8859-2, ISO-8859-5) which Lynx will indicate you prefer in requests\n"
@@ -5754,7 +5830,7 @@ msgstr ""
 "moeten sturen, maar het verzenden van een onacceptabel antwoord is ook\n"
 "toegestaan.\n"
 
-#: src/LYrcFile.c:473
+#: src/LYrcFile.c:494
 msgid ""
 "preferred_language specifies the language in MIME notation (e.g., en,\n"
 "fr, may be a comma-separated list in decreasing preference)\n"
@@ -5769,7 +5845,7 @@ msgstr ""
 "server het verzenden.  Als dit niet het geval is, zal de server het\n"
 "bestand in zijn standaard taal verzenden.\n"
 
-#: src/LYrcFile.c:484
+#: src/LYrcFile.c:505
 msgid ""
 "If run_all_execution_links is set \"on\" then all local execution links\n"
 "will be executed when they are selected.\n"
@@ -5781,7 +5857,8 @@ msgid ""
 "          or compromise security.  This should only be set to \"on\" if\n"
 "          you are viewing trusted source information.\n"
 msgstr ""
-"Als run_all_execution_links op \"on\" wordt gezet zullen alle lokale uitvoer-linksworden uitgevoerd als ze geselecteerd worden.\n"
+"Als run_all_execution_links op \"on\" wordt gezet zullen alle lokale\n"
+"uitvoer-linksworden uitgevoerd als ze geselecteerd worden.\n"
 "\n"
 "LET OP - Dit is potentieel ERG gevaarlijk.  Omdat u informatie kunt\n"
 "         bekijken die geschreven is door onbekende en niet vertrouwde\n"
@@ -5791,7 +5868,7 @@ msgstr ""
 "         omzeilen.  Deze optie moet alleen op \"on\" gezet worden als u\n"
 "         alleen maar informatie bekijkt uit een vertrouwde bron.\n"
 
-#: src/LYrcFile.c:495
+#: src/LYrcFile.c:516
 msgid ""
 "If run_execution_links_on_local_files is set \"on\" then all local\n"
 "execution links that are found in LOCAL files will be executed when they\n"
@@ -5806,7 +5883,11 @@ msgid ""
 "          or compromise security.  This should only be set to \"on\" if\n"
 "          you are viewing trusted source information.\n"
 msgstr ""
-"Als run_execution_links_on_local_files op \"on\" wordt gezet zullen alle lokale uitvoer-links gevonden in LOKALE bestanden worden uitgevoerd als ze geselecteerd worden.  Dit verschilt van run_all_execution_links, daar slechts bestanden die zich op het lokale systeem bevinden deze uitvoer rechten krijgen.\n"
+"Als run_execution_links_on_local_files op \"on\" wordt gezet zullen alle\n"
+"lokale uitvoer-links gevonden in LOKALE bestanden worden uitgevoerd als\n"
+"ze geselecteerd worden.  Dit verschilt van run_all_execution_links, daar\n"
+"slechts bestanden die zich op het lokale systeem bevinden deze uitvoer\n"
+"rechten krijgen.\n"
 "\n"
 "LET OP - Hier dreigt potentieel gevaar.  Omdat u informatie kunt\n"
 "         bekijken die geschreven is door onbekende en niet vertrouwde\n"
@@ -5816,7 +5897,7 @@ msgstr ""
 "         omzeilen.  Deze optie moet alleen op \"on\" gezet worden als u\n"
 "         alleen maar informatie bekijkt uit een vertrouwde bron.\n"
 
-#: src/LYrcFile.c:513
+#: src/LYrcFile.c:534
 msgid ""
 "select_popups specifies whether the OPTIONs in a SELECT block which\n"
 "lacks a MULTIPLE attribute are presented as a vertical list of radio\n"
@@ -5835,7 +5916,7 @@ msgstr ""
 "drukknoppen zorgt.\n"
 "De standaard kan worden tenietgedaan d.m.v. de `-popup' commandoregel optie.\n"
 
-#: src/LYrcFile.c:523
+#: src/LYrcFile.c:545
 msgid ""
 "show_color specifies how to set the color mode at startup.  A value of\n"
 "\"never\" will force color mode off (treat the terminal as monochrome)\n"
@@ -5870,7 +5951,7 @@ msgstr ""
 "'o'pties menu.  Als de optie-instellingen worden opgeslagen, zullen de\n"
 "\"on\" en \"off\" instellingen worden gezien als \"default\".\n"
 
-#: src/LYrcFile.c:540
+#: src/LYrcFile.c:562
 msgid ""
 "show_cursor specifies whether to 'hide' the cursor to the right (and\n"
 "bottom, if possible) of the screen, or to place it to the left of the\n"
@@ -5891,7 +5972,7 @@ msgstr ""
 "Een waarde \"on\" zal de positionering links van de links of opties\n"
 "zetten, en en waarde \"off\" probeert de cursor te 'verbergen'.\n"
 
-#: src/LYrcFile.c:551
+#: src/LYrcFile.c:573
 msgid ""
 "show_dotfiles specifies that the directory listing should include\n"
 "\"hidden\" (dot) files/directories.  If set \"on\", this will be\n"
@@ -5905,7 +5986,7 @@ msgstr ""
 "de commandoregel.  Indien uitgeschakeld, wordt het ook onmogelijk gemaakt\n"
 "om verborgen bestanden aan te maken vanuit Lynx.\n"
 
-#: src/LYrcFile.c:562
+#: src/LYrcFile.c:584
 msgid ""
 "If sub_bookmarks is not turned \"off\", and multiple bookmarks have\n"
 "been defined (see below), then all bookmark operations will first\n"
@@ -5929,7 +6010,7 @@ msgstr ""
 "gebruikersmodus het volledige menu getoond worden.\n"
 "\n"
 
-#: src/LYrcFile.c:576
+#: src/LYrcFile.c:598
 msgid ""
 "user_mode specifies the users level of knowledge with Lynx.  The\n"
 "default is \"NOVICE\" which displays two extra lines of help at the\n"
@@ -5945,7 +6026,7 @@ msgstr ""
 "schakelen.  Gebruik \"ADVANCED\" om onder in het scherm de URL van de\n"
 "geselecteerd link te zien.\n"
 
-#: src/LYrcFile.c:585
+#: src/LYrcFile.c:607
 msgid ""
 "If verbose_images is \"on\", lynx will print the name of the image\n"
 "source file in place of [INLINE], [LINK] or [IMAGE]\n"
@@ -5955,7 +6036,7 @@ msgstr ""
 "afbeelding laten zien in plaats van [INLINE], [LINK] of [IMAGE].\n"
 "Zie ook VERBOSE_IMAGES in lynx.cfg\n"
 
-#: src/LYrcFile.c:590
+#: src/LYrcFile.c:612
 msgid ""
 "If vi_keys is set to \"on\", then the normal VI movement keys:\n"
 "  j = down    k = up\n"
@@ -5970,7 +6051,7 @@ msgstr ""
 "De hoofdletters 'H', 'J' en 'K' zullen nog steeds hulp activeren,\n"
 "springen naar snelkoppelingen of de toetsenindeling laten zien.\n"
 
-#: src/LYrcFile.c:598
+#: src/LYrcFile.c:620
 msgid ""
 "The visited_links setting controls how Lynx organizes the information\n"
 "in the Visited Links Page.\n"
@@ -5978,7 +6059,7 @@ msgstr ""
 "De optie 'visited_links' bepaalt hoe Lynx de informatie weergeeft op de\n"
 "pagina met Bezochte links.\n"
 
-#: src/LYrcFile.c:819
+#: src/LYrcFile.c:845
 msgid ""
 "If keypad_mode is set to \"NUMBERS_AS_ARROWS\", then the numbers on\n"
 "your keypad when the numlock is on will act as arrow keys:\n"
@@ -5996,7 +6077,7 @@ msgstr ""
 "De corresponderende nummers op het linkerdeel van het toetsenbord zullen\n"
 "ook als pijltjestoetsen functioneren, ongeacht de Numlock stand.\n"
 
-#: src/LYrcFile.c:828
+#: src/LYrcFile.c:854
 msgid ""
 "If keypad_mode is set to \"LINKS_ARE_NUMBERED\", then numbers will\n"
 "appear next to each link and numbers are used to select links.\n"
@@ -6005,7 +6086,7 @@ msgstr ""
 "verschijnen naast elke link en nummers kunnen gebruikt worden om links\n"
 "te selecteren.\n"
 
-#: src/LYrcFile.c:832
+#: src/LYrcFile.c:858
 msgid ""
 "If keypad_mode is set to \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\", then\n"
 "numbers will appear next to each link and visible form input field.\n"
@@ -6025,7 +6106,7 @@ msgstr ""
 "op het scherm zichtbaar is.  Referentielijsten en uitvoer van het\n"
 "lijst commando nummeren ook formulier-invoervelden.\n"
 
-#: src/LYrcFile.c:841
+#: src/LYrcFile.c:867
 msgid ""
 "NOTE: Some fixed format documents may look disfigured when\n"
 "\"LINKS_ARE_NUMBERED\" or \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\" are\n"
@@ -6035,7 +6116,7 @@ msgstr ""
 "verminkt uitzien als \"LINKS_ARE_NUMBERED\" of\n"
 "\"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\" is aangezet.\n"
 
-#: src/LYrcFile.c:873
+#: src/LYrcFile.c:899
 msgid ""
 "Lynx User Defaults File\n"
 "\n"
@@ -6043,7 +6124,7 @@ msgstr ""
 "Lynxbestand met standaardinstellingen van gebruiker\n"
 "\n"
 
-#: src/LYrcFile.c:882
+#: src/LYrcFile.c:908
 msgid ""
 "This file contains options saved from the Lynx Options Screen (normally\n"
 "with the 'o' key).  To save options with that screen, you must select the\n"
@@ -6053,7 +6134,7 @@ msgstr ""
 "met de 'o'-toets). Om opties met dit venster te bewaren vinkt u het\n"
 "aanvinkveld aan:\n"
 
-#: src/LYrcFile.c:889
+#: src/LYrcFile.c:915
 msgid ""
 "You must then save the settings using the link on the line above the\n"
 "checkbox:\n"
@@ -6061,7 +6142,7 @@ msgstr ""
 "U bewaart vervolgens de instellingen via de link op de regel boven het\n"
 "aanvinkveld:\n"
 
-#: src/LYrcFile.c:896
+#: src/LYrcFile.c:922
 msgid ""
 "You may also use the command-line option \"-forms_options\", which displays\n"
 "the simpler Options Menu instead.  Save options with that using the '>' key.\n"
@@ -6071,7 +6152,7 @@ msgstr ""
 "een eenvoudiger optiemenu wordt getoond. Bewaar hiermee de opties met de\n"
 "'>'-toets.\n"
 
-#: src/LYrcFile.c:903
+#: src/LYrcFile.c:929
 msgid ""
 "This file contains options saved from the Lynx Options Screen (normally\n"
 "with the '>' key).\n"
@@ -6081,7 +6162,7 @@ msgstr ""
 "via de '>'-toets).\n"
 "\n"
 
-#: src/LYrcFile.c:910
+#: src/LYrcFile.c:936
 msgid ""
 "There is normally no need to edit this file manually, since the defaults\n"
 "here can be controlled from the Options Screen, and the next time options\n"
@@ -6101,6 +6182,15 @@ msgstr ""
 "meestal \"lynx.cfg\". Het heeft een andere inhoud en een andere opmaak.\n"
 "Het is niet dit bestand.\n"
 
+#~ msgid "Very long lines have been wrapped!"
+#~ msgstr "Erg lange regels zijn omgevouwen!"
+
+#~ msgid "Path too long"
+#~ msgstr "Pad is te lang"
+
+#~ msgid "Source and destination are the same location - request ignored!"
+#~ msgstr "Bron en bestemming zijn dezelfde locatie -- verzoek is genegeerd!"
+
 #~ msgid "Socket read failed for 180,000 tries."
 #~ msgstr "Lezen uit socket is mislukt na 180 duizend (!) pogingen."