snapshot of project "lynx", label v2-9-0dev_1b

11 files changed, 7487 insertions, 5495 deletions

diff --git a/CHANGES b/CHANGES
index 53e0ee16..7d361828 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,11 +1,15 @@
--- $LynxId: CHANGES,v 1.1011 2019/05/26 00:22:52 tom Exp $
+-- $LynxId: CHANGES,v 1.1013 2019/07/31 07:29:27 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
-2019-01-27 (2.9.0dev.2)
+2019-07-31 (2.9.0dev.2)
+* improved several configure macros, including workaround for non-POSIX
+  issue with BSDs.
+* fix typo in iso15_uni.tbl (Robert Bell)
 * update de.po from
     http://translationproject.org/latest/lynx
+* update config.guess (2019-06-10), config.sub (2019-06-30)
 
 2019-01-27 (2.9.0dev.1)
 * add/adapt changes from Keith Bowes' github:
diff --git a/aclocal.m4 b/aclocal.m4
index 41139f90..5b9c6923 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $LynxId: aclocal.m4,v 1.252 2018/07/08 15:22:44 tom Exp $
+dnl $LynxId: aclocal.m4,v 1.256 2019/08/01 00:07:38 tom Exp $
 dnl Macros for auto-configure script.
 dnl by Thomas E. Dickey <dickey@invisible-island.net>
 dnl and Jim Spath <jspath@mail.bcpl.lib.md.us>
@@ -12,7 +12,7 @@ dnl https://invisible-island.net/autoconf/autoconf.html
 dnl
 dnl ---------------------------------------------------------------------------
 dnl
-dnl Copyright 1997-2017,2018 by Thomas E. Dickey
+dnl Copyright 1997-2018,2019 by Thomas E. Dickey
 dnl
 dnl Permission to use, copy, modify, and distribute this software and its
 dnl documentation for any purpose and without fee is hereby granted,
@@ -732,7 +732,7 @@ AC_SUBST(EXTRA_CPPFLAGS)
 
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_ADD_INCDIR version: 14 updated: 2015/05/25 20:53:04
+dnl CF_ADD_INCDIR version: 15 updated: 2018/06/20 20:23:13
 dnl -------------
 dnl Add an include-directory to $CPPFLAGS.  Don't add /usr/include, since it's
 dnl redundant.  We don't normally need to add -I/usr/local/include for gcc,
@@ -763,7 +763,7 @@ if test -n "$1" ; then
 			if test "$GCC" = yes
 			then
 			  cf_save_CPPFLAGS=$CPPFLAGS
-			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+			  CF_APPEND_TEXT(CPPFLAGS,-I$cf_add_incdir)
 			  AC_TRY_COMPILE([#include <stdio.h>],
 				  [printf("Hello")],
 				  [],
@@ -1253,7 +1253,7 @@ AC_SUBST(BUILD_EXEEXT)
 AC_SUBST(BUILD_OBJEXT)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_BUNDLED_INTL version: 18 updated: 2015/05/10 19:52:14
+dnl CF_BUNDLED_INTL version: 19 updated: 2018/06/20 20:23:13
 dnl ---------------
 dnl Top-level macro for configuring an application with a bundled copy of
 dnl the intl and po directories for gettext.
@@ -1349,7 +1349,7 @@ else
 fi
 
 if test -z "$INTLDIR_MAKE" ; then
-	CPPFLAGS="$CPPFLAGS -I../intl"
+	CF_APPEND_TEXT(CPPFLAGS,-I../intl)
 fi
 
 dnl FIXME:  we use this in lynx (the alternative is a spurious dependency upon
@@ -1383,7 +1383,7 @@ if test "$USE_INCLUDED_LIBINTL" = yes ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CC_ENV_FLAGS version: 8 updated: 2017/09/23 08:50:24
+dnl CF_CC_ENV_FLAGS version: 9 updated: 2018/07/29 18:03:26
 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
@@ -1400,11 +1400,28 @@ AC_DEFUN([CF_CC_ENV_FLAGS],
 # This should have been defined by AC_PROG_CC
 : ${CC:=cc}
 
+AC_MSG_CHECKING(\$CFLAGS variable)
+case "x$CFLAGS" in
+(*-[[IUD]]*)
+	AC_MSG_RESULT(broken)
+	AC_MSG_WARN(your environment uses the CFLAGS variable to hold CPPFLAGS options)
+	cf_flags="$CFLAGS"
+	CFLAGS=
+	for cf_arg in $cf_flags
+	do
+		CF_ADD_CFLAGS($cf_arg)
+	done
+	;;
+(*)
+	AC_MSG_RESULT(ok)
+	;;
+esac
+
 AC_MSG_CHECKING(\$CC variable)
 case "$CC" in
 (*[[\ \	]]-*)
 	AC_MSG_RESULT(broken)
-	AC_MSG_WARN(your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options)
+	AC_MSG_WARN(your environment uses the CC variable to hold CFLAGS/CPPFLAGS options)
 	# humor him...
 	cf_prog=`echo "$CC" | sed -e 's/	/ /g' -e 's/[[ ]]* / /g' -e 's/[[ ]]*[[ ]]-[[^ ]].*//'`
 	cf_flags=`echo "$CC" | ${AWK:-awk} -v prog="$cf_prog" '{ printf("%s", [substr]([$]0,1+length(prog))); }'`
@@ -1767,6 +1784,60 @@ if test $cf_cv_color_curses = yes ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_CONST_X_STRING version: 1 updated: 2019/04/08 17:50:29
+dnl -----------------
+dnl The X11R4-X11R6 Xt specification uses an ambiguous String type for most
+dnl character-strings.
+dnl
+dnl It is ambiguous because the specification accommodated the pre-ANSI
+dnl compilers bundled by more than one vendor in lieu of providing a standard C
+dnl compiler other than by costly add-ons.  Because of this, the specification
+dnl did not take into account the use of const for telling the compiler that
+dnl string literals would be in readonly memory.
+dnl
+dnl As a workaround, one could (starting with X11R5) define XTSTRINGDEFINES, to
+dnl let the compiler decide how to represent Xt's strings which were #define'd. 
+dnl That does not solve the problem of using the block of Xt's strings which
+dnl are compiled into the library (and is less efficient than one might want).
+dnl
+dnl Xt specification 7 introduces the _CONST_X_STRING symbol which is used both
+dnl when compiling the library and compiling using the library, to tell the
+dnl compiler that String is const.
+AC_DEFUN([CF_CONST_X_STRING],
+[
+AC_TRY_COMPILE(
+[
+#include <stdlib.h>
+#include <X11/Intrinsic.h>
+],
+[String foo = malloc(1)],[
+
+AC_CACHE_CHECK(for X11/Xt const-feature,cf_cv_const_x_string,[
+	AC_TRY_COMPILE(
+		[
+#define _CONST_X_STRING	/* X11R7.8 (perhaps) */
+#undef  XTSTRINGDEFINES	/* X11R5 and later */
+#include <stdlib.h>
+#include <X11/Intrinsic.h>
+		],[String foo = malloc(1); *foo = 0],[
+			cf_cv_const_x_string=no
+		],[
+			cf_cv_const_x_string=yes
+		])
+])
+
+case $cf_cv_const_x_string in
+(no)
+	CF_APPEND_TEXT(CPPFLAGS,-DXTSTRINGDEFINES)
+	;;
+(*)
+	CF_APPEND_TEXT(CPPFLAGS,-D_CONST_X_STRING)
+	;;
+esac
+
+])
+])dnl
+dnl ---------------------------------------------------------------------------
 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).
@@ -1803,7 +1874,7 @@ CF_NCURSES_VERSION
 CF_CURSES_LIBS
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_CPPFLAGS version: 12 updated: 2015/04/15 19:08:48
+dnl CF_CURSES_CPPFLAGS version: 13 updated: 2018/06/20 20:23:13
 dnl ------------------
 dnl Look for the curses headers.
 AC_DEFUN([CF_CURSES_CPPFLAGS],[
@@ -1828,7 +1899,10 @@ case $host_os in
 	;;
 esac
 ])
-test "$cf_cv_curses_incdir" != no && CPPFLAGS="$CPPFLAGS $cf_cv_curses_incdir"
+if test "$cf_cv_curses_incdir" != no
+then
+	CF_APPEND_TEXT(CPPFLAGS,$cf_cv_curses_incdir)
+fi
 
 CF_CURSES_HEADER
 CF_TERM_HEADER
@@ -1901,7 +1975,7 @@ fi
 AC_CHECK_HEADERS($cf_cv_ncurses_header)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_LIBS version: 41 updated: 2017/12/31 19:23:43
+dnl CF_CURSES_LIBS version: 42 updated: 2018/06/20 20:23:13
 dnl --------------
 dnl Look for the curses libraries.  Older curses implementations may require
 dnl termcap/termlib to be linked as well.  Call CF_CURSES_CPPFLAGS first.
@@ -1934,7 +2008,7 @@ case $host_os in
 		AC_CHECK_LIB(Hcurses,initscr,[
 			# HP's header uses __HP_CURSES, but user claims _HP_CURSES.
 			CF_ADD_LIBS(-lHcurses)
-			CPPFLAGS="$CPPFLAGS -D__HP_CURSES -D_HP_CURSES"
+			CF_APPEND_TEXT(CPPFLAGS,-D__HP_CURSES -D_HP_CURSES)
 			ac_cv_func_initscr=yes
 			])])
 	fi
@@ -2535,7 +2609,7 @@ fi
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_FIND_LINKAGE version: 20 updated: 2015/04/18 08:56:57
+dnl CF_FIND_LINKAGE version: 21 updated: 2018/06/20 20:23:13
 dnl ---------------
 dnl Find a library (specifically the linkage used in the code fragment),
 dnl searching for it if it is not already in the library path.
@@ -2594,7 +2668,8 @@ AC_TRY_LINK([$1],[$2],[
 	do
 		if test -d $cf_cv_header_path_$3 ; then
 			CF_VERBOSE(... testing $cf_cv_header_path_$3)
-			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_$3"
+			CPPFLAGS="$cf_save_CPPFLAGS"
+			CF_APPEND_TEXT(CPPFLAGS,-I$cf_cv_header_path_$3)
 			AC_TRY_COMPILE([$1],[$2],[
 				CF_VERBOSE(... found $3 headers in $cf_cv_header_path_$3)
 				cf_cv_find_linkage_$3=maybe
@@ -2853,6 +2928,38 @@ AC_TRY_LINK([
 test "$cf_cv_func_sigaction" = yes && AC_DEFINE(HAVE_SIGACTION,1,[Define to 1 if we have sigaction])
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_FUNC_VASPRINTF version: 1 updated: 2019/07/31 20:03:22
+dnl -----------------
+dnl Check if vasprintf is available, and if it is (or can be) declared.
+AC_DEFUN([CF_FUNC_VASPRINTF],[
+AC_REQUIRE([CF_GNU_SOURCE])
+AC_CHECK_FUNC(vasprintf,[
+	AC_DEFINE(HAVE_VASPRINTF)
+	AC_MSG_CHECKING(if vasprintf requires workaround)
+	AC_TRY_COMPILE([
+		#include <stdio.h>
+		],[
+		void *p = (void *)vasprintf; return (p != 0)
+	],[
+		AC_MSG_RESULT(no)
+	],[
+		AC_TRY_COMPILE([
+			#ifndef _GNU_SOURCE
+			#define _GNU_SOURCE 1
+			#include <stdio.h>
+			#endif
+			],[
+			void *p = (void *)vasprintf; return (p != 0)
+		],[
+			AC_MSG_RESULT(yes)
+			CF_APPEND_TEXT(CPPFLAGS,-D_GNU_SOURCE)
+		],[
+			AC_MSG_RESULT(unknown)
+		])
+	])
+])
+])dnl
+dnl ---------------------------------------------------------------------------
 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()'
@@ -3017,7 +3124,7 @@ if test "$GCC" = yes ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_GCC_WARNINGS version: 32 updated: 2015/04/12 15:39:00
+dnl CF_GCC_WARNINGS version: 35 updated: 2019/06/16 09:45:01
 dnl ---------------
 dnl Check if the compiler supports useful warning options.  There's a few that
 dnl we don't use, simply because they're too noisy:
@@ -3041,12 +3148,11 @@ AC_DEFUN([CF_GCC_WARNINGS],
 AC_REQUIRE([CF_GCC_VERSION])
 CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS)
 CF_CLANG_COMPILER(GCC,CLANG_COMPILER,CFLAGS)
-
+if test "x$have_x" = xyes; then CF_CONST_X_STRING fi
 cat > conftest.$ac_ext <<EOF
 #line __oline__ "${as_me:-configure}"
 int main(int argc, char *argv[[]]) { return (argv[[argc-1]] == 0) ; }
 EOF
-
 if test "$INTEL_COMPILER" = yes
 then
 # The "-wdXXX" options suppress warnings:
@@ -3081,7 +3187,6 @@ then
 		fi
 	done
 	CFLAGS="$cf_save_CFLAGS"
-
 elif test "$GCC" = yes
 then
 	AC_CHECKING([for $CC warning options])
@@ -3110,9 +3215,6 @@ then
 		if AC_TRY_EVAL(ac_compile); then
 			test -n "$verbose" && AC_MSG_RESULT(... -$cf_opt)
 			case $cf_opt in
-			(Wcast-qual)
-				CPPFLAGS="$CPPFLAGS -DXTSTRINGDEFINES"
-				;;
 			(Winline)
 				case $GCC_VERSION in
 				([[34]].*)
@@ -3252,7 +3354,7 @@ AC_DEFUN([CF_GNUTLS],[
 	fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_GNU_SOURCE version: 7 updated: 2016/08/05 05:15:37
+dnl CF_GNU_SOURCE version: 10 updated: 2018/12/10 20:09:41
 dnl -------------
 dnl Check if we must define _GNU_SOURCE to get a reasonable value for
 dnl _XOPEN_SOURCE, upon which many POSIX definitions depend.  This is a defect
@@ -3260,38 +3362,106 @@ dnl (or misfeature) of glibc2, which breaks portability of many applications,
 dnl since it is interwoven with GNU extensions.
 dnl
 dnl Well, yes we could work around it...
+dnl
+dnl Parameters:
+dnl	$1 is the nominal value for _XOPEN_SOURCE
 AC_DEFUN([CF_GNU_SOURCE],
 [
-AC_CACHE_CHECK(if we must define _GNU_SOURCE,cf_cv_gnu_source,[
+cf_gnu_xopen_source=ifelse($1,,500,$1)
+
+AC_CACHE_CHECK(if this is the GNU C library,cf_cv_gnu_library,[
 AC_TRY_COMPILE([#include <sys/types.h>],[
-#ifndef _XOPEN_SOURCE
-make an error
-#endif],
-	[cf_cv_gnu_source=no],
-	[cf_save="$CPPFLAGS"
-	 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
-	 AC_TRY_COMPILE([#include <sys/types.h>],[
-#ifdef _XOPEN_SOURCE
-make an error
-#endif],
-	[cf_cv_gnu_source=no],
-	[cf_cv_gnu_source=yes])
-	CPPFLAGS="$cf_save"
-	])
+	#if __GLIBC__ > 0 && __GLIBC_MINOR__ >= 0
+		return 0;
+	#elif __NEWLIB__ > 0 && __NEWLIB_MINOR__ >= 0
+		return 0;
+	#else
+	#	error not GNU C library
+	#endif],
+	[cf_cv_gnu_library=yes],
+	[cf_cv_gnu_library=no])
 ])
 
-if test "$cf_cv_gnu_source" = yes
-then
-AC_CACHE_CHECK(if we should also define _DEFAULT_SOURCE,cf_cv_default_source,[
-CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
-	AC_TRY_COMPILE([#include <sys/types.h>],[
-#ifdef _DEFAULT_SOURCE
-make an error
-#endif],
-		[cf_cv_default_source=no],
-		[cf_cv_default_source=yes])
+if test x$cf_cv_gnu_library = xyes; then
+
+	# With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE
+	# was changed to help a little.  newlib incorporated the change about 4
+	# years later.
+	AC_CACHE_CHECK(if _DEFAULT_SOURCE can be used as a basis,cf_cv_gnu_library_219,[
+		cf_save="$CPPFLAGS"
+		CF_APPEND_TEXT(CPPFLAGS,-D_DEFAULT_SOURCE)
+		AC_TRY_COMPILE([#include <sys/types.h>],[
+			#if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 19) || (__GLIBC__ > 2)
+				return 0;
+			#elif (__NEWLIB__ == 2 && __NEWLIB_MINOR__ >= 4) || (__GLIBC__ > 3)
+				return 0;
+			#else
+			#	error GNU C library __GLIBC__.__GLIBC_MINOR__ is too old
+			#endif],
+			[cf_cv_gnu_library_219=yes],
+			[cf_cv_gnu_library_219=no])
+		CPPFLAGS="$cf_save"
 	])
-test "$cf_cv_default_source" = yes && CPPFLAGS="$CPPFLAGS -D_DEFAULT_SOURCE"
+
+	if test "x$cf_cv_gnu_library_219" = xyes; then
+		cf_save="$CPPFLAGS"
+		AC_CACHE_CHECK(if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE,cf_cv_gnu_dftsrc_219,[
+			CF_ADD_CFLAGS(-D_DEFAULT_SOURCE -D_XOPEN_SOURCE=$cf_gnu_xopen_source)
+			AC_TRY_COMPILE([
+				#include <limits.h>
+				#include <sys/types.h>
+				],[
+				#if (_XOPEN_SOURCE >= $cf_gnu_xopen_source) && (MB_LEN_MAX > 1)
+					return 0;
+				#else
+				#	error GNU C library is too old
+				#endif],
+				[cf_cv_gnu_dftsrc_219=yes],
+				[cf_cv_gnu_dftsrc_219=no])
+			])
+		test "x$cf_cv_gnu_dftsrc_219" = "xyes" || CPPFLAGS="$cf_save"
+	else
+		cf_cv_gnu_dftsrc_219=maybe
+	fi
+
+	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
+
+		AC_CACHE_CHECK(if we must define _GNU_SOURCE,cf_cv_gnu_source,[
+		AC_TRY_COMPILE([#include <sys/types.h>],[
+			#ifndef _XOPEN_SOURCE
+			#error	expected _XOPEN_SOURCE to be defined
+			#endif],
+			[cf_cv_gnu_source=no],
+			[cf_save="$CPPFLAGS"
+			 CF_ADD_CFLAGS(-D_GNU_SOURCE)
+			 AC_TRY_COMPILE([#include <sys/types.h>],[
+				#ifdef _XOPEN_SOURCE
+				#error	expected _XOPEN_SOURCE to be undefined
+				#endif],
+				[cf_cv_gnu_source=no],
+				[cf_cv_gnu_source=yes])
+			CPPFLAGS="$cf_save"
+			])
+		])
+
+		if test "$cf_cv_gnu_source" = yes
+		then
+		AC_CACHE_CHECK(if we should also define _DEFAULT_SOURCE,cf_cv_default_source,[
+			CF_APPEND_TEXT(CPPFLAGS,-D_GNU_SOURCE)
+			AC_TRY_COMPILE([#include <sys/types.h>],[
+				#ifdef _DEFAULT_SOURCE
+				#error	expected _DEFAULT_SOURCE to be undefined
+				#endif],
+				[cf_cv_default_source=no],
+				[cf_cv_default_source=yes])
+			])
+			if test "$cf_cv_default_source" = yes
+			then
+				CF_APPEND_TEXT(CPPFLAGS,-D_DEFAULT_SOURCE)
+			fi
+		fi
+	fi
+
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
@@ -3432,7 +3602,7 @@ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_LARGEFILE version: 10 updated: 2017/01/21 11:06:25
+dnl CF_LARGEFILE version: 11 updated: 2018/06/20 20:23:13
 dnl ------------
 dnl Add checks for large file support.
 AC_DEFUN([CF_LARGEFILE],[
@@ -3448,9 +3618,18 @@ ifdef([AC_FUNC_FSEEKO],[
 	# header files by themselves before looking at the body files it is
 	# told to compile.  For ncurses, those header files do not include
 	# the config.h
-	test "$ac_cv_sys_large_files"      != no && CPPFLAGS="$CPPFLAGS -D_LARGE_FILES "
-	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 "
+	if test "$ac_cv_sys_large_files" != no
+	then
+		CF_APPEND_TEXT(CPPFLAGS,-D_LARGE_FILES)
+	fi
+	if test "$ac_cv_sys_largefile_source" != no
+	then
+		CF_APPEND_TEXT(CPPFLAGS,-D_LARGEFILE_SOURCE)
+	fi
+	if test "$ac_cv_sys_file_offset_bits" != no
+	then
+		CF_APPEND_TEXT(CPPFLAGS,-D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits)
+	fi
 
 	AC_CACHE_CHECK(whether to use struct dirent64, cf_cv_struct_dirent64,[
 		AC_TRY_COMPILE([
@@ -3499,7 +3678,7 @@ AC_TRY_COMPILE([
 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: 7 updated: 2016/02/20 18:01:19
+dnl CF_LD_RPATH_OPT version: 8 updated: 2018/08/18 16:36:35
 dnl ---------------
 dnl For the given system and compiler, find the compiler flags to pass to the
 dnl loader to use the "rpath" feature.
@@ -3508,49 +3687,52 @@ AC_DEFUN([CF_LD_RPATH_OPT],
 AC_REQUIRE([CF_CHECK_CACHE])
 
 LD_RPATH_OPT=
-AC_MSG_CHECKING(for an rpath option)
-case $cf_cv_system_name in
-(irix*)
-	if test "$GCC" = yes; then
+if test "x$cf_cv_enable_rpath" != xno
+then
+	AC_MSG_CHECKING(for an rpath option)
+	case $cf_cv_system_name in
+	(irix*)
+		if test "$GCC" = yes; then
+			LD_RPATH_OPT="-Wl,-rpath,"
+		else
+			LD_RPATH_OPT="-rpath "
+		fi
+		;;
+	(linux*|gnu*|k*bsd*-gnu|freebsd*)
 		LD_RPATH_OPT="-Wl,-rpath,"
-	else
+		;;
+	(openbsd[[2-9]].*|mirbsd*)
+		LD_RPATH_OPT="-Wl,-rpath,"
+		;;
+	(dragonfly*)
 		LD_RPATH_OPT="-rpath "
-	fi
-	;;
-(linux*|gnu*|k*bsd*-gnu|freebsd*)
-	LD_RPATH_OPT="-Wl,-rpath,"
-	;;
-(openbsd[[2-9]].*|mirbsd*)
-	LD_RPATH_OPT="-Wl,-rpath,"
-	;;
-(dragonfly*)
-	LD_RPATH_OPT="-rpath "
-	;;
-(netbsd*)
-	LD_RPATH_OPT="-Wl,-rpath,"
-	;;
-(osf*|mls+*)
-	LD_RPATH_OPT="-rpath "
-	;;
-(solaris2*)
-	LD_RPATH_OPT="-R"
-	;;
-(*)
-	;;
-esac
-AC_MSG_RESULT($LD_RPATH_OPT)
+		;;
+	(netbsd*)
+		LD_RPATH_OPT="-Wl,-rpath,"
+		;;
+	(osf*|mls+*)
+		LD_RPATH_OPT="-rpath "
+		;;
+	(solaris2*)
+		LD_RPATH_OPT="-R"
+		;;
+	(*)
+		;;
+	esac
+	AC_MSG_RESULT($LD_RPATH_OPT)
 
-case "x$LD_RPATH_OPT" in
-(x-R*)
-	AC_MSG_CHECKING(if we need a space after rpath option)
-	cf_save_LIBS="$LIBS"
-	CF_ADD_LIBS(${LD_RPATH_OPT}$libdir)
-	AC_TRY_LINK(, , cf_rpath_space=no, cf_rpath_space=yes)
-	LIBS="$cf_save_LIBS"
-	AC_MSG_RESULT($cf_rpath_space)
-	test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
-	;;
-esac
+	case "x$LD_RPATH_OPT" in
+	(x-R*)
+		AC_MSG_CHECKING(if we need a space after rpath option)
+		cf_save_LIBS="$LIBS"
+		CF_ADD_LIBS(${LD_RPATH_OPT}$libdir)
+		AC_TRY_LINK(, , cf_rpath_space=no, cf_rpath_space=yes)
+		LIBS="$cf_save_LIBS"
+		AC_MSG_RESULT($cf_rpath_space)
+		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
+		;;
+	esac
+fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_LIBRARY_PATH version: 10 updated: 2015/04/15 19:08:48
@@ -3803,7 +3985,7 @@ printf("old\n");
 	,[$1=no])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_NCURSES_CONFIG version: 20 updated: 2018/01/03 04:47:33
+dnl CF_NCURSES_CONFIG version: 21 updated: 2018/06/20 20:23:13
 dnl -----------------
 dnl Tie together the configure-script macros for ncurses, preferring these in
 dnl order:
@@ -3828,7 +4010,7 @@ if test "x${PKG_CONFIG:=none}" != xnone; then
 		cf_save_CPPFLAGS="$CPPFLAGS"
 		cf_save_LIBS="$LIBS"
 
-		CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags $cf_ncuconfig_root`"
+		CF_ADD_CFLAGS(`$PKG_CONFIG --cflags $cf_ncuconfig_root`)
 		CF_ADD_LIBS(`$PKG_CONFIG --libs $cf_ncuconfig_root`)
 
 		AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
@@ -3870,7 +4052,7 @@ if test "x$cf_have_ncuconfig" = "xno"; then
 
 	if test "$NCURSES_CONFIG" != none ; then
 
-		CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`"
+		CF_ADD_CFLAGS(`$NCURSES_CONFIG --cflags`)
 		CF_ADD_LIBS(`$NCURSES_CONFIG --libs`)
 
 		# even with config script, some packages use no-override for curses.h
@@ -4448,12 +4630,13 @@ ifelse([$1],,,[$1=$PATH_SEPARATOR])
 	AC_MSG_RESULT($PATH_SEPARATOR)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_PATH_PROG version: 9 updated: 2012/10/04 20:12:20
+dnl CF_PATH_PROG version: 10 updated: 2019/06/30 19:44:43
 dnl ------------
 dnl Check for a given program, defining corresponding symbol.
 dnl	$1 = environment variable, which is suffixed by "_PATH" in the #define.
 dnl	$2 = program name to find.
 dnl	$3 = optional list of additional program names to test.
+dnl $4 = $PATH
 dnl
 dnl If there is more than one token in the result, #define the remaining tokens
 dnl to $1_ARGS.  We need this for 'install' in particular.
@@ -4463,7 +4646,7 @@ dnl
 AC_DEFUN([CF_PATH_PROG],[
 AC_REQUIRE([CF_PATHSEP])
 test -z "[$]$1" && $1=$2
-AC_PATH_PROGS($1,[$]$1 $2 $3,[$]$1)
+AC_PATH_PROGS($1,[$]$1 $2 ifelse($3,,,$3),[$]$1, ifelse($4,,,$4))
 
 cf_path_prog=""
 cf_path_args=""
@@ -4545,7 +4728,7 @@ AC_CHECK_LIB(pdcurses,initscr,[
 
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_PDCURSES_X11 version: 13 updated: 2012/10/06 16:39:58
+dnl CF_PDCURSES_X11 version: 14 updated: 2018/06/20 20:23:13
 dnl ---------------
 dnl Configure for PDCurses' X11 library
 AC_DEFUN([CF_PDCURSES_X11],[
@@ -4557,7 +4740,7 @@ CF_ACVERSION_CHECK(2.52,
 
 if test "$XCURSES_CONFIG" != none ; then
 
-CPPFLAGS="$CPPFLAGS `$XCURSES_CONFIG --cflags`"
+CF_ADD_CFLAGS(`$XCURSES_CONFIG --cflags`)
 CF_ADD_LIBS(`$XCURSES_CONFIG --libs`)
 
 cf_cv_lib_XCurses=yes
@@ -4626,7 +4809,7 @@ fi
 AC_SUBST(PKG_CONFIG)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_POSIX_C_SOURCE version: 9 updated: 2015/04/12 15:39:00
+dnl CF_POSIX_C_SOURCE version: 11 updated: 2018/12/31 20:46:17
 dnl -----------------
 dnl Define _POSIX_C_SOURCE to the given level, and _POSIX_SOURCE if needed.
 dnl
@@ -4641,7 +4824,10 @@ dnl
 dnl Parameters:
 dnl	$1 is the nominal value for _POSIX_C_SOURCE
 AC_DEFUN([CF_POSIX_C_SOURCE],
-[
+[AC_REQUIRE([CF_POSIX_VISIBLE])dnl
+
+if test "$cf_cv_posix_visible" = no; then
+
 cf_POSIX_C_SOURCE=ifelse([$1],,199506L,[$1])
 
 cf_save_CFLAGS="$CFLAGS"
@@ -4679,7 +4865,8 @@ make an error
 	 fi
 	 CF_MSG_LOG(ifdef from value $cf_POSIX_C_SOURCE)
 	 CFLAGS="$cf_trim_CFLAGS"
-	 CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
+	 CPPFLAGS="$cf_trim_CPPFLAGS"
+	 CF_APPEND_TEXT(CPPFLAGS,$cf_cv_posix_c_source)
 	 CF_MSG_LOG(if the second compile does not leave our definition intact error)
 	 AC_TRY_COMPILE([#include <sys/types.h>],[
 #ifndef _POSIX_C_SOURCE
@@ -4697,6 +4884,35 @@ if test "$cf_cv_posix_c_source" != no ; then
 	CF_ADD_CFLAGS($cf_cv_posix_c_source)
 fi
 
+fi # cf_cv_posix_visible
+
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_POSIX_VISIBLE version: 1 updated: 2018/12/31 20:46:17
+dnl ----------------
+dnl POSIX documents test-macros which an application may set before any system
+dnl headers are included to make features available.
+dnl
+dnl Some BSD platforms (originally FreeBSD, but copied by a few others)
+dnl diverged from POSIX in 2002 by setting symbols which make all of the most
+dnl recent features visible in the system header files unless the application
+dnl overrides the corresponding test-macros.  Doing that introduces portability
+dnl problems.
+dnl
+dnl This macro makes a special check for the symbols used for this, to avoid a
+dnl conflicting definition.
+AC_DEFUN([CF_POSIX_VISIBLE],
+[
+AC_CACHE_CHECK(if the POSIX test-macros are already defined,cf_cv_posix_visible,[
+AC_TRY_COMPILE([#include <stdio.h>],[
+#if defined(__POSIX_VISIBLE) && ((__POSIX_VISIBLE - 0L) > 0) \
+	&& defined(__XSI_VISIBLE) && ((__XSI_VISIBLE - 0L) > 0) \
+	&& defined(__BSD_VISIBLE) && ((__BSD_VISIBLE - 0L) > 0) \
+	&& defined(__ISO_C_VISIBLE) && ((__ISO_C_VISIBLE - 0L) > 0)
+#error conflicting symbols found
+#endif
+],[cf_cv_posix_visible=no],[cf_cv_posix_visible=yes])
+])
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_PROG_AR version: 1 updated: 2009/01/01 20:15:22
@@ -4750,7 +4966,7 @@ then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_PROG_EXT version: 13 updated: 2015/04/18 09:03:58
+dnl CF_PROG_EXT version: 14 updated: 2018/06/20 20:23:13
 dnl -----------
 dnl Compute $PROG_EXT, used for non-Unix ports, such as OS/2 EMX.
 AC_DEFUN([CF_PROG_EXT],
@@ -4759,7 +4975,7 @@ AC_REQUIRE([CF_CHECK_CACHE])
 case $cf_cv_system_name in
 (os2*)
 	CFLAGS="$CFLAGS -Zmt"
-	CPPFLAGS="$CPPFLAGS -D__ST_MT_ERRNO__"
+	CF_APPEND_TEXT(CPPFLAGS,-D__ST_MT_ERRNO__)
 	CXXFLAGS="$CXXFLAGS -Zmt"
 	# autoconf's macro sets -Zexe and suffix both, which conflict:w
 	LDFLAGS="$LDFLAGS -Zmt -Zcrtdll"
@@ -5007,12 +5223,12 @@ int main(void)
 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
+dnl CF_SIGWINCH version: 2 updated: 2019/03/23 19:54:44
 dnl -----------
 dnl Use this macro after CF_XOPEN_SOURCE, but do not require it (not all
 dnl programs need this test).
 dnl
-dnl This is really a MacOS X 10.4.3 workaround.  Defining _POSIX_C_SOURCE
+dnl This is really a Mac OS X 10.4.3 workaround.  Defining _POSIX_C_SOURCE
 dnl forces SIGWINCH to be undefined (breaks xterm, ncurses).  Oddly, the struct
 dnl winsize declaration is left alone - we may revisit this if Apple choose to
 dnl break that part of the interface as well.
@@ -5066,10 +5282,11 @@ done
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_SIZECHANGE version: 11 updated: 2015/04/18 08:56:57
+dnl CF_SIZECHANGE version: 14 updated: 2018/06/20 20:23:13
 dnl -------------
 dnl Check for definitions & structures needed for window size-changing
-dnl FIXME: check that this works with "snake" (HP-UX 10.x)
+dnl
+dnl https://stackoverflow.com/questions/18878141/difference-between-structures-ttysize-and-winsize/50769952#50769952
 AC_DEFUN([CF_SIZECHANGE],
 [
 AC_REQUIRE([CF_STRUCT_TERMIOS])
@@ -5081,7 +5298,10 @@ for cf_opts in "" "NEED_PTEM_H"
 do
 
 	CPPFLAGS="$cf_save_CPPFLAGS"
-	test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
+	if test -n "$cf_opts"
+	then
+		CF_APPEND_TEXT(CPPFLAGS,-D$cf_opts)
+	fi
 	AC_TRY_COMPILE([#include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
 #include <termios.h>
@@ -5090,24 +5310,26 @@ do
 #include <termio.h>
 #endif
 #endif
+
 #ifdef NEED_PTEM_H
 /* This is a workaround for SCO:  they neglected to define struct winsize in
  * termios.h -- it's only in termio.h and ptem.h
  */
-#include        <sys/stream.h>
-#include        <sys/ptem.h>
+#include <sys/stream.h>
+#include <sys/ptem.h>
 #endif
-#if !defined(sun) || !defined(HAVE_TERMIOS_H)
+
+#ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
 #endif
 ],[
 #ifdef TIOCGSIZE
-	struct ttysize win;	/* FIXME: what system is this? */
+	struct ttysize win;	/* SunOS 3.0... */
 	int y = win.ts_lines;
 	int x = win.ts_cols;
 #else
 #ifdef TIOCGWINSZ
-	struct winsize win;
+	struct winsize win;	/* everything else */
 	int y = win.ws_row;
 	int x = win.ws_col;
 #else
@@ -5127,7 +5349,7 @@ do
 done
 ])
 if test "$cf_cv_sizechange" != no ; then
-	AC_DEFINE(HAVE_SIZECHANGE,1,[Define to 1 if sizechar declarations are provided])
+	AC_DEFINE(HAVE_SIZECHANGE,1,[Define to 1 if sizechange declarations are provided])
 	case $cf_cv_sizechange in
 	(NEED*)
 		AC_DEFINE_UNQUOTED($cf_cv_sizechange )
@@ -5631,7 +5853,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: 8 updated: 2015/04/15 19:08:48
+dnl CF_STRUCT_TERMIOS version: 9 updated: 2018/06/08 21:57:23
 dnl -----------------
 dnl Some machines require _POSIX_SOURCE to completely define struct termios.
 AC_DEFUN([CF_STRUCT_TERMIOS],[
@@ -5641,11 +5863,10 @@ AC_CHECK_HEADERS( \
 termio.h \
 termios.h \
 unistd.h \
+sys/ioctl.h \
+sys/termio.h \
 )
 
-if test "$ISC" = yes ; then
-	AC_CHECK_HEADERS( sys/termio.h )
-fi
 if test "$ac_cv_header_termios_h" = yes ; then
 	case "$CFLAGS $CPPFLAGS" in
 	(*-D_POSIX_SOURCE*)
@@ -6062,7 +6283,7 @@ then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_TRY_XOPEN_SOURCE version: 1 updated: 2011/10/30 17:09:50
+dnl CF_TRY_XOPEN_SOURCE version: 2 updated: 2018/06/20 20:23:13
 dnl -------------------
 dnl If _XOPEN_SOURCE is not defined in the compile environment, check if we
 dnl can define it successfully.
@@ -6078,7 +6299,7 @@ make an error
 #endif],
 	[cf_cv_xopen_source=no],
 	[cf_save="$CPPFLAGS"
-	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+	 CF_APPEND_TEXT(CPPFLAGS,-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE)
 	 AC_TRY_COMPILE([
 #include <stdlib.h>
 #include <string.h>
@@ -6659,7 +6880,7 @@ AC_CHECK_FUNCS( \
 )
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_XOPEN_CURSES version: 13 updated: 2015/12/12 20:59:52
+dnl CF_XOPEN_CURSES version: 14 updated: 2018/06/20 20:23:13
 dnl ---------------
 dnl Test if we should define X/Open source for curses, needed on Digital Unix
 dnl 4.x, to see the extended functions, but breaks on IRIX 6.x.
@@ -6708,13 +6929,13 @@ AC_TRY_LINK([
 
 case $cf_cv_need_xopen_extension in
 (*_*)
-	CPPFLAGS="$CPPFLAGS -D$cf_cv_need_xopen_extension"
+	CF_APPEND_TEXT(CPPFLAGS,-D$cf_cv_need_xopen_extension)
 	;;
 esac
 
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_XOPEN_SOURCE version: 52 updated: 2016/08/27 12:21:42
+dnl CF_XOPEN_SOURCE version: 55 updated: 2018/12/31 20:46:17
 dnl ---------------
 dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
 dnl or adapt to the vendor's definitions to get equivalent functionality,
@@ -6725,6 +6946,9 @@ dnl	$1 is the nominal value for _XOPEN_SOURCE
 dnl	$2 is the nominal value for _POSIX_C_SOURCE
 AC_DEFUN([CF_XOPEN_SOURCE],[
 AC_REQUIRE([AC_CANONICAL_HOST])
+AC_REQUIRE([CF_POSIX_VISIBLE])
+
+if test "$cf_cv_posix_visible" = no; then
 
 cf_XOPEN_SOURCE=ifelse([$1],,500,[$1])
 cf_POSIX_C_SOURCE=ifelse([$2],,199506L,[$2])
@@ -6744,7 +6968,7 @@ case $host_os in
 	cf_xopen_source="-D_DARWIN_C_SOURCE"
 	cf_XOPEN_SOURCE=
 	;;
-(freebsd*|dragonfly*)
+(freebsd*|dragonfly*|midnightbsd*)
 	# 5.x headers associate
 	#	_XOPEN_SOURCE=600 with _POSIX_C_SOURCE=200112L
 	#	_XOPEN_SOURCE=500 with _POSIX_C_SOURCE=199506L
@@ -6763,7 +6987,7 @@ case $host_os in
 	cf_XOPEN_SOURCE=
 	;;
 (linux*|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin)
-	CF_GNU_SOURCE
+	CF_GNU_SOURCE($cf_XOPEN_SOURCE)
 	;;
 (minix*)
 	cf_xopen_source="-D_NETBSD_SOURCE" # POSIX.1-2001 features are ifdef'd with this...
@@ -6839,6 +7063,7 @@ make an error
 		CF_TRY_XOPEN_SOURCE
 	fi
 fi
+fi # cf_cv_posix_visible
 ])
 dnl ---------------------------------------------------------------------------
 dnl CF_X_ATHENA version: 23 updated: 2015/04/12 15:39:00
@@ -6953,7 +7178,7 @@ if test -z "$cf_x_athena_lib" ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_X_ATHENA_CPPFLAGS version: 5 updated: 2010/05/26 17:35:30
+dnl CF_X_ATHENA_CPPFLAGS version: 6 updated: 2018/06/20 20:23:13
 dnl --------------------
 dnl Normally invoked by CF_X_ATHENA, with $1 set to the appropriate flavor of
 dnl the Athena widgets, e.g., Xaw, Xaw3d, neXtaw.
@@ -6972,7 +7197,8 @@ do
 		cf_save="$CPPFLAGS"
 		cf_test=X11/$cf_x_athena_root/SimpleMenu.h
 		if test $cf_path != default ; then
-			CPPFLAGS="$cf_save -I$cf_path/include"
+			CPPFLAGS="$cf_save"
+			CF_APPEND_TEXT(CPPFLAGS,-I$cf_path/include)
 			AC_MSG_CHECKING(for $cf_test in $cf_path)
 		else
 			AC_MSG_CHECKING(for $cf_test)
@@ -6996,7 +7222,7 @@ if test -z "$cf_x_athena_inc" ; then
 	AC_MSG_WARN(
 [Unable to successfully find Athena header files with test program])
 elif test "$cf_x_athena_inc" != default ; then
-	CPPFLAGS="$CPPFLAGS -I$cf_x_athena_inc"
+	CF_APPEND_TEXT(CPPFLAGS,-I$cf_x_athena_inc)
 fi
 ])
 dnl ---------------------------------------------------------------------------
@@ -7071,7 +7297,7 @@ CF_TRY_PKG_CONFIG(Xext,,[
 		[CF_ADD_LIB(Xext)])])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_X_TOOLKIT version: 23 updated: 2015/04/12 15:39:00
+dnl CF_X_TOOLKIT version: 24 updated: 2019/03/23 19:54:44
 dnl ------------
 dnl Check for X Toolkit libraries
 AC_DEFUN([CF_X_TOOLKIT],
@@ -7079,7 +7305,7 @@ AC_DEFUN([CF_X_TOOLKIT],
 AC_REQUIRE([AC_PATH_XTRA])
 AC_REQUIRE([CF_CHECK_CACHE])
 
-# OSX is schizoid about who owns /usr/X11 (old) versus /opt/X11 (new), and (and
+# OSX is schizoid about who owns /usr/X11 (old) versus /opt/X11 (new) (and
 # in some cases has installed dummy files in the former, other cases replaced
 # it with a link to the new location).  This complicates the configure script.
 # Check for that pitfall, and recover using pkg-config
diff --git a/config.guess b/config.guess
index 9baaa270..41b8b854 100755
--- a/config.guess
+++ b/config.guess
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2018 Free Software Foundation, Inc.
+#   Copyright 1992-2019 Free Software Foundation, Inc.
 
-timestamp='2018-01-26'
+timestamp='2019-06-10'
 
 # 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
@@ -50,7 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2018 Free Software Foundation, Inc.
+Copyright 1992-2019 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -84,8 +84,6 @@ if test $# != 0; then
   exit 1
 fi
 
-trap 'exit 1' 1 2 15
-
 # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
 # compiler to aid in system detection is discouraged as it requires
 # temporary files to be created and, as you can see below, it is a
@@ -96,34 +94,38 @@ trap 'exit 1' 1 2 15
 
 # Portable tmp directory creation inspired by the Autoconf team.
 
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > "$dummy.c" ;
-	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
+tmp=
+# shellcheck disable=SC2172
+trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15
+
+set_cc_for_build() {
+    : "${TMPDIR=/tmp}"
+    # shellcheck disable=SC2039
+    { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+	{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } ||
+	{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+	{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; }
+    dummy=$tmp/dummy
+    case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in
+	,,)    echo "int x;" > "$dummy.c"
+	       for driver in cc gcc c89 c99 ; do
+		   if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
+		       CC_FOR_BUILD="$driver"
+		       break
+		   fi
+	       done
+	       if test x"$CC_FOR_BUILD" = x ; then
+		   CC_FOR_BUILD=no_compiler_found
+	       fi
+	       ;;
+	,,*)   CC_FOR_BUILD=$CC ;;
+	,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+    esac
+}
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+if test -f /.attbin/uname ; then
 	PATH=$PATH:/.attbin ; export PATH
 fi
 
@@ -138,7 +140,7 @@ Linux|GNU|GNU/*)
 	# We could probably try harder.
 	LIBC=gnu
 
-	eval "$set_cc_for_build"
+	set_cc_for_build
 	cat <<-EOF > "$dummy.c"
 	#include <features.h>
 	#if defined(__UCLIBC__)
@@ -199,7 +201,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
 		os=netbsdelf
 		;;
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval "$set_cc_for_build"
+		set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
 			| grep -q __ELF__
 		then
@@ -237,7 +239,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "$machine-${os}${release}${abi}"
+	echo "$machine-${os}${release}${abi-}"
 	exit ;;
     *:Bitrig:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
@@ -260,6 +262,9 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
     *:SolidBSD:*:*)
 	echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
 	exit ;;
+    *:OS108:*:*)
+	echo "$UNAME_MACHINE"-unknown-os108_"$UNAME_RELEASE"
+	exit ;;
     macppc:MirBSD:*:*)
 	echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
 	exit ;;
@@ -389,7 +394,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
 	echo i386-pc-auroraux"$UNAME_RELEASE"
 	exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	eval "$set_cc_for_build"
+	set_cc_for_build
 	SUN_ARCH=i386
 	# If there is a compiler, see if it is configured for 64-bit objects.
 	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
@@ -482,7 +487,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
 	echo clipper-intergraph-clix"$UNAME_RELEASE"
 	exit ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval "$set_cc_for_build"
+	set_cc_for_build
 	sed 's/^	//' << EOF > "$dummy.c"
 #ifdef __cplusplus
 #include <stdio.h>  /* for printf() prototype */
@@ -579,7 +584,7 @@ EOF
 	exit ;;
     *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval "$set_cc_for_build"
+		set_cc_for_build
 		sed 's/^		//' << EOF > "$dummy.c"
 		#include <sys/systemcfg.h>
 
@@ -660,7 +665,7 @@ EOF
 		    esac
 		fi
 		if [ "$HP_ARCH" = "" ]; then
-		    eval "$set_cc_for_build"
+		    set_cc_for_build
 		    sed 's/^		//' << EOF > "$dummy.c"
 
 		#define _HPUX_SOURCE
@@ -700,7 +705,7 @@ EOF
 	esac
 	if [ "$HP_ARCH" = hppa2.0w ]
 	then
-	    eval "$set_cc_for_build"
+	    set_cc_for_build
 
 	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
 	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
@@ -726,7 +731,7 @@ EOF
 	echo ia64-hp-hpux"$HPUX_REV"
 	exit ;;
     3050*:HI-UX:*:*)
-	eval "$set_cc_for_build"
+	set_cc_for_build
 	sed 's/^	//' << EOF > "$dummy.c"
 	#include <unistd.h>
 	int
@@ -840,6 +845,17 @@ EOF
     *:BSD/OS:*:*)
 	echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
 	exit ;;
+    arm:FreeBSD:*:*)
+	UNAME_PROCESSOR=`uname -p`
+	set_cc_for_build
+	if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_PCS_VFP
+	then
+	    echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabi
+	else
+	    echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabihf
+	fi
+	exit ;;
     *:FreeBSD:*:*)
 	UNAME_PROCESSOR=`/usr/bin/uname -p`
 	case "$UNAME_PROCESSOR" in
@@ -881,7 +897,7 @@ EOF
 	echo "$UNAME_MACHINE"-pc-uwin
 	exit ;;
     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-	echo x86_64-unknown-cygwin
+	echo x86_64-pc-cygwin
 	exit ;;
     prep*:SunOS:5.*:*)
 	echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
@@ -894,8 +910,8 @@ EOF
 	# other systems with GNU libc and userland
 	echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC"
 	exit ;;
-    i*86:Minix:*:*)
-	echo "$UNAME_MACHINE"-pc-minix
+    *:Minix:*:*)
+	echo "$UNAME_MACHINE"-unknown-minix
 	exit ;;
     aarch64:Linux:*:*)
 	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
@@ -922,7 +938,7 @@ EOF
 	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 	exit ;;
     arm*:Linux:*:*)
-	eval "$set_cc_for_build"
+	set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	    | grep -q __ARM_EABI__
 	then
@@ -971,23 +987,51 @@ EOF
 	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 	exit ;;
     mips:Linux:*:* | mips64:Linux:*:*)
-	eval "$set_cc_for_build"
+	set_cc_for_build
+	IS_GLIBC=0
+	test x"${LIBC}" = xgnu && IS_GLIBC=1
 	sed 's/^	//' << EOF > "$dummy.c"
 	#undef CPU
-	#undef ${UNAME_MACHINE}
-	#undef ${UNAME_MACHINE}el
+	#undef mips
+	#undef mipsel
+	#undef mips64
+	#undef mips64el
+	#if ${IS_GLIBC} && defined(_ABI64)
+	LIBCABI=gnuabi64
+	#else
+	#if ${IS_GLIBC} && defined(_ABIN32)
+	LIBCABI=gnuabin32
+	#else
+	LIBCABI=${LIBC}
+	#endif
+	#endif
+
+	#if ${IS_GLIBC} && defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6
+	CPU=mipsisa64r6
+	#else
+	#if ${IS_GLIBC} && !defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6
+	CPU=mipsisa32r6
+	#else
+	#if defined(__mips64)
+	CPU=mips64
+	#else
+	CPU=mips
+	#endif
+	#endif
+	#endif
+
 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=${UNAME_MACHINE}el
+	MIPS_ENDIAN=el
 	#else
 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=${UNAME_MACHINE}
+	MIPS_ENDIAN=
 	#else
-	CPU=
+	MIPS_ENDIAN=
 	#endif
 	#endif
 EOF
-	eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`"
-	test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; }
+	eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI'`"
+	test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; }
 	;;
     mips64el:Linux:*:*)
 	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
@@ -1100,7 +1144,7 @@ EOF
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
 	esac
-	echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}"
+	echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}"
 	exit ;;
     i*86:*:3.2:*)
 	if test -f /usr/options/cb.name; then
@@ -1284,38 +1328,39 @@ EOF
 	echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"
 	exit ;;
     *:Darwin:*:*)
-	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	eval "$set_cc_for_build"
-	if test "$UNAME_PROCESSOR" = unknown ; then
-	    UNAME_PROCESSOR=powerpc
+	UNAME_PROCESSOR=`uname -p`
+	case $UNAME_PROCESSOR in
+	    unknown) UNAME_PROCESSOR=powerpc ;;
+	esac
+	if command -v xcode-select > /dev/null 2> /dev/null && \
+		! xcode-select --print-path > /dev/null 2> /dev/null ; then
+	    # Avoid executing cc if there is no toolchain installed as
+	    # cc will be a stub that puts up a graphical alert
+	    # prompting the user to install developer tools.
+	    CC_FOR_BUILD=no_compiler_found
+	else
+	    set_cc_for_build
 	fi
-	if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then
-	    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
-		    case $UNAME_PROCESSOR in
-			i386) UNAME_PROCESSOR=x86_64 ;;
-			powerpc) UNAME_PROCESSOR=powerpc64 ;;
-		    esac
-		fi
-		# On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
-		if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
-		       (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
-		       grep IS_PPC >/dev/null
-		then
-		    UNAME_PROCESSOR=powerpc
-		fi
+	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
+		case $UNAME_PROCESSOR in
+		    i386) UNAME_PROCESSOR=x86_64 ;;
+		    powerpc) UNAME_PROCESSOR=powerpc64 ;;
+		esac
+	    fi
+	    # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
+	    if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
+		   (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+		   grep IS_PPC >/dev/null
+	    then
+		UNAME_PROCESSOR=powerpc
 	    fi
 	elif test "$UNAME_PROCESSOR" = i386 ; then
-	    # Avoid executing cc on OS X 10.9, as it ships with a stub
-	    # that puts up a graphical alert prompting to install
-	    # developer tools.  Any system running Mac OS X 10.7 or
-	    # later (Darwin 11 and later) is required to have a 64-bit
-	    # processor. This is not true of the ARM version of Darwin
-	    # that Apple uses in portable devices.
-	    UNAME_PROCESSOR=x86_64
+	    # uname -m returns i386 or x86_64
+	    UNAME_PROCESSOR=$UNAME_MACHINE
 	fi
 	echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE"
 	exit ;;
@@ -1358,6 +1403,7 @@ EOF
 	# "uname -m" is not consistent, so use $cputype instead. 386
 	# is converted to i386 for consistency with other x86
 	# operating systems.
+	# shellcheck disable=SC2154
 	if test "$cputype" = 386; then
 	    UNAME_MACHINE=i386
 	else
@@ -1414,8 +1460,148 @@ EOF
     amd64:Isilon\ OneFS:*:*)
 	echo x86_64-unknown-onefs
 	exit ;;
+    *:Unleashed:*:*)
+	echo "$UNAME_MACHINE"-unknown-unleashed"$UNAME_RELEASE"
+	exit ;;
 esac
 
+# No uname command or uname output not recognized.
+set_cc_for_build
+cat > "$dummy.c" <<EOF
+#ifdef _SEQUENT_
+#include <sys/types.h>
+#include <sys/utsname.h>
+#endif
+#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__)
+#if defined (vax) || defined (__vax) || defined (__vax__) || defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__)
+#include <signal.h>
+#if defined(_SIZE_T_) || defined(SIGLOST)
+#include <sys/utsname.h>
+#endif
+#endif
+#endif
+main ()
+{
+#if defined (sony)
+#if defined (MIPSEB)
+  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
+     I don't know....  */
+  printf ("mips-sony-bsd\n"); exit (0);
+#else
+#include <sys/param.h>
+  printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+  "4"
+#else
+  ""
+#endif
+  ); exit (0);
+#endif
+#endif
+
+#if defined (NeXT)
+#if !defined (__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
+#endif
+  int version;
+  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+  if (version < 4)
+    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  else
+    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+  exit (0);
+#endif
+
+#if defined (MULTIMAX) || defined (n16)
+#if defined (UMAXV)
+  printf ("ns32k-encore-sysv\n"); exit (0);
+#else
+#if defined (CMU)
+  printf ("ns32k-encore-mach\n"); exit (0);
+#else
+  printf ("ns32k-encore-bsd\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (__386BSD__)
+  printf ("i386-pc-bsd\n"); exit (0);
+#endif
+
+#if defined (sequent)
+#if defined (i386)
+  printf ("i386-sequent-dynix\n"); exit (0);
+#endif
+#if defined (ns32000)
+  printf ("ns32k-sequent-dynix\n"); exit (0);
+#endif
+#endif
+
+#if defined (_SEQUENT_)
+  struct utsname un;
+
+  uname(&un);
+  if (strncmp(un.version, "V2", 2) == 0) {
+    printf ("i386-sequent-ptx2\n"); exit (0);
+  }
+  if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+    printf ("i386-sequent-ptx1\n"); exit (0);
+  }
+  printf ("i386-sequent-ptx\n"); exit (0);
+#endif
+
+#if defined (vax)
+#if !defined (ultrix)
+#include <sys/param.h>
+#if defined (BSD)
+#if BSD == 43
+  printf ("vax-dec-bsd4.3\n"); exit (0);
+#else
+#if BSD == 199006
+  printf ("vax-dec-bsd4.3reno\n"); exit (0);
+#else
+  printf ("vax-dec-bsd\n"); exit (0);
+#endif
+#endif
+#else
+  printf ("vax-dec-bsd\n"); exit (0);
+#endif
+#else
+#if defined(_SIZE_T_) || defined(SIGLOST)
+  struct utsname un;
+  uname (&un);
+  printf ("vax-dec-ultrix%s\n", un.release); exit (0);
+#else
+  printf ("vax-dec-ultrix\n"); exit (0);
+#endif
+#endif
+#endif
+#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__)
+#if defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__)
+#if defined(_SIZE_T_) || defined(SIGLOST)
+  struct utsname *un;
+  uname (&un);
+  printf ("mips-dec-ultrix%s\n", un.release); exit (0);
+#else
+  printf ("mips-dec-ultrix\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (alliant) && defined (i860)
+  printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
+  exit (1);
+}
+EOF
+
+$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+	{ echo "$SYSTEM_NAME"; exit; }
+
+# Apollos put the system type in the environment.
+test -d /usr/apollo && { echo "$ISP-apollo-$SYSTYPE"; exit; }
+
 echo "$0: unable to guess system type" >&2
 
 case "$UNAME_MACHINE:$UNAME_SYSTEM" in
@@ -1469,7 +1655,7 @@ EOF
 exit 1
 
 # Local variables:
-# eval: (add-hook 'write-file-functions 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "timestamp='"
 # time-stamp-format: "%:y-%02m-%02d"
 # time-stamp-end: "'"
diff --git a/config.hin b/config.hin
index 2984cd8e..64099603 100644
--- a/config.hin
+++ b/config.hin
@@ -1,5 +1,5 @@
 /*
- * $LynxId: config.hin,v 1.145 2018/12/28 22:30:57 tom Exp $
+ * $LynxId: config.hin,v 1.146 2019/07/31 23:31:32 tom Exp $
  * vile:cmode
  *
  * The configure script translates "config.hin" into "lynx_cfg.h"
@@ -171,7 +171,7 @@
 #undef HAVE_UTMP_UT_XTIME	/* CF_UTMP_UT_XTIME */
 #undef HAVE_VALUES_H		/* AM_GNU_GETTEXT */
 #undef HAVE_VARARGS_H		/* CF_VARARGS */
-#undef HAVE_VASPRINTF
+#undef HAVE_VASPRINTF		/* CF_FUNC_VASPRINTF */
 #undef HAVE_VFORK_H		/* have <vfork.h> */
 #undef HAVE_WAIS_H
 #undef HAVE_WAITPID
diff --git a/config.sub b/config.sub
index 818892c1..a318a468 100755
--- a/config.sub
+++ b/config.sub
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2018 Free Software Foundation, Inc.
+#   Copyright 1992-2019 Free Software Foundation, Inc.
 
-timestamp='2018-01-15'
+timestamp='2019-06-30'
 
 # 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
@@ -67,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2018 Free Software Foundation, Inc.
+Copyright 1992-2019 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -89,7 +89,7 @@ while test $# -gt 0 ; do
     - )	# Use stdin as input.
        break ;;
     -* )
-       echo "$me: invalid option $1$help"
+       echo "$me: invalid option $1$help" >&2
        exit 1 ;;
 
     *local*)
@@ -110,1223 +110,1164 @@ case $# in
     exit 1;;
 esac
 
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
-  kopensolaris*-gnu* | cloudabi*-eabi* | \
-  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" ]
-    then os=`echo "$1" | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
+# Split fields of configuration type
+# shellcheck disable=SC2162
+IFS="-" read field1 field2 field3 field4 <<EOF
+$1
+EOF
 
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray | -microblaze*)
-		os=
-		basic_machine=$1
-		;;
-	-bluegene*)
-		os=-cnk
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
-	-chorusrdb)
-		os=-chorusrdb
-		basic_machine=$1
-		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco6)
-		os=-sco5v6
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5v6*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*178)
-		os=-lynxos178
-		;;
-	-lynx*5)
-		os=-lynxos5
+# Separate into logical components for further validation
+case $1 in
+	*-*-*-*-*)
+		echo Invalid configuration \`"$1"\': more than four components >&2
+		exit 1
 		;;
-	-lynx*)
-		os=-lynxos
+	*-*-*-*)
+		basic_machine=$field1-$field2
+		os=$field3-$field4
 		;;
-	-ptx*)
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'`
+	*-*-*)
+		# Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two
+		# parts
+		maybe_os=$field2-$field3
+		case $maybe_os in
+			nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc \
+			| linux-newlib* | linux-musl* | linux-uclibc* | uclinux-uclibc* \
+			| uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \
+			| netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
+			| storm-chaos* | os2-emx* | rtmk-nova*)
+				basic_machine=$field1
+				os=$maybe_os
+				;;
+			android-linux)
+				basic_machine=$field1-unknown
+				os=linux-android
+				;;
+			*)
+				basic_machine=$field1-$field2
+				os=$field3
+				;;
+		esac
 		;;
-	-psos*)
-		os=-psos
+	*-*)
+		# A lone config we happen to match not fitting any pattern
+		case $field1-$field2 in
+			decstation-3100)
+				basic_machine=mips-dec
+				os=
+				;;
+			*-*)
+				# Second component is usually, but not always the OS
+				case $field2 in
+					# Prevent following clause from handling this valid os
+					sun*os*)
+						basic_machine=$field1
+						os=$field2
+						;;
+					# Manufacturers
+					dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \
+					| att* | 7300* | 3300* | delta* | motorola* | sun[234]* \
+					| unicom* | ibm* | next | hp | isi* | apollo | altos* \
+					| convergent* | ncr* | news | 32* | 3600* | 3100* \
+					| hitachi* | c[123]* | convex* | sun | crds | omron* | dg \
+					| ultra | tti* | harris | dolphin | highlevel | gould \
+					| cbm | ns | masscomp | apple | axis | knuth | cray \
+					| microblaze* | sim | cisco \
+					| oki | wec | wrs | winbond)
+						basic_machine=$field1-$field2
+						os=
+						;;
+					*)
+						basic_machine=$field1
+						os=$field2
+						;;
+				esac
+			;;
+		esac
 		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
+	*)
+		# Convert single-component short-hands not valid as part of
+		# multi-component configurations.
+		case $field1 in
+			386bsd)
+				basic_machine=i386-pc
+				os=bsd
+				;;
+			a29khif)
+				basic_machine=a29k-amd
+				os=udi
+				;;
+			adobe68k)
+				basic_machine=m68010-adobe
+				os=scout
+				;;
+			alliant)
+				basic_machine=fx80-alliant
+				os=
+				;;
+			altos | altos3068)
+				basic_machine=m68k-altos
+				os=
+				;;
+			am29k)
+				basic_machine=a29k-none
+				os=bsd
+				;;
+			amdahl)
+				basic_machine=580-amdahl
+				os=sysv
+				;;
+			amiga)
+				basic_machine=m68k-unknown
+				os=
+				;;
+			amigaos | amigados)
+				basic_machine=m68k-unknown
+				os=amigaos
+				;;
+			amigaunix | amix)
+				basic_machine=m68k-unknown
+				os=sysv4
+				;;
+			apollo68)
+				basic_machine=m68k-apollo
+				os=sysv
+				;;
+			apollo68bsd)
+				basic_machine=m68k-apollo
+				os=bsd
+				;;
+			aros)
+				basic_machine=i386-pc
+				os=aros
+				;;
+			aux)
+				basic_machine=m68k-apple
+				os=aux
+				;;
+			balance)
+				basic_machine=ns32k-sequent
+				os=dynix
+				;;
+			blackfin)
+				basic_machine=bfin-unknown
+				os=linux
+				;;
+			cegcc)
+				basic_machine=arm-unknown
+				os=cegcc
+				;;
+			convex-c1)
+				basic_machine=c1-convex
+				os=bsd
+				;;
+			convex-c2)
+				basic_machine=c2-convex
+				os=bsd
+				;;
+			convex-c32)
+				basic_machine=c32-convex
+				os=bsd
+				;;
+			convex-c34)
+				basic_machine=c34-convex
+				os=bsd
+				;;
+			convex-c38)
+				basic_machine=c38-convex
+				os=bsd
+				;;
+			cray)
+				basic_machine=j90-cray
+				os=unicos
+				;;
+			crds | unos)
+				basic_machine=m68k-crds
+				os=
+				;;
+			da30)
+				basic_machine=m68k-da30
+				os=
+				;;
+			decstation | pmax | pmin | dec3100 | decstatn)
+				basic_machine=mips-dec
+				os=
+				;;
+			delta88)
+				basic_machine=m88k-motorola
+				os=sysv3
+				;;
+			dicos)
+				basic_machine=i686-pc
+				os=dicos
+				;;
+			djgpp)
+				basic_machine=i586-pc
+				os=msdosdjgpp
+				;;
+			ebmon29k)
+				basic_machine=a29k-amd
+				os=ebmon
+				;;
+			es1800 | OSE68k | ose68k | ose | OSE)
+				basic_machine=m68k-ericsson
+				os=ose
+				;;
+			gmicro)
+				basic_machine=tron-gmicro
+				os=sysv
+				;;
+			go32)
+				basic_machine=i386-pc
+				os=go32
+				;;
+			h8300hms)
+				basic_machine=h8300-hitachi
+				os=hms
+				;;
+			h8300xray)
+				basic_machine=h8300-hitachi
+				os=xray
+				;;
+			h8500hms)
+				basic_machine=h8500-hitachi
+				os=hms
+				;;
+			harris)
+				basic_machine=m88k-harris
+				os=sysv3
+				;;
+			hp300 | hp300hpux)
+				basic_machine=m68k-hp
+				os=hpux
+				;;
+			hp300bsd)
+				basic_machine=m68k-hp
+				os=bsd
+				;;
+			hppaosf)
+				basic_machine=hppa1.1-hp
+				os=osf
+				;;
+			hppro)
+				basic_machine=hppa1.1-hp
+				os=proelf
+				;;
+			i386mach)
+				basic_machine=i386-mach
+				os=mach
+				;;
+			isi68 | isi)
+				basic_machine=m68k-isi
+				os=sysv
+				;;
+			m68knommu)
+				basic_machine=m68k-unknown
+				os=linux
+				;;
+			magnum | m3230)
+				basic_machine=mips-mips
+				os=sysv
+				;;
+			merlin)
+				basic_machine=ns32k-utek
+				os=sysv
+				;;
+			mingw64)
+				basic_machine=x86_64-pc
+				os=mingw64
+				;;
+			mingw32)
+				basic_machine=i686-pc
+				os=mingw32
+				;;
+			mingw32ce)
+				basic_machine=arm-unknown
+				os=mingw32ce
+				;;
+			monitor)
+				basic_machine=m68k-rom68k
+				os=coff
+				;;
+			morphos)
+				basic_machine=powerpc-unknown
+				os=morphos
+				;;
+			moxiebox)
+				basic_machine=moxie-unknown
+				os=moxiebox
+				;;
+			msdos)
+				basic_machine=i386-pc
+				os=msdos
+				;;
+			msys)
+				basic_machine=i686-pc
+				os=msys
+				;;
+			mvs)
+				basic_machine=i370-ibm
+				os=mvs
+				;;
+			nacl)
+				basic_machine=le32-unknown
+				os=nacl
+				;;
+			ncr3000)
+				basic_machine=i486-ncr
+				os=sysv4
+				;;
+			netbsd386)
+				basic_machine=i386-pc
+				os=netbsd
+				;;
+			netwinder)
+				basic_machine=armv4l-rebel
+				os=linux
+				;;
+			news | news700 | news800 | news900)
+				basic_machine=m68k-sony
+				os=newsos
+				;;
+			news1000)
+				basic_machine=m68030-sony
+				os=newsos
+				;;
+			necv70)
+				basic_machine=v70-nec
+				os=sysv
+				;;
+			nh3000)
+				basic_machine=m68k-harris
+				os=cxux
+				;;
+			nh[45]000)
+				basic_machine=m88k-harris
+				os=cxux
+				;;
+			nindy960)
+				basic_machine=i960-intel
+				os=nindy
+				;;
+			mon960)
+				basic_machine=i960-intel
+				os=mon960
+				;;
+			nonstopux)
+				basic_machine=mips-compaq
+				os=nonstopux
+				;;
+			os400)
+				basic_machine=powerpc-ibm
+				os=os400
+				;;
+			OSE68000 | ose68000)
+				basic_machine=m68000-ericsson
+				os=ose
+				;;
+			os68k)
+				basic_machine=m68k-none
+				os=os68k
+				;;
+			paragon)
+				basic_machine=i860-intel
+				os=osf
+				;;
+			parisc)
+				basic_machine=hppa-unknown
+				os=linux
+				;;
+			pw32)
+				basic_machine=i586-unknown
+				os=pw32
+				;;
+			rdos | rdos64)
+				basic_machine=x86_64-pc
+				os=rdos
+				;;
+			rdos32)
+				basic_machine=i386-pc
+				os=rdos
+				;;
+			rom68k)
+				basic_machine=m68k-rom68k
+				os=coff
+				;;
+			sa29200)
+				basic_machine=a29k-amd
+				os=udi
+				;;
+			sei)
+				basic_machine=mips-sei
+				os=seiux
+				;;
+			sequent)
+				basic_machine=i386-sequent
+				os=
+				;;
+			sps7)
+				basic_machine=m68k-bull
+				os=sysv2
+				;;
+			st2000)
+				basic_machine=m68k-tandem
+				os=
+				;;
+			stratus)
+				basic_machine=i860-stratus
+				os=sysv4
+				;;
+			sun2)
+				basic_machine=m68000-sun
+				os=
+				;;
+			sun2os3)
+				basic_machine=m68000-sun
+				os=sunos3
+				;;
+			sun2os4)
+				basic_machine=m68000-sun
+				os=sunos4
+				;;
+			sun3)
+				basic_machine=m68k-sun
+				os=
+				;;
+			sun3os3)
+				basic_machine=m68k-sun
+				os=sunos3
+				;;
+			sun3os4)
+				basic_machine=m68k-sun
+				os=sunos4
+				;;
+			sun4)
+				basic_machine=sparc-sun
+				os=
+				;;
+			sun4os3)
+				basic_machine=sparc-sun
+				os=sunos3
+				;;
+			sun4os4)
+				basic_machine=sparc-sun
+				os=sunos4
+				;;
+			sun4sol2)
+				basic_machine=sparc-sun
+				os=solaris2
+				;;
+			sun386 | sun386i | roadrunner)
+				basic_machine=i386-sun
+				os=
+				;;
+			sv1)
+				basic_machine=sv1-cray
+				os=unicos
+				;;
+			symmetry)
+				basic_machine=i386-sequent
+				os=dynix
+				;;
+			t3e)
+				basic_machine=alphaev5-cray
+				os=unicos
+				;;
+			t90)
+				basic_machine=t90-cray
+				os=unicos
+				;;
+			toad1)
+				basic_machine=pdp10-xkl
+				os=tops20
+				;;
+			tpf)
+				basic_machine=s390x-ibm
+				os=tpf
+				;;
+			udi29k)
+				basic_machine=a29k-amd
+				os=udi
+				;;
+			ultra3)
+				basic_machine=a29k-nyu
+				os=sym1
+				;;
+			v810 | necv810)
+				basic_machine=v810-nec
+				os=none
+				;;
+			vaxv)
+				basic_machine=vax-dec
+				os=sysv
+				;;
+			vms)
+				basic_machine=vax-dec
+				os=vms
+				;;
+			vsta)
+				basic_machine=i386-pc
+				os=vsta
+				;;
+			vxworks960)
+				basic_machine=i960-wrs
+				os=vxworks
+				;;
+			vxworks68)
+				basic_machine=m68k-wrs
+				os=vxworks
+				;;
+			vxworks29k)
+				basic_machine=a29k-wrs
+				os=vxworks
+				;;
+			xbox)
+				basic_machine=i686-pc
+				os=mingw32
+				;;
+			ymp)
+				basic_machine=ymp-cray
+				os=unicos
+				;;
+			*)
+				basic_machine=$1
+				os=
+				;;
+		esac
 		;;
 esac
 
-# Decode aliases for certain CPU-COMPANY combinations.
+# Decode 1-component or ad-hoc basic machines
 case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# 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 | arceb \
-	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
-	| avr | avr32 \
-	| ba \
-	| be32 | be64 \
-	| bfin \
-	| c4x | c8051 | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| e2k | epiphany \
-	| fido | fr30 | frv | ft32 \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| hexagon \
-	| i370 | i860 | i960 | ia16 | ia64 \
-	| ip2k | iq2000 \
-	| k1om \
-	| le32 | le64 \
-	| lm32 \
-	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64octeon | mips64octeonel \
-	| mips64orion | mips64orionel \
-	| mips64r5900 | mips64r5900el \
-	| mips64vr | mips64vrel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mips64vr5900 | mips64vr5900el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa32r6 | mipsisa32r6el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64r6 | mipsisa64r6el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipsr5900 | mipsr5900el \
-	| mipstx39 | mipstx39el \
-	| mn10200 | mn10300 \
-	| moxie \
-	| mt \
-	| msp430 \
-	| nds32 | nds32le | nds32be \
-	| nios | nios2 | nios2eb | nios2el \
-	| ns16k | ns32k \
-	| open8 | or1k | or1knd | or32 \
-	| pdp10 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle \
-	| pru \
-	| pyramid \
-	| riscv32 | riscv64 \
-	| rl78 | rx \
-	| score \
-	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu \
-	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
-	| ubicom32 \
-	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
-	| visium \
-	| wasm32 \
-	| x86 | xc16x | xstormy16 | xtensa \
-	| z8k | z80)
-		basic_machine=$basic_machine-unknown
-		;;
-	c54x)
-		basic_machine=tic54x-unknown
-		;;
-	c55x)
-		basic_machine=tic55x-unknown
-		;;
-	c6x)
-		basic_machine=tic6x-unknown
-		;;
-	leon|leon[3-9])
-		basic_machine=sparc-$basic_machine
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
-		basic_machine=$basic_machine-unknown
-		os=-none
+	# Here we handle the default manufacturer of certain CPU types.  It is in
+	# some cases the only manufacturer, in others, it is the most popular.
+	w89k)
+		cpu=hppa1.1
+		vendor=winbond
 		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65)
+	op50n)
+		cpu=hppa1.1
+		vendor=oki
 		;;
-	ms1)
-		basic_machine=mt-unknown
+	op60c)
+		cpu=hppa1.1
+		vendor=oki
 		;;
-
-	strongarm | thumb | xscale)
-		basic_machine=arm-unknown
+	ibm*)
+		cpu=i370
+		vendor=ibm
 		;;
-	xgate)
-		basic_machine=$basic_machine-unknown
-		os=-none
+	orion105)
+		cpu=clipper
+		vendor=highlevel
 		;;
-	xscaleeb)
-		basic_machine=armeb-unknown
+	mac | mpw | mac-mpw)
+		cpu=m68k
+		vendor=apple
 		;;
-
-	xscaleel)
-		basic_machine=armel-unknown
+	pmac | pmac-mpw)
+		cpu=powerpc
+		vendor=apple
 		;;
 
-	# 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
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
-		exit 1
-		;;
-	# 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-* | arceb-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* | avr32-* \
-	| ba-* \
-	| be32-* | be64-* \
-	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* \
-	| c8051-* | clipper-* | craynv-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
-	| e2k-* | elxsi-* \
-	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| hexagon-* \
-	| i*86-* | i860-* | i960-* | ia16-* | ia64-* \
-	| ip2k-* | iq2000-* \
-	| k1om-* \
-	| le32-* | le64-* \
-	| lm32-* \
-	| m32c-* | m32r-* | m32rle-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
-	| microblaze-* | microblazeel-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64octeon-* | mips64octeonel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64r5900-* | mips64r5900el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mips64vr5900-* | mips64vr5900el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa32r6-* | mipsisa32r6el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
-	| mipsisa64r6-* | mipsisa64r6el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipsr5900-* | mipsr5900el-* \
-	| mipstx39-* | mipstx39el-* \
-	| mmix-* \
-	| mt-* \
-	| msp430-* \
-	| nds32-* | nds32le-* | nds32be-* \
-	| nios-* | nios2-* | nios2eb-* | nios2el-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
-	| open8-* \
-	| or1k*-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
-	| pru-* \
-	| pyramid-* \
-	| riscv32-* | riscv64-* \
-	| 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-* \
-	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
-	| tahoe-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tile*-* \
-	| tron-* \
-	| ubicom32-* \
-	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
-	| vax-* \
-	| visium-* \
-	| wasm32-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* \
-	| xstormy16-* | xtensa*-* \
-	| ymp-* \
-	| z8k-* | z80-*)
-		;;
-	# Recognize the basic CPU types without company name, with glob match.
-	xtensa*)
-		basic_machine=$basic_machine-unknown
-		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-pc
-		os=-bsd
-		;;
 	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
+		cpu=m68000
+		vendor=att
 		;;
 	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	abacus)
-		basic_machine=abacus-unknown
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amd64-*)
-		basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aros)
-		basic_machine=i386-pc
-		os=-aros
-		;;
-	asmjs)
-		basic_machine=asmjs-unknown
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	blackfin)
-		basic_machine=bfin-unknown
-		os=-linux
-		;;
-	blackfin-*)
-		basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		os=-linux
+		cpu=we32k
+		vendor=att
 		;;
 	bluegene*)
-		basic_machine=powerpc-ibm
-		os=-cnk
-		;;
-	c54x-*)
-		basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		;;
-	c55x-*)
-		basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		;;
-	c6x-*)
-		basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	cegcc)
-		basic_machine=arm-unknown
-		os=-cegcc
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	craynv)
-		basic_machine=craynv-cray
-		os=-unicosmp
-		;;
-	cr16 | cr16-*)
-		basic_machine=cr16-unknown
-		os=-elf
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	crisv32 | crisv32-* | etraxfs*)
-		basic_machine=crisv32-axis
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	crx)
-		basic_machine=crx-unknown
-		os=-elf
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
+		cpu=powerpc
+		vendor=ibm
+		os=cnk
 		;;
 	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
+		cpu=pdp10
+		vendor=dec
+		os=tops10
 		;;
 	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
+		cpu=pdp10
+		vendor=dec
+		os=tops20
 		;;
 	delta | 3300 | motorola-3300 | motorola-delta \
 	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	dicos)
-		basic_machine=i686-pc
-		os=-dicos
-		;;
-	djgpp)
-		basic_machine=i586-pc
-		os=-msdosdjgpp
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
+		cpu=m68k
+		vendor=motorola
 		;;
 	dpx2*)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	e500v[12])
-		basic_machine=powerpc-unknown
-		os=$os"spe"
-		;;
-	e500v[12]-*)
-		basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		os=$os"spe"
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
+		cpu=m68k
+		vendor=bull
+		os=sysv3
 		;;
 	encore | umax | mmax)
-		basic_machine=ns32k-encore
+		cpu=ns32k
+		vendor=encore
 		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
+	elxsi)
+		cpu=elxsi
+		vendor=elxsi
+		os=${os:-bsd}
 		;;
 	fx2800)
-		basic_machine=i860-alliant
+		cpu=i860
+		vendor=alliant
 		;;
 	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
+		cpu=ns32k
+		vendor=ns
 		;;
 	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
+		cpu=hppa1.1
+		vendor=hitachi
+		os=hiuxwe2
 		;;
 	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
+		cpu=hppa1.0
+		vendor=hp
 		;;
 	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
+		cpu=m68000
+		vendor=hp
 		;;
 	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
+		cpu=m68k
+		vendor=hp
 		;;
 	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
+		cpu=hppa1.0
+		vendor=hp
 		;;
 	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
+		cpu=hppa1.1
+		vendor=hp
 		;;
 	hp9k78[0-9] | hp78[0-9])
 		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
+		cpu=hppa1.1
+		vendor=hp
 		;;
 	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
 		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
+		cpu=hppa1.1
+		vendor=hp
 		;;
 	hp9k8[0-9][13679] | hp8[0-9][13679])
-		basic_machine=hppa1.1-hp
+		cpu=hppa1.1
+		vendor=hp
 		;;
 	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
+		cpu=hppa1.0
+		vendor=hp
 		;;
 	i*86v32)
-		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
+		cpu=`echo "$1" | sed -e 's/86.*/86/'`
+		vendor=pc
+		os=sysv32
 		;;
 	i*86v4*)
-		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
+		cpu=`echo "$1" | sed -e 's/86.*/86/'`
+		vendor=pc
+		os=sysv4
 		;;
 	i*86v)
-		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
-		os=-sysv
+		cpu=`echo "$1" | sed -e 's/86.*/86/'`
+		vendor=pc
+		os=sysv
 		;;
 	i*86sol2)
-		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
+		cpu=`echo "$1" | sed -e 's/86.*/86/'`
+		vendor=pc
+		os=solaris2
 		;;
-	vsta)
-		basic_machine=i386-unknown
-		os=-vsta
+	j90 | j90-cray)
+		cpu=j90
+		vendor=cray
+		os=${os:-unicos}
 		;;
 	iris | iris4d)
-		basic_machine=mips-sgi
+		cpu=mips
+		vendor=sgi
 		case $os in
-		    -irix*)
+		    irix*)
 			;;
 		    *)
-			os=-irix4
+			os=irix4
 			;;
 		esac
 		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	leon-*|leon[3-9]-*)
-		basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'`
-		;;
-	m68knommu)
-		basic_machine=m68k-unknown
-		os=-linux
-		;;
-	m68knommu-*)
-		basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	microblaze*)
-		basic_machine=microblaze-xilinx
-		;;
-	mingw64)
-		basic_machine=x86_64-pc
-		os=-mingw64
-		;;
-	mingw32)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
-	mingw32ce)
-		basic_machine=arm-unknown
-		os=-mingw32ce
-		;;
 	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mips3*-*)
-		basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	moxiebox)
-		basic_machine=moxie-unknown
-		os=-moxiebox
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	ms1-*)
-		basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'`
-		;;
-	msys)
-		basic_machine=i686-pc
-		os=-msys
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	nacl)
-		basic_machine=le32-unknown
-		os=-nacl
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
+		cpu=m68000
+		vendor=convergent
 		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
+	*mint | mint[0-9]* | *MiNT | *MiNT[0-9]*)
+		cpu=m68k
+		vendor=atari
+		os=mint
 		;;
 	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
+		cpu=mips
+		vendor=sony
+		os=newsos
 		;;
 	next | m*-next)
-		basic_machine=m68k-next
+		cpu=m68k
+		vendor=next
 		case $os in
-		    -nextstep* )
+		    openstep*)
+		        ;;
+		    nextstep*)
 			;;
-		    -ns2*)
-		      os=-nextstep2
+		    ns2*)
+		      os=nextstep2
 			;;
 		    *)
-		      os=-nextstep3
+		      os=nextstep3
 			;;
 		esac
 		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
 	np1)
-		basic_machine=np1-gould
-		;;
-	neo-tandem)
-		basic_machine=neo-tandem
-		;;
-	nse-tandem)
-		basic_machine=nse-tandem
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	nsv-tandem)
-		basic_machine=nsv-tandem
-		;;
-	nsx-tandem)
-		basic_machine=nsx-tandem
+		cpu=np1
+		vendor=gould
 		;;
 	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	openrisc | openrisc-*)
-		basic_machine=or32-unknown
-		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
+		cpu=hppa1.1
+		vendor=oki
+		os=proelf
 		;;
 	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	parisc)
-		basic_machine=hppa-unknown
-		os=-linux
-		;;
-	parisc-*)
-		basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		os=-linux
+		cpu=hppa1.1
+		vendor=hitachi
+		os=hiuxwe2
 		;;
 	pbd)
-		basic_machine=sparc-tti
+		cpu=sparc
+		vendor=tti
 		;;
 	pbb)
-		basic_machine=m68k-tti
+		cpu=m68k
+		vendor=tti
 		;;
-	pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pc98)
-		basic_machine=i386-pc
-		;;
-	pc98-*)
-		basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
-		basic_machine=i686-pc
-		;;
-	pentium4)
-		basic_machine=i786-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		;;
-	pentium4-*)
-		basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+	pc532)
+		cpu=ns32k
+		vendor=pc532
 		;;
 	pn)
-		basic_machine=pn-gould
+		cpu=pn
+		vendor=gould
 		;;
-	power)	basic_machine=power-ibm
+	power)
+		cpu=power
+		vendor=ibm
 		;;
-	ppc | ppcbe)	basic_machine=powerpc-unknown
-		;;
-	ppc-* | ppcbe-*)
-		basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle)
-		basic_machine=powerpcle-unknown
-		;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		;;
-	ppc64)	basic_machine=powerpc64-unknown
+	ps2)
+		cpu=i386
+		vendor=ibm
 		;;
-	ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+	rm[46]00)
+		cpu=mips
+		vendor=siemens
 		;;
-	ppc64le | powerpc64little)
-		basic_machine=powerpc64le-unknown
+	rtpc | rtpc-*)
+		cpu=romp
+		vendor=ibm
 		;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+	sde)
+		cpu=mipsisa32
+		vendor=sde
+		os=${os:-elf}
 		;;
-	ps2)
-		basic_machine=i386-ibm
+	simso-wrs)
+		cpu=sparclite
+		vendor=wrs
+		os=vxworks
 		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
+	tower | tower-32)
+		cpu=m68k
+		vendor=ncr
 		;;
-	rdos | rdos64)
-		basic_machine=x86_64-pc
-		os=-rdos
+	vpp*|vx|vx-*)
+		cpu=f301
+		vendor=fujitsu
 		;;
-	rdos32)
-		basic_machine=i386-pc
-		os=-rdos
+	w65)
+		cpu=w65
+		vendor=wdc
 		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
+	w89k-*)
+		cpu=hppa1.1
+		vendor=winbond
+		os=proelf
 		;;
-	rm[46]00)
-		basic_machine=mips-siemens
+	none)
+		cpu=none
+		vendor=none
 		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
+	leon|leon[3-9])
+		cpu=sparc
+		vendor=$basic_machine
 		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
+	leon-*|leon[3-9]-*)
+		cpu=sparc
+		vendor=`echo "$basic_machine" | sed 's/-.*//'`
 		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
+
+	*-*)
+		# shellcheck disable=SC2162
+		IFS="-" read cpu vendor <<EOF
+$basic_machine
+EOF
 		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
+	# 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)
+		cpu=$basic_machine
+		vendor=pc
 		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
+	# These rules are duplicated from below for sake of the special case above;
+	# i.e. things that normalized to x86 arches should also default to "pc"
+	pc98)
+		cpu=i386
+		vendor=pc
 		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
+	x64 | amd64)
+		cpu=x86_64
+		vendor=pc
 		;;
-	sde)
-		basic_machine=mipsisa32-sde
-		os=-elf
+	# Recognize the basic CPU types without company name.
+	*)
+		cpu=$basic_machine
+		vendor=unknown
 		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
+esac
+
+unset -v basic_machine
+
+# Decode basic machines in the full and proper CPU-Company form.
+case $cpu-$vendor in
+	# Here we handle the default manufacturer of certain CPU types in canonical form. It is in
+	# some cases the only manufacturer, in others, it is the most popular.
+	craynv-unknown)
+		vendor=cray
+		os=${os:-unicosmp}
 		;;
-	sequent)
-		basic_machine=i386-sequent
+	c90-unknown | c90-cray)
+		vendor=cray
+		os=${os:-unicos}
 		;;
-	sh5el)
-		basic_machine=sh5le-unknown
+	fx80-unknown)
+		vendor=alliant
 		;;
-	simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
+	romp-unknown)
+		vendor=ibm
 		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
+	mmix-unknown)
+		vendor=knuth
 		;;
-	spur)
-		basic_machine=spur-unknown
+	microblaze-unknown | microblazeel-unknown)
+		vendor=xilinx
 		;;
-	st2000)
-		basic_machine=m68k-tandem
+	rs6000-unknown)
+		vendor=ibm
 		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
+	vax-unknown)
+		vendor=dec
 		;;
-	strongarm-* | thumb-*)
-		basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+	pdp11-unknown)
+		vendor=dec
 		;;
-	sun2)
-		basic_machine=m68000-sun
+	we32k-unknown)
+		vendor=att
 		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
+	cydra-unknown)
+		vendor=cydrome
 		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
+	i370-ibm*)
+		vendor=ibm
 		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
+	orion-unknown)
+		vendor=highlevel
 		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
+	xps-unknown | xps100-unknown)
+		cpu=xps100
+		vendor=honeywell
 		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
+
+	# Here we normalize CPU types with a missing or matching vendor
+	dpx20-unknown | dpx20-bull)
+		cpu=rs6000
+		vendor=bull
+		os=${os:-bosx}
 		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
+
+	# Here we normalize CPU types irrespective of the vendor
+	amd64-*)
+		cpu=x86_64
 		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
+	blackfin-*)
+		cpu=bfin
+		os=linux
 		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
+	c54x-*)
+		cpu=tic54x
 		;;
-	sun4)
-		basic_machine=sparc-sun
+	c55x-*)
+		cpu=tic55x
 		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
+	c6x-*)
+		cpu=tic6x
 		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
+	e500v[12]-*)
+		cpu=powerpc
+		os=$os"spe"
 		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
+	mips3*-*)
+		cpu=mips64
 		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
+	ms1-*)
+		cpu=mt
 		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
+	m68knommu-*)
+		cpu=m68k
+		os=linux
 		;;
-	tile*)
-		basic_machine=$basic_machine-unknown
-		os=-linux-gnu
+	m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*)
+		cpu=s12z
 		;;
-	tx39)
-		basic_machine=mipstx39-unknown
+	openrisc-*)
+		cpu=or32
 		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
+	parisc-*)
+		cpu=hppa
+		os=linux
 		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+		cpu=i586
 		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
+	pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*)
+		cpu=i686
 		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+		cpu=i686
 		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
+	pentium4-*)
+		cpu=i786
 		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
+	pc98-*)
+		cpu=i386
 		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
+	ppc-* | ppcbe-*)
+		cpu=powerpc
 		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
+	ppcle-* | powerpclittle-*)
+		cpu=powerpcle
 		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
+	ppc64-*)
+		cpu=powerpc64
 		;;
-	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
+	ppc64le-* | powerpc64little-*)
+		cpu=powerpc64le
 		;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
+	sb1-*)
+		cpu=mipsisa64sb1
 		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
+	sb1el-*)
+		cpu=mipsisa64sb1el
 		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
+	sh5e[lb]-*)
+		cpu=`echo "$cpu" | sed 's/^\(sh.\)e\(.\)$/\1\2e/'`
 		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
+	spur-*)
+		cpu=spur
 		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
+	strongarm-* | thumb-*)
+		cpu=arm
 		;;
-	x64)
-		basic_machine=x86_64-pc
+	tx39-*)
+		cpu=mipstx39
 		;;
-	xbox)
-		basic_machine=i686-pc
-		os=-mingw32
+	tx39el-*)
+		cpu=mipstx39el
 		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
+	x64-*)
+		cpu=x86_64
 		;;
 	xscale-* | xscalee[bl]-*)
-		basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'`
-		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
+		cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
 		;;
 
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
-		;;
-	romp)
-		basic_machine=romp-ibm
+	# Recognize the canonical CPU Types that limit and/or modify the
+	# company names they are paired with.
+	cr16-*)
+		os=${os:-elf}
 		;;
-	mmix)
-		basic_machine=mmix-knuth
+	crisv32-* | etraxfs*-*)
+		cpu=crisv32
+		vendor=axis
 		;;
-	rs6000)
-		basic_machine=rs6000-ibm
+	cris-* | etrax*-*)
+		cpu=cris
+		vendor=axis
 		;;
-	vax)
-		basic_machine=vax-dec
+	crx-*)
+		os=${os:-elf}
 		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
+	neo-tandem)
+		cpu=neo
+		vendor=tandem
 		;;
-	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
-		basic_machine=sh-unknown
+	nse-tandem)
+		cpu=nse
+		vendor=tandem
 		;;
-	cydra)
-		basic_machine=cydra-cydrome
+	nsr-tandem)
+		cpu=nsr
+		vendor=tandem
 		;;
-	orion)
-		basic_machine=orion-highlevel
+	nsv-tandem)
+		cpu=nsv
+		vendor=tandem
 		;;
-	orion105)
-		basic_machine=clipper-highlevel
+	nsx-tandem)
+		cpu=nsx
+		vendor=tandem
 		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
+	s390-*)
+		cpu=s390
+		vendor=ibm
 		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
+	s390x-*)
+		cpu=s390x
+		vendor=ibm
 		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
+	tile*-*)
+		os=${os:-linux-gnu}
 		;;
+
 	*)
-		echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
-		exit 1
+		# Recognize the canonical CPU types that are allowed with any
+		# company name.
+		case $cpu in
+			1750a | 580 \
+			| a29k \
+			| aarch64 | aarch64_be \
+			| abacus \
+			| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \
+			| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \
+			| alphapca5[67] | alpha64pca5[67] \
+			| am33_2.0 \
+			| amdgcn \
+			| arc | arceb \
+			| arm  | arm[lb]e | arme[lb] | armv* \
+			| avr | avr32 \
+			| asmjs \
+			| ba \
+			| be32 | be64 \
+			| bfin | bpf | bs2000 \
+			| c[123]* | c30 | [cjt]90 | c4x \
+			| c8051 | clipper | craynv | csky | cydra \
+			| d10v | d30v | dlx | dsp16xx \
+			| e2k | elxsi | epiphany \
+			| f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \
+			| h8300 | h8500 \
+			| hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+			| hexagon \
+			| i370 | i*86 | i860 | i960 | ia16 | ia64 \
+			| ip2k | iq2000 \
+			| k1om \
+			| le32 | le64 \
+			| lm32 \
+			| m32c | m32r | m32rle \
+			| m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \
+			| m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \
+			| m88110 | m88k | maxq | mb | mcore | mep | metag \
+			| microblaze | microblazeel \
+			| mips | mipsbe | mipseb | mipsel | mipsle \
+			| mips16 \
+			| mips64 | mips64eb | mips64el \
+			| mips64octeon | mips64octeonel \
+			| mips64orion | mips64orionel \
+			| mips64r5900 | mips64r5900el \
+			| mips64vr | mips64vrel \
+			| mips64vr4100 | mips64vr4100el \
+			| mips64vr4300 | mips64vr4300el \
+			| mips64vr5000 | mips64vr5000el \
+			| mips64vr5900 | mips64vr5900el \
+			| mipsisa32 | mipsisa32el \
+			| mipsisa32r2 | mipsisa32r2el \
+			| mipsisa32r6 | mipsisa32r6el \
+			| mipsisa64 | mipsisa64el \
+			| mipsisa64r2 | mipsisa64r2el \
+			| mipsisa64r6 | mipsisa64r6el \
+			| mipsisa64sb1 | mipsisa64sb1el \
+			| mipsisa64sr71k | mipsisa64sr71kel \
+			| mipsr5900 | mipsr5900el \
+			| mipstx39 | mipstx39el \
+			| mmix \
+			| mn10200 | mn10300 \
+			| moxie \
+			| mt \
+			| msp430 \
+			| nds32 | nds32le | nds32be \
+			| nfp \
+			| nios | nios2 | nios2eb | nios2el \
+			| none | np1 | ns16k | ns32k | nvptx \
+			| open8 \
+			| or1k* \
+			| or32 \
+			| orion \
+			| picochip \
+			| pdp10 | pdp11 | pj | pjl | pn | power \
+			| powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \
+			| pru \
+			| pyramid \
+			| riscv | riscv32 | riscv64 \
+			| rl78 | romp | rs6000 | rx \
+			| score \
+			| sh | shl \
+			| sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \
+			| sh[1234]e[lb] |  sh[12345][lb]e | sh[23]ele | sh64 | sh64le \
+			| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \
+			| sparclite \
+			| sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \
+			| spu \
+			| tahoe \
+			| tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \
+			| tron \
+			| ubicom32 \
+			| v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \
+			| vax \
+			| visium \
+			| w65 \
+			| wasm32 | wasm64 \
+			| we32k \
+			| x86 | x86_64 | xc16x | xgate | xps100 \
+			| xstormy16 | xtensa* \
+			| ymp \
+			| z8k | z80)
+				;;
+
+			*)
+				echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2
+				exit 1
+				;;
+		esac
 		;;
 esac
 
 # Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'`
+case $vendor in
+	digital*)
+		vendor=dec
 		;;
-	*-commodore*)
-		basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'`
+	commodore*)
+		vendor=cbm
 		;;
 	*)
 		;;
@@ -1334,198 +1275,243 @@ esac
 
 # Decode manufacturer-specific aliases for certain operating systems.
 
-if [ x"$os" != x"" ]
+if [ x$os != x ]
 then
 case $os in
 	# First match some system type aliases that might get confused
 	# with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-auroraux)
-		os=-auroraux
+	# solaris* is a basic system type, with this one exception.
+	auroraux)
+		os=auroraux
 		;;
-	-solaris1 | -solaris1.*)
+	bluegene*)
+		os=cnk
+		;;
+	solaris1 | solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
 		;;
-	-solaris)
-		os=-solaris2
+	solaris)
+		os=solaris2
 		;;
-	-unixware*)
-		os=-sysv4.2uw
+	unixware*)
+		os=sysv4.2uw
 		;;
-	-gnu/linux*)
+	gnu/linux*)
 		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
 		;;
 	# es1800 is here to avoid being matched by es* (a different OS)
-	-es1800*)
-		os=-ose
+	es1800*)
+		os=ose
+		;;
+	# Some version numbers need modification
+	chorusos*)
+		os=chorusos
+		;;
+	isc)
+		os=isc2.2
+		;;
+	sco6)
+		os=sco5v6
+		;;
+	sco5)
+		os=sco3.2v5
+		;;
+	sco4)
+		os=sco3.2v4
+		;;
+	sco3.2.[4-9]*)
+		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+		;;
+	sco3.2v[4-9]* | sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		;;
+	scout)
+		# Don't match below
+		;;
+	sco*)
+		os=sco3.2v2
+		;;
+	psos*)
+		os=psos
 		;;
 	# Now accept the basic system types.
 	# The portable systems comes first.
 	# Each alternative MUST end in a * to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-	      | -sym* | -kopensolaris* | -plan9* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* | -aros* | -cloudabi* | -sortix* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
-	      | -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* | -glidix* \
-	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
-	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
-	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme*)
+	# sysv* is not here because it comes later, after sysvr4.
+	gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
+	     | *vms* | esix* | aix* | cnk* | sunos | sunos[34]*\
+	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
+	     | sym* | kopensolaris* | plan9* \
+	     | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
+	     | aos* | aros* | cloudabi* | sortix* \
+	     | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
+	     | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \
+	     | knetbsd* | mirbsd* | netbsd* \
+	     | bitrig* | openbsd* | solidbsd* | libertybsd* | os108* \
+	     | ekkobsd* | kfreebsd* | freebsd* | riscix* | lynxos* \
+	     | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \
+	     | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \
+	     | udi* | eabi* | lites* | ieee* | go32* | aux* | hcos* \
+	     | chorusrdb* | cegcc* | glidix* \
+	     | cygwin* | msys* | pe* | moss* | proelf* | rtems* \
+	     | midipix* | mingw32* | mingw64* | linux-gnu* | linux-android* \
+	     | linux-newlib* | linux-musl* | linux-uclibc* \
+	     | uxpv* | beos* | mpeix* | udk* | moxiebox* \
+	     | interix* | uwin* | mks* | rhapsody* | darwin* \
+	     | openstep* | oskit* | conix* | pw32* | nonstopux* \
+	     | storm-chaos* | tops10* | tenex* | tops20* | its* \
+	     | os2* | vos* | palmos* | uclinux* | nucleus* \
+	     | morphos* | superux* | rtmk* | windiss* \
+	     | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
+	     | skyos* | haiku* | rdos* | toppers* | drops* | es* \
+	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
+	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
+	     | nsk* | powerunix)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
+	qnx*)
+		case $cpu in
+		    x86 | i*86)
 			;;
 		    *)
-			os=-nto$os
+			os=nto-$os
 			;;
 		esac
 		;;
-	-nto-qnx*)
+	hiux*)
+		os=hiuxwe2
 		;;
-	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
+	nto-qnx*)
 		;;
-	-sim | -xray | -os68k* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+	nto*)
+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 		;;
-	-mac*)
-		os=`echo "$os" | sed -e 's|mac|macos|'`
+	sim | xray | os68k* | v88r* \
+	    | windows* | osx | abug | netware* | os9* \
+	    | macos* | mpw* | magic* | mmixware* | mon960* | lnews*)
 		;;
-	-linux-dietlibc)
-		os=-linux-dietlibc
+	linux-dietlibc)
+		os=linux-dietlibc
 		;;
-	-linux*)
+	linux*)
 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
 		;;
-	-sunos5*)
-		os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
+	lynx*178)
+		os=lynxos178
 		;;
-	-sunos6*)
-		os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
+	lynx*5)
+		os=lynxos5
+		;;
+	lynx*)
+		os=lynxos
 		;;
-	-opened*)
-		os=-openedition
+	mac*)
+		os=`echo "$os" | sed -e 's|mac|macos|'`
 		;;
-	-os400*)
-		os=-os400
+	opened*)
+		os=openedition
 		;;
-	-wince*)
-		os=-wince
+	os400*)
+		os=os400
 		;;
-	-utek*)
-		os=-bsd
+	sunos5*)
+		os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
 		;;
-	-dynix*)
-		os=-bsd
+	sunos6*)
+		os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
 		;;
-	-acis*)
-		os=-aos
+	wince*)
+		os=wince
 		;;
-	-atheos*)
-		os=-atheos
+	utek*)
+		os=bsd
 		;;
-	-syllable*)
-		os=-syllable
+	dynix*)
+		os=bsd
 		;;
-	-386bsd)
-		os=-bsd
+	acis*)
+		os=aos
 		;;
-	-ctix* | -uts*)
-		os=-sysv
+	atheos*)
+		os=atheos
 		;;
-	-nova*)
-		os=-rtmk-nova
+	syllable*)
+		os=syllable
 		;;
-	-ns2)
-		os=-nextstep2
+	386bsd)
+		os=bsd
 		;;
-	-nsk*)
-		os=-nsk
+	ctix* | uts*)
+		os=sysv
+		;;
+	nova*)
+		os=rtmk-nova
+		;;
+	ns2)
+		os=nextstep2
 		;;
 	# Preserve the version number of sinix5.
-	-sinix5.*)
+	sinix5.*)
 		os=`echo $os | sed -e 's|sinix|sysv|'`
 		;;
-	-sinix*)
-		os=-sysv4
+	sinix*)
+		os=sysv4
 		;;
-	-tpf*)
-		os=-tpf
+	tpf*)
+		os=tpf
 		;;
-	-triton*)
-		os=-sysv3
+	triton*)
+		os=sysv3
 		;;
-	-oss*)
-		os=-sysv3
+	oss*)
+		os=sysv3
 		;;
-	-svr4*)
-		os=-sysv4
+	svr4*)
+		os=sysv4
 		;;
-	-svr3)
-		os=-sysv3
+	svr3)
+		os=sysv3
 		;;
-	-sysvr4)
-		os=-sysv4
+	sysvr4)
+		os=sysv4
 		;;
-	# This must come after -sysvr4.
-	-sysv*)
+	# This must come after sysvr4.
+	sysv*)
 		;;
-	-ose*)
-		os=-ose
+	ose*)
+		os=ose
 		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
+	*mint | mint[0-9]* | *MiNT | MiNT[0-9]*)
+		os=mint
 		;;
-	-zvmoe)
-		os=-zvmoe
+	zvmoe)
+		os=zvmoe
 		;;
-	-dicos*)
-		os=-dicos
+	dicos*)
+		os=dicos
 		;;
-	-pikeos*)
+	pikeos*)
 		# Until real need of OS specific support for
 		# particular features comes up, bare metal
 		# configurations are quite functional.
-		case $basic_machine in
+		case $cpu in
 		    arm*)
-			os=-eabi
+			os=eabi
 			;;
 		    *)
-			os=-elf
+			os=elf
 			;;
 		esac
 		;;
-	-nacl*)
+	nacl*)
 		;;
-	-ios)
+	ios)
 		;;
-	-none)
+	none)
+		;;
+	*-eabi)
 		;;
 	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
 		echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2
 		exit 1
 		;;
@@ -1542,258 +1528,265 @@ else
 # will signal an error saying that MANUFACTURER isn't an operating
 # system, and we'll never get to this point.
 
-case $basic_machine in
+case $cpu-$vendor in
 	score-*)
-		os=-elf
+		os=elf
 		;;
 	spu-*)
-		os=-elf
+		os=elf
 		;;
 	*-acorn)
-		os=-riscix1.2
+		os=riscix1.2
 		;;
 	arm*-rebel)
-		os=-linux
+		os=linux
 		;;
 	arm*-semi)
-		os=-aout
+		os=aout
 		;;
 	c4x-* | tic4x-*)
-		os=-coff
+		os=coff
 		;;
 	c8051-*)
-		os=-elf
+		os=elf
+		;;
+	clipper-intergraph)
+		os=clix
 		;;
 	hexagon-*)
-		os=-elf
+		os=elf
 		;;
 	tic54x-*)
-		os=-coff
+		os=coff
 		;;
 	tic55x-*)
-		os=-coff
+		os=coff
 		;;
 	tic6x-*)
-		os=-coff
+		os=coff
 		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
-		os=-tops20
+		os=tops20
 		;;
 	pdp11-*)
-		os=-none
+		os=none
 		;;
 	*-dec | vax-*)
-		os=-ultrix4.2
+		os=ultrix4.2
 		;;
 	m68*-apollo)
-		os=-domain
+		os=domain
 		;;
 	i386-sun)
-		os=-sunos4.0.2
+		os=sunos4.0.2
 		;;
 	m68000-sun)
-		os=-sunos3
+		os=sunos3
 		;;
 	m68*-cisco)
-		os=-aout
+		os=aout
 		;;
 	mep-*)
-		os=-elf
+		os=elf
 		;;
 	mips*-cisco)
-		os=-elf
+		os=elf
 		;;
 	mips*-*)
-		os=-elf
+		os=elf
 		;;
 	or32-*)
-		os=-coff
+		os=coff
 		;;
 	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
+		os=sysv3
 		;;
 	sparc-* | *-sun)
-		os=-sunos4.1.1
+		os=sunos4.1.1
 		;;
 	pru-*)
-		os=-elf
+		os=elf
 		;;
 	*-be)
-		os=-beos
+		os=beos
 		;;
 	*-ibm)
-		os=-aix
+		os=aix
 		;;
 	*-knuth)
-		os=-mmixware
+		os=mmixware
 		;;
 	*-wec)
-		os=-proelf
+		os=proelf
 		;;
 	*-winbond)
-		os=-proelf
+		os=proelf
 		;;
 	*-oki)
-		os=-proelf
+		os=proelf
 		;;
 	*-hp)
-		os=-hpux
+		os=hpux
 		;;
 	*-hitachi)
-		os=-hiux
+		os=hiux
 		;;
 	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
+		os=sysv
 		;;
 	*-cbm)
-		os=-amigaos
+		os=amigaos
 		;;
 	*-dg)
-		os=-dgux
+		os=dgux
 		;;
 	*-dolphin)
-		os=-sysv3
+		os=sysv3
 		;;
 	m68k-ccur)
-		os=-rtu
+		os=rtu
 		;;
 	m88k-omron*)
-		os=-luna
+		os=luna
 		;;
 	*-next)
-		os=-nextstep
+		os=nextstep
 		;;
 	*-sequent)
-		os=-ptx
+		os=ptx
 		;;
 	*-crds)
-		os=-unos
+		os=unos
 		;;
 	*-ns)
-		os=-genix
+		os=genix
 		;;
 	i370-*)
-		os=-mvs
+		os=mvs
 		;;
 	*-gould)
-		os=-sysv
+		os=sysv
 		;;
 	*-highlevel)
-		os=-bsd
+		os=bsd
 		;;
 	*-encore)
-		os=-bsd
+		os=bsd
 		;;
 	*-sgi)
-		os=-irix
+		os=irix
 		;;
 	*-siemens)
-		os=-sysv4
+		os=sysv4
 		;;
 	*-masscomp)
-		os=-rtu
+		os=rtu
 		;;
 	f30[01]-fujitsu | f700-fujitsu)
-		os=-uxpv
+		os=uxpv
 		;;
 	*-rom68k)
-		os=-coff
+		os=coff
 		;;
 	*-*bug)
-		os=-coff
+		os=coff
 		;;
 	*-apple)
-		os=-macos
+		os=macos
 		;;
 	*-atari*)
-		os=-mint
+		os=mint
+		;;
+	*-wrs)
+		os=vxworks
 		;;
 	*)
-		os=-none
+		os=none
 		;;
 esac
 fi
 
 # Here we handle the case where we know the os, and the CPU type, but not the
 # manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
+case $vendor in
+	unknown)
 		case $os in
-			-riscix*)
+			riscix*)
 				vendor=acorn
 				;;
-			-sunos*)
+			sunos*)
 				vendor=sun
 				;;
-			-cnk*|-aix*)
+			cnk*|-aix*)
 				vendor=ibm
 				;;
-			-beos*)
+			beos*)
 				vendor=be
 				;;
-			-hpux*)
+			hpux*)
 				vendor=hp
 				;;
-			-mpeix*)
+			mpeix*)
 				vendor=hp
 				;;
-			-hiux*)
+			hiux*)
 				vendor=hitachi
 				;;
-			-unos*)
+			unos*)
 				vendor=crds
 				;;
-			-dgux*)
+			dgux*)
 				vendor=dg
 				;;
-			-luna*)
+			luna*)
 				vendor=omron
 				;;
-			-genix*)
+			genix*)
 				vendor=ns
 				;;
-			-mvs* | -opened*)
+			clix*)
+				vendor=intergraph
+				;;
+			mvs* | opened*)
 				vendor=ibm
 				;;
-			-os400*)
+			os400*)
 				vendor=ibm
 				;;
-			-ptx*)
+			ptx*)
 				vendor=sequent
 				;;
-			-tpf*)
+			tpf*)
 				vendor=ibm
 				;;
-			-vxsim* | -vxworks* | -windiss*)
+			vxsim* | vxworks* | windiss*)
 				vendor=wrs
 				;;
-			-aux*)
+			aux*)
 				vendor=apple
 				;;
-			-hms*)
+			hms*)
 				vendor=hitachi
 				;;
-			-mpw* | -macos*)
+			mpw* | macos*)
 				vendor=apple
 				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+			*mint | mint[0-9]* | *MiNT | MiNT[0-9]*)
 				vendor=atari
 				;;
-			-vos*)
+			vos*)
 				vendor=stratus
 				;;
 		esac
-		basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"`
 		;;
 esac
 
-echo "$basic_machine$os"
+echo "$cpu-$vendor-$os"
 exit
 
 # Local variables:
-# eval: (add-hook 'write-file-functions 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "timestamp='"
 # time-stamp-format: "%:y-%02m-%02d"
 # time-stamp-end: "'"
diff --git a/configure b/configure
index 038eafdf..e533a0ac 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in 2.9.0dev.1.
+# From configure.in 2.9.0dev.2.
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20181006.
 #
@@ -2145,14 +2145,133 @@ esac
 # This should have been defined by AC_PROG_CC
 : ${CC:=cc}
 
-echo "$as_me:2148: checking \$CC variable" >&5
+echo "$as_me:2148: checking \$CFLAGS variable" >&5
+echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
+case "x$CFLAGS" in
+(*-[IUD]*)
+	echo "$as_me:2152: result: broken" >&5
+echo "${ECHO_T}broken" >&6
+	{ echo "$as_me:2154: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
+echo "$as_me: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&2;}
+	cf_flags="$CFLAGS"
+	CFLAGS=
+	for cf_arg in $cf_flags
+	do
+
+cf_fix_cppflags=no
+cf_new_cflags=
+cf_new_cppflags=
+cf_new_extra_cppflags=
+
+for cf_add_cflags in $cf_arg
+do
+case $cf_fix_cppflags in
+(no)
+	case $cf_add_cflags in
+	(-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
+		case $cf_add_cflags in
+		(-D*)
+			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+
+			test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
+				&& test -z "${cf_tst_cflags}" \
+				&& cf_fix_cppflags=yes
+
+			if test $cf_fix_cppflags = yes ; then
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
+				continue
+			elif test "${cf_tst_cflags}" = "\"'" ; then
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
+				continue
+			fi
+			;;
+		esac
+		case "$CPPFLAGS" in
+		(*$cf_add_cflags)
+			;;
+		(*)
+			case $cf_add_cflags in
+			(-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
+
+	test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+	cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+
+			;;
+		esac
+		;;
+	(*)
+
+	test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+	cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+
+		;;
+	esac
+	;;
+(yes)
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
+	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
+
+	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
+		&& test -z "${cf_tst_cflags}" \
+		&& cf_fix_cppflags=no
+	;;
+esac
+done
+
+if test -n "$cf_new_cflags" ; then
+
+	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+	CFLAGS="${CFLAGS}$cf_new_cflags"
+
+fi
+
+if test -n "$cf_new_cppflags" ; then
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+
+fi
+
+if test -n "$cf_new_extra_cppflags" ; then
+
+	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+
+fi
+
+	done
+	;;
+(*)
+	echo "$as_me:2262: result: ok" >&5
+echo "${ECHO_T}ok" >&6
+	;;
+esac
+
+echo "$as_me:2267: checking \$CC variable" >&5
 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
 case "$CC" in
 (*[\ \	]-*)
-	echo "$as_me:2152: result: broken" >&5
+	echo "$as_me:2271: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:2154: 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;}
+	{ echo "$as_me:2273: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
+echo "$as_me: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;}
 	# humor him...
 	cf_prog=`echo "$CC" | sed -e 's/	/ /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'`
 	cf_flags=`echo "$CC" | ${AWK:-awk} -v prog="$cf_prog" '{ printf("%s", substr($0,1+length(prog))); }'`
@@ -2268,19 +2387,19 @@ fi
 	done
 	test -n "$verbose" && echo "	resulting CC: '$CC'" 1>&6
 
-echo "${as_me:-configure}:2271: testing resulting CC: '$CC' ..." 1>&5
+echo "${as_me:-configure}:2390: testing resulting CC: '$CC' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CFLAGS: '$CFLAGS'" 1>&6
 
-echo "${as_me:-configure}:2275: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+echo "${as_me:-configure}:2394: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
 
-echo "${as_me:-configure}:2279: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+echo "${as_me:-configure}:2398: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
 
 	;;
 (*)
-	echo "$as_me:2283: result: ok" >&5
+	echo "$as_me:2402: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
@@ -2291,7 +2410,7 @@ 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:2294: checking how to run the C preprocessor" >&5
+echo "$as_me:2413: 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
@@ -2312,18 +2431,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 2315 "configure"
+#line 2434 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2320: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2439: \"$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:2326: \$? = $ac_status" >&5
+  echo "$as_me:2445: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2346,17 +2465,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 2349 "configure"
+#line 2468 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2353: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2472: \"$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:2359: \$? = $ac_status" >&5
+  echo "$as_me:2478: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2393,7 +2512,7 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:2396: result: $CPP" >&5
+echo "$as_me:2515: result: $CPP" >&5
 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -2403,18 +2522,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 2406 "configure"
+#line 2525 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2411: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2530: \"$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:2417: \$? = $ac_status" >&5
+  echo "$as_me:2536: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2437,17 +2556,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 2440 "configure"
+#line 2559 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2444: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2563: \"$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:2450: \$? = $ac_status" >&5
+  echo "$as_me:2569: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2475,7 +2594,7 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:2478: error: C preprocessor \"$CPP\" fails sanity check" >&5
+  { { echo "$as_me:2597: error: C preprocessor \"$CPP\" fails sanity check" >&5
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -2487,7 +2606,7 @@ 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:2490: checking if preprocessor -C option works" >&5
+echo "$as_me:2609: checking if preprocessor -C option works" >&5
 echo $ECHO_N "checking if preprocessor -C option works... $ECHO_C" >&6
 if test "${cf_cv_prog_cpp_comments+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2512,34 +2631,34 @@ rm -f conftest.[ci]
 
 fi
 
-echo "$as_me:2515: result: $cf_cv_prog_cpp_comments" >&5
+echo "$as_me:2634: result: $cf_cv_prog_cpp_comments" >&5
 echo "${ECHO_T}$cf_cv_prog_cpp_comments" >&6
 if test x$cf_cv_prog_cpp_comments = xyes
 then
 	CPP="$CPP -C"
 fi
 
-echo "$as_me:2522: checking whether ln -s works" >&5
+echo "$as_me:2641: 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:2526: result: yes" >&5
+  echo "$as_me:2645: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:2529: result: no, using $LN_S" >&5
+  echo "$as_me:2648: 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:2536: result: Override: No symbolic links in mingw." >&5
+echo "$as_me:2655: result: Override: No symbolic links in mingw." >&5
 echo "${ECHO_T}Override: No symbolic links in mingw." >&6
 	;;
 (*)
 	;;
 esac
-echo "$as_me:2542: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:2661: 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
@@ -2559,11 +2678,11 @@ fi
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:2562: result: yes" >&5
+  echo "$as_me:2681: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:2566: result: no" >&5
+  echo "$as_me:2685: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
@@ -2580,7 +2699,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:2583: checking for a BSD compatible install" >&5
+echo "$as_me:2702: 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
@@ -2629,7 +2748,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:2632: result: $INSTALL" >&5
+echo "$as_me:2751: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -2644,7 +2763,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:2647: checking for $ac_word" >&5
+echo "$as_me:2766: 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
@@ -2659,7 +2778,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:2662: found $ac_dir/$ac_word" >&5
+echo "$as_me:2781: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2667,10 +2786,10 @@ fi
 fi
 YACC=$ac_cv_prog_YACC
 if test -n "$YACC"; then
-  echo "$as_me:2670: result: $YACC" >&5
+  echo "$as_me:2789: result: $YACC" >&5
 echo "${ECHO_T}$YACC" >&6
 else
-  echo "$as_me:2673: result: no" >&5
+  echo "$as_me:2792: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2682,7 +2801,7 @@ for ac_prog in lint cppcheck splint
 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:2685: checking for $ac_word" >&5
+echo "$as_me:2804: 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
@@ -2697,7 +2816,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:2700: found $ac_dir/$ac_word" >&5
+echo "$as_me:2819: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2705,17 +2824,17 @@ fi
 fi
 LINT=$ac_cv_prog_LINT
 if test -n "$LINT"; then
-  echo "$as_me:2708: result: $LINT" >&5
+  echo "$as_me:2827: result: $LINT" >&5
 echo "${ECHO_T}$LINT" >&6
 else
-  echo "$as_me:2711: result: no" >&5
+  echo "$as_me:2830: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
   test -n "$LINT" && break
 done
 
-echo "$as_me:2718: checking for makeflags variable" >&5
+echo "$as_me:2837: 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
@@ -2745,7 +2864,7 @@ CF_EOF
 			;;
 		(*)
 
-echo "${as_me:-configure}:2748: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
+echo "${as_me:-configure}:2867: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
 
 			;;
 		esac
@@ -2753,10 +2872,10 @@ echo "${as_me:-configure}:2748: testing given option \"$cf_option\",no match \"$
 	rm -f cf_makeflags.tmp
 
 fi
-echo "$as_me:2756: result: $cf_cv_makeflags" >&5
+echo "$as_me:2875: result: $cf_cv_makeflags" >&5
 echo "${ECHO_T}$cf_cv_makeflags" >&6
 
-echo "$as_me:2759: checking if filesystem supports mixed-case filenames" >&5
+echo "$as_me:2878: 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
@@ -2783,7 +2902,7 @@ else
 fi
 
 fi
-echo "$as_me:2786: result: $cf_cv_mixedcase" >&5
+echo "$as_me:2905: result: $cf_cv_mixedcase" >&5
 echo "${ECHO_T}$cf_cv_mixedcase" >&6
 test "$cf_cv_mixedcase" = yes &&
 cat >>confdefs.h <<\EOF
@@ -2794,7 +2913,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:2797: checking for $ac_word" >&5
+echo "$as_me:2916: 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
@@ -2809,7 +2928,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:2812: found $ac_dir/$ac_word" >&5
+echo "$as_me:2931: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2817,10 +2936,10 @@ fi
 fi
 CTAGS=$ac_cv_prog_CTAGS
 if test -n "$CTAGS"; then
-  echo "$as_me:2820: result: $CTAGS" >&5
+  echo "$as_me:2939: result: $CTAGS" >&5
 echo "${ECHO_T}$CTAGS" >&6
 else
-  echo "$as_me:2823: result: no" >&5
+  echo "$as_me:2942: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2831,7 +2950,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:2834: checking for $ac_word" >&5
+echo "$as_me:2953: 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
@@ -2846,7 +2965,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:2849: found $ac_dir/$ac_word" >&5
+echo "$as_me:2968: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2854,10 +2973,10 @@ fi
 fi
 ETAGS=$ac_cv_prog_ETAGS
 if test -n "$ETAGS"; then
-  echo "$as_me:2857: result: $ETAGS" >&5
+  echo "$as_me:2976: result: $ETAGS" >&5
 echo "${ECHO_T}$ETAGS" >&6
 else
-  echo "$as_me:2860: result: no" >&5
+  echo "$as_me:2979: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2866,7 +2985,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:2869: checking for $ac_word" >&5
+echo "$as_me:2988: 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
@@ -2881,7 +3000,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:2884: found $ac_dir/$ac_word" >&5
+echo "$as_me:3003: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2890,17 +3009,17 @@ fi
 fi
 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
 if test -n "$MAKE_LOWER_TAGS"; then
-  echo "$as_me:2893: result: $MAKE_LOWER_TAGS" >&5
+  echo "$as_me:3012: result: $MAKE_LOWER_TAGS" >&5
 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
 else
-  echo "$as_me:2896: result: no" >&5
+  echo "$as_me:3015: 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:2903: checking for $ac_word" >&5
+echo "$as_me:3022: 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
@@ -2915,7 +3034,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:2918: found $ac_dir/$ac_word" >&5
+echo "$as_me:3037: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2924,10 +3043,10 @@ fi
 fi
 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
 if test -n "$MAKE_UPPER_TAGS"; then
-  echo "$as_me:2927: result: $MAKE_UPPER_TAGS" >&5
+  echo "$as_me:3046: result: $MAKE_UPPER_TAGS" >&5
 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
 else
-  echo "$as_me:2930: result: no" >&5
+  echo "$as_me:3049: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2950,7 +3069,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:2953: checking for $ac_word" >&5
+echo "$as_me:3072: 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
@@ -2967,7 +3086,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:2970: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3089: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -2978,10 +3097,10 @@ fi
 WINDRES=$ac_cv_path_WINDRES
 
 if test -n "$WINDRES"; then
-  echo "$as_me:2981: result: $WINDRES" >&5
+  echo "$as_me:3100: result: $WINDRES" >&5
 echo "${ECHO_T}$WINDRES" >&6
 else
-  echo "$as_me:2984: result: no" >&5
+  echo "$as_me:3103: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2990,7 +3109,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:2993: checking for $ac_word" >&5
+echo "$as_me:3112: 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
@@ -3007,7 +3126,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:3010: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3129: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -3019,10 +3138,10 @@ fi
 ac_pt_WINDRES=$ac_cv_path_ac_pt_WINDRES
 
 if test -n "$ac_pt_WINDRES"; then
-  echo "$as_me:3022: result: $ac_pt_WINDRES" >&5
+  echo "$as_me:3141: result: $ac_pt_WINDRES" >&5
 echo "${ECHO_T}$ac_pt_WINDRES" >&6
 else
-  echo "$as_me:3025: result: no" >&5
+  echo "$as_me:3144: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3050,7 +3169,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:3053: checking for $ac_word" >&5
+echo "$as_me:3172: 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
@@ -3065,7 +3184,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:3068: found $ac_dir/$ac_word" >&5
+echo "$as_me:3187: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3073,10 +3192,10 @@ fi
 fi
 BUILD_CC=$ac_cv_prog_BUILD_CC
 if test -n "$BUILD_CC"; then
-  echo "$as_me:3076: result: $BUILD_CC" >&5
+  echo "$as_me:3195: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 else
-  echo "$as_me:3079: result: no" >&5
+  echo "$as_me:3198: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3085,12 +3204,12 @@ done
 test -n "$BUILD_CC" || BUILD_CC="none"
 
 fi;
-	echo "$as_me:3088: checking for native build C compiler" >&5
+	echo "$as_me:3207: checking for native build C compiler" >&5
 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
-	echo "$as_me:3090: result: $BUILD_CC" >&5
+	echo "$as_me:3209: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 
-	echo "$as_me:3093: checking for native build C preprocessor" >&5
+	echo "$as_me:3212: 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.
@@ -3100,10 +3219,10 @@ if test "${with_build_cpp+set}" = set; then
 else
   BUILD_CPP='${BUILD_CC} -E'
 fi;
-	echo "$as_me:3103: result: $BUILD_CPP" >&5
+	echo "$as_me:3222: result: $BUILD_CPP" >&5
 echo "${ECHO_T}$BUILD_CPP" >&6
 
-	echo "$as_me:3106: checking for native build C flags" >&5
+	echo "$as_me:3225: 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.
@@ -3111,10 +3230,10 @@ if test "${with_build_cflags+set}" = set; then
   withval="$with_build_cflags"
   BUILD_CFLAGS="$withval"
 fi;
-	echo "$as_me:3114: result: $BUILD_CFLAGS" >&5
+	echo "$as_me:3233: result: $BUILD_CFLAGS" >&5
 echo "${ECHO_T}$BUILD_CFLAGS" >&6
 
-	echo "$as_me:3117: checking for native build C preprocessor-flags" >&5
+	echo "$as_me:3236: 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.
@@ -3122,10 +3241,10 @@ if test "${with_build_cppflags+set}" = set; then
   withval="$with_build_cppflags"
   BUILD_CPPFLAGS="$withval"
 fi;
-	echo "$as_me:3125: result: $BUILD_CPPFLAGS" >&5
+	echo "$as_me:3244: result: $BUILD_CPPFLAGS" >&5
 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
 
-	echo "$as_me:3128: checking for native build linker-flags" >&5
+	echo "$as_me:3247: 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.
@@ -3133,10 +3252,10 @@ if test "${with_build_ldflags+set}" = set; then
   withval="$with_build_ldflags"
   BUILD_LDFLAGS="$withval"
 fi;
-	echo "$as_me:3136: result: $BUILD_LDFLAGS" >&5
+	echo "$as_me:3255: result: $BUILD_LDFLAGS" >&5
 echo "${ECHO_T}$BUILD_LDFLAGS" >&6
 
-	echo "$as_me:3139: checking for native build linker-libraries" >&5
+	echo "$as_me:3258: 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.
@@ -3144,7 +3263,7 @@ if test "${with_build_libs+set}" = set; then
   withval="$with_build_libs"
   BUILD_LIBS="$withval"
 fi;
-	echo "$as_me:3147: result: $BUILD_LIBS" >&5
+	echo "$as_me:3266: result: $BUILD_LIBS" >&5
 echo "${ECHO_T}$BUILD_LIBS" >&6
 
 	# this assumes we're on Unix.
@@ -3154,7 +3273,7 @@ echo "${ECHO_T}$BUILD_LIBS" >&6
 	: ${BUILD_CC:='${CC}'}
 
 	if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then
-		{ { echo "$as_me:3157: error: Cross-build requires two compilers.
+		{ { echo "$as_me:3276: 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;}
@@ -3175,7 +3294,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:3178: checking for $ac_word" >&5
+echo "$as_me:3297: 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
@@ -3190,7 +3309,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:3193: found $ac_dir/$ac_word" >&5
+echo "$as_me:3312: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3198,10 +3317,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:3201: result: $RANLIB" >&5
+  echo "$as_me:3320: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:3204: result: no" >&5
+  echo "$as_me:3323: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3210,7 +3329,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:3213: checking for $ac_word" >&5
+echo "$as_me:3332: 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
@@ -3225,7 +3344,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:3228: found $ac_dir/$ac_word" >&5
+echo "$as_me:3347: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3234,10 +3353,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:3237: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:3356: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:3240: result: no" >&5
+  echo "$as_me:3359: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3249,7 +3368,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:3252: checking for $ac_word" >&5
+echo "$as_me:3371: 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
@@ -3264,7 +3383,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:3267: found $ac_dir/$ac_word" >&5
+echo "$as_me:3386: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3272,10 +3391,10 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:3275: result: $AR" >&5
+  echo "$as_me:3394: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 else
-  echo "$as_me:3278: result: no" >&5
+  echo "$as_me:3397: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3284,7 +3403,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:3287: checking for $ac_word" >&5
+echo "$as_me:3406: 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
@@ -3299,7 +3418,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:3302: found $ac_dir/$ac_word" >&5
+echo "$as_me:3421: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3308,10 +3427,10 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:3311: result: $ac_ct_AR" >&5
+  echo "$as_me:3430: result: $ac_ct_AR" >&5
 echo "${ECHO_T}$ac_ct_AR" >&6
 else
-  echo "$as_me:3314: result: no" >&5
+  echo "$as_me:3433: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3320,7 +3439,7 @@ else
   AR="$ac_cv_prog_AR"
 fi
 
-echo "$as_me:3323: checking for options to update archives" >&5
+echo "$as_me:3442: 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
@@ -3343,13 +3462,13 @@ else
 		rm -f conftest.a
 
 		cat >conftest.$ac_ext <<EOF
-#line 3346 "configure"
+#line 3465 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-		if { (eval echo "$as_me:3349: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:3468: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3352: \$? = $ac_status" >&5
+  echo "$as_me:3471: \$? = $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
@@ -3360,7 +3479,7 @@ EOF
 		else
 			test -n "$verbose" && echo "	cannot compile test-program" 1>&6
 
-echo "${as_me:-configure}:3363: testing cannot compile test-program ..." 1>&5
+echo "${as_me:-configure}:3482: testing cannot compile test-program ..." 1>&5
 
 			break
 		fi
@@ -3368,7 +3487,7 @@ echo "${as_me:-configure}:3363: testing cannot compile test-program ..." 1>&5
 	rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext
 
 fi
-echo "$as_me:3371: result: $cf_cv_ar_flags" >&5
+echo "$as_me:3490: result: $cf_cv_ar_flags" >&5
 echo "${ECHO_T}$cf_cv_ar_flags" >&6
 
 if test -n "$ARFLAGS" ; then
@@ -3379,7 +3498,7 @@ else
 	ARFLAGS=$cf_cv_ar_flags
 fi
 
-echo "$as_me:3382: checking if you want to see long compiling messages" >&5
+echo "$as_me:3501: 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.
@@ -3413,7 +3532,7 @@ else
 	ECHO_CC=''
 
 fi;
-echo "$as_me:3416: result: $enableval" >&5
+echo "$as_me:3535: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 # special case for WWW/*
@@ -3423,7 +3542,7 @@ else
 	DONT_ECHO_CC=''
 fi
 
-echo "$as_me:3426: checking if you want to check memory-leaks" >&5
+echo "$as_me:3545: 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.
@@ -3440,7 +3559,7 @@ else
 	with_leak_checks=no
 
 fi;
-echo "$as_me:3443: result: $with_leak_checks" >&5
+echo "$as_me:3562: result: $with_leak_checks" >&5
 echo "${ECHO_T}$with_leak_checks" >&6
 test "$with_leak_checks" = "yes" &&
 cat >>confdefs.h <<\EOF
@@ -3450,7 +3569,7 @@ 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:3453: checking if you want to enable debug-code" >&5
+echo "$as_me:3572: 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.
@@ -3467,7 +3586,7 @@ else
 	with_debug=no
 
 fi;
-echo "$as_me:3470: result: $with_debug" >&5
+echo "$as_me:3589: result: $with_debug" >&5
 echo "${ECHO_T}$with_debug" >&6
 if test "$with_debug" = "yes" ; then
 	case $host_os in
@@ -3492,7 +3611,7 @@ else
 	esac
 fi
 
-echo "$as_me:3495: checking if you want to enable lynx trace code *recommended* " >&5
+echo "$as_me:3614: 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.
@@ -3509,14 +3628,14 @@ else
 	with_trace=yes
 
 fi;
-echo "$as_me:3512: result: $with_trace" >&5
+echo "$as_me:3631: result: $with_trace" >&5
 echo "${ECHO_T}$with_trace" >&6
 test $with_trace = no &&
 cat >>confdefs.h <<\EOF
 #define NO_LYNX_TRACE 1
 EOF
 
-echo "$as_me:3519: checking if you want verbose trace code" >&5
+echo "$as_me:3638: 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.
@@ -3533,7 +3652,7 @@ else
 	with_vertrace=no
 
 fi;
-echo "$as_me:3536: result: $with_vertrace" >&5
+echo "$as_me:3655: result: $with_vertrace" >&5
 echo "${ECHO_T}$with_vertrace" >&6
 test $with_vertrace = yes &&
 cat >>confdefs.h <<\EOF
@@ -3542,7 +3661,7 @@ EOF
 
 if test -n "$GCC"
 then
-echo "$as_me:3545: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:3664: 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.
@@ -3559,7 +3678,7 @@ else
 	with_warnings=no
 
 fi;
-echo "$as_me:3562: result: $with_warnings" >&5
+echo "$as_me:3681: result: $with_warnings" >&5
 echo "${ECHO_T}$with_warnings" >&6
 if test "$with_warnings" = "yes"
 then
@@ -3582,10 +3701,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:3585: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:3704: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > conftest.$ac_ext <<EOF
-#line 3588 "${as_me:-configure}"
+#line 3707 "${as_me:-configure}"
 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"
@@ -3634,12 +3753,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:3637: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:3756: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3640: \$? = $ac_status" >&5
+  echo "$as_me:3759: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-			test -n "$verbose" && echo "$as_me:3642: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:3761: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case $cf_attribute in
@@ -3703,12 +3822,12 @@ INTEL_COMPILER=no
 if test "$GCC" = yes ; then
 	case $host_os in
 	(linux*|gnu*)
-		echo "$as_me:3706: checking if this is really Intel C compiler" >&5
+		echo "$as_me:3825: 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 3711 "configure"
+#line 3830 "configure"
 #include "confdefs.h"
 
 int
@@ -3725,16 +3844,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3728: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3847: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3731: \$? = $ac_status" >&5
+  echo "$as_me:3850: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3734: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3853: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3737: \$? = $ac_status" >&5
+  echo "$as_me:3856: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -3745,7 +3864,7 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 		CFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:3748: result: $INTEL_COMPILER" >&5
+		echo "$as_me:3867: result: $INTEL_COMPILER" >&5
 echo "${ECHO_T}$INTEL_COMPILER" >&6
 		;;
 	esac
@@ -3754,12 +3873,12 @@ fi
 CLANG_COMPILER=no
 
 if test "$GCC" = yes ; then
-	echo "$as_me:3757: checking if this is really Clang C compiler" >&5
+	echo "$as_me:3876: 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 3762 "configure"
+#line 3881 "configure"
 #include "confdefs.h"
 
 int
@@ -3776,16 +3895,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3779: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3898: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3782: \$? = $ac_status" >&5
+  echo "$as_me:3901: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3785: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3904: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3788: \$? = $ac_status" >&5
+  echo "$as_me:3907: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   CLANG_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
@@ -3796,15 +3915,115 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 	CFLAGS="$cf_save_CFLAGS"
-	echo "$as_me:3799: result: $CLANG_COMPILER" >&5
+	echo "$as_me:3918: result: $CLANG_COMPILER" >&5
 echo "${ECHO_T}$CLANG_COMPILER" >&6
 fi
 
+if test "x$have_x" = xyes; then
+cat >conftest.$ac_ext <<_ACEOF
+#line 3924 "configure"
+#include "confdefs.h"
+
+#include <stdlib.h>
+#include <X11/Intrinsic.h>
+
+int
+main (void)
+{
+String foo = malloc(1)
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:3939: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:3942: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:3945: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:3948: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+echo "$as_me:3951: checking for X11/Xt const-feature" >&5
+echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6
+if test "${cf_cv_const_x_string+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+	cat >conftest.$ac_ext <<_ACEOF
+#line 3958 "configure"
+#include "confdefs.h"
+
+#define _CONST_X_STRING	/* X11R7.8 (perhaps) */
+#undef  XTSTRINGDEFINES	/* X11R5 and later */
+#include <stdlib.h>
+#include <X11/Intrinsic.h>
+
+int
+main (void)
+{
+String foo = malloc(1); *foo = 0
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:3975: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:3978: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:3981: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:3984: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+			cf_cv_const_x_string=no
+
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+
+			cf_cv_const_x_string=yes
+
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+
+fi
+echo "$as_me:3999: result: $cf_cv_const_x_string" >&5
+echo "${ECHO_T}$cf_cv_const_x_string" >&6
+
+case $cf_cv_const_x_string in
+(no)
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-DXTSTRINGDEFINES"
+
+	;;
+(*)
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-D_CONST_X_STRING"
+
+	;;
+esac
+
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
 cat > conftest.$ac_ext <<EOF
-#line 3804 "${as_me:-configure}"
+#line 4024 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
-
 if test "$INTEL_COMPILER" = yes
 then
 # The "-wdXXX" options suppress warnings:
@@ -3818,7 +4037,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:3821: checking for $CC warning options..." >&5
+	{ echo "$as_me:4040: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="-Wall"
@@ -3834,21 +4053,20 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:3837: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:4056: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3840: \$? = $ac_status" >&5
+  echo "$as_me:4059: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-			test -n "$verbose" && echo "$as_me:3842: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:4061: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
 	done
 	CFLAGS="$cf_save_CFLAGS"
-
 elif test "$GCC" = yes
 then
-	{ echo "$as_me:3851: checking for $CC warning options..." >&5
+	{ echo "$as_me:4069: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS=
@@ -3872,23 +4090,20 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef $cf_gcc_warnings $cf_warn_CONST
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:3875: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:4093: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3878: \$? = $ac_status" >&5
+  echo "$as_me:4096: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-			test -n "$verbose" && echo "$as_me:3880: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:4098: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case $cf_opt in
-			(Wcast-qual)
-				CPPFLAGS="$CPPFLAGS -DXTSTRINGDEFINES"
-				;;
 			(Winline)
 				case $GCC_VERSION in
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:3891: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:4106: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -3898,7 +4113,7 @@ echo "${as_me:-configure}:3891: 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}:3901: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:4116: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -3914,7 +4129,7 @@ rm -rf conftest*
 fi
 fi
 
-echo "$as_me:3917: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:4132: 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.
@@ -3931,7 +4146,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:3934: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:4149: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case .$with_cflags in
@@ -4045,23 +4260,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:4048: checking for dbmalloc.h" >&5
+	echo "$as_me:4263: 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 4054 "configure"
+#line 4269 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:4058: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4273: \"$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:4064: \$? = $ac_status" >&5
+  echo "$as_me:4279: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4080,11 +4295,11 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:4083: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:4298: 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:4087: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:4302: 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
@@ -4092,7 +4307,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 4095 "configure"
+#line 4310 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4111,16 +4326,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4114: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4329: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4117: \$? = $ac_status" >&5
+  echo "$as_me:4332: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4120: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4335: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4123: \$? = $ac_status" >&5
+  echo "$as_me:4338: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -4131,7 +4346,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4134: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:4349: 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
@@ -4146,7 +4361,7 @@ fi
 
 fi
 
-echo "$as_me:4149: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:4364: 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.
@@ -4163,7 +4378,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:4166: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:4381: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case .$with_cflags in
@@ -4277,23 +4492,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:4280: checking for dmalloc.h" >&5
+	echo "$as_me:4495: 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 4286 "configure"
+#line 4501 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:4290: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4505: \"$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:4296: \$? = $ac_status" >&5
+  echo "$as_me:4511: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4312,11 +4527,11 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:4315: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:4530: 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:4319: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:4534: 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
@@ -4324,7 +4539,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 4327 "configure"
+#line 4542 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4343,16 +4558,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4346: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4561: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4349: \$? = $ac_status" >&5
+  echo "$as_me:4564: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4352: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4567: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4355: \$? = $ac_status" >&5
+  echo "$as_me:4570: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -4363,7 +4578,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4366: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:4581: 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
@@ -4403,7 +4618,7 @@ case $host_os in
 	# contributed by Alex Matulich (matuli_a@marlin.navsea.navy.mil) also
 	# references -lmalloc and -lbsd.
 
-echo "$as_me:4406: checking for strcmp in -lc_s" >&5
+echo "$as_me:4621: 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
@@ -4411,7 +4626,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc_s  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 4414 "configure"
+#line 4629 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4430,16 +4645,16 @@ strcmp ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4433: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4648: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4436: \$? = $ac_status" >&5
+  echo "$as_me:4651: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4439: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4654: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4442: \$? = $ac_status" >&5
+  echo "$as_me:4657: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_c_s_strcmp=yes
 else
@@ -4450,7 +4665,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4453: result: $ac_cv_lib_c_s_strcmp" >&5
+echo "$as_me:4668: 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
@@ -4630,14 +4845,14 @@ fi
 	# SCO's cc (which is reported to have broken const/volatile).
 	case "$CC" in
 	(cc|*/cc)
-		{ echo "$as_me:4633: WARNING: You should consider using gcc or rcc if available" >&5
+		{ echo "$as_me:4848: 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:4640: checking for $ac_word" >&5
+echo "$as_me:4855: 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
@@ -4652,7 +4867,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:4655: found $ac_dir/$ac_word" >&5
+echo "$as_me:4870: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4660,10 +4875,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:4663: result: $CC" >&5
+  echo "$as_me:4878: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:4666: result: no" >&5
+  echo "$as_me:4881: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4686,23 +4901,23 @@ test -n "$CC" || CC="$CC"
 for ac_header in jcurses.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:4689: checking for $ac_header" >&5
+echo "$as_me:4904: 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 4695 "configure"
+#line 4910 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:4699: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4914: \"$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:4705: \$? = $ac_status" >&5
+  echo "$as_me:4920: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4721,7 +4936,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:4724: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:4939: 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
@@ -4749,23 +4964,23 @@ done
 for ac_header in cursesX.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:4752: checking for $ac_header" >&5
+echo "$as_me:4967: 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 4758 "configure"
+#line 4973 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:4762: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4977: \"$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:4768: \$? = $ac_status" >&5
+  echo "$as_me:4983: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4784,7 +4999,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:4787: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:5002: 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
@@ -4811,14 +5026,133 @@ esac
 # This should have been defined by AC_PROG_CC
 : ${CC:=cc}
 
-echo "$as_me:4814: checking \$CC variable" >&5
+echo "$as_me:5029: checking \$CFLAGS variable" >&5
+echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
+case "x$CFLAGS" in
+(*-[IUD]*)
+	echo "$as_me:5033: result: broken" >&5
+echo "${ECHO_T}broken" >&6
+	{ echo "$as_me:5035: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
+echo "$as_me: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&2;}
+	cf_flags="$CFLAGS"
+	CFLAGS=
+	for cf_arg in $cf_flags
+	do
+
+cf_fix_cppflags=no
+cf_new_cflags=
+cf_new_cppflags=
+cf_new_extra_cppflags=
+
+for cf_add_cflags in $cf_arg
+do
+case $cf_fix_cppflags in
+(no)
+	case $cf_add_cflags in
+	(-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
+		case $cf_add_cflags in
+		(-D*)
+			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+
+			test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
+				&& test -z "${cf_tst_cflags}" \
+				&& cf_fix_cppflags=yes
+
+			if test $cf_fix_cppflags = yes ; then
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
+				continue
+			elif test "${cf_tst_cflags}" = "\"'" ; then
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
+				continue
+			fi
+			;;
+		esac
+		case "$CPPFLAGS" in
+		(*$cf_add_cflags)
+			;;
+		(*)
+			case $cf_add_cflags in
+			(-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
+
+	test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+	cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+
+			;;
+		esac
+		;;
+	(*)
+
+	test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+	cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+
+		;;
+	esac
+	;;
+(yes)
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
+	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
+
+	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
+		&& test -z "${cf_tst_cflags}" \
+		&& cf_fix_cppflags=no
+	;;
+esac
+done
+
+if test -n "$cf_new_cflags" ; then
+
+	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+	CFLAGS="${CFLAGS}$cf_new_cflags"
+
+fi
+
+if test -n "$cf_new_cppflags" ; then
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+
+fi
+
+if test -n "$cf_new_extra_cppflags" ; then
+
+	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+
+fi
+
+	done
+	;;
+(*)
+	echo "$as_me:5143: result: ok" >&5
+echo "${ECHO_T}ok" >&6
+	;;
+esac
+
+echo "$as_me:5148: checking \$CC variable" >&5
 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
 case "$CC" in
 (*[\ \	]-*)
-	echo "$as_me:4818: result: broken" >&5
+	echo "$as_me:5152: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:4820: 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;}
+	{ echo "$as_me:5154: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
+echo "$as_me: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;}
 	# humor him...
 	cf_prog=`echo "$CC" | sed -e 's/	/ /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'`
 	cf_flags=`echo "$CC" | ${AWK:-awk} -v prog="$cf_prog" '{ printf("%s", substr($0,1+length(prog))); }'`
@@ -4934,24 +5268,24 @@ fi
 	done
 	test -n "$verbose" && echo "	resulting CC: '$CC'" 1>&6
 
-echo "${as_me:-configure}:4937: testing resulting CC: '$CC' ..." 1>&5
+echo "${as_me:-configure}:5271: testing resulting CC: '$CC' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CFLAGS: '$CFLAGS'" 1>&6
 
-echo "${as_me:-configure}:4941: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+echo "${as_me:-configure}:5275: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
 
-echo "${as_me:-configure}:4945: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+echo "${as_me:-configure}:5279: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
 
 	;;
 (*)
-	echo "$as_me:4949: result: ok" >&5
+	echo "$as_me:5283: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
 
-echo "$as_me:4954: checking for ${CC:-cc} option to accept ANSI C" >&5
+echo "$as_me:5288: 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
@@ -5075,7 +5409,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 5078 "configure"
+#line 5412 "configure"
 #include "confdefs.h"
 
 #ifndef CC_HAS_PROTOS
@@ -5096,16 +5430,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5099: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5433: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5102: \$? = $ac_status" >&5
+  echo "$as_me:5436: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5105: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5439: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5108: \$? = $ac_status" >&5
+  echo "$as_me:5442: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ansi_cc="$cf_arg"; break
 else
@@ -5118,7 +5452,7 @@ CFLAGS="$cf_save_CFLAGS"
 CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi
-echo "$as_me:5121: result: $cf_cv_ansi_cc" >&5
+echo "$as_me:5455: result: $cf_cv_ansi_cc" >&5
 echo "${ECHO_T}$cf_cv_ansi_cc" >&6
 
 if test "$cf_cv_ansi_cc" != "no"; then
@@ -5232,7 +5566,7 @@ fi
 fi
 
 if test "$cf_cv_ansi_cc" = "no"; then
-	{ { echo "$as_me:5235: error: Your compiler does not appear to recognize prototypes.
+	{ { echo "$as_me:5569: 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
@@ -5252,7 +5586,7 @@ if test "${enable_largefile+set}" = set; then
 fi;
 if test "$enable_largefile" != no; then
 
-  echo "$as_me:5255: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:5589: 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
@@ -5264,7 +5598,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 5267 "configure"
+#line 5601 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -5284,16 +5618,16 @@ main (void)
 }
 _ACEOF
      	 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5287: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5621: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5290: \$? = $ac_status" >&5
+  echo "$as_me:5624: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5293: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5627: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5296: \$? = $ac_status" >&5
+  echo "$as_me:5630: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -5303,16 +5637,16 @@ fi
 rm -f conftest.$ac_objext
      	 CC="$CC -n32"
      	 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5306: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5640: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5309: \$? = $ac_status" >&5
+  echo "$as_me:5643: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5312: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5646: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5315: \$? = $ac_status" >&5
+  echo "$as_me:5649: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else
@@ -5326,13 +5660,13 @@ rm -f conftest.$ac_objext
        rm -f conftest.$ac_ext
     fi
 fi
-echo "$as_me:5329: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:5663: 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:5335: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:5669: 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
@@ -5340,7 +5674,7 @@ else
   while :; do
   ac_cv_sys_file_offset_bits=no
   cat >conftest.$ac_ext <<_ACEOF
-#line 5343 "configure"
+#line 5677 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -5360,16 +5694,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5363: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5697: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5366: \$? = $ac_status" >&5
+  echo "$as_me:5700: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5369: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5703: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5372: \$? = $ac_status" >&5
+  echo "$as_me:5706: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -5378,7 +5712,7 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 5381 "configure"
+#line 5715 "configure"
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -5399,16 +5733,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5402: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5736: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5405: \$? = $ac_status" >&5
+  echo "$as_me:5739: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5408: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5742: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5411: \$? = $ac_status" >&5
+  echo "$as_me:5745: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else
@@ -5419,7 +5753,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
   break
 done
 fi
-echo "$as_me:5422: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:5756: 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
 
@@ -5429,7 +5763,7 @@ EOF
 
 fi
 rm -rf conftest*
-  echo "$as_me:5432: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:5766: 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
@@ -5437,7 +5771,7 @@ else
   while :; do
   ac_cv_sys_large_files=no
   cat >conftest.$ac_ext <<_ACEOF
-#line 5440 "configure"
+#line 5774 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -5457,16 +5791,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5460: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5794: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5463: \$? = $ac_status" >&5
+  echo "$as_me:5797: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5466: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5800: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5469: \$? = $ac_status" >&5
+  echo "$as_me:5803: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -5475,7 +5809,7 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 5478 "configure"
+#line 5812 "configure"
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
@@ -5496,16 +5830,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5499: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5833: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5502: \$? = $ac_status" >&5
+  echo "$as_me:5836: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5505: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5839: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5508: \$? = $ac_status" >&5
+  echo "$as_me:5842: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_large_files=1; break
 else
@@ -5516,7 +5850,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
   break
 done
 fi
-echo "$as_me:5519: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:5853: 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
 
@@ -5529,7 +5863,7 @@ rm -rf conftest*
 fi
 
 	if test "$enable_largefile" != no ; then
-	echo "$as_me:5532: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+	echo "$as_me:5866: 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
@@ -5537,7 +5871,7 @@ else
   while :; do
   ac_cv_sys_largefile_source=no
   cat >conftest.$ac_ext <<_ACEOF
-#line 5540 "configure"
+#line 5874 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -5549,16 +5883,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5552: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5886: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5555: \$? = $ac_status" >&5
+  echo "$as_me:5889: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5558: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5892: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5561: \$? = $ac_status" >&5
+  echo "$as_me:5895: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -5567,7 +5901,7 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 5570 "configure"
+#line 5904 "configure"
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
@@ -5580,16 +5914,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5583: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5917: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5586: \$? = $ac_status" >&5
+  echo "$as_me:5920: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5589: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5923: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5592: \$? = $ac_status" >&5
+  echo "$as_me:5926: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_largefile_source=1; break
 else
@@ -5600,7 +5934,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
   break
 done
 fi
-echo "$as_me:5603: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:5937: 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
 
@@ -5614,13 +5948,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:5617: checking for fseeko" >&5
+echo "$as_me:5951: 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 5623 "configure"
+#line 5957 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -5632,16 +5966,16 @@ return fseeko && fseeko (stdin, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5635: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5969: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5638: \$? = $ac_status" >&5
+  echo "$as_me:5972: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5641: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5975: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5644: \$? = $ac_status" >&5
+  echo "$as_me:5978: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_fseeko=yes
 else
@@ -5651,7 +5985,7 @@ ac_cv_func_fseeko=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:5654: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:5988: result: $ac_cv_func_fseeko" >&5
 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
 if test $ac_cv_func_fseeko = yes; then
 
@@ -5668,18 +6002,36 @@ fi
 	# header files by themselves before looking at the body files it is
 	# told to compile.  For ncurses, those header files do not include
 	# the config.h
-	test "$ac_cv_sys_large_files"      != no && CPPFLAGS="$CPPFLAGS -D_LARGE_FILES "
-	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 "
+	if test "$ac_cv_sys_large_files" != no
+	then
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-D_LARGE_FILES"
 
-	echo "$as_me:5675: checking whether to use struct dirent64" >&5
+	fi
+	if test "$ac_cv_sys_largefile_source" != no
+	then
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-D_LARGEFILE_SOURCE"
+
+	fi
+	if test "$ac_cv_sys_file_offset_bits" != no
+	then
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits"
+
+	fi
+
+	echo "$as_me:6027: 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 5682 "configure"
+#line 6034 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types"
@@ -5701,16 +6053,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5704: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6056: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5707: \$? = $ac_status" >&5
+  echo "$as_me:6059: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5710: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6062: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5713: \$? = $ac_status" >&5
+  echo "$as_me:6065: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_struct_dirent64=yes
 else
@@ -5721,7 +6073,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:5724: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:6076: result: $cf_cv_struct_dirent64" >&5
 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
 	test "$cf_cv_struct_dirent64" = yes &&
 cat >>confdefs.h <<\EOF
@@ -5733,20 +6085,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:5736: checking for PATH separator" >&5
+	echo "$as_me:6088: 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:=':'}  ;;
 	esac
 
-	echo "$as_me:5743: result: $PATH_SEPARATOR" >&5
+	echo "$as_me:6095: 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:5749: checking for $ac_word" >&5
+echo "$as_me:6101: 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
@@ -5773,17 +6125,17 @@ esac
 fi
 MSGINIT="$ac_cv_path_MSGINIT"
 if test "$MSGINIT" != ":"; then
-  echo "$as_me:5776: result: $MSGINIT" >&5
+  echo "$as_me:6128: result: $MSGINIT" >&5
 echo "${ECHO_T}$MSGINIT" >&6
 else
-  echo "$as_me:5779: result: no" >&5
+  echo "$as_me:6131: 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}:5786: testing adding en.po ..." 1>&5
+echo "${as_me:-configure}:6138: testing adding en.po ..." 1>&5
 
 		ALL_LINGUAS="$ALL_LINGUAS en"
 	fi
@@ -5792,7 +6144,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:5795: checking for $ac_word" >&5
+echo "$as_me:6147: 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
@@ -5807,7 +6159,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:5810: found $ac_dir/$ac_word" >&5
+echo "$as_me:6162: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5815,10 +6167,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:5818: result: $RANLIB" >&5
+  echo "$as_me:6170: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:5821: result: no" >&5
+  echo "$as_me:6173: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5827,7 +6179,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:5830: checking for $ac_word" >&5
+echo "$as_me:6182: 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
@@ -5842,7 +6194,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:5845: found $ac_dir/$ac_word" >&5
+echo "$as_me:6197: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5851,10 +6203,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:5854: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:6206: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:5857: result: no" >&5
+  echo "$as_me:6209: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5863,13 +6215,13 @@ else
   RANLIB="$ac_cv_prog_RANLIB"
 fi
 
-echo "$as_me:5866: checking for ANSI C header files" >&5
+echo "$as_me:6218: 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 5872 "configure"
+#line 6224 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -5877,13 +6229,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:5880: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:6232: \"$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:5886: \$? = $ac_status" >&5
+  echo "$as_me:6238: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5905,7 +6257,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 5908 "configure"
+#line 6260 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -5923,7 +6275,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 5926 "configure"
+#line 6278 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -5944,7 +6296,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5947 "configure"
+#line 6299 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -5970,15 +6322,15 @@ main (void)
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:5973: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6325: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5976: \$? = $ac_status" >&5
+  echo "$as_me:6328: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:5978: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6330: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5981: \$? = $ac_status" >&5
+  echo "$as_me:6333: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -5991,7 +6343,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:5994: result: $ac_cv_header_stdc" >&5
+echo "$as_me:6346: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -6001,7 +6353,7 @@ EOF
 
 fi
 
-echo "$as_me:6004: checking for inline" >&5
+echo "$as_me:6356: 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
@@ -6009,7 +6361,7 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >conftest.$ac_ext <<_ACEOF
-#line 6012 "configure"
+#line 6364 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo () {return 0; }
@@ -6018,16 +6370,16 @@ $ac_kw int foo () {return 0; }
 
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6021: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6373: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6024: \$? = $ac_status" >&5
+  echo "$as_me:6376: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6027: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6379: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6030: \$? = $ac_status" >&5
+  echo "$as_me:6382: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
@@ -6038,7 +6390,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:6041: result: $ac_cv_c_inline" >&5
+echo "$as_me:6393: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -6059,28 +6411,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:6062: checking for $ac_header" >&5
+echo "$as_me:6414: 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 6068 "configure"
+#line 6420 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6074: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6426: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6077: \$? = $ac_status" >&5
+  echo "$as_me:6429: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6080: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6432: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6083: \$? = $ac_status" >&5
+  echo "$as_me:6435: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -6090,7 +6442,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:6093: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:6445: 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
@@ -6100,13 +6452,13 @@ EOF
 fi
 done
 
-echo "$as_me:6103: checking for off_t" >&5
+echo "$as_me:6455: 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 6109 "configure"
+#line 6461 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -6121,16 +6473,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6124: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6476: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6127: \$? = $ac_status" >&5
+  echo "$as_me:6479: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6130: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6482: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6133: \$? = $ac_status" >&5
+  echo "$as_me:6485: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -6140,7 +6492,7 @@ ac_cv_type_off_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:6143: result: $ac_cv_type_off_t" >&5
+echo "$as_me:6495: 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
   :
@@ -6152,13 +6504,13 @@ EOF
 
 fi
 
-echo "$as_me:6155: checking for size_t" >&5
+echo "$as_me:6507: 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 6161 "configure"
+#line 6513 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -6173,16 +6525,16 @@ if (sizeof (size_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6176: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6528: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6179: \$? = $ac_status" >&5
+  echo "$as_me:6531: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6182: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6534: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6185: \$? = $ac_status" >&5
+  echo "$as_me:6537: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_size_t=yes
 else
@@ -6192,7 +6544,7 @@ ac_cv_type_size_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:6195: result: $ac_cv_type_size_t" >&5
+echo "$as_me:6547: 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
   :
@@ -6206,13 +6558,13 @@ fi
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:6209: checking for working alloca.h" >&5
+echo "$as_me:6561: 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 6215 "configure"
+#line 6567 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int
@@ -6224,16 +6576,16 @@ char *p = (char *) alloca (2 * sizeof (int));
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6227: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6579: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6230: \$? = $ac_status" >&5
+  echo "$as_me:6582: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6233: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6585: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6236: \$? = $ac_status" >&5
+  echo "$as_me:6588: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_working_alloca_h=yes
 else
@@ -6243,7 +6595,7 @@ ac_cv_working_alloca_h=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6246: result: $ac_cv_working_alloca_h" >&5
+echo "$as_me:6598: 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
 
@@ -6253,13 +6605,13 @@ EOF
 
 fi
 
-echo "$as_me:6256: checking for alloca" >&5
+echo "$as_me:6608: 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 6262 "configure"
+#line 6614 "configure"
 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -6291,16 +6643,16 @@ char *p = (char *) alloca (1);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6294: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6646: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6297: \$? = $ac_status" >&5
+  echo "$as_me:6649: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6300: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6652: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6303: \$? = $ac_status" >&5
+  echo "$as_me:6655: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_alloca_works=yes
 else
@@ -6310,7 +6662,7 @@ ac_cv_func_alloca_works=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6313: result: $ac_cv_func_alloca_works" >&5
+echo "$as_me:6665: 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
@@ -6331,13 +6683,13 @@ cat >>confdefs.h <<\EOF
 #define C_ALLOCA 1
 EOF
 
-echo "$as_me:6334: checking whether \`alloca.c' needs Cray hooks" >&5
+echo "$as_me:6686: 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 6340 "configure"
+#line 6692 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -6355,18 +6707,18 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:6358: result: $ac_cv_os_cray" >&5
+echo "$as_me:6710: 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:6363: checking for $ac_func" >&5
+echo "$as_me:6715: 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 6369 "configure"
+#line 6721 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -6397,16 +6749,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6400: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6752: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6403: \$? = $ac_status" >&5
+  echo "$as_me:6755: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6406: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6758: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6409: \$? = $ac_status" >&5
+  echo "$as_me:6761: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -6416,7 +6768,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6419: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:6771: 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
 
@@ -6430,7 +6782,7 @@ fi
   done
 fi
 
-echo "$as_me:6433: checking stack direction for C alloca" >&5
+echo "$as_me:6785: 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
@@ -6439,7 +6791,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6442 "configure"
+#line 6794 "configure"
 #include "confdefs.h"
 int
 find_stack_direction (void)
@@ -6462,15 +6814,15 @@ main (void)
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:6465: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6817: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6468: \$? = $ac_status" >&5
+  echo "$as_me:6820: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:6470: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6822: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6473: \$? = $ac_status" >&5
+  echo "$as_me:6825: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_stack_direction=1
 else
@@ -6482,7 +6834,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:6485: result: $ac_cv_c_stack_direction" >&5
+echo "$as_me:6837: result: $ac_cv_c_stack_direction" >&5
 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
 cat >>confdefs.h <<EOF
@@ -6494,23 +6846,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:6497: checking for $ac_header" >&5
+echo "$as_me:6849: 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 6503 "configure"
+#line 6855 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:6507: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:6859: \"$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:6513: \$? = $ac_status" >&5
+  echo "$as_me:6865: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6529,7 +6881,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:6532: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:6884: 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
@@ -6542,13 +6894,13 @@ done
 for ac_func in getpagesize
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:6545: checking for $ac_func" >&5
+echo "$as_me:6897: 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 6551 "configure"
+#line 6903 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -6579,16 +6931,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6582: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6934: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6585: \$? = $ac_status" >&5
+  echo "$as_me:6937: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6588: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6940: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6591: \$? = $ac_status" >&5
+  echo "$as_me:6943: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -6598,7 +6950,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6601: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:6953: 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
@@ -6608,7 +6960,7 @@ EOF
 fi
 done
 
-echo "$as_me:6611: checking for working mmap" >&5
+echo "$as_me:6963: 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
@@ -6617,7 +6969,7 @@ else
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6620 "configure"
+#line 6972 "configure"
 #include "confdefs.h"
 $ac_includes_default
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -6744,15 +7096,15 @@ main (void)
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:6747: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7099: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6750: \$? = $ac_status" >&5
+  echo "$as_me:7102: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:6752: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7104: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6755: \$? = $ac_status" >&5
+  echo "$as_me:7107: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -6764,7 +7116,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:6767: result: $ac_cv_func_mmap_fixed_mapped" >&5
+echo "$as_me:7119: 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
 
@@ -6775,13 +7127,13 @@ EOF
 fi
 rm -f conftest.mmap
 
-echo "$as_me:6778: checking whether we are using the GNU C Library 2.1 or newer" >&5
+echo "$as_me:7130: 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 6784 "configure"
+#line 7136 "configure"
 #include "confdefs.h"
 
 #include <features.h>
@@ -6801,7 +7153,7 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:6804: result: $ac_cv_gnu_library_2_1" >&5
+echo "$as_me:7156: 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"
@@ -6814,7 +7166,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:6817: error: CF_BUNDLED_INTL used without setting PACKAGE variable" >&5
+	{ { echo "$as_me:7169: 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
@@ -6831,23 +7183,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:6834: checking for $ac_header" >&5
+echo "$as_me:7186: 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 6840 "configure"
+#line 7192 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:6844: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7196: \"$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:6850: \$? = $ac_status" >&5
+  echo "$as_me:7202: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6866,7 +7218,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:6869: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:7221: 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
@@ -6881,13 +7233,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:6884: checking for $ac_func" >&5
+echo "$as_me:7236: 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 6890 "configure"
+#line 7242 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -6918,16 +7270,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6921: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7273: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6924: \$? = $ac_status" >&5
+  echo "$as_me:7276: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6927: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7279: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6930: \$? = $ac_status" >&5
+  echo "$as_me:7282: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -6937,7 +7289,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6940: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:7292: 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
@@ -6983,9 +7335,12 @@ if test -n "$cf_searchpath/include" ; then
 			if test "$GCC" = yes
 			then
 			  cf_save_CPPFLAGS=$CPPFLAGS
-			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 6988 "configure"
+#line 7343 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -6997,16 +7352,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7000: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7355: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7003: \$? = $ac_status" >&5
+  echo "$as_me:7358: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7006: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7361: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7009: \$? = $ac_status" >&5
+  echo "$as_me:7364: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -7023,7 +7378,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}:7026: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:7381: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -7064,9 +7419,12 @@ if test -n "$cf_searchpath/../include" ; then
 			if test "$GCC" = yes
 			then
 			  cf_save_CPPFLAGS=$CPPFLAGS
-			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 7069 "configure"
+#line 7427 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7078,16 +7436,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7081: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7439: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7084: \$? = $ac_status" >&5
+  echo "$as_me:7442: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7087: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7445: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7090: \$? = $ac_status" >&5
+  echo "$as_me:7448: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -7104,7 +7462,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}:7107: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:7465: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -7122,7 +7480,7 @@ echo "${as_me:-configure}:7107: testing adding $cf_add_incdir to include-path ..
 fi
 
 	else
-{ { echo "$as_me:7125: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:7483: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -7147,7 +7505,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}:7150: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:7508: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -7176,7 +7534,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}:7179: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:7537: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -7185,7 +7543,7 @@ echo "${as_me:-configure}:7179: testing adding $cf_add_libdir to library-path ..
 fi
 
 	else
-{ { echo "$as_me:7188: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:7546: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -7196,7 +7554,7 @@ esac
 
 fi;
 
-  echo "$as_me:7199: checking for iconv" >&5
+  echo "$as_me:7557: 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
@@ -7207,12 +7565,12 @@ else
 cf_cv_header_path_iconv=
 cf_cv_library_path_iconv=
 
-echo "${as_me:-configure}:7210: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:7568: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 7215 "configure"
+#line 7573 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -7231,16 +7589,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7234: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7592: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7237: \$? = $ac_status" >&5
+  echo "$as_me:7595: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7240: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7598: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7243: \$? = $ac_status" >&5
+  echo "$as_me:7601: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -7254,7 +7612,7 @@ cat conftest.$ac_ext >&5
 LIBS="-liconv  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 7257 "configure"
+#line 7615 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -7273,16 +7631,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7276: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7634: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7279: \$? = $ac_status" >&5
+  echo "$as_me:7637: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7282: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7640: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7285: \$? = $ac_status" >&5
+  echo "$as_me:7643: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -7299,9 +7657,9 @@ cat conftest.$ac_ext >&5
 
 	test -n "$verbose" && echo "	find linkage for iconv library" 1>&6
 
-echo "${as_me:-configure}:7302: testing find linkage for iconv library ..." 1>&5
+echo "${as_me:-configure}:7660: testing find linkage for iconv library ..." 1>&5
 
-echo "${as_me:-configure}:7304: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:7662: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -7392,11 +7750,15 @@ 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}:7395: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:7753: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
+
+			CPPFLAGS="$cf_save_CPPFLAGS"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_iconv"
 
-			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_iconv"
 			cat >conftest.$ac_ext <<_ACEOF
-#line 7399 "configure"
+#line 7761 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -7415,21 +7777,21 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7418: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7780: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7421: \$? = $ac_status" >&5
+  echo "$as_me:7783: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7424: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7786: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7427: \$? = $ac_status" >&5
+  echo "$as_me:7789: \$? = $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}:7432: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:7794: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
 
 				cf_cv_find_linkage_iconv=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -7447,7 +7809,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "$cf_cv_find_linkage_iconv" = maybe ; then
 
-echo "${as_me:-configure}:7450: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:7812: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -7522,13 +7884,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}:7525: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:7887: 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 7531 "configure"
+#line 7893 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -7547,21 +7909,21 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7550: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7912: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7553: \$? = $ac_status" >&5
+  echo "$as_me:7915: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7556: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7918: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7559: \$? = $ac_status" >&5
+  echo "$as_me:7921: \$? = $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}:7564: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:7926: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
 
 					cf_cv_find_linkage_iconv=yes
 					cf_cv_library_file_iconv="-liconv"
@@ -7601,7 +7963,7 @@ am_cv_func_iconv="no, consider installing GNU libiconv"
 fi
 
 fi
-echo "$as_me:7604: result: $am_cv_func_iconv" >&5
+echo "$as_me:7966: result: $am_cv_func_iconv" >&5
 echo "${ECHO_T}$am_cv_func_iconv" >&6
 
   if test "$am_cv_func_iconv" = yes; then
@@ -7610,14 +7972,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_ICONV 1
 EOF
 
-    echo "$as_me:7613: checking if the declaration of iconv() needs const." >&5
+    echo "$as_me:7975: 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 7620 "configure"
+#line 7982 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -7642,16 +8004,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7645: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8007: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7648: \$? = $ac_status" >&5
+  echo "$as_me:8010: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7651: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8013: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7654: \$? = $ac_status" >&5
+  echo "$as_me:8016: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_proto_iconv_const=no
 else
@@ -7661,7 +8023,7 @@ am_cv_proto_iconv_const=yes
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:7664: result: $am_cv_proto_iconv_const" >&5
+echo "$as_me:8026: 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
@@ -7701,9 +8063,12 @@ if test -n "$cf_cv_header_path_iconv" ; then
 			if test "$GCC" = yes
 			then
 			  cf_save_CPPFLAGS=$CPPFLAGS
-			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 7706 "configure"
+#line 8071 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7715,16 +8080,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7718: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8083: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7721: \$? = $ac_status" >&5
+  echo "$as_me:8086: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7724: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8089: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7727: \$? = $ac_status" >&5
+  echo "$as_me:8092: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -7741,7 +8106,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}:7744: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:8109: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -7780,7 +8145,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}:7783: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:8148: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -7791,13 +8156,13 @@ fi
     fi
   fi
 
-echo "$as_me:7794: checking for nl_langinfo and CODESET" >&5
+echo "$as_me:8159: 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 7800 "configure"
+#line 8165 "configure"
 #include "confdefs.h"
 #include <langinfo.h>
 int
@@ -7809,16 +8174,16 @@ char* cs = nl_langinfo(CODESET);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7812: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8177: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7815: \$? = $ac_status" >&5
+  echo "$as_me:8180: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7818: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8183: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7821: \$? = $ac_status" >&5
+  echo "$as_me:8186: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_langinfo_codeset=yes
 else
@@ -7829,7 +8194,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:7832: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:8197: result: $am_cv_langinfo_codeset" >&5
 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
 	if test $am_cv_langinfo_codeset = yes; then
 
@@ -7840,13 +8205,13 @@ EOF
 	fi
 
    if test $ac_cv_header_locale_h = yes; then
-	echo "$as_me:7843: checking for LC_MESSAGES" >&5
+	echo "$as_me:8208: 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 7849 "configure"
+#line 8214 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int
@@ -7858,16 +8223,16 @@ return LC_MESSAGES
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7861: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8226: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7864: \$? = $ac_status" >&5
+  echo "$as_me:8229: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7867: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8232: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7870: \$? = $ac_status" >&5
+  echo "$as_me:8235: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_val_LC_MESSAGES=yes
 else
@@ -7877,7 +8242,7 @@ am_cv_val_LC_MESSAGES=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7880: result: $am_cv_val_LC_MESSAGES" >&5
+echo "$as_me:8245: 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
 
@@ -7887,7 +8252,7 @@ EOF
 
 	fi
 fi
-   echo "$as_me:7890: checking whether NLS is requested" >&5
+   echo "$as_me:8255: 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.
@@ -7897,7 +8262,7 @@ if test "${enable_nls+set}" = set; then
 else
   USE_NLS=no
 fi;
-  echo "$as_me:7900: result: $USE_NLS" >&5
+  echo "$as_me:8265: result: $USE_NLS" >&5
 echo "${ECHO_T}$USE_NLS" >&6
 
   BUILD_INCLUDED_LIBINTL=no
@@ -7911,7 +8276,7 @@ cat >>confdefs.h <<\EOF
 #define ENABLE_NLS 1
 EOF
 
-    echo "$as_me:7914: checking whether included gettext is requested" >&5
+    echo "$as_me:8279: 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.
@@ -7921,7 +8286,7 @@ if test "${with_included_gettext+set}" = set; then
 else
   nls_cv_force_use_gnu_gettext=no
 fi;
-    echo "$as_me:7924: result: $nls_cv_force_use_gnu_gettext" >&5
+    echo "$as_me:8289: 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"
@@ -7934,7 +8299,7 @@ echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6
             # Extract the first word of "msgfmt", so it can be a program name with args.
 
 set dummy msgfmt; ac_word=$2
-echo "$as_me:7937: checking for $ac_word" >&5
+echo "$as_me:8302: 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
@@ -7961,16 +8326,16 @@ esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != ":"; then
-  echo "$as_me:7964: result: $MSGFMT" >&5
+  echo "$as_me:8329: result: $MSGFMT" >&5
 echo "${ECHO_T}$MSGFMT" >&6
 else
-  echo "$as_me:7967: result: no" >&5
+  echo "$as_me:8332: 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:7973: checking for $ac_word" >&5
+echo "$as_me:8338: 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
@@ -7987,7 +8352,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:7990: found $ac_dir/$ac_word" >&5
+   echo "$as_me:8355: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -7999,17 +8364,17 @@ fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 
 if test -n "$GMSGFMT"; then
-  echo "$as_me:8002: result: $GMSGFMT" >&5
+  echo "$as_me:8367: result: $GMSGFMT" >&5
 echo "${ECHO_T}$GMSGFMT" >&6
 else
-  echo "$as_me:8005: result: no" >&5
+  echo "$as_me:8370: 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:8012: checking for $ac_word" >&5
+echo "$as_me:8377: 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
@@ -8036,10 +8401,10 @@ esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
-  echo "$as_me:8039: result: $XGETTEXT" >&5
+  echo "$as_me:8404: result: $XGETTEXT" >&5
 echo "${ECHO_T}$XGETTEXT" >&6
 else
-  echo "$as_me:8042: result: no" >&5
+  echo "$as_me:8407: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8170,12 +8535,12 @@ LIBS="$cf_add_libs"
 cf_cv_header_path_intl=
 cf_cv_library_path_intl=
 
-echo "${as_me:-configure}:8173: testing Starting FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me:-configure}:8538: testing Starting FIND_LINKAGE(intl,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 8178 "configure"
+#line 8543 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -8197,16 +8562,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8200: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8565: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8203: \$? = $ac_status" >&5
+  echo "$as_me:8568: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8206: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8571: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8209: \$? = $ac_status" >&5
+  echo "$as_me:8574: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_intl=yes
@@ -8220,7 +8585,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lintl  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 8223 "configure"
+#line 8588 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -8242,16 +8607,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8245: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8610: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8248: \$? = $ac_status" >&5
+  echo "$as_me:8613: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8251: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8616: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8254: \$? = $ac_status" >&5
+  echo "$as_me:8619: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_intl=yes
@@ -8268,9 +8633,9 @@ cat conftest.$ac_ext >&5
 
 	test -n "$verbose" && echo "	find linkage for intl library" 1>&6
 
-echo "${as_me:-configure}:8271: testing find linkage for intl library ..." 1>&5
+echo "${as_me:-configure}:8636: testing find linkage for intl library ..." 1>&5
 
-echo "${as_me:-configure}:8273: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me:-configure}:8638: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -8361,11 +8726,15 @@ 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}:8364: testing ... testing $cf_cv_header_path_intl ..." 1>&5
+echo "${as_me:-configure}:8729: testing ... testing $cf_cv_header_path_intl ..." 1>&5
+
+			CPPFLAGS="$cf_save_CPPFLAGS"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_intl"
 
-			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_intl"
 			cat >conftest.$ac_ext <<_ACEOF
-#line 8368 "configure"
+#line 8737 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -8387,21 +8756,21 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8390: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8759: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8393: \$? = $ac_status" >&5
+  echo "$as_me:8762: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8396: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8765: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8399: \$? = $ac_status" >&5
+  echo "$as_me:8768: \$? = $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}:8404: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5
+echo "${as_me:-configure}:8773: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5
 
 				cf_cv_find_linkage_intl=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -8419,7 +8788,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "$cf_cv_find_linkage_intl" = maybe ; then
 
-echo "${as_me:-configure}:8422: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me:-configure}:8791: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -8494,13 +8863,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}:8497: testing ... testing $cf_cv_library_path_intl ..." 1>&5
+echo "${as_me:-configure}:8866: 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 8503 "configure"
+#line 8872 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -8522,21 +8891,21 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8525: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8894: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8528: \$? = $ac_status" >&5
+  echo "$as_me:8897: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8531: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8900: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8534: \$? = $ac_status" >&5
+  echo "$as_me:8903: \$? = $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}:8539: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5
+echo "${as_me:-configure}:8908: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5
 
 					cf_cv_find_linkage_intl=yes
 					cf_cv_library_file_intl="-lintl"
@@ -8575,9 +8944,9 @@ else
 cf_cv_func_gettext=no
 fi
 
-      echo "$as_me:8578: checking for libintl.h and gettext()" >&5
+      echo "$as_me:8947: checking for libintl.h and gettext()" >&5
 echo $ECHO_N "checking for libintl.h and gettext()... $ECHO_C" >&6
-      echo "$as_me:8580: result: $cf_cv_func_gettext" >&5
+      echo "$as_me:8949: result: $cf_cv_func_gettext" >&5
 echo "${ECHO_T}$cf_cv_func_gettext" >&6
 
       LIBS="$cf_save_LIBS_1"
@@ -8617,9 +8986,12 @@ if test -n "$cf_cv_header_path_intl" ; then
 			if test "$GCC" = yes
 			then
 			  cf_save_CPPFLAGS=$CPPFLAGS
-			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 8622 "configure"
+#line 8994 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8631,16 +9003,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8634: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9006: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8637: \$? = $ac_status" >&5
+  echo "$as_me:9009: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8640: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9012: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8643: \$? = $ac_status" >&5
+  echo "$as_me:9015: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -8657,7 +9029,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}:8660: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9032: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -8696,7 +9068,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}:8699: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:9071: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				INTLLIBS="-L$cf_add_libdir $INTLLIBS"
 			fi
@@ -8712,13 +9084,13 @@ fi
 for ac_func in dcgettext
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8715: checking for $ac_func" >&5
+echo "$as_me:9087: 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 8721 "configure"
+#line 9093 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -8749,16 +9121,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8752: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9124: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8755: \$? = $ac_status" >&5
+  echo "$as_me:9127: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8758: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9130: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8761: \$? = $ac_status" >&5
+  echo "$as_me:9133: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -8768,7 +9140,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8771: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:9143: 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
@@ -8783,7 +9155,7 @@ done
           CATOBJEXT=.gmo
         fi
       elif test -z "$MSGFMT" || test -z "$XGETTEXT" ; then
-        { echo "$as_me:8786: WARNING: disabling NLS feature" >&5
+        { echo "$as_me:9158: WARNING: disabling NLS feature" >&5
 echo "$as_me: WARNING: disabling NLS feature" >&2;}
         sed -e /ENABLE_NLS/d confdefs.h >confdefs.tmp
         mv confdefs.tmp confdefs.h
@@ -8814,7 +9186,7 @@ echo "$as_me: WARNING: disabling NLS feature" >&2;}
         LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
       elif test "$nls_cv_use_gnu_gettext" = "yes"; then
         nls_cv_use_gnu_gettext=no
-        { echo "$as_me:8817: WARNING: no NLS library is packaged with this application" >&5
+        { echo "$as_me:9189: WARNING: no NLS library is packaged with this application" >&5
 echo "$as_me: WARNING: no NLS library is packaged with this application" >&2;}
       fi
     fi
@@ -8823,7 +9195,7 @@ echo "$as_me: WARNING: no NLS library is packaged with this application" >&2;}
       if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then
         : ;
       else
-        { echo "$as_me:8826: WARNING: found msgfmt program is not GNU msgfmt" >&5
+        { echo "$as_me:9198: WARNING: found msgfmt program is not GNU msgfmt" >&5
 echo "$as_me: WARNING: found msgfmt program is not GNU msgfmt" >&2;}
       fi
     fi
@@ -8832,7 +9204,7 @@ echo "$as_me: WARNING: found msgfmt program is not GNU msgfmt" >&2;}
       if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then
         : ;
       else
-        { echo "$as_me:8835: WARNING: found xgettext program is not GNU xgettext" >&5
+        { echo "$as_me:9207: WARNING: found xgettext program is not GNU xgettext" >&5
 echo "$as_me: WARNING: found xgettext program is not GNU xgettext" >&2;}
       fi
     fi
@@ -8850,7 +9222,7 @@ echo "$as_me: WARNING: found xgettext program is not GNU xgettext" >&2;}
 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:8853: checking for $ac_word" >&5
+echo "$as_me:9225: 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
@@ -8865,7 +9237,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:8868: found $ac_dir/$ac_word" >&5
+echo "$as_me:9240: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -8873,10 +9245,10 @@ fi
 fi
 INTLBISON=$ac_cv_prog_INTLBISON
 if test -n "$INTLBISON"; then
-  echo "$as_me:8876: result: $INTLBISON" >&5
+  echo "$as_me:9248: result: $INTLBISON" >&5
 echo "${ECHO_T}$INTLBISON" >&6
 else
-  echo "$as_me:8879: result: no" >&5
+  echo "$as_me:9251: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8886,7 +9258,7 @@ done
       if test -z "$INTLBISON"; then
         ac_verc_fail=yes
       else
-                echo "$as_me:8889: checking version of bison" >&5
+                echo "$as_me:9261: 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
@@ -8895,7 +9267,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:8898: result: $ac_prog_version" >&5
+      echo "$as_me:9270: result: $ac_prog_version" >&5
 echo "${ECHO_T}$ac_prog_version" >&6
       fi
       if test $ac_verc_fail = yes; then
@@ -8922,7 +9294,7 @@ echo "${ECHO_T}$ac_prog_version" >&6
      if test "x$ALL_LINGUAS" = "x"; then
        LINGUAS=
      else
-       echo "$as_me:8925: checking for catalogs to be installed" >&5
+       echo "$as_me:9297: 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
@@ -8942,7 +9314,7 @@ echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
          fi
        done
        LINGUAS=$NEW_LINGUAS
-       echo "$as_me:8945: result: $LINGUAS" >&5
+       echo "$as_me:9317: result: $LINGUAS" >&5
 echo "${ECHO_T}$LINGUAS" >&6
      fi
 
@@ -8978,7 +9350,7 @@ cf_makefile=makefile
 use_our_messages=no
 if test "$USE_NLS" = yes ; then
 if test -d $srcdir/po ; then
-echo "$as_me:8981: checking if we should use included message-library" >&5
+echo "$as_me:9353: 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.
@@ -8989,7 +9361,7 @@ else
   use_our_messages=yes
 fi;
 fi
-echo "$as_me:8992: result: $use_our_messages" >&5
+echo "$as_me:9364: result: $use_our_messages" >&5
 echo "${ECHO_T}$use_our_messages" >&6
 fi
 
@@ -9031,23 +9403,23 @@ else
 for ac_header in libintl.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:9034: checking for $ac_header" >&5
+echo "$as_me:9406: 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 9040 "configure"
+#line 9412 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:9044: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:9416: \"$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:9050: \$? = $ac_status" >&5
+  echo "$as_me:9422: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9066,7 +9438,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:9069: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:9441: 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
@@ -9080,7 +9452,10 @@ done
 fi
 
 if test -z "$INTLDIR_MAKE" ; then
-	CPPFLAGS="$CPPFLAGS -I../intl"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I../intl"
+
 fi
 
 if test "$BUILD_INCLUDED_LIBINTL" = yes ; then
@@ -9152,7 +9527,7 @@ case ".$withval" in
 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9155: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:9530: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -9161,7 +9536,7 @@ esac
 fi
 eval NLS_DATADIR="$withval"
 
-echo "$as_me:9164: checking if you want full utility pathnames" >&5
+echo "$as_me:9539: 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.
@@ -9178,14 +9553,14 @@ else
 	with_full_paths=yes
 
 fi;
-echo "$as_me:9181: result: $with_full_paths" >&5
+echo "$as_me:9556: result: $with_full_paths" >&5
 echo "${ECHO_T}$with_full_paths" >&6
 test $with_full_paths = no &&
 cat >>confdefs.h <<\EOF
 #define USE_EXECVP 1
 EOF
 
-echo "$as_me:9188: checking for system mailer" >&5
+echo "$as_me:9563: 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
@@ -9205,14 +9580,14 @@ else
 
 fi
 
-echo "$as_me:9208: result: $cf_cv_SYSTEM_MAIL" >&5
+echo "$as_me:9583: 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:9215: checking system mail flags" >&5
+echo "$as_me:9590: 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
@@ -9228,7 +9603,7 @@ else
 
 fi
 
-echo "$as_me:9231: result: $cf_cv_system_mail_flags" >&5
+echo "$as_me:9606: result: $cf_cv_system_mail_flags" >&5
 echo "${ECHO_T}$cf_cv_system_mail_flags" >&6
 
 cat >>confdefs.h <<EOF
@@ -9241,6 +9616,57 @@ if test $with_full_paths = no ; then
 fi
 fi
 
+echo "$as_me:9619: checking if the POSIX test-macros are already defined" >&5
+echo $ECHO_N "checking if the POSIX test-macros are already defined... $ECHO_C" >&6
+if test "${cf_cv_posix_visible+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+cat >conftest.$ac_ext <<_ACEOF
+#line 9626 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+int
+main (void)
+{
+
+#if defined(__POSIX_VISIBLE) && ((__POSIX_VISIBLE - 0L) > 0) \
+	&& defined(__XSI_VISIBLE) && ((__XSI_VISIBLE - 0L) > 0) \
+	&& defined(__BSD_VISIBLE) && ((__BSD_VISIBLE - 0L) > 0) \
+	&& defined(__ISO_C_VISIBLE) && ((__ISO_C_VISIBLE - 0L) > 0)
+#error conflicting symbols found
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:9645: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:9648: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:9651: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:9654: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  cf_cv_posix_visible=no
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+cf_cv_posix_visible=yes
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+
+fi
+echo "$as_me:9665: result: $cf_cv_posix_visible" >&5
+echo "${ECHO_T}$cf_cv_posix_visible" >&6
+
+if test "$cf_cv_posix_visible" = no; then
+
 cf_XOPEN_SOURCE=500
 cf_POSIX_C_SOURCE=199506L
 cf_xopen_source=
@@ -9259,7 +9685,7 @@ case $host_os in
 	cf_xopen_source="-D_DARWIN_C_SOURCE"
 	cf_XOPEN_SOURCE=
 	;;
-(freebsd*|dragonfly*)
+(freebsd*|dragonfly*|midnightbsd*)
 	# 5.x headers associate
 	#	_XOPEN_SOURCE=600 with _POSIX_C_SOURCE=200112L
 	#	_XOPEN_SOURCE=500 with _POSIX_C_SOURCE=199506L
@@ -9279,71 +9705,436 @@ case $host_os in
 	;;
 (linux*|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin)
 
-echo "$as_me:9282: checking if we must define _GNU_SOURCE" >&5
+cf_gnu_xopen_source=$cf_XOPEN_SOURCE
+
+echo "$as_me:9710: checking if this is the GNU C library" >&5
+echo $ECHO_N "checking if this is the GNU C library... $ECHO_C" >&6
+if test "${cf_cv_gnu_library+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+cat >conftest.$ac_ext <<_ACEOF
+#line 9717 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+int
+main (void)
+{
+
+	#if __GLIBC__ > 0 && __GLIBC_MINOR__ >= 0
+		return 0;
+	#elif __NEWLIB__ > 0 && __NEWLIB_MINOR__ >= 0
+		return 0;
+	#else
+	#	error not GNU C library
+	#endif
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:9736: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:9739: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:9742: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:9745: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  cf_cv_gnu_library=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+cf_cv_gnu_library=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+
+fi
+echo "$as_me:9756: result: $cf_cv_gnu_library" >&5
+echo "${ECHO_T}$cf_cv_gnu_library" >&6
+
+if test x$cf_cv_gnu_library = xyes; then
+
+	# With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE
+	# was changed to help a little.  newlib incorporated the change about 4
+	# years later.
+	echo "$as_me:9764: checking if _DEFAULT_SOURCE can be used as a basis" >&5
+echo $ECHO_N "checking if _DEFAULT_SOURCE can be used as a basis... $ECHO_C" >&6
+if test "${cf_cv_gnu_library_219+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+		cf_save="$CPPFLAGS"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
+
+		cat >conftest.$ac_ext <<_ACEOF
+#line 9776 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+int
+main (void)
+{
+
+			#if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 19) || (__GLIBC__ > 2)
+				return 0;
+			#elif (__NEWLIB__ == 2 && __NEWLIB_MINOR__ >= 4) || (__GLIBC__ > 3)
+				return 0;
+			#else
+			#	error GNU C library __GLIBC__.__GLIBC_MINOR__ is too old
+			#endif
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:9795: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:9798: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:9801: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:9804: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  cf_cv_gnu_library_219=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+cf_cv_gnu_library_219=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+		CPPFLAGS="$cf_save"
+
+fi
+echo "$as_me:9816: result: $cf_cv_gnu_library_219" >&5
+echo "${ECHO_T}$cf_cv_gnu_library_219" >&6
+
+	if test "x$cf_cv_gnu_library_219" = xyes; then
+		cf_save="$CPPFLAGS"
+		echo "$as_me:9821: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
+echo $ECHO_N "checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE... $ECHO_C" >&6
+if test "${cf_cv_gnu_dftsrc_219+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+cf_fix_cppflags=no
+cf_new_cflags=
+cf_new_cppflags=
+cf_new_extra_cppflags=
+
+for cf_add_cflags in -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=$cf_gnu_xopen_source
+do
+case $cf_fix_cppflags in
+(no)
+	case $cf_add_cflags in
+	(-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
+		case $cf_add_cflags in
+		(-D*)
+			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+
+			test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
+				&& test -z "${cf_tst_cflags}" \
+				&& cf_fix_cppflags=yes
+
+			if test $cf_fix_cppflags = yes ; then
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
+				continue
+			elif test "${cf_tst_cflags}" = "\"'" ; then
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
+				continue
+			fi
+			;;
+		esac
+		case "$CPPFLAGS" in
+		(*$cf_add_cflags)
+			;;
+		(*)
+			case $cf_add_cflags in
+			(-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
+
+	test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+	cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+
+			;;
+		esac
+		;;
+	(*)
+
+	test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+	cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+
+		;;
+	esac
+	;;
+(yes)
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
+	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
+
+	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
+		&& test -z "${cf_tst_cflags}" \
+		&& cf_fix_cppflags=no
+	;;
+esac
+done
+
+if test -n "$cf_new_cflags" ; then
+
+	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+	CFLAGS="${CFLAGS}$cf_new_cflags"
+
+fi
+
+if test -n "$cf_new_cppflags" ; then
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+
+fi
+
+if test -n "$cf_new_extra_cppflags" ; then
+
+	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+
+fi
+
+			cat >conftest.$ac_ext <<_ACEOF
+#line 9926 "configure"
+#include "confdefs.h"
+
+				#include <limits.h>
+				#include <sys/types.h>
+
+int
+main (void)
+{
+
+				#if (_XOPEN_SOURCE >= $cf_gnu_xopen_source) && (MB_LEN_MAX > 1)
+					return 0;
+				#else
+				#	error GNU C library is too old
+				#endif
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:9946: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:9949: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:9952: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:9955: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  cf_cv_gnu_dftsrc_219=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+cf_cv_gnu_dftsrc_219=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+
+fi
+echo "$as_me:9966: result: $cf_cv_gnu_dftsrc_219" >&5
+echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
+		test "x$cf_cv_gnu_dftsrc_219" = "xyes" || CPPFLAGS="$cf_save"
+	else
+		cf_cv_gnu_dftsrc_219=maybe
+	fi
+
+	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
+
+		echo "$as_me:9975: 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 9289 "configure"
+		cat >conftest.$ac_ext <<_ACEOF
+#line 9982 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
 main (void)
 {
 
-#ifndef _XOPEN_SOURCE
-make an error
-#endif
+			#ifndef _XOPEN_SOURCE
+			#error	expected _XOPEN_SOURCE to be defined
+			#endif
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9304: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9997: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9307: \$? = $ac_status" >&5
+  echo "$as_me:10000: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9310: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10003: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9313: \$? = $ac_status" >&5
+  echo "$as_me:10006: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_gnu_source=no
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cf_save="$CPPFLAGS"
-	 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
-	 cat >conftest.$ac_ext <<_ACEOF
-#line 9322 "configure"
+
+cf_fix_cppflags=no
+cf_new_cflags=
+cf_new_cppflags=
+cf_new_extra_cppflags=
+
+for cf_add_cflags in -D_GNU_SOURCE
+do
+case $cf_fix_cppflags in
+(no)
+	case $cf_add_cflags in
+	(-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
+		case $cf_add_cflags in
+		(-D*)
+			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+
+			test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
+				&& test -z "${cf_tst_cflags}" \
+				&& cf_fix_cppflags=yes
+
+			if test $cf_fix_cppflags = yes ; then
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
+				continue
+			elif test "${cf_tst_cflags}" = "\"'" ; then
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
+				continue
+			fi
+			;;
+		esac
+		case "$CPPFLAGS" in
+		(*$cf_add_cflags)
+			;;
+		(*)
+			case $cf_add_cflags in
+			(-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
+
+	test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+	cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+
+			;;
+		esac
+		;;
+	(*)
+
+	test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+	cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+
+		;;
+	esac
+	;;
+(yes)
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
+	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
+
+	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
+		&& test -z "${cf_tst_cflags}" \
+		&& cf_fix_cppflags=no
+	;;
+esac
+done
+
+if test -n "$cf_new_cflags" ; then
+
+	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+	CFLAGS="${CFLAGS}$cf_new_cflags"
+
+fi
+
+if test -n "$cf_new_cppflags" ; then
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+
+fi
+
+if test -n "$cf_new_extra_cppflags" ; then
+
+	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+
+fi
+
+			 cat >conftest.$ac_ext <<_ACEOF
+#line 10113 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
 main (void)
 {
 
-#ifdef _XOPEN_SOURCE
-make an error
-#endif
+				#ifdef _XOPEN_SOURCE
+				#error	expected _XOPEN_SOURCE to be undefined
+				#endif
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9337: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10128: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9340: \$? = $ac_status" >&5
+  echo "$as_me:10131: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9343: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10134: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9346: \$? = $ac_status" >&5
+  echo "$as_me:10137: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_gnu_source=no
 else
@@ -9352,50 +10143,52 @@ cat conftest.$ac_ext >&5
 cf_cv_gnu_source=yes
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-	CPPFLAGS="$cf_save"
+			CPPFLAGS="$cf_save"
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:9361: result: $cf_cv_gnu_source" >&5
+echo "$as_me:10152: result: $cf_cv_gnu_source" >&5
 echo "${ECHO_T}$cf_cv_gnu_source" >&6
 
-if test "$cf_cv_gnu_source" = yes
-then
-echo "$as_me:9366: checking if we should also define _DEFAULT_SOURCE" >&5
+		if test "$cf_cv_gnu_source" = yes
+		then
+		echo "$as_me:10157: checking if we should also define _DEFAULT_SOURCE" >&5
 echo $ECHO_N "checking if we should also define _DEFAULT_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_default_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
-	cat >conftest.$ac_ext <<_ACEOF
-#line 9374 "configure"
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
+
+			cat >conftest.$ac_ext <<_ACEOF
+#line 10167 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
 main (void)
 {
 
-#ifdef _DEFAULT_SOURCE
-make an error
-#endif
+				#ifdef _DEFAULT_SOURCE
+				#error	expected _DEFAULT_SOURCE to be undefined
+				#endif
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9389: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10182: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9392: \$? = $ac_status" >&5
+  echo "$as_me:10185: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9395: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10188: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9398: \$? = $ac_status" >&5
+  echo "$as_me:10191: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_default_source=no
 else
@@ -9406,9 +10199,18 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:9409: result: $cf_cv_default_source" >&5
+echo "$as_me:10202: result: $cf_cv_default_source" >&5
 echo "${ECHO_T}$cf_cv_default_source" >&6
-test "$cf_cv_default_source" = yes && CPPFLAGS="$CPPFLAGS -D_DEFAULT_SOURCE"
+			if test "$cf_cv_default_source" = yes
+			then
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
+
+			fi
+		fi
+	fi
+
 fi
 
 	;;
@@ -9419,6 +10221,8 @@ fi
 	# setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <sys/select.h> and other headers which use u_int / u_short types
 	cf_XOPEN_SOURCE=
 
+if test "$cf_cv_posix_visible" = no; then
+
 cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE
 
 cf_save_CFLAGS="$CFLAGS"
@@ -9432,16 +10236,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:9435: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:10239: 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}:9441: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:10245: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 9444 "configure"
+#line 10248 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -9456,16 +10260,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9459: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10263: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9462: \$? = $ac_status" >&5
+  echo "$as_me:10266: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9465: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10269: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9468: \$? = $ac_status" >&5
+  echo "$as_me:10272: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -9486,7 +10290,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >conftest.$ac_ext <<_ACEOF
-#line 9489 "configure"
+#line 10293 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -9501,16 +10305,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9504: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10308: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9507: \$? = $ac_status" >&5
+  echo "$as_me:10311: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9510: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10314: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9513: \$? = $ac_status" >&5
+  echo "$as_me:10317: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9521,15 +10325,18 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 	 fi
 
-echo "${as_me:-configure}:9524: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:10328: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
-	 CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
+	 CPPFLAGS="$cf_trim_CPPFLAGS"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:9529: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:10336: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 9532 "configure"
+#line 10339 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -9544,16 +10351,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9547: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10354: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9550: \$? = $ac_status" >&5
+  echo "$as_me:10357: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9553: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10360: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9556: \$? = $ac_status" >&5
+  echo "$as_me:10363: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9569,7 +10376,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:9572: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:10379: 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
@@ -9676,6 +10483,8 @@ fi
 
 fi
 
+fi # cf_cv_posix_visible
+
 	;;
 (netbsd*)
 	cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw
@@ -9707,14 +10516,14 @@ fi
 	;;
 (*)
 
-echo "$as_me:9710: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:10519: 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 9717 "configure"
+#line 10526 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -9733,25 +10542,28 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9736: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10545: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9739: \$? = $ac_status" >&5
+  echo "$as_me:10548: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9742: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10551: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9745: \$? = $ac_status" >&5
+  echo "$as_me:10554: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cf_save="$CPPFLAGS"
-	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 9754 "configure"
+#line 10566 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -9770,16 +10582,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9773: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10585: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9776: \$? = $ac_status" >&5
+  echo "$as_me:10588: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9779: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10591: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9782: \$? = $ac_status" >&5
+  echo "$as_me:10594: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
@@ -9794,7 +10606,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:9797: result: $cf_cv_xopen_source" >&5
+echo "$as_me:10609: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -9909,6 +10721,8 @@ fi
 
 fi
 
+if test "$cf_cv_posix_visible" = no; then
+
 cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE
 
 cf_save_CFLAGS="$CFLAGS"
@@ -9922,16 +10736,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:9925: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:10739: 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}:9931: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:10745: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 9934 "configure"
+#line 10748 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -9946,16 +10760,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9949: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10763: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9952: \$? = $ac_status" >&5
+  echo "$as_me:10766: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9955: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10769: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9958: \$? = $ac_status" >&5
+  echo "$as_me:10772: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -9976,7 +10790,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >conftest.$ac_ext <<_ACEOF
-#line 9979 "configure"
+#line 10793 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -9991,16 +10805,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9994: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10808: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9997: \$? = $ac_status" >&5
+  echo "$as_me:10811: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10000: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10814: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10003: \$? = $ac_status" >&5
+  echo "$as_me:10817: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -10011,15 +10825,18 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 	 fi
 
-echo "${as_me:-configure}:10014: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:10828: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
-	 CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
+	 CPPFLAGS="$cf_trim_CPPFLAGS"
 
-echo "${as_me:-configure}:10019: testing if the second compile does not leave our definition intact error ..." 1>&5
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
+
+echo "${as_me:-configure}:10836: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 10022 "configure"
+#line 10839 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10034,16 +10851,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10037: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10854: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10040: \$? = $ac_status" >&5
+  echo "$as_me:10857: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10043: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10860: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10046: \$? = $ac_status" >&5
+  echo "$as_me:10863: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -10059,7 +10876,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:10062: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:10879: 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
@@ -10166,6 +10983,8 @@ fi
 
 fi
 
+fi # cf_cv_posix_visible
+
 	;;
 esac
 
@@ -10251,7 +11070,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}:10254: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:11073: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -10261,7 +11080,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}:10264: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:11083: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -10271,7 +11090,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:10274: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:11093: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
 
 	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
 	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
@@ -10281,10 +11100,10 @@ fi
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-	echo "$as_me:10284: checking if _XOPEN_SOURCE really is set" >&5
+	echo "$as_me:11103: 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 10287 "configure"
+#line 11106 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -10299,16 +11118,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10302: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11121: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10305: \$? = $ac_status" >&5
+  echo "$as_me:11124: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10308: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11127: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10311: \$? = $ac_status" >&5
+  echo "$as_me:11130: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else
@@ -10317,12 +11136,12 @@ cat conftest.$ac_ext >&5
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-	echo "$as_me:10320: result: $cf_XOPEN_SOURCE_set" >&5
+	echo "$as_me:11139: 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 10325 "configure"
+#line 11144 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -10337,16 +11156,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10340: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11159: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10343: \$? = $ac_status" >&5
+  echo "$as_me:11162: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10346: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11165: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10349: \$? = $ac_status" >&5
+  echo "$as_me:11168: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_XOPEN_SOURCE_set_ok=yes
 else
@@ -10357,19 +11176,19 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 		if test $cf_XOPEN_SOURCE_set_ok = no
 		then
-			{ echo "$as_me:10360: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+			{ echo "$as_me:11179: WARNING: _XOPEN_SOURCE is lower than requested" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
 		fi
 	else
 
-echo "$as_me:10365: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:11184: 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 10372 "configure"
+#line 11191 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -10388,25 +11207,28 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10391: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11210: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10394: \$? = $ac_status" >&5
+  echo "$as_me:11213: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10397: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11216: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10400: \$? = $ac_status" >&5
+  echo "$as_me:11219: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cf_save="$CPPFLAGS"
-	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 10409 "configure"
+#line 11231 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -10425,16 +11247,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10428: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11250: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10431: \$? = $ac_status" >&5
+  echo "$as_me:11253: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10434: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11256: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10437: \$? = $ac_status" >&5
+  echo "$as_me:11259: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
@@ -10449,7 +11271,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:10452: result: $cf_cv_xopen_source" >&5
+echo "$as_me:11274: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -10566,15 +11388,16 @@ fi
 
 	fi
 fi
+fi # cf_cv_posix_visible
 
-echo "$as_me:10570: checking if SIGWINCH is defined" >&5
+echo "$as_me:11393: 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 10577 "configure"
+#line 11400 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -10589,23 +11412,23 @@ int x = SIGWINCH
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10592: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11415: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10595: \$? = $ac_status" >&5
+  echo "$as_me:11418: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10598: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11421: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10601: \$? = $ac_status" >&5
+  echo "$as_me:11424: \$? = $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 10608 "configure"
+#line 11431 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -10623,16 +11446,16 @@ int x = SIGWINCH
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10626: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11449: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10629: \$? = $ac_status" >&5
+  echo "$as_me:11452: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10632: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11455: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10635: \$? = $ac_status" >&5
+  echo "$as_me:11458: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_define_sigwinch=maybe
 else
@@ -10646,11 +11469,11 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:10649: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:11472: 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:10653: checking for actual SIGWINCH definition" >&5
+echo "$as_me:11476: 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
@@ -10661,7 +11484,7 @@ cf_sigwinch=32
 while test $cf_sigwinch != 1
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 10664 "configure"
+#line 11487 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -10683,16 +11506,16 @@ int x = SIGWINCH
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10686: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11509: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10689: \$? = $ac_status" >&5
+  echo "$as_me:11512: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10692: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11515: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10695: \$? = $ac_status" >&5
+  echo "$as_me:11518: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fixup_sigwinch=$cf_sigwinch
 	 break
@@ -10706,7 +11529,7 @@ cf_sigwinch=`expr $cf_sigwinch - 1`
 done
 
 fi
-echo "$as_me:10709: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:11532: result: $cf_cv_fixup_sigwinch" >&5
 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
 
 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
@@ -10718,7 +11541,7 @@ if test -n "$TRY_CFLAGS" ; then
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:10721: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:11544: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -10803,7 +11626,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}:10806: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:11629: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -10813,7 +11636,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}:10816: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:11639: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -10823,7 +11646,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:10826: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:11649: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
 
 	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
 	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
@@ -10832,7 +11655,7 @@ fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 10835 "configure"
+#line 11658 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10844,16 +11667,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10847: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11670: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10850: \$? = $ac_status" >&5
+  echo "$as_me:11673: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10853: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11676: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10856: \$? = $ac_status" >&5
+  echo "$as_me:11679: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -10861,12 +11684,12 @@ else
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:10864: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:11687: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
 
 	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:10869: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:11692: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_flags"
@@ -10878,7 +11701,7 @@ fi
 
 ### Look for network libraries first, since some functions (such as gethostname)
 ### are used in a lot of places.
-echo "$as_me:10881: checking if you want NSS compatible SSL libraries" >&5
+echo "$as_me:11704: 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
@@ -10893,10 +11716,10 @@ else
 fi;
 
 fi
-echo "$as_me:10896: result: $cf_cv_use_libnss_compat" >&5
+echo "$as_me:11719: result: $cf_cv_use_libnss_compat" >&5
 echo "${ECHO_T}$cf_cv_use_libnss_compat" >&6
 
-echo "$as_me:10899: checking if you want ssl library" >&5
+echo "$as_me:11722: 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
@@ -10911,10 +11734,10 @@ else
 fi;
 
 fi
-echo "$as_me:10914: result: $cf_cv_use_libssl" >&5
+echo "$as_me:11737: result: $cf_cv_use_libssl" >&5
 echo "${ECHO_T}$cf_cv_use_libssl" >&6
 
-echo "$as_me:10917: checking if you want gnutls support" >&5
+echo "$as_me:11740: 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
@@ -10929,11 +11752,11 @@ else
 fi;
 
 fi
-echo "$as_me:10932: result: $cf_cv_use_libgnutls" >&5
+echo "$as_me:11755: 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:10936: checking if you want gnutls-openssl compat" >&5
+echo "$as_me:11759: 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
@@ -10948,10 +11771,10 @@ else
 fi;
 
 fi
-echo "$as_me:10951: result: $cf_cv_gnutls_compat" >&5
+echo "$as_me:11774: result: $cf_cv_gnutls_compat" >&5
 echo "${ECHO_T}$cf_cv_gnutls_compat" >&6
 
-echo "$as_me:10954: checking if you want socks library" >&5
+echo "$as_me:11777: 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
@@ -10966,10 +11789,10 @@ else
 fi;
 
 fi
-echo "$as_me:10969: result: $cf_cv_use_libsocks" >&5
+echo "$as_me:11792: result: $cf_cv_use_libsocks" >&5
 echo "${ECHO_T}$cf_cv_use_libsocks" >&6
 
-echo "$as_me:10972: checking if you want socks5 library" >&5
+echo "$as_me:11795: 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
@@ -10984,7 +11807,7 @@ else
 fi;
 
 fi
-echo "$as_me:10987: result: $cf_cv_use_libsocks5" >&5
+echo "$as_me:11810: result: $cf_cv_use_libsocks5" >&5
 echo "${ECHO_T}$cf_cv_use_libsocks5" >&6
 
 if test "x$cf_cv_use_libsocks" != xno ; then
@@ -11021,9 +11844,12 @@ if test -n "$cf_searchpath/include" ; then
 			if test "$GCC" = yes
 			then
 			  cf_save_CPPFLAGS=$CPPFLAGS
-			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 11026 "configure"
+#line 11852 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11035,16 +11861,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11038: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11864: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11041: \$? = $ac_status" >&5
+  echo "$as_me:11867: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11044: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11870: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11047: \$? = $ac_status" >&5
+  echo "$as_me:11873: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11061,7 +11887,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}:11064: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11890: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -11102,9 +11928,12 @@ if test -n "$cf_searchpath/../include" ; then
 			if test "$GCC" = yes
 			then
 			  cf_save_CPPFLAGS=$CPPFLAGS
-			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 11107 "configure"
+#line 11936 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11116,16 +11945,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11119: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11948: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11122: \$? = $ac_status" >&5
+  echo "$as_me:11951: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11125: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11954: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11128: \$? = $ac_status" >&5
+  echo "$as_me:11957: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11142,7 +11971,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}:11145: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11974: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -11160,7 +11989,7 @@ echo "${as_me:-configure}:11145: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:11163: error: cannot find socks library under $cf_cv_use_libsocks" >&5
+{ { echo "$as_me:11992: 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
@@ -11185,7 +12014,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}:11188: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:12017: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -11214,7 +12043,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}:11217: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:12046: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -11223,7 +12052,7 @@ echo "${as_me:-configure}:11217: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:11226: error: cannot find socks library under $cf_cv_use_libsocks" >&5
+{ { echo "$as_me:12055: 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
@@ -11237,12 +12066,12 @@ esac
 cf_cv_header_path_socks=
 cf_cv_library_path_socks=
 
-echo "${as_me:-configure}:11240: testing Starting FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me:-configure}:12069: testing Starting FIND_LINKAGE(socks,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 11245 "configure"
+#line 12074 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -11258,16 +12087,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11261: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12090: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11264: \$? = $ac_status" >&5
+  echo "$as_me:12093: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11267: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12096: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11270: \$? = $ac_status" >&5
+  echo "$as_me:12099: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_socks=yes
@@ -11281,7 +12110,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lsocks  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 11284 "configure"
+#line 12113 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -11297,16 +12126,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11300: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12129: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11303: \$? = $ac_status" >&5
+  echo "$as_me:12132: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11306: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12135: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11309: \$? = $ac_status" >&5
+  echo "$as_me:12138: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_socks=yes
@@ -11323,9 +12152,9 @@ cat conftest.$ac_ext >&5
 
 	test -n "$verbose" && echo "	find linkage for socks library" 1>&6
 
-echo "${as_me:-configure}:11326: testing find linkage for socks library ..." 1>&5
+echo "${as_me:-configure}:12155: testing find linkage for socks library ..." 1>&5
 
-echo "${as_me:-configure}:11328: testing Searching for headers in FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me:-configure}:12157: testing Searching for headers in FIND_LINKAGE(socks,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -11416,11 +12245,15 @@ 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}:11419: testing ... testing $cf_cv_header_path_socks ..." 1>&5
+echo "${as_me:-configure}:12248: testing ... testing $cf_cv_header_path_socks ..." 1>&5
+
+			CPPFLAGS="$cf_save_CPPFLAGS"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_socks"
 
-			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_socks"
 			cat >conftest.$ac_ext <<_ACEOF
-#line 11423 "configure"
+#line 12256 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -11436,21 +12269,21 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11439: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12272: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11442: \$? = $ac_status" >&5
+  echo "$as_me:12275: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11445: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12278: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11448: \$? = $ac_status" >&5
+  echo "$as_me:12281: \$? = $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}:11453: testing ... found socks headers in $cf_cv_header_path_socks ..." 1>&5
+echo "${as_me:-configure}:12286: testing ... found socks headers in $cf_cv_header_path_socks ..." 1>&5
 
 				cf_cv_find_linkage_socks=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -11468,7 +12301,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "$cf_cv_find_linkage_socks" = maybe ; then
 
-echo "${as_me:-configure}:11471: testing Searching for socks library in FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me:-configure}:12304: testing Searching for socks library in FIND_LINKAGE(socks,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -11543,13 +12376,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}:11546: testing ... testing $cf_cv_library_path_socks ..." 1>&5
+echo "${as_me:-configure}:12379: 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 11552 "configure"
+#line 12385 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -11565,21 +12398,21 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11568: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12401: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11571: \$? = $ac_status" >&5
+  echo "$as_me:12404: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11574: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12407: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11577: \$? = $ac_status" >&5
+  echo "$as_me:12410: \$? = $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}:11582: testing ... found socks library in $cf_cv_library_path_socks ..." 1>&5
+echo "${as_me:-configure}:12415: testing ... found socks library in $cf_cv_library_path_socks ..." 1>&5
 
 					cf_cv_find_linkage_socks=yes
 					cf_cv_library_file_socks="-lsocks"
@@ -11636,9 +12469,12 @@ if test -n "$cf_cv_header_path_socks" ; then
 			if test "$GCC" = yes
 			then
 			  cf_save_CPPFLAGS=$CPPFLAGS
-			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 11641 "configure"
+#line 12477 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11650,16 +12486,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11653: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12489: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11656: \$? = $ac_status" >&5
+  echo "$as_me:12492: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11659: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12495: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11662: \$? = $ac_status" >&5
+  echo "$as_me:12498: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11676,7 +12512,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}:11679: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:12515: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -11712,7 +12548,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}:11715: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:12551: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -11737,7 +12573,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:11740: WARNING: Cannot find socks library" >&5
+{ echo "$as_me:12576: WARNING: Cannot find socks library" >&5
 echo "$as_me: WARNING: Cannot find socks library" >&2;}
 fi
 
@@ -11780,7 +12616,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
   else
-    { { echo "$as_me:11783: error: cannot link with socks library" >&5
+    { { echo "$as_me:12619: error: cannot link with socks library" >&5
 echo "$as_me: error: cannot link with socks library" >&2;}
    { (exit 1); exit 1; }; }
   fi
@@ -11819,9 +12655,12 @@ if test -n "$cf_searchpath/include" ; then
 			if test "$GCC" = yes
 			then
 			  cf_save_CPPFLAGS=$CPPFLAGS
-			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 11824 "configure"
+#line 12663 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11833,16 +12672,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11836: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12675: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11839: \$? = $ac_status" >&5
+  echo "$as_me:12678: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11842: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12681: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11845: \$? = $ac_status" >&5
+  echo "$as_me:12684: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11859,7 +12698,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}:11862: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:12701: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -11900,9 +12739,12 @@ if test -n "$cf_searchpath/../include" ; then
 			if test "$GCC" = yes
 			then
 			  cf_save_CPPFLAGS=$CPPFLAGS
-			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 11905 "configure"
+#line 12747 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11914,16 +12756,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11917: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12759: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11920: \$? = $ac_status" >&5
+  echo "$as_me:12762: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11923: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12765: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11926: \$? = $ac_status" >&5
+  echo "$as_me:12768: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11940,7 +12782,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}:11943: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:12785: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -11958,7 +12800,7 @@ echo "${as_me:-configure}:11943: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:11961: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5
+{ { echo "$as_me:12803: 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
@@ -11983,7 +12825,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}:11986: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:12828: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -12012,7 +12854,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}:12015: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:12857: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -12021,7 +12863,7 @@ echo "${as_me:-configure}:12015: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:12024: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5
+{ { echo "$as_me:12866: 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
@@ -12054,11 +12896,11 @@ cat >>confdefs.h <<\EOF
 #define SOCKS 1
 EOF
 
-echo "$as_me:12057: checking if the socks library uses socks4 prefix" >&5
+echo "$as_me:12899: 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 12061 "configure"
+#line 12903 "configure"
 #include "confdefs.h"
 
 #include <socks.h>
@@ -12072,16 +12914,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12075: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12917: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12078: \$? = $ac_status" >&5
+  echo "$as_me:12920: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12081: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12923: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12084: \$? = $ac_status" >&5
+  echo "$as_me:12926: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >>confdefs.h <<\EOF
@@ -12093,7 +12935,7 @@ else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 12096 "configure"
+#line 12938 "configure"
 #include "confdefs.h"
 #include <socks.h>
 int
@@ -12105,29 +12947,29 @@ SOCKSinit((char *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12108: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12950: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12111: \$? = $ac_status" >&5
+  echo "$as_me:12953: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12114: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12956: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12117: \$? = $ac_status" >&5
+  echo "$as_me:12959: \$? = $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:12123: error: Cannot link with socks5 library" >&5
+{ { echo "$as_me:12965: 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:12130: result: $cf_use_socks4" >&5
+echo "$as_me:12972: result: $cf_use_socks4" >&5
 echo "${ECHO_T}$cf_use_socks4" >&6
 
 if test "$cf_use_socks4" = "yes" ; then
@@ -12182,10 +13024,10 @@ EOF
 
 fi
 
-echo "$as_me:12185: checking if socks5p.h is available" >&5
+echo "$as_me:13027: 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 12188 "configure"
+#line 13030 "configure"
 #include "confdefs.h"
 
 #define INCLUDE_PROTOTYPES
@@ -12200,16 +13042,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12203: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13045: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12206: \$? = $ac_status" >&5
+  echo "$as_me:13048: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12209: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13051: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12212: \$? = $ac_status" >&5
+  echo "$as_me:13054: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_use_socks5p_h=yes
 else
@@ -12218,7 +13060,7 @@ cat conftest.$ac_ext >&5
 cf_use_socks5p_h=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:12221: result: $cf_use_socks5p_h" >&5
+echo "$as_me:13063: result: $cf_use_socks5p_h" >&5
 echo "${ECHO_T}$cf_use_socks5p_h" >&6
 
 test "$cf_use_socks5p_h" = yes &&
@@ -12230,14 +13072,14 @@ else
 
 cf_test_netlibs=no
 
-echo "$as_me:12233: checking for network libraries" >&5
+echo "$as_me:13075: 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:12240: result: working..." >&5
+echo "$as_me:13082: result: working..." >&5
 echo "${ECHO_T}working..." >&6
 
 cf_cv_netlibs=""
@@ -12249,23 +13091,23 @@ case $host_os in
 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:12252: checking for $ac_header" >&5
+echo "$as_me:13094: 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 12258 "configure"
+#line 13100 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:12262: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:13104: \"$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:12268: \$? = $ac_status" >&5
+  echo "$as_me:13110: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12284,7 +13126,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:12287: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:13129: 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
@@ -12319,7 +13161,7 @@ done
 LIBS="$cf_add_libs"
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 12322 "configure"
+#line 13164 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_WINDOWS_H
@@ -12346,22 +13188,22 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12349: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13191: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12352: \$? = $ac_status" >&5
+  echo "$as_me:13194: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12355: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13197: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12358: \$? = $ac_status" >&5
+  echo "$as_me:13200: \$? = $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:12364: error: Cannot link against winsock library" >&5
+{ { echo "$as_me:13206: error: Cannot link against winsock library" >&5
 echo "$as_me: error: Cannot link against winsock library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -12374,13 +13216,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:12377: checking for $ac_func" >&5
+echo "$as_me:13219: 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 12383 "configure"
+#line 13225 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -12411,16 +13253,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12414: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13256: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12417: \$? = $ac_status" >&5
+  echo "$as_me:13259: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12420: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13262: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12423: \$? = $ac_status" >&5
+  echo "$as_me:13265: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -12430,7 +13272,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12433: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:13275: 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
@@ -12439,7 +13281,7 @@ EOF
 
 else
 
-echo "$as_me:12442: checking for gethostname in -lnsl" >&5
+echo "$as_me:13284: 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
@@ -12447,7 +13289,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12450 "configure"
+#line 13292 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12466,16 +13308,16 @@ gethostname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12469: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13311: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12472: \$? = $ac_status" >&5
+  echo "$as_me:13314: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12475: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13317: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12478: \$? = $ac_status" >&5
+  echo "$as_me:13320: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostname=yes
 else
@@ -12486,7 +13328,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12489: result: $ac_cv_lib_nsl_gethostname" >&5
+echo "$as_me:13331: 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
 
@@ -12503,7 +13345,7 @@ else
 	ac_cv_func_gethostname=unknown
 	unset ac_cv_func_gethostname 2>/dev/null
 
-echo "$as_me:12506: checking for gethostname in -lsocket" >&5
+echo "$as_me:13348: 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
@@ -12511,7 +13353,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12514 "configure"
+#line 13356 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12530,16 +13372,16 @@ gethostname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12533: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13375: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12536: \$? = $ac_status" >&5
+  echo "$as_me:13378: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12539: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13381: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12542: \$? = $ac_status" >&5
+  echo "$as_me:13384: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_gethostname=yes
 else
@@ -12550,7 +13392,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12553: result: $ac_cv_lib_socket_gethostname" >&5
+echo "$as_me:13395: 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
 
@@ -12574,7 +13416,7 @@ fi
 fi
 done
 
-	echo "$as_me:12577: checking for main in -linet" >&5
+	echo "$as_me:13419: 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
@@ -12582,7 +13424,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-linet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12585 "configure"
+#line 13427 "configure"
 #include "confdefs.h"
 
 int
@@ -12594,16 +13436,16 @@ main ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12597: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13439: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12600: \$? = $ac_status" >&5
+  echo "$as_me:13442: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12603: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13445: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12606: \$? = $ac_status" >&5
+  echo "$as_me:13448: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_inet_main=yes
 else
@@ -12614,7 +13456,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12617: result: $ac_cv_lib_inet_main" >&5
+echo "$as_me:13459: 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"
@@ -12625,13 +13467,13 @@ fi
 for ac_func in socket
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:12628: checking for $ac_func" >&5
+echo "$as_me:13470: 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 12634 "configure"
+#line 13476 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -12662,16 +13504,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12665: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13507: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12668: \$? = $ac_status" >&5
+  echo "$as_me:13510: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12671: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13513: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12674: \$? = $ac_status" >&5
+  echo "$as_me:13516: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -12681,7 +13523,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12684: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:13526: 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
@@ -12690,7 +13532,7 @@ EOF
 
 else
 
-echo "$as_me:12693: checking for socket in -lsocket" >&5
+echo "$as_me:13535: 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
@@ -12698,7 +13540,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12701 "configure"
+#line 13543 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12717,16 +13559,16 @@ socket ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12720: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13562: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12723: \$? = $ac_status" >&5
+  echo "$as_me:13565: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12726: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13568: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12729: \$? = $ac_status" >&5
+  echo "$as_me:13571: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_socket=yes
 else
@@ -12737,7 +13579,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12740: result: $ac_cv_lib_socket_socket" >&5
+echo "$as_me:13582: 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
 
@@ -12754,7 +13596,7 @@ else
 	ac_cv_func_socket=unknown
 	unset ac_cv_func_socket 2>/dev/null
 
-echo "$as_me:12757: checking for socket in -lbsd" >&5
+echo "$as_me:13599: 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
@@ -12762,7 +13604,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12765 "configure"
+#line 13607 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12781,16 +13623,16 @@ socket ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12784: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13626: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12787: \$? = $ac_status" >&5
+  echo "$as_me:13629: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12790: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13632: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12793: \$? = $ac_status" >&5
+  echo "$as_me:13635: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_bsd_socket=yes
 else
@@ -12801,7 +13643,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12804: result: $ac_cv_lib_bsd_socket" >&5
+echo "$as_me:13646: 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
 
@@ -12830,13 +13672,13 @@ done
 for ac_func in gethostbyname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:12833: checking for $ac_func" >&5
+echo "$as_me:13675: 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 12839 "configure"
+#line 13681 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -12867,16 +13709,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12870: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13712: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12873: \$? = $ac_status" >&5
+  echo "$as_me:13715: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12876: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13718: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12879: \$? = $ac_status" >&5
+  echo "$as_me:13721: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -12886,7 +13728,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12889: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:13731: 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
@@ -12895,7 +13737,7 @@ EOF
 
 else
 
-echo "$as_me:12898: checking for gethostbyname in -lnsl" >&5
+echo "$as_me:13740: 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
@@ -12903,7 +13745,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12906 "configure"
+#line 13748 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12922,16 +13764,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12925: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13767: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12928: \$? = $ac_status" >&5
+  echo "$as_me:13770: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12931: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13773: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12934: \$? = $ac_status" >&5
+  echo "$as_me:13776: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -12942,7 +13784,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12945: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:13787: 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
 
@@ -12967,13 +13809,13 @@ done
 for ac_func in inet_ntoa
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:12970: checking for $ac_func" >&5
+echo "$as_me:13812: 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 12976 "configure"
+#line 13818 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -13004,16 +13846,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13007: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13849: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13010: \$? = $ac_status" >&5
+  echo "$as_me:13852: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13013: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13855: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13016: \$? = $ac_status" >&5
+  echo "$as_me:13858: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -13023,7 +13865,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:13026: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:13868: 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
@@ -13032,7 +13874,7 @@ EOF
 
 else
 
-echo "$as_me:13035: checking for inet_ntoa in -lnsl" >&5
+echo "$as_me:13877: 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
@@ -13040,7 +13882,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 13043 "configure"
+#line 13885 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13059,16 +13901,16 @@ inet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13062: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13904: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13065: \$? = $ac_status" >&5
+  echo "$as_me:13907: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13068: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13910: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13071: \$? = $ac_status" >&5
+  echo "$as_me:13913: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_inet_ntoa=yes
 else
@@ -13079,7 +13921,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13082: result: $ac_cv_lib_nsl_inet_ntoa" >&5
+echo "$as_me:13924: 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
 
@@ -13104,13 +13946,13 @@ done
 for ac_func in gethostbyname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:13107: checking for $ac_func" >&5
+echo "$as_me:13949: 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 13113 "configure"
+#line 13955 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -13141,16 +13983,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13144: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13986: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13147: \$? = $ac_status" >&5
+  echo "$as_me:13989: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13150: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13992: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13153: \$? = $ac_status" >&5
+  echo "$as_me:13995: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -13160,7 +14002,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:13163: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:14005: 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
@@ -13169,7 +14011,7 @@ EOF
 
 else
 
-echo "$as_me:13172: checking for gethostbyname in -lnetwork" >&5
+echo "$as_me:14014: 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
@@ -13177,7 +14019,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnetwork $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 13180 "configure"
+#line 14022 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13196,16 +14038,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13199: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14041: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13202: \$? = $ac_status" >&5
+  echo "$as_me:14044: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13205: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14047: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13208: \$? = $ac_status" >&5
+  echo "$as_me:14050: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_network_gethostbyname=yes
 else
@@ -13216,7 +14058,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13219: result: $ac_cv_lib_network_gethostbyname" >&5
+echo "$as_me:14061: 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
 
@@ -13241,13 +14083,13 @@ done
 for ac_func in strcasecmp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:13244: checking for $ac_func" >&5
+echo "$as_me:14086: 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 13250 "configure"
+#line 14092 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -13278,16 +14120,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13281: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14123: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13284: \$? = $ac_status" >&5
+  echo "$as_me:14126: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13287: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14129: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13290: \$? = $ac_status" >&5
+  echo "$as_me:14132: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -13297,7 +14139,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:13300: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:14142: 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
@@ -13306,7 +14148,7 @@ EOF
 
 else
 
-echo "$as_me:13309: checking for strcasecmp in -lresolv" >&5
+echo "$as_me:14151: 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
@@ -13314,7 +14156,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 13317 "configure"
+#line 14159 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13333,16 +14175,16 @@ strcasecmp ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13336: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14178: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13339: \$? = $ac_status" >&5
+  echo "$as_me:14181: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13342: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14184: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13345: \$? = $ac_status" >&5
+  echo "$as_me:14187: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_resolv_strcasecmp=yes
 else
@@ -13353,7 +14195,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13356: result: $ac_cv_lib_resolv_strcasecmp" >&5
+echo "$as_me:14198: 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
 
@@ -13410,14 +14252,14 @@ test $cf_test_netlibs = no && echo "$cf_cv_netlibs" >&6
 
 fi
 
-echo "$as_me:13413: checking for inet_aton function" >&5
+echo "$as_me:14255: 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 13420 "configure"
+#line 14262 "configure"
 #include "confdefs.h"
 
 #if defined(__MINGW32__)
@@ -13452,16 +14294,16 @@ inet_aton(0, (struct in_addr *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13455: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14297: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13458: \$? = $ac_status" >&5
+  echo "$as_me:14300: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13461: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14303: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13464: \$? = $ac_status" >&5
+  echo "$as_me:14306: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_inet_aton=yes
 else
@@ -13471,7 +14313,7 @@ cf_cv_have_inet_aton=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:13474: result: $cf_cv_have_inet_aton" >&5
+echo "$as_me:14316: 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
 
@@ -13480,14 +14322,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-    echo "$as_me:13483: checking for inet_addr function" >&5
+    echo "$as_me:14325: 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 13490 "configure"
+#line 14332 "configure"
 #include "confdefs.h"
 
 #if defined(__MINGW32__)
@@ -13522,16 +14364,16 @@ inet_addr(0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13525: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14367: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13528: \$? = $ac_status" >&5
+  echo "$as_me:14370: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13531: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14373: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13534: \$? = $ac_status" >&5
+  echo "$as_me:14376: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_inet_addr=yes
 else
@@ -13541,10 +14383,10 @@ cf_cv_have_inet_addr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:13544: result: $cf_cv_have_inet_addr" >&5
+echo "$as_me:14386: 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:13547: checking for library with inet_addr" >&5
+	echo "$as_me:14389: 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
@@ -13555,7 +14397,7 @@ else
 	    do
 		LIBS="$cf_save_LIBS $cf_inetlib"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 13558 "configure"
+#line 14400 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -13571,16 +14413,16 @@ inet_addr(0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13574: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14416: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13577: \$? = $ac_status" >&5
+  echo "$as_me:14419: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13580: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14422: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13583: \$? = $ac_status" >&5
+  echo "$as_me:14425: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_lib_inet_addr=$cf_inetlib
 else
@@ -13594,7 +14436,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	    done
 
 fi
-echo "$as_me:13597: result: $cf_cv_lib_inet_addr" >&5
+echo "$as_me:14439: 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
 
@@ -13615,13 +14457,13 @@ done
 LIBS="$cf_add_libs"
 
 	else
-	    { echo "$as_me:13618: WARNING: Unable to find library for inet_addr function" >&5
+	    { echo "$as_me:14460: 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:13624: checking if you want to use pkg-config" >&5
+echo "$as_me:14466: 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.
@@ -13631,7 +14473,7 @@ if test "${with_pkg_config+set}" = set; then
 else
   cf_pkg_config=yes
 fi;
-echo "$as_me:13634: result: $cf_pkg_config" >&5
+echo "$as_me:14476: result: $cf_pkg_config" >&5
 echo "${ECHO_T}$cf_pkg_config" >&6
 
 case $cf_pkg_config in
@@ -13643,7 +14485,7 @@ case $cf_pkg_config in
 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:13646: checking for $ac_word" >&5
+echo "$as_me:14488: 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
@@ -13660,7 +14502,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:13663: found $ac_dir/$ac_word" >&5
+   echo "$as_me:14505: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -13671,10 +14513,10 @@ fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:13674: result: $PKG_CONFIG" >&5
+  echo "$as_me:14516: result: $PKG_CONFIG" >&5
 echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  echo "$as_me:13677: result: no" >&5
+  echo "$as_me:14519: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -13683,7 +14525,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:13686: checking for $ac_word" >&5
+echo "$as_me:14528: 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
@@ -13700,7 +14542,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:13703: found $ac_dir/$ac_word" >&5
+   echo "$as_me:14545: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -13712,10 +14554,10 @@ fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 
 if test -n "$ac_pt_PKG_CONFIG"; then
-  echo "$as_me:13715: result: $ac_pt_PKG_CONFIG" >&5
+  echo "$as_me:14557: result: $ac_pt_PKG_CONFIG" >&5
 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
 else
-  echo "$as_me:13718: result: no" >&5
+  echo "$as_me:14560: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -13758,14 +14600,14 @@ case ".$PKG_CONFIG" in
 	PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:13761: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+	{ { echo "$as_me:14603: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
 echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
 esac
 
 elif test "x$cf_pkg_config" != xno ; then
-	{ echo "$as_me:13768: WARNING: pkg-config is not installed" >&5
+	{ echo "$as_me:14610: WARNING: pkg-config is not installed" >&5
 echo "$as_me: WARNING: pkg-config is not installed" >&2;}
 fi
 
@@ -13808,9 +14650,12 @@ if test -n "$cf_searchpath/include" ; then
 			if test "$GCC" = yes
 			then
 			  cf_save_CPPFLAGS=$CPPFLAGS
-			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 13813 "configure"
+#line 14658 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13822,16 +14667,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13825: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14670: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13828: \$? = $ac_status" >&5
+  echo "$as_me:14673: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13831: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14676: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13834: \$? = $ac_status" >&5
+  echo "$as_me:14679: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -13848,7 +14693,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}:13851: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:14696: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -13889,9 +14734,12 @@ if test -n "$cf_searchpath/../include" ; then
 			if test "$GCC" = yes
 			then
 			  cf_save_CPPFLAGS=$CPPFLAGS
-			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 13894 "configure"
+#line 14742 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13903,16 +14751,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13906: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14754: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13909: \$? = $ac_status" >&5
+  echo "$as_me:14757: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13912: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14760: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13915: \$? = $ac_status" >&5
+  echo "$as_me:14763: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -13929,7 +14777,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me:-configure}:13932: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:14780: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -13947,7 +14795,7 @@ echo "${as_me:-configure}:13932: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:13950: error: cannot find ssl library under $cf_cv_use_libssl" >&5
+{ { echo "$as_me:14798: 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
@@ -13972,7 +14820,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}:13975: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:14823: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -14001,7 +14849,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}:14004: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:14852: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -14010,7 +14858,7 @@ echo "${as_me:-configure}:14004: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:14013: error: cannot find ssl library under $cf_cv_use_libssl" >&5
+{ { echo "$as_me:14861: 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
@@ -14027,15 +14875,15 @@ esac
 			cf_cv_pkg_ssl=
 			for cf_try_package in openssl libssl
 			do
-				echo "$as_me:14030: checking pkg-config for $cf_try_package" >&5
+				echo "$as_me:14878: checking pkg-config for $cf_try_package" >&5
 echo $ECHO_N "checking pkg-config for $cf_try_package... $ECHO_C" >&6
 				if "$PKG_CONFIG" --exists $cf_try_package ; then
 					cf_cv_pkg_ssl=$cf_try_package
-					echo "$as_me:14034: result: yes" >&5
+					echo "$as_me:14882: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 					break
 				else
-					echo "$as_me:14038: result: no" >&5
+					echo "$as_me:14886: result: no" >&5
 echo "${ECHO_T}no" >&6
 				fi
 			done
@@ -14179,7 +15027,7 @@ fi
 					esac
 					test -n "$verbose" && echo "	adding $cf_libs_ssl to LIBS" 1>&6
 
-echo "${as_me:-configure}:14182: testing adding $cf_libs_ssl to LIBS ..." 1>&5
+echo "${as_me:-configure}:15030: testing adding $cf_libs_ssl to LIBS ..." 1>&5
 
 cf_add_libs="$cf_libs_ssl"
 # Filter out duplicates - this happens with badly-designed ".pc" files...
@@ -14215,7 +15063,7 @@ LIBS="$cf_add_libs"
 			(*-ldl)
 				;;
 			(*)
-				echo "$as_me:14218: checking for dlsym in -ldl" >&5
+				echo "$as_me:15066: 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
@@ -14223,7 +15071,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 14226 "configure"
+#line 15074 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14242,16 +15090,16 @@ dlsym ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14245: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15093: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14248: \$? = $ac_status" >&5
+  echo "$as_me:15096: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14251: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15099: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14254: \$? = $ac_status" >&5
+  echo "$as_me:15102: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dl_dlsym=yes
 else
@@ -14262,7 +15110,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14265: result: $ac_cv_lib_dl_dlsym" >&5
+echo "$as_me:15113: 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"
@@ -14278,12 +15126,12 @@ fi
 cf_cv_header_path_ssl=
 cf_cv_library_path_ssl=
 
-echo "${as_me:-configure}:14281: testing Starting FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me:-configure}:15129: testing Starting FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 14286 "configure"
+#line 15134 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14312,16 +15160,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14315: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15163: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14318: \$? = $ac_status" >&5
+  echo "$as_me:15166: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14321: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15169: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14324: \$? = $ac_status" >&5
+  echo "$as_me:15172: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_ssl=yes
@@ -14335,7 +15183,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lssl $cf_extra_ssl_libs $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 14338 "configure"
+#line 15186 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14364,16 +15212,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14367: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15215: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14370: \$? = $ac_status" >&5
+  echo "$as_me:15218: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14373: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15221: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14376: \$? = $ac_status" >&5
+  echo "$as_me:15224: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_ssl=yes
@@ -14390,9 +15238,9 @@ cat conftest.$ac_ext >&5
 
 	test -n "$verbose" && echo "	find linkage for ssl library" 1>&6
 
-echo "${as_me:-configure}:14393: testing find linkage for ssl library ..." 1>&5
+echo "${as_me:-configure}:15241: testing find linkage for ssl library ..." 1>&5
 
-echo "${as_me:-configure}:14395: testing Searching for headers in FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me:-configure}:15243: testing Searching for headers in FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -14483,11 +15331,15 @@ 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}:14486: testing ... testing $cf_cv_header_path_ssl ..." 1>&5
+echo "${as_me:-configure}:15334: testing ... testing $cf_cv_header_path_ssl ..." 1>&5
+
+			CPPFLAGS="$cf_save_CPPFLAGS"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_ssl"
 
-			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_ssl"
 			cat >conftest.$ac_ext <<_ACEOF
-#line 14490 "configure"
+#line 15342 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14516,21 +15368,21 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14519: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15371: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14522: \$? = $ac_status" >&5
+  echo "$as_me:15374: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14525: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15377: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14528: \$? = $ac_status" >&5
+  echo "$as_me:15380: \$? = $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}:14533: testing ... found ssl headers in $cf_cv_header_path_ssl ..." 1>&5
+echo "${as_me:-configure}:15385: testing ... found ssl headers in $cf_cv_header_path_ssl ..." 1>&5
 
 				cf_cv_find_linkage_ssl=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -14548,7 +15400,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "$cf_cv_find_linkage_ssl" = maybe ; then
 
-echo "${as_me:-configure}:14551: testing Searching for ssl library in FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me:-configure}:15403: testing Searching for ssl library in FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -14556,7 +15408,7 @@ echo "${as_me:-configure}:14551: 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 14559 "configure"
+#line 15411 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14585,21 +15437,21 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14588: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15440: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14591: \$? = $ac_status" >&5
+  echo "$as_me:15443: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14594: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15446: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14597: \$? = $ac_status" >&5
+  echo "$as_me:15449: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 			test -n "$verbose" && echo "	... found ssl library in system" 1>&6
 
-echo "${as_me:-configure}:14602: testing ... found ssl library in system ..." 1>&5
+echo "${as_me:-configure}:15454: testing ... found ssl library in system ..." 1>&5
 
 			cf_cv_find_linkage_ssl=yes
 else
@@ -14680,13 +15532,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}:14683: testing ... testing $cf_cv_library_path_ssl ..." 1>&5
+echo "${as_me:-configure}:15535: 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 14689 "configure"
+#line 15541 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14715,21 +15567,21 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14718: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15570: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14721: \$? = $ac_status" >&5
+  echo "$as_me:15573: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14724: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15576: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14727: \$? = $ac_status" >&5
+  echo "$as_me:15579: \$? = $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}:14732: testing ... found ssl library in $cf_cv_library_path_ssl ..." 1>&5
+echo "${as_me:-configure}:15584: testing ... found ssl library in $cf_cv_library_path_ssl ..." 1>&5
 
 					cf_cv_find_linkage_ssl=yes
 					cf_cv_library_file_ssl="-lssl"
@@ -14791,7 +15643,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}:14794: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:15646: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -14845,9 +15697,12 @@ if test -n "$cf_cv_header_path_ssl" ; then
 			if test "$GCC" = yes
 			then
 			  cf_save_CPPFLAGS=$CPPFLAGS
-			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 14850 "configure"
+#line 15705 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14859,16 +15714,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14862: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15717: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14865: \$? = $ac_status" >&5
+  echo "$as_me:15720: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14868: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15723: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14871: \$? = $ac_status" >&5
+  echo "$as_me:15726: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -14885,7 +15740,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}:14888: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:15743: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -14918,7 +15773,7 @@ EOF
 		if test -n "$cf_cv_header_path_ssl" ; then
 			test -n "$verbose" && echo "	checking ssl header-path $cf_cv_header_path_ssl" 1>&6
 
-echo "${as_me:-configure}:14921: testing checking ssl header-path $cf_cv_header_path_ssl ..." 1>&5
+echo "${as_me:-configure}:15776: testing checking ssl header-path $cf_cv_header_path_ssl ..." 1>&5
 
 			case $cf_cv_header_path_ssl in
 			(*/openssl)
@@ -14931,10 +15786,10 @@ EOF
 			esac
 		fi
 
-echo "$as_me:14934: checking for X509 support" >&5
+echo "$as_me:15789: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 14937 "configure"
+#line 15792 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14963,16 +15818,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:14966: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15821: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14969: \$? = $ac_status" >&5
+  echo "$as_me:15824: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14972: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15827: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14975: \$? = $ac_status" >&5
+  echo "$as_me:15830: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_x509_support=yes
 else
@@ -14981,7 +15836,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:14984: result: $cf_x509_support" >&5
+echo "$as_me:15839: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 
 if test "$cf_x509_support" = yes ; then
@@ -15031,9 +15886,12 @@ if test -n "$cf_searchpath/include" ; then
 			if test "$GCC" = yes
 			then
 			  cf_save_CPPFLAGS=$CPPFLAGS
-			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 15036 "configure"
+#line 15894 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -15045,16 +15903,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15048: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15906: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15051: \$? = $ac_status" >&5
+  echo "$as_me:15909: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15054: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15912: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15057: \$? = $ac_status" >&5
+  echo "$as_me:15915: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -15071,7 +15929,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}:15074: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:15932: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -15112,9 +15970,12 @@ if test -n "$cf_searchpath/../include" ; then
 			if test "$GCC" = yes
 			then
 			  cf_save_CPPFLAGS=$CPPFLAGS
-			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 15117 "configure"
+#line 15978 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -15126,16 +15987,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15129: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15990: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15132: \$? = $ac_status" >&5
+  echo "$as_me:15993: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15135: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15996: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15138: \$? = $ac_status" >&5
+  echo "$as_me:15999: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -15152,7 +16013,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}:15155: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:16016: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -15170,7 +16031,7 @@ echo "${as_me:-configure}:15155: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:15173: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:16034: 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
@@ -15195,7 +16056,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}:15198: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:16059: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -15224,7 +16085,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}:15227: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:16088: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -15233,7 +16094,7 @@ echo "${as_me:-configure}:15227: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:15236: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:16097: 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
@@ -15251,12 +16112,12 @@ esac
 		(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}:15254: testing checking pkg-config for $cf_pkg_gnutls ..." 1>&5
+echo "${as_me:-configure}:16115: 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}:15259: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:16120: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_cv_have_gnutls=yes
 				cf_cv_pkg_config_ssl=yes
@@ -15388,7 +16249,7 @@ fi
 					esac
 					test -n "$verbose" && echo "	adding $cf_libs_ssl to LIBS" 1>&6
 
-echo "${as_me:-configure}:15391: testing adding $cf_libs_ssl to LIBS ..." 1>&5
+echo "${as_me:-configure}:16252: testing adding $cf_libs_ssl to LIBS ..." 1>&5
 
 cf_add_libs="$cf_libs_ssl"
 # Filter out duplicates - this happens with badly-designed ".pc" files...
@@ -15410,7 +16271,7 @@ LIBS="$cf_add_libs"
 			else
 				test -n "$verbose" && echo "	... did not find $cf_pkg_gnutls in pkg-config" 1>&6
 
-echo "${as_me:-configure}:15413: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:16274: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_pkg_gnutls=none
 			fi
@@ -15430,12 +16291,12 @@ EOF
 cf_cv_header_path_gnutls=
 cf_cv_library_path_gnutls=
 
-echo "${as_me:-configure}:15433: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:16294: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 15438 "configure"
+#line 16299 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -15464,16 +16325,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15467: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16328: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15470: \$? = $ac_status" >&5
+  echo "$as_me:16331: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15473: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16334: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15476: \$? = $ac_status" >&5
+  echo "$as_me:16337: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -15487,7 +16348,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lgnutls  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 15490 "configure"
+#line 16351 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -15516,16 +16377,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15519: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16380: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15522: \$? = $ac_status" >&5
+  echo "$as_me:16383: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15525: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16386: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15528: \$? = $ac_status" >&5
+  echo "$as_me:16389: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -15542,9 +16403,9 @@ cat conftest.$ac_ext >&5
 
 	test -n "$verbose" && echo "	find linkage for gnutls library" 1>&6
 
-echo "${as_me:-configure}:15545: testing find linkage for gnutls library ..." 1>&5
+echo "${as_me:-configure}:16406: testing find linkage for gnutls library ..." 1>&5
 
-echo "${as_me:-configure}:15547: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:16408: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -15635,11 +16496,15 @@ 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}:15638: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:16499: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
+
+			CPPFLAGS="$cf_save_CPPFLAGS"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_gnutls"
 
-			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_gnutls"
 			cat >conftest.$ac_ext <<_ACEOF
-#line 15642 "configure"
+#line 16507 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -15668,21 +16533,21 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15671: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16536: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15674: \$? = $ac_status" >&5
+  echo "$as_me:16539: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15677: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16542: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15680: \$? = $ac_status" >&5
+  echo "$as_me:16545: \$? = $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}:15685: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:16550: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
 
 				cf_cv_find_linkage_gnutls=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -15700,7 +16565,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "$cf_cv_find_linkage_gnutls" = maybe ; then
 
-echo "${as_me:-configure}:15703: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:16568: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -15775,13 +16640,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}:15778: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:16643: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
 
 					CPPFLAGS="$cf_test_CPPFLAGS"
 					LIBS="-lgnutls  $cf_save_LIBS"
 					LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_gnutls"
 					cat >conftest.$ac_ext <<_ACEOF
-#line 15784 "configure"
+#line 16649 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -15810,21 +16675,21 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15813: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16678: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15816: \$? = $ac_status" >&5
+  echo "$as_me:16681: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15819: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16684: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15822: \$? = $ac_status" >&5
+  echo "$as_me:16687: \$? = $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}:15827: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:16692: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
 
 					cf_cv_find_linkage_gnutls=yes
 					cf_cv_library_file_gnutls="-lgnutls"
@@ -15899,9 +16764,12 @@ if test -n "$cf_cv_header_path_gnutls" ; then
 			if test "$GCC" = yes
 			then
 			  cf_save_CPPFLAGS=$CPPFLAGS
-			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 15904 "configure"
+#line 16772 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -15913,16 +16781,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15916: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16784: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15919: \$? = $ac_status" >&5
+  echo "$as_me:16787: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15922: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16790: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15925: \$? = $ac_status" >&5
+  echo "$as_me:16793: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -15939,7 +16807,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}:15942: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:16810: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -15980,7 +16848,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}:15983: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:16851: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -16009,13 +16877,13 @@ LIBS="$cf_add_libs"
 for ac_func in gnutls_protocol_set_priority
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:16012: checking for $ac_func" >&5
+echo "$as_me:16880: 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 16018 "configure"
+#line 16886 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -16046,16 +16914,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16049: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16917: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16052: \$? = $ac_status" >&5
+  echo "$as_me:16920: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16055: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16923: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16058: \$? = $ac_status" >&5
+  echo "$as_me:16926: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -16065,7 +16933,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:16068: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:16936: 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
@@ -16075,13 +16943,13 @@ EOF
 fi
 done
 
-		echo "$as_me:16078: checking for gnutls_rnd" >&5
+		echo "$as_me:16946: checking for gnutls_rnd" >&5
 echo $ECHO_N "checking for gnutls_rnd... $ECHO_C" >&6
 if test "${ac_cv_func_gnutls_rnd+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 16084 "configure"
+#line 16952 "configure"
 #include "confdefs.h"
 #define gnutls_rnd autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -16112,16 +16980,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16115: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16983: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16118: \$? = $ac_status" >&5
+  echo "$as_me:16986: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16121: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16989: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16124: \$? = $ac_status" >&5
+  echo "$as_me:16992: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_gnutls_rnd=yes
 else
@@ -16131,7 +16999,7 @@ ac_cv_func_gnutls_rnd=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:16134: result: $ac_cv_func_gnutls_rnd" >&5
+echo "$as_me:17002: result: $ac_cv_func_gnutls_rnd" >&5
 echo "${ECHO_T}$ac_cv_func_gnutls_rnd" >&6
 if test $ac_cv_func_gnutls_rnd = yes; then
   cat >>confdefs.h <<\EOF
@@ -16160,10 +17028,10 @@ fi
 
 		EXTRA_OBJS="$EXTRA_OBJS tidy_tls\$o"
 
-echo "$as_me:16163: checking for X509 support" >&5
+echo "$as_me:17031: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 16166 "configure"
+#line 17034 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16192,16 +17060,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:16195: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17063: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16198: \$? = $ac_status" >&5
+  echo "$as_me:17066: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16201: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17069: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16204: \$? = $ac_status" >&5
+  echo "$as_me:17072: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_x509_support=yes
 else
@@ -16210,7 +17078,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:16213: result: $cf_x509_support" >&5
+echo "$as_me:17081: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 
 if test "$cf_x509_support" = yes ; then
@@ -16259,9 +17127,12 @@ if test -n "$cf_searchpath/include" ; then
 			if test "$GCC" = yes
 			then
 			  cf_save_CPPFLAGS=$CPPFLAGS
-			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 16264 "configure"
+#line 17135 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -16273,16 +17144,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16276: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17147: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16279: \$? = $ac_status" >&5
+  echo "$as_me:17150: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16282: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17153: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16285: \$? = $ac_status" >&5
+  echo "$as_me:17156: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -16299,7 +17170,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}:16302: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:17173: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -16340,9 +17211,12 @@ if test -n "$cf_searchpath/../include" ; then
 			if test "$GCC" = yes
 			then
 			  cf_save_CPPFLAGS=$CPPFLAGS
-			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 16345 "configure"
+#line 17219 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -16354,16 +17228,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16357: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17231: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16360: \$? = $ac_status" >&5
+  echo "$as_me:17234: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16363: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17237: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16366: \$? = $ac_status" >&5
+  echo "$as_me:17240: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -16380,7 +17254,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}:16383: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:17257: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -16398,7 +17272,7 @@ echo "${as_me:-configure}:16383: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:16401: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:17275: 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
@@ -16423,7 +17297,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}:16426: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:17300: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -16452,7 +17326,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}:16455: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:17329: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -16461,7 +17335,7 @@ echo "${as_me:-configure}:16455: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:16464: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:17338: 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
@@ -16479,12 +17353,12 @@ esac
 		(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}:16482: testing checking pkg-config for $cf_pkg_gnutls ..." 1>&5
+echo "${as_me:-configure}:17356: 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}:16487: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:17361: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_cv_have_gnutls=yes
 				cf_cv_pkg_config_ssl=yes
@@ -16616,7 +17490,7 @@ fi
 					esac
 					test -n "$verbose" && echo "	adding $cf_libs_ssl to LIBS" 1>&6
 
-echo "${as_me:-configure}:16619: testing adding $cf_libs_ssl to LIBS ..." 1>&5
+echo "${as_me:-configure}:17493: testing adding $cf_libs_ssl to LIBS ..." 1>&5
 
 cf_add_libs="$cf_libs_ssl"
 # Filter out duplicates - this happens with badly-designed ".pc" files...
@@ -16638,7 +17512,7 @@ LIBS="$cf_add_libs"
 			else
 				test -n "$verbose" && echo "	... did not find $cf_pkg_gnutls in pkg-config" 1>&6
 
-echo "${as_me:-configure}:16641: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:17515: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_pkg_gnutls=none
 			fi
@@ -16658,12 +17532,12 @@ EOF
 cf_cv_header_path_gnutls=
 cf_cv_library_path_gnutls=
 
-echo "${as_me:-configure}:16661: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:17535: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 16666 "configure"
+#line 17540 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16692,16 +17566,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16695: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17569: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16698: \$? = $ac_status" >&5
+  echo "$as_me:17572: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16701: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17575: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16704: \$? = $ac_status" >&5
+  echo "$as_me:17578: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -16715,7 +17589,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lgnutls -lgnutls-openssl $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 16718 "configure"
+#line 17592 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16744,16 +17618,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16747: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17621: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16750: \$? = $ac_status" >&5
+  echo "$as_me:17624: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16753: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17627: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16756: \$? = $ac_status" >&5
+  echo "$as_me:17630: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -16770,9 +17644,9 @@ cat conftest.$ac_ext >&5
 
 	test -n "$verbose" && echo "	find linkage for gnutls library" 1>&6
 
-echo "${as_me:-configure}:16773: testing find linkage for gnutls library ..." 1>&5
+echo "${as_me:-configure}:17647: testing find linkage for gnutls library ..." 1>&5
 
-echo "${as_me:-configure}:16775: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:17649: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -16863,11 +17737,15 @@ 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}:16866: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:17740: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
+
+			CPPFLAGS="$cf_save_CPPFLAGS"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_gnutls"
 
-			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_gnutls"
 			cat >conftest.$ac_ext <<_ACEOF
-#line 16870 "configure"
+#line 17748 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16896,21 +17774,21 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16899: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17777: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16902: \$? = $ac_status" >&5
+  echo "$as_me:17780: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16905: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17783: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16908: \$? = $ac_status" >&5
+  echo "$as_me:17786: \$? = $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}:16913: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:17791: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
 
 				cf_cv_find_linkage_gnutls=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -16928,7 +17806,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "$cf_cv_find_linkage_gnutls" = maybe ; then
 
-echo "${as_me:-configure}:16931: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:17809: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -17003,13 +17881,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}:17006: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:17884: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
 
 					CPPFLAGS="$cf_test_CPPFLAGS"
 					LIBS="-lgnutls -lgnutls-openssl $cf_save_LIBS"
 					LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_gnutls"
 					cat >conftest.$ac_ext <<_ACEOF
-#line 17012 "configure"
+#line 17890 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17038,21 +17916,21 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17041: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17919: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17044: \$? = $ac_status" >&5
+  echo "$as_me:17922: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17047: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17925: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17050: \$? = $ac_status" >&5
+  echo "$as_me:17928: \$? = $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}:17055: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:17933: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
 
 					cf_cv_find_linkage_gnutls=yes
 					cf_cv_library_file_gnutls="-lgnutls"
@@ -17127,9 +18005,12 @@ if test -n "$cf_cv_header_path_gnutls" ; then
 			if test "$GCC" = yes
 			then
 			  cf_save_CPPFLAGS=$CPPFLAGS
-			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 17132 "configure"
+#line 18013 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -17141,16 +18022,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17144: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18025: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17147: \$? = $ac_status" >&5
+  echo "$as_me:18028: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17150: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18031: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17153: \$? = $ac_status" >&5
+  echo "$as_me:18034: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -17167,7 +18048,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}:17170: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:18051: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -17208,7 +18089,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}:17211: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:18092: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -17237,13 +18118,13 @@ LIBS="$cf_add_libs"
 for ac_func in gnutls_protocol_set_priority
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:17240: checking for $ac_func" >&5
+echo "$as_me:18121: 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 17246 "configure"
+#line 18127 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -17274,16 +18155,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17277: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18158: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17280: \$? = $ac_status" >&5
+  echo "$as_me:18161: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17283: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18164: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17286: \$? = $ac_status" >&5
+  echo "$as_me:18167: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -17293,7 +18174,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:17296: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:18177: 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
@@ -17303,13 +18184,13 @@ EOF
 fi
 done
 
-		echo "$as_me:17306: checking for gnutls_rnd" >&5
+		echo "$as_me:18187: checking for gnutls_rnd" >&5
 echo $ECHO_N "checking for gnutls_rnd... $ECHO_C" >&6
 if test "${ac_cv_func_gnutls_rnd+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 17312 "configure"
+#line 18193 "configure"
 #include "confdefs.h"
 #define gnutls_rnd autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -17340,16 +18221,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17343: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18224: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17346: \$? = $ac_status" >&5
+  echo "$as_me:18227: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17349: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18230: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17352: \$? = $ac_status" >&5
+  echo "$as_me:18233: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_gnutls_rnd=yes
 else
@@ -17359,7 +18240,7 @@ ac_cv_func_gnutls_rnd=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:17362: result: $ac_cv_func_gnutls_rnd" >&5
+echo "$as_me:18243: result: $ac_cv_func_gnutls_rnd" >&5
 echo "${ECHO_T}$ac_cv_func_gnutls_rnd" >&6
 if test $ac_cv_func_gnutls_rnd = yes; then
   cat >>confdefs.h <<\EOF
@@ -17387,7 +18268,7 @@ LIBS="$cf_add_libs"
 fi
 
 		if test "$cf_pkg_gnutls" = none ; then
-				echo "$as_me:17390: checking for SSL_connect in -lgnutls-openssl" >&5
+				echo "$as_me:18271: 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
@@ -17395,7 +18276,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnutls-openssl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 17398 "configure"
+#line 18279 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17414,16 +18295,16 @@ SSL_connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17417: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18298: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17420: \$? = $ac_status" >&5
+  echo "$as_me:18301: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17423: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18304: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17426: \$? = $ac_status" >&5
+  echo "$as_me:18307: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gnutls_openssl_SSL_connect=yes
 else
@@ -17434,7 +18315,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17437: result: $ac_cv_lib_gnutls_openssl_SSL_connect" >&5
+echo "$as_me:18318: 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
 
@@ -17455,7 +18336,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-  echo "$as_me:17458: checking for SSL_connect in -lgnutls-extra" >&5
+  echo "$as_me:18339: 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
@@ -17463,7 +18344,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnutls-extra  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 17466 "configure"
+#line 18347 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17482,16 +18363,16 @@ SSL_connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17485: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18366: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17488: \$? = $ac_status" >&5
+  echo "$as_me:18369: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17491: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18372: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17494: \$? = $ac_status" >&5
+  echo "$as_me:18375: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gnutls_extra_SSL_connect=yes
 else
@@ -17502,7 +18383,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17505: result: $ac_cv_lib_gnutls_extra_SSL_connect" >&5
+echo "$as_me:18386: 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
 
@@ -17523,7 +18404,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-  { { echo "$as_me:17526: error: cannot find gnutls openssl functions" >&5
+  { { echo "$as_me:18407: error: cannot find gnutls openssl functions" >&5
 echo "$as_me: error: cannot find gnutls openssl functions" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -17532,10 +18413,10 @@ fi
 
 			fi
 
-echo "$as_me:17535: checking for X509 support" >&5
+echo "$as_me:18416: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 17538 "configure"
+#line 18419 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17564,16 +18445,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:17567: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18448: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17570: \$? = $ac_status" >&5
+  echo "$as_me:18451: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17573: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18454: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17576: \$? = $ac_status" >&5
+  echo "$as_me:18457: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_x509_support=yes
 else
@@ -17582,7 +18463,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:17585: result: $cf_x509_support" >&5
+echo "$as_me:18466: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 
 if test "$cf_x509_support" = yes ; then
@@ -17614,7 +18495,7 @@ case "$cf_cv_use_libnss_compat" in
 	;;
 (yes)
 
-echo "$as_me:17617: checking for SSL_get_version in -lnss_compat_ossl" >&5
+echo "$as_me:18498: 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
@@ -17622,7 +18503,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnss_compat_ossl -lnss_compat_ossl $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 17625 "configure"
+#line 18506 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17641,16 +18522,16 @@ SSL_get_version ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17644: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18525: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17647: \$? = $ac_status" >&5
+  echo "$as_me:18528: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17650: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18531: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17653: \$? = $ac_status" >&5
+  echo "$as_me:18534: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nss_compat_ossl_SSL_get_version=yes
 else
@@ -17661,7 +18542,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17664: result: $ac_cv_lib_nss_compat_ossl_SSL_get_version" >&5
+echo "$as_me:18545: 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
@@ -17676,11 +18557,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}:17679: testing assume it is in $cf_ssl_root ..." 1>&5
+echo "${as_me:-configure}:18560: 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:17683: error: cannot find NSS compilant libraries" >&5
+			{ { echo "$as_me:18564: error: cannot find NSS compilant libraries" >&5
 echo "$as_me: error: cannot find NSS compilant libraries" >&2;}
    { (exit 1); exit 1; }; }
 		fi
@@ -17695,13 +18576,13 @@ fi
 		elif test -d $cf_cv_use_libnss_compat/../include ; then
 			cf_ssl_root=$cf_cv_use_libnss_compat/..
 		else
-			{ { echo "$as_me:17698: error: cannot find NSS compilant library under $cf_cv_use_libnss_compat" >&5
+			{ { echo "$as_me:18579: 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:17704: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&5
+		{ echo "$as_me:18585: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&5
 echo "$as_me: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&2;}
 	fi
 	;;
@@ -17830,10 +18711,10 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 if test "$cf_ssl_subincs" = yes ; then
-echo "$as_me:17833: checking for NSS compilant include directory" >&5
+echo "$as_me:18714: 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 17836 "configure"
+#line 18717 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17847,16 +18728,16 @@ SSL_shutdown((SSL *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17850: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18731: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17853: \$? = $ac_status" >&5
+  echo "$as_me:18734: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17856: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18737: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17859: \$? = $ac_status" >&5
+  echo "$as_me:18740: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_ssl_incl=yes
 else
@@ -17865,7 +18746,7 @@ cat conftest.$ac_ext >&5
 cf_ssl_incl=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:17868: result: $cf_ssl_incl" >&5
+echo "$as_me:18749: result: $cf_ssl_incl" >&5
 echo "${ECHO_T}$cf_ssl_incl" >&6
 test "$cf_ssl_incl" = yes &&
 cat >>confdefs.h <<\EOF
@@ -17874,10 +18755,10 @@ EOF
 
 fi
 
-echo "$as_me:17877: checking if we can link to NSS compilant library" >&5
+echo "$as_me:18758: 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 17880 "configure"
+#line 18761 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17896,16 +18777,16 @@ SSL_shutdown((SSL *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17899: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18780: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17902: \$? = $ac_status" >&5
+  echo "$as_me:18783: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17905: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18786: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17908: \$? = $ac_status" >&5
+  echo "$as_me:18789: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_ssl_library=yes
 else
@@ -17914,7 +18795,7 @@ cat conftest.$ac_ext >&5
 cf_ssl_library=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:17917: result: $cf_ssl_library" >&5
+echo "$as_me:18798: result: $cf_ssl_library" >&5
 echo "${ECHO_T}$cf_ssl_library" >&6
 if test "$cf_ssl_library" = yes ; then
 
@@ -17927,7 +18808,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-	{ { echo "$as_me:17930: error: Cannot link with NSS compilant libraries" >&5
+	{ { echo "$as_me:18811: error: Cannot link with NSS compilant libraries" >&5
 echo "$as_me: error: Cannot link with NSS compilant libraries" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -17935,7 +18816,7 @@ fi
 fi
 
 ### check for ipv6 support
-echo "$as_me:17938: checking whether to enable ipv6" >&5
+echo "$as_me:18819: 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.
@@ -17952,11 +18833,11 @@ EOF
 else
   enableval=no
 fi;
-echo "$as_me:17955: result: $enableval" >&5
+echo "$as_me:18836: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 if test "$enableval" = "yes"; then
 
-echo "$as_me:17959: checking ipv6 stack type" >&5
+echo "$as_me:18840: 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
@@ -17977,7 +18858,7 @@ do
 		;;
 	(inria)
 				cat >conftest.$ac_ext <<_ACEOF
-#line 17980 "configure"
+#line 18861 "configure"
 #include "confdefs.h"
 
 #include <netinet/in.h>
@@ -17994,7 +18875,7 @@ rm -rf conftest*
 		;;
 	(kame)
 				cat >conftest.$ac_ext <<_ACEOF
-#line 17997 "configure"
+#line 18878 "configure"
 #include "confdefs.h"
 
 #include <netinet/in.h>
@@ -18011,7 +18892,7 @@ rm -rf conftest*
 		;;
 	(linux-glibc)
 				cat >conftest.$ac_ext <<_ACEOF
-#line 18014 "configure"
+#line 18895 "configure"
 #include "confdefs.h"
 
 #include <features.h>
@@ -18037,7 +18918,7 @@ rm -rf conftest*
 		;;
 	(toshiba)
 		cat >conftest.$ac_ext <<_ACEOF
-#line 18040 "configure"
+#line 18921 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -18054,7 +18935,7 @@ rm -rf conftest*
 		;;
 	(v6d)
 		cat >conftest.$ac_ext <<_ACEOF
-#line 18057 "configure"
+#line 18938 "configure"
 #include "confdefs.h"
 
 #include </usr/local/v6/include/sys/v6config.h>
@@ -18071,7 +18952,7 @@ rm -rf conftest*
 		;;
 	(zeta)
 		cat >conftest.$ac_ext <<_ACEOF
-#line 18074 "configure"
+#line 18955 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -18093,13 +18974,13 @@ rm -rf conftest*
 done
 
 fi
-echo "$as_me:18096: result: $cf_cv_ipv6type" >&5
+echo "$as_me:18977: result: $cf_cv_ipv6type" >&5
 echo "${ECHO_T}$cf_cv_ipv6type" >&6
 
 cf_ipv6lib=none
 cf_ipv6dir=none
 
-echo "$as_me:18102: checking for IPv6 library if required" >&5
+echo "$as_me:18983: checking for IPv6 library if required" >&5
 echo $ECHO_N "checking for IPv6 library if required... $ECHO_C" >&6
 case $cf_cv_ipv6type in
 (solaris)
@@ -18129,13 +19010,13 @@ case $cf_cv_ipv6type in
 	cf_ipv6dir=v6
 	;;
 esac
-echo "$as_me:18132: result: $cf_ipv6lib" >&5
+echo "$as_me:19013: result: $cf_ipv6lib" >&5
 echo "${ECHO_T}$cf_ipv6lib" >&6
 
 if test "$cf_ipv6lib" != "none"; then
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 18138 "configure"
+#line 19019 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -18151,16 +19032,16 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18154: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19035: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18157: \$? = $ac_status" >&5
+  echo "$as_me:19038: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18160: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19041: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18163: \$? = $ac_status" >&5
+  echo "$as_me:19044: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -18276,9 +19157,12 @@ if test -n "$cf_incdir" ; then
 			if test "$GCC" = yes
 			then
 			  cf_save_CPPFLAGS=$CPPFLAGS
-			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 18281 "configure"
+#line 19165 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -18290,16 +19174,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18293: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19177: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18296: \$? = $ac_status" >&5
+  echo "$as_me:19180: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18299: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19183: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18302: \$? = $ac_status" >&5
+  echo "$as_me:19186: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -18316,7 +19200,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}:18319: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:19203: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -18344,13 +19228,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:18347: checking for getaddrinfo" >&5
+	echo "$as_me:19231: 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 18353 "configure"
+#line 19237 "configure"
 #include "confdefs.h"
 #define getaddrinfo autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18381,16 +19265,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18384: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19268: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18387: \$? = $ac_status" >&5
+  echo "$as_me:19271: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18390: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19274: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18393: \$? = $ac_status" >&5
+  echo "$as_me:19277: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_getaddrinfo=yes
 else
@@ -18400,18 +19284,18 @@ ac_cv_func_getaddrinfo=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:18403: result: $ac_cv_func_getaddrinfo" >&5
+echo "$as_me:19287: 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:18410: checking for getaddrinfo in -l$cf_ipv6lib" >&5
+		echo "$as_me:19294: 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 18414 "configure"
+#line 19298 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -18427,25 +19311,25 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18430: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19314: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18433: \$? = $ac_status" >&5
+  echo "$as_me:19317: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18436: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19320: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18439: \$? = $ac_status" >&5
+  echo "$as_me:19323: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:18441: result: yes" >&5
+  echo "$as_me:19325: 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:18448: result: no" >&5
+echo "$as_me:19332: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -18513,11 +19397,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:18516: checking for -l$cf_ipv6lib in $cf_libdir" >&5
+				echo "$as_me:19400: 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 18520 "configure"
+#line 19404 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -18533,25 +19417,25 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18536: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19420: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18539: \$? = $ac_status" >&5
+  echo "$as_me:19423: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18542: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19426: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18545: \$? = $ac_status" >&5
+  echo "$as_me:19429: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:18547: result: yes" >&5
+  echo "$as_me:19431: 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:18554: result: no" >&5
+echo "$as_me:19438: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -18566,7 +19450,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_ipv6lib
 
 	if test $cf_found_library = no ; then
-		{ { echo "$as_me:18569: error: No $cf_ipv6lib library found, cannot continue.  You must fetch lib$cf_ipv6lib.a
+		{ { echo "$as_me:19453: 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;}
@@ -18574,7 +19458,7 @@ from an appropriate IPv6 kit and compile beforehand." >&2;}
 	fi
 fi
 
-echo "$as_me:18577: checking working getaddrinfo" >&5
+echo "$as_me:19461: 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
@@ -18584,7 +19468,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_getaddrinfo=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 18587 "configure"
+#line 19471 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -18664,15 +19548,15 @@ int main(void)
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:18667: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19551: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18670: \$? = $ac_status" >&5
+  echo "$as_me:19554: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:18672: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19556: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18675: \$? = $ac_status" >&5
+  echo "$as_me:19559: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_getaddrinfo=yes
 else
@@ -18685,7 +19569,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:18688: result: $cf_cv_getaddrinfo" >&5
+echo "$as_me:19572: result: $cf_cv_getaddrinfo" >&5
 echo "${ECHO_T}$cf_cv_getaddrinfo" >&6
 if test "$cf_cv_getaddrinfo" = yes ; then
 
@@ -18701,12 +19585,12 @@ fi
 
 if test "$cf_cv_getaddrinfo" != "yes"; then
 	if test "$cf_cv_ipv6type" != "linux"; then
-		{ echo "$as_me:18704: WARNING: You must get working getaddrinfo() function,
+		{ echo "$as_me:19588: 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:18709: WARNING: The getaddrinfo() implementation on your system seems be buggy.
+		{ echo "$as_me:19593: 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.
@@ -18717,7 +19601,7 @@ fi
 
 fi
 
-echo "$as_me:18720: checking for screen type" >&5
+echo "$as_me:19604: 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
@@ -18731,7 +19615,7 @@ case $withval in
 (curses|ncurses*|pdcurses|slang)
 	cf_cv_screen=$withval
 	;;
-(*)	{ { echo "$as_me:18734: error: Unexpected value $withval" >&5
+(*)	{ { echo "$as_me:19618: error: Unexpected value $withval" >&5
 echo "$as_me: error: Unexpected value $withval" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -18740,13 +19624,13 @@ else
   cf_cv_screen=curses
 fi;
 fi
-echo "$as_me:18743: result: $cf_cv_screen" >&5
+echo "$as_me:19627: result: $cf_cv_screen" >&5
 echo "${ECHO_T}$cf_cv_screen" >&6
 
 case $cf_cv_screen in
 (curses|ncurses*)
 
-echo "$as_me:18749: checking for specific curses-directory" >&5
+echo "$as_me:19633: 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.
@@ -18756,7 +19640,7 @@ if test "${with_curses_dir+set}" = set; then
 else
   cf_cv_curses_dir=no
 fi;
-echo "$as_me:18759: result: $cf_cv_curses_dir" >&5
+echo "$as_me:19643: 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" )
@@ -18787,7 +19671,7 @@ case ".$withval" in
 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:18790: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:19674: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -18818,9 +19702,12 @@ if test -n "$cf_cv_curses_dir/include" ; then
 			if test "$GCC" = yes
 			then
 			  cf_save_CPPFLAGS=$CPPFLAGS
-			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 18823 "configure"
+#line 19710 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -18832,16 +19719,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18835: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19722: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18838: \$? = $ac_status" >&5
+  echo "$as_me:19725: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18841: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19728: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18844: \$? = $ac_status" >&5
+  echo "$as_me:19731: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -18858,7 +19745,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}:18861: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:19748: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -18894,7 +19781,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}:18897: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:19784: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -18913,7 +19800,7 @@ dft_color_style=yes
 case $cf_cv_screen in
 (curses)
 
-echo "$as_me:18916: checking for extra include directories" >&5
+echo "$as_me:19803: 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
@@ -18939,11 +19826,17 @@ case $host_os in
 esac
 
 fi
-echo "$as_me:18942: result: $cf_cv_curses_incdir" >&5
+echo "$as_me:19829: 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"
+if test "$cf_cv_curses_incdir" != no
+then
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}$cf_cv_curses_incdir"
 
-echo "$as_me:18946: checking if we have identified curses headers" >&5
+fi
+
+echo "$as_me:19839: 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
@@ -18955,7 +19848,7 @@ for cf_header in \
 	curses.h  ncurses/ncurses.h ncurses/curses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 18958 "configure"
+#line 19851 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -18967,16 +19860,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18970: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19863: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18973: \$? = $ac_status" >&5
+  echo "$as_me:19866: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18976: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19869: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18979: \$? = $ac_status" >&5
+  echo "$as_me:19872: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -18987,11 +19880,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:18990: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:19883: 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:18994: error: No curses header-files found" >&5
+	{ { echo "$as_me:19887: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -19001,23 +19894,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:19004: checking for $ac_header" >&5
+echo "$as_me:19897: 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 19010 "configure"
+#line 19903 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:19014: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:19907: \"$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:19020: \$? = $ac_status" >&5
+  echo "$as_me:19913: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -19036,7 +19929,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:19039: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:19932: 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
@@ -19046,7 +19939,7 @@ EOF
 fi
 done
 
-echo "$as_me:19049: checking for terminfo header" >&5
+echo "$as_me:19942: 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
@@ -19064,7 +19957,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 19067 "configure"
+#line 19960 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19079,16 +19972,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19082: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19975: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19085: \$? = $ac_status" >&5
+  echo "$as_me:19978: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19088: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19981: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19091: \$? = $ac_status" >&5
+  echo "$as_me:19984: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -19104,7 +19997,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:19107: result: $cf_cv_term_header" >&5
+echo "$as_me:20000: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -19136,7 +20029,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:19139: checking for ncurses version" >&5
+echo "$as_me:20032: 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
@@ -19162,10 +20055,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:19165: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:20058: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:19168: \$? = $ac_status" >&5
+  echo "$as_me:20061: \$? = $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%".*%%'`
@@ -19175,7 +20068,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 19178 "configure"
+#line 20071 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19200,15 +20093,15 @@ int main(void)
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:19203: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20096: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19206: \$? = $ac_status" >&5
+  echo "$as_me:20099: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:19208: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20101: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19211: \$? = $ac_status" >&5
+  echo "$as_me:20104: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -19222,17 +20115,17 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:19225: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:20118: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:19232: checking if we have identified curses libraries" >&5
+echo "$as_me:20125: 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 19235 "configure"
+#line 20128 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -19244,16 +20137,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19247: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20140: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19250: \$? = $ac_status" >&5
+  echo "$as_me:20143: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19253: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20146: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19256: \$? = $ac_status" >&5
+  echo "$as_me:20149: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -19262,13 +20155,13 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:19265: result: $cf_result" >&5
+echo "$as_me:20158: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 if test "$cf_result" = no ; then
 case $host_os in
 (freebsd*)
-	echo "$as_me:19271: checking for tgoto in -lmytinfo" >&5
+	echo "$as_me:20164: 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
@@ -19276,7 +20169,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 19279 "configure"
+#line 20172 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19295,16 +20188,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19298: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20191: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19301: \$? = $ac_status" >&5
+  echo "$as_me:20194: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19304: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20197: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19307: \$? = $ac_status" >&5
+  echo "$as_me:20200: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -19315,7 +20208,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19318: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:20211: 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
 
@@ -19345,7 +20238,7 @@ fi
 	# term.h) for cur_colr
 	if test "x$cf_cv_screen" = "xcurses_colr"
 	then
-		echo "$as_me:19348: checking for initscr in -lcur_colr" >&5
+		echo "$as_me:20241: 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
@@ -19353,7 +20246,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcur_colr  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 19356 "configure"
+#line 20249 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19372,16 +20265,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19375: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20268: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19378: \$? = $ac_status" >&5
+  echo "$as_me:20271: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19381: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20274: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19384: \$? = $ac_status" >&5
+  echo "$as_me:20277: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_cur_colr_initscr=yes
 else
@@ -19392,7 +20285,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19395: result: $ac_cv_lib_cur_colr_initscr" >&5
+echo "$as_me:20288: 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
 
@@ -19416,7 +20309,7 @@ LIBS="$cf_add_libs"
 
 else
 
-		echo "$as_me:19419: checking for initscr in -lHcurses" >&5
+		echo "$as_me:20312: 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
@@ -19424,7 +20317,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lHcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 19427 "configure"
+#line 20320 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19443,16 +20336,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19446: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20339: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19449: \$? = $ac_status" >&5
+  echo "$as_me:20342: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19452: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20345: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19455: \$? = $ac_status" >&5
+  echo "$as_me:20348: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Hcurses_initscr=yes
 else
@@ -19463,7 +20356,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19466: result: $ac_cv_lib_Hcurses_initscr" >&5
+echo "$as_me:20359: 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
 
@@ -19485,7 +20378,9 @@ do
 done
 LIBS="$cf_add_libs"
 
-			CPPFLAGS="$CPPFLAGS -D__HP_CURSES -D_HP_CURSES"
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-D__HP_CURSES -D_HP_CURSES"
+
 			ac_cv_func_initscr=yes
 
 fi
@@ -19519,7 +20414,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}:19522: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:20417: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -19548,7 +20443,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}:19551: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:20446: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -19579,7 +20474,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}:19582: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:20477: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -19614,7 +20509,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}:19617: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:20512: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -19658,13 +20553,13 @@ if test ".$ac_cv_func_initscr" != .yes ; then
 	# because it may be needed to link the test-case for initscr.
 	if test "x$cf_term_lib" = x
 	then
-		echo "$as_me:19661: checking for tgoto" >&5
+		echo "$as_me:20556: 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 19667 "configure"
+#line 20562 "configure"
 #include "confdefs.h"
 #define tgoto autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -19695,16 +20590,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19698: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20593: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19701: \$? = $ac_status" >&5
+  echo "$as_me:20596: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19704: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20599: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19707: \$? = $ac_status" >&5
+  echo "$as_me:20602: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_tgoto=yes
 else
@@ -19714,7 +20609,7 @@ ac_cv_func_tgoto=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:19717: result: $ac_cv_func_tgoto" >&5
+echo "$as_me:20612: 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
@@ -19723,7 +20618,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:19726: checking for tgoto in -l$cf_term_lib" >&5
+echo "$as_me:20621: 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
@@ -19731,7 +20626,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_term_lib  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 19734 "configure"
+#line 20629 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19750,16 +20645,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19753: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20648: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19756: \$? = $ac_status" >&5
+  echo "$as_me:20651: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19759: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20654: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19762: \$? = $ac_status" >&5
+  echo "$as_me:20657: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -19770,7 +20665,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19773: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:20668: 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
 
@@ -19793,10 +20688,10 @@ fi
 		do
 			LIBS="-l$cf_curs_lib $cf_save_LIBS"
 			if test "$cf_term_lib" = unknown || test "$cf_term_lib" = "$cf_curs_lib" ; then
-				echo "$as_me:19796: checking if we can link with $cf_curs_lib library" >&5
+				echo "$as_me:20691: 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 19799 "configure"
+#line 20694 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -19808,16 +20703,16 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19811: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20706: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19814: \$? = $ac_status" >&5
+  echo "$as_me:20709: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19817: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20712: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19820: \$? = $ac_status" >&5
+  echo "$as_me:20715: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -19826,16 +20721,16 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-				echo "$as_me:19829: result: $cf_result" >&5
+				echo "$as_me:20724: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 				test $cf_result = yes && break
 			elif test "$cf_curs_lib" = "$cf_term_lib" ; then
 				cf_result=no
 			elif test "$cf_term_lib" != predefined ; then
-				echo "$as_me:19835: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+				echo "$as_me:20730: 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 19838 "configure"
+#line 20733 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -19847,16 +20742,16 @@ initscr(); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19850: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20745: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19853: \$? = $ac_status" >&5
+  echo "$as_me:20748: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19856: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20751: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19859: \$? = $ac_status" >&5
+  echo "$as_me:20754: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=no
 else
@@ -19865,7 +20760,7 @@ cat conftest.$ac_ext >&5
 
 					LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
 					cat >conftest.$ac_ext <<_ACEOF
-#line 19868 "configure"
+#line 20763 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -19877,16 +20772,16 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19880: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20775: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19883: \$? = $ac_status" >&5
+  echo "$as_me:20778: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19886: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20781: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19889: \$? = $ac_status" >&5
+  echo "$as_me:20784: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -19898,19 +20793,19 @@ 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:19901: result: $cf_result" >&5
+				echo "$as_me:20796: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 				test $cf_result != error && break
 			fi
 		done
 	fi
-	test $cf_curs_lib = unknown && { { echo "$as_me:19907: error: no curses library found" >&5
+	test $cf_curs_lib = unknown && { { echo "$as_me:20802: error: no curses library found" >&5
 echo "$as_me: error: no curses library found" >&2;}
    { (exit 1); exit 1; }; }
 fi
 fi
 
-echo "$as_me:19913: checking for curses performance tradeoff" >&5
+echo "$as_me:20808: 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
@@ -19918,7 +20813,7 @@ else
 
     cf_cv_curs_performance=no
     cat >conftest.$ac_ext <<_ACEOF
-#line 19921 "configure"
+#line 20816 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19937,20 +20832,20 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19940: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20835: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19943: \$? = $ac_status" >&5
+  echo "$as_me:20838: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19946: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20841: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19949: \$? = $ac_status" >&5
+  echo "$as_me:20844: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 19953 "configure"
+#line 20848 "configure"
 #include "confdefs.h"
 
 #define CURS_PERFORMANCE
@@ -19970,16 +20865,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19973: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20868: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19976: \$? = $ac_status" >&5
+  echo "$as_me:20871: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19979: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20874: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19982: \$? = $ac_status" >&5
+  echo "$as_me:20877: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_curs_performance=yes
 else
@@ -19994,21 +20889,21 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:19997: result: $cf_cv_curs_performance" >&5
+echo "$as_me:20892: result: $cf_cv_curs_performance" >&5
 echo "${ECHO_T}$cf_cv_curs_performance" >&6
 test $cf_cv_curs_performance = yes &&
 cat >>confdefs.h <<\EOF
 #define CURS_PERFORMANCE 1
 EOF
 
-echo "$as_me:20004: checking for curses touchline function" >&5
+echo "$as_me:20899: 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 20011 "configure"
+#line 20906 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20021,23 +20916,23 @@ touchline(stdscr, 1,2,3);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20024: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20919: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20027: \$? = $ac_status" >&5
+  echo "$as_me:20922: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20030: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20925: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20033: \$? = $ac_status" >&5
+  echo "$as_me:20928: \$? = $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 20040 "configure"
+#line 20935 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20050,16 +20945,16 @@ touchline(stdscr, 1,2);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20053: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20948: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20056: \$? = $ac_status" >&5
+  echo "$as_me:20951: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20059: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20954: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20062: \$? = $ac_status" >&5
+  echo "$as_me:20957: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_curs_touchline=sysv
 else
@@ -20071,7 +20966,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:20074: result: $cf_cv_curs_touchline" >&5
+echo "$as_me:20969: result: $cf_cv_curs_touchline" >&5
 echo "${ECHO_T}$cf_cv_curs_touchline" >&6
 case "$cf_cv_curs_touchline" in
 (bsd)
@@ -20093,7 +20988,7 @@ esac
 	;;
 (ncursesw*)
 
-echo "$as_me:20096: checking for multibyte character support" >&5
+echo "$as_me:20991: 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
@@ -20101,7 +20996,7 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 20104 "configure"
+#line 20999 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20114,16 +21009,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20117: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21012: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20120: \$? = $ac_status" >&5
+  echo "$as_me:21015: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20123: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21018: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20126: \$? = $ac_status" >&5
+  echo "$as_me:21021: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_utf8_lib=yes
 else
@@ -20135,12 +21030,12 @@ cat conftest.$ac_ext >&5
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
-echo "${as_me:-configure}:20138: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:21033: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 20143 "configure"
+#line 21038 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -20153,16 +21048,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20156: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21051: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20159: \$? = $ac_status" >&5
+  echo "$as_me:21054: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20162: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21057: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20165: \$? = $ac_status" >&5
+  echo "$as_me:21060: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -20176,7 +21071,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lutf8  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 20179 "configure"
+#line 21074 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -20189,16 +21084,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20192: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21087: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20195: \$? = $ac_status" >&5
+  echo "$as_me:21090: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20198: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21093: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20201: \$? = $ac_status" >&5
+  echo "$as_me:21096: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -20215,9 +21110,9 @@ cat conftest.$ac_ext >&5
 
 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
 
-echo "${as_me:-configure}:20218: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:21113: testing find linkage for utf8 library ..." 1>&5
 
-echo "${as_me:-configure}:20220: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:21115: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -20308,11 +21203,15 @@ 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}:20311: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:21206: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+
+			CPPFLAGS="$cf_save_CPPFLAGS"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
 
-			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8"
 			cat >conftest.$ac_ext <<_ACEOF
-#line 20315 "configure"
+#line 21214 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -20325,21 +21224,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20328: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21227: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20331: \$? = $ac_status" >&5
+  echo "$as_me:21230: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20334: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21233: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20337: \$? = $ac_status" >&5
+  echo "$as_me:21236: \$? = $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}:20342: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:21241: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
 
 				cf_cv_find_linkage_utf8=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -20357,7 +21256,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
-echo "${as_me:-configure}:20360: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:21259: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -20432,13 +21331,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}:20435: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:21334: 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 20441 "configure"
+#line 21340 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -20451,21 +21350,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20454: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21353: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20457: \$? = $ac_status" >&5
+  echo "$as_me:21356: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20460: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21359: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20463: \$? = $ac_status" >&5
+  echo "$as_me:21362: \$? = $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}:20468: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:21367: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
 
 					cf_cv_find_linkage_utf8=yes
 					cf_cv_library_file_utf8="-lutf8"
@@ -20507,7 +21406,7 @@ fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:20510: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:21409: 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
@@ -20540,9 +21439,12 @@ if test -n "$cf_cv_header_path_utf8" ; then
 			if test "$GCC" = yes
 			then
 			  cf_save_CPPFLAGS=$CPPFLAGS
-			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 20545 "configure"
+#line 21447 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -20554,16 +21456,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20557: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21459: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20560: \$? = $ac_status" >&5
+  echo "$as_me:21462: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20563: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21465: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20566: \$? = $ac_status" >&5
+  echo "$as_me:21468: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -20580,7 +21482,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}:20583: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:21485: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -20616,7 +21518,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}:20619: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:21521: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -20646,20 +21548,116 @@ cf_ncuconfig_root=$cf_cv_screen
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:20649: checking pkg-config for $cf_ncuconfig_root" >&5
+	echo "$as_me:21551: checking pkg-config for $cf_ncuconfig_root" >&5
 echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
 	if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then
-		echo "$as_me:20652: result: yes" >&5
+		echo "$as_me:21554: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:20655: checking if the $cf_ncuconfig_root package files work" >&5
+		echo "$as_me:21557: checking if the $cf_ncuconfig_root package files work" >&5
 echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
 		cf_have_ncuconfig=unknown
 
 		cf_save_CPPFLAGS="$CPPFLAGS"
 		cf_save_LIBS="$LIBS"
 
-		CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags $cf_ncuconfig_root`"
+cf_fix_cppflags=no
+cf_new_cflags=
+cf_new_cppflags=
+cf_new_extra_cppflags=
+
+for cf_add_cflags in `$PKG_CONFIG --cflags $cf_ncuconfig_root`
+do
+case $cf_fix_cppflags in
+(no)
+	case $cf_add_cflags in
+	(-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
+		case $cf_add_cflags in
+		(-D*)
+			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+
+			test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
+				&& test -z "${cf_tst_cflags}" \
+				&& cf_fix_cppflags=yes
+
+			if test $cf_fix_cppflags = yes ; then
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
+				continue
+			elif test "${cf_tst_cflags}" = "\"'" ; then
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
+				continue
+			fi
+			;;
+		esac
+		case "$CPPFLAGS" in
+		(*$cf_add_cflags)
+			;;
+		(*)
+			case $cf_add_cflags in
+			(-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
+
+	test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+	cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+
+			;;
+		esac
+		;;
+	(*)
+
+	test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+	cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+
+		;;
+	esac
+	;;
+(yes)
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
+	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
+
+	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
+		&& test -z "${cf_tst_cflags}" \
+		&& cf_fix_cppflags=no
+	;;
+esac
+done
+
+if test -n "$cf_new_cflags" ; then
+
+	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+	CFLAGS="${CFLAGS}$cf_new_cflags"
+
+fi
+
+if test -n "$cf_new_cppflags" ; then
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+
+fi
+
+if test -n "$cf_new_extra_cppflags" ; then
+
+	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+
+fi
 
 cf_add_libs="`$PKG_CONFIG --libs $cf_ncuconfig_root`"
 # Filter out duplicates - this happens with badly-designed ".pc" files...
@@ -20678,7 +21676,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 20681 "configure"
+#line 21679 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -20690,37 +21688,37 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20693: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21691: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20696: \$? = $ac_status" >&5
+  echo "$as_me:21694: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20699: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21697: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20702: \$? = $ac_status" >&5
+  echo "$as_me:21700: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 20708 "configure"
+#line 21706 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 				int main(void)
 				{ char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:20715: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21713: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20718: \$? = $ac_status" >&5
+  echo "$as_me:21716: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:20720: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21718: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20723: \$? = $ac_status" >&5
+  echo "$as_me:21721: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -20737,7 +21735,7 @@ cat conftest.$ac_ext >&5
 cf_have_ncuconfig=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-		echo "$as_me:20740: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:21738: result: $cf_have_ncuconfig" >&5
 echo "${ECHO_T}$cf_have_ncuconfig" >&6
 		test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
 		if test "$cf_have_ncuconfig" != "yes"
@@ -20753,7 +21751,7 @@ EOF
 
 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
-echo "$as_me:20756: checking for terminfo header" >&5
+echo "$as_me:21754: 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
@@ -20771,7 +21769,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 20774 "configure"
+#line 21772 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20786,16 +21784,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20789: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21787: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20792: \$? = $ac_status" >&5
+  echo "$as_me:21790: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20795: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21793: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20798: \$? = $ac_status" >&5
+  echo "$as_me:21796: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -20811,7 +21809,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:20814: result: $cf_cv_term_header" >&5
+echo "$as_me:21812: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -20846,7 +21844,7 @@ esac
 		fi
 
 	else
-		echo "$as_me:20849: result: no" >&5
+		echo "$as_me:21847: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -20862,7 +21860,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:20865: checking for $ac_word" >&5
+echo "$as_me:21863: 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
@@ -20877,7 +21875,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:20880: found $ac_dir/$ac_word" >&5
+echo "$as_me:21878: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -20885,10 +21883,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:20888: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:21886: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:20891: result: no" >&5
+  echo "$as_me:21889: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -20901,7 +21899,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:20904: checking for $ac_word" >&5
+echo "$as_me:21902: 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
@@ -20916,7 +21914,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:20919: found $ac_dir/$ac_word" >&5
+echo "$as_me:21917: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -20924,10 +21922,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:20927: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:21925: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:20930: result: no" >&5
+  echo "$as_me:21928: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -20940,7 +21938,103 @@ fi
 
 	if test "$NCURSES_CONFIG" != none ; then
 
-		CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`"
+cf_fix_cppflags=no
+cf_new_cflags=
+cf_new_cppflags=
+cf_new_extra_cppflags=
+
+for cf_add_cflags in `$NCURSES_CONFIG --cflags`
+do
+case $cf_fix_cppflags in
+(no)
+	case $cf_add_cflags in
+	(-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
+		case $cf_add_cflags in
+		(-D*)
+			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+
+			test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
+				&& test -z "${cf_tst_cflags}" \
+				&& cf_fix_cppflags=yes
+
+			if test $cf_fix_cppflags = yes ; then
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
+				continue
+			elif test "${cf_tst_cflags}" = "\"'" ; then
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
+				continue
+			fi
+			;;
+		esac
+		case "$CPPFLAGS" in
+		(*$cf_add_cflags)
+			;;
+		(*)
+			case $cf_add_cflags in
+			(-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
+
+	test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+	cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+
+			;;
+		esac
+		;;
+	(*)
+
+	test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+	cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+
+		;;
+	esac
+	;;
+(yes)
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
+	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
+
+	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
+		&& test -z "${cf_tst_cflags}" \
+		&& cf_fix_cppflags=no
+	;;
+esac
+done
+
+if test -n "$cf_new_cflags" ; then
+
+	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+	CFLAGS="${CFLAGS}$cf_new_cflags"
+
+fi
+
+if test -n "$cf_new_cppflags" ; then
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+
+fi
+
+if test -n "$cf_new_extra_cppflags" ; then
+
+	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+
+fi
 
 cf_add_libs="`$NCURSES_CONFIG --libs`"
 # Filter out duplicates - this happens with badly-designed ".pc" files...
@@ -20960,7 +22054,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:20963: checking if we have identified curses headers" >&5
+echo "$as_me:22057: 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
@@ -20972,7 +22066,7 @@ for cf_header in \
 	curses.h $cf_cv_screen/curses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 20975 "configure"
+#line 22069 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -20984,16 +22078,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20987: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22081: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20990: \$? = $ac_status" >&5
+  echo "$as_me:22084: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20993: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22087: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20996: \$? = $ac_status" >&5
+  echo "$as_me:22090: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -21004,11 +22098,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:21007: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:22101: 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:21011: error: No curses header-files found" >&5
+	{ { echo "$as_me:22105: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -21018,23 +22112,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:21021: checking for $ac_header" >&5
+echo "$as_me:22115: 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 21027 "configure"
+#line 22121 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:21031: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:22125: \"$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:21037: \$? = $ac_status" >&5
+  echo "$as_me:22131: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -21053,7 +22147,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:21056: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:22150: 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
@@ -21104,9 +22198,12 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 			if test "$GCC" = yes
 			then
 			  cf_save_CPPFLAGS=$CPPFLAGS
-			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 21109 "configure"
+#line 22206 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -21118,16 +22215,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21121: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22218: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21124: \$? = $ac_status" >&5
+  echo "$as_me:22221: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21127: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22224: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21130: \$? = $ac_status" >&5
+  echo "$as_me:22227: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -21144,7 +22241,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}:21147: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:22244: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -21163,7 +22260,7 @@ fi
 
 }
 
-echo "$as_me:21166: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:22263: 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
@@ -21175,7 +22272,7 @@ else
 	do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 21178 "configure"
+#line 22275 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -21199,16 +22296,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21202: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22299: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21205: \$? = $ac_status" >&5
+  echo "$as_me:22302: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21208: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22305: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21211: \$? = $ac_status" >&5
+  echo "$as_me:22308: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -21223,14 +22320,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 	done
 
 fi
-echo "$as_me:21226: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:22323: 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:21233: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:22330: 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
@@ -21346,9 +22443,12 @@ if test -n "$cf_incdir" ; then
 			if test "$GCC" = yes
 			then
 			  cf_save_CPPFLAGS=$CPPFLAGS
-			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 21351 "configure"
+#line 22451 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -21360,16 +22460,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21363: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22463: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21366: \$? = $ac_status" >&5
+  echo "$as_me:22466: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21369: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22469: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21372: \$? = $ac_status" >&5
+  echo "$as_me:22472: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -21386,7 +22486,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}:21389: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:22489: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -21409,7 +22509,7 @@ fi
 		do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 21412 "configure"
+#line 22512 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -21433,16 +22533,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21436: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22536: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21439: \$? = $ac_status" >&5
+  echo "$as_me:22539: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21442: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22542: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21445: \$? = $ac_status" >&5
+  echo "$as_me:22545: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -21463,12 +22563,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:21466: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:22566: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:21471: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:22571: 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%/[^/]*$%%'`
@@ -21499,9 +22599,12 @@ if test -n "$cf_1st_incdir" ; then
 			if test "$GCC" = yes
 			then
 			  cf_save_CPPFLAGS=$CPPFLAGS
-			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 21504 "configure"
+#line 22607 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -21513,16 +22616,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21516: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22619: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21519: \$? = $ac_status" >&5
+  echo "$as_me:22622: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21522: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22625: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21525: \$? = $ac_status" >&5
+  echo "$as_me:22628: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -21539,7 +22642,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}:21542: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:22645: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -21587,7 +22690,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:21590: checking for terminfo header" >&5
+echo "$as_me:22693: 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
@@ -21605,7 +22708,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 21608 "configure"
+#line 22711 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -21620,16 +22723,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21623: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22726: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21626: \$? = $ac_status" >&5
+  echo "$as_me:22729: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21629: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22732: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21632: \$? = $ac_status" >&5
+  echo "$as_me:22735: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -21645,7 +22748,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:21648: result: $cf_cv_term_header" >&5
+echo "$as_me:22751: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -21683,7 +22786,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:21686: checking for ncurses version" >&5
+echo "$as_me:22789: 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
@@ -21709,10 +22812,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:21712: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:22815: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:21715: \$? = $ac_status" >&5
+  echo "$as_me:22818: \$? = $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%".*%%'`
@@ -21722,7 +22825,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 21725 "configure"
+#line 22828 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -21747,15 +22850,15 @@ int main(void)
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:21750: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22853: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21753: \$? = $ac_status" >&5
+  echo "$as_me:22856: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:21755: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22858: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21758: \$? = $ac_status" >&5
+  echo "$as_me:22861: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -21769,7 +22872,7 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:21772: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:22875: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -21782,7 +22885,7 @@ cf_nculib_root=$cf_cv_screen
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:21785: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:22888: 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
@@ -21790,7 +22893,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 21793 "configure"
+#line 22896 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21809,16 +22912,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21812: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22915: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21815: \$? = $ac_status" >&5
+  echo "$as_me:22918: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21818: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22921: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21821: \$? = $ac_status" >&5
+  echo "$as_me:22924: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -21829,10 +22932,10 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21832: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:22935: 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:21835: checking for initscr in -lgpm" >&5
+  echo "$as_me:22938: 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
@@ -21840,7 +22943,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 21843 "configure"
+#line 22946 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21859,16 +22962,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21862: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22965: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21865: \$? = $ac_status" >&5
+  echo "$as_me:22968: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21868: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22971: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21871: \$? = $ac_status" >&5
+  echo "$as_me:22974: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -21879,7 +22982,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21882: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:22985: 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"
@@ -21894,7 +22997,7 @@ case $host_os in
 	# 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:21897: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:23000: 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
@@ -21902,7 +23005,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 21905 "configure"
+#line 23008 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21921,16 +23024,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21924: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23027: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21927: \$? = $ac_status" >&5
+  echo "$as_me:23030: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21930: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23033: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21933: \$? = $ac_status" >&5
+  echo "$as_me:23036: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -21941,7 +23044,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21944: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:23047: 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"
@@ -21990,13 +23093,13 @@ else
 
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
-	echo "$as_me:21993: checking for initscr" >&5
+	echo "$as_me:23096: 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 21999 "configure"
+#line 23102 "configure"
 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22027,16 +23130,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22030: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23133: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22033: \$? = $ac_status" >&5
+  echo "$as_me:23136: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22036: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23139: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22039: \$? = $ac_status" >&5
+  echo "$as_me:23142: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -22046,18 +23149,18 @@ ac_cv_func_initscr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:22049: result: $ac_cv_func_initscr" >&5
+echo "$as_me:23152: 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:22056: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:23159: 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 22060 "configure"
+#line 23163 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -22069,25 +23172,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22072: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23175: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22075: \$? = $ac_status" >&5
+  echo "$as_me:23178: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22078: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23181: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22081: \$? = $ac_status" >&5
+  echo "$as_me:23184: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:22083: result: yes" >&5
+  echo "$as_me:23186: 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:22090: result: no" >&5
+echo "$as_me:23193: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -22155,11 +23258,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:22158: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:23261: 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 22162 "configure"
+#line 23265 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -22171,25 +23274,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22174: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23277: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22177: \$? = $ac_status" >&5
+  echo "$as_me:23280: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22180: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23283: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22183: \$? = $ac_status" >&5
+  echo "$as_me:23286: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:22185: result: yes" >&5
+  echo "$as_me:23288: 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:22192: result: no" >&5
+echo "$as_me:23295: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -22204,7 +23307,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:22207: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:23310: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -22212,7 +23315,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:22215: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:23318: 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
@@ -22222,7 +23325,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >conftest.$ac_ext <<_ACEOF
-#line 22225 "configure"
+#line 23328 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -22234,23 +23337,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22237: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23340: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22240: \$? = $ac_status" >&5
+  echo "$as_me:23343: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22243: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23346: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22246: \$? = $ac_status" >&5
+  echo "$as_me:23349: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:22248: result: yes" >&5
+  echo "$as_me:23351: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:22253: result: no" >&5
+echo "$as_me:23356: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -22276,20 +23379,116 @@ cf_ncuconfig_root=$cf_cv_screen
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:22279: checking pkg-config for $cf_ncuconfig_root" >&5
+	echo "$as_me:23382: checking pkg-config for $cf_ncuconfig_root" >&5
 echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
 	if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then
-		echo "$as_me:22282: result: yes" >&5
+		echo "$as_me:23385: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:22285: checking if the $cf_ncuconfig_root package files work" >&5
+		echo "$as_me:23388: checking if the $cf_ncuconfig_root package files work" >&5
 echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
 		cf_have_ncuconfig=unknown
 
 		cf_save_CPPFLAGS="$CPPFLAGS"
 		cf_save_LIBS="$LIBS"
 
-		CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags $cf_ncuconfig_root`"
+cf_fix_cppflags=no
+cf_new_cflags=
+cf_new_cppflags=
+cf_new_extra_cppflags=
+
+for cf_add_cflags in `$PKG_CONFIG --cflags $cf_ncuconfig_root`
+do
+case $cf_fix_cppflags in
+(no)
+	case $cf_add_cflags in
+	(-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
+		case $cf_add_cflags in
+		(-D*)
+			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+
+			test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
+				&& test -z "${cf_tst_cflags}" \
+				&& cf_fix_cppflags=yes
+
+			if test $cf_fix_cppflags = yes ; then
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
+				continue
+			elif test "${cf_tst_cflags}" = "\"'" ; then
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
+				continue
+			fi
+			;;
+		esac
+		case "$CPPFLAGS" in
+		(*$cf_add_cflags)
+			;;
+		(*)
+			case $cf_add_cflags in
+			(-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
+
+	test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+	cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+
+			;;
+		esac
+		;;
+	(*)
+
+	test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+	cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+
+		;;
+	esac
+	;;
+(yes)
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
+	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
+
+	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
+		&& test -z "${cf_tst_cflags}" \
+		&& cf_fix_cppflags=no
+	;;
+esac
+done
+
+if test -n "$cf_new_cflags" ; then
+
+	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+	CFLAGS="${CFLAGS}$cf_new_cflags"
+
+fi
+
+if test -n "$cf_new_cppflags" ; then
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+
+fi
+
+if test -n "$cf_new_extra_cppflags" ; then
+
+	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+
+fi
 
 cf_add_libs="`$PKG_CONFIG --libs $cf_ncuconfig_root`"
 # Filter out duplicates - this happens with badly-designed ".pc" files...
@@ -22308,7 +23507,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 22311 "configure"
+#line 23510 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -22320,37 +23519,37 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22323: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23522: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22326: \$? = $ac_status" >&5
+  echo "$as_me:23525: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22329: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23528: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22332: \$? = $ac_status" >&5
+  echo "$as_me:23531: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 22338 "configure"
+#line 23537 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 				int main(void)
 				{ char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:22345: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23544: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22348: \$? = $ac_status" >&5
+  echo "$as_me:23547: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:22350: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23549: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22353: \$? = $ac_status" >&5
+  echo "$as_me:23552: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -22367,7 +23566,7 @@ cat conftest.$ac_ext >&5
 cf_have_ncuconfig=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-		echo "$as_me:22370: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:23569: result: $cf_have_ncuconfig" >&5
 echo "${ECHO_T}$cf_have_ncuconfig" >&6
 		test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
 		if test "$cf_have_ncuconfig" != "yes"
@@ -22383,7 +23582,7 @@ EOF
 
 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
-echo "$as_me:22386: checking for terminfo header" >&5
+echo "$as_me:23585: 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
@@ -22401,7 +23600,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 22404 "configure"
+#line 23603 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -22416,16 +23615,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22419: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23618: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22422: \$? = $ac_status" >&5
+  echo "$as_me:23621: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22425: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23624: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22428: \$? = $ac_status" >&5
+  echo "$as_me:23627: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -22441,7 +23640,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:22444: result: $cf_cv_term_header" >&5
+echo "$as_me:23643: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -22476,7 +23675,7 @@ esac
 		fi
 
 	else
-		echo "$as_me:22479: result: no" >&5
+		echo "$as_me:23678: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -22492,7 +23691,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:22495: checking for $ac_word" >&5
+echo "$as_me:23694: 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
@@ -22507,7 +23706,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:22510: found $ac_dir/$ac_word" >&5
+echo "$as_me:23709: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -22515,10 +23714,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:22518: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:23717: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:22521: result: no" >&5
+  echo "$as_me:23720: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -22531,7 +23730,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:22534: checking for $ac_word" >&5
+echo "$as_me:23733: 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
@@ -22546,7 +23745,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:22549: found $ac_dir/$ac_word" >&5
+echo "$as_me:23748: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -22554,10 +23753,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:22557: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:23756: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:22560: result: no" >&5
+  echo "$as_me:23759: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -22570,7 +23769,103 @@ fi
 
 	if test "$NCURSES_CONFIG" != none ; then
 
-		CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`"
+cf_fix_cppflags=no
+cf_new_cflags=
+cf_new_cppflags=
+cf_new_extra_cppflags=
+
+for cf_add_cflags in `$NCURSES_CONFIG --cflags`
+do
+case $cf_fix_cppflags in
+(no)
+	case $cf_add_cflags in
+	(-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
+		case $cf_add_cflags in
+		(-D*)
+			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+
+			test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
+				&& test -z "${cf_tst_cflags}" \
+				&& cf_fix_cppflags=yes
+
+			if test $cf_fix_cppflags = yes ; then
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
+				continue
+			elif test "${cf_tst_cflags}" = "\"'" ; then
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
+				continue
+			fi
+			;;
+		esac
+		case "$CPPFLAGS" in
+		(*$cf_add_cflags)
+			;;
+		(*)
+			case $cf_add_cflags in
+			(-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
+
+	test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+	cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+
+			;;
+		esac
+		;;
+	(*)
+
+	test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+	cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+
+		;;
+	esac
+	;;
+(yes)
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
+	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
+
+	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
+		&& test -z "${cf_tst_cflags}" \
+		&& cf_fix_cppflags=no
+	;;
+esac
+done
+
+if test -n "$cf_new_cflags" ; then
+
+	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+	CFLAGS="${CFLAGS}$cf_new_cflags"
+
+fi
+
+if test -n "$cf_new_cppflags" ; then
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+
+fi
+
+if test -n "$cf_new_extra_cppflags" ; then
+
+	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+
+fi
 
 cf_add_libs="`$NCURSES_CONFIG --libs`"
 # Filter out duplicates - this happens with badly-designed ".pc" files...
@@ -22590,7 +23885,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:22593: checking if we have identified curses headers" >&5
+echo "$as_me:23888: 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
@@ -22602,7 +23897,7 @@ for cf_header in \
 	curses.h $cf_cv_screen/curses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 22605 "configure"
+#line 23900 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -22614,16 +23909,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22617: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23912: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22620: \$? = $ac_status" >&5
+  echo "$as_me:23915: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22623: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23918: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22626: \$? = $ac_status" >&5
+  echo "$as_me:23921: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -22634,11 +23929,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:22637: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:23932: 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:22641: error: No curses header-files found" >&5
+	{ { echo "$as_me:23936: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -22648,23 +23943,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:22651: checking for $ac_header" >&5
+echo "$as_me:23946: 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 22657 "configure"
+#line 23952 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22661: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:23956: \"$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:22667: \$? = $ac_status" >&5
+  echo "$as_me:23962: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22683,7 +23978,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:22686: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:23981: 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
@@ -22734,9 +24029,12 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 			if test "$GCC" = yes
 			then
 			  cf_save_CPPFLAGS=$CPPFLAGS
-			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 22739 "configure"
+#line 24037 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -22748,16 +24046,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22751: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24049: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22754: \$? = $ac_status" >&5
+  echo "$as_me:24052: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22757: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24055: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22760: \$? = $ac_status" >&5
+  echo "$as_me:24058: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -22774,7 +24072,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}:22777: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24075: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -22793,7 +24091,7 @@ fi
 
 }
 
-echo "$as_me:22796: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:24094: 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
@@ -22805,7 +24103,7 @@ else
 	do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 22808 "configure"
+#line 24106 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -22829,16 +24127,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22832: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24130: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22835: \$? = $ac_status" >&5
+  echo "$as_me:24133: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22838: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24136: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22841: \$? = $ac_status" >&5
+  echo "$as_me:24139: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -22853,14 +24151,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 	done
 
 fi
-echo "$as_me:22856: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:24154: 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:22863: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:24161: 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
@@ -22976,9 +24274,12 @@ if test -n "$cf_incdir" ; then
 			if test "$GCC" = yes
 			then
 			  cf_save_CPPFLAGS=$CPPFLAGS
-			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 22981 "configure"
+#line 24282 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -22990,16 +24291,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22993: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24294: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22996: \$? = $ac_status" >&5
+  echo "$as_me:24297: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22999: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24300: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23002: \$? = $ac_status" >&5
+  echo "$as_me:24303: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -23016,7 +24317,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}:23019: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24320: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -23039,7 +24340,7 @@ fi
 		do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 23042 "configure"
+#line 24343 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -23063,16 +24364,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23066: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24367: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23069: \$? = $ac_status" >&5
+  echo "$as_me:24370: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23072: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24373: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23075: \$? = $ac_status" >&5
+  echo "$as_me:24376: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -23093,12 +24394,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:23096: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:24397: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:23101: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:24402: 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%/[^/]*$%%'`
@@ -23129,9 +24430,12 @@ if test -n "$cf_1st_incdir" ; then
 			if test "$GCC" = yes
 			then
 			  cf_save_CPPFLAGS=$CPPFLAGS
-			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 23134 "configure"
+#line 24438 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -23143,16 +24447,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23146: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24450: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23149: \$? = $ac_status" >&5
+  echo "$as_me:24453: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23152: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24456: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23155: \$? = $ac_status" >&5
+  echo "$as_me:24459: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -23169,7 +24473,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}:23172: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24476: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -23217,7 +24521,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:23220: checking for terminfo header" >&5
+echo "$as_me:24524: 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
@@ -23235,7 +24539,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 23238 "configure"
+#line 24542 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -23250,16 +24554,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23253: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24557: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23256: \$? = $ac_status" >&5
+  echo "$as_me:24560: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23259: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24563: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23262: \$? = $ac_status" >&5
+  echo "$as_me:24566: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -23275,7 +24579,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:23278: result: $cf_cv_term_header" >&5
+echo "$as_me:24582: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -23313,7 +24617,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:23316: checking for ncurses version" >&5
+echo "$as_me:24620: 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
@@ -23339,10 +24643,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:23342: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:24646: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:23345: \$? = $ac_status" >&5
+  echo "$as_me:24649: \$? = $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%".*%%'`
@@ -23352,7 +24656,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 23355 "configure"
+#line 24659 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -23377,15 +24681,15 @@ int main(void)
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:23380: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24684: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23383: \$? = $ac_status" >&5
+  echo "$as_me:24687: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:23385: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24689: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23388: \$? = $ac_status" >&5
+  echo "$as_me:24692: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -23399,7 +24703,7 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:23402: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:24706: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -23412,7 +24716,7 @@ cf_nculib_root=$cf_cv_screen
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:23415: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:24719: 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
@@ -23420,7 +24724,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 23423 "configure"
+#line 24727 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23439,16 +24743,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23442: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24746: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23445: \$? = $ac_status" >&5
+  echo "$as_me:24749: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23448: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24752: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23451: \$? = $ac_status" >&5
+  echo "$as_me:24755: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -23459,10 +24763,10 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23462: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:24766: 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:23465: checking for initscr in -lgpm" >&5
+  echo "$as_me:24769: 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
@@ -23470,7 +24774,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 23473 "configure"
+#line 24777 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23489,16 +24793,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23492: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24796: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23495: \$? = $ac_status" >&5
+  echo "$as_me:24799: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23498: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24802: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23501: \$? = $ac_status" >&5
+  echo "$as_me:24805: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -23509,7 +24813,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23512: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:24816: 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"
@@ -23524,7 +24828,7 @@ case $host_os in
 	# 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:23527: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:24831: 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
@@ -23532,7 +24836,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 23535 "configure"
+#line 24839 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23551,16 +24855,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23554: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24858: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23557: \$? = $ac_status" >&5
+  echo "$as_me:24861: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23560: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24864: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23563: \$? = $ac_status" >&5
+  echo "$as_me:24867: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -23571,7 +24875,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23574: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:24878: 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"
@@ -23620,13 +24924,13 @@ else
 
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
-	echo "$as_me:23623: checking for initscr" >&5
+	echo "$as_me:24927: 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 23629 "configure"
+#line 24933 "configure"
 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -23657,16 +24961,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23660: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24964: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23663: \$? = $ac_status" >&5
+  echo "$as_me:24967: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23666: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24970: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23669: \$? = $ac_status" >&5
+  echo "$as_me:24973: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -23676,18 +24980,18 @@ ac_cv_func_initscr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:23679: result: $ac_cv_func_initscr" >&5
+echo "$as_me:24983: 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:23686: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:24990: 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 23690 "configure"
+#line 24994 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -23699,25 +25003,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23702: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25006: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23705: \$? = $ac_status" >&5
+  echo "$as_me:25009: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23708: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25012: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23711: \$? = $ac_status" >&5
+  echo "$as_me:25015: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:23713: result: yes" >&5
+  echo "$as_me:25017: 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:23720: result: no" >&5
+echo "$as_me:25024: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -23785,11 +25089,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:23788: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:25092: 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 23792 "configure"
+#line 25096 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -23801,25 +25105,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23804: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25108: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23807: \$? = $ac_status" >&5
+  echo "$as_me:25111: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23810: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25114: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23813: \$? = $ac_status" >&5
+  echo "$as_me:25117: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:23815: result: yes" >&5
+  echo "$as_me:25119: 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:23822: result: no" >&5
+echo "$as_me:25126: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -23834,7 +25138,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:23837: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:25141: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -23842,7 +25146,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:23845: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:25149: 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
@@ -23852,7 +25156,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >conftest.$ac_ext <<_ACEOF
-#line 23855 "configure"
+#line 25159 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -23864,23 +25168,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23867: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25171: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23870: \$? = $ac_status" >&5
+  echo "$as_me:25174: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23873: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25177: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23876: \$? = $ac_status" >&5
+  echo "$as_me:25180: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:23878: result: yes" >&5
+  echo "$as_me:25182: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:23883: result: no" >&5
+echo "$as_me:25187: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -23912,7 +25216,7 @@ fi
 	;;
 (slang)
 
-echo "$as_me:23915: checking for slang header file" >&5
+echo "$as_me:25219: 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
@@ -23920,7 +25224,7 @@ else
 
 	cf_cv_slang_header=no
 	cat >conftest.$ac_ext <<_ACEOF
-#line 23923 "configure"
+#line 25227 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -23932,16 +25236,16 @@ printf("%s\n", SLANG_VERSION)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23935: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25239: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23938: \$? = $ac_status" >&5
+  echo "$as_me:25242: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23941: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25245: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23944: \$? = $ac_status" >&5
+  echo "$as_me:25248: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_header=predefined
 else
@@ -24046,7 +25350,7 @@ cf_search="$cf_search $cf_header_path_list"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:24049: result: $cf_cv_slang_header" >&5
+echo "$as_me:25353: result: $cf_cv_slang_header" >&5
 echo "${ECHO_T}$cf_cv_slang_header" >&6
 
 if test "x$cf_cv_slang_header" != xno
@@ -24085,9 +25389,12 @@ if test -n "$cf_incdir" ; then
 			if test "$GCC" = yes
 			then
 			  cf_save_CPPFLAGS=$CPPFLAGS
-			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 24090 "configure"
+#line 25397 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24099,16 +25406,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24102: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25409: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24105: \$? = $ac_status" >&5
+  echo "$as_me:25412: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24108: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25415: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24111: \$? = $ac_status" >&5
+  echo "$as_me:25418: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -24125,7 +25432,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}:24128: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:25435: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24157,7 +25464,7 @@ else
 
 cf_cv_termlib=none
 cat >conftest.$ac_ext <<_ACEOF
-#line 24160 "configure"
+#line 25467 "configure"
 #include "confdefs.h"
 
 int
@@ -24169,19 +25476,19 @@ char *x=(char*)tgoto("",0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24172: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25479: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24175: \$? = $ac_status" >&5
+  echo "$as_me:25482: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24178: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25485: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24181: \$? = $ac_status" >&5
+  echo "$as_me:25488: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 24184 "configure"
+#line 25491 "configure"
 #include "confdefs.h"
 
 int
@@ -24193,16 +25500,16 @@ int x=tigetstr("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24196: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25503: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24199: \$? = $ac_status" >&5
+  echo "$as_me:25506: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24202: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25509: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24205: \$? = $ac_status" >&5
+  echo "$as_me:25512: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termlib=terminfo
 else
@@ -24213,7 +25520,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}:24216: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
+echo "${as_me:-configure}:25523: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
 
 else
   echo "$as_me: failed program was:" >&5
@@ -24228,10 +25535,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:24231: checking for $cf_func in -l$cf_lib" >&5
+			echo "$as_me:25538: 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 24234 "configure"
+#line 25541 "configure"
 #include "confdefs.h"
 
 int
@@ -24243,16 +25550,16 @@ int x=$cf_func("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24246: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25553: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24249: \$? = $ac_status" >&5
+  echo "$as_me:25556: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24252: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25559: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24255: \$? = $ac_status" >&5
+  echo "$as_me:25562: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -24261,7 +25568,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-			echo "$as_me:24264: result: $cf_result" >&5
+			echo "$as_me:25571: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				if test "$cf_func" = tigetstr ; then
@@ -24278,7 +25585,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:24281: checking for initscr in -lcurses" >&5
+	echo "$as_me:25588: 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
@@ -24286,7 +25593,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 24289 "configure"
+#line 25596 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24305,16 +25612,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24308: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25615: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24311: \$? = $ac_status" >&5
+  echo "$as_me:25618: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24314: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25621: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24317: \$? = $ac_status" >&5
+  echo "$as_me:25624: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_curses_initscr=yes
 else
@@ -24325,7 +25632,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24328: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:25635: 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
 
@@ -24347,7 +25654,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-	echo "$as_me:24350: checking for tgoto in -ltermcap" >&5
+	echo "$as_me:25657: 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
@@ -24355,7 +25662,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 24358 "configure"
+#line 25665 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24374,16 +25681,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24377: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25684: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24380: \$? = $ac_status" >&5
+  echo "$as_me:25687: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24383: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25690: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24386: \$? = $ac_status" >&5
+  echo "$as_me:25693: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_termcap_tgoto=yes
 else
@@ -24394,7 +25701,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24397: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:25704: 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
 
@@ -24421,20 +25728,20 @@ fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 if test "$cf_cv_termlib" = none; then
-	{ echo "$as_me:24424: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+	{ echo "$as_me:25731: 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:24431: checking for acos" >&5
+echo "$as_me:25738: 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 24437 "configure"
+#line 25744 "configure"
 #include "confdefs.h"
 #define acos autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -24465,16 +25772,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24468: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25775: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24471: \$? = $ac_status" >&5
+  echo "$as_me:25778: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24474: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25781: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24477: \$? = $ac_status" >&5
+  echo "$as_me:25784: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_acos=yes
 else
@@ -24484,13 +25791,13 @@ ac_cv_func_acos=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:24487: result: $ac_cv_func_acos" >&5
+echo "$as_me:25794: 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:24493: checking for acos in -lm" >&5
+echo "$as_me:25800: 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
@@ -24498,7 +25805,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm $LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 24501 "configure"
+#line 25808 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24517,16 +25824,16 @@ acos ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24520: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25827: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24523: \$? = $ac_status" >&5
+  echo "$as_me:25830: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24526: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25833: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24529: \$? = $ac_status" >&5
+  echo "$as_me:25836: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_m_acos=yes
 else
@@ -24537,7 +25844,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24540: result: $ac_cv_lib_m_acos" >&5
+echo "$as_me:25847: 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
 
@@ -24563,13 +25870,13 @@ case $host_os in
 
 	eval 'cf_cv_have_lib_'video'=no'
 	cf_libdir=""
-	echo "$as_me:24566: checking for v_init" >&5
+	echo "$as_me:25873: 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 24572 "configure"
+#line 25879 "configure"
 #include "confdefs.h"
 #define v_init autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -24600,16 +25907,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24603: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25910: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24606: \$? = $ac_status" >&5
+  echo "$as_me:25913: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24609: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25916: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24612: \$? = $ac_status" >&5
+  echo "$as_me:25919: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_v_init=yes
 else
@@ -24619,18 +25926,18 @@ ac_cv_func_v_init=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:24622: result: $ac_cv_func_v_init" >&5
+echo "$as_me:25929: 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:24629: checking for v_init in -lvideo" >&5
+		echo "$as_me:25936: 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 24633 "configure"
+#line 25940 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -24642,25 +25949,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24645: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25952: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24648: \$? = $ac_status" >&5
+  echo "$as_me:25955: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24651: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25958: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24654: \$? = $ac_status" >&5
+  echo "$as_me:25961: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:24656: result: yes" >&5
+  echo "$as_me:25963: 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:24663: result: no" >&5
+echo "$as_me:25970: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -24728,11 +26035,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:24731: checking for -lvideo in $cf_libdir" >&5
+				echo "$as_me:26038: 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 24735 "configure"
+#line 26042 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -24744,25 +26051,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24747: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26054: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24750: \$? = $ac_status" >&5
+  echo "$as_me:26057: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24753: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26060: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24756: \$? = $ac_status" >&5
+  echo "$as_me:26063: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:24758: result: yes" >&5
+  echo "$as_me:26065: 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:24765: result: no" >&5
+echo "$as_me:26072: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -24777,7 +26084,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'video
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:24780: error: Cannot link video library" >&5
+	{ { echo "$as_me:26087: error: Cannot link video library" >&5
 echo "$as_me: error: Cannot link video library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -24787,13 +26094,13 @@ esac
 
 	eval 'cf_cv_have_lib_'slang'=no'
 	cf_libdir=""
-	echo "$as_me:24790: checking for SLtt_get_screen_size" >&5
+	echo "$as_me:26097: 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 24796 "configure"
+#line 26103 "configure"
 #include "confdefs.h"
 #define SLtt_get_screen_size autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -24824,16 +26131,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24827: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26134: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24830: \$? = $ac_status" >&5
+  echo "$as_me:26137: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24833: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26140: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24836: \$? = $ac_status" >&5
+  echo "$as_me:26143: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_SLtt_get_screen_size=yes
 else
@@ -24843,18 +26150,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:24846: result: $ac_cv_func_SLtt_get_screen_size" >&5
+echo "$as_me:26153: 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:24853: checking for SLtt_get_screen_size in -lslang" >&5
+		echo "$as_me:26160: 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 24857 "configure"
+#line 26164 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -24866,25 +26173,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24869: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26176: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24872: \$? = $ac_status" >&5
+  echo "$as_me:26179: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24875: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26182: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24878: \$? = $ac_status" >&5
+  echo "$as_me:26185: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:24880: result: yes" >&5
+  echo "$as_me:26187: 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:24887: result: no" >&5
+echo "$as_me:26194: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -24952,11 +26259,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:24955: checking for -lslang in $cf_libdir" >&5
+				echo "$as_me:26262: 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 24959 "configure"
+#line 26266 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -24968,25 +26275,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24971: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26278: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24974: \$? = $ac_status" >&5
+  echo "$as_me:26281: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24977: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26284: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24980: \$? = $ac_status" >&5
+  echo "$as_me:26287: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:24982: result: yes" >&5
+  echo "$as_me:26289: 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:24989: result: no" >&5
+echo "$as_me:26296: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -25001,13 +26308,13 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'slang
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:25004: error: Cannot link slang library" >&5
+	{ { echo "$as_me:26311: 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:25010: checking if we can link slang without termcap" >&5
+echo "$as_me:26317: 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%^.%%'`
@@ -25016,7 +26323,7 @@ else
 fi
 LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s%$cf_exclude%%" -e 's%^.%%'`
 cat >conftest.$ac_ext <<_ACEOF
-#line 25019 "configure"
+#line 26326 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -25028,16 +26335,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25031: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26338: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25034: \$? = $ac_status" >&5
+  echo "$as_me:26341: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25037: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26344: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25040: \$? = $ac_status" >&5
+  echo "$as_me:26347: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -25046,13 +26353,13 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:25049: result: $cf_result" >&5
+echo "$as_me:26356: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 test $cf_result = no && LIBS="$cf_slang_LIBS3"
 
 else
 
-echo "$as_me:25055: checking for slang2 header file" >&5
+echo "$as_me:26362: 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
@@ -25060,7 +26367,7 @@ else
 
 	cf_cv_slang2_header=no
 	cat >conftest.$ac_ext <<_ACEOF
-#line 25063 "configure"
+#line 26370 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -25072,16 +26379,16 @@ printf("%s\n", SLANG_VERSION)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25075: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26382: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25078: \$? = $ac_status" >&5
+  echo "$as_me:26385: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25081: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26388: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25084: \$? = $ac_status" >&5
+  echo "$as_me:26391: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang2_header=predefined
 else
@@ -25186,7 +26493,7 @@ cf_search="$cf_search $cf_header_path_list"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25189: result: $cf_cv_slang2_header" >&5
+echo "$as_me:26496: result: $cf_cv_slang2_header" >&5
 echo "${ECHO_T}$cf_cv_slang2_header" >&6
 
 if test "x$cf_cv_slang2_header" != xno
@@ -25225,9 +26532,12 @@ if test -n "$cf_incdir" ; then
 			if test "$GCC" = yes
 			then
 			  cf_save_CPPFLAGS=$CPPFLAGS
-			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 25230 "configure"
+#line 26540 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -25239,16 +26549,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25242: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26552: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25245: \$? = $ac_status" >&5
+  echo "$as_me:26555: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25248: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26558: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25251: \$? = $ac_status" >&5
+  echo "$as_me:26561: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -25265,7 +26575,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}:25268: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:26578: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -25297,7 +26607,7 @@ else
 
 cf_cv_termlib=none
 cat >conftest.$ac_ext <<_ACEOF
-#line 25300 "configure"
+#line 26610 "configure"
 #include "confdefs.h"
 
 int
@@ -25309,19 +26619,19 @@ char *x=(char*)tgoto("",0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25312: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26622: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25315: \$? = $ac_status" >&5
+  echo "$as_me:26625: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25318: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26628: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25321: \$? = $ac_status" >&5
+  echo "$as_me:26631: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 25324 "configure"
+#line 26634 "configure"
 #include "confdefs.h"
 
 int
@@ -25333,16 +26643,16 @@ int x=tigetstr("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25336: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26646: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25339: \$? = $ac_status" >&5
+  echo "$as_me:26649: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25342: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26652: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25345: \$? = $ac_status" >&5
+  echo "$as_me:26655: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termlib=terminfo
 else
@@ -25353,7 +26663,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}:25356: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
+echo "${as_me:-configure}:26666: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
 
 else
   echo "$as_me: failed program was:" >&5
@@ -25368,10 +26678,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:25371: checking for $cf_func in -l$cf_lib" >&5
+			echo "$as_me:26681: 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 25374 "configure"
+#line 26684 "configure"
 #include "confdefs.h"
 
 int
@@ -25383,16 +26693,16 @@ int x=$cf_func("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25386: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26696: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25389: \$? = $ac_status" >&5
+  echo "$as_me:26699: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25392: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26702: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25395: \$? = $ac_status" >&5
+  echo "$as_me:26705: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -25401,7 +26711,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-			echo "$as_me:25404: result: $cf_result" >&5
+			echo "$as_me:26714: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				if test "$cf_func" = tigetstr ; then
@@ -25418,7 +26728,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:25421: checking for initscr in -lcurses" >&5
+	echo "$as_me:26731: 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
@@ -25426,7 +26736,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 25429 "configure"
+#line 26739 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -25445,16 +26755,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25448: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26758: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25451: \$? = $ac_status" >&5
+  echo "$as_me:26761: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25454: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26764: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25457: \$? = $ac_status" >&5
+  echo "$as_me:26767: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_curses_initscr=yes
 else
@@ -25465,7 +26775,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:25468: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:26778: 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
 
@@ -25487,7 +26797,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-	echo "$as_me:25490: checking for tgoto in -ltermcap" >&5
+	echo "$as_me:26800: 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
@@ -25495,7 +26805,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 25498 "configure"
+#line 26808 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -25514,16 +26824,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25517: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26827: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25520: \$? = $ac_status" >&5
+  echo "$as_me:26830: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25523: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26833: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25526: \$? = $ac_status" >&5
+  echo "$as_me:26836: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_termcap_tgoto=yes
 else
@@ -25534,7 +26844,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:25537: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:26847: 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
 
@@ -25561,20 +26871,20 @@ fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 if test "$cf_cv_termlib" = none; then
-	{ echo "$as_me:25564: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+	{ echo "$as_me:26874: 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:25571: checking for acos" >&5
+echo "$as_me:26881: 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 25577 "configure"
+#line 26887 "configure"
 #include "confdefs.h"
 #define acos autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -25605,16 +26915,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25608: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26918: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25611: \$? = $ac_status" >&5
+  echo "$as_me:26921: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25614: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26924: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25617: \$? = $ac_status" >&5
+  echo "$as_me:26927: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_acos=yes
 else
@@ -25624,13 +26934,13 @@ ac_cv_func_acos=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:25627: result: $ac_cv_func_acos" >&5
+echo "$as_me:26937: 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:25633: checking for acos in -lm" >&5
+echo "$as_me:26943: 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
@@ -25638,7 +26948,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm $LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 25641 "configure"
+#line 26951 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -25657,16 +26967,16 @@ acos ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25660: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26970: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25663: \$? = $ac_status" >&5
+  echo "$as_me:26973: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25666: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26976: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25669: \$? = $ac_status" >&5
+  echo "$as_me:26979: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_m_acos=yes
 else
@@ -25677,7 +26987,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:25680: result: $ac_cv_lib_m_acos" >&5
+echo "$as_me:26990: 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
 
@@ -25703,13 +27013,13 @@ case $host_os in
 
 	eval 'cf_cv_have_lib_'video'=no'
 	cf_libdir=""
-	echo "$as_me:25706: checking for v_init" >&5
+	echo "$as_me:27016: 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 25712 "configure"
+#line 27022 "configure"
 #include "confdefs.h"
 #define v_init autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -25740,16 +27050,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25743: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27053: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25746: \$? = $ac_status" >&5
+  echo "$as_me:27056: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25749: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27059: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25752: \$? = $ac_status" >&5
+  echo "$as_me:27062: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_v_init=yes
 else
@@ -25759,18 +27069,18 @@ ac_cv_func_v_init=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:25762: result: $ac_cv_func_v_init" >&5
+echo "$as_me:27072: 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:25769: checking for v_init in -lvideo" >&5
+		echo "$as_me:27079: 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 25773 "configure"
+#line 27083 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -25782,25 +27092,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25785: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27095: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25788: \$? = $ac_status" >&5
+  echo "$as_me:27098: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25791: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27101: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25794: \$? = $ac_status" >&5
+  echo "$as_me:27104: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:25796: result: yes" >&5
+  echo "$as_me:27106: 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:25803: result: no" >&5
+echo "$as_me:27113: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -25868,11 +27178,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:25871: checking for -lvideo in $cf_libdir" >&5
+				echo "$as_me:27181: 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 25875 "configure"
+#line 27185 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -25884,25 +27194,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25887: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27197: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25890: \$? = $ac_status" >&5
+  echo "$as_me:27200: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25893: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27203: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25896: \$? = $ac_status" >&5
+  echo "$as_me:27206: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:25898: result: yes" >&5
+  echo "$as_me:27208: 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:25905: result: no" >&5
+echo "$as_me:27215: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -25917,7 +27227,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'video
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:25920: error: Cannot link video library" >&5
+	{ { echo "$as_me:27230: error: Cannot link video library" >&5
 echo "$as_me: error: Cannot link video library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -25927,13 +27237,13 @@ esac
 
 	eval 'cf_cv_have_lib_'slang2'=no'
 	cf_libdir=""
-	echo "$as_me:25930: checking for SLtt_get_screen_size" >&5
+	echo "$as_me:27240: 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 25936 "configure"
+#line 27246 "configure"
 #include "confdefs.h"
 #define SLtt_get_screen_size autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -25964,16 +27274,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25967: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27277: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25970: \$? = $ac_status" >&5
+  echo "$as_me:27280: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25973: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27283: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25976: \$? = $ac_status" >&5
+  echo "$as_me:27286: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_SLtt_get_screen_size=yes
 else
@@ -25983,18 +27293,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:25986: result: $ac_cv_func_SLtt_get_screen_size" >&5
+echo "$as_me:27296: 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:25993: checking for SLtt_get_screen_size in -lslang2" >&5
+		echo "$as_me:27303: 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 25997 "configure"
+#line 27307 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -26006,25 +27316,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26009: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27319: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26012: \$? = $ac_status" >&5
+  echo "$as_me:27322: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26015: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27325: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26018: \$? = $ac_status" >&5
+  echo "$as_me:27328: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:26020: result: yes" >&5
+  echo "$as_me:27330: 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:26027: result: no" >&5
+echo "$as_me:27337: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -26092,11 +27402,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:26095: checking for -lslang2 in $cf_libdir" >&5
+				echo "$as_me:27405: 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 26099 "configure"
+#line 27409 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -26108,25 +27418,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26111: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27421: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26114: \$? = $ac_status" >&5
+  echo "$as_me:27424: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26117: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27427: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26120: \$? = $ac_status" >&5
+  echo "$as_me:27430: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:26122: result: yes" >&5
+  echo "$as_me:27432: 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:26129: result: no" >&5
+echo "$as_me:27439: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -26141,13 +27451,13 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'slang2
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:26144: error: Cannot link slang2 library" >&5
+	{ { echo "$as_me:27454: 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:26150: checking if we can link slang2 without termcap" >&5
+echo "$as_me:27460: 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%^.%%'`
@@ -26156,7 +27466,7 @@ else
 fi
 LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s%$cf_exclude%%" -e 's%^.%%'`
 cat >conftest.$ac_ext <<_ACEOF
-#line 26159 "configure"
+#line 27469 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -26168,16 +27478,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26171: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27481: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26174: \$? = $ac_status" >&5
+  echo "$as_me:27484: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26177: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27487: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26180: \$? = $ac_status" >&5
+  echo "$as_me:27490: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -26186,12 +27496,12 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:26189: result: $cf_result" >&5
+echo "$as_me:27499: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 test $cf_result = no && LIBS="$cf_slang_LIBS3"
 
 	else
-		{ { echo "$as_me:26194: error: cannot find slang headers" >&5
+		{ { echo "$as_me:27504: error: cannot find slang headers" >&5
 echo "$as_me: error: cannot find slang headers" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -26199,14 +27509,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:26202: checking if we must define UTF8" >&5
+echo "$as_me:27512: 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 26209 "configure"
+#line 27519 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -26218,16 +27528,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26221: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27531: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26224: \$? = $ac_status" >&5
+  echo "$as_me:27534: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26227: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27537: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26230: \$? = $ac_status" >&5
+  echo "$as_me:27540: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_utf8=no
 else
@@ -26235,7 +27545,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 26238 "configure"
+#line 27548 "configure"
 #include "confdefs.h"
 
 #define UTF8
@@ -26249,16 +27559,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26252: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27562: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26255: \$? = $ac_status" >&5
+  echo "$as_me:27565: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26258: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27568: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26261: \$? = $ac_status" >&5
+  echo "$as_me:27571: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_utf8=yes
 else
@@ -26271,7 +27581,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:26274: result: $cf_cv_slang_utf8" >&5
+echo "$as_me:27584: result: $cf_cv_slang_utf8" >&5
 echo "${ECHO_T}$cf_cv_slang_utf8" >&6
 
 if test "$cf_cv_slang_utf8" = yes ; then
@@ -26282,14 +27592,14 @@ EOF
 
 fi
 
-echo "$as_me:26285: checking if we must tell slang this is UNIX" >&5
+echo "$as_me:27595: 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 26292 "configure"
+#line 27602 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -26308,16 +27618,16 @@ SLang_TT_Baud_Rate = 1
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26311: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27621: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26314: \$? = $ac_status" >&5
+  echo "$as_me:27624: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26317: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27627: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26320: \$? = $ac_status" >&5
+  echo "$as_me:27630: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_unix=yes
 else
@@ -26328,20 +27638,20 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:26331: result: $cf_cv_slang_unix" >&5
+echo "$as_me:27641: result: $cf_cv_slang_unix" >&5
 echo "${ECHO_T}$cf_cv_slang_unix" >&6
 test $cf_cv_slang_unix = yes &&
 cat >>confdefs.h <<\EOF
 #define REAL_UNIX_SYSTEM 1
 EOF
 
-	echo "$as_me:26338: checking for SLsmg_Color_Type" >&5
+	echo "$as_me:27648: 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 26344 "configure"
+#line 27654 "configure"
 #include "confdefs.h"
 #include <slang.h>
 
@@ -26357,16 +27667,16 @@ if (sizeof (SLsmg_Color_Type))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26360: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27670: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26363: \$? = $ac_status" >&5
+  echo "$as_me:27673: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26366: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27676: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26369: \$? = $ac_status" >&5
+  echo "$as_me:27679: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_SLsmg_Color_Type=yes
 else
@@ -26376,7 +27686,7 @@ ac_cv_type_SLsmg_Color_Type=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:26379: result: $ac_cv_type_SLsmg_Color_Type" >&5
+echo "$as_me:27689: 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
@@ -26392,13 +27702,13 @@ EOF
 
 fi
 
-	echo "$as_me:26395: checking for SLtt_Char_Type" >&5
+	echo "$as_me:27705: 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 26401 "configure"
+#line 27711 "configure"
 #include "confdefs.h"
 #include <slang.h>
 
@@ -26414,16 +27724,16 @@ if (sizeof (SLtt_Char_Type))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26417: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27727: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26420: \$? = $ac_status" >&5
+  echo "$as_me:27730: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26423: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27733: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26426: \$? = $ac_status" >&5
+  echo "$as_me:27736: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_SLtt_Char_Type=yes
 else
@@ -26433,7 +27743,7 @@ ac_cv_type_SLtt_Char_Type=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:26436: result: $ac_cv_type_SLtt_Char_Type" >&5
+echo "$as_me:27746: 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
@@ -26454,45 +27764,47 @@ fi
 esac
 
 LD_RPATH_OPT=
-echo "$as_me:26457: checking for an rpath option" >&5
+if test "x$cf_cv_enable_rpath" != xno
+then
+	echo "$as_me:27769: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
-case $cf_cv_system_name in
-(irix*)
-	if test "$GCC" = yes; then
+	case $cf_cv_system_name in
+	(irix*)
+		if test "$GCC" = yes; then
+			LD_RPATH_OPT="-Wl,-rpath,"
+		else
+			LD_RPATH_OPT="-rpath "
+		fi
+		;;
+	(linux*|gnu*|k*bsd*-gnu|freebsd*)
 		LD_RPATH_OPT="-Wl,-rpath,"
-	else
+		;;
+	(openbsd[2-9].*|mirbsd*)
+		LD_RPATH_OPT="-Wl,-rpath,"
+		;;
+	(dragonfly*)
 		LD_RPATH_OPT="-rpath "
-	fi
-	;;
-(linux*|gnu*|k*bsd*-gnu|freebsd*)
-	LD_RPATH_OPT="-Wl,-rpath,"
-	;;
-(openbsd[2-9].*|mirbsd*)
-	LD_RPATH_OPT="-Wl,-rpath,"
-	;;
-(dragonfly*)
-	LD_RPATH_OPT="-rpath "
-	;;
-(netbsd*)
-	LD_RPATH_OPT="-Wl,-rpath,"
-	;;
-(osf*|mls+*)
-	LD_RPATH_OPT="-rpath "
-	;;
-(solaris2*)
-	LD_RPATH_OPT="-R"
-	;;
-(*)
-	;;
-esac
-echo "$as_me:26488: result: $LD_RPATH_OPT" >&5
+		;;
+	(netbsd*)
+		LD_RPATH_OPT="-Wl,-rpath,"
+		;;
+	(osf*|mls+*)
+		LD_RPATH_OPT="-rpath "
+		;;
+	(solaris2*)
+		LD_RPATH_OPT="-R"
+		;;
+	(*)
+		;;
+	esac
+	echo "$as_me:27800: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
-case "x$LD_RPATH_OPT" in
-(x-R*)
-	echo "$as_me:26493: checking if we need a space after rpath option" >&5
+	case "x$LD_RPATH_OPT" in
+	(x-R*)
+		echo "$as_me:27805: 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"
+		cf_save_LIBS="$LIBS"
 
 cf_add_libs="${LD_RPATH_OPT}$libdir"
 # Filter out duplicates - this happens with badly-designed ".pc" files...
@@ -26510,8 +27822,8 @@ do
 done
 LIBS="$cf_add_libs"
 
-	cat >conftest.$ac_ext <<_ACEOF
-#line 26514 "configure"
+		cat >conftest.$ac_ext <<_ACEOF
+#line 27826 "configure"
 #include "confdefs.h"
 
 int
@@ -26523,16 +27835,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26526: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27838: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26529: \$? = $ac_status" >&5
+  echo "$as_me:27841: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26532: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27844: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26535: \$? = $ac_status" >&5
+  echo "$as_me:27847: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_rpath_space=no
 else
@@ -26541,24 +27853,25 @@ cat conftest.$ac_ext >&5
 cf_rpath_space=yes
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-	LIBS="$cf_save_LIBS"
-	echo "$as_me:26545: result: $cf_rpath_space" >&5
+		LIBS="$cf_save_LIBS"
+		echo "$as_me:27857: result: $cf_rpath_space" >&5
 echo "${ECHO_T}$cf_rpath_space" >&6
-	test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
-	;;
-esac
+		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
+		;;
+	esac
+fi
 
 if test -z "$LD_RPATH_OPT"
 then
 	test -n "$verbose" && echo "	will not attempt to use rpath" 1>&6
 
-echo "${as_me:-configure}:26555: testing will not attempt to use rpath ..." 1>&5
+echo "${as_me:-configure}:27868: testing will not attempt to use rpath ..." 1>&5
 
 elif test "x${enable_rpath_hack:-yes}" = "xno"
 then
 	test -n "$verbose" && echo "	"rpath is disabled" 1>&6
 
-echo "${as_me:-configure}:26561: testing "rpath is disabled ..." 1>&5
+echo "${as_me:-configure}:27874: testing "rpath is disabled ..." 1>&5
 
 elif test -z "${LD_RUN_PATH}${LD_LIBRARY_PATH}"
 then
@@ -26569,7 +27882,7 @@ if test "$cross_compiling" = yes; then
   cf_check_run=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 26572 "configure"
+#line 27885 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main(void) {
@@ -26578,15 +27891,15 @@ int main(void) {
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:26581: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27894: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26584: \$? = $ac_status" >&5
+  echo "$as_me:27897: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:26586: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27899: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26589: \$? = $ac_status" >&5
+  echo "$as_me:27902: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_check_run=yes
 else
@@ -26602,7 +27915,7 @@ fi
 		then
 			test -n "$verbose" && echo "	linkage is broken" 1>&6
 
-echo "${as_me:-configure}:26605: testing linkage is broken ..." 1>&5
+echo "${as_me:-configure}:27918: testing linkage is broken ..." 1>&5
 
 			cf_result=
 			for cf_item in $LIBS
@@ -26634,7 +27947,7 @@ if test "$cross_compiling" = yes; then
   cf_check_run=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 26637 "configure"
+#line 27950 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main(void) {
@@ -26643,15 +27956,15 @@ int main(void) {
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:26646: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27959: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26649: \$? = $ac_status" >&5
+  echo "$as_me:27962: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:26651: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27964: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26654: \$? = $ac_status" >&5
+  echo "$as_me:27967: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_check_run=yes
 else
@@ -26667,12 +27980,12 @@ fi
 				then
 					test -n "$verbose" && echo "	use rpath for $cf_save_LIBS" 1>&6
 
-echo "${as_me:-configure}:26670: testing use rpath for $cf_save_LIBS ..." 1>&5
+echo "${as_me:-configure}:27983: testing use rpath for $cf_save_LIBS ..." 1>&5
 
 					LIBS="$cf_result"
 					test -n "$verbose" && echo "	result is now $LIBS" 1>&6
 
-echo "${as_me:-configure}:26675: testing result is now $LIBS ..." 1>&5
+echo "${as_me:-configure}:27988: testing result is now $LIBS ..." 1>&5
 
 				else
 					LIBS="$cf_save_LIBS"
@@ -26683,20 +27996,20 @@ echo "${as_me:-configure}:26675: testing result is now $LIBS ..." 1>&5
 	(*)
 		test -n "$verbose" && echo "	will not attempt to use rpath" 1>&6
 
-echo "${as_me:-configure}:26686: testing will not attempt to use rpath ..." 1>&5
+echo "${as_me:-configure}:27999: testing will not attempt to use rpath ..." 1>&5
 
 		;;
 	esac
 fi
 
-echo "$as_me:26692: checking for chtype typedef" >&5
+echo "$as_me:28005: 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 26699 "configure"
+#line 28012 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -26708,16 +28021,16 @@ chtype foo
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26711: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28024: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26714: \$? = $ac_status" >&5
+  echo "$as_me:28027: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26717: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28030: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26720: \$? = $ac_status" >&5
+  echo "$as_me:28033: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_chtype_decl=yes
 else
@@ -26727,7 +28040,7 @@ cf_cv_chtype_decl=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:26730: result: $cf_cv_chtype_decl" >&5
+echo "$as_me:28043: result: $cf_cv_chtype_decl" >&5
 echo "${ECHO_T}$cf_cv_chtype_decl" >&6
 if test $cf_cv_chtype_decl = yes ; then
 
@@ -26735,14 +28048,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_TYPE_CHTYPE 1
 EOF
 
-	echo "$as_me:26738: checking if chtype is scalar or struct" >&5
+	echo "$as_me:28051: 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 26745 "configure"
+#line 28058 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -26754,16 +28067,16 @@ chtype foo; long x = foo
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26757: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28070: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26760: \$? = $ac_status" >&5
+  echo "$as_me:28073: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26763: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28076: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26766: \$? = $ac_status" >&5
+  echo "$as_me:28079: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_chtype_type=scalar
 else
@@ -26773,7 +28086,7 @@ cf_cv_chtype_type=struct
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:26776: result: $cf_cv_chtype_type" >&5
+echo "$as_me:28089: result: $cf_cv_chtype_type" >&5
 echo "${ECHO_T}$cf_cv_chtype_type" >&6
 	if test $cf_cv_chtype_type = scalar ; then
 
@@ -26784,7 +28097,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:26787: checking if you want the wide-curses features" >&5
+echo "$as_me:28100: 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.
@@ -26801,10 +28114,10 @@ else
 	use_wide_curses=$cf_wide_curses
 
 fi;
-echo "$as_me:26804: result: $use_wide_curses" >&5
+echo "$as_me:28117: result: $use_wide_curses" >&5
 echo "${ECHO_T}$use_wide_curses" >&6
 
-echo "$as_me:26807: checking if color-style code should be used" >&5
+echo "$as_me:28120: 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.
@@ -26824,7 +28137,7 @@ fi;
 
 case $use_color_style in
 (no)
-	echo "$as_me:26827: result: no" >&5
+	echo "$as_me:28140: result: no" >&5
 echo "${ECHO_T}no" >&6
 	INSTALL_LSS=
 	;;
@@ -26834,10 +28147,10 @@ cat >>confdefs.h <<\EOF
 #define USE_COLOR_STYLE 1
 EOF
 
-	echo "$as_me:26837: result: yes" >&5
+	echo "$as_me:28150: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-	echo "$as_me:26840: checking for location of style-sheet file" >&5
+	echo "$as_me:28153: 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.
@@ -26873,7 +28186,7 @@ case ".$withval" in
 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:26876: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:28189: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -26882,7 +28195,7 @@ esac
 fi
 eval LYNX_LSS_FILE="$withval"
 
-	echo "$as_me:26885: result: $LYNX_LSS_FILE" >&5
+	echo "$as_me:28198: result: $LYNX_LSS_FILE" >&5
 echo "${ECHO_T}$LYNX_LSS_FILE" >&6
 
 	test "$LYNX_LSS_FILE" = no && LYNX_LSS_FILE=
@@ -26895,7 +28208,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:26898: checking for the default configuration-file" >&5
+echo "$as_me:28211: 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.
@@ -26931,7 +28244,7 @@ case ".$withval" in
 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:26934: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:28247: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -26940,7 +28253,7 @@ esac
 fi
 eval LYNX_CFG_FILE="$withval"
 
-echo "$as_me:26943: result: $LYNX_CFG_FILE" >&5
+echo "$as_me:28256: result: $LYNX_CFG_FILE" >&5
 echo "${ECHO_T}$LYNX_CFG_FILE" >&6
 
 test "$LYNX_CFG_FILE" = no && LYNX_CFG_FILE=
@@ -26949,7 +28262,7 @@ cat >>confdefs.h <<EOF
 #define LYNX_CFG_FILE "$LYNX_CFG_FILE"
 EOF
 
-echo "$as_me:26952: checking for the default configuration-path" >&5
+echo "$as_me:28265: checking for the default configuration-path" >&5
 echo $ECHO_N "checking for the default configuration-path... $ECHO_C" >&6
 
 # Check whether --with-cfg-path or --without-cfg-path was given.
@@ -26985,7 +28298,7 @@ case ".$withval" in
 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:26988: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:28301: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -26994,7 +28307,7 @@ esac
 fi
 eval LYNX_CFG_PATH="$withval"
 
-echo "$as_me:26997: result: $LYNX_CFG_PATH" >&5
+echo "$as_me:28310: result: $LYNX_CFG_PATH" >&5
 echo "${ECHO_T}$LYNX_CFG_PATH" >&6
 
 test -z "$LYNX_CFG_PATH" && `echo "$LYNX_CFG_FILE" | sed -e 's%/[^/]*$%%'`
@@ -27004,7 +28317,7 @@ cat >>confdefs.h <<EOF
 #define LYNX_CFG_PATH "$LYNX_CFG_PATH"
 EOF
 
-echo "$as_me:27007: checking if htmlized lynx.cfg should be built" >&5
+echo "$as_me:28320: 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.
@@ -27021,7 +28334,7 @@ else
 	use_htmlized_cfg=no
 
 fi;
-echo "$as_me:27024: result: $use_htmlized_cfg" >&5
+echo "$as_me:28337: result: $use_htmlized_cfg" >&5
 echo "${ECHO_T}$use_htmlized_cfg" >&6
 
 LYNXCFG_MAKE=''
@@ -27029,7 +28342,7 @@ if test $use_htmlized_cfg = no ; then
 	LYNXCFG_MAKE='#'
 fi
 
-echo "$as_me:27032: checking if local doc directory should be linked to help page" >&5
+echo "$as_me:28345: 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.
@@ -27046,7 +28359,7 @@ else
 	use_local_docs=no
 
 fi;
-echo "$as_me:27049: result: $use_local_docs" >&5
+echo "$as_me:28362: result: $use_local_docs" >&5
 echo "${ECHO_T}$use_local_docs" >&6
 
 LYNXDOC_MAKE=''
@@ -27054,7 +28367,7 @@ if test $use_local_docs = no ; then
 	LYNXDOC_MAKE='#'
 fi
 
-echo "$as_me:27057: checking for MIME library directory" >&5
+echo "$as_me:28370: 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.
@@ -27090,7 +28403,7 @@ case ".$withval" in
 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:27093: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:28406: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -27099,7 +28412,7 @@ esac
 fi
 eval MIME_LIBDIR="$withval"
 
-echo "$as_me:27102: result: $MIME_LIBDIR" >&5
+echo "$as_me:28415: result: $MIME_LIBDIR" >&5
 echo "${ECHO_T}$MIME_LIBDIR" >&6
 MIME_LIBDIR=`echo "$MIME_LIBDIR" | sed -e 's,/$,,' -e 's,$,/,'`
 
@@ -27107,7 +28420,7 @@ cat >>confdefs.h <<EOF
 #define MIME_LIBDIR "$MIME_LIBDIR"
 EOF
 
-echo "$as_me:27110: checking if locale-charset selection logic should be used" >&5
+echo "$as_me:28423: 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.
@@ -27124,7 +28437,7 @@ else
 	use_locale_charset=yes
 
 fi;
-echo "$as_me:27127: result: $use_locale_charset" >&5
+echo "$as_me:28440: result: $use_locale_charset" >&5
 echo "${ECHO_T}$use_locale_charset" >&6
 test $use_locale_charset != no &&
 cat >>confdefs.h <<\EOF
@@ -27133,7 +28446,7 @@ EOF
 
 CHARSET_DEFS=
 
-echo "$as_me:27136: checking if you want only a few charsets" >&5
+echo "$as_me:28449: 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.
@@ -27145,7 +28458,7 @@ else
 fi;
 
 if test -n "$cf_charsets" ; then
-	echo "$as_me:27148: result: yes" >&5
+	echo "$as_me:28461: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 cat >>confdefs.h <<\EOF
@@ -27159,7 +28472,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}:27162: testing using minimal list of charsets: $cf_min_charsets ..." 1>&5
+echo "${as_me:-configure}:28475: 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'`
@@ -27186,28 +28499,28 @@ echo "${as_me:-configure}:27162: testing using minimal list of charsets: $cf_min
 		then
 			test -n "$verbose" && echo "	found $cf_charset" 1>&6
 
-echo "${as_me:-configure}:27189: testing found $cf_charset ..." 1>&5
+echo "${as_me:-configure}:28502: 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}:27195: testing not found $cf_charset ..." 1>&5
+echo "${as_me:-configure}:28508: testing not found $cf_charset ..." 1>&5
 
 		fi
 	done
 else
-	echo "$as_me:27200: result: no" >&5
+	echo "$as_me:28513: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:27204: checking for ANSI C header files" >&5
+echo "$as_me:28517: 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 27210 "configure"
+#line 28523 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -27215,13 +28528,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:27218: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:28531: \"$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:27224: \$? = $ac_status" >&5
+  echo "$as_me:28537: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -27243,7 +28556,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 27246 "configure"
+#line 28559 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -27261,7 +28574,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 27264 "configure"
+#line 28577 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -27282,7 +28595,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 27285 "configure"
+#line 28598 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -27308,15 +28621,15 @@ main (void)
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:27311: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28624: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27314: \$? = $ac_status" >&5
+  echo "$as_me:28627: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:27316: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28629: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27319: \$? = $ac_status" >&5
+  echo "$as_me:28632: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -27329,7 +28642,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:27332: result: $ac_cv_header_stdc" >&5
+echo "$as_me:28645: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -27339,13 +28652,13 @@ EOF
 
 fi
 
-echo "$as_me:27342: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:28655: 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 27348 "configure"
+#line 28661 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -27361,16 +28674,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27364: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28677: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27367: \$? = $ac_status" >&5
+  echo "$as_me:28680: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27370: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28683: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27373: \$? = $ac_status" >&5
+  echo "$as_me:28686: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_header_time=yes
 else
@@ -27380,7 +28693,7 @@ ac_cv_header_time=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27383: result: $ac_cv_header_time" >&5
+echo "$as_me:28696: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -27393,13 +28706,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:27396: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:28709: 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 27402 "configure"
+#line 28715 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -27414,16 +28727,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27417: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28730: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27420: \$? = $ac_status" >&5
+  echo "$as_me:28733: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27423: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28736: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27426: \$? = $ac_status" >&5
+  echo "$as_me:28739: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -27433,7 +28746,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27436: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:28749: 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
@@ -27446,7 +28759,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:27449: checking for opendir in -ldir" >&5
+  echo "$as_me:28762: 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
@@ -27454,7 +28767,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 27457 "configure"
+#line 28770 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -27473,16 +28786,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27476: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28789: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27479: \$? = $ac_status" >&5
+  echo "$as_me:28792: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27482: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28795: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27485: \$? = $ac_status" >&5
+  echo "$as_me:28798: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -27493,14 +28806,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:27496: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:28809: 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:27503: checking for opendir in -lx" >&5
+  echo "$as_me:28816: 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
@@ -27508,7 +28821,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 27511 "configure"
+#line 28824 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -27527,16 +28840,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27530: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28843: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27533: \$? = $ac_status" >&5
+  echo "$as_me:28846: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27536: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28849: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27539: \$? = $ac_status" >&5
+  echo "$as_me:28852: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -27547,7 +28860,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:27550: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:28863: 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"
@@ -27576,23 +28889,23 @@ for ac_header in \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:27579: checking for $ac_header" >&5
+echo "$as_me:28892: 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 27585 "configure"
+#line 28898 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:27589: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:28902: \"$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:27595: \$? = $ac_status" >&5
+  echo "$as_me:28908: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -27611,7 +28924,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:27614: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:28927: 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
@@ -27621,14 +28934,14 @@ EOF
 fi
 done
 
-echo "$as_me:27624: checking termio.h and termios.h" >&5
+echo "$as_me:28937: 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 27631 "configure"
+#line 28944 "configure"
 #include "confdefs.h"
 
 #if HAVE_TERMIO_H
@@ -27646,16 +28959,16 @@ putchar (0x0a)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27649: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28962: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27652: \$? = $ac_status" >&5
+  echo "$as_me:28965: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27655: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28968: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27658: \$? = $ac_status" >&5
+  echo "$as_me:28971: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termio_and_termios=yes
 else
@@ -27666,21 +28979,21 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:27669: result: $cf_cv_termio_and_termios" >&5
+echo "$as_me:28982: result: $cf_cv_termio_and_termios" >&5
 echo "${ECHO_T}$cf_cv_termio_and_termios" >&6
 test $cf_cv_termio_and_termios = no &&
 cat >>confdefs.h <<\EOF
 #define TERMIO_AND_TERMIOS 1
 EOF
 
-echo "$as_me:27676: checking for sigaction and structs" >&5
+echo "$as_me:28989: 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 27683 "configure"
+#line 28996 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -27700,16 +29013,16 @@ struct sigaction act;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27703: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29016: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27706: \$? = $ac_status" >&5
+  echo "$as_me:29019: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27709: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29022: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27712: \$? = $ac_status" >&5
+  echo "$as_me:29025: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_func_sigaction=yes
 else
@@ -27720,7 +29033,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:27723: result: $cf_cv_func_sigaction" >&5
+echo "$as_me:29036: result: $cf_cv_func_sigaction" >&5
 echo "${ECHO_T}$cf_cv_func_sigaction" >&6
 test "$cf_cv_func_sigaction" = yes &&
 cat >>confdefs.h <<\EOF
@@ -27730,23 +29043,23 @@ EOF
 for ac_header in sys/wait.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:27733: checking for $ac_header" >&5
+echo "$as_me:29046: 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 27739 "configure"
+#line 29052 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:27743: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:29056: \"$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:27749: \$? = $ac_status" >&5
+  echo "$as_me:29062: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -27765,7 +29078,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:27768: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:29081: 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
@@ -27786,23 +29099,23 @@ else
 for ac_header in wait.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:27789: checking for $ac_header" >&5
+echo "$as_me:29102: 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 27795 "configure"
+#line 29108 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:27799: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:29112: \"$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:27805: \$? = $ac_status" >&5
+  echo "$as_me:29118: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -27821,7 +29134,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:27824: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:29137: 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
@@ -27834,23 +29147,23 @@ done
 for ac_header in waitstatus.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:27837: checking for $ac_header" >&5
+echo "$as_me:29150: 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 27843 "configure"
+#line 29156 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:27847: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:29160: \"$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:27853: \$? = $ac_status" >&5
+  echo "$as_me:29166: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -27869,7 +29182,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:27872: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:29185: 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
@@ -27891,14 +29204,14 @@ cf_wait_headers="$cf_wait_headers
 fi
 fi
 
-echo "$as_me:27894: checking for union wait" >&5
+echo "$as_me:29207: 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 27901 "configure"
+#line 29214 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -27914,16 +29227,16 @@ int x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27917: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29230: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27920: \$? = $ac_status" >&5
+  echo "$as_me:29233: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27923: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29236: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27926: \$? = $ac_status" >&5
+  echo "$as_me:29239: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_unionwait=no
 	 echo compiles ok w/o union wait 1>&5
@@ -27933,7 +29246,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 27936 "configure"
+#line 29249 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -27953,16 +29266,16 @@ union wait x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27956: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29269: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27959: \$? = $ac_status" >&5
+  echo "$as_me:29272: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27962: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29275: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27965: \$? = $ac_status" >&5
+  echo "$as_me:29278: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_unionwait=yes
 	 echo compiles ok with union wait and possibly macros too 1>&5
@@ -27977,7 +29290,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:27980: result: $cf_cv_type_unionwait" >&5
+echo "$as_me:29293: result: $cf_cv_type_unionwait" >&5
 echo "${ECHO_T}$cf_cv_type_unionwait" >&6
 test $cf_cv_type_unionwait = yes &&
 cat >>confdefs.h <<\EOF
@@ -27986,14 +29299,14 @@ EOF
 
 if test $cf_cv_type_unionwait = yes; then
 
-	echo "$as_me:27989: checking if union wait can be used as wait-arg" >&5
+	echo "$as_me:29302: 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 27996 "configure"
+#line 29309 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -28005,16 +29318,16 @@ union wait x; wait(&x)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28008: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29321: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28011: \$? = $ac_status" >&5
+  echo "$as_me:29324: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28014: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29327: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28017: \$? = $ac_status" >&5
+  echo "$as_me:29330: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_arg_union_wait=yes
 else
@@ -28026,21 +29339,21 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-	echo "$as_me:28029: result: $cf_cv_arg_union_wait" >&5
+	echo "$as_me:29342: result: $cf_cv_arg_union_wait" >&5
 echo "${ECHO_T}$cf_cv_arg_union_wait" >&6
 	test $cf_cv_arg_union_wait = yes &&
 cat >>confdefs.h <<\EOF
 #define WAIT_USES_UNION 1
 EOF
 
-	echo "$as_me:28036: checking if union wait can be used as waitpid-arg" >&5
+	echo "$as_me:29349: 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 28043 "configure"
+#line 29356 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -28052,16 +29365,16 @@ union wait x; waitpid(0, &x, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28055: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29368: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28058: \$? = $ac_status" >&5
+  echo "$as_me:29371: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28061: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29374: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28064: \$? = $ac_status" >&5
+  echo "$as_me:29377: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_arg_union_waitpid=yes
 else
@@ -28073,7 +29386,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-	echo "$as_me:28076: result: $cf_cv_arg_union_waitpid" >&5
+	echo "$as_me:29389: 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
@@ -28082,13 +29395,13 @@ EOF
 
 fi
 
-echo "$as_me:28085: checking for uid_t in sys/types.h" >&5
+echo "$as_me:29398: 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 28091 "configure"
+#line 29404 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -28102,7 +29415,7 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:28105: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:29418: 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
 
@@ -28116,7 +29429,7 @@ EOF
 
 fi
 
-echo "$as_me:28119: checking type of array argument to getgroups" >&5
+echo "$as_me:29432: 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
@@ -28125,7 +29438,7 @@ else
   ac_cv_type_getgroups=cross
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 28128 "configure"
+#line 29441 "configure"
 #include "confdefs.h"
 /* Thanks to Mike Rendell for this test.  */
 #include <sys/types.h>
@@ -28151,15 +29464,15 @@ main (void)
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:28154: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29467: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28157: \$? = $ac_status" >&5
+  echo "$as_me:29470: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:28159: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29472: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28162: \$? = $ac_status" >&5
+  echo "$as_me:29475: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_getgroups=gid_t
 else
@@ -28172,7 +29485,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 28175 "configure"
+#line 29488 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 
@@ -28187,20 +29500,20 @@ rm -rf conftest*
 
 fi
 fi
-echo "$as_me:28190: result: $ac_cv_type_getgroups" >&5
+echo "$as_me:29503: 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:28197: checking for off_t" >&5
+echo "$as_me:29510: 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 28203 "configure"
+#line 29516 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28215,16 +29528,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28218: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29531: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28221: \$? = $ac_status" >&5
+  echo "$as_me:29534: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28224: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29537: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28227: \$? = $ac_status" >&5
+  echo "$as_me:29540: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -28234,7 +29547,7 @@ ac_cv_type_off_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:28237: result: $ac_cv_type_off_t" >&5
+echo "$as_me:29550: 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
   :
@@ -28246,13 +29559,13 @@ EOF
 
 fi
 
-echo "$as_me:28249: checking for pid_t" >&5
+echo "$as_me:29562: 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 28255 "configure"
+#line 29568 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28267,16 +29580,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28270: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29583: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28273: \$? = $ac_status" >&5
+  echo "$as_me:29586: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28276: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29589: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28279: \$? = $ac_status" >&5
+  echo "$as_me:29592: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -28286,7 +29599,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:28289: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:29602: 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
   :
@@ -28298,13 +29611,13 @@ EOF
 
 fi
 
-echo "$as_me:28301: checking for uid_t in sys/types.h" >&5
+echo "$as_me:29614: 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 28307 "configure"
+#line 29620 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -28318,7 +29631,7 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:28321: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:29634: 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
 
@@ -28332,13 +29645,13 @@ EOF
 
 fi
 
-echo "$as_me:28335: checking for mode_t" >&5
+echo "$as_me:29648: 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 28341 "configure"
+#line 29654 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28353,16 +29666,16 @@ if (sizeof (mode_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28356: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29669: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28359: \$? = $ac_status" >&5
+  echo "$as_me:29672: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28362: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29675: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28365: \$? = $ac_status" >&5
+  echo "$as_me:29678: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_mode_t=yes
 else
@@ -28372,7 +29685,7 @@ ac_cv_type_mode_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:28375: result: $ac_cv_type_mode_t" >&5
+echo "$as_me:29688: 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
   :
@@ -28384,13 +29697,13 @@ EOF
 
 fi
 
-	echo "$as_me:28387: checking for ssize_t" >&5
+	echo "$as_me:29700: 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 28393 "configure"
+#line 29706 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28405,16 +29718,16 @@ if (sizeof (ssize_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28408: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29721: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28411: \$? = $ac_status" >&5
+  echo "$as_me:29724: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28414: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29727: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28417: \$? = $ac_status" >&5
+  echo "$as_me:29730: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_ssize_t=yes
 else
@@ -28424,7 +29737,7 @@ ac_cv_type_ssize_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:28427: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:29740: 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
@@ -28440,13 +29753,13 @@ EOF
 
 fi
 
-	echo "$as_me:28443: checking for socklen_t" >&5
+	echo "$as_me:29756: 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 28449 "configure"
+#line 29762 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -28464,16 +29777,16 @@ if (sizeof (socklen_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28467: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29780: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28470: \$? = $ac_status" >&5
+  echo "$as_me:29783: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28473: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29786: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28476: \$? = $ac_status" >&5
+  echo "$as_me:29789: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_socklen_t=yes
 else
@@ -28483,7 +29796,7 @@ ac_cv_type_socklen_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:28486: result: $ac_cv_type_socklen_t" >&5
+echo "$as_me:29799: 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
@@ -28499,7 +29812,7 @@ EOF
 
 fi
 
-echo "$as_me:28502: checking for long long type" >&5
+echo "$as_me:29815: 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
@@ -28530,7 +29843,7 @@ _CFEOF
 	rm -f conftest*
 
 fi
-echo "$as_me:28533: result: $cf_cv_type_long_long" >&5
+echo "$as_me:29846: 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
@@ -28541,14 +29854,14 @@ EOF
 
 fi
 
-echo "$as_me:28544: checking for tm.tm_gmtoff" >&5
+echo "$as_me:29857: 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 28551 "configure"
+#line 29864 "configure"
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
@@ -28573,16 +29886,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28576: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29889: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28579: \$? = $ac_status" >&5
+  echo "$as_me:29892: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28582: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29895: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28585: \$? = $ac_status" >&5
+  echo "$as_me:29898: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_tm_gmtoff=yes
 else
@@ -28593,20 +29906,20 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:28596: result: $cf_cv_tm_gmtoff" >&5
+echo "$as_me:29909: result: $cf_cv_tm_gmtoff" >&5
 echo "${ECHO_T}$cf_cv_tm_gmtoff" >&6
 test $cf_cv_tm_gmtoff = no &&
 cat >>confdefs.h <<\EOF
 #define DONT_HAVE_TM_GMTOFF 1
 EOF
 
-echo "$as_me:28603: checking for int" >&5
+echo "$as_me:29916: 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 28609 "configure"
+#line 29922 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28621,16 +29934,16 @@ if (sizeof (int))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28624: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29937: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28627: \$? = $ac_status" >&5
+  echo "$as_me:29940: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28630: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29943: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28633: \$? = $ac_status" >&5
+  echo "$as_me:29946: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_int=yes
 else
@@ -28640,10 +29953,10 @@ ac_cv_type_int=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:28643: result: $ac_cv_type_int" >&5
+echo "$as_me:29956: result: $ac_cv_type_int" >&5
 echo "${ECHO_T}$ac_cv_type_int" >&6
 
-echo "$as_me:28646: checking size of int" >&5
+echo "$as_me:29959: 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
@@ -28652,7 +29965,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 28655 "configure"
+#line 29968 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28664,21 +29977,21 @@ int _array_ [1 - 2 * !((sizeof (int)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28667: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29980: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28670: \$? = $ac_status" >&5
+  echo "$as_me:29983: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28673: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29986: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28676: \$? = $ac_status" >&5
+  echo "$as_me:29989: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 28681 "configure"
+#line 29994 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28690,16 +30003,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28693: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30006: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28696: \$? = $ac_status" >&5
+  echo "$as_me:30009: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28699: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30012: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28702: \$? = $ac_status" >&5
+  echo "$as_me:30015: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -28715,7 +30028,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 28718 "configure"
+#line 30031 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28727,16 +30040,16 @@ int _array_ [1 - 2 * !((sizeof (int)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28730: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30043: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28733: \$? = $ac_status" >&5
+  echo "$as_me:30046: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28736: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30049: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28739: \$? = $ac_status" >&5
+  echo "$as_me:30052: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -28752,7 +30065,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 28755 "configure"
+#line 30068 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28764,16 +30077,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28767: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30080: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28770: \$? = $ac_status" >&5
+  echo "$as_me:30083: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28773: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30086: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28776: \$? = $ac_status" >&5
+  echo "$as_me:30089: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -28786,12 +30099,12 @@ done
 ac_cv_sizeof_int=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28789: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:30102: 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 28794 "configure"
+#line 30107 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28807,15 +30120,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:28810: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30123: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28813: \$? = $ac_status" >&5
+  echo "$as_me:30126: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:28815: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30128: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28818: \$? = $ac_status" >&5
+  echo "$as_me:30131: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_int=`cat conftest.val`
 else
@@ -28831,7 +30144,7 @@ else
   ac_cv_sizeof_int=0
 fi
 fi
-echo "$as_me:28834: result: $ac_cv_sizeof_int" >&5
+echo "$as_me:30147: 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
@@ -28840,11 +30153,11 @@ EOF
 if test "${ac_cv_type_int+set}" = set; then
 	cf_cv_sizeof="$ac_cv_sizeof_int"
 	if test "${ac_cv_sizeof_int+set}" != set; then
-		{ echo "$as_me:28843: WARNING: using 4 for sizeof int" >&5
+		{ echo "$as_me:30156: 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:28847: WARNING: sizeof int not found, using 4" >&5
+		{ echo "$as_me:30160: 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
@@ -28858,13 +30171,13 @@ cf_cv_type=`echo "sizeof_int" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKL
 	fi
 fi
 
-echo "$as_me:28861: checking for long" >&5
+echo "$as_me:30174: 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 28867 "configure"
+#line 30180 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28879,16 +30192,16 @@ if (sizeof (long))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28882: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30195: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28885: \$? = $ac_status" >&5
+  echo "$as_me:30198: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28888: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30201: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28891: \$? = $ac_status" >&5
+  echo "$as_me:30204: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_long=yes
 else
@@ -28898,10 +30211,10 @@ ac_cv_type_long=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:28901: result: $ac_cv_type_long" >&5
+echo "$as_me:30214: result: $ac_cv_type_long" >&5
 echo "${ECHO_T}$ac_cv_type_long" >&6
 
-echo "$as_me:28904: checking size of long" >&5
+echo "$as_me:30217: 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
@@ -28910,7 +30223,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 28913 "configure"
+#line 30226 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28922,21 +30235,21 @@ int _array_ [1 - 2 * !((sizeof (long)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28925: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30238: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28928: \$? = $ac_status" >&5
+  echo "$as_me:30241: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28931: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30244: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28934: \$? = $ac_status" >&5
+  echo "$as_me:30247: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 28939 "configure"
+#line 30252 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28948,16 +30261,16 @@ int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28951: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30264: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28954: \$? = $ac_status" >&5
+  echo "$as_me:30267: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28957: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30270: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28960: \$? = $ac_status" >&5
+  echo "$as_me:30273: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -28973,7 +30286,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 28976 "configure"
+#line 30289 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28985,16 +30298,16 @@ int _array_ [1 - 2 * !((sizeof (long)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28988: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30301: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28991: \$? = $ac_status" >&5
+  echo "$as_me:30304: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28994: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30307: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28997: \$? = $ac_status" >&5
+  echo "$as_me:30310: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -29010,7 +30323,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 29013 "configure"
+#line 30326 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -29022,16 +30335,16 @@ int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29025: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30338: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29028: \$? = $ac_status" >&5
+  echo "$as_me:30341: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29031: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30344: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29034: \$? = $ac_status" >&5
+  echo "$as_me:30347: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -29044,12 +30357,12 @@ done
 ac_cv_sizeof_long=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:29047: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:30360: 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 29052 "configure"
+#line 30365 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -29065,15 +30378,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:29068: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30381: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29071: \$? = $ac_status" >&5
+  echo "$as_me:30384: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:29073: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30386: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29076: \$? = $ac_status" >&5
+  echo "$as_me:30389: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_long=`cat conftest.val`
 else
@@ -29089,7 +30402,7 @@ else
   ac_cv_sizeof_long=0
 fi
 fi
-echo "$as_me:29092: result: $ac_cv_sizeof_long" >&5
+echo "$as_me:30405: 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
@@ -29098,11 +30411,11 @@ EOF
 if test "${ac_cv_type_long+set}" = set; then
 	cf_cv_sizeof="$ac_cv_sizeof_long"
 	if test "${ac_cv_sizeof_long+set}" != set; then
-		{ echo "$as_me:29101: WARNING: using 4 for sizeof long" >&5
+		{ echo "$as_me:30414: 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:29105: WARNING: sizeof long not found, using 4" >&5
+		{ echo "$as_me:30418: 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
@@ -29116,13 +30429,13 @@ cf_cv_type=`echo "sizeof_long" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJK
 	fi
 fi
 
-echo "$as_me:29119: checking for off_t" >&5
+echo "$as_me:30432: 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 29125 "configure"
+#line 30438 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -29137,16 +30450,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29140: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30453: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29143: \$? = $ac_status" >&5
+  echo "$as_me:30456: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29146: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30459: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29149: \$? = $ac_status" >&5
+  echo "$as_me:30462: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -29156,10 +30469,10 @@ ac_cv_type_off_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:29159: result: $ac_cv_type_off_t" >&5
+echo "$as_me:30472: result: $ac_cv_type_off_t" >&5
 echo "${ECHO_T}$ac_cv_type_off_t" >&6
 
-echo "$as_me:29162: checking size of off_t" >&5
+echo "$as_me:30475: 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
@@ -29168,7 +30481,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 29171 "configure"
+#line 30484 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -29180,21 +30493,21 @@ int _array_ [1 - 2 * !((sizeof (off_t)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29183: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30496: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29186: \$? = $ac_status" >&5
+  echo "$as_me:30499: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29189: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30502: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29192: \$? = $ac_status" >&5
+  echo "$as_me:30505: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 29197 "configure"
+#line 30510 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -29206,16 +30519,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29209: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30522: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29212: \$? = $ac_status" >&5
+  echo "$as_me:30525: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29215: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30528: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29218: \$? = $ac_status" >&5
+  echo "$as_me:30531: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -29231,7 +30544,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 29234 "configure"
+#line 30547 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -29243,16 +30556,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29246: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30559: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29249: \$? = $ac_status" >&5
+  echo "$as_me:30562: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29252: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30565: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29255: \$? = $ac_status" >&5
+  echo "$as_me:30568: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -29268,7 +30581,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 29271 "configure"
+#line 30584 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -29280,16 +30593,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29283: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30596: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29286: \$? = $ac_status" >&5
+  echo "$as_me:30599: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29289: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30602: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29292: \$? = $ac_status" >&5
+  echo "$as_me:30605: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -29302,12 +30615,12 @@ done
 ac_cv_sizeof_off_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:29305: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:30618: 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 29310 "configure"
+#line 30623 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -29323,15 +30636,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:29326: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30639: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29329: \$? = $ac_status" >&5
+  echo "$as_me:30642: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:29331: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30644: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29334: \$? = $ac_status" >&5
+  echo "$as_me:30647: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_off_t=`cat conftest.val`
 else
@@ -29347,7 +30660,7 @@ else
   ac_cv_sizeof_off_t=0
 fi
 fi
-echo "$as_me:29350: result: $ac_cv_sizeof_off_t" >&5
+echo "$as_me:30663: 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
@@ -29356,11 +30669,11 @@ EOF
 if test "${ac_cv_type_off_t+set}" = set; then
 	cf_cv_sizeof="$ac_cv_sizeof_off_t"
 	if test "${ac_cv_sizeof_off_t+set}" != set; then
-		{ echo "$as_me:29359: WARNING: using 4 for sizeof off_t" >&5
+		{ echo "$as_me:30672: 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:29363: WARNING: sizeof off_t not found, using 4" >&5
+		{ echo "$as_me:30676: 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
@@ -29374,13 +30687,13 @@ cf_cv_type=`echo "sizeof_off_t" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJ
 	fi
 fi
 
-echo "$as_me:29377: checking for size_t" >&5
+echo "$as_me:30690: 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 29383 "configure"
+#line 30696 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -29395,16 +30708,16 @@ if (sizeof (size_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29398: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30711: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29401: \$? = $ac_status" >&5
+  echo "$as_me:30714: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29404: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30717: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29407: \$? = $ac_status" >&5
+  echo "$as_me:30720: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_size_t=yes
 else
@@ -29414,10 +30727,10 @@ ac_cv_type_size_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:29417: result: $ac_cv_type_size_t" >&5
+echo "$as_me:30730: result: $ac_cv_type_size_t" >&5
 echo "${ECHO_T}$ac_cv_type_size_t" >&6
 
-echo "$as_me:29420: checking size of size_t" >&5
+echo "$as_me:30733: checking size of size_t" >&5
 echo $ECHO_N "checking size of size_t... $ECHO_C" >&6
 if test "${ac_cv_sizeof_size_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29426,7 +30739,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 29429 "configure"
+#line 30742 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -29438,21 +30751,21 @@ int _array_ [1 - 2 * !((sizeof (size_t)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29441: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30754: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29444: \$? = $ac_status" >&5
+  echo "$as_me:30757: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29447: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30760: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29450: \$? = $ac_status" >&5
+  echo "$as_me:30763: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 29455 "configure"
+#line 30768 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -29464,16 +30777,16 @@ int _array_ [1 - 2 * !((sizeof (size_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29467: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30780: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29470: \$? = $ac_status" >&5
+  echo "$as_me:30783: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29473: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30786: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29476: \$? = $ac_status" >&5
+  echo "$as_me:30789: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -29489,7 +30802,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 29492 "configure"
+#line 30805 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -29501,16 +30814,16 @@ int _array_ [1 - 2 * !((sizeof (size_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29504: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30817: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29507: \$? = $ac_status" >&5
+  echo "$as_me:30820: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29510: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30823: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29513: \$? = $ac_status" >&5
+  echo "$as_me:30826: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -29526,7 +30839,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 29529 "configure"
+#line 30842 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -29538,16 +30851,16 @@ int _array_ [1 - 2 * !((sizeof (size_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29541: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30854: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29544: \$? = $ac_status" >&5
+  echo "$as_me:30857: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29547: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30860: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29550: \$? = $ac_status" >&5
+  echo "$as_me:30863: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -29560,12 +30873,12 @@ done
 ac_cv_sizeof_size_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:29563: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:30876: 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 29568 "configure"
+#line 30881 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -29581,15 +30894,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:29584: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30897: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29587: \$? = $ac_status" >&5
+  echo "$as_me:30900: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:29589: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30902: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29592: \$? = $ac_status" >&5
+  echo "$as_me:30905: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_size_t=`cat conftest.val`
 else
@@ -29605,7 +30918,7 @@ else
   ac_cv_sizeof_size_t=0
 fi
 fi
-echo "$as_me:29608: result: $ac_cv_sizeof_size_t" >&5
+echo "$as_me:30921: result: $ac_cv_sizeof_size_t" >&5
 echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
@@ -29614,11 +30927,11 @@ EOF
 if test "${ac_cv_type_size_t+set}" = set; then
 	cf_cv_sizeof="$ac_cv_sizeof_size_t"
 	if test "${ac_cv_sizeof_size_t+set}" != set; then
-		{ echo "$as_me:29617: WARNING: using 4 for sizeof size_t" >&5
+		{ echo "$as_me:30930: WARNING: using 4 for sizeof size_t" >&5
 echo "$as_me: WARNING: using 4 for sizeof size_t" >&2;}
 		ac_cv_sizeof_size_t=4
 	elif test "x${ac_cv_sizeof_size_t}" = x0; then
-		{ echo "$as_me:29621: WARNING: sizeof size_t not found, using 4" >&5
+		{ echo "$as_me:30934: WARNING: sizeof size_t not found, using 4" >&5
 echo "$as_me: WARNING: sizeof size_t not found, using 4" >&2;}
 		ac_cv_sizeof_size_t=4
 	fi
@@ -29632,13 +30945,13 @@ cf_cv_type=`echo "sizeof_size_t" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHI
 	fi
 fi
 
-echo "$as_me:29635: checking for time_t" >&5
+echo "$as_me:30948: 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 29641 "configure"
+#line 30954 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -29653,16 +30966,16 @@ if (sizeof (time_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29656: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30969: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29659: \$? = $ac_status" >&5
+  echo "$as_me:30972: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29662: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30975: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29665: \$? = $ac_status" >&5
+  echo "$as_me:30978: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_time_t=yes
 else
@@ -29672,10 +30985,10 @@ ac_cv_type_time_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:29675: result: $ac_cv_type_time_t" >&5
+echo "$as_me:30988: result: $ac_cv_type_time_t" >&5
 echo "${ECHO_T}$ac_cv_type_time_t" >&6
 
-echo "$as_me:29678: checking size of time_t" >&5
+echo "$as_me:30991: 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
@@ -29684,7 +30997,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 29687 "configure"
+#line 31000 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -29696,21 +31009,21 @@ int _array_ [1 - 2 * !((sizeof (time_t)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29699: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31012: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29702: \$? = $ac_status" >&5
+  echo "$as_me:31015: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29705: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31018: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29708: \$? = $ac_status" >&5
+  echo "$as_me:31021: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 29713 "configure"
+#line 31026 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -29722,16 +31035,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29725: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31038: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29728: \$? = $ac_status" >&5
+  echo "$as_me:31041: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29731: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31044: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29734: \$? = $ac_status" >&5
+  echo "$as_me:31047: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -29747,7 +31060,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 29750 "configure"
+#line 31063 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -29759,16 +31072,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29762: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31075: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29765: \$? = $ac_status" >&5
+  echo "$as_me:31078: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29768: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31081: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29771: \$? = $ac_status" >&5
+  echo "$as_me:31084: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -29784,7 +31097,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 29787 "configure"
+#line 31100 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -29796,16 +31109,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29799: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31112: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29802: \$? = $ac_status" >&5
+  echo "$as_me:31115: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29805: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31118: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29808: \$? = $ac_status" >&5
+  echo "$as_me:31121: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -29818,12 +31131,12 @@ done
 ac_cv_sizeof_time_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:29821: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:31134: 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 29826 "configure"
+#line 31139 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -29839,15 +31152,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:29842: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31155: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29845: \$? = $ac_status" >&5
+  echo "$as_me:31158: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:29847: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31160: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29850: \$? = $ac_status" >&5
+  echo "$as_me:31163: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_time_t=`cat conftest.val`
 else
@@ -29863,7 +31176,7 @@ else
   ac_cv_sizeof_time_t=0
 fi
 fi
-echo "$as_me:29866: result: $ac_cv_sizeof_time_t" >&5
+echo "$as_me:31179: 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
@@ -29872,11 +31185,11 @@ EOF
 if test "${ac_cv_type_time_t+set}" = set; then
 	cf_cv_sizeof="$ac_cv_sizeof_time_t"
 	if test "${ac_cv_sizeof_time_t+set}" != set; then
-		{ echo "$as_me:29875: WARNING: using 4 for sizeof time_t" >&5
+		{ echo "$as_me:31188: 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:29879: WARNING: sizeof time_t not found, using 4" >&5
+		{ echo "$as_me:31192: 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
@@ -29890,13 +31203,13 @@ cf_cv_type=`echo "sizeof_time_t" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHI
 	fi
 fi
 
-echo "$as_me:29893: checking for intptr_t" >&5
+echo "$as_me:31206: checking for intptr_t" >&5
 echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6
 if test "${ac_cv_type_intptr_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 29899 "configure"
+#line 31212 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -29911,16 +31224,16 @@ if (sizeof (intptr_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29914: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31227: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29917: \$? = $ac_status" >&5
+  echo "$as_me:31230: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29920: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31233: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29923: \$? = $ac_status" >&5
+  echo "$as_me:31236: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_intptr_t=yes
 else
@@ -29930,7 +31243,7 @@ ac_cv_type_intptr_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:29933: result: $ac_cv_type_intptr_t" >&5
+echo "$as_me:31246: result: $ac_cv_type_intptr_t" >&5
 echo "${ECHO_T}$ac_cv_type_intptr_t" >&6
 if test $ac_cv_type_intptr_t = yes; then
   :
@@ -29944,13 +31257,13 @@ fi
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:29947: checking for working alloca.h" >&5
+echo "$as_me:31260: 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 29953 "configure"
+#line 31266 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int
@@ -29962,16 +31275,16 @@ char *p = (char *) alloca (2 * sizeof (int));
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29965: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31278: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29968: \$? = $ac_status" >&5
+  echo "$as_me:31281: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29971: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31284: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29974: \$? = $ac_status" >&5
+  echo "$as_me:31287: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_working_alloca_h=yes
 else
@@ -29981,7 +31294,7 @@ ac_cv_working_alloca_h=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:29984: result: $ac_cv_working_alloca_h" >&5
+echo "$as_me:31297: 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
 
@@ -29991,13 +31304,13 @@ EOF
 
 fi
 
-echo "$as_me:29994: checking for alloca" >&5
+echo "$as_me:31307: 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 30000 "configure"
+#line 31313 "configure"
 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -30029,16 +31342,16 @@ char *p = (char *) alloca (1);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30032: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31345: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30035: \$? = $ac_status" >&5
+  echo "$as_me:31348: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30038: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31351: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30041: \$? = $ac_status" >&5
+  echo "$as_me:31354: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_alloca_works=yes
 else
@@ -30048,7 +31361,7 @@ ac_cv_func_alloca_works=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:30051: result: $ac_cv_func_alloca_works" >&5
+echo "$as_me:31364: 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
@@ -30069,13 +31382,13 @@ cat >>confdefs.h <<\EOF
 #define C_ALLOCA 1
 EOF
 
-echo "$as_me:30072: checking whether \`alloca.c' needs Cray hooks" >&5
+echo "$as_me:31385: 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 30078 "configure"
+#line 31391 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -30093,18 +31406,18 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:30096: result: $ac_cv_os_cray" >&5
+echo "$as_me:31409: 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:30101: checking for $ac_func" >&5
+echo "$as_me:31414: 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 30107 "configure"
+#line 31420 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -30135,16 +31448,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30138: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31451: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30141: \$? = $ac_status" >&5
+  echo "$as_me:31454: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30144: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31457: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30147: \$? = $ac_status" >&5
+  echo "$as_me:31460: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -30154,7 +31467,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:30157: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:31470: 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
 
@@ -30168,7 +31481,7 @@ fi
   done
 fi
 
-echo "$as_me:30171: checking stack direction for C alloca" >&5
+echo "$as_me:31484: 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
@@ -30177,7 +31490,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 30180 "configure"
+#line 31493 "configure"
 #include "confdefs.h"
 int
 find_stack_direction (void)
@@ -30200,15 +31513,15 @@ main (void)
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:30203: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31516: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30206: \$? = $ac_status" >&5
+  echo "$as_me:31519: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:30208: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31521: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30211: \$? = $ac_status" >&5
+  echo "$as_me:31524: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_stack_direction=1
 else
@@ -30220,7 +31533,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:30223: result: $ac_cv_c_stack_direction" >&5
+echo "$as_me:31536: result: $ac_cv_c_stack_direction" >&5
 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
 cat >>confdefs.h <<EOF
@@ -30232,23 +31545,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:30235: checking for $ac_header" >&5
+echo "$as_me:31548: 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 30241 "configure"
+#line 31554 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:30245: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:31558: \"$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:30251: \$? = $ac_status" >&5
+  echo "$as_me:31564: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -30267,7 +31580,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:30270: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:31583: 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
@@ -30280,13 +31593,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:30283: checking for $ac_func" >&5
+echo "$as_me:31596: 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 30289 "configure"
+#line 31602 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -30317,16 +31630,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30320: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31633: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30323: \$? = $ac_status" >&5
+  echo "$as_me:31636: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30326: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31639: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30329: \$? = $ac_status" >&5
+  echo "$as_me:31642: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -30336,7 +31649,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:30339: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:31652: 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
@@ -30348,7 +31661,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:30351: checking for working fork" >&5
+  echo "$as_me:31664: 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
@@ -30371,15 +31684,15 @@ else
       }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:30374: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31687: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30377: \$? = $ac_status" >&5
+  echo "$as_me:31690: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:30379: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31692: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30382: \$? = $ac_status" >&5
+  echo "$as_me:31695: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -30391,7 +31704,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:30394: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:31707: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -30405,12 +31718,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:30408: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:31721: 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:30413: checking for working vfork" >&5
+  echo "$as_me:31726: 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
@@ -30419,7 +31732,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 30422 "configure"
+#line 31735 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -30516,15 +31829,15 @@ main (void)
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:30519: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31832: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30522: \$? = $ac_status" >&5
+  echo "$as_me:31835: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:30524: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31837: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30527: \$? = $ac_status" >&5
+  echo "$as_me:31840: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -30536,13 +31849,13 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:30539: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:31852: 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:30545: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:31858: 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
 
@@ -30567,14 +31880,14 @@ EOF
 
 fi
 
-echo "$as_me:30570: checking if we should use fcntl or ioctl" >&5
+echo "$as_me:31883: 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 30577 "configure"
+#line 31890 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -30591,16 +31904,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30594: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31907: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30597: \$? = $ac_status" >&5
+  echo "$as_me:31910: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30600: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31913: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30603: \$? = $ac_status" >&5
+  echo "$as_me:31916: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fionbio=ioctl
 else
@@ -30608,7 +31921,7 @@ else
 cat conftest.$ac_ext >&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 30611 "configure"
+#line 31924 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -30630,16 +31943,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30633: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31946: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30636: \$? = $ac_status" >&5
+  echo "$as_me:31949: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30639: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31952: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30642: \$? = $ac_status" >&5
+  echo "$as_me:31955: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fionbio=fcntl
 else
@@ -30652,21 +31965,21 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:30655: result: $cf_cv_fionbio" >&5
+echo "$as_me:31968: result: $cf_cv_fionbio" >&5
 echo "${ECHO_T}$cf_cv_fionbio" >&6
 test "$cf_cv_fionbio" = "fcntl" &&
 cat >>confdefs.h <<\EOF
 #define USE_FCNTL 1
 EOF
 
-echo "$as_me:30662: checking for broken/missing definition of remove" >&5
+echo "$as_me:31975: 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 30669 "configure"
+#line 31982 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -30678,23 +31991,23 @@ remove("dummy")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30681: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31994: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30684: \$? = $ac_status" >&5
+  echo "$as_me:31997: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30687: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32000: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30690: \$? = $ac_status" >&5
+  echo "$as_me:32003: \$? = $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 30697 "configure"
+#line 32010 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 		int __unlink(name) { return unlink(name); }
@@ -30707,16 +32020,16 @@ remove("dummy")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30710: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32023: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30713: \$? = $ac_status" >&5
+  echo "$as_me:32026: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30716: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32029: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30719: \$? = $ac_status" >&5
+  echo "$as_me:32032: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_baddef_remove=yes
 else
@@ -30731,21 +32044,21 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:30734: result: $cf_cv_baddef_remove" >&5
+echo "$as_me:32047: result: $cf_cv_baddef_remove" >&5
 echo "${ECHO_T}$cf_cv_baddef_remove" >&6
 test "$cf_cv_baddef_remove" != no &&
 cat >>confdefs.h <<\EOF
 #define NEED_REMOVE 1
 EOF
 
-echo "$as_me:30741: checking for lstat" >&5
+echo "$as_me:32054: 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 30748 "configure"
+#line 32061 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -30759,16 +32072,16 @@ lstat(".", (struct stat *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30762: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32075: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30765: \$? = $ac_status" >&5
+  echo "$as_me:32078: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30768: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32081: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30771: \$? = $ac_status" >&5
+  echo "$as_me:32084: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_lstat=yes
 else
@@ -30780,7 +32093,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:30783: result: $ac_cv_func_lstat " >&5
+echo "$as_me:32096: result: $ac_cv_func_lstat " >&5
 echo "${ECHO_T}$ac_cv_func_lstat " >&6
 if test $ac_cv_func_lstat = yes; then
 
@@ -30790,6 +32103,161 @@ EOF
 
 fi
 
+echo "$as_me:32106: checking for vasprintf" >&5
+echo $ECHO_N "checking for vasprintf... $ECHO_C" >&6
+if test "${ac_cv_func_vasprintf+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 32112 "configure"
+#include "confdefs.h"
+#define vasprintf autoconf_temporary
+#include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
+#undef vasprintf
+
+#ifdef __cplusplus
+extern "C"
+#endif
+
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char vasprintf (void);
+
+int
+main (void)
+{
+
+/* The GNU C library defines stubs for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_vasprintf) || defined (__stub___vasprintf)
+#error found stub for vasprintf
+#endif
+
+	return vasprintf ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:32143: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:32146: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:32149: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:32152: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_vasprintf=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_func_vasprintf=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:32162: result: $ac_cv_func_vasprintf" >&5
+echo "${ECHO_T}$ac_cv_func_vasprintf" >&6
+if test $ac_cv_func_vasprintf = yes; then
+
+	cat >>confdefs.h <<\EOF
+#define HAVE_VASPRINTF 1
+EOF
+
+	echo "$as_me:32170: checking if vasprintf requires workaround" >&5
+echo $ECHO_N "checking if vasprintf requires workaround... $ECHO_C" >&6
+	cat >conftest.$ac_ext <<_ACEOF
+#line 32173 "configure"
+#include "confdefs.h"
+
+		#include <stdio.h>
+
+int
+main (void)
+{
+
+		void *p = (void *)vasprintf; return (p != 0)
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:32189: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:32192: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:32195: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:32198: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+		echo "$as_me:32201: result: no" >&5
+echo "${ECHO_T}no" >&6
+
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+
+		cat >conftest.$ac_ext <<_ACEOF
+#line 32209 "configure"
+#include "confdefs.h"
+
+			#ifndef _GNU_SOURCE
+			#define _GNU_SOURCE 1
+			#include <stdio.h>
+			#endif
+
+int
+main (void)
+{
+
+			void *p = (void *)vasprintf; return (p != 0)
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:32228: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:32231: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:32234: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:32237: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+			echo "$as_me:32240: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
+
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+
+			echo "$as_me:32250: result: unknown" >&5
+echo "${ECHO_T}unknown" >&6
+
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+
+fi
+
 for ac_func in \
 	atoll \
 	ctermid \
@@ -30810,18 +32278,17 @@ for ac_func in \
 	ttyname \
 	unsetenv \
 	sleep usleep \
-	vasprintf \
 	waitpid \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:30818: checking for $ac_func" >&5
+echo "$as_me:32285: 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 30824 "configure"
+#line 32291 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -30852,16 +32319,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30855: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32322: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30858: \$? = $ac_status" >&5
+  echo "$as_me:32325: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30861: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32328: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30864: \$? = $ac_status" >&5
+  echo "$as_me:32331: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -30871,7 +32338,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:30874: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:32341: 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
@@ -30888,13 +32355,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:30891: checking for $ac_func" >&5
+echo "$as_me:32358: 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 30897 "configure"
+#line 32364 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -30925,16 +32392,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30928: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32395: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30931: \$? = $ac_status" >&5
+  echo "$as_me:32398: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30934: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32401: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30937: \$? = $ac_status" >&5
+  echo "$as_me:32404: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -30944,7 +32411,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:30947: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:32414: 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
@@ -30956,7 +32423,7 @@ else
 fi
 done
 
-echo "$as_me:30959: checking for random-integer functions" >&5
+echo "$as_me:32426: 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
@@ -30976,7 +32443,7 @@ do
 	esac
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 30979 "configure"
+#line 32446 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -30995,16 +32462,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:30998: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32465: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31001: \$? = $ac_status" >&5
+  echo "$as_me:32468: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31004: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32471: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31007: \$? = $ac_status" >&5
+  echo "$as_me:32474: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_srand_func=$cf_func
  break
@@ -31016,10 +32483,10 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:31019: result: $cf_cv_srand_func" >&5
+echo "$as_me:32486: 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:31022: checking for range of random-integers" >&5
+	echo "$as_me:32489: 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
@@ -31040,7 +32507,7 @@ else
 			;;
 		esac
 		cat >conftest.$ac_ext <<_ACEOF
-#line 31043 "configure"
+#line 32510 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -31059,16 +32526,16 @@ long x = $cf_cv_rand_max
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31062: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32529: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31065: \$? = $ac_status" >&5
+  echo "$as_me:32532: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31068: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32535: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31071: \$? = $ac_status" >&5
+  echo "$as_me:32538: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -31079,15 +32546,15 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:31082: result: $cf_cv_rand_max" >&5
+echo "$as_me:32549: result: $cf_cv_rand_max" >&5
 echo "${ECHO_T}$cf_cv_rand_max" >&6
 
 	case $cf_cv_srand_func in
 	(*/arc4random)
-		echo "$as_me:31087: checking if <bsd/stdlib.h> should be included" >&5
+		echo "$as_me:32554: 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 31090 "configure"
+#line 32557 "configure"
 #include "confdefs.h"
 #include <bsd/stdlib.h>
 int
@@ -31100,23 +32567,23 @@ void *arc4random(int);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31103: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32570: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31106: \$? = $ac_status" >&5
+  echo "$as_me:32573: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31109: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32576: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31112: \$? = $ac_status" >&5
+  echo "$as_me:32579: \$? = $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 31119 "configure"
+#line 32586 "configure"
 #include "confdefs.h"
 #include <bsd/stdlib.h>
 int
@@ -31128,16 +32595,16 @@ unsigned x = arc4random()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31131: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32598: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31134: \$? = $ac_status" >&5
+  echo "$as_me:32601: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31137: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32604: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31140: \$? = $ac_status" >&5
+  echo "$as_me:32607: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_bsd_stdlib_h=yes
 else
@@ -31148,7 +32615,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-	    echo "$as_me:31151: result: $cf_bsd_stdlib_h" >&5
+	    echo "$as_me:32618: result: $cf_bsd_stdlib_h" >&5
 echo "${ECHO_T}$cf_bsd_stdlib_h" >&6
 		if test "$cf_bsd_stdlib_h" = yes
 		then
@@ -31158,10 +32625,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 		else
-			echo "$as_me:31161: checking if <bsd/random.h> should be included" >&5
+			echo "$as_me:32628: 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 31164 "configure"
+#line 32631 "configure"
 #include "confdefs.h"
 #include <bsd/random.h>
 int
@@ -31174,23 +32641,23 @@ void *arc4random(int);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31177: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32644: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31180: \$? = $ac_status" >&5
+  echo "$as_me:32647: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31183: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32650: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31186: \$? = $ac_status" >&5
+  echo "$as_me:32653: \$? = $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 31193 "configure"
+#line 32660 "configure"
 #include "confdefs.h"
 #include <bsd/random.h>
 int
@@ -31202,16 +32669,16 @@ unsigned x = arc4random()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31205: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32672: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31208: \$? = $ac_status" >&5
+  echo "$as_me:32675: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31211: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32678: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31214: \$? = $ac_status" >&5
+  echo "$as_me:32681: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_bsd_random_h=yes
 else
@@ -31222,7 +32689,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-			echo "$as_me:31225: result: $cf_bsd_random_h" >&5
+			echo "$as_me:32692: result: $cf_bsd_random_h" >&5
 echo "${ECHO_T}$cf_bsd_random_h" >&6
 			if test "$cf_bsd_random_h" = yes
 			then
@@ -31232,7 +32699,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 			else
-				{ echo "$as_me:31235: WARNING: no header file found for arc4random" >&5
+				{ echo "$as_me:32702: WARNING: no header file found for arc4random" >&5
 echo "$as_me: WARNING: no header file found for arc4random" >&2;}
 			fi
 		fi
@@ -31267,13 +32734,13 @@ fi
 for ac_func in sleep
 do
 
-echo "$as_me:31270: checking for $ac_func declaration" >&5
+echo "$as_me:32737: 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 31276 "configure"
+#line 32743 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -31294,20 +32761,20 @@ extern	int	$ac_func();
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31297: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32764: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31300: \$? = $ac_status" >&5
+  echo "$as_me:32767: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31303: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32770: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31306: \$? = $ac_status" >&5
+  echo "$as_me:32773: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 31310 "configure"
+#line 32777 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -31328,16 +32795,16 @@ int	(*p)() = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31331: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32798: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31334: \$? = $ac_status" >&5
+  echo "$as_me:32801: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31337: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32804: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31340: \$? = $ac_status" >&5
+  echo "$as_me:32807: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -31358,11 +32825,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:31361: result: yes" >&5
+  echo "$as_me:32828: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:31365: result: no" >&5
+  echo "$as_me:32832: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -31377,13 +32844,13 @@ done
 for ac_func in strstr
 do
 
-echo "$as_me:31380: checking for $ac_func declaration" >&5
+echo "$as_me:32847: 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 31386 "configure"
+#line 32853 "configure"
 #include "confdefs.h"
 #include <string.h>
 int
@@ -31397,20 +32864,20 @@ extern	int	$ac_func();
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31400: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32867: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31403: \$? = $ac_status" >&5
+  echo "$as_me:32870: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31406: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32873: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31409: \$? = $ac_status" >&5
+  echo "$as_me:32876: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 31413 "configure"
+#line 32880 "configure"
 #include "confdefs.h"
 #include <string.h>
 int
@@ -31424,16 +32891,16 @@ int	(*p)() = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31427: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32894: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31430: \$? = $ac_status" >&5
+  echo "$as_me:32897: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31433: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32900: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31436: \$? = $ac_status" >&5
+  echo "$as_me:32903: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -31454,11 +32921,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:31457: result: yes" >&5
+  echo "$as_me:32924: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:31461: result: no" >&5
+  echo "$as_me:32928: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -31473,13 +32940,13 @@ done
 for ac_func in getgrgid getgrnam
 do
 
-echo "$as_me:31476: checking for $ac_func declaration" >&5
+echo "$as_me:32943: 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 31482 "configure"
+#line 32949 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -31495,20 +32962,20 @@ extern	int	$ac_func();
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31498: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32965: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31501: \$? = $ac_status" >&5
+  echo "$as_me:32968: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31504: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32971: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31507: \$? = $ac_status" >&5
+  echo "$as_me:32974: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 31511 "configure"
+#line 32978 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -31524,16 +32991,16 @@ int	(*p)() = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31527: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32994: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31530: \$? = $ac_status" >&5
+  echo "$as_me:32997: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31533: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33000: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31536: \$? = $ac_status" >&5
+  echo "$as_me:33003: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -31554,11 +33021,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:31557: result: yes" >&5
+  echo "$as_me:33024: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:31561: result: no" >&5
+  echo "$as_me:33028: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -31570,14 +33037,14 @@ EOF
 fi
 done
 
-echo "$as_me:31573: checking if TRUE/FALSE are defined" >&5
+echo "$as_me:33040: 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 31580 "configure"
+#line 33047 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -31591,16 +33058,16 @@ int x = TRUE, y = FALSE
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31594: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33061: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31597: \$? = $ac_status" >&5
+  echo "$as_me:33064: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31600: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33067: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31603: \$? = $ac_status" >&5
+  echo "$as_me:33070: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_bool_defs=yes
 else
@@ -31611,7 +33078,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:31614: result: $cf_cv_bool_defs" >&5
+echo "$as_me:33081: result: $cf_cv_bool_defs" >&5
 echo "${ECHO_T}$cf_cv_bool_defs" >&6
 if test "$cf_cv_bool_defs" = no ; then
 
@@ -31625,14 +33092,14 @@ EOF
 
 fi
 
-echo "$as_me:31628: checking if external errno is declared" >&5
+echo "$as_me:33095: 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 31635 "configure"
+#line 33102 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -31650,16 +33117,16 @@ int x = (int) errno
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31653: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33120: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31656: \$? = $ac_status" >&5
+  echo "$as_me:33123: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31659: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33126: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31662: \$? = $ac_status" >&5
+  echo "$as_me:33129: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -31670,7 +33137,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:31673: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:33140: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -31685,14 +33152,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:31688: checking if external errno exists" >&5
+echo "$as_me:33155: 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 31695 "configure"
+#line 33162 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -31707,16 +33174,16 @@ errno = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31710: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33177: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31713: \$? = $ac_status" >&5
+  echo "$as_me:33180: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31716: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33183: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31719: \$? = $ac_status" >&5
+  echo "$as_me:33186: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_errno=yes
 else
@@ -31727,7 +33194,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:31730: result: $cf_cv_have_errno" >&5
+echo "$as_me:33197: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -31740,7 +33207,7 @@ EOF
 
 fi
 
-echo "$as_me:31743: checking if we can set errno" >&5
+echo "$as_me:33210: 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
@@ -31748,7 +33215,7 @@ else
 
 if test "$cross_compiling" = yes; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 31751 "configure"
+#line 33218 "configure"
 #include "confdefs.h"
 #include <errno.h>
 int
@@ -31760,16 +33227,16 @@ errno = 255
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31763: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33230: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31766: \$? = $ac_status" >&5
+  echo "$as_me:33233: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31769: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33236: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31772: \$? = $ac_status" >&5
+  echo "$as_me:33239: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_set_errno=maybe
 else
@@ -31780,7 +33247,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 31783 "configure"
+#line 33250 "configure"
 #include "confdefs.h"
 
 #include <errno.h>
@@ -31791,15 +33258,15 @@ int main(void)
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:31794: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33261: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31797: \$? = $ac_status" >&5
+  echo "$as_me:33264: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:31799: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33266: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31802: \$? = $ac_status" >&5
+  echo "$as_me:33269: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_set_errno=yes
 else
@@ -31812,21 +33279,21 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:31815: result: $cf_cv_set_errno" >&5
+echo "$as_me:33282: result: $cf_cv_set_errno" >&5
 echo "${ECHO_T}$cf_cv_set_errno" >&6
 test "$cf_cv_set_errno" != no &&
 cat >>confdefs.h <<\EOF
 #define CAN_SET_ERRNO 1
 EOF
 
-echo "$as_me:31822: checking for setlocale()" >&5
+echo "$as_me:33289: 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 31829 "configure"
+#line 33296 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int
@@ -31838,16 +33305,16 @@ setlocale(LC_ALL, "")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31841: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33308: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31844: \$? = $ac_status" >&5
+  echo "$as_me:33311: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31847: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33314: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31850: \$? = $ac_status" >&5
+  echo "$as_me:33317: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_locale=yes
 else
@@ -31859,7 +33326,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:31862: result: $cf_cv_locale" >&5
+echo "$as_me:33329: result: $cf_cv_locale" >&5
 echo "${ECHO_T}$cf_cv_locale" >&6
 test $cf_cv_locale = yes && {
 cat >>confdefs.h <<\EOF
@@ -31867,14 +33334,14 @@ cat >>confdefs.h <<\EOF
 EOF
  }
 
-echo "$as_me:31870: checking if NGROUPS is defined" >&5
+echo "$as_me:33337: 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 31877 "configure"
+#line 33344 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -31893,23 +33360,23 @@ int x = NGROUPS
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31896: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33363: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31899: \$? = $ac_status" >&5
+  echo "$as_me:33366: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31902: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33369: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31905: \$? = $ac_status" >&5
+  echo "$as_me:33372: \$? = $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 31912 "configure"
+#line 33379 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -31928,16 +33395,16 @@ int x = NGROUPS_MAX
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31931: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33398: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31934: \$? = $ac_status" >&5
+  echo "$as_me:33401: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31937: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33404: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31940: \$? = $ac_status" >&5
+  echo "$as_me:33407: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ngroups=NGROUPS_MAX
 else
@@ -31949,7 +33416,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:31952: result: $cf_cv_ngroups" >&5
+echo "$as_me:33419: result: $cf_cv_ngroups" >&5
 echo "${ECHO_T}$cf_cv_ngroups" >&6
 
 fi
@@ -31967,14 +33434,14 @@ EOF
 
 fi
 
-echo "$as_me:31970: checking if external sys_nerr is declared" >&5
+echo "$as_me:33437: 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 31977 "configure"
+#line 33444 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -31992,16 +33459,16 @@ int x = (int) sys_nerr
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31995: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33462: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31998: \$? = $ac_status" >&5
+  echo "$as_me:33465: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32001: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33468: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32004: \$? = $ac_status" >&5
+  echo "$as_me:33471: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_nerr=yes
 else
@@ -32012,7 +33479,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:32015: result: $cf_cv_dcl_sys_nerr" >&5
+echo "$as_me:33482: 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
@@ -32027,14 +33494,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:32030: checking if external sys_nerr exists" >&5
+echo "$as_me:33497: 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 32037 "configure"
+#line 33504 "configure"
 #include "confdefs.h"
 
 #undef sys_nerr
@@ -32049,16 +33516,16 @@ sys_nerr = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32052: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33519: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32055: \$? = $ac_status" >&5
+  echo "$as_me:33522: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32058: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33525: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32061: \$? = $ac_status" >&5
+  echo "$as_me:33528: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_nerr=yes
 else
@@ -32069,7 +33536,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:32072: result: $cf_cv_have_sys_nerr" >&5
+echo "$as_me:33539: 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
@@ -32082,14 +33549,14 @@ EOF
 
 fi
 
-echo "$as_me:32085: checking if external sys_errlist is declared" >&5
+echo "$as_me:33552: 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 32092 "configure"
+#line 33559 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -32107,16 +33574,16 @@ int x = (int) sys_errlist
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32110: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33577: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32113: \$? = $ac_status" >&5
+  echo "$as_me:33580: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32116: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33583: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32119: \$? = $ac_status" >&5
+  echo "$as_me:33586: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_errlist=yes
 else
@@ -32127,7 +33594,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:32130: result: $cf_cv_dcl_sys_errlist" >&5
+echo "$as_me:33597: 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
@@ -32142,14 +33609,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:32145: checking if external sys_errlist exists" >&5
+echo "$as_me:33612: 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 32152 "configure"
+#line 33619 "configure"
 #include "confdefs.h"
 
 #undef sys_errlist
@@ -32164,16 +33631,16 @@ sys_errlist = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32167: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33634: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32170: \$? = $ac_status" >&5
+  echo "$as_me:33637: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32173: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33640: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32176: \$? = $ac_status" >&5
+  echo "$as_me:33643: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_errlist=yes
 else
@@ -32184,7 +33651,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:32187: result: $cf_cv_have_sys_errlist" >&5
+echo "$as_me:33654: 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
@@ -32200,23 +33667,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:32203: checking for $ac_header" >&5
+echo "$as_me:33670: 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 32209 "configure"
+#line 33676 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:32213: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:33680: \"$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:32219: \$? = $ac_status" >&5
+  echo "$as_me:33686: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -32235,7 +33702,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:32238: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:33705: 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
@@ -32245,14 +33712,14 @@ EOF
 fi
 done
 
-echo "$as_me:32248: checking for lastlog path" >&5
+echo "$as_me:33715: 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 32255 "configure"
+#line 33722 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -32272,16 +33739,16 @@ char *path = _PATH_LASTLOG
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32275: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33742: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32278: \$? = $ac_status" >&5
+  echo "$as_me:33745: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32281: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33748: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32284: \$? = $ac_status" >&5
+  echo "$as_me:33751: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_path_lastlog="_PATH_LASTLOG"
 else
@@ -32296,14 +33763,14 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:32299: result: $cf_cv_path_lastlog" >&5
+echo "$as_me:33766: result: $cf_cv_path_lastlog" >&5
 echo "${ECHO_T}$cf_cv_path_lastlog" >&6
 test $cf_cv_path_lastlog != no &&
 cat >>confdefs.h <<\EOF
 #define USE_LASTLOG 1
 EOF
 
-echo "$as_me:32306: checking for utmp implementation" >&5
+echo "$as_me:33773: 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
@@ -32320,7 +33787,7 @@ cf_utmp_includes="
 #endif
 "
 	cat >conftest.$ac_ext <<_ACEOF
-#line 32323 "configure"
+#line 33790 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -32334,16 +33801,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32337: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33804: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32340: \$? = $ac_status" >&5
+  echo "$as_me:33807: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32343: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33810: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32346: \$? = $ac_status" >&5
+  echo "$as_me:33813: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -32352,7 +33819,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 32355 "configure"
+#line 33822 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -32366,16 +33833,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32369: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33836: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32372: \$? = $ac_status" >&5
+  echo "$as_me:33839: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32375: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33842: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32378: \$? = $ac_status" >&5
+  echo "$as_me:33845: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -32390,7 +33857,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:32393: result: $cf_cv_have_utmp" >&5
+echo "$as_me:33860: result: $cf_cv_have_utmp" >&5
 echo "${ECHO_T}$cf_cv_have_utmp" >&6
 
 if test $cf_cv_have_utmp != no ; then
@@ -32405,14 +33872,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:32408: checking if ${cf_cv_have_utmp}.ut_host is declared" >&5
+echo "$as_me:33875: 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 32415 "configure"
+#line 33882 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -32426,16 +33893,16 @@ struct $cf_cv_have_utmp x; char *y = &x.ut_host[0]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32429: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33896: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32432: \$? = $ac_status" >&5
+  echo "$as_me:33899: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32435: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33902: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32438: \$? = $ac_status" >&5
+  echo "$as_me:33905: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_host=yes
 else
@@ -32447,7 +33914,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:32450: result: $cf_cv_have_utmp_ut_host" >&5
+echo "$as_me:33917: 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
@@ -32457,14 +33924,14 @@ EOF
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:32460: checking if ${cf_cv_have_utmp}.ut_syslen is declared" >&5
+echo "$as_me:33927: 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 32467 "configure"
+#line 33934 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -32478,16 +33945,16 @@ struct $cf_cv_have_utmp x; int y = x.ut_syslen
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32481: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33948: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32484: \$? = $ac_status" >&5
+  echo "$as_me:33951: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32487: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33954: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32490: \$? = $ac_status" >&5
+  echo "$as_me:33957: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_syslen=yes
 else
@@ -32499,7 +33966,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:32502: result: $cf_cv_have_utmp_ut_syslen" >&5
+echo "$as_me:33969: 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
@@ -32509,7 +33976,7 @@ EOF
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:32512: checking if ${cf_cv_have_utmp}.ut_name is declared" >&5
+echo "$as_me:33979: 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
@@ -32526,7 +33993,7 @@ cf_utmp_includes="
 "
 for cf_header in ut_name ut_user ; do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 32529 "configure"
+#line 33996 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -32540,16 +34007,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32543: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34010: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32546: \$? = $ac_status" >&5
+  echo "$as_me:34013: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32549: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34016: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32552: \$? = $ac_status" >&5
+  echo "$as_me:34019: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_name=$cf_header
 	 break
@@ -32561,12 +34028,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:32564: result: $cf_cv_have_utmp_ut_name" >&5
+echo "$as_me:34031: result: $cf_cv_have_utmp_ut_name" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_name" >&6
 
 case $cf_cv_have_utmp_ut_name in
 (no)
-	{ { echo "$as_me:32569: error: Cannot find declaration for ut.ut_name" >&5
+	{ { echo "$as_me:34036: 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; }; }
 	;;
@@ -32581,7 +34048,7 @@ esac
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:32584: checking for exit-status in $cf_cv_have_utmp" >&5
+echo "$as_me:34051: 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
@@ -32594,7 +34061,7 @@ for cf_result in \
 	ut_exit.ut_exit
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 32597 "configure"
+#line 34064 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -32608,16 +34075,16 @@ struct $cf_cv_have_utmp x; long y = x.$cf_result = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32611: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34078: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32614: \$? = $ac_status" >&5
+  echo "$as_me:34081: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32617: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34084: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32620: \$? = $ac_status" >&5
+  echo "$as_me:34087: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_xstatus=$cf_result
 	 break
@@ -32630,7 +34097,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:32633: result: $cf_cv_have_utmp_ut_xstatus" >&5
+echo "$as_me:34100: 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
 
@@ -32646,14 +34113,14 @@ fi
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:32649: checking if ${cf_cv_have_utmp}.ut_xtime is declared" >&5
+echo "$as_me:34116: 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 32656 "configure"
+#line 34123 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -32667,23 +34134,23 @@ struct $cf_cv_have_utmp x; long y = x.ut_xtime = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32670: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34137: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32673: \$? = $ac_status" >&5
+  echo "$as_me:34140: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32676: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34143: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32679: \$? = $ac_status" >&5
+  echo "$as_me:34146: \$? = $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 32686 "configure"
+#line 34153 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -32697,16 +34164,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:32700: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34167: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32703: \$? = $ac_status" >&5
+  echo "$as_me:34170: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32706: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34173: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32709: \$? = $ac_status" >&5
+  echo "$as_me:34176: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_xtime=define
 else
@@ -32720,7 +34187,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:32723: result: $cf_cv_have_utmp_ut_xtime" >&5
+echo "$as_me:34190: 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
 
@@ -32739,14 +34206,14 @@ fi
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:32742: checking if ${cf_cv_have_utmp}.ut_session is declared" >&5
+echo "$as_me:34209: 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 32749 "configure"
+#line 34216 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -32760,16 +34227,16 @@ struct $cf_cv_have_utmp x; long y = x.ut_session
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32763: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34230: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32766: \$? = $ac_status" >&5
+  echo "$as_me:34233: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32769: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34236: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32772: \$? = $ac_status" >&5
+  echo "$as_me:34239: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_session=yes
 else
@@ -32780,7 +34247,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:32783: result: $cf_cv_have_utmp_ut_session" >&5
+echo "$as_me:34250: 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
 
@@ -32791,7 +34258,7 @@ EOF
 fi
 fi
 
-echo "$as_me:32794: checking if $cf_cv_have_utmp is SYSV flavor" >&5
+echo "$as_me:34261: 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
@@ -32799,7 +34266,7 @@ else
 
 test "$cf_cv_have_utmp" = "utmp" && cf_prefix="ut" || cf_prefix="utx"
 cat >conftest.$ac_ext <<_ACEOF
-#line 32802 "configure"
+#line 34269 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -32818,16 +34285,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32821: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34288: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32824: \$? = $ac_status" >&5
+  echo "$as_me:34291: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32827: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34294: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32830: \$? = $ac_status" >&5
+  echo "$as_me:34297: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_sysv_utmp=yes
 else
@@ -32838,7 +34305,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:32841: result: $cf_cv_sysv_utmp" >&5
+echo "$as_me:34308: result: $cf_cv_sysv_utmp" >&5
 echo "${ECHO_T}$cf_cv_sysv_utmp" >&6
 test $cf_cv_sysv_utmp = yes &&
 cat >>confdefs.h <<\EOF
@@ -32847,14 +34314,14 @@ EOF
 
 fi
 
-echo "$as_me:32850: checking if external h_errno exists" >&5
+echo "$as_me:34317: 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 32857 "configure"
+#line 34324 "configure"
 #include "confdefs.h"
 
 #undef h_errno
@@ -32869,16 +34336,16 @@ h_errno = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32872: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34339: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32875: \$? = $ac_status" >&5
+  echo "$as_me:34342: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32878: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34345: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32881: \$? = $ac_status" >&5
+  echo "$as_me:34348: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_h_errno=yes
 else
@@ -32889,7 +34356,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:32892: result: $cf_cv_have_h_errno" >&5
+echo "$as_me:34359: 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
@@ -32902,7 +34369,7 @@ EOF
 
 fi
 
-echo "$as_me:32905: checking if bibp: URLs should be supported" >&5
+echo "$as_me:34372: 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.
@@ -32919,14 +34386,14 @@ else
 	use_bibp_urls=yes
 
 fi;
-echo "$as_me:32922: result: $use_bibp_urls" >&5
+echo "$as_me:34389: result: $use_bibp_urls" >&5
 echo "${ECHO_T}$use_bibp_urls" >&6
 test $use_bibp_urls = no &&
 cat >>confdefs.h <<\EOF
 #define DISABLE_BIBP 1
 EOF
 
-echo "$as_me:32929: checking if configuration info should be browsable" >&5
+echo "$as_me:34396: 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.
@@ -32943,14 +34410,14 @@ else
 	use_config_info=yes
 
 fi;
-echo "$as_me:32946: result: $use_config_info" >&5
+echo "$as_me:34413: result: $use_config_info" >&5
 echo "${ECHO_T}$use_config_info" >&6
 test $use_config_info = no &&
 cat >>confdefs.h <<\EOF
 #define NO_CONFIG_INFO 1
 EOF
 
-echo "$as_me:32953: checking if new-style forms-based options screen should be used" >&5
+echo "$as_me:34420: 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.
@@ -32967,14 +34434,14 @@ else
 	use_forms_options=yes
 
 fi;
-echo "$as_me:32970: result: $use_forms_options" >&5
+echo "$as_me:34437: result: $use_forms_options" >&5
 echo "${ECHO_T}$use_forms_options" >&6
 test $use_forms_options = no &&
 cat >>confdefs.h <<\EOF
 #define NO_OPTION_FORMS 1
 EOF
 
-echo "$as_me:32977: checking if old-style options menu should be used" >&5
+echo "$as_me:34444: 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.
@@ -32991,14 +34458,14 @@ else
 	use_menu_options=yes
 
 fi;
-echo "$as_me:32994: result: $use_menu_options" >&5
+echo "$as_me:34461: result: $use_menu_options" >&5
 echo "${ECHO_T}$use_menu_options" >&6
 test $use_menu_options = no &&
 cat >>confdefs.h <<\EOF
 #define NO_OPTION_MENU 1
 EOF
 
-echo "$as_me:33001: checking if sessions code should be used" >&5
+echo "$as_me:34468: 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.
@@ -33015,7 +34482,7 @@ else
 	use_sessions=yes
 
 fi;
-echo "$as_me:33018: result: $use_sessions" >&5
+echo "$as_me:34485: result: $use_sessions" >&5
 echo "${ECHO_T}$use_sessions" >&6
 if test $use_sessions != no ; then
 
@@ -33026,7 +34493,7 @@ EOF
 	EXTRA_OBJS="$EXTRA_OBJS LYSession\$o"
 fi
 
-echo "$as_me:33029: checking if session-caching code should be used" >&5
+echo "$as_me:34496: 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.
@@ -33043,7 +34510,7 @@ else
 	use_session_cache=yes
 
 fi;
-echo "$as_me:33046: result: $use_session_cache" >&5
+echo "$as_me:34513: result: $use_session_cache" >&5
 echo "${ECHO_T}$use_session_cache" >&6
 if test $use_session_cache != no ; then
 
@@ -33053,7 +34520,7 @@ EOF
 
 fi
 
-echo "$as_me:33056: checking if address-list page should be used" >&5
+echo "$as_me:34523: 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.
@@ -33070,14 +34537,14 @@ else
 	use_addrlist_page=yes
 
 fi;
-echo "$as_me:33073: result: $use_addrlist_page" >&5
+echo "$as_me:34540: result: $use_addrlist_page" >&5
 echo "${ECHO_T}$use_addrlist_page" >&6
 test $use_addrlist_page != no &&
 cat >>confdefs.h <<\EOF
 #define USE_ADDRLIST_PAGE 1
 EOF
 
-echo "$as_me:33080: checking if experimental CJK logic should be used" >&5
+echo "$as_me:34547: 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.
@@ -33094,14 +34561,14 @@ else
 	use_cjk=no
 
 fi;
-echo "$as_me:33097: result: $use_cjk" >&5
+echo "$as_me:34564: result: $use_cjk" >&5
 echo "${ECHO_T}$use_cjk" >&6
 test $use_cjk != no &&
 cat >>confdefs.h <<\EOF
 #define CJK_EX 1
 EOF
 
-echo "$as_me:33104: checking if experimental Japanese UTF-8 logic should be used" >&5
+echo "$as_me:34571: 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.
@@ -33118,7 +34585,7 @@ else
 	use_ja_utf8=no
 
 fi;
-echo "$as_me:33121: result: $use_ja_utf8" >&5
+echo "$as_me:34588: result: $use_ja_utf8" >&5
 echo "${ECHO_T}$use_ja_utf8" >&6
 if test $use_ja_utf8 != no ; then
 
@@ -33162,9 +34629,12 @@ if test -n "$cf_searchpath/include" ; then
 			if test "$GCC" = yes
 			then
 			  cf_save_CPPFLAGS=$CPPFLAGS
-			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 33167 "configure"
+#line 34637 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -33176,16 +34646,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33179: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34649: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33182: \$? = $ac_status" >&5
+  echo "$as_me:34652: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33185: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34655: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33188: \$? = $ac_status" >&5
+  echo "$as_me:34658: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -33202,7 +34672,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}:33205: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:34675: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -33243,9 +34713,12 @@ if test -n "$cf_searchpath/../include" ; then
 			if test "$GCC" = yes
 			then
 			  cf_save_CPPFLAGS=$CPPFLAGS
-			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 33248 "configure"
+#line 34721 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -33257,16 +34730,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33260: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34733: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33263: \$? = $ac_status" >&5
+  echo "$as_me:34736: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33266: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34739: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33269: \$? = $ac_status" >&5
+  echo "$as_me:34742: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -33283,7 +34756,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}:33286: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:34759: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -33301,7 +34774,7 @@ echo "${as_me:-configure}:33286: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:33304: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:34777: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -33326,7 +34799,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}:33329: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:34802: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -33355,7 +34828,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}:33358: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:34831: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -33364,7 +34837,7 @@ echo "${as_me:-configure}:33358: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:33367: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:34840: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -33375,7 +34848,7 @@ esac
 
 fi;
 
-  echo "$as_me:33378: checking for iconv" >&5
+  echo "$as_me:34851: 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
@@ -33386,12 +34859,12 @@ else
 cf_cv_header_path_iconv=
 cf_cv_library_path_iconv=
 
-echo "${as_me:-configure}:33389: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:34862: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 33394 "configure"
+#line 34867 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -33410,16 +34883,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33413: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34886: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33416: \$? = $ac_status" >&5
+  echo "$as_me:34889: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33419: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34892: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33422: \$? = $ac_status" >&5
+  echo "$as_me:34895: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -33433,7 +34906,7 @@ cat conftest.$ac_ext >&5
 LIBS="-liconv  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 33436 "configure"
+#line 34909 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -33452,16 +34925,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33455: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34928: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33458: \$? = $ac_status" >&5
+  echo "$as_me:34931: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33461: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34934: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33464: \$? = $ac_status" >&5
+  echo "$as_me:34937: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -33478,9 +34951,9 @@ cat conftest.$ac_ext >&5
 
 	test -n "$verbose" && echo "	find linkage for iconv library" 1>&6
 
-echo "${as_me:-configure}:33481: testing find linkage for iconv library ..." 1>&5
+echo "${as_me:-configure}:34954: testing find linkage for iconv library ..." 1>&5
 
-echo "${as_me:-configure}:33483: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:34956: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -33571,11 +35044,15 @@ 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}:33574: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:35047: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
+
+			CPPFLAGS="$cf_save_CPPFLAGS"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_iconv"
 
-			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_iconv"
 			cat >conftest.$ac_ext <<_ACEOF
-#line 33578 "configure"
+#line 35055 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -33594,21 +35071,21 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33597: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35074: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33600: \$? = $ac_status" >&5
+  echo "$as_me:35077: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33603: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35080: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33606: \$? = $ac_status" >&5
+  echo "$as_me:35083: \$? = $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}:33611: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:35088: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
 
 				cf_cv_find_linkage_iconv=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -33626,7 +35103,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "$cf_cv_find_linkage_iconv" = maybe ; then
 
-echo "${as_me:-configure}:33629: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:35106: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -33701,13 +35178,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}:33704: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:35181: 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 33710 "configure"
+#line 35187 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -33726,21 +35203,21 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33729: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35206: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33732: \$? = $ac_status" >&5
+  echo "$as_me:35209: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33735: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35212: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33738: \$? = $ac_status" >&5
+  echo "$as_me:35215: \$? = $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}:33743: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:35220: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
 
 					cf_cv_find_linkage_iconv=yes
 					cf_cv_library_file_iconv="-liconv"
@@ -33780,7 +35257,7 @@ am_cv_func_iconv="no, consider installing GNU libiconv"
 fi
 
 fi
-echo "$as_me:33783: result: $am_cv_func_iconv" >&5
+echo "$as_me:35260: result: $am_cv_func_iconv" >&5
 echo "${ECHO_T}$am_cv_func_iconv" >&6
 
   if test "$am_cv_func_iconv" = yes; then
@@ -33789,14 +35266,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_ICONV 1
 EOF
 
-    echo "$as_me:33792: checking if the declaration of iconv() needs const." >&5
+    echo "$as_me:35269: 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 33799 "configure"
+#line 35276 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -33821,16 +35298,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33824: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35301: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33827: \$? = $ac_status" >&5
+  echo "$as_me:35304: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33830: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35307: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33833: \$? = $ac_status" >&5
+  echo "$as_me:35310: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_proto_iconv_const=no
 else
@@ -33840,7 +35317,7 @@ am_cv_proto_iconv_const=yes
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:33843: result: $am_cv_proto_iconv_const" >&5
+echo "$as_me:35320: 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
@@ -33880,9 +35357,12 @@ if test -n "$cf_cv_header_path_iconv" ; then
 			if test "$GCC" = yes
 			then
 			  cf_save_CPPFLAGS=$CPPFLAGS
-			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 33885 "configure"
+#line 35365 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -33894,16 +35374,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33897: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35377: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33900: \$? = $ac_status" >&5
+  echo "$as_me:35380: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33903: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35383: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33906: \$? = $ac_status" >&5
+  echo "$as_me:35386: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -33920,7 +35400,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}:33923: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:35403: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -33959,7 +35439,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}:33962: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:35442: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -33975,7 +35455,7 @@ fi
 	fi
 fi
 
-echo "$as_me:33978: checking if experimental wcwidth/UTF-8 logic should be used" >&5
+echo "$as_me:35458: checking if experimental wcwidth/UTF-8 logic should be used" >&5
 echo $ECHO_N "checking if experimental wcwidth/UTF-8 logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-wcwidth-support or --disable-wcwidth-support was given.
@@ -33992,7 +35472,7 @@ else
 	use_wcwidth=no
 
 fi;
-echo "$as_me:33995: result: $use_wcwidth" >&5
+echo "$as_me:35475: result: $use_wcwidth" >&5
 echo "${ECHO_T}$use_wcwidth" >&6
 test $use_wcwidth != no &&
 cat >>confdefs.h <<\EOF
@@ -34007,7 +35487,7 @@ case $cf_cv_screen in
 esac
 
 if test "$use_dft_colors" != no ; then
-echo "$as_me:34010: checking if you want to use default-colors" >&5
+echo "$as_me:35490: 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.
@@ -34024,7 +35504,7 @@ else
 	use_dft_colors=no
 
 fi;
-echo "$as_me:34027: result: $use_dft_colors" >&5
+echo "$as_me:35507: result: $use_dft_colors" >&5
 echo "${ECHO_T}$use_dft_colors" >&6
 test $use_dft_colors = "yes" &&
 cat >>confdefs.h <<\EOF
@@ -34033,7 +35513,7 @@ EOF
 
 fi
 
-echo "$as_me:34036: checking if experimental keyboard-layout logic should be used" >&5
+echo "$as_me:35516: 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.
@@ -34050,14 +35530,14 @@ else
 	use_kbd_layout=no
 
 fi;
-echo "$as_me:34053: result: $use_kbd_layout" >&5
+echo "$as_me:35533: result: $use_kbd_layout" >&5
 echo "${ECHO_T}$use_kbd_layout" >&6
 test $use_kbd_layout != no &&
 cat >>confdefs.h <<\EOF
 #define EXP_KEYBOARD_LAYOUT 1
 EOF
 
-echo "$as_me:34060: checking if experimental nested-table logic should be used" >&5
+echo "$as_me:35540: 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.
@@ -34074,14 +35554,14 @@ else
 	use_nested_tables=no
 
 fi;
-echo "$as_me:34077: result: $use_nested_tables" >&5
+echo "$as_me:35557: result: $use_nested_tables" >&5
 echo "${ECHO_T}$use_nested_tables" >&6
 test $use_nested_tables != no &&
 cat >>confdefs.h <<\EOF
 #define EXP_NESTED_TABLES 1
 EOF
 
-echo "$as_me:34084: checking if alternative line-edit bindings should be used" >&5
+echo "$as_me:35564: 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.
@@ -34098,14 +35578,14 @@ else
 	use_alt_bindings=yes
 
 fi;
-echo "$as_me:34101: result: $use_alt_bindings" >&5
+echo "$as_me:35581: result: $use_alt_bindings" >&5
 echo "${ECHO_T}$use_alt_bindings" >&6
 test $use_alt_bindings != no &&
 cat >>confdefs.h <<\EOF
 #define USE_ALT_BINDINGS 1
 EOF
 
-echo "$as_me:34108: checking if ascii case-conversion should be used" >&5
+echo "$as_me:35588: 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.
@@ -34122,14 +35602,14 @@ else
 	use_ascii_ctypes=yes
 
 fi;
-echo "$as_me:34125: result: $use_ascii_ctypes" >&5
+echo "$as_me:35605: result: $use_ascii_ctypes" >&5
 echo "${ECHO_T}$use_ascii_ctypes" >&6
 test $use_ascii_ctypes != no &&
 cat >>confdefs.h <<\EOF
 #define USE_ASCII_CTYPES 1
 EOF
 
-echo "$as_me:34132: checking if you want to use extended HTML DTD logic" >&5
+echo "$as_me:35612: 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.
@@ -34146,14 +35626,14 @@ else
 	use_ext_htmldtd=yes
 
 fi;
-echo "$as_me:34149: result: $use_ext_htmldtd" >&5
+echo "$as_me:35629: result: $use_ext_htmldtd" >&5
 echo "${ECHO_T}$use_ext_htmldtd" >&6
 test $use_ext_htmldtd = "no" &&
 cat >>confdefs.h <<\EOF
 #define NO_EXTENDED_HTMLDTD 1
 EOF
 
-echo "$as_me:34156: checking if file-upload logic should be used" >&5
+echo "$as_me:35636: 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.
@@ -34170,14 +35650,14 @@ else
 	use_file_upload=yes
 
 fi;
-echo "$as_me:34173: result: $use_file_upload" >&5
+echo "$as_me:35653: result: $use_file_upload" >&5
 echo "${ECHO_T}$use_file_upload" >&6
 test $use_file_upload != no &&
 cat >>confdefs.h <<\EOF
 #define USE_FILE_UPLOAD 1
 EOF
 
-echo "$as_me:34180: checking if IDNA support should be used" >&5
+echo "$as_me:35660: 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.
@@ -34194,7 +35674,7 @@ else
 	use_idna=yes
 
 fi;
-echo "$as_me:34197: result: $use_idna" >&5
+echo "$as_me:35677: result: $use_idna" >&5
 echo "${ECHO_T}$use_idna" >&6
 
 if test "$use_idna" = yes ; then
@@ -34231,9 +35711,12 @@ if test -n "$cf_searchpath/include" ; then
 			if test "$GCC" = yes
 			then
 			  cf_save_CPPFLAGS=$CPPFLAGS
-			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 34236 "configure"
+#line 35719 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -34245,16 +35728,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34248: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35731: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34251: \$? = $ac_status" >&5
+  echo "$as_me:35734: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:34254: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35737: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34257: \$? = $ac_status" >&5
+  echo "$as_me:35740: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -34271,7 +35754,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}:34274: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:35757: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -34312,9 +35795,12 @@ if test -n "$cf_searchpath/../include" ; then
 			if test "$GCC" = yes
 			then
 			  cf_save_CPPFLAGS=$CPPFLAGS
-			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 34317 "configure"
+#line 35803 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -34326,16 +35812,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34329: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35815: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34332: \$? = $ac_status" >&5
+  echo "$as_me:35818: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:34335: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35821: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34338: \$? = $ac_status" >&5
+  echo "$as_me:35824: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -34352,7 +35838,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}:34355: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:35841: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -34370,7 +35856,7 @@ echo "${as_me:-configure}:34355: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:34373: error: cannot find  under $use_idna" >&5
+{ { echo "$as_me:35859: error: cannot find  under $use_idna" >&5
 echo "$as_me: error: cannot find  under $use_idna" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -34395,7 +35881,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}:34398: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:35884: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -34424,7 +35910,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}:34427: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:35913: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -34433,7 +35919,7 @@ echo "${as_me:-configure}:34427: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:34436: error: cannot find  under $use_idna" >&5
+{ { echo "$as_me:35922: error: cannot find  under $use_idna" >&5
 echo "$as_me: error: cannot find  under $use_idna" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -34447,12 +35933,12 @@ esac
 cf_cv_header_path_idn=
 cf_cv_library_path_idn=
 
-echo "${as_me:-configure}:34450: testing Starting FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:35936: testing Starting FIND_LINKAGE(idn,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 34455 "configure"
+#line 35941 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -34470,16 +35956,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34473: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35959: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34476: \$? = $ac_status" >&5
+  echo "$as_me:35962: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:34479: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35965: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34482: \$? = $ac_status" >&5
+  echo "$as_me:35968: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_idn=yes
@@ -34493,7 +35979,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lidn $LIBICONV $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 34496 "configure"
+#line 35982 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -34511,16 +35997,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34514: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36000: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34517: \$? = $ac_status" >&5
+  echo "$as_me:36003: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:34520: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36006: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34523: \$? = $ac_status" >&5
+  echo "$as_me:36009: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_idn=yes
@@ -34537,9 +36023,9 @@ cat conftest.$ac_ext >&5
 
 	test -n "$verbose" && echo "	find linkage for idn library" 1>&6
 
-echo "${as_me:-configure}:34540: testing find linkage for idn library ..." 1>&5
+echo "${as_me:-configure}:36026: testing find linkage for idn library ..." 1>&5
 
-echo "${as_me:-configure}:34542: testing Searching for headers in FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:36028: testing Searching for headers in FIND_LINKAGE(idn,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -34630,11 +36116,15 @@ 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}:34633: testing ... testing $cf_cv_header_path_idn ..." 1>&5
+echo "${as_me:-configure}:36119: testing ... testing $cf_cv_header_path_idn ..." 1>&5
+
+			CPPFLAGS="$cf_save_CPPFLAGS"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_idn"
 
-			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_idn"
 			cat >conftest.$ac_ext <<_ACEOF
-#line 34637 "configure"
+#line 36127 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -34652,21 +36142,21 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34655: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36145: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34658: \$? = $ac_status" >&5
+  echo "$as_me:36148: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:34661: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36151: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34664: \$? = $ac_status" >&5
+  echo "$as_me:36154: \$? = $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}:34669: testing ... found idn headers in $cf_cv_header_path_idn ..." 1>&5
+echo "${as_me:-configure}:36159: testing ... found idn headers in $cf_cv_header_path_idn ..." 1>&5
 
 				cf_cv_find_linkage_idn=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -34684,7 +36174,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "$cf_cv_find_linkage_idn" = maybe ; then
 
-echo "${as_me:-configure}:34687: testing Searching for idn library in FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:36177: testing Searching for idn library in FIND_LINKAGE(idn,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -34759,13 +36249,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}:34762: testing ... testing $cf_cv_library_path_idn ..." 1>&5
+echo "${as_me:-configure}:36252: 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 34768 "configure"
+#line 36258 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -34783,21 +36273,21 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34786: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36276: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34789: \$? = $ac_status" >&5
+  echo "$as_me:36279: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:34792: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36282: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34795: \$? = $ac_status" >&5
+  echo "$as_me:36285: \$? = $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}:34800: testing ... found idn library in $cf_cv_library_path_idn ..." 1>&5
+echo "${as_me:-configure}:36290: testing ... found idn library in $cf_cv_library_path_idn ..." 1>&5
 
 					cf_cv_find_linkage_idn=yes
 					cf_cv_library_file_idn="-lidn"
@@ -34854,9 +36344,12 @@ if test -n "$cf_cv_header_path_idn" ; then
 			if test "$GCC" = yes
 			then
 			  cf_save_CPPFLAGS=$CPPFLAGS
-			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 34859 "configure"
+#line 36352 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -34868,16 +36361,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34871: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36364: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34874: \$? = $ac_status" >&5
+  echo "$as_me:36367: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:34877: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36370: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34880: \$? = $ac_status" >&5
+  echo "$as_me:36373: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -34894,7 +36387,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}:34897: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:36390: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -34930,7 +36423,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}:34933: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:36426: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -34955,7 +36448,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:34958: WARNING: Cannot find idn library" >&5
+{ echo "$as_me:36451: WARNING: Cannot find idn library" >&5
 echo "$as_me: WARNING: Cannot find idn library" >&2;}
 fi
 
@@ -34969,7 +36462,7 @@ fi
 
 fi
 
-echo "$as_me:34972: checking if element-justification logic should be used" >&5
+echo "$as_me:36465: 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.
@@ -34986,14 +36479,14 @@ else
 	use_justify_elts=yes
 
 fi;
-echo "$as_me:34989: result: $use_justify_elts" >&5
+echo "$as_me:36482: result: $use_justify_elts" >&5
 echo "${ECHO_T}$use_justify_elts" >&6
 test $use_justify_elts != no &&
 cat >>confdefs.h <<\EOF
 #define USE_JUSTIFY_ELTS 1
 EOF
 
-echo "$as_me:34996: checking if partial-display should be used" >&5
+echo "$as_me:36489: 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.
@@ -35010,14 +36503,14 @@ else
 	use_partial_display=yes
 
 fi;
-echo "$as_me:35013: result: $use_partial_display" >&5
+echo "$as_me:36506: result: $use_partial_display" >&5
 echo "${ECHO_T}$use_partial_display" >&6
 test $use_partial_display != no &&
 cat >>confdefs.h <<\EOF
 #define DISP_PARTIAL 1
 EOF
 
-echo "$as_me:35020: checking if persistent-cookie logic should be used" >&5
+echo "$as_me:36513: 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.
@@ -35034,14 +36527,14 @@ else
 	use_filed_cookies=yes
 
 fi;
-echo "$as_me:35037: result: $use_filed_cookies" >&5
+echo "$as_me:36530: result: $use_filed_cookies" >&5
 echo "${ECHO_T}$use_filed_cookies" >&6
 test $use_filed_cookies != no &&
 cat >>confdefs.h <<\EOF
 #define USE_PERSISTENT_COOKIES 1
 EOF
 
-echo "$as_me:35044: checking if html source should be colorized" >&5
+echo "$as_me:36537: 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.
@@ -35058,14 +36551,14 @@ else
 	use_prettysrc=yes
 
 fi;
-echo "$as_me:35061: result: $use_prettysrc" >&5
+echo "$as_me:36554: result: $use_prettysrc" >&5
 echo "${ECHO_T}$use_prettysrc" >&6
 test $use_prettysrc != no &&
 cat >>confdefs.h <<\EOF
 #define USE_PRETTYSRC 1
 EOF
 
-echo "$as_me:35068: checking if progress-bar code should be used" >&5
+echo "$as_me:36561: 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.
@@ -35082,14 +36575,14 @@ else
 	use_progressbar=yes
 
 fi;
-echo "$as_me:35085: result: $use_progressbar" >&5
+echo "$as_me:36578: result: $use_progressbar" >&5
 echo "${ECHO_T}$use_progressbar" >&6
 test $use_progressbar != no &&
 cat >>confdefs.h <<\EOF
 #define USE_PROGRESSBAR 1
 EOF
 
-echo "$as_me:35092: checking if read-progress message should show ETA" >&5
+echo "$as_me:36585: 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.
@@ -35106,14 +36599,14 @@ else
 	use_read_eta=yes
 
 fi;
-echo "$as_me:35109: result: $use_read_eta" >&5
+echo "$as_me:36602: result: $use_read_eta" >&5
 echo "${ECHO_T}$use_read_eta" >&6
 test $use_read_eta != no &&
 cat >>confdefs.h <<\EOF
 #define USE_READPROGRESS 1
 EOF
 
-echo "$as_me:35116: checking if source caching should be used" >&5
+echo "$as_me:36609: 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.
@@ -35130,14 +36623,14 @@ else
 	use_source_cache=yes
 
 fi;
-echo "$as_me:35133: result: $use_source_cache" >&5
+echo "$as_me:36626: result: $use_source_cache" >&5
 echo "${ECHO_T}$use_source_cache" >&6
 test $use_source_cache != no &&
 cat >>confdefs.h <<\EOF
 #define USE_SOURCE_CACHE 1
 EOF
 
-echo "$as_me:35140: checking if scrollbar code should be used" >&5
+echo "$as_me:36633: 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.
@@ -35154,10 +36647,10 @@ else
 	use_scrollbar=yes
 
 fi;
-echo "$as_me:35157: result: $use_scrollbar" >&5
+echo "$as_me:36650: result: $use_scrollbar" >&5
 echo "${ECHO_T}$use_scrollbar" >&6
 
-echo "$as_me:35160: checking if charset-selection logic should be used" >&5
+echo "$as_me:36653: 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.
@@ -35174,14 +36667,14 @@ else
 	use_charset_choice=no
 
 fi;
-echo "$as_me:35177: result: $use_charset_choice" >&5
+echo "$as_me:36670: result: $use_charset_choice" >&5
 echo "${ECHO_T}$use_charset_choice" >&6
 test $use_charset_choice != no &&
 cat >>confdefs.h <<\EOF
 #define USE_CHARSET_CHOICE 1
 EOF
 
-echo "$as_me:35184: checking if you want to use external commands" >&5
+echo "$as_me:36677: 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.
@@ -35198,7 +36691,7 @@ else
 	use_externs=no
 
 fi;
-echo "$as_me:35201: result: $use_externs" >&5
+echo "$as_me:36694: result: $use_externs" >&5
 echo "${ECHO_T}$use_externs" >&6
 if test $use_externs != "no" ; then
 
@@ -35209,7 +36702,7 @@ EOF
 	EXTRA_OBJS="$EXTRA_OBJS LYExtern\$o"
 fi
 
-echo "$as_me:35212: checking if you want to use setfont support" >&5
+echo "$as_me:36705: 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.
@@ -35226,7 +36719,7 @@ else
 	use_setfont=no
 
 fi;
-echo "$as_me:35229: result: $use_setfont" >&5
+echo "$as_me:36722: result: $use_setfont" >&5
 echo "${ECHO_T}$use_setfont" >&6
 if test $use_setfont = yes ; then
 	case $host_os in
@@ -35237,7 +36730,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:35240: checking for $ac_word" >&5
+echo "$as_me:36733: 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
@@ -35254,7 +36747,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:35257: found $ac_dir/$ac_word" >&5
+   echo "$as_me:36750: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -35265,10 +36758,10 @@ fi
 SETFONT=$ac_cv_path_SETFONT
 
 if test -n "$SETFONT"; then
-  echo "$as_me:35268: result: $SETFONT" >&5
+  echo "$as_me:36761: result: $SETFONT" >&5
 echo "${ECHO_T}$SETFONT" >&6
 else
-  echo "$as_me:35271: result: no" >&5
+  echo "$as_me:36764: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -35327,7 +36820,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:35330: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:36823: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define SETFONT_PATH "$cf_path_prog"
@@ -35345,19 +36838,19 @@ fi
 		SETFONT=built-in
 		test -n "$verbose" && echo "	Assume $host_os has font-switching" 1>&6
 
-echo "${as_me:-configure}:35348: testing Assume $host_os has font-switching ..." 1>&5
+echo "${as_me:-configure}:36841: 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}:35355: testing Assume $host_os has no font-switching ..." 1>&5
+echo "${as_me:-configure}:36848: testing Assume $host_os has no font-switching ..." 1>&5
 
 		;;
 	esac
 	if test -z "$SETFONT" ; then
-		{ echo "$as_me:35360: WARNING: Cannot find a font-setting program" >&5
+		{ echo "$as_me:36853: WARNING: Cannot find a font-setting program" >&5
 echo "$as_me: WARNING: Cannot find a font-setting program" >&2;}
 	elif test "$SETFONT" != unknown ; then
 
@@ -35368,7 +36861,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:35371: checking if you want cgi-link support" >&5
+echo "$as_me:36864: 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.
@@ -35385,10 +36878,10 @@ EOF
 else
   enableval=no
 fi;
-echo "$as_me:35388: result: $enableval" >&5
+echo "$as_me:36881: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:35391: checking if you want change-exec support" >&5
+echo "$as_me:36884: 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.
@@ -35405,14 +36898,14 @@ else
 	use_change_exec=no
 
 fi;
-echo "$as_me:35408: result: $use_change_exec" >&5
+echo "$as_me:36901: result: $use_change_exec" >&5
 echo "${ECHO_T}$use_change_exec" >&6
 test $use_change_exec = yes &&
 cat >>confdefs.h <<\EOF
 #define ENABLE_OPTS_CHANGE_EXEC 1
 EOF
 
-echo "$as_me:35415: checking if you want exec-links support" >&5
+echo "$as_me:36908: 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.
@@ -35429,14 +36922,14 @@ else
 	use_exec_links=$enableval
 
 fi;
-echo "$as_me:35432: result: $use_exec_links" >&5
+echo "$as_me:36925: result: $use_exec_links" >&5
 echo "${ECHO_T}$use_exec_links" >&6
 test $use_exec_links = yes &&
 cat >>confdefs.h <<\EOF
 #define EXEC_LINKS 1
 EOF
 
-echo "$as_me:35439: checking if you want exec-scripts support" >&5
+echo "$as_me:36932: 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.
@@ -35453,14 +36946,14 @@ else
 	use_exec_scripts=$enableval
 
 fi;
-echo "$as_me:35456: result: $use_exec_scripts" >&5
+echo "$as_me:36949: result: $use_exec_scripts" >&5
 echo "${ECHO_T}$use_exec_scripts" >&6
 test $use_exec_scripts = yes &&
 cat >>confdefs.h <<\EOF
 #define EXEC_SCRIPTS 1
 EOF
 
-echo "$as_me:35463: checking if you want internal-links feature" >&5
+echo "$as_me:36956: 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.
@@ -35477,14 +36970,14 @@ else
 	use_internal_links=no
 
 fi;
-echo "$as_me:35480: result: $use_internal_links" >&5
+echo "$as_me:36973: result: $use_internal_links" >&5
 echo "${ECHO_T}$use_internal_links" >&6
 test $use_internal_links = yes &&
 cat >>confdefs.h <<\EOF
 #define TRACK_INTERNAL_LINKS 1
 EOF
 
-echo "$as_me:35487: checking if you want to fork NSL requests" >&5
+echo "$as_me:36980: 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.
@@ -35501,7 +36994,7 @@ else
 	use_nsl_fork=no
 
 fi;
-echo "$as_me:35504: result: $use_nsl_fork" >&5
+echo "$as_me:36997: result: $use_nsl_fork" >&5
 echo "${ECHO_T}$use_nsl_fork" >&6
 if test $use_nsl_fork = yes ; then
 	case $host_os in
@@ -35522,7 +37015,7 @@ EOF
 	esac
 fi
 
-echo "$as_me:35525: checking if you want to log URL requests via syslog" >&5
+echo "$as_me:37018: 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.
@@ -35539,14 +37032,14 @@ else
 	use_syslog=no
 
 fi;
-echo "$as_me:35542: result: $use_syslog" >&5
+echo "$as_me:37035: result: $use_syslog" >&5
 echo "${ECHO_T}$use_syslog" >&6
 test $use_syslog = yes &&
 cat >>confdefs.h <<\EOF
 #define SYSLOG_REQUESTED_URLS 1
 EOF
 
-echo "$as_me:35549: checking if you want to underline links" >&5
+echo "$as_me:37042: 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.
@@ -35563,7 +37056,7 @@ else
 	use_underline=no
 
 fi;
-echo "$as_me:35566: result: $use_underline" >&5
+echo "$as_me:37059: result: $use_underline" >&5
 echo "${ECHO_T}$use_underline" >&6
 test $use_underline = yes &&
 cat >>confdefs.h <<\EOF
@@ -35575,7 +37068,7 @@ cat >>confdefs.h <<\EOF
 #define UNDERLINE_LINKS 0
 EOF
 
-echo "$as_me:35578: checking if help files should be gzip'ed" >&5
+echo "$as_me:37071: 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.
@@ -35592,10 +37085,10 @@ else
 	use_gzip_help=no
 
 fi;
-echo "$as_me:35595: result: $use_gzip_help" >&5
+echo "$as_me:37088: result: $use_gzip_help" >&5
 echo "${ECHO_T}$use_gzip_help" >&6
 
-echo "$as_me:35598: checking if you want to use libbz2 for decompression of some bzip2 files" >&5
+echo "$as_me:37091: 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.
@@ -35605,7 +37098,7 @@ if test "${with_bzlib+set}" = set; then
 else
   use_bzlib=no
 fi;
-echo "$as_me:35608: result: $use_bzlib" >&5
+echo "$as_me:37101: result: $use_bzlib" >&5
 echo "${ECHO_T}$use_bzlib" >&6
 
 if test ".$use_bzlib" != ".no" ; then
@@ -35642,9 +37135,12 @@ if test -n "$cf_searchpath/include" ; then
 			if test "$GCC" = yes
 			then
 			  cf_save_CPPFLAGS=$CPPFLAGS
-			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 35647 "configure"
+#line 37143 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -35656,16 +37152,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:35659: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:37155: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35662: \$? = $ac_status" >&5
+  echo "$as_me:37158: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:35665: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37161: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35668: \$? = $ac_status" >&5
+  echo "$as_me:37164: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -35682,7 +37178,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}:35685: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:37181: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -35723,9 +37219,12 @@ if test -n "$cf_searchpath/../include" ; then
 			if test "$GCC" = yes
 			then
 			  cf_save_CPPFLAGS=$CPPFLAGS
-			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 35728 "configure"
+#line 37227 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -35737,16 +37236,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:35740: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:37239: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35743: \$? = $ac_status" >&5
+  echo "$as_me:37242: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:35746: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37245: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35749: \$? = $ac_status" >&5
+  echo "$as_me:37248: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -35763,7 +37262,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}:35766: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:37265: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -35781,7 +37280,7 @@ echo "${as_me:-configure}:35766: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:35784: error: cannot find  under $use_bzlib" >&5
+{ { echo "$as_me:37283: error: cannot find  under $use_bzlib" >&5
 echo "$as_me: error: cannot find  under $use_bzlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -35806,7 +37305,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}:35809: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:37308: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -35835,7 +37334,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}:35838: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:37337: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -35844,7 +37343,7 @@ echo "${as_me:-configure}:35838: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:35847: error: cannot find  under $use_bzlib" >&5
+{ { echo "$as_me:37346: error: cannot find  under $use_bzlib" >&5
 echo "$as_me: error: cannot find  under $use_bzlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -35858,12 +37357,12 @@ esac
 cf_cv_header_path_bz2=
 cf_cv_library_path_bz2=
 
-echo "${as_me:-configure}:35861: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:37360: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 35866 "configure"
+#line 37365 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -35880,16 +37379,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35883: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37382: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35886: \$? = $ac_status" >&5
+  echo "$as_me:37385: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35889: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37388: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35892: \$? = $ac_status" >&5
+  echo "$as_me:37391: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_bz2=yes
@@ -35903,7 +37402,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lbz2  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 35906 "configure"
+#line 37405 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -35920,16 +37419,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35923: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37422: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35926: \$? = $ac_status" >&5
+  echo "$as_me:37425: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35929: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37428: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35932: \$? = $ac_status" >&5
+  echo "$as_me:37431: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_bz2=yes
@@ -35946,9 +37445,9 @@ cat conftest.$ac_ext >&5
 
 	test -n "$verbose" && echo "	find linkage for bz2 library" 1>&6
 
-echo "${as_me:-configure}:35949: testing find linkage for bz2 library ..." 1>&5
+echo "${as_me:-configure}:37448: testing find linkage for bz2 library ..." 1>&5
 
-echo "${as_me:-configure}:35951: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:37450: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -36039,11 +37538,15 @@ 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}:36042: testing ... testing $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:37541: testing ... testing $cf_cv_header_path_bz2 ..." 1>&5
+
+			CPPFLAGS="$cf_save_CPPFLAGS"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_bz2"
 
-			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_bz2"
 			cat >conftest.$ac_ext <<_ACEOF
-#line 36046 "configure"
+#line 37549 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -36060,21 +37563,21 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:36063: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:37566: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36066: \$? = $ac_status" >&5
+  echo "$as_me:37569: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:36069: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37572: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36072: \$? = $ac_status" >&5
+  echo "$as_me:37575: \$? = $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}:36077: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:37580: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
 
 				cf_cv_find_linkage_bz2=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -36092,7 +37595,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "$cf_cv_find_linkage_bz2" = maybe ; then
 
-echo "${as_me:-configure}:36095: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:37598: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -36100,7 +37603,7 @@ echo "${as_me:-configure}:36095: testing Searching for bz2 library in FIND_LINKA
 		CPPFLAGS="$cf_test_CPPFLAGS"
 		LIBS="-lbz2  $cf_save_LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 36103 "configure"
+#line 37606 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -36117,21 +37620,21 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36120: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37623: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36123: \$? = $ac_status" >&5
+  echo "$as_me:37626: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36126: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37629: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36129: \$? = $ac_status" >&5
+  echo "$as_me:37632: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 			test -n "$verbose" && echo "	... found bz2 library in system" 1>&6
 
-echo "${as_me:-configure}:36134: testing ... found bz2 library in system ..." 1>&5
+echo "${as_me:-configure}:37637: testing ... found bz2 library in system ..." 1>&5
 
 			cf_cv_find_linkage_bz2=yes
 else
@@ -36212,13 +37715,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}:36215: testing ... testing $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:37718: 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 36221 "configure"
+#line 37724 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -36235,21 +37738,21 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36238: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37741: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36241: \$? = $ac_status" >&5
+  echo "$as_me:37744: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36244: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37747: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36247: \$? = $ac_status" >&5
+  echo "$as_me:37750: \$? = $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}:36252: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:37755: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
 
 					cf_cv_find_linkage_bz2=yes
 					cf_cv_library_file_bz2="-lbz2"
@@ -36306,9 +37809,12 @@ if test -n "$cf_cv_header_path_bz2" ; then
 			if test "$GCC" = yes
 			then
 			  cf_save_CPPFLAGS=$CPPFLAGS
-			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 36311 "configure"
+#line 37817 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -36320,16 +37826,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:36323: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:37829: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36326: \$? = $ac_status" >&5
+  echo "$as_me:37832: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:36329: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37835: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36332: \$? = $ac_status" >&5
+  echo "$as_me:37838: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -36346,7 +37852,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}:36349: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:37855: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -36382,7 +37888,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}:36385: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:37891: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -36407,7 +37913,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:36410: WARNING: Cannot find bz2 library" >&5
+{ echo "$as_me:37916: WARNING: Cannot find bz2 library" >&5
 echo "$as_me: WARNING: Cannot find bz2 library" >&2;}
 fi
 
@@ -36418,7 +37924,7 @@ EOF
 
 fi
 
-echo "$as_me:36421: checking if you want to use zlib for decompression of some gzip files" >&5
+echo "$as_me:37927: 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.
@@ -36428,7 +37934,7 @@ if test "${with_zlib+set}" = set; then
 else
   use_zlib=no
 fi;
-echo "$as_me:36431: result: $use_zlib" >&5
+echo "$as_me:37937: result: $use_zlib" >&5
 echo "${ECHO_T}$use_zlib" >&6
 
 if test ".$use_zlib" != ".no" ; then
@@ -36465,9 +37971,12 @@ if test -n "$cf_searchpath/include" ; then
 			if test "$GCC" = yes
 			then
 			  cf_save_CPPFLAGS=$CPPFLAGS
-			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 36470 "configure"
+#line 37979 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -36479,16 +37988,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:36482: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:37991: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36485: \$? = $ac_status" >&5
+  echo "$as_me:37994: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:36488: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37997: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36491: \$? = $ac_status" >&5
+  echo "$as_me:38000: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -36505,7 +38014,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}:36508: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:38017: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -36546,9 +38055,12 @@ if test -n "$cf_searchpath/../include" ; then
 			if test "$GCC" = yes
 			then
 			  cf_save_CPPFLAGS=$CPPFLAGS
-			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 36551 "configure"
+#line 38063 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -36560,16 +38072,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:36563: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:38075: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36566: \$? = $ac_status" >&5
+  echo "$as_me:38078: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:36569: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38081: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36572: \$? = $ac_status" >&5
+  echo "$as_me:38084: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -36586,7 +38098,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}:36589: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:38101: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -36604,7 +38116,7 @@ echo "${as_me:-configure}:36589: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:36607: error: cannot find  under $use_zlib" >&5
+{ { echo "$as_me:38119: error: cannot find  under $use_zlib" >&5
 echo "$as_me: error: cannot find  under $use_zlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -36629,7 +38141,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}:36632: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:38144: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -36658,7 +38170,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}:36661: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:38173: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -36667,7 +38179,7 @@ echo "${as_me:-configure}:36661: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:36670: error: cannot find  under $use_zlib" >&5
+{ { echo "$as_me:38182: error: cannot find  under $use_zlib" >&5
 echo "$as_me: error: cannot find  under $use_zlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -36681,12 +38193,12 @@ esac
 cf_cv_header_path_z=
 cf_cv_library_path_z=
 
-echo "${as_me:-configure}:36684: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:38196: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 36689 "configure"
+#line 38201 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -36702,16 +38214,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36705: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38217: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36708: \$? = $ac_status" >&5
+  echo "$as_me:38220: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36711: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38223: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36714: \$? = $ac_status" >&5
+  echo "$as_me:38226: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_z=yes
@@ -36725,7 +38237,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lz  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 36728 "configure"
+#line 38240 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -36741,16 +38253,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36744: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38256: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36747: \$? = $ac_status" >&5
+  echo "$as_me:38259: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36750: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38262: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36753: \$? = $ac_status" >&5
+  echo "$as_me:38265: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_z=yes
@@ -36767,9 +38279,9 @@ cat conftest.$ac_ext >&5
 
 	test -n "$verbose" && echo "	find linkage for z library" 1>&6
 
-echo "${as_me:-configure}:36770: testing find linkage for z library ..." 1>&5
+echo "${as_me:-configure}:38282: testing find linkage for z library ..." 1>&5
 
-echo "${as_me:-configure}:36772: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:38284: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -36860,11 +38372,15 @@ 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}:36863: testing ... testing $cf_cv_header_path_z ..." 1>&5
+echo "${as_me:-configure}:38375: testing ... testing $cf_cv_header_path_z ..." 1>&5
+
+			CPPFLAGS="$cf_save_CPPFLAGS"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_z"
 
-			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_z"
 			cat >conftest.$ac_ext <<_ACEOF
-#line 36867 "configure"
+#line 38383 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -36880,21 +38396,21 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:36883: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:38399: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36886: \$? = $ac_status" >&5
+  echo "$as_me:38402: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:36889: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38405: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36892: \$? = $ac_status" >&5
+  echo "$as_me:38408: \$? = $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}:36897: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
+echo "${as_me:-configure}:38413: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
 
 				cf_cv_find_linkage_z=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -36912,7 +38428,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "$cf_cv_find_linkage_z" = maybe ; then
 
-echo "${as_me:-configure}:36915: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:38431: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -36920,7 +38436,7 @@ echo "${as_me:-configure}:36915: testing Searching for z library in FIND_LINKAGE
 		CPPFLAGS="$cf_test_CPPFLAGS"
 		LIBS="-lz  $cf_save_LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 36923 "configure"
+#line 38439 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -36936,21 +38452,21 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36939: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38455: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36942: \$? = $ac_status" >&5
+  echo "$as_me:38458: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36945: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38461: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36948: \$? = $ac_status" >&5
+  echo "$as_me:38464: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 			test -n "$verbose" && echo "	... found z library in system" 1>&6
 
-echo "${as_me:-configure}:36953: testing ... found z library in system ..." 1>&5
+echo "${as_me:-configure}:38469: testing ... found z library in system ..." 1>&5
 
 			cf_cv_find_linkage_z=yes
 else
@@ -37031,13 +38547,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}:37034: testing ... testing $cf_cv_library_path_z ..." 1>&5
+echo "${as_me:-configure}:38550: 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 37040 "configure"
+#line 38556 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -37053,21 +38569,21 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:37056: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38572: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37059: \$? = $ac_status" >&5
+  echo "$as_me:38575: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:37062: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38578: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37065: \$? = $ac_status" >&5
+  echo "$as_me:38581: \$? = $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}:37070: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
+echo "${as_me:-configure}:38586: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
 
 					cf_cv_find_linkage_z=yes
 					cf_cv_library_file_z="-lz"
@@ -37124,9 +38640,12 @@ if test -n "$cf_cv_header_path_z" ; then
 			if test "$GCC" = yes
 			then
 			  cf_save_CPPFLAGS=$CPPFLAGS
-			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
+
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 37129 "configure"
+#line 38648 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -37138,16 +38657,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:37141: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:38660: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:37144: \$? = $ac_status" >&5
+  echo "$as_me:38663: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:37147: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38666: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37150: \$? = $ac_status" >&5
+  echo "$as_me:38669: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -37164,7 +38683,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}:37167: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:38686: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -37200,7 +38719,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}:37203: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:38722: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -37225,7 +38744,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:37228: WARNING: Cannot find z library" >&5
+{ echo "$as_me:38747: WARNING: Cannot find z library" >&5
 echo "$as_me: WARNING: Cannot find z library" >&2;}
 fi
 
@@ -37234,13 +38753,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:37237: checking for $ac_func" >&5
+echo "$as_me:38756: 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 37243 "configure"
+#line 38762 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -37271,16 +38790,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:37274: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38793: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37277: \$? = $ac_status" >&5
+  echo "$as_me:38796: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:37280: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38799: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37283: \$? = $ac_status" >&5
+  echo "$as_me:38802: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -37290,7 +38809,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:37293: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:38812: 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
@@ -37307,7 +38826,7 @@ EOF
 
 fi
 
-echo "$as_me:37310: checking if you want to exclude FINGER code" >&5
+echo "$as_me:38829: 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.
@@ -37324,14 +38843,14 @@ else
 	use_finger=no
 
 fi;
-echo "$as_me:37327: result: $use_finger" >&5
+echo "$as_me:38846: result: $use_finger" >&5
 echo "${ECHO_T}$use_finger" >&6
 test $use_finger != "no" &&
 cat >>confdefs.h <<\EOF
 #define DISABLE_FINGER 1
 EOF
 
-echo "$as_me:37334: checking if you want to exclude GOPHER code" >&5
+echo "$as_me:38853: 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.
@@ -37348,14 +38867,14 @@ else
 	use_gopher=no
 
 fi;
-echo "$as_me:37351: result: $use_gopher" >&5
+echo "$as_me:38870: result: $use_gopher" >&5
 echo "${ECHO_T}$use_gopher" >&6
 test $use_gopher != "no" &&
 cat >>confdefs.h <<\EOF
 #define DISABLE_GOPHER 1
 EOF
 
-echo "$as_me:37358: checking if you want to exclude NEWS code" >&5
+echo "$as_me:38877: 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.
@@ -37372,14 +38891,14 @@ else
 	use_news=no
 
 fi;
-echo "$as_me:37375: result: $use_news" >&5
+echo "$as_me:38894: result: $use_news" >&5
 echo "${ECHO_T}$use_news" >&6
 test $use_news != "no" &&
 cat >>confdefs.h <<\EOF
 #define DISABLE_NEWS 1
 EOF
 
-echo "$as_me:37382: checking if you want to exclude FTP code" >&5
+echo "$as_me:38901: 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.
@@ -37396,14 +38915,14 @@ else
 	use_ftp=no
 
 fi;
-echo "$as_me:37399: result: $use_ftp" >&5
+echo "$as_me:38918: result: $use_ftp" >&5
 echo "${ECHO_T}$use_ftp" >&6
 test $use_ftp != "no" &&
 cat >>confdefs.h <<\EOF
 #define DISABLE_FTP 1
 EOF
 
-echo "$as_me:37406: checking if you want to include WAIS code" >&5
+echo "$as_me:38925: 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.
@@ -37420,13 +38939,13 @@ else
 	use_wais=no
 
 fi;
-echo "$as_me:37423: result: $use_wais" >&5
+echo "$as_me:38942: result: $use_wais" >&5
 echo "${ECHO_T}$use_wais" >&6
 
 MAKE_WAIS="#"
 if test $use_wais != "no"
 then
-	echo "$as_me:37429: checking for fs_free in -lwais" >&5
+	echo "$as_me:38948: 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
@@ -37434,7 +38953,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lwais  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 37437 "configure"
+#line 38956 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -37453,16 +38972,16 @@ fs_free ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:37456: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38975: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37459: \$? = $ac_status" >&5
+  echo "$as_me:38978: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:37462: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38981: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37465: \$? = $ac_status" >&5
+  echo "$as_me:38984: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_wais_fs_free=yes
 else
@@ -37473,18 +38992,18 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:37476: result: $ac_cv_lib_wais_fs_free" >&5
+echo "$as_me:38995: 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:37480: checking if -lm needed for math functions" >&5
+echo "$as_me:38999: 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 37487 "configure"
+#line 39006 "configure"
 #include "confdefs.h"
 
 	#include <stdio.h>
@@ -37500,16 +39019,16 @@ double x = rand(); printf("result = %g\n", sin(x))
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:37503: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39022: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37506: \$? = $ac_status" >&5
+  echo "$as_me:39025: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:37509: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39028: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37512: \$? = $ac_status" >&5
+  echo "$as_me:39031: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_libm=no
 else
@@ -37519,7 +39038,7 @@ cf_cv_need_libm=yes
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:37522: result: $cf_cv_need_libm" >&5
+echo "$as_me:39041: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 if test "$cf_cv_need_libm" = yes
 then
@@ -37561,23 +39080,23 @@ LIBS="$cf_add_libs"
 for ac_header in wais.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:37564: checking for $ac_header" >&5
+echo "$as_me:39083: 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 37570 "configure"
+#line 39089 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:37574: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:39093: \"$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:37580: \$? = $ac_status" >&5
+  echo "$as_me:39099: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -37596,7 +39115,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:37599: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:39118: 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
@@ -37609,7 +39128,7 @@ done
 		MAKE_WAIS=
 
 else
-  { echo "$as_me:37612: WARNING: could not find WAIS library" >&5
+  { echo "$as_me:39131: WARNING: could not find WAIS library" >&5
 echo "$as_me: WARNING: could not find WAIS library" >&2;}
 fi
 
@@ -37617,7 +39136,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:37620: checking if directory-editor code should be used" >&5
+echo "$as_me:39139: 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.
@@ -37634,7 +39153,7 @@ else
 	use_dired=yes
 
 fi;
-echo "$as_me:37637: result: $use_dired" >&5
+echo "$as_me:39156: result: $use_dired" >&5
 echo "${ECHO_T}$use_dired" >&6
 
 if test ".$use_dired" != ".no" ; then
@@ -37644,7 +39163,7 @@ cat >>confdefs.h <<\EOF
 #define DIRED_SUPPORT 1
 EOF
 
-	echo "$as_me:37647: checking if you wish to allow extracting from archives via DirEd" >&5
+	echo "$as_me:39166: 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.
@@ -37661,10 +39180,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:37664: result: $enableval" >&5
+	echo "$as_me:39183: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:37667: checking if DirEd mode should override keys" >&5
+	echo "$as_me:39186: 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.
@@ -37688,10 +39207,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:37691: result: $enableval" >&5
+	echo "$as_me:39210: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:37694: checking if you wish to allow permissions commands via DirEd" >&5
+	echo "$as_me:39213: 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.
@@ -37715,10 +39234,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:37718: result: $enableval" >&5
+	echo "$as_me:39237: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:37721: checking if you wish to allow executable-permission commands via DirEd" >&5
+	echo "$as_me:39240: 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.
@@ -37735,10 +39254,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:37738: result: $enableval" >&5
+	echo "$as_me:39257: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:37741: checking if you wish to allow \"tar\" commands from DirEd" >&5
+	echo "$as_me:39260: 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.
@@ -37762,10 +39281,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:37765: result: $enableval" >&5
+	echo "$as_me:39284: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:37768: checking if you wish to allow \"uudecode\" commands from DirEd" >&5
+	echo "$as_me:39287: 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.
@@ -37789,10 +39308,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:37792: result: $enableval" >&5
+	echo "$as_me:39311: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:37795: checking if you wish to allow \"zip\" and \"unzip\" commands from DirEd" >&5
+	echo "$as_me:39314: 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.
@@ -37816,10 +39335,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:37819: result: $enableval" >&5
+	echo "$as_me:39338: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:37822: checking if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd" >&5
+	echo "$as_me:39341: 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.
@@ -37843,11 +39362,11 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:37846: result: $enableval" >&5
+	echo "$as_me:39365: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 fi
 
-echo "$as_me:37850: checking if you want long-directory listings" >&5
+echo "$as_me:39369: 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.
@@ -37871,10 +39390,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-echo "$as_me:37874: result: $enableval" >&5
+echo "$as_me:39393: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:37877: checking if parent-directory references are permitted" >&5
+echo "$as_me:39396: 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.
@@ -37891,7 +39410,7 @@ EOF
 else
   enableval=yes
 fi;
-echo "$as_me:37894: result: $enableval" >&5
+echo "$as_me:39413: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 test -z "$TELNET" && TELNET=telnet
@@ -37899,7 +39418,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:37902: checking for $ac_word" >&5
+echo "$as_me:39421: 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
@@ -37916,7 +39435,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:37919: found $ac_dir/$ac_word" >&5
+   echo "$as_me:39438: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37927,10 +39446,10 @@ fi
 TELNET=$ac_cv_path_TELNET
 
 if test -n "$TELNET"; then
-  echo "$as_me:37930: result: $TELNET" >&5
+  echo "$as_me:39449: result: $TELNET" >&5
 echo "${ECHO_T}$TELNET" >&6
 else
-  echo "$as_me:37933: result: no" >&5
+  echo "$as_me:39452: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37989,7 +39508,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37992: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:39511: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TELNET_PATH "$cf_path_prog"
@@ -38007,7 +39526,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:38010: checking for $ac_word" >&5
+echo "$as_me:39529: 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
@@ -38024,7 +39543,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:38027: found $ac_dir/$ac_word" >&5
+   echo "$as_me:39546: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -38035,10 +39554,10 @@ fi
 TN3270=$ac_cv_path_TN3270
 
 if test -n "$TN3270"; then
-  echo "$as_me:38038: result: $TN3270" >&5
+  echo "$as_me:39557: result: $TN3270" >&5
 echo "${ECHO_T}$TN3270" >&6
 else
-  echo "$as_me:38041: result: no" >&5
+  echo "$as_me:39560: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -38097,7 +39616,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:38100: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:39619: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TN3270_PATH "$cf_path_prog"
@@ -38115,7 +39634,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:38118: checking for $ac_word" >&5
+echo "$as_me:39637: 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
@@ -38132,7 +39651,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:38135: found $ac_dir/$ac_word" >&5
+   echo "$as_me:39654: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -38143,10 +39662,10 @@ fi
 RLOGIN=$ac_cv_path_RLOGIN
 
 if test -n "$RLOGIN"; then
-  echo "$as_me:38146: result: $RLOGIN" >&5
+  echo "$as_me:39665: result: $RLOGIN" >&5
 echo "${ECHO_T}$RLOGIN" >&6
 else
-  echo "$as_me:38149: result: no" >&5
+  echo "$as_me:39668: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -38205,7 +39724,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:38208: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:39727: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define RLOGIN_PATH "$cf_path_prog"
@@ -38223,7 +39742,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:38226: checking for $ac_word" >&5
+echo "$as_me:39745: 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
@@ -38240,7 +39759,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:38243: found $ac_dir/$ac_word" >&5
+   echo "$as_me:39762: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -38251,10 +39770,10 @@ fi
 MV=$ac_cv_path_MV
 
 if test -n "$MV"; then
-  echo "$as_me:38254: result: $MV" >&5
+  echo "$as_me:39773: result: $MV" >&5
 echo "${ECHO_T}$MV" >&6
 else
-  echo "$as_me:38257: result: no" >&5
+  echo "$as_me:39776: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -38313,7 +39832,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:38316: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:39835: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define MV_PATH "$cf_path_prog"
@@ -38331,7 +39850,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:38334: checking for $ac_word" >&5
+echo "$as_me:39853: 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
@@ -38348,7 +39867,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:38351: found $ac_dir/$ac_word" >&5
+   echo "$as_me:39870: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -38359,10 +39878,10 @@ fi
 GZIP=$ac_cv_path_GZIP
 
 if test -n "$GZIP"; then
-  echo "$as_me:38362: result: $GZIP" >&5
+  echo "$as_me:39881: result: $GZIP" >&5
 echo "${ECHO_T}$GZIP" >&6
 else
-  echo "$as_me:38365: result: no" >&5
+  echo "$as_me:39884: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -38421,7 +39940,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:38424: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:39943: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define GZIP_PATH "$cf_path_prog"
@@ -38439,7 +39958,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:38442: checking for $ac_word" >&5
+echo "$as_me:39961: 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
@@ -38456,7 +39975,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:38459: found $ac_dir/$ac_word" >&5
+   echo "$as_me:39978: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -38467,10 +39986,10 @@ fi
 UNCOMPRESS=$ac_cv_path_UNCOMPRESS
 
 if test -n "$UNCOMPRESS"; then
-  echo "$as_me:38470: result: $UNCOMPRESS" >&5
+  echo "$as_me:39989: result: $UNCOMPRESS" >&5
 echo "${ECHO_T}$UNCOMPRESS" >&6
 else
-  echo "$as_me:38473: result: no" >&5
+  echo "$as_me:39992: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -38529,7 +40048,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:38532: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:40051: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define UNCOMPRESS_PATH "$cf_path_prog"
@@ -38547,7 +40066,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:38550: checking for $ac_word" >&5
+echo "$as_me:40069: 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
@@ -38564,7 +40083,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:38567: found $ac_dir/$ac_word" >&5
+   echo "$as_me:40086: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -38575,10 +40094,10 @@ fi
 UNZIP=$ac_cv_path_UNZIP
 
 if test -n "$UNZIP"; then
-  echo "$as_me:38578: result: $UNZIP" >&5
+  echo "$as_me:40097: result: $UNZIP" >&5
 echo "${ECHO_T}$UNZIP" >&6
 else
-  echo "$as_me:38581: result: no" >&5
+  echo "$as_me:40100: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -38637,7 +40156,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:38640: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:40159: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define UNZIP_PATH "$cf_path_prog"
@@ -38655,7 +40174,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:38658: checking for $ac_word" >&5
+echo "$as_me:40177: 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
@@ -38672,7 +40191,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:38675: found $ac_dir/$ac_word" >&5
+   echo "$as_me:40194: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -38683,10 +40202,10 @@ fi
 BZIP2=$ac_cv_path_BZIP2
 
 if test -n "$BZIP2"; then
-  echo "$as_me:38686: result: $BZIP2" >&5
+  echo "$as_me:40205: result: $BZIP2" >&5
 echo "${ECHO_T}$BZIP2" >&6
 else
-  echo "$as_me:38689: result: no" >&5
+  echo "$as_me:40208: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -38745,7 +40264,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:38748: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:40267: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define BZIP2_PATH "$cf_path_prog"
@@ -38763,7 +40282,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:38766: checking for $ac_word" >&5
+echo "$as_me:40285: 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
@@ -38780,7 +40299,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:38783: found $ac_dir/$ac_word" >&5
+   echo "$as_me:40302: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -38791,10 +40310,10 @@ fi
 TAR=$ac_cv_path_TAR
 
 if test -n "$TAR"; then
-  echo "$as_me:38794: result: $TAR" >&5
+  echo "$as_me:40313: result: $TAR" >&5
 echo "${ECHO_T}$TAR" >&6
 else
-  echo "$as_me:38797: result: no" >&5
+  echo "$as_me:40316: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -38853,7 +40372,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:38856: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:40375: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TAR_PATH "$cf_path_prog"
@@ -38911,7 +40430,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:38914: checking for $ac_word" >&5
+echo "$as_me:40433: 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
@@ -38928,7 +40447,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:38931: found $ac_dir/$ac_word" >&5
+   echo "$as_me:40450: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -38939,10 +40458,10 @@ fi
 COMPRESS=$ac_cv_path_COMPRESS
 
 if test -n "$COMPRESS"; then
-  echo "$as_me:38942: result: $COMPRESS" >&5
+  echo "$as_me:40461: result: $COMPRESS" >&5
 echo "${ECHO_T}$COMPRESS" >&6
 else
-  echo "$as_me:38945: result: no" >&5
+  echo "$as_me:40464: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -39001,7 +40520,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:39004: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:40523: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define COMPRESS_PATH "$cf_path_prog"
@@ -39019,7 +40538,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:39022: checking for $ac_word" >&5
+echo "$as_me:40541: 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
@@ -39036,7 +40555,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:39039: found $ac_dir/$ac_word" >&5
+   echo "$as_me:40558: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -39047,10 +40566,10 @@ fi
 RM=$ac_cv_path_RM
 
 if test -n "$RM"; then
-  echo "$as_me:39050: result: $RM" >&5
+  echo "$as_me:40569: result: $RM" >&5
 echo "${ECHO_T}$RM" >&6
 else
-  echo "$as_me:39053: result: no" >&5
+  echo "$as_me:40572: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -39109,7 +40628,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:39112: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:40631: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define RM_PATH "$cf_path_prog"
@@ -39127,7 +40646,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:39130: checking for $ac_word" >&5
+echo "$as_me:40649: 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
@@ -39144,7 +40663,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:39147: found $ac_dir/$ac_word" >&5
+   echo "$as_me:40666: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -39155,10 +40674,10 @@ fi
 UUDECODE=$ac_cv_path_UUDECODE
 
 if test -n "$UUDECODE"; then
-  echo "$as_me:39158: result: $UUDECODE" >&5
+  echo "$as_me:40677: result: $UUDECODE" >&5
 echo "${ECHO_T}$UUDECODE" >&6
 else
-  echo "$as_me:39161: result: no" >&5
+  echo "$as_me:40680: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -39217,7 +40736,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:39220: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:40739: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define UUDECODE_PATH "$cf_path_prog"
@@ -39235,7 +40754,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:39238: checking for $ac_word" >&5
+echo "$as_me:40757: 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
@@ -39252,7 +40771,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:39255: found $ac_dir/$ac_word" >&5
+   echo "$as_me:40774: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -39263,10 +40782,10 @@ fi
 ZCAT=$ac_cv_path_ZCAT
 
 if test -n "$ZCAT"; then
-  echo "$as_me:39266: result: $ZCAT" >&5
+  echo "$as_me:40785: result: $ZCAT" >&5
 echo "${ECHO_T}$ZCAT" >&6
 else
-  echo "$as_me:39269: result: no" >&5
+  echo "$as_me:40788: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -39325,7 +40844,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:39328: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:40847: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define ZCAT_PATH "$cf_path_prog"
@@ -39343,7 +40862,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:39346: checking for $ac_word" >&5
+echo "$as_me:40865: 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
@@ -39360,7 +40879,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:39363: found $ac_dir/$ac_word" >&5
+   echo "$as_me:40882: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -39371,10 +40890,10 @@ fi
 ZIP=$ac_cv_path_ZIP
 
 if test -n "$ZIP"; then
-  echo "$as_me:39374: result: $ZIP" >&5
+  echo "$as_me:40893: result: $ZIP" >&5
 echo "${ECHO_T}$ZIP" >&6
 else
-  echo "$as_me:39377: result: no" >&5
+  echo "$as_me:40896: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -39433,7 +40952,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:39436: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:40955: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define ZIP_PATH "$cf_path_prog"
@@ -39461,7 +40980,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:39464: checking for $ac_word" >&5
+echo "$as_me:40983: 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
@@ -39478,7 +40997,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:39481: found $ac_dir/$ac_word" >&5
+   echo "$as_me:41000: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -39489,10 +41008,10 @@ fi
 INSTALL=$ac_cv_path_INSTALL
 
 if test -n "$INSTALL"; then
-  echo "$as_me:39492: result: $INSTALL" >&5
+  echo "$as_me:41011: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 else
-  echo "$as_me:39495: result: no" >&5
+  echo "$as_me:41014: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -39551,7 +41070,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:39554: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:41073: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define INSTALL_PATH "$cf_path_prog"
@@ -39581,7 +41100,7 @@ if test $cf_cv_screen = pdcurses ; then
 	case $host_os in
 	(mingw*)
 
-echo "$as_me:39584: checking for initscr in -lpdcurses" >&5
+echo "$as_me:41103: checking for initscr in -lpdcurses" >&5
 echo $ECHO_N "checking for initscr in -lpdcurses... $ECHO_C" >&6
 if test "${ac_cv_lib_pdcurses_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -39589,7 +41108,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpdcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 39592 "configure"
+#line 41111 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39608,16 +41127,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39611: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41130: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39614: \$? = $ac_status" >&5
+  echo "$as_me:41133: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39617: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41136: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39620: \$? = $ac_status" >&5
+  echo "$as_me:41139: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_pdcurses_initscr=yes
 else
@@ -39628,7 +41147,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:39631: result: $ac_cv_lib_pdcurses_initscr" >&5
+echo "$as_me:41150: result: $ac_cv_lib_pdcurses_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_pdcurses_initscr" >&6
 if test $ac_cv_lib_pdcurses_initscr = yes; then
 
@@ -39650,13 +41169,13 @@ LIBS="$cf_add_libs"
 
 	cf_cv_term_header=no
 	cf_cv_unctrl_header=no
-	echo "$as_me:39653: checking for winwstr" >&5
+	echo "$as_me:41172: checking for winwstr" >&5
 echo $ECHO_N "checking for winwstr... $ECHO_C" >&6
 if test "${ac_cv_func_winwstr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 39659 "configure"
+#line 41178 "configure"
 #include "confdefs.h"
 #define winwstr autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -39687,16 +41206,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39690: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41209: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39693: \$? = $ac_status" >&5
+  echo "$as_me:41212: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39696: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41215: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39699: \$? = $ac_status" >&5
+  echo "$as_me:41218: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_winwstr=yes
 else
@@ -39706,7 +41225,7 @@ ac_cv_func_winwstr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:39709: result: $ac_cv_func_winwstr" >&5
+echo "$as_me:41228: result: $ac_cv_func_winwstr" >&5
 echo "${ECHO_T}$ac_cv_func_winwstr" >&6
 if test $ac_cv_func_winwstr = yes; then
   cat >>confdefs.h <<\EOF
@@ -39715,13 +41234,13 @@ EOF
 
 fi
 
-	echo "$as_me:39718: checking for pdcurses_dll_iname" >&5
+	echo "$as_me:41237: checking for pdcurses_dll_iname" >&5
 echo $ECHO_N "checking for pdcurses_dll_iname... $ECHO_C" >&6
 if test "${ac_cv_func_pdcurses_dll_iname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 39724 "configure"
+#line 41243 "configure"
 #include "confdefs.h"
 #define pdcurses_dll_iname autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -39752,16 +41271,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39755: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41274: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39758: \$? = $ac_status" >&5
+  echo "$as_me:41277: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39761: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41280: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39764: \$? = $ac_status" >&5
+  echo "$as_me:41283: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_pdcurses_dll_iname=yes
 else
@@ -39771,7 +41290,7 @@ ac_cv_func_pdcurses_dll_iname=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:39774: result: $ac_cv_func_pdcurses_dll_iname" >&5
+echo "$as_me:41293: result: $ac_cv_func_pdcurses_dll_iname" >&5
 echo "${ECHO_T}$ac_cv_func_pdcurses_dll_iname" >&6
 if test $ac_cv_func_pdcurses_dll_iname = yes; then
   cat >>confdefs.h <<\EOF
@@ -39784,7 +41303,7 @@ fi
 
 		;;
 	(*)
-		echo "$as_me:39787: checking for X" >&5
+		echo "$as_me:41306: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -39881,17 +41400,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 39884 "configure"
+#line 41403 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:39888: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:41407: \"$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:39894: \$? = $ac_status" >&5
+  echo "$as_me:41413: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -39924,7 +41443,7 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >conftest.$ac_ext <<_ACEOF
-#line 39927 "configure"
+#line 41446 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -39936,16 +41455,16 @@ XtMalloc (0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39939: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41458: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39942: \$? = $ac_status" >&5
+  echo "$as_me:41461: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39945: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41464: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39948: \$? = $ac_status" >&5
+  echo "$as_me:41467: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -39983,7 +41502,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:39986: result: $have_x" >&5
+  echo "$as_me:41505: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -39993,7 +41512,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:39996: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:41515: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -40017,11 +41536,11 @@ else
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:40020: checking whether -R must be followed by a space" >&5
+      echo "$as_me:41539: 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 40024 "configure"
+#line 41543 "configure"
 #include "confdefs.h"
 
 int
@@ -40033,16 +41552,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40036: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41555: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40039: \$? = $ac_status" >&5
+  echo "$as_me:41558: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40042: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41561: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40045: \$? = $ac_status" >&5
+  echo "$as_me:41564: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_nospace=yes
 else
@@ -40052,13 +41571,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:40055: result: no" >&5
+	echo "$as_me:41574: 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 40061 "configure"
+#line 41580 "configure"
 #include "confdefs.h"
 
 int
@@ -40070,16 +41589,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40073: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41592: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40076: \$? = $ac_status" >&5
+  echo "$as_me:41595: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40079: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41598: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40082: \$? = $ac_status" >&5
+  echo "$as_me:41601: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_space=yes
 else
@@ -40089,11 +41608,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:40092: result: yes" >&5
+	  echo "$as_me:41611: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:40096: result: neither works" >&5
+	  echo "$as_me:41615: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -40113,7 +41632,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 40116 "configure"
+#line 41635 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -40132,22 +41651,22 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40135: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41654: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40138: \$? = $ac_status" >&5
+  echo "$as_me:41657: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40141: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41660: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40144: \$? = $ac_status" >&5
+  echo "$as_me:41663: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:40150: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:41669: 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
@@ -40155,7 +41674,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 40158 "configure"
+#line 41677 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -40174,16 +41693,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40177: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41696: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40180: \$? = $ac_status" >&5
+  echo "$as_me:41699: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40183: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41702: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40186: \$? = $ac_status" >&5
+  echo "$as_me:41705: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -40194,14 +41713,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:40197: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:41716: 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:40204: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:41723: 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
@@ -40209,7 +41728,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 40212 "configure"
+#line 41731 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -40228,16 +41747,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40231: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41750: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40234: \$? = $ac_status" >&5
+  echo "$as_me:41753: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40237: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41756: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40240: \$? = $ac_status" >&5
+  echo "$as_me:41759: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -40248,7 +41767,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:40251: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:41770: 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"
@@ -40267,13 +41786,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:40270: checking for gethostbyname" >&5
+    echo "$as_me:41789: 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 40276 "configure"
+#line 41795 "configure"
 #include "confdefs.h"
 #define gethostbyname autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -40304,16 +41823,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40307: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41826: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40310: \$? = $ac_status" >&5
+  echo "$as_me:41829: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40313: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41832: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40316: \$? = $ac_status" >&5
+  echo "$as_me:41835: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -40323,11 +41842,11 @@ ac_cv_func_gethostbyname=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:40326: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:41845: 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:40330: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:41849: 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
@@ -40335,7 +41854,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 40338 "configure"
+#line 41857 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -40354,16 +41873,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40357: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41876: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40360: \$? = $ac_status" >&5
+  echo "$as_me:41879: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40363: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41882: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40366: \$? = $ac_status" >&5
+  echo "$as_me:41885: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -40374,14 +41893,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:40377: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:41896: 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:40384: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:41903: 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
@@ -40389,7 +41908,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 40392 "configure"
+#line 41911 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -40408,16 +41927,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40411: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41930: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40414: \$? = $ac_status" >&5
+  echo "$as_me:41933: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40417: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41936: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40420: \$? = $ac_status" >&5
+  echo "$as_me:41939: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -40428,7 +41947,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:40431: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:41950: 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"
@@ -40444,13 +41963,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:40447: checking for connect" >&5
+    echo "$as_me:41966: 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 40453 "configure"
+#line 41972 "configure"
 #include "confdefs.h"
 #define connect autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -40481,16 +42000,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40484: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42003: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40487: \$? = $ac_status" >&5
+  echo "$as_me:42006: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40490: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42009: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40493: \$? = $ac_status" >&5
+  echo "$as_me:42012: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_connect=yes
 else
@@ -40500,11 +42019,11 @@ ac_cv_func_connect=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:40503: result: $ac_cv_func_connect" >&5
+echo "$as_me:42022: 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:40507: checking for connect in -lsocket" >&5
+      echo "$as_me:42026: 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
@@ -40512,7 +42031,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 40515 "configure"
+#line 42034 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -40531,16 +42050,16 @@ connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40534: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42053: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40537: \$? = $ac_status" >&5
+  echo "$as_me:42056: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40540: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42059: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40543: \$? = $ac_status" >&5
+  echo "$as_me:42062: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -40551,7 +42070,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:40554: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:42073: 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"
@@ -40560,13 +42079,13 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:40563: checking for remove" >&5
+    echo "$as_me:42082: 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 40569 "configure"
+#line 42088 "configure"
 #include "confdefs.h"
 #define remove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -40597,16 +42116,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40600: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42119: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40603: \$? = $ac_status" >&5
+  echo "$as_me:42122: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40606: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42125: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40609: \$? = $ac_status" >&5
+  echo "$as_me:42128: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_remove=yes
 else
@@ -40616,11 +42135,11 @@ ac_cv_func_remove=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:40619: result: $ac_cv_func_remove" >&5
+echo "$as_me:42138: 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:40623: checking for remove in -lposix" >&5
+      echo "$as_me:42142: 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
@@ -40628,7 +42147,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 40631 "configure"
+#line 42150 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -40647,16 +42166,16 @@ remove ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40650: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42169: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40653: \$? = $ac_status" >&5
+  echo "$as_me:42172: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40656: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42175: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40659: \$? = $ac_status" >&5
+  echo "$as_me:42178: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -40667,7 +42186,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:40670: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:42189: 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"
@@ -40676,13 +42195,13 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:40679: checking for shmat" >&5
+    echo "$as_me:42198: 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 40685 "configure"
+#line 42204 "configure"
 #include "confdefs.h"
 #define shmat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -40713,16 +42232,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40716: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42235: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40719: \$? = $ac_status" >&5
+  echo "$as_me:42238: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40722: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42241: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40725: \$? = $ac_status" >&5
+  echo "$as_me:42244: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -40732,11 +42251,11 @@ ac_cv_func_shmat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:40735: result: $ac_cv_func_shmat" >&5
+echo "$as_me:42254: 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:40739: checking for shmat in -lipc" >&5
+      echo "$as_me:42258: 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
@@ -40744,7 +42263,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 40747 "configure"
+#line 42266 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -40763,16 +42282,16 @@ shmat ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40766: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42285: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40769: \$? = $ac_status" >&5
+  echo "$as_me:42288: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40772: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42291: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40775: \$? = $ac_status" >&5
+  echo "$as_me:42294: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -40783,7 +42302,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:40786: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:42305: 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"
@@ -40801,7 +42320,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:40804: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:42323: 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
@@ -40809,7 +42328,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 40812 "configure"
+#line 42331 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -40828,16 +42347,16 @@ IceConnectionNumber ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40831: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42350: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40834: \$? = $ac_status" >&5
+  echo "$as_me:42353: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40837: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42356: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40840: \$? = $ac_status" >&5
+  echo "$as_me:42359: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -40848,7 +42367,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:40851: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:42370: 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"
@@ -40860,7 +42379,7 @@ fi
 
 cf_x_athena=${cf_x_athena:-Xaw}
 
-echo "$as_me:40863: checking if you want to link with Xaw 3d library" >&5
+echo "$as_me:42382: 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=
 
@@ -40871,14 +42390,14 @@ if test "${with_Xaw3d+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3d
-	echo "$as_me:40874: result: yes" >&5
+	echo "$as_me:42393: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:40877: result: no" >&5
+	echo "$as_me:42396: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:40881: checking if you want to link with Xaw 3d xft library" >&5
+echo "$as_me:42400: checking if you want to link with Xaw 3d xft library" >&5
 echo $ECHO_N "checking if you want to link with Xaw 3d xft library... $ECHO_C" >&6
 withval=
 
@@ -40889,14 +42408,14 @@ if test "${with_Xaw3dxft+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3dxft
-	echo "$as_me:40892: result: yes" >&5
+	echo "$as_me:42411: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:40895: result: no" >&5
+	echo "$as_me:42414: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:40899: checking if you want to link with neXT Athena library" >&5
+echo "$as_me:42418: 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=
 
@@ -40907,14 +42426,14 @@ if test "${with_neXtaw+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=neXtaw
-	echo "$as_me:40910: result: yes" >&5
+	echo "$as_me:42429: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:40913: result: no" >&5
+	echo "$as_me:42432: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:40917: checking if you want to link with Athena-Plus library" >&5
+echo "$as_me:42436: 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=
 
@@ -40925,10 +42444,10 @@ if test "${with_XawPlus+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=XawPlus
-	echo "$as_me:40928: result: yes" >&5
+	echo "$as_me:42447: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:40931: result: no" >&5
+	echo "$as_me:42450: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -40948,17 +42467,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}:40951: testing found package $cf_athena_pkg ..." 1>&5
+echo "${as_me:-configure}:42470: 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}:40957: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:42476: 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}:40961: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:42480: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -41089,20 +42608,20 @@ EOF
 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
 
-echo "${as_me:-configure}:41092: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:42611: testing ..trimmed $LIBS ..." 1>&5
 
 			;;
 		esac
 	done
 
-echo "$as_me:41098: checking for usable $cf_x_athena/Xmu package" >&5
+echo "$as_me:42617: 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 41105 "configure"
+#line 42624 "configure"
 #include "confdefs.h"
 
 #include <X11/Xmu/CharSet.h>
@@ -41118,16 +42637,16 @@ int check = XmuCompareISOLatin1("big", "small")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:41121: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42640: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41124: \$? = $ac_status" >&5
+  echo "$as_me:42643: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:41127: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42646: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41130: \$? = $ac_status" >&5
+  echo "$as_me:42649: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xaw_compat=yes
 else
@@ -41137,7 +42656,7 @@ cf_cv_xaw_compat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:41140: result: $cf_cv_xaw_compat" >&5
+echo "$as_me:42659: result: $cf_cv_xaw_compat" >&5
 echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 
 			if test "$cf_cv_xaw_compat" = no
@@ -41149,7 +42668,7 @@ echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 				(*)
 					test -n "$verbose" && echo "	work around broken package" 1>&6
 
-echo "${as_me:-configure}:41152: testing work around broken package ..." 1>&5
+echo "${as_me:-configure}:42671: testing work around broken package ..." 1>&5
 
 					cf_save_xmu="$LIBS"
 					cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^  *//' -e 's/ .*//'`
@@ -41157,17 +42676,17 @@ echo "${as_me:-configure}:41152: 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}:41160: testing found package xmu ..." 1>&5
+echo "${as_me:-configure}:42679: 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}:41166: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:42685: 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}:41170: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:42689: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -41287,12 +42806,12 @@ LIBS="$cf_add_libs"
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:41290: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:42809: testing ...before $LIBS ..." 1>&5
 
 LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%$cf_first_lib %$cf_first_lib $cf_pkgconfig_libs %" -e 's%  % %g'`
 test -n "$verbose" && echo "	...after  $LIBS" 1>&6
 
-echo "${as_me:-configure}:41295: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:42814: testing ...after  $LIBS ..." 1>&5
 
 else
 	cf_pkgconfig_incs=
@@ -41300,12 +42819,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:41303: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:42822: testing ...before $LIBS ..." 1>&5
 
 LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%$cf_first_lib %$cf_first_lib -lXmu %" -e 's%  % %g'`
 test -n "$verbose" && echo "	...after  $LIBS" 1>&6
 
-echo "${as_me:-configure}:41308: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:42827: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -41316,7 +42835,7 @@ fi
 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
 
-echo "${as_me:-configure}:41319: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:42838: testing ..trimmed $LIBS ..." 1>&5
 
 			;;
 		esac
@@ -41341,17 +42860,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}:41344: testing found package Xext ..." 1>&5
+echo "${as_me:-configure}:42863: 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}:41350: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:42869: 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}:41354: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:42873: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -41472,7 +42991,7 @@ else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
 
-	echo "$as_me:41475: checking for XextCreateExtension in -lXext" >&5
+	echo "$as_me:42994: 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
@@ -41480,7 +42999,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 41483 "configure"
+#line 43002 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -41499,16 +43018,16 @@ XextCreateExtension ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:41502: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43021: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41505: \$? = $ac_status" >&5
+  echo "$as_me:43024: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:41508: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43027: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41511: \$? = $ac_status" >&5
+  echo "$as_me:43030: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
@@ -41519,7 +43038,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:41522: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:43041: 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
 
@@ -41543,7 +43062,7 @@ fi
 
 fi
 
-# OSX is schizoid about who owns /usr/X11 (old) versus /opt/X11 (new), and (and
+# OSX is schizoid about who owns /usr/X11 (old) versus /opt/X11 (new) (and
 # in some cases has installed dummy files in the former, other cases replaced
 # it with a link to the new location).  This complicates the configure script.
 # Check for that pitfall, and recover using pkg-config
@@ -41555,17 +43074,17 @@ then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then
 	test -n "$verbose" && echo "	found package x11" 1>&6
 
-echo "${as_me:-configure}:41558: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:43077: 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}:41564: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:43083: 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}:41568: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:43087: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -41685,24 +43204,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:41688: WARNING: unable to find X11 library" >&5
+	{ echo "$as_me:43207: WARNING: unable to find X11 library" >&5
 echo "$as_me: WARNING: unable to find X11 library" >&2;}
 fi
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then
 	test -n "$verbose" && echo "	found package ice" 1>&6
 
-echo "${as_me:-configure}:41695: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:43214: 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}:41701: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:43220: 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}:41705: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:43224: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -41822,24 +43341,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:41825: WARNING: unable to find ICE library" >&5
+	{ echo "$as_me:43344: WARNING: unable to find ICE library" >&5
 echo "$as_me: WARNING: unable to find ICE library" >&2;}
 fi
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then
 	test -n "$verbose" && echo "	found package sm" 1>&6
 
-echo "${as_me:-configure}:41832: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:43351: 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}:41838: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:43357: 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}:41842: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:43361: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -41959,24 +43478,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:41962: WARNING: unable to find SM library" >&5
+	{ echo "$as_me:43481: WARNING: unable to find SM library" >&5
 echo "$as_me: WARNING: unable to find SM library" >&2;}
 fi
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then
 	test -n "$verbose" && echo "	found package xt" 1>&6
 
-echo "${as_me:-configure}:41969: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:43488: 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}:41975: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:43494: 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}:41979: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:43498: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -42096,7 +43615,7 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:42099: WARNING: unable to find Xt library" >&5
+	{ echo "$as_me:43618: WARNING: unable to find Xt library" >&5
 echo "$as_me: WARNING: unable to find Xt library" >&2;}
 fi
 
@@ -42107,17 +43626,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}:42110: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:43629: 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}:42116: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:43635: 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}:42120: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:43639: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -42238,14 +43757,14 @@ LIBS="$cf_add_libs"
 		;;
 	(*)
 # we have an "xt" package, but it may omit Xt's dependency on X11
-echo "$as_me:42241: checking for usable X dependency" >&5
+echo "$as_me:43760: 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 42248 "configure"
+#line 43767 "configure"
 #include "confdefs.h"
 
 #include <X11/Xlib.h>
@@ -42264,16 +43783,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42267: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43786: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42270: \$? = $ac_status" >&5
+  echo "$as_me:43789: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42273: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43792: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42276: \$? = $ac_status" >&5
+  echo "$as_me:43795: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xt_x11_compat=yes
 else
@@ -42283,30 +43802,30 @@ cf_cv_xt_x11_compat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:42286: result: $cf_cv_xt_x11_compat" >&5
+echo "$as_me:43805: 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}:42292: testing work around broken X11 dependency ..." 1>&5
+echo "${as_me:-configure}:43811: 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}:42299: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:43818: 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}:42305: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:43824: 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}:42309: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:43828: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -42429,12 +43948,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:42432: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:43951: 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}:42437: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:43956: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -42442,14 +43961,14 @@ fi
 		;;
 	esac
 
-echo "$as_me:42445: checking for usable X Toolkit package" >&5
+echo "$as_me:43964: 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 42452 "configure"
+#line 43971 "configure"
 #include "confdefs.h"
 
 #include <X11/Shell.h>
@@ -42464,16 +43983,16 @@ int num = IceConnectionNumber(0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42467: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43986: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42470: \$? = $ac_status" >&5
+  echo "$as_me:43989: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42473: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43992: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42476: \$? = $ac_status" >&5
+  echo "$as_me:43995: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xt_ice_compat=yes
 else
@@ -42483,7 +44002,7 @@ cf_cv_xt_ice_compat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:42486: result: $cf_cv_xt_ice_compat" >&5
+echo "$as_me:44005: result: $cf_cv_xt_ice_compat" >&5
 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
 
 	if test "$cf_cv_xt_ice_compat" = no
@@ -42497,22 +44016,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}:42500: testing work around broken ICE dependency ..." 1>&5
+echo "${as_me:-configure}:44019: 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}:42505: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:44024: 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}:42511: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:44030: 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}:42515: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:44034: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -42631,17 +44150,17 @@ LIBS="$cf_add_libs"
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then
 	test -n "$verbose" && echo "	found package sm" 1>&6
 
-echo "${as_me:-configure}:42634: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:44153: 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}:42640: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:44159: 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}:42644: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:44163: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -42770,12 +44289,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:42773: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:44292: 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}:42778: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:44297: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -42795,7 +44314,7 @@ else
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:42798: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:44317: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -42880,7 +44399,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}:42883: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:44402: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -42890,7 +44409,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}:42893: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:44412: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -42900,7 +44419,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:42903: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:44422: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
 
 	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
 	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
@@ -42909,7 +44428,7 @@ fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 42912 "configure"
+#line 44431 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -42921,16 +44440,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42924: \"$ac_link\"") >&5
+if { (eval echo "$as_me:44443: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42927: \$? = $ac_status" >&5
+  echo "$as_me:44446: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42930: \"$ac_try\"") >&5
+  { (eval echo "$as_me:44449: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42933: \$? = $ac_status" >&5
+  echo "$as_me:44452: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -42938,12 +44457,12 @@ else
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:42941: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:44460: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
 
 	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:42946: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:44465: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_flags"
@@ -42951,13 +44470,13 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-	echo "$as_me:42954: checking for XOpenDisplay" >&5
+	echo "$as_me:44473: 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 42960 "configure"
+#line 44479 "configure"
 #include "confdefs.h"
 #define XOpenDisplay autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -42988,16 +44507,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42991: \"$ac_link\"") >&5
+if { (eval echo "$as_me:44510: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42994: \$? = $ac_status" >&5
+  echo "$as_me:44513: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42997: \"$ac_try\"") >&5
+  { (eval echo "$as_me:44516: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43000: \$? = $ac_status" >&5
+  echo "$as_me:44519: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_XOpenDisplay=yes
 else
@@ -43007,13 +44526,13 @@ ac_cv_func_XOpenDisplay=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:43010: result: $ac_cv_func_XOpenDisplay" >&5
+echo "$as_me:44529: 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:43016: checking for XOpenDisplay in -lX11" >&5
+	echo "$as_me:44535: 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
@@ -43021,7 +44540,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 43024 "configure"
+#line 44543 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -43040,16 +44559,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43043: \"$ac_link\"") >&5
+if { (eval echo "$as_me:44562: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43046: \$? = $ac_status" >&5
+  echo "$as_me:44565: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:43049: \"$ac_try\"") >&5
+  { (eval echo "$as_me:44568: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43052: \$? = $ac_status" >&5
+  echo "$as_me:44571: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -43060,7 +44579,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:43063: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:44582: 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
 
@@ -43084,13 +44603,13 @@ fi
 
 fi
 
-	echo "$as_me:43087: checking for XtAppInitialize" >&5
+	echo "$as_me:44606: 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 43093 "configure"
+#line 44612 "configure"
 #include "confdefs.h"
 #define XtAppInitialize autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -43121,16 +44640,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43124: \"$ac_link\"") >&5
+if { (eval echo "$as_me:44643: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43127: \$? = $ac_status" >&5
+  echo "$as_me:44646: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:43130: \"$ac_try\"") >&5
+  { (eval echo "$as_me:44649: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43133: \$? = $ac_status" >&5
+  echo "$as_me:44652: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_XtAppInitialize=yes
 else
@@ -43140,13 +44659,13 @@ ac_cv_func_XtAppInitialize=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:43143: result: $ac_cv_func_XtAppInitialize" >&5
+echo "$as_me:44662: 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:43149: checking for XtAppInitialize in -lXt" >&5
+	echo "$as_me:44668: 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
@@ -43154,7 +44673,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 43157 "configure"
+#line 44676 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -43173,16 +44692,16 @@ XtAppInitialize ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43176: \"$ac_link\"") >&5
+if { (eval echo "$as_me:44695: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43179: \$? = $ac_status" >&5
+  echo "$as_me:44698: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:43182: \"$ac_try\"") >&5
+  { (eval echo "$as_me:44701: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43185: \$? = $ac_status" >&5
+  echo "$as_me:44704: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xt_XtAppInitialize=yes
 else
@@ -43193,7 +44712,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:43196: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:44715: 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
 
@@ -43210,7 +44729,7 @@ fi
 fi
 
 if test $cf_have_X_LIBS = no ; then
-	{ echo "$as_me:43213: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+	{ echo "$as_me:44732: 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
@@ -43231,15 +44750,19 @@ do
 		cf_save="$CPPFLAGS"
 		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:43235: checking for $cf_test in $cf_path" >&5
+			CPPFLAGS="$cf_save"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_path/include"
+
+			echo "$as_me:44758: 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:43238: checking for $cf_test" >&5
+			echo "$as_me:44761: checking for $cf_test" >&5
 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
 		fi
 		cat >conftest.$ac_ext <<_ACEOF
-#line 43242 "configure"
+#line 44765 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -43253,16 +44776,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:43256: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:44779: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:43259: \$? = $ac_status" >&5
+  echo "$as_me:44782: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:43262: \"$ac_try\"") >&5
+  { (eval echo "$as_me:44785: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43265: \$? = $ac_status" >&5
+  echo "$as_me:44788: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -43271,7 +44794,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-		echo "$as_me:43274: result: $cf_result" >&5
+		echo "$as_me:44797: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 		if test "$cf_result" = yes ; then
 			cf_x_athena_inc=$cf_path
@@ -43283,10 +44806,13 @@ echo "${ECHO_T}$cf_result" >&6
 done
 
 if test -z "$cf_x_athena_inc" ; then
-	{ echo "$as_me:43286: WARNING: Unable to successfully find Athena header files with test program" >&5
+	{ echo "$as_me:44809: 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"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-I$cf_x_athena_inc"
+
 fi
 
 cf_x_athena_root=$cf_x_athena
@@ -43329,7 +44855,7 @@ do
 done
 LIBS="$cf_add_libs"
 
-				echo "$as_me:43332: checking for $cf_libs in $cf_path" >&5
+				echo "$as_me:44858: checking for $cf_libs in $cf_path" >&5
 echo $ECHO_N "checking for $cf_libs in $cf_path... $ECHO_C" >&6
 			else
 
@@ -43349,11 +44875,11 @@ do
 done
 LIBS="$cf_add_libs"
 
-				echo "$as_me:43352: checking for $cf_test in $cf_libs" >&5
+				echo "$as_me:44878: 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 43356 "configure"
+#line 44882 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -43369,16 +44895,16 @@ $cf_test((XtAppContext) 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43372: \"$ac_link\"") >&5
+if { (eval echo "$as_me:44898: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43375: \$? = $ac_status" >&5
+  echo "$as_me:44901: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:43378: \"$ac_try\"") >&5
+  { (eval echo "$as_me:44904: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43381: \$? = $ac_status" >&5
+  echo "$as_me:44907: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -43387,7 +44913,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-			echo "$as_me:43390: result: $cf_result" >&5
+			echo "$as_me:44916: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				cf_x_athena_lib="$cf_libs"
@@ -43401,7 +44927,7 @@ echo "${ECHO_T}$cf_result" >&6
 done
 
 if test -z "$cf_x_athena_lib" ; then
-	{ { echo "$as_me:43404: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+	{ { echo "$as_me:44930: 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
@@ -43419,7 +44945,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:43422: checking for $ac_word" >&5
+echo "$as_me:44948: 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
@@ -43434,7 +44960,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:43437: found $ac_dir/$ac_word" >&5
+echo "$as_me:44963: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -43442,10 +44968,10 @@ fi
 fi
 XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
 if test -n "$XCURSES_CONFIG"; then
-  echo "$as_me:43445: result: $XCURSES_CONFIG" >&5
+  echo "$as_me:44971: result: $XCURSES_CONFIG" >&5
 echo "${ECHO_T}$XCURSES_CONFIG" >&6
 else
-  echo "$as_me:43448: result: no" >&5
+  echo "$as_me:44974: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -43458,7 +44984,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:43461: checking for $ac_word" >&5
+echo "$as_me:44987: 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
@@ -43473,7 +44999,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:43476: found $ac_dir/$ac_word" >&5
+echo "$as_me:45002: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -43481,10 +45007,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:43484: result: $ac_ct_XCURSES_CONFIG" >&5
+  echo "$as_me:45010: result: $ac_ct_XCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6
 else
-  echo "$as_me:43487: result: no" >&5
+  echo "$as_me:45013: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -43497,7 +45023,103 @@ fi
 
 if test "$XCURSES_CONFIG" != none ; then
 
-CPPFLAGS="$CPPFLAGS `$XCURSES_CONFIG --cflags`"
+cf_fix_cppflags=no
+cf_new_cflags=
+cf_new_cppflags=
+cf_new_extra_cppflags=
+
+for cf_add_cflags in `$XCURSES_CONFIG --cflags`
+do
+case $cf_fix_cppflags in
+(no)
+	case $cf_add_cflags in
+	(-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
+		case $cf_add_cflags in
+		(-D*)
+			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+
+			test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
+				&& test -z "${cf_tst_cflags}" \
+				&& cf_fix_cppflags=yes
+
+			if test $cf_fix_cppflags = yes ; then
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
+				continue
+			elif test "${cf_tst_cflags}" = "\"'" ; then
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
+				continue
+			fi
+			;;
+		esac
+		case "$CPPFLAGS" in
+		(*$cf_add_cflags)
+			;;
+		(*)
+			case $cf_add_cflags in
+			(-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
+
+	test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+	cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+
+			;;
+		esac
+		;;
+	(*)
+
+	test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+	cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+
+		;;
+	esac
+	;;
+(yes)
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
+	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
+
+	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
+		&& test -z "${cf_tst_cflags}" \
+		&& cf_fix_cppflags=no
+	;;
+esac
+done
+
+if test -n "$cf_new_cflags" ; then
+
+	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+	CFLAGS="${CFLAGS}$cf_new_cflags"
+
+fi
+
+if test -n "$cf_new_cppflags" ; then
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+
+fi
+
+if test -n "$cf_new_extra_cppflags" ; then
+
+	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+
+fi
 
 cf_add_libs="`$XCURSES_CONFIG --libs`"
 # Filter out duplicates - this happens with badly-designed ".pc" files...
@@ -43523,7 +45145,7 @@ LDFLAGS="$LDFLAGS $X_LIBS"
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:43526: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:45148: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -43608,7 +45230,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}:43611: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:45233: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -43618,7 +45240,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}:43621: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:45243: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -43628,7 +45250,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me:-configure}:43631: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:45253: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
 
 	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
 	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
@@ -43637,7 +45259,7 @@ fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 43640 "configure"
+#line 45262 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -43649,16 +45271,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43652: \"$ac_link\"") >&5
+if { (eval echo "$as_me:45274: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43655: \$? = $ac_status" >&5
+  echo "$as_me:45277: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:43658: \"$ac_try\"") >&5
+  { (eval echo "$as_me:45280: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43661: \$? = $ac_status" >&5
+  echo "$as_me:45283: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -43666,12 +45288,12 @@ else
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:43669: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:45291: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
 
 	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:43674: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:45296: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_flags"
@@ -43679,7 +45301,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:43682: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:45304: 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
@@ -43687,7 +45309,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 43690 "configure"
+#line 45312 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -43706,16 +45328,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43709: \"$ac_link\"") >&5
+if { (eval echo "$as_me:45331: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43712: \$? = $ac_status" >&5
+  echo "$as_me:45334: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:43715: \"$ac_try\"") >&5
+  { (eval echo "$as_me:45337: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43718: \$? = $ac_status" >&5
+  echo "$as_me:45340: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -43726,7 +45348,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:43729: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:45351: 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
 
@@ -43748,7 +45370,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-echo "$as_me:43751: checking for XCurses library" >&5
+echo "$as_me:45373: 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
@@ -43771,7 +45393,7 @@ done
 LIBS="$cf_add_libs"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 43774 "configure"
+#line 45396 "configure"
 #include "confdefs.h"
 
 #include <xcurses.h>
@@ -43786,16 +45408,16 @@ XCursesExit();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43789: \"$ac_link\"") >&5
+if { (eval echo "$as_me:45411: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43792: \$? = $ac_status" >&5
+  echo "$as_me:45414: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:43795: \"$ac_try\"") >&5
+  { (eval echo "$as_me:45417: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43798: \$? = $ac_status" >&5
+  echo "$as_me:45420: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_lib_XCurses=yes
 else
@@ -43806,7 +45428,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:43809: result: $cf_cv_lib_XCurses" >&5
+echo "$as_me:45431: result: $cf_cv_lib_XCurses" >&5
 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
 
 fi
@@ -43821,23 +45443,23 @@ cat >>confdefs.h <<\EOF
 #define XCURSES 1
 EOF
 
-	echo "$as_me:43824: checking for xcurses.h" >&5
+	echo "$as_me:45446: 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 43830 "configure"
+#line 45452 "configure"
 #include "confdefs.h"
 #include <xcurses.h>
 _ACEOF
-if { (eval echo "$as_me:43834: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:45456: \"$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:43840: \$? = $ac_status" >&5
+  echo "$as_me:45462: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -43856,7 +45478,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:43859: result: $ac_cv_header_xcurses_h" >&5
+echo "$as_me:45481: 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
 
@@ -43867,7 +45489,7 @@ EOF
 fi
 
 else
-	{ { echo "$as_me:43870: error: Cannot link with XCurses" >&5
+	{ { echo "$as_me:45492: error: Cannot link with XCurses" >&5
 echo "$as_me: error: Cannot link with XCurses" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -43876,7 +45498,7 @@ fi
 	esac
 else
 
-echo "$as_me:43879: checking if we can include termio.h with curses" >&5
+echo "$as_me:45501: 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
@@ -43886,7 +45508,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 43889 "configure"
+#line 45511 "configure"
 #include "confdefs.h"
 
 #include <LYCurses.h>
@@ -43900,16 +45522,16 @@ putchar(0x0a)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:43903: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:45525: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:43906: \$? = $ac_status" >&5
+  echo "$as_me:45528: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:43909: \"$ac_try\"") >&5
+  { (eval echo "$as_me:45531: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43912: \$? = $ac_status" >&5
+  echo "$as_me:45534: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termio_and_curses=yes
 else
@@ -43922,7 +45544,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
     rm -f lynx_cfg.h
 
 fi
-echo "$as_me:43925: result: $cf_cv_termio_and_curses" >&5
+echo "$as_me:45547: result: $cf_cv_termio_and_curses" >&5
 echo "${ECHO_T}$cf_cv_termio_and_curses" >&6
 
 test $cf_cv_termio_and_curses = yes &&
@@ -43939,23 +45561,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:43942: checking for $ac_header" >&5
+echo "$as_me:45564: 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 43948 "configure"
+#line 45570 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:43952: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:45574: \"$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:43958: \$? = $ac_status" >&5
+  echo "$as_me:45580: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -43974,7 +45596,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:43977: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:45599: 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
@@ -43986,7 +45608,7 @@ done
 
 	fi
 
-echo "$as_me:43989: checking if curses supports alternate-character set" >&5
+echo "$as_me:45611: 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
@@ -43995,7 +45617,7 @@ else
 for mapname in acs_map _acs_map
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 43998 "configure"
+#line 45620 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -44009,16 +45631,16 @@ chtype x = $mapname['l']; $mapname['m'] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:44012: \"$ac_link\"") >&5
+if { (eval echo "$as_me:45634: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:44015: \$? = $ac_status" >&5
+  echo "$as_me:45637: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:44018: \"$ac_try\"") >&5
+  { (eval echo "$as_me:45640: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:44021: \$? = $ac_status" >&5
+  echo "$as_me:45643: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_alt_char_set=$mapname
 	 break
@@ -44032,21 +45654,21 @@ done
 
 fi
 
-echo "$as_me:44035: result: $cf_cv_alt_char_set" >&5
+echo "$as_me:45657: result: $cf_cv_alt_char_set" >&5
 echo "${ECHO_T}$cf_cv_alt_char_set" >&6
 test $cf_cv_alt_char_set != no &&
 cat >>confdefs.h <<EOF
 #define ALT_CHAR_SET $cf_cv_alt_char_set
 EOF
 
-echo "$as_me:44042: checking if curses supports fancy attributes" >&5
+echo "$as_me:45664: 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 44049 "configure"
+#line 45671 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -44064,16 +45686,16 @@ attrset(A_UNDERLINE|A_BOLD|A_REVERSE);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:44067: \"$ac_link\"") >&5
+if { (eval echo "$as_me:45689: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:44070: \$? = $ac_status" >&5
+  echo "$as_me:45692: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:44073: \"$ac_try\"") >&5
+  { (eval echo "$as_me:45695: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:44076: \$? = $ac_status" >&5
+  echo "$as_me:45698: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fancy_curses=yes
 else
@@ -44085,14 +45707,14 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:44088: result: $cf_cv_fancy_curses" >&5
+echo "$as_me:45710: result: $cf_cv_fancy_curses" >&5
 echo "${ECHO_T}$cf_cv_fancy_curses" >&6
 test $cf_cv_fancy_curses = yes &&
 cat >>confdefs.h <<\EOF
 #define FANCY_CURSES 1
 EOF
 
-echo "$as_me:44095: checking for function curses_version" >&5
+echo "$as_me:45717: 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
@@ -44102,7 +45724,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_curses_version=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 44105 "configure"
+#line 45727 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -44115,15 +45737,15 @@ int main(void)
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:44118: \"$ac_link\"") >&5
+if { (eval echo "$as_me:45740: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:44121: \$? = $ac_status" >&5
+  echo "$as_me:45743: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:44123: \"$ac_try\"") >&5
+  { (eval echo "$as_me:45745: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:44126: \$? = $ac_status" >&5
+  echo "$as_me:45748: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_func_curses_version=yes
 
@@ -44138,7 +45760,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core
 fi
-echo "$as_me:44141: result: $cf_cv_func_curses_version" >&5
+echo "$as_me:45763: 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
@@ -44146,14 +45768,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test "$cf_cv_ncurses_version" != no ; then
-echo "$as_me:44149: checking for obsolete/broken version of ncurses" >&5
+echo "$as_me:45771: 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 44156 "configure"
+#line 45778 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -44172,16 +45794,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:44175: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:45797: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:44178: \$? = $ac_status" >&5
+  echo "$as_me:45800: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:44181: \"$ac_try\"") >&5
+  { (eval echo "$as_me:45803: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:44184: \$? = $ac_status" >&5
+  echo "$as_me:45806: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_broken=no
 else
@@ -44193,10 +45815,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:44196: result: $cf_cv_ncurses_broken" >&5
+echo "$as_me:45818: 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:44199: WARNING: hmm... you should get an up-to-date version of ncurses" >&5
+	{ echo "$as_me:45821: 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
@@ -44206,14 +45828,14 @@ EOF
 fi
 fi
 
-echo "$as_me:44209: checking if curses supports color attributes" >&5
+echo "$as_me:45831: 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 44216 "configure"
+#line 45838 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -44233,16 +45855,16 @@ chtype x = COLOR_BLUE;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:44236: \"$ac_link\"") >&5
+if { (eval echo "$as_me:45858: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:44239: \$? = $ac_status" >&5
+  echo "$as_me:45861: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:44242: \"$ac_try\"") >&5
+  { (eval echo "$as_me:45864: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:44245: \$? = $ac_status" >&5
+  echo "$as_me:45867: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_color_curses=yes
 else
@@ -44254,7 +45876,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:44257: result: $cf_cv_color_curses" >&5
+echo "$as_me:45879: result: $cf_cv_color_curses" >&5
 echo "${ECHO_T}$cf_cv_color_curses" >&6
 if test $cf_cv_color_curses = yes ; then
 
@@ -44273,26 +45895,28 @@ for ac_header in \
 termio.h \
 termios.h \
 unistd.h \
+sys/ioctl.h \
+sys/termio.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:44279: checking for $ac_header" >&5
+echo "$as_me:45903: 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 44285 "configure"
+#line 45909 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:44289: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:45913: \"$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:44295: \$? = $ac_status" >&5
+  echo "$as_me:45919: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -44311,7 +45935,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:44314: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:45938: 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
@@ -44321,57 +45945,6 @@ EOF
 fi
 done
 
-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:44329: 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 44335 "configure"
-#include "confdefs.h"
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:44339: \"$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:44345: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  eval "$as_ac_Header=yes"
-else
-  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  eval "$as_ac_Header=no"
-fi
-rm -f conftest.err conftest.$ac_ext
-fi
-echo "$as_me:44364: 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
-
-fi
-done
-
-fi
 if test "$ac_cv_header_termios_h" = yes ; then
 	case "$CFLAGS $CPPFLAGS" in
 	(*-D_POSIX_SOURCE*)
@@ -44379,10 +45952,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	(*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:44382: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:45955: 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 44385 "configure"
+#line 45958 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -44394,16 +45967,16 @@ struct termios foo; int x = foo.c_iflag
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:44397: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:45970: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:44400: \$? = $ac_status" >&5
+  echo "$as_me:45973: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:44403: \"$ac_try\"") >&5
+  { (eval echo "$as_me:45976: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:44406: \$? = $ac_status" >&5
+  echo "$as_me:45979: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   termios_bad=no
 else
@@ -44411,7 +45984,7 @@ else
 cat conftest.$ac_ext >&5
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 44414 "configure"
+#line 45987 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -44425,16 +45998,16 @@ struct termios foo; int x = foo.c_iflag
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:44428: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:46001: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:44431: \$? = $ac_status" >&5
+  echo "$as_me:46004: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:44434: \"$ac_try\"") >&5
+  { (eval echo "$as_me:46007: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:44437: \$? = $ac_status" >&5
+  echo "$as_me:46010: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   termios_bad=unknown
 else
@@ -44450,12 +46023,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-	echo "$as_me:44453: result: $termios_bad" >&5
+	echo "$as_me:46026: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:44458: checking declaration of size-change" >&5
+echo "$as_me:46031: 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
@@ -44468,9 +46041,15 @@ for cf_opts in "" "NEED_PTEM_H"
 do
 
 	CPPFLAGS="$cf_save_CPPFLAGS"
-	test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
+	if test -n "$cf_opts"
+	then
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-D$cf_opts"
+
+	fi
 	cat >conftest.$ac_ext <<_ACEOF
-#line 44473 "configure"
+#line 46052 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -44480,14 +46059,16 @@ do
 #include <termio.h>
 #endif
 #endif
+
 #ifdef NEED_PTEM_H
 /* This is a workaround for SCO:  they neglected to define struct winsize in
  * termios.h -- it's only in termio.h and ptem.h
  */
-#include        <sys/stream.h>
-#include        <sys/ptem.h>
+#include <sys/stream.h>
+#include <sys/ptem.h>
 #endif
-#if !defined(sun) || !defined(HAVE_TERMIOS_H)
+
+#ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
 #endif
 
@@ -44496,12 +46077,12 @@ main (void)
 {
 
 #ifdef TIOCGSIZE
-	struct ttysize win;	/* FIXME: what system is this? */
+	struct ttysize win;	/* SunOS 3.0... */
 	int y = win.ts_lines;
 	int x = win.ts_cols;
 #else
 #ifdef TIOCGWINSZ
-	struct winsize win;
+	struct winsize win;	/* everything else */
 	int y = win.ws_row;
 	int x = win.ws_col;
 #else
@@ -44514,16 +46095,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:44517: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:46098: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:44520: \$? = $ac_status" >&5
+  echo "$as_me:46101: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:44523: \"$ac_try\"") >&5
+  { (eval echo "$as_me:46104: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:44526: \$? = $ac_status" >&5
+  echo "$as_me:46107: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_sizechange=yes
 else
@@ -44542,7 +46123,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:44545: result: $cf_cv_sizechange" >&5
+echo "$as_me:46126: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 
@@ -44560,14 +46141,14 @@ EOF
 	esac
 fi
 
-echo "$as_me:44563: checking if ttytype is declared in curses library" >&5
+echo "$as_me:46144: 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 44570 "configure"
+#line 46151 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -44579,16 +46160,16 @@ char *x = &ttytype[1]; *x = 1
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:44582: \"$ac_link\"") >&5
+if { (eval echo "$as_me:46163: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:44585: \$? = $ac_status" >&5
+  echo "$as_me:46166: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:44588: \"$ac_try\"") >&5
+  { (eval echo "$as_me:46169: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:44591: \$? = $ac_status" >&5
+  echo "$as_me:46172: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_ttytype=yes
 else
@@ -44600,7 +46181,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:44603: result: $cf_cv_have_ttytype" >&5
+echo "$as_me:46184: result: $cf_cv_have_ttytype" >&5
 echo "${ECHO_T}$cf_cv_have_ttytype" >&6
 test $cf_cv_have_ttytype = yes &&
 cat >>confdefs.h <<\EOF
@@ -44609,14 +46190,14 @@ EOF
 
 	if test "$use_wide_curses" = yes ; then
 
-echo "$as_me:44612: checking if curses supports wide characters" >&5
+echo "$as_me:46193: 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 44619 "configure"
+#line 46200 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -44635,16 +46216,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:44638: \"$ac_link\"") >&5
+if { (eval echo "$as_me:46219: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:44641: \$? = $ac_status" >&5
+  echo "$as_me:46222: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:44644: \"$ac_try\"") >&5
+  { (eval echo "$as_me:46225: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:44647: \$? = $ac_status" >&5
+  echo "$as_me:46228: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_widec_curses=yes
 else
@@ -44655,7 +46236,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:44658: result: $cf_cv_widec_curses" >&5
+echo "$as_me:46239: result: $cf_cv_widec_curses" >&5
 echo "${ECHO_T}$cf_cv_widec_curses" >&6
 
 if test "$cf_cv_widec_curses" = yes ; then
@@ -44665,14 +46246,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	# This is needed on Tru64 5.0 to declare mbstate_t
-	echo "$as_me:44668: checking if we must include wchar.h to declare mbstate_t" >&5
+	echo "$as_me:46249: 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 44675 "configure"
+#line 46256 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -44686,23 +46267,23 @@ mbstate_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:44689: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:46270: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:44692: \$? = $ac_status" >&5
+  echo "$as_me:46273: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:44695: \"$ac_try\"") >&5
+  { (eval echo "$as_me:46276: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:44698: \$? = $ac_status" >&5
+  echo "$as_me:46279: \$? = $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 44705 "configure"
+#line 46286 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -44717,16 +46298,16 @@ mbstate_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:44720: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:46301: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:44723: \$? = $ac_status" >&5
+  echo "$as_me:46304: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:44726: \"$ac_try\"") >&5
+  { (eval echo "$as_me:46307: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:44729: \$? = $ac_status" >&5
+  echo "$as_me:46310: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_widec_mbstate=yes
 else
@@ -44738,7 +46319,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:44741: result: $cf_cv_widec_mbstate" >&5
+echo "$as_me:46322: result: $cf_cv_widec_mbstate" >&5
 echo "${ECHO_T}$cf_cv_widec_mbstate" >&6
 
 if test "$cf_cv_widec_mbstate" = yes ; then
@@ -44761,7 +46342,7 @@ fi
 
 	fi
 
-echo "$as_me:44764: checking definition to turn on extended curses functions" >&5
+echo "$as_me:46345: checking definition to turn on extended curses functions" >&5
 echo $ECHO_N "checking definition to turn on extended curses functions... $ECHO_C" >&6
 if test "${cf_cv_need_xopen_extension+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -44769,7 +46350,7 @@ else
 
 cf_cv_need_xopen_extension=unknown
 cat >conftest.$ac_ext <<_ACEOF
-#line 44772 "configure"
+#line 46353 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -44795,16 +46376,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:44798: \"$ac_link\"") >&5
+if { (eval echo "$as_me:46379: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:44801: \$? = $ac_status" >&5
+  echo "$as_me:46382: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:44804: \"$ac_try\"") >&5
+  { (eval echo "$as_me:46385: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:44807: \$? = $ac_status" >&5
+  echo "$as_me:46388: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_xopen_extension=none
 else
@@ -44814,7 +46395,7 @@ cat conftest.$ac_ext >&5
 	for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
 	do
 		cat >conftest.$ac_ext <<_ACEOF
-#line 44817 "configure"
+#line 46398 "configure"
 #include "confdefs.h"
 
 #define $cf_try_xopen_extension 1
@@ -44836,16 +46417,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:44839: \"$ac_link\"") >&5
+if { (eval echo "$as_me:46420: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:44842: \$? = $ac_status" >&5
+  echo "$as_me:46423: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:44845: \"$ac_try\"") >&5
+  { (eval echo "$as_me:46426: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:44848: \$? = $ac_status" >&5
+  echo "$as_me:46429: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_xopen_extension=$cf_try_xopen_extension; break
 else
@@ -44859,16 +46440,19 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:44862: result: $cf_cv_need_xopen_extension" >&5
+echo "$as_me:46443: result: $cf_cv_need_xopen_extension" >&5
 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
 
 case $cf_cv_need_xopen_extension in
 (*_*)
-	CPPFLAGS="$CPPFLAGS -D$cf_cv_need_xopen_extension"
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}-D$cf_cv_need_xopen_extension"
+
 	;;
 esac
 
-echo "$as_me:44871: checking for term.h" >&5
+echo "$as_me:46455: 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
@@ -44889,7 +46473,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 44892 "configure"
+#line 46476 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -44903,16 +46487,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:44906: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:46490: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:44909: \$? = $ac_status" >&5
+  echo "$as_me:46493: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:44912: \"$ac_try\"") >&5
+  { (eval echo "$as_me:46496: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:44915: \$? = $ac_status" >&5
+  echo "$as_me:46499: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_term_header=$cf_header
 	 break
@@ -44931,7 +46515,7 @@ case $cf_cv_term_header in
 	for cf_header in ncurses/term.h ncursesw/term.h
 	do
 		cat >conftest.$ac_ext <<_ACEOF
-#line 44934 "configure"
+#line 46518 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -44949,16 +46533,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:44952: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:46536: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:44955: \$? = $ac_status" >&5
+  echo "$as_me:46539: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:44958: \"$ac_try\"") >&5
+  { (eval echo "$as_me:46542: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:44961: \$? = $ac_status" >&5
+  echo "$as_me:46545: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_term_header=$cf_header
 			 break
@@ -44973,7 +46557,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 esac
 
 fi
-echo "$as_me:44976: result: $cf_cv_term_header" >&5
+echo "$as_me:46560: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 case $cf_cv_term_header in
@@ -45000,7 +46584,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:45003: checking for unctrl.h" >&5
+echo "$as_me:46587: 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
@@ -45021,7 +46605,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 45024 "configure"
+#line 46608 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -45035,16 +46619,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:45038: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:46622: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:45041: \$? = $ac_status" >&5
+  echo "$as_me:46625: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:45044: \"$ac_try\"") >&5
+  { (eval echo "$as_me:46628: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:45047: \$? = $ac_status" >&5
+  echo "$as_me:46631: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_unctrl_header=$cf_header
 	 break
@@ -45057,12 +46641,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:45060: result: $cf_cv_unctrl_header" >&5
+echo "$as_me:46644: result: $cf_cv_unctrl_header" >&5
 echo "${ECHO_T}$cf_cv_unctrl_header" >&6
 
 case $cf_cv_unctrl_header in
 (no)
-	{ echo "$as_me:45065: WARNING: unctrl.h header not found" >&5
+	{ echo "$as_me:46649: WARNING: unctrl.h header not found" >&5
 echo "$as_me: WARNING: unctrl.h header not found" >&2;}
 	;;
 esac
@@ -45118,10 +46702,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:45121: checking for ${cf_func}" >&5
+	echo "$as_me:46705: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me:-configure}:45124: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:46708: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -45130,7 +46714,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >conftest.$ac_ext <<_ACEOF
-#line 45133 "configure"
+#line 46717 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -45163,16 +46747,16 @@ if (foo + 1234L > 5678L)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:45166: \"$ac_link\"") >&5
+if { (eval echo "$as_me:46750: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:45169: \$? = $ac_status" >&5
+  echo "$as_me:46753: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:45172: \"$ac_try\"") >&5
+  { (eval echo "$as_me:46756: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:45175: \$? = $ac_status" >&5
+  echo "$as_me:46759: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -45188,7 +46772,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:45191: result: $cf_result" >&5
+	echo "$as_me:46775: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test $cf_result != no; then
 		cat >>confdefs.h <<EOF
@@ -45204,13 +46788,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:45207: checking for $ac_func" >&5
+echo "$as_me:46791: 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 45213 "configure"
+#line 46797 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -45241,16 +46825,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:45244: \"$ac_link\"") >&5
+if { (eval echo "$as_me:46828: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:45247: \$? = $ac_status" >&5
+  echo "$as_me:46831: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:45250: \"$ac_try\"") >&5
+  { (eval echo "$as_me:46834: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:45253: \$? = $ac_status" >&5
+  echo "$as_me:46837: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -45260,7 +46844,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:45263: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:46847: 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
@@ -45274,12 +46858,12 @@ fi
 
 if test $use_color_style != no ; then
 	if test .$cf_cv_color_curses != .yes ; then
-		{ { echo "$as_me:45277: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:46861: 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:45282: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:46866: error: Configuration does not support color-styles" >&5
 echo "$as_me: error: Configuration does not support color-styles" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -45287,7 +46871,7 @@ fi
 
 if test $use_scrollbar != no ; then
 	if test .$cf_cv_fancy_curses != .yes ; then
-		{ echo "$as_me:45290: WARNING: Configuration does not support ACS_xxx definitions" >&5
+		{ echo "$as_me:46874: WARNING: Configuration does not support ACS_xxx definitions" >&5
 echo "$as_me: WARNING: Configuration does not support ACS_xxx definitions" >&2;}
 	else
 
@@ -45300,7 +46884,7 @@ fi
 
 # use rpath for libraries in unusual places
 
-echo "$as_me:45303: checking if rpath-hack should be disabled" >&5
+echo "$as_me:46887: 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.
@@ -45317,21 +46901,21 @@ else
 	cf_disable_rpath_hack=no
 
 fi;
-echo "$as_me:45320: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:46904: 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:45324: checking for updated LDFLAGS" >&5
+echo "$as_me:46908: 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:45327: result: maybe" >&5
+	echo "$as_me:46911: 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:45334: checking for $ac_word" >&5
+echo "$as_me:46918: 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
@@ -45346,7 +46930,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:45349: found $ac_dir/$ac_word" >&5
+echo "$as_me:46933: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -45354,10 +46938,10 @@ fi
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:45357: result: $cf_ldd_prog" >&5
+  echo "$as_me:46941: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:45360: result: no" >&5
+  echo "$as_me:46944: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -45371,7 +46955,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
 		cf_rpath_oops=
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 45374 "configure"
+#line 46958 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -45383,16 +46967,16 @@ printf("Hello");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:45386: \"$ac_link\"") >&5
+if { (eval echo "$as_me:46970: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:45389: \$? = $ac_status" >&5
+  echo "$as_me:46973: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:45392: \"$ac_try\"") >&5
+  { (eval echo "$as_me:46976: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:45395: \$? = $ac_status" >&5
+  echo "$as_me:46979: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
 		 cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
@@ -45420,7 +47004,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}:45423: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:47007: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 
 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
 						break
@@ -45432,11 +47016,11 @@ echo "${as_me:-configure}:45423: testing ...adding -L$cf_rpath_dir/lib to LDFLAG
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:45435: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:47019: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:45439: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:47023: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -45473,7 +47057,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:45476: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:47060: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -45486,11 +47070,11 @@ LDFLAGS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:45489: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:47073: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:45493: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:47077: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -45527,7 +47111,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:45530: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:47114: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -45540,14 +47124,14 @@ LIBS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:45543: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:47127: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:45547: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:47131: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 else
-	echo "$as_me:45550: result: no" >&5
+	echo "$as_me:47134: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -45654,7 +47238,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:45657: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:47241: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -45830,7 +47414,7 @@ cat >>$CONFIG_STATUS <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:45833: error: ambiguous option: $1
+    { { echo "$as_me:47417: 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;}
@@ -45849,7 +47433,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:45852: error: unrecognized option: $1
+  -*) { { echo "$as_me:47436: 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;}
@@ -45902,7 +47486,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:45905: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:47489: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -46256,7 +47840,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:46259: creating $ac_file" >&5
+    { echo "$as_me:47843: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -46274,7 +47858,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:46277: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:47861: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -46287,7 +47871,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:46290: error: cannot find input file: $f" >&5
+           { { echo "$as_me:47874: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -46303,7 +47887,7 @@ cat >>$CONFIG_STATUS <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' $ac_item`
         if test -z "$ac_used"; then
-          { echo "$as_me:46306: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:47890: 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;}
@@ -46312,7 +47896,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' $ac_item`
       if test -n "$ac_seen"; then
-        { echo "$as_me:46315: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:47899: 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;}
@@ -46349,7 +47933,7 @@ s,@INSTALL@,$ac_INSTALL,;t t
             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:46352: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:47936: 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;}
@@ -46360,7 +47944,7 @@ $ac_seen" >&2;}
     egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
     if test -s $tmp/out; then
       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
-      { echo "$as_me:46363: WARNING: Some variables may not be substituted:
+      { echo "$as_me:47947: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -46409,7 +47993,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:46412: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:47996: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -46420,7 +48004,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:46423: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:48007: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -46433,7 +48017,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:46436: error: cannot find input file: $f" >&5
+           { { echo "$as_me:48020: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -46551,7 +48135,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:46554: $ac_file is unchanged" >&5
+      { echo "$as_me:48138: $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 2ac1942e..7b8bd984 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $LynxId: configure.in,v 1.308 2019/05/26 00:22:19 tom Exp $
+dnl $LynxId: configure.in,v 1.310 2019/07/31 23:34:58 tom Exp $
 dnl
 dnl Process this file with autoconf to produce a configure script.
 dnl
@@ -7,7 +7,7 @@ dnl by T.E.Dickey <dickey@invisible-island.net>
 dnl and Jim Spath <jspath@mail.bcpl.lib.md.us>
 dnl
 dnl ---------------------------------------------------------------------------
-dnl Copyright 1997-2017,2018 by Thomas E. Dickey
+dnl Copyright 1997-2018,2019 by Thomas E. Dickey
 dnl
 dnl Permission to use, copy, modify, and distribute this software and its
 dnl documentation for any purpose and without fee is hereby granted,
@@ -798,6 +798,7 @@ AC_FUNC_VFORK
 CF_FIONBIO
 CF_REMOVE_BROKEN
 CF_FUNC_LSTAT
+CF_FUNC_VASPRINTF
 AC_CHECK_FUNCS( \
 	atoll \
 	ctermid \
@@ -818,7 +819,6 @@ AC_CHECK_FUNCS( \
 	ttyname \
 	unsetenv \
 	sleep usleep \
-	vasprintf \
 	waitpid \
 )
 AC_REPLACE_FUNCS( \
diff --git a/makefile.in b/makefile.in
index 5fce4d60..c2e998f2 100644
--- a/makefile.in
+++ b/makefile.in
@@ -1,4 +1,4 @@
-# $LynxId: makefile.in,v 1.176 2019/05/26 00:22:19 tom Exp $
+# $LynxId: makefile.in,v 1.177 2019/07/31 23:06:14 tom Exp $
 ##makefile for lynx
 
 SHELL		= @CONFIG_SHELL@
@@ -157,7 +157,6 @@ SITE_DEFS = # Your defines here
 # defines for which there are no configure options:
 # -DIGNORE_CTRL_C  Define if Control-C shouldn't exit lynx.
 # -DNO_RULES       Disables CERN-style access rules (see lynx.cfg).
-# -DUSE_VASPRINT   Use vasprintf() function
 #
 # if you are linking to freeWAIS-0.202 or older, you should define this
 # in SITE_DEFS
diff --git a/src/chrtrans/iso10_uni.tbl b/src/chrtrans/iso10_uni.tbl
index 4c6605c8..edd59e28 100644
--- a/src/chrtrans/iso10_uni.tbl
+++ b/src/chrtrans/iso10_uni.tbl
@@ -20,134 +20,134 @@ ONorth European (ISO-8859-10)
 
 0x20-0x7e	idem
 
-0xa0	U+00a0	# NO-BREAK SPACE
-0xa1	U+0104	# LATIN CAPITAL LETTER A WITH OGONEK
-0xa2	U+0112	# LATIN CAPITAL LETTER E WITH MACRON
-0xa3	U+0122	# LATIN CAPITAL LETTER G WITH CEDILLA
-0xa4	U+012a	# LATIN CAPITAL LETTER I WITH MACRON
-0xa5	U+0128	# LATIN CAPITAL LETTER I WITH TILDE
-0xa6	U+0136	# LATIN CAPITAL LETTER K WITH CEDILLA
-0xa7	U+00a7	# SECTION SIGN
-0xa8	U+013b	# LATIN CAPITAL LETTER L WITH CEDILLA
-0xa9	U+0110	# LATIN CAPITAL LETTER D WITH STROKE
-0xaa	U+0160	# LATIN CAPITAL LETTER S WITH CARON
-0xab	U+0166	# LATIN CAPITAL LETTER T WITH STROKE
-0xac	U+017d	# LATIN CAPITAL LETTER Z WITH CARON
-0xad	U+00ad	# SOFT HYPHEN
-0xae	U+016a	# LATIN CAPITAL LETTER U WITH MACRON
-0xaf	U+014a	# LATIN CAPITAL LETTER ENG
-0xb0	U+00b0	# DEGREE SIGN
-0xb1	U+0105	# LATIN SMALL LETTER A WITH OGONEK
-0xb2	U+0113	# LATIN SMALL LETTER E WITH MACRON
-0xb3	U+0123	# LATIN SMALL LETTER G WITH CEDILLA
-0xb4	U+012b	# LATIN SMALL LETTER I WITH MACRON
-0xb5	U+0129	# LATIN SMALL LETTER I WITH TILDE
-0xb6	U+0137	# LATIN SMALL LETTER K WITH CEDILLA
-0xb7	U+00b7	# MIDDLE DOT
-0xb8	U+013c	# LATIN SMALL LETTER L WITH CEDILLA
-0xb9	U+0111	# LATIN SMALL LETTER D WITH STROKE
-0xba	U+0161	# LATIN SMALL LETTER S WITH CARON
-0xbb	U+0167	# LATIN SMALL LETTER T WITH STROKE
-0xbc	U+017e	# LATIN SMALL LETTER Z WITH CARON
-0xbd	U+2015	# HORIZONTAL BAR
-0xbe	U+016b	# LATIN SMALL LETTER U WITH MACRON
-0xbf	U+014b	# LATIN SMALL LETTER ENG
-0xc0	U+0100	# LATIN CAPITAL LETTER A WITH MACRON
-
-0xc1-0xc6	idem
-
-#0xc1	U+00c1	# LATIN CAPITAL LETTER A WITH ACUTE
-#0xc2	U+00c2	# LATIN CAPITAL LETTER A WITH CIRCUMFLEX
-#0xc3	U+00c3	# LATIN CAPITAL LETTER A WITH TILDE
-#0xc4	U+00c4	# LATIN CAPITAL LETTER A WITH DIAERESIS
-#0xc5	U+00c5	# LATIN CAPITAL LETTER A WITH RING ABOVE
-#0xc6	U+00c6	# LATIN CAPITAL LETTER AE
-
-0xc7	U+012e	# LATIN CAPITAL LETTER I WITH OGONEK
-0xc8	U+010c	# LATIN CAPITAL LETTER C WITH CARON
-0xc9	U+00c9	# LATIN CAPITAL LETTER E WITH ACUTE
-0xca	U+0118	# LATIN CAPITAL LETTER E WITH OGONEK
-0xcb	U+00cb	# LATIN CAPITAL LETTER E WITH DIAERESIS
-0xcc	U+0116	# LATIN CAPITAL LETTER E WITH DOT ABOVE
-
-0xcd-0xd0	idem
-
-#0xcd	U+00cd	# LATIN CAPITAL LETTER I WITH ACUTE
-#0xce	U+00ce	# LATIN CAPITAL LETTER I WITH CIRCUMFLEX
-#0xcf	U+00cf	# LATIN CAPITAL LETTER I WITH DIAERESIS
-#0xd0	U+00d0	# LATIN CAPITAL LETTER ETH
-
-0xd1	U+0145	# LATIN CAPITAL LETTER N WITH CEDILLA
-0xd2	U+014c	# LATIN CAPITAL LETTER O WITH MACRON
-
-0xd3-0xd6	idem
-
-#0xd3	U+00d3	# LATIN CAPITAL LETTER O WITH ACUTE
-#0xd4	U+00d4	# LATIN CAPITAL LETTER O WITH CIRCUMFLEX
-#0xd5	U+00d5	# LATIN CAPITAL LETTER O WITH TILDE
-#0xd6	U+00d6	# LATIN CAPITAL LETTER O WITH DIAERESIS
-
-0xd7	U+0168	# LATIN CAPITAL LETTER U WITH TILDE
-0xd8	U+00d8	# LATIN CAPITAL LETTER O WITH STROKE
-0xd9	U+0172	# LATIN CAPITAL LETTER U WITH OGONEK
-
-0xda-0xde	idem
-
-#0xda	U+00da	# LATIN CAPITAL LETTER U WITH ACUTE
-#0xdb	U+00db	# LATIN CAPITAL LETTER U WITH CIRCUMFLEX
-#0xdc	U+00dc	# LATIN CAPITAL LETTER U WITH DIAERESIS
-#0xdd	U+00dd	# LATIN CAPITAL LETTER Y WITH ACUTE
-#0xde	U+00de	# LATIN CAPITAL LETTER THORN
-
-0xdF	U+00df	# LATIN SMALL LETTER SHARP S
-0xe0	U+0101	# LATIN SMALL LETTER A WITH MACRON
-
-0xe1-0xe6	idem
-
-#0xe1	U+00e1	# LATIN SMALL LETTER A WITH ACUTE
-#0xe2	U+00e2	# LATIN SMALL LETTER A WITH CIRCUMFLEX
-#0xe3	U+00e3	# LATIN SMALL LETTER A WITH TILDE
-#0xe4	U+00e4	# LATIN SMALL LETTER A WITH DIAERESIS
-#0xe5	U+00e5	# LATIN SMALL LETTER A WITH RING ABOVE
-#0xe6	U+00e6	# LATIN SMALL LETTER AE
-
-0xe7	U+012f	# LATIN SMALL LETTER I WITH OGONEK
-0xe8	U+010d	# LATIN SMALL LETTER C WITH CARON
-0xe9	U+00e9	# LATIN SMALL LETTER E WITH ACUTE
-0xea	U+0119	# LATIN SMALL LETTER E WITH OGONEK
-0xeb	U+00eb	# LATIN SMALL LETTER E WITH DIAERESIS
-0xec	U+0117	# LATIN SMALL LETTER E WITH DOT ABOVE
-
-0xed-0xf0	idem
-
-#0xed	U+00ed	# LATIN SMALL LETTER I WITH ACUTE
-#0xee	U+00ee	# LATIN SMALL LETTER I WITH CIRCUMFLEX
-#0xef	U+00ef	# LATIN SMALL LETTER I WITH DIAERESIS
-#0xf0	U+00F0	# LATIN SMALL LETTER ETH
-
-0xf1	U+0146	# LATIN SMALL LETTER N WITH CEDILLA
-0xf2	U+014d	# LATIN SMALL LETTER O WITH MACRON
-
-0xf3-0xf6	idem
-
-#0xf3	U+00f3	# LATIN SMALL LETTER O WITH ACUTE
-#0xf4	U+00f4	# LATIN SMALL LETTER O WITH CIRCUMFLEX
-#0xf5	U+00f5	# LATIN SMALL LETTER O WITH TILDE
-#0xf6	U+00f6	# LATIN SMALL LETTER O WITH DIAERESIS
-
-0xf7	U+0169	# LATIN SMALL LETTER U WITH TILDE
-0xf8	U+00f8	# LATIN SMALL LETTER O WITH STROKE
-0xf9	U+0173	# LATIN SMALL LETTER U WITH OGONEK
-
-0xfa-0xfe	idem
-
-#0xfa	U+00fa	# LATIN SMALL LETTER U WITH ACUTE
-#0xfb	U+00fb	# LATIN SMALL LETTER U WITH CIRCUMFLEX
-#0xfc	U+00fc	# LATIN SMALL LETTER U WITH DIAERESIS
-#0xfd	U+00fd	# LATIN SMALL LETTER Y WITH ACUTE
-#0xfe	U+00fe	# LATIN SMALL LETTER THORN
-
-0xfF	U+0138	# LATIN SMALL LETTER KRA
+0xA0	U+00A0	# NO-BREAK SPACE
+0xA1	U+0104	# LATIN CAPITAL LETTER A WITH OGONEK
+0xA2	U+0112	# LATIN CAPITAL LETTER E WITH MACRON
+0xA3	U+0122	# LATIN CAPITAL LETTER G WITH CEDILLA
+0xA4	U+012A	# LATIN CAPITAL LETTER I WITH MACRON
+0xA5	U+0128	# LATIN CAPITAL LETTER I WITH TILDE
+0xA6	U+0136	# LATIN CAPITAL LETTER K WITH CEDILLA
+0xA7	U+00A7	# SECTION SIGN
+0xA8	U+013B	# LATIN CAPITAL LETTER L WITH CEDILLA
+0xA9	U+0110	# LATIN CAPITAL LETTER D WITH STROKE
+0xAA	U+0160	# LATIN CAPITAL LETTER S WITH CARON
+0xAB	U+0166	# LATIN CAPITAL LETTER T WITH STROKE
+0xAC	U+017D	# LATIN CAPITAL LETTER Z WITH CARON
+0xAD	U+00AD	# SOFT HYPHEN
+0xAE	U+016A	# LATIN CAPITAL LETTER U WITH MACRON
+0xAF	U+014A	# LATIN CAPITAL LETTER ENG
+0xB0	U+00B0	# DEGREE SIGN
+0xB1	U+0105	# LATIN SMALL LETTER A WITH OGONEK
+0xB2	U+0113	# LATIN SMALL LETTER E WITH MACRON
+0xB3	U+0123	# LATIN SMALL LETTER G WITH CEDILLA
+0xB4	U+012B	# LATIN SMALL LETTER I WITH MACRON
+0xB5	U+0129	# LATIN SMALL LETTER I WITH TILDE
+0xB6	U+0137	# LATIN SMALL LETTER K WITH CEDILLA
+0xB7	U+00B7	# MIDDLE DOT
+0xB8	U+013C	# LATIN SMALL LETTER L WITH CEDILLA
+0xB9	U+0111	# LATIN SMALL LETTER D WITH STROKE
+0xBA	U+0161	# LATIN SMALL LETTER S WITH CARON
+0xBB	U+0167	# LATIN SMALL LETTER T WITH STROKE
+0xBC	U+017E	# LATIN SMALL LETTER Z WITH CARON
+0xBD	U+2015	# HORIZONTAL BAR
+0xBE	U+016B	# LATIN SMALL LETTER U WITH MACRON
+0xBF	U+014B	# LATIN SMALL LETTER ENG
+0xC0	U+0100	# LATIN CAPITAL LETTER A WITH MACRON
+
+0xC1-0xC6	idem
+
+#0xC1	U+00C1	# LATIN CAPITAL LETTER A WITH ACUTE
+#0xC2	U+00C2	# LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+#0xC3	U+00C3	# LATIN CAPITAL LETTER A WITH TILDE
+#0xC4	U+00C4	# LATIN CAPITAL LETTER A WITH DIAERESIS
+#0xC5	U+00C5	# LATIN CAPITAL LETTER A WITH RING ABOVE
+#0xC6	U+00C6	# LATIN CAPITAL LETTER AE
+
+0xC7	U+012E	# LATIN CAPITAL LETTER I WITH OGONEK
+0xC8	U+010C	# LATIN CAPITAL LETTER C WITH CARON
+0xC9	U+00C9	# LATIN CAPITAL LETTER E WITH ACUTE
+0xCA	U+0118	# LATIN CAPITAL LETTER E WITH OGONEK
+0xCB	U+00CB	# LATIN CAPITAL LETTER E WITH DIAERESIS
+0xCC	U+0116	# LATIN CAPITAL LETTER E WITH DOT ABOVE
+
+0xCD-0xD0	idem
+
+#0xCD	U+00CD	# LATIN CAPITAL LETTER I WITH ACUTE
+#0xCE	U+00CE	# LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+#0xCF	U+00CF	# LATIN CAPITAL LETTER I WITH DIAERESIS
+#0xD0	U+00D0	# LATIN CAPITAL LETTER ETH
+
+0xD1	U+0145	# LATIN CAPITAL LETTER N WITH CEDILLA
+0xD2	U+014C	# LATIN CAPITAL LETTER O WITH MACRON
+
+0xD3-0xD6	idem
+
+#0xD3	U+00D3	# LATIN CAPITAL LETTER O WITH ACUTE
+#0xD4	U+00D4	# LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+#0xD5	U+00D5	# LATIN CAPITAL LETTER O WITH TILDE
+#0xD6	U+00D6	# LATIN CAPITAL LETTER O WITH DIAERESIS
+
+0xD7	U+0168	# LATIN CAPITAL LETTER U WITH TILDE
+0xD8	U+00D8	# LATIN CAPITAL LETTER O WITH STROKE
+0xD9	U+0172	# LATIN CAPITAL LETTER U WITH OGONEK
+
+0xDA-0xDE	idem
+
+#0xDA	U+00DA	# LATIN CAPITAL LETTER U WITH ACUTE
+#0xDB	U+00DB	# LATIN CAPITAL LETTER U WITH CIRCUMFLEX
+#0xDC	U+00DC	# LATIN CAPITAL LETTER U WITH DIAERESIS
+#0xDD	U+00DD	# LATIN CAPITAL LETTER Y WITH ACUTE
+#0xDE	U+00DE	# LATIN CAPITAL LETTER THORN
+
+0xDf	U+00DF	# LATIN SMALL LETTER SHARP S
+0xE0	U+0101	# LATIN SMALL LETTER A WITH MACRON
+
+0xE1-0xE6	idem
+
+#0xE1	U+00E1	# LATIN SMALL LETTER A WITH ACUTE
+#0xE2	U+00E2	# LATIN SMALL LETTER A WITH CIRCUMFLEX
+#0xE3	U+00E3	# LATIN SMALL LETTER A WITH TILDE
+#0xE4	U+00E4	# LATIN SMALL LETTER A WITH DIAERESIS
+#0xE5	U+00E5	# LATIN SMALL LETTER A WITH RING ABOVE
+#0xE6	U+00E6	# LATIN SMALL LETTER AE
+
+0xE7	U+012F	# LATIN SMALL LETTER I WITH OGONEK
+0xE8	U+010D	# LATIN SMALL LETTER C WITH CARON
+0xE9	U+00E9	# LATIN SMALL LETTER E WITH ACUTE
+0xEA	U+0119	# LATIN SMALL LETTER E WITH OGONEK
+0xEB	U+00EB	# LATIN SMALL LETTER E WITH DIAERESIS
+0xEC	U+0117	# LATIN SMALL LETTER E WITH DOT ABOVE
+
+0xED-0xF0	idem
+
+#0xED	U+00ED	# LATIN SMALL LETTER I WITH ACUTE
+#0xEE	U+00EE	# LATIN SMALL LETTER I WITH CIRCUMFLEX
+#0xEF	U+00EF	# LATIN SMALL LETTER I WITH DIAERESIS
+#0xF0	U+00f0	# LATIN SMALL LETTER ETH
+
+0xF1	U+0146	# LATIN SMALL LETTER N WITH CEDILLA
+0xF2	U+014D	# LATIN SMALL LETTER O WITH MACRON
+
+0xF3-0xF6	idem
+
+#0xF3	U+00F3	# LATIN SMALL LETTER O WITH ACUTE
+#0xF4	U+00F4	# LATIN SMALL LETTER O WITH CIRCUMFLEX
+#0xF5	U+00F5	# LATIN SMALL LETTER O WITH TILDE
+#0xF6	U+00F6	# LATIN SMALL LETTER O WITH DIAERESIS
+
+0xF7	U+0169	# LATIN SMALL LETTER U WITH TILDE
+0xF8	U+00F8	# LATIN SMALL LETTER O WITH STROKE
+0xF9	U+0173	# LATIN SMALL LETTER U WITH OGONEK
+
+0xFA-0xFE	idem
+
+#0xFA	U+00FA	# LATIN SMALL LETTER U WITH ACUTE
+#0xFB	U+00FB	# LATIN SMALL LETTER U WITH CIRCUMFLEX
+#0xFC	U+00FC	# LATIN SMALL LETTER U WITH DIAERESIS
+#0xFD	U+00FD	# LATIN SMALL LETTER Y WITH ACUTE
+#0xFE	U+00FE	# LATIN SMALL LETTER THORN
+
+0xFF	U+0138	# LATIN SMALL LETTER KRA
 
 # TRADE MARK SIGN:
 U+2122:(TM)
diff --git a/src/chrtrans/iso13_uni.tbl b/src/chrtrans/iso13_uni.tbl
index e51ea23e..33e3b8fc 100644
--- a/src/chrtrans/iso13_uni.tbl
+++ b/src/chrtrans/iso13_uni.tbl
@@ -79,7 +79,7 @@ D0
 0xDC	U+00DC	# LATIN CAPITAL LETTER U WITH DIAERESIS
 0xDD	U+017B	# LATIN CAPITAL LETTER Z WITH DOT ABOVE
 0xDE	U+017D	# LATIN CAPITAL LETTER Z WITH CARON
-0xDF	U+00DF	# LATIN SMALL LETTER SHARP S
+0xDF	U+00DF	# LATIN SMALL LETTER SHARP S (German)
 0xE0	U+0105	# LATIN SMALL LETTER A WITH OGONEK
 0xE1	U+012F	# LATIN SMALL LETTER I WITH OGONEK
 0xE2	U+0101	# LATIN SMALL LETTER A WITH MACRON
diff --git a/src/chrtrans/iso15_uni.tbl b/src/chrtrans/iso15_uni.tbl
index efb5bf23..398affdc 100644
--- a/src/chrtrans/iso15_uni.tbl
+++ b/src/chrtrans/iso15_uni.tbl
@@ -140,7 +140,7 @@ D0
 0xB5	U+00B5	#	MICRO SIGN
 0xB6	U+00B6	#	PILCROW SIGN
 0xB7	U+00B7	#	MIDDLE DOT
-0xB8	U+017D	#	LATIN SMALL LETTER Z WITH CARON
+0xB8	U+017E	#	LATIN SMALL LETTER Z WITH CARON
 0xB9	U+00B9	#	SUPERSCRIPT ONE
 0xBA	U+00BA	#	MASCULINE ORDINAL INDICATOR
 0xBB	U+00BB	#	RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK