Index: patches/ncurses-5.9-branch_update-1.patch
===================================================================
--- patches/ncurses-5.9-branch_update-1.patch	(revision 351ffeb541ad42800db78d6b14b92ceaeccf7793)
+++ patches/ncurses-5.9-branch_update-1.patch	(revision 351ffeb541ad42800db78d6b14b92ceaeccf7793)
@@ -0,0 +1,9921 @@
+Submitted By: Joe Ciccone <jciccone@gmail.com>
+Date: 2011-04-16
+Initial Package Version: 5.9
+Origin: Upstream
+Upstream Status: From Upstream
+Description: Update NCurses with the periodic fixes posted at
+             ftp://invisible-island.net/ncurses/5.9/
+
+             This patch includes the following fixes:
+
+             ncurses-5.9-20110409.patch.gz
+
+diff -Naur ncurses-5.9.orig/NEWS ncurses-5.9/NEWS
+--- ncurses-5.9.orig/NEWS	2011-04-03 20:02:42.000000000 -0400
++++ ncurses-5.9/NEWS	2011-04-16 13:56:50.767211046 -0400
+@@ -25,7 +25,7 @@
+ -- sale, use or other dealings in this Software without prior written        --
+ -- authorization.                                                            --
+ -------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.1682 2011/04/04 00:02:42 tom Exp $
++-- $Id: NEWS,v 1.1686 2011/04/10 00:05:44 tom Exp $
+ -------------------------------------------------------------------------------
+ 
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -45,6 +45,15 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+ 
++20110409
++	+ fixes to build c++ binding with clang 3.0 (patch by Alexander
++	  Kolesen).
++	+ add check for unctrl.h in test/configure, to work around breakage in
++	  some ncurses packages.
++	+ add "--disable-widec" option to test/configure script.
++	+ add "--with-curses-colr" and "--with-curses-5lib" options to the
++	  test/configure script to address testing with very old machines.
++
+ 20110404 5.9 release for upload to ftp.gnu.org
+ 
+ 20110402
+diff -Naur ncurses-5.9.orig/c++/cursesf.h ncurses-5.9/c++/cursesf.h
+--- ncurses-5.9.orig/c++/cursesf.h	2005-08-13 14:08:24.000000000 -0400
++++ ncurses-5.9/c++/cursesf.h	2011-04-16 13:56:50.767211046 -0400
+@@ -1,6 +1,6 @@
+ // * This makes emacs happy -*-Mode: C++;-*-
+ /****************************************************************************
+- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2005,2011 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -31,7 +31,7 @@
+  *   Author: Juergen Pfeifer, 1997                                          *
+  ****************************************************************************/
+ 
+-// $Id: cursesf.h,v 1.28 2005/08/13 18:08:24 tom Exp $
++// $Id: cursesf.h,v 1.29 2011/04/09 18:07:01 Alexander.Kolesen Exp $
+ 
+ #ifndef NCURSES_CURSESF_H_incl
+ #define NCURSES_CURSESF_H_incl 1
+@@ -681,7 +681,7 @@
+ 		   const T* p_UserData = STATIC_CAST(T*)(0),
+ 		   bool with_frame=FALSE,
+ 		   bool autoDelete_Fields=FALSE)
+-    : NCursesForm (Fields, with_frame, autoDelete_Fields) {
++    : NCursesForm (&Fields, with_frame, autoDelete_Fields) {
+       if (form)
+ 	set_user (const_cast<void *>(p_UserData));
+   };
+@@ -694,7 +694,7 @@
+ 		   const T* p_UserData = STATIC_CAST(T*)(0),
+ 		   bool with_frame=FALSE,
+ 		   bool autoDelete_Fields=FALSE)
+-    : NCursesForm (Fields, nlines, ncols, begin_y, begin_x,
++    : NCursesForm (&Fields, nlines, ncols, begin_y, begin_x,
+ 		   with_frame, autoDelete_Fields) {
+       if (form)
+ 	set_user (const_cast<void *>(p_UserData));
+diff -Naur ncurses-5.9.orig/c++/cursesm.h ncurses-5.9/c++/cursesm.h
+--- ncurses-5.9.orig/c++/cursesm.h	2005-08-13 14:10:36.000000000 -0400
++++ ncurses-5.9/c++/cursesm.h	2011-04-16 13:56:50.767211046 -0400
+@@ -1,6 +1,6 @@
+ // * This makes emacs happy -*-Mode: C++;-*-
+ /****************************************************************************
+- * Copyright (c) 1998-2003,2005 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2005,2011 Free Software Foundation, Inc.              *
+  *                                                                          *
+  * Permission is hereby granted, free of charge, to any person obtaining a  *
+  * copy of this software and associated documentation files (the            *
+@@ -31,7 +31,7 @@
+  *   Author: Juergen Pfeifer, 1997                                          *
+  ****************************************************************************/
+ 
+-// $Id: cursesm.h,v 1.25 2005/08/13 18:10:36 tom Exp $
++// $Id: cursesm.h,v 1.26 2011/04/09 18:07:08 Alexander.Kolesen Exp $
+ 
+ #ifndef NCURSES_CURSESM_H_incl
+ #define NCURSES_CURSESM_H_incl 1
+@@ -639,7 +639,7 @@
+ 		   const T* p_UserData = STATIC_CAST(T*)(0),
+ 		   bool with_frame=FALSE,
+ 		   bool autoDelete_Items=FALSE)
+-    : NCursesMenu (Items, with_frame, autoDelete_Items) {
++    : NCursesMenu (&Items, with_frame, autoDelete_Items) {
+       if (menu)
+ 	set_user (const_cast<void *>(p_UserData));
+   };
+@@ -651,7 +651,7 @@
+ 		   int begin_x = 0,
+ 		   const T* p_UserData = STATIC_CAST(T*)(0),
+ 		   bool with_frame=FALSE)
+-    : NCursesMenu (Items, nlines, ncols, begin_y, begin_x, with_frame) {
++    : NCursesMenu (&Items, nlines, ncols, begin_y, begin_x, with_frame) {
+       if (menu)
+ 	set_user (const_cast<void *>(p_UserData));
+   };
+diff -Naur ncurses-5.9.orig/dist.mk ncurses-5.9/dist.mk
+--- ncurses-5.9.orig/dist.mk	2011-04-04 18:42:20.000000000 -0400
++++ ncurses-5.9/dist.mk	2011-04-16 13:56:50.767211046 -0400
+@@ -25,7 +25,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: dist.mk,v 1.810 2011/04/04 22:42:20 tom Exp $
++# $Id: dist.mk,v 1.811 2011/04/09 16:14:30 tom Exp $
+ # Makefile for creating ncurses distributions.
+ #
+ # This only needs to be used directly as a makefile by developers, but
+@@ -37,7 +37,7 @@
+ # These define the major/minor/patch versions of ncurses.
+ NCURSES_MAJOR = 5
+ NCURSES_MINOR = 9
+-NCURSES_PATCH = 20110404
++NCURSES_PATCH = 20110409
+ 
+ # We don't append the patch to the version, since this only applies to releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+diff -Naur ncurses-5.9.orig/include/ncurses_defs ncurses-5.9/include/ncurses_defs
+--- ncurses-5.9.orig/include/ncurses_defs	2011-03-22 05:17:59.000000000 -0400
++++ ncurses-5.9/include/ncurses_defs	2011-04-16 13:56:50.767211046 -0400
+@@ -1,4 +1,4 @@
+-# $Id: ncurses_defs,v 1.46 2011/03/22 09:17:59 tom Exp $
++# $Id: ncurses_defs,v 1.47 2011/04/09 20:40:48 tom Exp $
+ ##############################################################################
+ # Copyright (c) 2000-2010,2011 Free Software Foundation, Inc.                #
+ #                                                                            #
+@@ -153,6 +153,7 @@
+ HAVE_TYPEINFO
+ HAVE_TYPE_ATTR_T
+ HAVE_TYPE_SIGACTION
++HAVE_UNCTRL_H	1
+ HAVE_UNISTD_H
+ HAVE_UNLINK
+ HAVE_USE_DEFAULT_COLORS
+diff -Naur ncurses-5.9.orig/test/aclocal.m4 ncurses-5.9/test/aclocal.m4
+--- ncurses-5.9.orig/test/aclocal.m4	2011-03-24 04:28:07.000000000 -0400
++++ ncurses-5.9/test/aclocal.m4	2011-04-16 13:56:50.767211046 -0400
+@@ -26,7 +26,7 @@
+ dnl authorization.                                                           *
+ dnl***************************************************************************
+ dnl
+-dnl $Id: aclocal.m4,v 1.50 2011/03/24 08:28:07 tom Exp $
++dnl $Id: aclocal.m4,v 1.52 2011/04/09 22:22:11 tom Exp $
+ dnl
+ dnl Author: Thomas E. Dickey
+ dnl
+@@ -533,7 +533,7 @@
+ CF_CURSES_LIBS
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_CURSES_CPPFLAGS version: 10 updated: 2009/01/06 19:34:11
++dnl CF_CURSES_CPPFLAGS version: 11 updated: 2011/04/09 14:51:08
+ dnl ------------------
+ dnl Look for the curses headers.
+ AC_DEFUN([CF_CURSES_CPPFLAGS],[
+@@ -542,13 +542,19 @@
+ cf_cv_curses_incdir=no
+ case $host_os in #(vi
+ hpux10.*) #(vi
+-	test -d /usr/include/curses_colr && \
+-	cf_cv_curses_incdir="-I/usr/include/curses_colr"
++	if test "x$cf_cv_screen" = "xcurses_colr"
++	then
++		test -d /usr/include/curses_colr && \
++		cf_cv_curses_incdir="-I/usr/include/curses_colr"
++	fi
+ 	;;
+ sunos3*|sunos4*)
+-	test -d /usr/5lib && \
+-	test -d /usr/5include && \
+-	cf_cv_curses_incdir="-I/usr/5include"
++	if test "x$cf_cv_screen" = "xcurses_5lib"
++	then
++		test -d /usr/5lib && \
++		test -d /usr/5include && \
++		cf_cv_curses_incdir="-I/usr/5include"
++	fi
+ 	;;
+ esac
+ ])
+@@ -558,7 +564,7 @@
+ CF_TERM_HEADER
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_CURSES_FUNCS version: 15 updated: 2010/10/23 15:52:32
++dnl CF_CURSES_FUNCS version: 16 updated: 2011/04/09 18:19:55
+ dnl ---------------
+ dnl Curses-functions are a little complicated, since a lot of them are macros.
+ AC_DEFUN([CF_CURSES_FUNCS],
+@@ -566,6 +572,7 @@
+ AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl
+ AC_REQUIRE([CF_XOPEN_CURSES])
+ AC_REQUIRE([CF_CURSES_TERM_H])
++AC_REQUIRE([CF_CURSES_UNCTRL_H])
+ for cf_func in $1
+ do
+ 	CF_UPPER(cf_tr_func,$cf_func)
+@@ -624,7 +631,7 @@
+ AC_CHECK_HEADERS($cf_cv_ncurses_header)
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_CURSES_LIBS version: 33 updated: 2011/03/06 12:37:18
++dnl CF_CURSES_LIBS version: 34 updated: 2011/04/09 14:51:08
+ 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.
+@@ -644,16 +651,23 @@
+     AC_CHECK_LIB(mytinfo,tgoto,[CF_ADD_LIBS(-lmytinfo)])
+     ;;
+ hpux10.*) #(vi
+-    AC_CHECK_LIB(cur_colr,initscr,[
+-        CF_ADD_LIBS(-lcur_colr)
+-        ac_cv_func_initscr=yes
+-        ],[
+-    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"
+-        ac_cv_func_initscr=yes
+-        ])])
++	# Looking at HPUX 10.20, the Hcurses library is the oldest (1997), cur_colr
++	# next (1998), and xcurses "newer" (2000).  There is no header file for
++	# Hcurses; the subdirectory curses_colr has the headers (curses.h and
++	# term.h) for cur_colr
++	if test "x$cf_cv_screen" = "xcurses_colr"
++	then
++		AC_CHECK_LIB(cur_colr,initscr,[
++			CF_ADD_LIBS(-lcur_colr)
++			ac_cv_func_initscr=yes
++			],[
++		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"
++			ac_cv_func_initscr=yes
++			])])
++	fi
+     ;;
+ linux*)
+ 	case `arch 2>/dev/null` in
+@@ -671,9 +685,12 @@
+ 	esac
+     ;;
+ sunos3*|sunos4*)
+-    if test -d /usr/5lib ; then
+-      CF_ADD_LIBDIR(/usr/5lib)
+-      CF_ADD_LIBS(-lcurses -ltermcap)
++	if test "x$cf_cv_screen" = "xcurses_5lib"
++	then
++		if test -d /usr/5lib ; then
++			CF_ADD_LIBDIR(/usr/5lib)
++			CF_ADD_LIBS(-lcurses -ltermcap)
++		fi
+     fi
+     ac_cv_func_initscr=yes
+     ;;
+@@ -738,7 +755,7 @@
+ 
+ ])dnl
+ dnl ---------------------------------------------------------------------------
+-dnl CF_CURSES_TERM_H version: 8 updated: 2010/10/23 15:54:49
++dnl CF_CURSES_TERM_H version: 9 updated: 2011/04/09 18:19:55
+ dnl ----------------
+ dnl SVr4 curses should have term.h as well (where it puts the definitions of
+ dnl the low-level interface).  This may not be true in old/broken implementations,
+@@ -752,9 +769,17 @@
+ 
+ # If we found <ncurses/curses.h>, look for <ncurses/term.h>, but always look
+ # for <term.h> if we do not find the variant.
+-for cf_header in \
+-	`echo ${cf_cv_ncurses_header:-curses.h} | sed -e 's%/.*%/%'`term.h \
+-	term.h
++
++cf_header_list="term.h ncurses/term.h ncursesw/term.h"
++
++case ${cf_cv_ncurses_header:-curses.h} in #(vi
++*/*)
++	cf_header_item=`echo ${cf_cv_ncurses_header:-curses.h} | sed -e 's%\..*%%' -e 's%/.*%/%'`term.h
++	cf_header_list="$cf_header_item $cf_header_list"
++	;;
++esac
++
++for cf_header in $cf_header_list
+ do
+ 	AC_TRY_COMPILE([
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -799,6 +824,61 @@
+ 	;;
+ esac
+ ])dnl
++dnl ---------------------------------------------------------------------------
++dnl CF_CURSES_UNCTRL_H version: 1 updated: 2011/04/09 18:19:55
++dnl ------------------
++dnl Any X/Open curses implementation must have unctrl.h, but ncurses packages
++dnl may put it in a subdirectory (along with ncurses' other headers, of
++dnl course).  Packages which put the headers in inconsistent locations are
++dnl broken).
++AC_DEFUN([CF_CURSES_UNCTRL_H],
++[
++AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl
++
++AC_CACHE_CHECK(for unctrl.h, cf_cv_unctrl_header,[
++
++# If we found <ncurses/curses.h>, look for <ncurses/unctrl.h>, but always look
++# for <unctrl.h> if we do not find the variant.
++
++cf_header_list="unctrl.h ncurses/unctrl.h ncursesw/unctrl.h"
++
++case ${cf_cv_ncurses_header:-curses.h} in #(vi
++*/*)
++	cf_header_item=`echo ${cf_cv_ncurses_header:-curses.h} | sed -e 's%\..*%%' -e 's%/.*%/%'`unctrl.h
++	cf_header_list="$cf_header_item $cf_header_list"
++	;;
++esac
++
++for cf_header in $cf_header_list
++do
++	AC_TRY_COMPILE([
++#include <${cf_cv_ncurses_header:-curses.h}>
++#include <${cf_header}>],
++	[WINDOW *x],
++	[cf_cv_unctrl_header=$cf_header
++	 break],
++	[cf_cv_unctrl_header=no])
++done
++
++case $cf_cv_unctrl_header in #(vi
++no)
++	AC_MSG_WARN(unctrl.h header not found)
++	;;
++esac
++])
++
++case $cf_cv_unctrl_header in #(vi
++unctrl.h) #(vi
++	AC_DEFINE(HAVE_UNCTRL_H)
++	;;
++ncurses/unctrl.h) #(vi
++	AC_DEFINE(HAVE_NCURSES_UNCTRL_H)
++	;;
++ncursesw/unctrl.h)
++	AC_DEFINE(HAVE_NCURSESW_UNCTRL_H)
++	;;
++esac
++])dnl
+ dnl ---------------------------------------------------------------------------
+ dnl CF_CURSES_WACS_MAP version: 5 updated: 2011/01/15 11:28:59
+ dnl ------------------
+diff -Naur ncurses-5.9.orig/test/configure ncurses-5.9/test/configure
+--- ncurses-5.9.orig/test/configure	2011-03-24 04:29:40.000000000 -0400
++++ ncurses-5.9/test/configure	2011-04-16 13:56:50.779211046 -0400
+@@ -105,42 +105,6 @@
+ : ${ac_max_here_lines=38}
+ 
+ ac_unique_file="ncurses.c"
+-# Factoring default headers for most tests.
+-ac_includes_default="\
+-#include <stdio.h>
+-#if HAVE_SYS_TYPES_H
+-# include <sys/types.h>
+-#endif
+-#if HAVE_SYS_STAT_H
+-# include <sys/stat.h>
+-#endif
+-#if STDC_HEADERS
+-# include <stdlib.h>
+-# include <stddef.h>
+-#else
+-# if HAVE_STDLIB_H
+-#  include <stdlib.h>
+-# endif
+-#endif
+-#if HAVE_STRING_H
+-# if !STDC_HEADERS && HAVE_MEMORY_H
+-#  include <memory.h>
+-# endif
+-# include <string.h>
+-#endif
+-#if HAVE_STRINGS_H
+-# include <strings.h>
+-#endif
+-#if HAVE_INTTYPES_H
+-# include <inttypes.h>
+-#else
+-# if HAVE_STDINT_H
+-#  include <stdint.h>
+-# endif
+-#endif
+-#if HAVE_UNISTD_H
+-# include <unistd.h>
+-#endif"
+ 
+ # Initialize some variables set by options.
+ ac_init_help=
+@@ -687,11 +651,13 @@
+   --with-dbmalloc         test: use Conor Cahill's dbmalloc library
+   --with-valgrind         test: use valgrind
+   --disable-leaks         test: free permanent memory, analyze leaks
++--disable-widec           disable checks for wide-character functions
+   --with-curses-dir=DIR   directory in which (n)curses is installed
+-  --with-5lib             use SunOS sysv-libraries
+   --with-ncursesw         use wide ncurses-libraries (installed)
+   --with-ncurses          use ncurses-libraries (installed)
+   --with-pdcurses         compile/link with pdcurses X11 library
++  --with-curses-colr      compile/link with HPUX 10.x color-curses
++  --with-curses-5lib      compile/link with SunOS 5lib curses
+   --with-Xaw3d            link with Xaw 3d library
+   --with-neXtaw           link with neXT Athena library
+   --with-XawPlus          link with Athena-Plus library
+@@ -891,7 +857,7 @@
+ fi
+ for ac_site_file in $CONFIG_SITE; do
+   if test -r "$ac_site_file"; then
+-    { echo "$as_me:894: loading site script $ac_site_file" >&5
++    { echo "$as_me:860: loading site script $ac_site_file" >&5
+ echo "$as_me: loading site script $ac_site_file" >&6;}
+     cat "$ac_site_file" >&5
+     . "$ac_site_file"
+@@ -902,7 +868,7 @@
+   # Some versions of bash will fail to source /dev/null (special
+   # files actually), so we avoid doing that.
+   if test -f "$cache_file"; then
+-    { echo "$as_me:905: loading cache $cache_file" >&5
++    { echo "$as_me:871: loading cache $cache_file" >&5
+ echo "$as_me: loading cache $cache_file" >&6;}
+     case $cache_file in
+       [\\/]* | ?:[\\/]* ) . $cache_file;;
+@@ -910,7 +876,7 @@
+     esac
+   fi
+ else
+-  { echo "$as_me:913: creating cache $cache_file" >&5
++  { echo "$as_me:879: creating cache $cache_file" >&5
+ echo "$as_me: creating cache $cache_file" >&6;}
+   >$cache_file
+ fi
+@@ -926,21 +892,21 @@
+   eval ac_new_val="\$ac_env_${ac_var}_value"
+   case $ac_old_set,$ac_new_set in
+     set,)
+-      { echo "$as_me:929: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
++      { echo "$as_me:895: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+ echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+       ac_cache_corrupted=: ;;
+     ,set)
+-      { echo "$as_me:933: error: \`$ac_var' was not set in the previous run" >&5
++      { echo "$as_me:899: error: \`$ac_var' was not set in the previous run" >&5
+ echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+       ac_cache_corrupted=: ;;
+     ,);;
+     *)
+       if test "x$ac_old_val" != "x$ac_new_val"; then
+-        { echo "$as_me:939: error: \`$ac_var' has changed since the previous run:" >&5
++        { echo "$as_me:905: error: \`$ac_var' has changed since the previous run:" >&5
+ echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+-        { echo "$as_me:941:   former value:  $ac_old_val" >&5
++        { echo "$as_me:907:   former value:  $ac_old_val" >&5
+ echo "$as_me:   former value:  $ac_old_val" >&2;}
+-        { echo "$as_me:943:   current value: $ac_new_val" >&5
++        { echo "$as_me:909:   current value: $ac_new_val" >&5
+ echo "$as_me:   current value: $ac_new_val" >&2;}
+         ac_cache_corrupted=:
+       fi;;
+@@ -959,9 +925,9 @@
+   fi
+ done
+ if $ac_cache_corrupted; then
+-  { echo "$as_me:962: error: changes in the environment can compromise the build" >&5
++  { echo "$as_me:928: error: changes in the environment can compromise the build" >&5
+ echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+-  { { echo "$as_me:964: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
++  { { echo "$as_me:930: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+ echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -982,10 +948,10 @@
+ echo "#! $SHELL" >conftest.sh
+ echo  "exit 0"   >>conftest.sh
+ chmod +x conftest.sh
+-if { (echo "$as_me:985: PATH=\".;.\"; conftest.sh") >&5
++if { (echo "$as_me:951: PATH=\".;.\"; conftest.sh") >&5
+   (PATH=".;."; conftest.sh) 2>&5
+   ac_status=$?
+-  echo "$as_me:988: \$? = $ac_status" >&5
++  echo "$as_me:954: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+   ac_path_separator=';'
+ else
+@@ -1017,7 +983,7 @@
+   fi
+ done
+ if test -z "$ac_aux_dir"; then
+-  { { echo "$as_me:1020: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
++  { { echo "$as_me:986: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+ echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1027,11 +993,11 @@
+ 
+ # Make sure we can run config.sub.
+ $ac_config_sub sun4 >/dev/null 2>&1 ||
+-  { { echo "$as_me:1030: error: cannot run $ac_config_sub" >&5
++  { { echo "$as_me:996: error: cannot run $ac_config_sub" >&5
+ echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-echo "$as_me:1034: checking build system type" >&5
++echo "$as_me:1000: checking build system type" >&5
+ echo $ECHO_N "checking build system type... $ECHO_C" >&6
+ if test "${ac_cv_build+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1040,16 +1006,16 @@
+ test -z "$ac_cv_build_alias" &&
+   ac_cv_build_alias=`$ac_config_guess`
+ test -z "$ac_cv_build_alias" &&
+-  { { echo "$as_me:1043: error: cannot guess build type; you must specify one" >&5
++  { { echo "$as_me:1009: error: cannot guess build type; you must specify one" >&5
+ echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+    { (exit 1); exit 1; }; }
+ ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
+-  { { echo "$as_me:1047: error: $ac_config_sub $ac_cv_build_alias failed." >&5
++  { { echo "$as_me:1013: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+ echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:1052: result: $ac_cv_build" >&5
++echo "$as_me:1018: result: $ac_cv_build" >&5
+ echo "${ECHO_T}$ac_cv_build" >&6
+ build=$ac_cv_build
+ build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+@@ -1057,7 +1023,7 @@
+ build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ 
+ if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then
+-	echo "$as_me:1060: checking host system type" >&5
++	echo "$as_me:1026: checking host system type" >&5
+ echo $ECHO_N "checking host system type... $ECHO_C" >&6
+ if test "${ac_cv_host+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1066,12 +1032,12 @@
+ test -z "$ac_cv_host_alias" &&
+   ac_cv_host_alias=$ac_cv_build_alias
+ ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
+-  { { echo "$as_me:1069: error: $ac_config_sub $ac_cv_host_alias failed" >&5
++  { { echo "$as_me:1035: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+ echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:1074: result: $ac_cv_host" >&5
++echo "$as_me:1040: result: $ac_cv_host" >&5
+ echo "${ECHO_T}$ac_cv_host" >&6
+ host=$ac_cv_host
+ host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+@@ -1096,13 +1062,13 @@
+ fi
+ 
+ test -z "$system_name" && system_name="$cf_cv_system_name"
+-test -n "$cf_cv_system_name" && echo "$as_me:1099: result: Configuring for $cf_cv_system_name" >&5
++test -n "$cf_cv_system_name" && echo "$as_me:1065: result: Configuring for $cf_cv_system_name" >&5
+ echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6
+ 
+ if test ".$system_name" != ".$cf_cv_system_name" ; then
+-	echo "$as_me:1103: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
++	echo "$as_me:1069: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
+ echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6
+-	{ { echo "$as_me:1105: error: \"Please remove config.cache and try again.\"" >&5
++	{ { echo "$as_me:1071: error: \"Please remove config.cache and try again.\"" >&5
+ echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -1120,7 +1086,7 @@
+ program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
+ rm conftest.sed
+ 
+-echo "$as_me:1123: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "$as_me:1089: 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
+@@ -1140,11 +1106,11 @@
+ rm -f conftest.make
+ fi
+ if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+-  echo "$as_me:1143: result: yes" >&5
++  echo "$as_me:1109: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+   SET_MAKE=
+ else
+-  echo "$as_me:1147: result: no" >&5
++  echo "$as_me:1113: result: no" >&5
+ echo "${ECHO_T}no" >&6
+   SET_MAKE="MAKE=${MAKE-make}"
+ fi
+@@ -1158,7 +1124,7 @@
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}gcc; ac_word=$2
+-echo "$as_me:1161: checking for $ac_word" >&5
++echo "$as_me:1127: 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
+@@ -1173,7 +1139,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CC="${ac_tool_prefix}gcc"
+-echo "$as_me:1176: found $ac_dir/$ac_word" >&5
++echo "$as_me:1142: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1181,10 +1147,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:1184: result: $CC" >&5
++  echo "$as_me:1150: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:1187: result: no" >&5
++  echo "$as_me:1153: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1193,7 +1159,7 @@
+   ac_ct_CC=$CC
+   # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+-echo "$as_me:1196: checking for $ac_word" >&5
++echo "$as_me:1162: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1208,7 +1174,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_CC="gcc"
+-echo "$as_me:1211: found $ac_dir/$ac_word" >&5
++echo "$as_me:1177: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1216,10 +1182,10 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:1219: result: $ac_ct_CC" >&5
++  echo "$as_me:1185: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+-  echo "$as_me:1222: result: no" >&5
++  echo "$as_me:1188: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1232,7 +1198,7 @@
+   if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}cc; ac_word=$2
+-echo "$as_me:1235: checking for $ac_word" >&5
++echo "$as_me:1201: 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
+@@ -1247,7 +1213,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CC="${ac_tool_prefix}cc"
+-echo "$as_me:1250: found $ac_dir/$ac_word" >&5
++echo "$as_me:1216: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1255,10 +1221,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:1258: result: $CC" >&5
++  echo "$as_me:1224: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:1261: result: no" >&5
++  echo "$as_me:1227: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1267,7 +1233,7 @@
+   ac_ct_CC=$CC
+   # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+-echo "$as_me:1270: checking for $ac_word" >&5
++echo "$as_me:1236: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1282,7 +1248,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_CC="cc"
+-echo "$as_me:1285: found $ac_dir/$ac_word" >&5
++echo "$as_me:1251: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1290,10 +1256,10 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:1293: result: $ac_ct_CC" >&5
++  echo "$as_me:1259: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+-  echo "$as_me:1296: result: no" >&5
++  echo "$as_me:1262: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1306,7 +1272,7 @@
+ if test -z "$CC"; then
+   # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+-echo "$as_me:1309: checking for $ac_word" >&5
++echo "$as_me:1275: 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
+@@ -1326,7 +1292,7 @@
+   continue
+ fi
+ ac_cv_prog_CC="cc"
+-echo "$as_me:1329: found $ac_dir/$ac_word" >&5
++echo "$as_me:1295: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1348,10 +1314,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:1351: result: $CC" >&5
++  echo "$as_me:1317: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:1354: result: no" >&5
++  echo "$as_me:1320: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1362,7 +1328,7 @@
+   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:1365: checking for $ac_word" >&5
++echo "$as_me:1331: 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
+@@ -1377,7 +1343,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+-echo "$as_me:1380: found $ac_dir/$ac_word" >&5
++echo "$as_me:1346: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1385,10 +1351,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:1388: result: $CC" >&5
++  echo "$as_me:1354: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:1391: result: no" >&5
++  echo "$as_me:1357: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1401,7 +1367,7 @@
+ 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:1404: checking for $ac_word" >&5
++echo "$as_me:1370: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1416,7 +1382,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_CC="$ac_prog"
+-echo "$as_me:1419: found $ac_dir/$ac_word" >&5
++echo "$as_me:1385: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -1424,10 +1390,10 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:1427: result: $ac_ct_CC" >&5
++  echo "$as_me:1393: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+-  echo "$as_me:1430: result: no" >&5
++  echo "$as_me:1396: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1439,32 +1405,32 @@
+ 
+ fi
+ 
+-test -z "$CC" && { { echo "$as_me:1442: error: no acceptable cc found in \$PATH" >&5
++test -z "$CC" && { { echo "$as_me:1408: error: no acceptable cc found in \$PATH" >&5
+ echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ # Provide some information about the compiler.
+-echo "$as_me:1447:" \
++echo "$as_me:1413:" \
+      "checking for C compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo $2`
+-{ (eval echo "$as_me:1450: \"$ac_compiler --version </dev/null >&5\"") >&5
++{ (eval echo "$as_me:1416: \"$ac_compiler --version </dev/null >&5\"") >&5
+   (eval $ac_compiler --version </dev/null >&5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1453: \$? = $ac_status" >&5
++  echo "$as_me:1419: \$? = $ac_status" >&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:1455: \"$ac_compiler -v </dev/null >&5\"") >&5
++{ (eval echo "$as_me:1421: \"$ac_compiler -v </dev/null >&5\"") >&5
+   (eval $ac_compiler -v </dev/null >&5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1458: \$? = $ac_status" >&5
++  echo "$as_me:1424: \$? = $ac_status" >&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:1460: \"$ac_compiler -V </dev/null >&5\"") >&5
++{ (eval echo "$as_me:1426: \"$ac_compiler -V </dev/null >&5\"") >&5
+   (eval $ac_compiler -V </dev/null >&5) 2>&5
+   ac_status=$?
+-  echo "$as_me:1463: \$? = $ac_status" >&5
++  echo "$as_me:1429: \$? = $ac_status" >&5
+   (exit $ac_status); }
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 1467 "configure"
++#line 1433 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1480,13 +1446,13 @@
+ # Try to create an executable without -o first, disregard a.out.
+ # It will help us diagnose broken compilers, and finding out an intuition
+ # of exeext.
+-echo "$as_me:1483: checking for C compiler default output" >&5
++echo "$as_me:1449: checking for C compiler default output" >&5
+ echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
+ ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+-if { (eval echo "$as_me:1486: \"$ac_link_default\"") >&5
++if { (eval echo "$as_me:1452: \"$ac_link_default\"") >&5
+   (eval $ac_link_default) 2>&5
+   ac_status=$?
+-  echo "$as_me:1489: \$? = $ac_status" >&5
++  echo "$as_me:1455: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+   # Find the output, starting from the most likely.  This scheme is
+ # not robust to junk in `.', hence go to wildcards (a.*) only as a last
+@@ -1509,34 +1475,34 @@
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-{ { echo "$as_me:1512: error: C compiler cannot create executables" >&5
++{ { echo "$as_me:1478: error: C compiler cannot create executables" >&5
+ echo "$as_me: error: C compiler cannot create executables" >&2;}
+    { (exit 77); exit 77; }; }
+ fi
+ 
+ ac_exeext=$ac_cv_exeext
+-echo "$as_me:1518: result: $ac_file" >&5
++echo "$as_me:1484: result: $ac_file" >&5
+ echo "${ECHO_T}$ac_file" >&6
+ 
+ # Check the compiler produces executables we can run.  If not, either
+ # the compiler is broken, or we cross compile.
+-echo "$as_me:1523: checking whether the C compiler works" >&5
++echo "$as_me:1489: checking whether the C compiler works" >&5
+ echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
+ # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+ # If not cross compiling, check that we can run a simple program.
+ if test "$cross_compiling" != yes; then
+   if { ac_try='./$ac_file'
+-  { (eval echo "$as_me:1529: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1495: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1532: \$? = $ac_status" >&5
++  echo "$as_me:1498: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+     cross_compiling=no
+   else
+     if test "$cross_compiling" = maybe; then
+ 	cross_compiling=yes
+     else
+-	{ { echo "$as_me:1539: error: cannot run C compiled programs.
++	{ { echo "$as_me:1505: error: cannot run C compiled programs.
+ If you meant to cross compile, use \`--host'." >&5
+ echo "$as_me: error: cannot run C compiled programs.
+ If you meant to cross compile, use \`--host'." >&2;}
+@@ -1544,24 +1510,24 @@
+     fi
+   fi
+ fi
+-echo "$as_me:1547: result: yes" >&5
++echo "$as_me:1513: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+ rm -f a.out a.exe conftest$ac_cv_exeext
+ ac_clean_files=$ac_clean_files_save
+ # Check the compiler produces executables we can run.  If not, either
+ # the compiler is broken, or we cross compile.
+-echo "$as_me:1554: checking whether we are cross compiling" >&5
++echo "$as_me:1520: checking whether we are cross compiling" >&5
+ echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+-echo "$as_me:1556: result: $cross_compiling" >&5
++echo "$as_me:1522: result: $cross_compiling" >&5
+ echo "${ECHO_T}$cross_compiling" >&6
+ 
+-echo "$as_me:1559: checking for executable suffix" >&5
++echo "$as_me:1525: checking for executable suffix" >&5
+ echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
+-if { (eval echo "$as_me:1561: \"$ac_link\"") >&5
++if { (eval echo "$as_me:1527: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:1564: \$? = $ac_status" >&5
++  echo "$as_me:1530: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+   # If both `conftest.exe' and `conftest' are `present' (well, observable)
+ # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+@@ -1577,25 +1543,25 @@
+   esac
+ done
+ else
+-  { { echo "$as_me:1580: error: cannot compute EXEEXT: cannot compile and link" >&5
++  { { echo "$as_me:1546: error: cannot compute EXEEXT: cannot compile and link" >&5
+ echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+ rm -f conftest$ac_cv_exeext
+-echo "$as_me:1586: result: $ac_cv_exeext" >&5
++echo "$as_me:1552: result: $ac_cv_exeext" >&5
+ echo "${ECHO_T}$ac_cv_exeext" >&6
+ 
+ rm -f conftest.$ac_ext
+ EXEEXT=$ac_cv_exeext
+ ac_exeext=$EXEEXT
+-echo "$as_me:1592: checking for object suffix" >&5
++echo "$as_me:1558: checking for object suffix" >&5
+ echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
+ if test "${ac_cv_objext+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 1598 "configure"
++#line 1564 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1607,10 +1573,10 @@
+ }
+ _ACEOF
+ rm -f conftest.o conftest.obj
+-if { (eval echo "$as_me:1610: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1576: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1613: \$? = $ac_status" >&5
++  echo "$as_me:1579: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
+   case $ac_file in
+@@ -1622,24 +1588,24 @@
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-{ { echo "$as_me:1625: error: cannot compute OBJEXT: cannot compile" >&5
++{ { echo "$as_me:1591: error: cannot compute OBJEXT: cannot compile" >&5
+ echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+ rm -f conftest.$ac_cv_objext conftest.$ac_ext
+ fi
+-echo "$as_me:1632: result: $ac_cv_objext" >&5
++echo "$as_me:1598: result: $ac_cv_objext" >&5
+ echo "${ECHO_T}$ac_cv_objext" >&6
+ OBJEXT=$ac_cv_objext
+ ac_objext=$OBJEXT
+-echo "$as_me:1636: checking whether we are using the GNU C compiler" >&5
++echo "$as_me:1602: checking whether we are using the GNU C compiler" >&5
+ echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
+ if test "${ac_cv_c_compiler_gnu+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 1642 "configure"
++#line 1608 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1654,16 +1620,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:1657: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1623: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1660: \$? = $ac_status" >&5
++  echo "$as_me:1626: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:1663: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1629: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1666: \$? = $ac_status" >&5
++  echo "$as_me:1632: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_compiler_gnu=yes
+ else
+@@ -1675,19 +1641,19 @@
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-echo "$as_me:1678: result: $ac_cv_c_compiler_gnu" >&5
++echo "$as_me:1644: result: $ac_cv_c_compiler_gnu" >&5
+ echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
+ GCC=`test $ac_compiler_gnu = yes && echo yes`
+ ac_test_CFLAGS=${CFLAGS+set}
+ ac_save_CFLAGS=$CFLAGS
+ CFLAGS="-g"
+-echo "$as_me:1684: checking whether $CC accepts -g" >&5
++echo "$as_me:1650: checking whether $CC accepts -g" >&5
+ echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
+ if test "${ac_cv_prog_cc_g+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 1690 "configure"
++#line 1656 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1699,16 +1665,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:1702: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1668: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1705: \$? = $ac_status" >&5
++  echo "$as_me:1671: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:1708: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1674: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1711: \$? = $ac_status" >&5
++  echo "$as_me:1677: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_prog_cc_g=yes
+ else
+@@ -1718,7 +1684,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:1721: result: $ac_cv_prog_cc_g" >&5
++echo "$as_me:1687: result: $ac_cv_prog_cc_g" >&5
+ echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+ if test "$ac_test_CFLAGS" = set; then
+   CFLAGS=$ac_save_CFLAGS
+@@ -1745,16 +1711,16 @@
+ #endif
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:1748: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1714: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1751: \$? = $ac_status" >&5
++  echo "$as_me:1717: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:1754: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1720: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1757: \$? = $ac_status" >&5
++  echo "$as_me:1723: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   for ac_declaration in \
+    ''\
+@@ -1766,7 +1732,7 @@
+    'void exit (int);'
+ do
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 1769 "configure"
++#line 1735 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ $ac_declaration
+@@ -1779,16 +1745,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:1782: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1748: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1785: \$? = $ac_status" >&5
++  echo "$as_me:1751: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:1788: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1754: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1791: \$? = $ac_status" >&5
++  echo "$as_me:1757: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -1798,7 +1764,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 1801 "configure"
++#line 1767 "configure"
+ #include "confdefs.h"
+ $ac_declaration
+ int
+@@ -1810,16 +1776,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:1813: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:1779: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:1816: \$? = $ac_status" >&5
++  echo "$as_me:1782: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:1819: \"$ac_try\"") >&5
++  { (eval echo "$as_me:1785: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:1822: \$? = $ac_status" >&5
++  echo "$as_me:1788: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
+ else
+@@ -1853,7 +1819,7 @@
+ 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:1856: checking how to run the C preprocessor" >&5
++echo "$as_me:1822: 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
+@@ -1874,18 +1840,18 @@
+   # 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 1877 "configure"
++#line 1843 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:1882: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:1848: \"$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:1888: \$? = $ac_status" >&5
++  echo "$as_me:1854: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -1908,17 +1874,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 1911 "configure"
++#line 1877 "configure"
+ #include "confdefs.h"
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:1915: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:1881: \"$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:1921: \$? = $ac_status" >&5
++  echo "$as_me:1887: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -1955,7 +1921,7 @@
+ else
+   ac_cv_prog_CPP=$CPP
+ fi
+-echo "$as_me:1958: result: $CPP" >&5
++echo "$as_me:1924: result: $CPP" >&5
+ echo "${ECHO_T}$CPP" >&6
+ ac_preproc_ok=false
+ for ac_c_preproc_warn_flag in '' yes
+@@ -1965,18 +1931,18 @@
+   # 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 1968 "configure"
++#line 1934 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+                      Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:1973: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:1939: \"$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:1979: \$? = $ac_status" >&5
++  echo "$as_me:1945: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -1999,17 +1965,17 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 2002 "configure"
++#line 1968 "configure"
+ #include "confdefs.h"
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:2006: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:1972: \"$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:2012: \$? = $ac_status" >&5
++  echo "$as_me:1978: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -2037,7 +2003,7 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:2040: error: C preprocessor \"$CPP\" fails sanity check" >&5
++  { { echo "$as_me:2006: error: C preprocessor \"$CPP\" fails sanity check" >&5
+ echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -2053,7 +2019,7 @@
+ 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:2056: checking for $ac_word" >&5
++echo "$as_me:2022: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_AWK+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2068,7 +2034,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_AWK="$ac_prog"
+-echo "$as_me:2071: found $ac_dir/$ac_word" >&5
++echo "$as_me:2037: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -2076,10 +2042,10 @@
+ fi
+ AWK=$ac_cv_prog_AWK
+ if test -n "$AWK"; then
+-  echo "$as_me:2079: result: $AWK" >&5
++  echo "$as_me:2045: result: $AWK" >&5
+ echo "${ECHO_T}$AWK" >&6
+ else
+-  echo "$as_me:2082: result: no" >&5
++  echo "$as_me:2048: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -2098,7 +2064,7 @@
+ # 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:2101: checking for a BSD compatible install" >&5
++echo "$as_me:2067: 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
+@@ -2147,7 +2113,7 @@
+     INSTALL=$ac_install_sh
+   fi
+ fi
+-echo "$as_me:2150: result: $INSTALL" >&5
++echo "$as_me:2116: result: $INSTALL" >&5
+ echo "${ECHO_T}$INSTALL" >&6
+ 
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+@@ -2172,7 +2138,7 @@
+ 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:2175: checking for $ac_word" >&5
++echo "$as_me:2141: 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
+@@ -2187,7 +2153,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_LINT="$ac_prog"
+-echo "$as_me:2190: found $ac_dir/$ac_word" >&5
++echo "$as_me:2156: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -2195,17 +2161,17 @@
+ fi
+ LINT=$ac_cv_prog_LINT
+ if test -n "$LINT"; then
+-  echo "$as_me:2198: result: $LINT" >&5
++  echo "$as_me:2164: result: $LINT" >&5
+ echo "${ECHO_T}$LINT" >&6
+ else
+-  echo "$as_me:2201: result: no" >&5
++  echo "$as_me:2167: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+   test -n "$LINT" && break
+ done
+ 
+-echo "$as_me:2208: checking if filesystem supports mixed-case filenames" >&5
++echo "$as_me:2174: 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
+@@ -2232,7 +2198,7 @@
+ fi
+ 
+ fi
+-echo "$as_me:2235: result: $cf_cv_mixedcase" >&5
++echo "$as_me:2201: result: $cf_cv_mixedcase" >&5
+ echo "${ECHO_T}$cf_cv_mixedcase" >&6
+ test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF
+ #define MIXEDCASE_FILENAMES 1
+@@ -2242,7 +2208,7 @@
+ 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:2245: checking for $ac_word" >&5
++echo "$as_me:2211: 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
+@@ -2257,7 +2223,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CTAGS="$ac_prog"
+-echo "$as_me:2260: found $ac_dir/$ac_word" >&5
++echo "$as_me:2226: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -2265,10 +2231,10 @@
+ fi
+ CTAGS=$ac_cv_prog_CTAGS
+ if test -n "$CTAGS"; then
+-  echo "$as_me:2268: result: $CTAGS" >&5
++  echo "$as_me:2234: result: $CTAGS" >&5
+ echo "${ECHO_T}$CTAGS" >&6
+ else
+-  echo "$as_me:2271: result: no" >&5
++  echo "$as_me:2237: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -2279,7 +2245,7 @@
+ 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:2282: checking for $ac_word" >&5
++echo "$as_me:2248: 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
+@@ -2294,7 +2260,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ETAGS="$ac_prog"
+-echo "$as_me:2297: found $ac_dir/$ac_word" >&5
++echo "$as_me:2263: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -2302,10 +2268,10 @@
+ fi
+ ETAGS=$ac_cv_prog_ETAGS
+ if test -n "$ETAGS"; then
+-  echo "$as_me:2305: result: $ETAGS" >&5
++  echo "$as_me:2271: result: $ETAGS" >&5
+ echo "${ECHO_T}$ETAGS" >&6
+ else
+-  echo "$as_me:2308: result: no" >&5
++  echo "$as_me:2274: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -2314,7 +2280,7 @@
+ 
+ # 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:2317: checking for $ac_word" >&5
++echo "$as_me:2283: 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
+@@ -2329,7 +2295,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_MAKE_LOWER_TAGS="yes"
+-echo "$as_me:2332: found $ac_dir/$ac_word" >&5
++echo "$as_me:2298: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -2338,17 +2304,17 @@
+ fi
+ MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
+ if test -n "$MAKE_LOWER_TAGS"; then
+-  echo "$as_me:2341: result: $MAKE_LOWER_TAGS" >&5
++  echo "$as_me:2307: result: $MAKE_LOWER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
+ else
+-  echo "$as_me:2344: result: no" >&5
++  echo "$as_me:2310: 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:2351: checking for $ac_word" >&5
++echo "$as_me:2317: 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
+@@ -2363,7 +2329,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_MAKE_UPPER_TAGS="yes"
+-echo "$as_me:2366: found $ac_dir/$ac_word" >&5
++echo "$as_me:2332: found $ac_dir/$ac_word" >&5
+ break
+ done
+ 
+@@ -2372,10 +2338,10 @@
+ fi
+ MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
+ if test -n "$MAKE_UPPER_TAGS"; then
+-  echo "$as_me:2375: result: $MAKE_UPPER_TAGS" >&5
++  echo "$as_me:2341: result: $MAKE_UPPER_TAGS" >&5
+ echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
+ else
+-  echo "$as_me:2378: result: no" >&5
++  echo "$as_me:2344: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -2395,14 +2361,14 @@
+ 	MAKE_LOWER_TAGS="#"
+ fi
+ 
+-echo "$as_me:2398: checking if -lm needed for math functions" >&5
++echo "$as_me:2364: 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 2405 "configure"
++#line 2371 "configure"
+ #include "confdefs.h"
+ 
+ 	#include <stdio.h>
+@@ -2417,16 +2383,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:2420: \"$ac_link\"") >&5
++if { (eval echo "$as_me:2386: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:2423: \$? = $ac_status" >&5
++  echo "$as_me:2389: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:2426: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2392: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2429: \$? = $ac_status" >&5
++  echo "$as_me:2395: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_need_libm=no
+ else
+@@ -2436,7 +2402,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:2439: result: $cf_cv_need_libm" >&5
++echo "$as_me:2405: result: $cf_cv_need_libm" >&5
+ echo "${ECHO_T}$cf_cv_need_libm" >&6
+ if test "$cf_cv_need_libm" = yes
+ then
+@@ -2471,7 +2437,7 @@
+ cf_cv_screen=curses
+ cf_cv_libtype=
+ 
+-echo "$as_me:2474: checking for ${CC:-cc} option to accept ANSI C" >&5
++echo "$as_me:2440: 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
+@@ -2575,7 +2541,7 @@
+ fi
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 2578 "configure"
++#line 2544 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef CC_HAS_PROTOS
+@@ -2596,16 +2562,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2599: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2565: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2602: \$? = $ac_status" >&5
++  echo "$as_me:2568: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:2605: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2571: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2608: \$? = $ac_status" >&5
++  echo "$as_me:2574: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ansi_cc="$cf_arg"; break
+ else
+@@ -2618,7 +2584,7 @@
+ CPPFLAGS="$cf_save_CPPFLAGS"
+ 
+ fi
+-echo "$as_me:2621: result: $cf_cv_ansi_cc" >&5
++echo "$as_me:2587: result: $cf_cv_ansi_cc" >&5
+ echo "${ECHO_T}$cf_cv_ansi_cc" >&6
+ 
+ if test "$cf_cv_ansi_cc" != "no"; then
+@@ -2711,7 +2677,7 @@
+ fi
+ 
+ if test "$cf_cv_ansi_cc" = "no"; then
+-	{ { echo "$as_me:2714: error: Your compiler does not appear to recognize prototypes.
++	{ { echo "$as_me:2680: 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
+@@ -2742,10 +2708,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:2745: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:2711: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > conftest.$ac_ext <<EOF
+-#line 2748 "${as_me:-configure}"
++#line 2714 "${as_me:-configure}"
+ #include "confdefs.h"
+ #include "conftest.h"
+ #include "conftest.i"
+@@ -2794,12 +2760,12 @@
+ 			;;
+ 		esac
+ 
+-		if { (eval echo "$as_me:2797: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:2763: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2800: \$? = $ac_status" >&5
++  echo "$as_me:2766: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:2802: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:2768: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case $cf_attribute in #(vi
+@@ -2870,14 +2836,14 @@
+ 	;;
+ linux*|gnu*|mint*|k*bsd*-gnu) #(vi
+ 
+-echo "$as_me:2873: checking if we must define _GNU_SOURCE" >&5
++echo "$as_me:2839: 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 2880 "configure"
++#line 2846 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -2892,16 +2858,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2895: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2861: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2898: \$? = $ac_status" >&5
++  echo "$as_me:2864: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:2901: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2867: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2904: \$? = $ac_status" >&5
++  echo "$as_me:2870: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -2910,7 +2876,7 @@
+ cf_save="$CPPFLAGS"
+ 	 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
+ 	 cat >conftest.$ac_ext <<_ACEOF
+-#line 2913 "configure"
++#line 2879 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -2925,16 +2891,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2928: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2894: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:2931: \$? = $ac_status" >&5
++  echo "$as_me:2897: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:2934: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2900: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:2937: \$? = $ac_status" >&5
++  echo "$as_me:2903: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_gnu_source=no
+ else
+@@ -2949,7 +2915,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:2952: result: $cf_cv_gnu_source" >&5
++echo "$as_me:2918: result: $cf_cv_gnu_source" >&5
+ echo "${ECHO_T}$cf_cv_gnu_source" >&6
+ test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
+ 
+@@ -2979,14 +2945,14 @@
+ 	cf_xopen_source="-D__EXTENSIONS__"
+ 	;;
+ *)
+-	echo "$as_me:2982: checking if we should define _XOPEN_SOURCE" >&5
++	echo "$as_me:2948: 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 2989 "configure"
++#line 2955 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -3001,16 +2967,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3004: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:2970: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3007: \$? = $ac_status" >&5
++  echo "$as_me:2973: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:3010: \"$ac_try\"") >&5
++  { (eval echo "$as_me:2976: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3013: \$? = $ac_status" >&5
++  echo "$as_me:2979: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -3019,7 +2985,7 @@
+ cf_save="$CPPFLAGS"
+ 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 	 cat >conftest.$ac_ext <<_ACEOF
+-#line 3022 "configure"
++#line 2988 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -3034,16 +3000,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3037: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3003: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3040: \$? = $ac_status" >&5
++  echo "$as_me:3006: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:3043: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3009: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3046: \$? = $ac_status" >&5
++  echo "$as_me:3012: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xopen_source=no
+ else
+@@ -3058,7 +3024,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:3061: result: $cf_cv_xopen_source" >&5
++echo "$as_me:3027: result: $cf_cv_xopen_source" >&5
+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
+ 	if test "$cf_cv_xopen_source" != no ; then
+ 
+@@ -3165,16 +3131,16 @@
+ 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+ 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
+ 
+-echo "$as_me:3168: checking if we should define _POSIX_C_SOURCE" >&5
++echo "$as_me:3134: 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}:3174: testing if the symbol is already defined go no further ..." 1>&5
++echo "${as_me:-configure}:3140: testing if the symbol is already defined go no further ..." 1>&5
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 3177 "configure"
++#line 3143 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -3189,16 +3155,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3192: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3158: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3195: \$? = $ac_status" >&5
++  echo "$as_me:3161: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:3198: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3164: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3201: \$? = $ac_status" >&5
++  echo "$as_me:3167: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_posix_c_source=no
+ else
+@@ -3219,7 +3185,7 @@
+ 	 esac
+ 	 if test "$cf_want_posix_source" = yes ; then
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 3222 "configure"
++#line 3188 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -3234,16 +3200,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3237: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3203: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3240: \$? = $ac_status" >&5
++  echo "$as_me:3206: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:3243: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3209: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3246: \$? = $ac_status" >&5
++  echo "$as_me:3212: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -3254,15 +3220,15 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 	 fi
+ 
+-echo "${as_me:-configure}:3257: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
++echo "${as_me:-configure}:3223: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+ 
+ 	 CFLAGS="$cf_trim_CFLAGS"
+ 	 CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
+ 
+-echo "${as_me:-configure}:3262: testing if the second compile does not leave our definition intact error ..." 1>&5
++echo "${as_me:-configure}:3228: testing if the second compile does not leave our definition intact error ..." 1>&5
+ 
+ 	 cat >conftest.$ac_ext <<_ACEOF
+-#line 3265 "configure"
++#line 3231 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int
+@@ -3277,16 +3243,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3280: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3246: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3283: \$? = $ac_status" >&5
++  echo "$as_me:3249: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:3286: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3252: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3289: \$? = $ac_status" >&5
++  echo "$as_me:3255: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -3302,7 +3268,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:3305: result: $cf_cv_posix_c_source" >&5
++echo "$as_me:3271: 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
+@@ -3474,7 +3440,7 @@
+ 
+ fi
+ 
+-echo "$as_me:3477: checking for $CC option to accept ANSI C" >&5
++echo "$as_me:3443: checking for $CC option to accept ANSI C" >&5
+ echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
+ if test "${ac_cv_prog_cc_stdc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3482,7 +3448,7 @@
+   ac_cv_prog_cc_stdc=no
+ ac_save_CC=$CC
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 3485 "configure"
++#line 3451 "configure"
+ #include "confdefs.h"
+ #include <stdarg.h>
+ #include <stdio.h>
+@@ -3531,16 +3497,16 @@
+ do
+   CC="$ac_save_CC $ac_arg"
+   rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3534: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3500: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3537: \$? = $ac_status" >&5
++  echo "$as_me:3503: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:3540: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3506: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3543: \$? = $ac_status" >&5
++  echo "$as_me:3509: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_prog_cc_stdc=$ac_arg
+ break
+@@ -3557,21 +3523,21 @@
+ 
+ case "x$ac_cv_prog_cc_stdc" in
+   x|xno)
+-    echo "$as_me:3560: result: none needed" >&5
++    echo "$as_me:3526: result: none needed" >&5
+ echo "${ECHO_T}none needed" >&6 ;;
+   *)
+-    echo "$as_me:3563: result: $ac_cv_prog_cc_stdc" >&5
++    echo "$as_me:3529: result: $ac_cv_prog_cc_stdc" >&5
+ echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+     CC="$CC $ac_cv_prog_cc_stdc" ;;
+ esac
+ 
+-echo "$as_me:3568: checking for an ANSI C-conforming const" >&5
++echo "$as_me:3534: checking for an ANSI C-conforming const" >&5
+ echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
+ if test "${ac_cv_c_const+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 3574 "configure"
++#line 3540 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -3629,16 +3595,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3632: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3598: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3635: \$? = $ac_status" >&5
++  echo "$as_me:3601: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:3638: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3604: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3641: \$? = $ac_status" >&5
++  echo "$as_me:3607: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_c_const=yes
+ else
+@@ -3648,7 +3614,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:3651: result: $ac_cv_c_const" >&5
++echo "$as_me:3617: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+ 
+@@ -3658,7 +3624,7 @@
+ 
+ fi
+ 
+-echo "$as_me:3661: checking for signal global datatype" >&5
++echo "$as_me:3627: checking for signal global datatype" >&5
+ echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6
+ if test "${cf_cv_sig_atomic_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3670,7 +3636,7 @@
+ 		"int"
+ 	do
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 3673 "configure"
++#line 3639 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -3693,16 +3659,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3696: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3662: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3699: \$? = $ac_status" >&5
++  echo "$as_me:3665: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:3702: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3668: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3705: \$? = $ac_status" >&5
++  echo "$as_me:3671: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_sig_atomic_t=$cf_type
+ else
+@@ -3716,13 +3682,13 @@
+ 
+ fi
+ 
+-echo "$as_me:3719: result: $cf_cv_sig_atomic_t" >&5
++echo "$as_me:3685: result: $cf_cv_sig_atomic_t" >&5
+ echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6
+ test "$cf_cv_sig_atomic_t" != no && cat >>confdefs.h <<EOF
+ #define SIG_ATOMIC_T $cf_cv_sig_atomic_t
+ EOF
+ 
+-echo "$as_me:3725: checking if you want to see long compiling messages" >&5
++echo "$as_me:3691: 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.
+@@ -3756,22 +3722,22 @@
+     ECHO_CC=''
+ 
+ fi;
+-echo "$as_me:3759: result: $enableval" >&5
++echo "$as_me:3725: result: $enableval" >&5
+ echo "${ECHO_T}$enableval" >&6
+ 
+ GCC_VERSION=none
+ if test "$GCC" = yes ; then
+-	echo "$as_me:3764: checking version of $CC" >&5
++	echo "$as_me:3730: checking version of $CC" >&5
+ echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
+ 	GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
+ 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
+-	echo "$as_me:3768: result: $GCC_VERSION" >&5
++	echo "$as_me:3734: result: $GCC_VERSION" >&5
+ echo "${ECHO_T}$GCC_VERSION" >&6
+ fi
+ 
+ if ( test "$GCC" = yes || test "$GXX" = yes )
+ then
+-echo "$as_me:3774: checking if you want to turn on gcc warnings" >&5
++echo "$as_me:3740: 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.
+@@ -3788,7 +3754,7 @@
+   with_warnings=no
+ 
+ fi;
+-echo "$as_me:3791: result: $with_warnings" >&5
++echo "$as_me:3757: result: $with_warnings" >&5
+ echo "${ECHO_T}$with_warnings" >&6
+ if test "$with_warnings" = "yes"
+ then
+@@ -3811,10 +3777,10 @@
+ EOF
+ if test "$GCC" = yes
+ then
+-	{ echo "$as_me:3814: checking for $CC __attribute__ directives..." >&5
++	{ echo "$as_me:3780: checking for $CC __attribute__ directives..." >&5
+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
+ cat > conftest.$ac_ext <<EOF
+-#line 3817 "${as_me:-configure}"
++#line 3783 "${as_me:-configure}"
+ #include "confdefs.h"
+ #include "conftest.h"
+ #include "conftest.i"
+@@ -3863,12 +3829,12 @@
+ 			;;
+ 		esac
+ 
+-		if { (eval echo "$as_me:3866: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:3832: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3869: \$? = $ac_status" >&5
++  echo "$as_me:3835: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:3871: result: ... $cf_attribute" >&5
++			test -n "$verbose" && echo "$as_me:3837: result: ... $cf_attribute" >&5
+ echo "${ECHO_T}... $cf_attribute" >&6
+ 			cat conftest.h >>confdefs.h
+ 			case $cf_attribute in #(vi
+@@ -3908,12 +3874,12 @@
+ if test "$GCC" = yes ; then
+ 	case $host_os in
+ 	linux*|gnu*)
+-		echo "$as_me:3911: checking if this is really Intel C compiler" >&5
++		echo "$as_me:3877: 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 3916 "configure"
++#line 3882 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -3930,16 +3896,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3933: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:3899: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3936: \$? = $ac_status" >&5
++  echo "$as_me:3902: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:3939: \"$ac_try\"") >&5
++  { (eval echo "$as_me:3905: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:3942: \$? = $ac_status" >&5
++  echo "$as_me:3908: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   INTEL_COMPILER=yes
+ cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
+@@ -3950,14 +3916,14 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 		CFLAGS="$cf_save_CFLAGS"
+-		echo "$as_me:3953: result: $INTEL_COMPILER" >&5
++		echo "$as_me:3919: result: $INTEL_COMPILER" >&5
+ echo "${ECHO_T}$INTEL_COMPILER" >&6
+ 		;;
+ 	esac
+ fi
+ 
+ cat > conftest.$ac_ext <<EOF
+-#line 3960 "${as_me:-configure}"
++#line 3926 "${as_me:-configure}"
+ int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
+ EOF
+ 
+@@ -3974,7 +3940,7 @@
+ # remark #981: operands are evaluated in unspecified order
+ # warning #279: controlling expression is constant
+ 
+-	{ echo "$as_me:3977: checking for $CC warning options..." >&5
++	{ echo "$as_me:3943: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS="-Wall"
+@@ -3990,12 +3956,12 @@
+ 		wd981
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:3993: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:3959: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:3996: \$? = $ac_status" >&5
++  echo "$as_me:3962: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:3998: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:3964: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+ 		fi
+@@ -4004,7 +3970,7 @@
+ 
+ elif test "$GCC" = yes
+ then
+-	{ echo "$as_me:4007: checking for $CC warning options..." >&5
++	{ echo "$as_me:3973: checking for $CC warning options..." >&5
+ echo "$as_me: checking for $CC warning options..." >&6;}
+ 	cf_save_CFLAGS="$CFLAGS"
+ 	EXTRA_CFLAGS=
+@@ -4024,12 +3990,12 @@
+ 		Wundef $cf_warn_CONST
+ 	do
+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+-		if { (eval echo "$as_me:4027: \"$ac_compile\"") >&5
++		if { (eval echo "$as_me:3993: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4030: \$? = $ac_status" >&5
++  echo "$as_me:3996: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-			test -n "$verbose" && echo "$as_me:4032: result: ... -$cf_opt" >&5
++			test -n "$verbose" && echo "$as_me:3998: result: ... -$cf_opt" >&5
+ echo "${ECHO_T}... -$cf_opt" >&6
+ 			case $cf_opt in #(vi
+ 			Wcast-qual) #(vi
+@@ -4040,7 +4006,7 @@
+ 				[34].*)
+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+ 
+-echo "${as_me:-configure}:4043: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
++echo "${as_me:-configure}:4009: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+ 
+ 					continue;;
+ 				esac
+@@ -4056,7 +4022,7 @@
+ fi
+ fi
+ 
+-echo "$as_me:4059: checking if you want to use dmalloc for testing" >&5
++echo "$as_me:4025: 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.
+@@ -4072,7 +4038,7 @@
+ else
+   with_dmalloc=
+ fi;
+-echo "$as_me:4075: result: ${with_dmalloc:-no}" >&5
++echo "$as_me:4041: result: ${with_dmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
+ 
+ case .$with_cflags in #(vi
+@@ -4166,23 +4132,23 @@
+ esac
+ 
+ if test "$with_dmalloc" = yes ; then
+-	echo "$as_me:4169: checking for dmalloc.h" >&5
++	echo "$as_me:4135: 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 4175 "configure"
++#line 4141 "configure"
+ #include "confdefs.h"
+ #include <dmalloc.h>
+ _ACEOF
+-if { (eval echo "$as_me:4179: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:4145: \"$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:4185: \$? = $ac_status" >&5
++  echo "$as_me:4151: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -4201,11 +4167,11 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:4204: result: $ac_cv_header_dmalloc_h" >&5
++echo "$as_me:4170: 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:4208: checking for dmalloc_debug in -ldmalloc" >&5
++echo "$as_me:4174: 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
+@@ -4213,7 +4179,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldmalloc  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 4216 "configure"
++#line 4182 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -4232,16 +4198,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:4235: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4201: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:4238: \$? = $ac_status" >&5
++  echo "$as_me:4204: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:4241: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4207: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4244: \$? = $ac_status" >&5
++  echo "$as_me:4210: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dmalloc_dmalloc_debug=yes
+ else
+@@ -4252,7 +4218,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:4255: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
++echo "$as_me:4221: 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
+@@ -4267,7 +4233,7 @@
+ 
+ fi
+ 
+-echo "$as_me:4270: checking if you want to use dbmalloc for testing" >&5
++echo "$as_me:4236: 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.
+@@ -4283,7 +4249,7 @@
+ else
+   with_dbmalloc=
+ fi;
+-echo "$as_me:4286: result: ${with_dbmalloc:-no}" >&5
++echo "$as_me:4252: result: ${with_dbmalloc:-no}" >&5
+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
+ 
+ case .$with_cflags in #(vi
+@@ -4377,23 +4343,23 @@
+ esac
+ 
+ if test "$with_dbmalloc" = yes ; then
+-	echo "$as_me:4380: checking for dbmalloc.h" >&5
++	echo "$as_me:4346: 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 4386 "configure"
++#line 4352 "configure"
+ #include "confdefs.h"
+ #include <dbmalloc.h>
+ _ACEOF
+-if { (eval echo "$as_me:4390: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:4356: \"$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:4396: \$? = $ac_status" >&5
++  echo "$as_me:4362: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -4412,11 +4378,11 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:4415: result: $ac_cv_header_dbmalloc_h" >&5
++echo "$as_me:4381: 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:4419: checking for debug_malloc in -ldbmalloc" >&5
++echo "$as_me:4385: 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
+@@ -4424,7 +4390,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldbmalloc  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 4427 "configure"
++#line 4393 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -4443,16 +4409,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:4446: \"$ac_link\"") >&5
++if { (eval echo "$as_me:4412: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:4449: \$? = $ac_status" >&5
++  echo "$as_me:4415: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:4452: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4418: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4455: \$? = $ac_status" >&5
++  echo "$as_me:4421: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dbmalloc_debug_malloc=yes
+ else
+@@ -4463,7 +4429,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:4466: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
++echo "$as_me:4432: 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
+@@ -4478,7 +4444,7 @@
+ 
+ fi
+ 
+-echo "$as_me:4481: checking if you want to use valgrind for testing" >&5
++echo "$as_me:4447: checking if you want to use valgrind for testing" >&5
+ echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6
+ 
+ # Check whether --with-valgrind or --without-valgrind was given.
+@@ -4494,7 +4460,7 @@
+ else
+   with_valgrind=
+ fi;
+-echo "$as_me:4497: result: ${with_valgrind:-no}" >&5
++echo "$as_me:4463: result: ${with_valgrind:-no}" >&5
+ echo "${ECHO_T}${with_valgrind:-no}" >&6
+ 
+ case .$with_cflags in #(vi
+@@ -4587,7 +4553,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:4590: checking if you want to perform memory-leak testing" >&5
++echo "$as_me:4556: checking if you want to perform memory-leak testing" >&5
+ echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6
+ 
+ # Check whether --enable-leaks or --disable-leaks was given.
+@@ -4597,7 +4563,7 @@
+ else
+   : ${with_no_leaks:=no}
+ fi;
+-echo "$as_me:4600: result: $with_no_leaks" >&5
++echo "$as_me:4566: result: $with_no_leaks" >&5
+ echo "${ECHO_T}$with_no_leaks" >&6
+ 
+ if test "$with_no_leaks" = yes ; then
+@@ -4611,7 +4577,27 @@
+ 
+ fi
+ 
+-echo "$as_me:4614: checking for specific curses-directory" >&5
++echo "$as_me:4580: checking if you want to check for wide-character functions" >&5
++echo $ECHO_N "checking if you want to check for wide-character functions... $ECHO_C" >&6
++
++# Check whether --enable-widec or --disable-widec was given.
++if test "${enable_widec+set}" = set; then
++  enableval="$enable_widec"
++  test "$enableval" != no && enableval=yes
++  if test "$enableval" != "yes" ; then
++    cf_enable_widec=no
++  else
++    cf_enable_widec=yes
++  fi
++else
++  enableval=yes
++  cf_enable_widec=yes
++
++fi;
++echo "$as_me:4597: result: $cf_enable_widec" >&5
++echo "${ECHO_T}$cf_enable_widec" >&6
++
++echo "$as_me:4600: 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.
+@@ -4621,7 +4607,7 @@
+ else
+   cf_cv_curses_dir=no
+ fi;
+-echo "$as_me:4624: result: $cf_cv_curses_dir" >&5
++echo "$as_me:4610: 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" )
+@@ -4652,7 +4638,7 @@
+   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+   ;;
+ *)
+-  { { echo "$as_me:4655: error: expected a pathname, not \"$withval\"" >&5
++  { { echo "$as_me:4641: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+    { (exit 1); exit 1; }; }
+   ;;
+@@ -4685,7 +4671,7 @@
+ 			  cf_save_CPPFLAGS=$CPPFLAGS
+ 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 4688 "configure"
++#line 4674 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -4697,16 +4683,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4700: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4686: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4703: \$? = $ac_status" >&5
++  echo "$as_me:4689: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4706: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4692: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4709: \$? = $ac_status" >&5
++  echo "$as_me:4695: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -4723,7 +4709,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:4726: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:4712: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -4757,7 +4743,7 @@
+       if test "$cf_have_libdir" = no ; then
+         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+ 
+-echo "${as_me:-configure}:4760: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:4746: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+       fi
+@@ -4768,12 +4754,8 @@
+ 	fi
+ fi
+ 
+-# Check whether --with-5lib or --without-5lib was given.
+-if test "${with_5lib+set}" = set; then
+-  withval="$with_5lib"
+-  LIBS="-L/usr/5lib $LIBS"
+-	 CPPFLAGS="$CPPFLAGS -I/usr/5include"
+-fi;
++echo "$as_me:4757: checking for specified curses library type" >&5
++echo $ECHO_N "checking for specified curses library type... $ECHO_C" >&6
+ 
+ # Check whether --with-ncursesw or --without-ncursesw was given.
+ if test "${with_ncursesw+set}" = set; then
+@@ -4791,14 +4773,31 @@
+ if test "${with_pdcurses+set}" = set; then
+   withval="$with_pdcurses"
+   cf_cv_screen=pdcurses
++else
++
++# Check whether --with-curses-colr or --without-curses-colr was given.
++if test "${with_curses_colr+set}" = set; then
++  withval="$with_curses_colr"
++  cf_cv_screen=curses_colr
++else
++
++# Check whether --with-curses-5lib or --without-curses-5lib was given.
++if test "${with_curses_5lib+set}" = set; then
++  withval="$with_curses_5lib"
++  cf_cv_screen=curses_5lib
++fi;
++fi;
+ fi;
+ fi;
+ fi;
+ 
++echo "$as_me:4794: result: $cf_cv_screen" >&5
++echo "${ECHO_T}$cf_cv_screen" >&6
++
+ case $cf_cv_screen in
+-curses)
++curses|curses_*)
+ 
+-echo "$as_me:4801: checking for extra include directories" >&5
++echo "$as_me:4800: 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
+@@ -4807,22 +4806,28 @@
+ cf_cv_curses_incdir=no
+ case $host_os in #(vi
+ hpux10.*) #(vi
+-	test -d /usr/include/curses_colr && \
+-	cf_cv_curses_incdir="-I/usr/include/curses_colr"
++	if test "x$cf_cv_screen" = "xcurses_colr"
++	then
++		test -d /usr/include/curses_colr && \
++		cf_cv_curses_incdir="-I/usr/include/curses_colr"
++	fi
+ 	;;
+ sunos3*|sunos4*)
+-	test -d /usr/5lib && \
+-	test -d /usr/5include && \
+-	cf_cv_curses_incdir="-I/usr/5include"
++	if test "x$cf_cv_screen" = "xcurses_5lib"
++	then
++		test -d /usr/5lib && \
++		test -d /usr/5include && \
++		cf_cv_curses_incdir="-I/usr/5include"
++	fi
+ 	;;
+ esac
+ 
+ fi
+-echo "$as_me:4821: result: $cf_cv_curses_incdir" >&5
++echo "$as_me:4826: result: $cf_cv_curses_incdir" >&5
+ echo "${ECHO_T}$cf_cv_curses_incdir" >&6
+ test "$cf_cv_curses_incdir" != no && CPPFLAGS="$CPPFLAGS $cf_cv_curses_incdir"
+ 
+-echo "$as_me:4825: checking if we have identified curses headers" >&5
++echo "$as_me:4830: 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
+@@ -4834,7 +4839,7 @@
+ 	ncurses.h ncurses/curses.h ncurses/ncurses.h
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 4837 "configure"
++#line 4842 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -4846,16 +4851,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4849: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4854: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4852: \$? = $ac_status" >&5
++  echo "$as_me:4857: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4855: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4860: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4858: \$? = $ac_status" >&5
++  echo "$as_me:4863: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -4866,11 +4871,11 @@
+ done
+ 
+ fi
+-echo "$as_me:4869: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:4874: 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:4873: error: No curses header-files found" >&5
++	{ { echo "$as_me:4878: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -4880,23 +4885,23 @@
+ for ac_header in $cf_cv_ncurses_header
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:4883: checking for $ac_header" >&5
++echo "$as_me:4888: 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 4889 "configure"
++#line 4894 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:4893: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:4898: \"$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:4899: \$? = $ac_status" >&5
++  echo "$as_me:4904: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -4915,7 +4920,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:4918: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:4923: 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
+@@ -4925,7 +4930,7 @@
+ fi
+ done
+ 
+-echo "$as_me:4928: checking for terminfo header" >&5
++echo "$as_me:4933: 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
+@@ -4943,7 +4948,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 4946 "configure"
++#line 4951 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -4958,16 +4963,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4961: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:4966: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:4964: \$? = $ac_status" >&5
++  echo "$as_me:4969: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:4967: \"$ac_try\"") >&5
++  { (eval echo "$as_me:4972: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:4970: \$? = $ac_status" >&5
++  echo "$as_me:4975: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -4983,7 +4988,7 @@
+ done
+ 
+ fi
+-echo "$as_me:4986: result: $cf_cv_term_header" >&5
++echo "$as_me:4991: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -5012,7 +5017,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:5015: checking for ncurses version" >&5
++echo "$as_me:5020: 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
+@@ -5038,10 +5043,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:5041: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:5046: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5044: \$? = $ac_status" >&5
++  echo "$as_me:5049: \$? = $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%".*%%'`
+@@ -5051,7 +5056,7 @@
+ 
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 5054 "configure"
++#line 5059 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -5076,15 +5081,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:5079: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5084: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5082: \$? = $ac_status" >&5
++  echo "$as_me:5087: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:5084: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5089: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5087: \$? = $ac_status" >&5
++  echo "$as_me:5092: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -5098,16 +5103,16 @@
+ 	rm -f $cf_tempfile
+ 
+ fi
+-echo "$as_me:5101: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:5106: 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:5107: checking if we have identified curses libraries" >&5
++echo "$as_me:5112: 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 5110 "configure"
++#line 5115 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -5119,16 +5124,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5122: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5127: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5125: \$? = $ac_status" >&5
++  echo "$as_me:5130: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5128: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5133: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5131: \$? = $ac_status" >&5
++  echo "$as_me:5136: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -5137,13 +5142,13 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-echo "$as_me:5140: result: $cf_result" >&5
++echo "$as_me:5145: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 
+ if test "$cf_result" = no ; then
+ case $host_os in #(vi
+ freebsd*) #(vi
+-    echo "$as_me:5146: checking for tgoto in -lmytinfo" >&5
++    echo "$as_me:5151: 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
+@@ -5151,7 +5156,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 5154 "configure"
++#line 5159 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -5170,16 +5175,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5173: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5178: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5176: \$? = $ac_status" >&5
++  echo "$as_me:5181: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5179: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5184: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5182: \$? = $ac_status" >&5
++  echo "$as_me:5187: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -5190,7 +5195,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:5193: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:5198: result: $ac_cv_lib_mytinfo_tgoto" >&5
+ echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
+ if test $ac_cv_lib_mytinfo_tgoto = yes; then
+   LIBS="-lmytinfo $LIBS"
+@@ -5198,7 +5203,13 @@
+ 
+     ;;
+ hpux10.*) #(vi
+-    echo "$as_me:5201: checking for initscr in -lcur_colr" >&5
++	# Looking at HPUX 10.20, the Hcurses library is the oldest (1997), cur_colr
++	# next (1998), and xcurses "newer" (2000).  There is no header file for
++	# Hcurses; the subdirectory curses_colr has the headers (curses.h and
++	# term.h) for cur_colr
++	if test "x$cf_cv_screen" = "xcurses_colr"
++	then
++		echo "$as_me:5212: 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
+@@ -5206,7 +5217,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lcur_colr  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 5209 "configure"
++#line 5220 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -5225,16 +5236,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5228: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5239: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5231: \$? = $ac_status" >&5
++  echo "$as_me:5242: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5234: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5245: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5237: \$? = $ac_status" >&5
++  echo "$as_me:5248: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_cur_colr_initscr=yes
+ else
+@@ -5245,16 +5256,16 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:5248: result: $ac_cv_lib_cur_colr_initscr" >&5
++echo "$as_me:5259: 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
+ 
+-        LIBS="-lcur_colr $LIBS"
+-        ac_cv_func_initscr=yes
++			LIBS="-lcur_colr $LIBS"
++			ac_cv_func_initscr=yes
+ 
+ else
+ 
+-    echo "$as_me:5257: checking for initscr in -lHcurses" >&5
++		echo "$as_me:5268: 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
+@@ -5262,7 +5273,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lHcurses  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 5265 "configure"
++#line 5276 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -5281,16 +5292,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5284: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5295: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5287: \$? = $ac_status" >&5
++  echo "$as_me:5298: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5290: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5301: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5293: \$? = $ac_status" >&5
++  echo "$as_me:5304: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_Hcurses_initscr=yes
+ else
+@@ -5301,19 +5312,20 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:5304: result: $ac_cv_lib_Hcurses_initscr" >&5
++echo "$as_me:5315: 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
+ 
+-        # HP's header uses __HP_CURSES, but user claims _HP_CURSES.
+-        LIBS="-lHcurses $LIBS"
+-        CPPFLAGS="$CPPFLAGS -D__HP_CURSES -D_HP_CURSES"
+-        ac_cv_func_initscr=yes
++			# HP's header uses __HP_CURSES, but user claims _HP_CURSES.
++			LIBS="-lHcurses $LIBS"
++			CPPFLAGS="$CPPFLAGS -D__HP_CURSES -D_HP_CURSES"
++			ac_cv_func_initscr=yes
+ 
+ fi
+ 
+ fi
+ 
++	fi
+     ;;
+ linux*)
+ 	case `arch 2>/dev/null` in
+@@ -5340,7 +5352,7 @@
+       if test "$cf_have_libdir" = no ; then
+         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+ 
+-echo "${as_me:-configure}:5343: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:5355: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+       fi
+@@ -5369,7 +5381,7 @@
+       if test "$cf_have_libdir" = no ; then
+         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+ 
+-echo "${as_me:-configure}:5372: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:5384: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+       fi
+@@ -5400,7 +5412,7 @@
+       if test "$cf_have_libdir" = no ; then
+         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+ 
+-echo "${as_me:-configure}:5403: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:5415: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+       fi
+@@ -5412,7 +5424,9 @@
+ 	esac
+     ;;
+ sunos3*|sunos4*)
+-    if test -d /usr/5lib ; then
++	if test "x$cf_cv_screen" = "xcurses_5lib"
++	then
++		if test -d /usr/5lib ; then
+ 
+ if test -n "/usr/5lib" ; then
+   for cf_add_libdir in /usr/5lib
+@@ -5433,7 +5447,7 @@
+       if test "$cf_have_libdir" = no ; then
+         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+ 
+-echo "${as_me:-configure}:5436: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:5450: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+       fi
+@@ -5441,7 +5455,8 @@
+   done
+ fi
+ 
+-      LIBS="-lcurses -ltermcap $LIBS"
++			LIBS="-lcurses -ltermcap $LIBS"
++		fi
+     fi
+     ac_cv_func_initscr=yes
+     ;;
+@@ -5461,13 +5476,13 @@
+ 
+     # Check for library containing tgoto.  Do this before curses library
+     # because it may be needed to link the test-case for initscr.
+-    echo "$as_me:5464: checking for tgoto" >&5
++    echo "$as_me:5479: 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 5470 "configure"
++#line 5485 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char tgoto (); below.  */
+@@ -5498,16 +5513,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5501: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5516: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5504: \$? = $ac_status" >&5
++  echo "$as_me:5519: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5507: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5522: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5510: \$? = $ac_status" >&5
++  echo "$as_me:5525: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_tgoto=yes
+ else
+@@ -5517,7 +5532,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:5520: result: $ac_cv_func_tgoto" >&5
++echo "$as_me:5535: 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
+@@ -5526,7 +5541,7 @@
+         for cf_term_lib in $cf_check_list termcap termlib unknown
+         do
+             as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh`
+-echo "$as_me:5529: checking for tgoto in -l$cf_term_lib" >&5
++echo "$as_me:5544: 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
+@@ -5534,7 +5549,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_term_lib  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 5537 "configure"
++#line 5552 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -5553,16 +5568,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5556: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5571: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5559: \$? = $ac_status" >&5
++  echo "$as_me:5574: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5562: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5577: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5565: \$? = $ac_status" >&5
++  echo "$as_me:5580: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -5573,7 +5588,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:5576: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "$as_me:5591: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
+ if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+   break
+@@ -5588,7 +5603,7 @@
+  	for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown
+     do
+         as_ac_Lib=`echo "ac_cv_lib_$cf_curs_lib''_initscr" | $as_tr_sh`
+-echo "$as_me:5591: checking for initscr in -l$cf_curs_lib" >&5
++echo "$as_me:5606: checking for initscr in -l$cf_curs_lib" >&5
+ echo $ECHO_N "checking for initscr in -l$cf_curs_lib... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5596,7 +5611,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$cf_curs_lib  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 5599 "configure"
++#line 5614 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -5615,16 +5630,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5618: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5633: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5621: \$? = $ac_status" >&5
++  echo "$as_me:5636: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5624: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5639: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5627: \$? = $ac_status" >&5
++  echo "$as_me:5642: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -5635,23 +5650,23 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:5638: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "$as_me:5653: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
+ if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+   break
+ fi
+ 
+     done
+-    test $cf_curs_lib = unknown && { { echo "$as_me:5645: error: no curses library found" >&5
++    test $cf_curs_lib = unknown && { { echo "$as_me:5660: error: no curses library found" >&5
+ echo "$as_me: error: no curses library found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+     LIBS="-l$cf_curs_lib $cf_save_LIBS"
+     if test "$cf_term_lib" = unknown ; then
+-        echo "$as_me:5651: checking if we can link with $cf_curs_lib library" >&5
++        echo "$as_me:5666: 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 5654 "configure"
++#line 5669 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -5663,16 +5678,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5666: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5681: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5669: \$? = $ac_status" >&5
++  echo "$as_me:5684: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5672: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5687: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5675: \$? = $ac_status" >&5
++  echo "$as_me:5690: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -5681,18 +5696,18 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-        echo "$as_me:5684: result: $cf_result" >&5
++        echo "$as_me:5699: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+-        test $cf_result = no && { { echo "$as_me:5686: error: Cannot link curses library" >&5
++        test $cf_result = no && { { echo "$as_me:5701: error: Cannot link curses library" >&5
+ echo "$as_me: error: Cannot link curses library" >&2;}
+    { (exit 1); exit 1; }; }
+     elif test "$cf_curs_lib" = "$cf_term_lib" ; then
+         :
+     elif test "$cf_term_lib" != predefined ; then
+-        echo "$as_me:5692: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
++        echo "$as_me:5707: 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 5695 "configure"
++#line 5710 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -5704,16 +5719,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5707: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5722: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5710: \$? = $ac_status" >&5
++  echo "$as_me:5725: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5713: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5728: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5716: \$? = $ac_status" >&5
++  echo "$as_me:5731: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=no
+ else
+@@ -5722,7 +5737,7 @@
+ 
+             LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
+             cat >conftest.$ac_ext <<_ACEOF
+-#line 5725 "configure"
++#line 5740 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -5734,16 +5749,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5737: \"$ac_link\"") >&5
++if { (eval echo "$as_me:5752: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:5740: \$? = $ac_status" >&5
++  echo "$as_me:5755: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:5743: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5758: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5746: \$? = $ac_status" >&5
++  echo "$as_me:5761: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -5755,20 +5770,20 @@
+ 
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-        echo "$as_me:5758: result: $cf_result" >&5
++        echo "$as_me:5773: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+     fi
+ fi
+ fi
+ 
+-echo "$as_me:5764: checking for NetBSD form.h" >&5
++echo "$as_me:5779: checking for NetBSD form.h" >&5
+ echo $ECHO_N "checking for NetBSD form.h... $ECHO_C" >&6
+ if test "${cf_cv_netbsd_form_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 5771 "configure"
++#line 5786 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -5787,16 +5802,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:5790: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5805: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5793: \$? = $ac_status" >&5
++  echo "$as_me:5808: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:5796: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5811: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5799: \$? = $ac_status" >&5
++  echo "$as_me:5814: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_netbsd_form_h=yes
+ 
+@@ -5808,21 +5823,21 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:5811: result: $cf_cv_netbsd_form_h" >&5
++echo "$as_me:5826: result: $cf_cv_netbsd_form_h" >&5
+ echo "${ECHO_T}$cf_cv_netbsd_form_h" >&6
+ 
+ test "$cf_cv_netbsd_form_h" = yes && cat >>confdefs.h <<\EOF
+ #define HAVE_NETBSD_FORM_H 1
+ EOF
+ 
+-echo "$as_me:5818: checking for NetBSD menu.h" >&5
++echo "$as_me:5833: checking for NetBSD menu.h" >&5
+ echo $ECHO_N "checking for NetBSD menu.h... $ECHO_C" >&6
+ if test "${cf_cv_netbsd_menu_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 5825 "configure"
++#line 5840 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -5840,16 +5855,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:5843: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5858: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5846: \$? = $ac_status" >&5
++  echo "$as_me:5861: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:5849: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5864: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5852: \$? = $ac_status" >&5
++  echo "$as_me:5867: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_netbsd_menu_h=yes
+ 
+@@ -5861,7 +5876,7 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:5864: result: $cf_cv_netbsd_menu_h" >&5
++echo "$as_me:5879: result: $cf_cv_netbsd_menu_h" >&5
+ echo "${ECHO_T}$cf_cv_netbsd_menu_h" >&6
+ 
+ test "$cf_cv_netbsd_menu_h" = yes && cat >>confdefs.h <<\EOF
+@@ -5878,7 +5893,7 @@
+ 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:5881: checking for $ac_word" >&5
++echo "$as_me:5896: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_NCURSES_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5895,7 +5910,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_NCURSES_CONFIG="$ac_dir/$ac_word"
+-   echo "$as_me:5898: found $ac_dir/$ac_word" >&5
++   echo "$as_me:5913: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -5906,10 +5921,10 @@
+ NCURSES_CONFIG=$ac_cv_path_NCURSES_CONFIG
+ 
+ if test -n "$NCURSES_CONFIG"; then
+-  echo "$as_me:5909: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:5924: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:5912: result: no" >&5
++  echo "$as_me:5927: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -5924,7 +5939,7 @@
+ 
+ # even with config script, some packages use no-override for curses.h
+ 
+-echo "$as_me:5927: checking if we have identified curses headers" >&5
++echo "$as_me:5942: 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
+@@ -5938,7 +5953,7 @@
+ 	ncurses.h
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 5941 "configure"
++#line 5956 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -5950,16 +5965,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:5953: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:5968: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:5956: \$? = $ac_status" >&5
++  echo "$as_me:5971: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:5959: \"$ac_try\"") >&5
++  { (eval echo "$as_me:5974: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:5962: \$? = $ac_status" >&5
++  echo "$as_me:5977: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -5970,11 +5985,11 @@
+ done
+ 
+ fi
+-echo "$as_me:5973: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:5988: 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:5977: error: No curses header-files found" >&5
++	{ { echo "$as_me:5992: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -5984,23 +5999,23 @@
+ for ac_header in $cf_cv_ncurses_header
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:5987: checking for $ac_header" >&5
++echo "$as_me:6002: 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 5993 "configure"
++#line 6008 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:5997: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:6012: \"$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:6003: \$? = $ac_status" >&5
++  echo "$as_me:6018: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -6019,7 +6034,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:6022: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:6037: 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
+@@ -6072,7 +6087,7 @@
+ 			  cf_save_CPPFLAGS=$CPPFLAGS
+ 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 6075 "configure"
++#line 6090 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -6084,16 +6099,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6087: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6102: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6090: \$? = $ac_status" >&5
++  echo "$as_me:6105: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6093: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6108: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6096: \$? = $ac_status" >&5
++  echo "$as_me:6111: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -6110,7 +6125,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:6113: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:6128: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -6127,7 +6142,7 @@
+ 
+ }
+ 
+-echo "$as_me:6130: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:6145: 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
+@@ -6139,7 +6154,7 @@
+ 	do
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 6142 "configure"
++#line 6157 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -6163,16 +6178,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6166: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6181: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6169: \$? = $ac_status" >&5
++  echo "$as_me:6184: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6172: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6187: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6175: \$? = $ac_status" >&5
++  echo "$as_me:6190: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_h=$cf_header
+ 
+@@ -6187,14 +6202,14 @@
+ 	done
+ 
+ fi
+-echo "$as_me:6190: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:6205: 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:6197: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:6212: 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
+@@ -6334,7 +6349,7 @@
+ 			  cf_save_CPPFLAGS=$CPPFLAGS
+ 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 6337 "configure"
++#line 6352 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -6346,16 +6361,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6349: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6364: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6352: \$? = $ac_status" >&5
++  echo "$as_me:6367: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6355: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6370: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6358: \$? = $ac_status" >&5
++  echo "$as_me:6373: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -6372,7 +6387,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:6375: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:6390: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -6393,7 +6408,7 @@
+ 		do
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 6396 "configure"
++#line 6411 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -6417,16 +6432,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6420: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6435: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6423: \$? = $ac_status" >&5
++  echo "$as_me:6438: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6426: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6441: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6429: \$? = $ac_status" >&5
++  echo "$as_me:6444: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_h2=$cf_header
+ 
+@@ -6447,12 +6462,12 @@
+ 		CPPFLAGS="$cf_save2_CPPFLAGS"
+ 		test "$cf_cv_ncurses_h2" != no && break
+ 	done
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6450: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6465: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:6455: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:6470: 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%/[^/]*$%%'`
+@@ -6485,7 +6500,7 @@
+ 			  cf_save_CPPFLAGS=$CPPFLAGS
+ 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 6488 "configure"
++#line 6503 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -6497,16 +6512,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6500: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6515: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6503: \$? = $ac_status" >&5
++  echo "$as_me:6518: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6506: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6521: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6509: \$? = $ac_status" >&5
++  echo "$as_me:6524: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -6523,7 +6538,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:6526: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:6541: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -6566,7 +6581,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:6569: checking for terminfo header" >&5
++echo "$as_me:6584: 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
+@@ -6584,7 +6599,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6587 "configure"
++#line 6602 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -6599,16 +6614,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6602: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:6617: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:6605: \$? = $ac_status" >&5
++  echo "$as_me:6620: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:6608: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6623: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6611: \$? = $ac_status" >&5
++  echo "$as_me:6626: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -6624,7 +6639,7 @@
+ done
+ 
+ fi
+-echo "$as_me:6627: result: $cf_cv_term_header" >&5
++echo "$as_me:6642: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -6658,7 +6673,7 @@
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:6661: checking for ncurses version" >&5
++echo "$as_me:6676: 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
+@@ -6684,10 +6699,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:6687: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:6702: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6690: \$? = $ac_status" >&5
++  echo "$as_me:6705: \$? = $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%".*%%'`
+@@ -6697,7 +6712,7 @@
+ 
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 6700 "configure"
++#line 6715 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -6722,15 +6737,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:6725: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6740: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6728: \$? = $ac_status" >&5
++  echo "$as_me:6743: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:6730: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6745: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6733: \$? = $ac_status" >&5
++  echo "$as_me:6748: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -6744,7 +6759,7 @@
+ 	rm -f $cf_tempfile
+ 
+ fi
+-echo "$as_me:6747: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:6762: 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
+@@ -6756,7 +6771,7 @@
+ 	# to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:6759: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:6774: 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
+@@ -6764,7 +6779,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6767 "configure"
++#line 6782 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6783,16 +6798,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6786: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6801: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6789: \$? = $ac_status" >&5
++  echo "$as_me:6804: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6792: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6807: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6795: \$? = $ac_status" >&5
++  echo "$as_me:6810: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -6803,10 +6818,10 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6806: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:6821: 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:6809: checking for initscr in -lgpm" >&5
++  echo "$as_me:6824: 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
+@@ -6814,7 +6829,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6817 "configure"
++#line 6832 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6833,16 +6848,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6836: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6851: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6839: \$? = $ac_status" >&5
++  echo "$as_me:6854: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6842: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6857: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6845: \$? = $ac_status" >&5
++  echo "$as_me:6860: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_gpm_initscr=yes
+ else
+@@ -6853,7 +6868,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6856: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:6871: 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"
+@@ -6868,7 +6883,7 @@
+ 	# 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:6871: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:6886: 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
+@@ -6876,7 +6891,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 6879 "configure"
++#line 6894 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -6895,16 +6910,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6898: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6913: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6901: \$? = $ac_status" >&5
++  echo "$as_me:6916: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6904: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6919: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6907: \$? = $ac_status" >&5
++  echo "$as_me:6922: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -6915,7 +6930,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:6918: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:6933: 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"
+@@ -6934,13 +6949,13 @@
+ 
+ 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
+ 	cf_libdir=""
+-	echo "$as_me:6937: checking for initscr" >&5
++	echo "$as_me:6952: 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 6943 "configure"
++#line 6958 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char initscr (); below.  */
+@@ -6971,16 +6986,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6974: \"$ac_link\"") >&5
++if { (eval echo "$as_me:6989: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:6977: \$? = $ac_status" >&5
++  echo "$as_me:6992: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6980: \"$ac_try\"") >&5
++  { (eval echo "$as_me:6995: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:6983: \$? = $ac_status" >&5
++  echo "$as_me:6998: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_initscr=yes
+ else
+@@ -6990,18 +7005,18 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:6993: result: $ac_cv_func_initscr" >&5
++echo "$as_me:7008: 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:7000: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:7015: 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 7004 "configure"
++#line 7019 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7013,25 +7028,25 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7016: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7031: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7019: \$? = $ac_status" >&5
++  echo "$as_me:7034: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:7022: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7037: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7025: \$? = $ac_status" >&5
++  echo "$as_me:7040: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  echo "$as_me:7027: result: yes" >&5
++  echo "$as_me:7042: 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:7034: result: no" >&5
++echo "$as_me:7049: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ cf_search=
+@@ -7121,11 +7136,11 @@
+ 
+ 			for cf_libdir in $cf_search
+ 			do
+-				echo "$as_me:7124: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:7139: 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 7128 "configure"
++#line 7143 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7137,25 +7152,25 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7140: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7155: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7143: \$? = $ac_status" >&5
++  echo "$as_me:7158: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:7146: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7161: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7149: \$? = $ac_status" >&5
++  echo "$as_me:7164: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  echo "$as_me:7151: result: yes" >&5
++  echo "$as_me:7166: 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:7158: result: no" >&5
++echo "$as_me:7173: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 					 LIBS="$cf_save_LIBS"
+ fi
+@@ -7170,7 +7185,7 @@
+ eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
+ 
+ if test $cf_found_library = no ; then
+-	{ { echo "$as_me:7173: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:7188: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -7178,7 +7193,7 @@
+ fi
+ 
+ if test -n "$cf_ncurses_LIBS" ; then
+-	echo "$as_me:7181: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:7196: 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
+@@ -7188,7 +7203,7 @@
+ 		fi
+ 	done
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 7191 "configure"
++#line 7206 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -7200,23 +7215,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7203: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7218: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7206: \$? = $ac_status" >&5
++  echo "$as_me:7221: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:7209: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7224: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7212: \$? = $ac_status" >&5
++  echo "$as_me:7227: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  echo "$as_me:7214: result: yes" >&5
++  echo "$as_me:7229: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-echo "$as_me:7219: result: no" >&5
++echo "$as_me:7234: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		 LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -7235,7 +7250,7 @@
+ ncursesw)
+ 	cf_cv_libtype=w
+ 
+-echo "$as_me:7238: checking for multibyte character support" >&5
++echo "$as_me:7253: 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
+@@ -7243,7 +7258,7 @@
+ 
+ 	cf_save_LIBS="$LIBS"
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 7246 "configure"
++#line 7261 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -7256,16 +7271,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7259: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7274: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7262: \$? = $ac_status" >&5
++  echo "$as_me:7277: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:7265: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7280: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7268: \$? = $ac_status" >&5
++  echo "$as_me:7283: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_utf8_lib=yes
+ else
+@@ -7277,12 +7292,12 @@
+ cf_cv_header_path_utf8=
+ cf_cv_library_path_utf8=
+ 
+-echo "${as_me:-configure}:7280: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:7295: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+ cf_save_LIBS="$LIBS"
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7285 "configure"
++#line 7300 "configure"
+ #include "confdefs.h"
+ 
+ #include <libutf8.h>
+@@ -7295,16 +7310,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7298: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7313: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7301: \$? = $ac_status" >&5
++  echo "$as_me:7316: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:7304: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7319: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7307: \$? = $ac_status" >&5
++  echo "$as_me:7322: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -7318,7 +7333,7 @@
+ LIBS="-lutf8  $cf_save_LIBS"
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7321 "configure"
++#line 7336 "configure"
+ #include "confdefs.h"
+ 
+ #include <libutf8.h>
+@@ -7331,16 +7346,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7334: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7349: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7337: \$? = $ac_status" >&5
++  echo "$as_me:7352: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:7340: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7355: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7343: \$? = $ac_status" >&5
++  echo "$as_me:7358: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_find_linkage_utf8=yes
+@@ -7357,9 +7372,9 @@
+ 
+     test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
+ 
+-echo "${as_me:-configure}:7360: testing find linkage for utf8 library ..." 1>&5
++echo "${as_me:-configure}:7375: testing find linkage for utf8 library ..." 1>&5
+ 
+-echo "${as_me:-configure}:7362: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:7377: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+     cf_save_CPPFLAGS="$CPPFLAGS"
+     cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -7472,11 +7487,11 @@
+       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}:7475: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:7490: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+ 
+         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8"
+         cat >conftest.$ac_ext <<_ACEOF
+-#line 7479 "configure"
++#line 7494 "configure"
+ #include "confdefs.h"
+ 
+ #include <libutf8.h>
+@@ -7489,21 +7504,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7492: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7507: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7495: \$? = $ac_status" >&5
++  echo "$as_me:7510: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7498: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7513: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7501: \$? = $ac_status" >&5
++  echo "$as_me:7516: \$? = $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}:7506: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:7521: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+ 
+             cf_cv_find_linkage_utf8=maybe
+             cf_test_CPPFLAGS="$CPPFLAGS"
+@@ -7521,7 +7536,7 @@
+ 
+     if test "$cf_cv_find_linkage_utf8" = maybe ; then
+ 
+-echo "${as_me:-configure}:7524: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
++echo "${as_me:-configure}:7539: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+ 
+       cf_save_LIBS="$LIBS"
+       cf_save_LDFLAGS="$LDFLAGS"
+@@ -7618,13 +7633,13 @@
+           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}:7621: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:7636: 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 7627 "configure"
++#line 7642 "configure"
+ #include "confdefs.h"
+ 
+ #include <libutf8.h>
+@@ -7637,21 +7652,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7640: \"$ac_link\"") >&5
++if { (eval echo "$as_me:7655: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:7643: \$? = $ac_status" >&5
++  echo "$as_me:7658: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:7646: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7661: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7649: \$? = $ac_status" >&5
++  echo "$as_me:7664: \$? = $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}:7654: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
++echo "${as_me:-configure}:7669: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+ 
+                 cf_cv_find_linkage_utf8=yes
+                 cf_cv_library_file_utf8="-lutf8"
+@@ -7693,7 +7708,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:7696: result: $cf_cv_utf8_lib" >&5
++echo "$as_me:7711: 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
+@@ -7727,7 +7742,7 @@
+ 			  cf_save_CPPFLAGS=$CPPFLAGS
+ 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 7730 "configure"
++#line 7745 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -7739,16 +7754,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7742: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7757: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7745: \$? = $ac_status" >&5
++  echo "$as_me:7760: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7748: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7763: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7751: \$? = $ac_status" >&5
++  echo "$as_me:7766: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -7765,7 +7780,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:7768: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:7783: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -7799,7 +7814,7 @@
+       if test "$cf_have_libdir" = no ; then
+         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+ 
+-echo "${as_me:-configure}:7802: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:7817: testing adding $cf_add_libdir to library-path ..." 1>&5
+ 
+         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+       fi
+@@ -7817,7 +7832,7 @@
+ 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:7820: checking for $ac_word" >&5
++echo "$as_me:7835: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_NCURSES_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7834,7 +7849,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_NCURSES_CONFIG="$ac_dir/$ac_word"
+-   echo "$as_me:7837: found $ac_dir/$ac_word" >&5
++   echo "$as_me:7852: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -7845,10 +7860,10 @@
+ NCURSES_CONFIG=$ac_cv_path_NCURSES_CONFIG
+ 
+ if test -n "$NCURSES_CONFIG"; then
+-  echo "$as_me:7848: result: $NCURSES_CONFIG" >&5
++  echo "$as_me:7863: result: $NCURSES_CONFIG" >&5
+ echo "${ECHO_T}$NCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:7851: result: no" >&5
++  echo "$as_me:7866: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -7863,7 +7878,7 @@
+ 
+ # even with config script, some packages use no-override for curses.h
+ 
+-echo "$as_me:7866: checking if we have identified curses headers" >&5
++echo "$as_me:7881: 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
+@@ -7877,7 +7892,7 @@
+ 	ncurses.h
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7880 "configure"
++#line 7895 "configure"
+ #include "confdefs.h"
+ #include <${cf_header}>
+ int
+@@ -7889,16 +7904,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7892: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:7907: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:7895: \$? = $ac_status" >&5
++  echo "$as_me:7910: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:7898: \"$ac_try\"") >&5
++  { (eval echo "$as_me:7913: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:7901: \$? = $ac_status" >&5
++  echo "$as_me:7916: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_header=$cf_header; break
+ else
+@@ -7909,11 +7924,11 @@
+ done
+ 
+ fi
+-echo "$as_me:7912: result: $cf_cv_ncurses_header" >&5
++echo "$as_me:7927: 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:7916: error: No curses header-files found" >&5
++	{ { echo "$as_me:7931: error: No curses header-files found" >&5
+ echo "$as_me: error: No curses header-files found" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -7923,23 +7938,23 @@
+ for ac_header in $cf_cv_ncurses_header
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:7926: checking for $ac_header" >&5
++echo "$as_me:7941: 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 7932 "configure"
++#line 7947 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:7936: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:7951: \"$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:7942: \$? = $ac_status" >&5
++  echo "$as_me:7957: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -7958,7 +7973,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:7961: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:7976: 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
+@@ -8011,7 +8026,7 @@
+ 			  cf_save_CPPFLAGS=$CPPFLAGS
+ 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 8014 "configure"
++#line 8029 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -8023,16 +8038,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8026: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8041: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8029: \$? = $ac_status" >&5
++  echo "$as_me:8044: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8032: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8047: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8035: \$? = $ac_status" >&5
++  echo "$as_me:8050: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -8049,7 +8064,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:8052: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8067: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -8066,7 +8081,7 @@
+ 
+ }
+ 
+-echo "$as_me:8069: checking for $cf_ncuhdr_root header in include-path" >&5
++echo "$as_me:8084: 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
+@@ -8078,7 +8093,7 @@
+ 	do
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 8081 "configure"
++#line 8096 "configure"
+ #include "confdefs.h"
+ 
+ #define _XOPEN_SOURCE_EXTENDED
+@@ -8110,16 +8125,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8113: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8128: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8116: \$? = $ac_status" >&5
++  echo "$as_me:8131: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8119: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8134: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8122: \$? = $ac_status" >&5
++  echo "$as_me:8137: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_h=$cf_header
+ 
+@@ -8134,14 +8149,14 @@
+ 	done
+ 
+ fi
+-echo "$as_me:8137: result: $cf_cv_ncurses_h" >&5
++echo "$as_me:8152: 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:8144: checking for $cf_ncuhdr_root include-path" >&5
++echo "$as_me:8159: 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
+@@ -8281,7 +8296,7 @@
+ 			  cf_save_CPPFLAGS=$CPPFLAGS
+ 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 8284 "configure"
++#line 8299 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -8293,16 +8308,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8296: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8311: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8299: \$? = $ac_status" >&5
++  echo "$as_me:8314: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8302: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8317: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8305: \$? = $ac_status" >&5
++  echo "$as_me:8320: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -8319,7 +8334,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:8322: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8337: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -8340,7 +8355,7 @@
+ 		do
+ 
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 8343 "configure"
++#line 8358 "configure"
+ #include "confdefs.h"
+ 
+ #include <$cf_header>
+@@ -8364,16 +8379,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8367: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8382: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8370: \$? = $ac_status" >&5
++  echo "$as_me:8385: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8373: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8388: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8376: \$? = $ac_status" >&5
++  echo "$as_me:8391: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_h2=$cf_header
+ 
+@@ -8394,12 +8409,12 @@
+ 		CPPFLAGS="$cf_save2_CPPFLAGS"
+ 		test "$cf_cv_ncurses_h2" != no && break
+ 	done
+-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8397: error: not found" >&5
++	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8412: error: not found" >&5
+ echo "$as_me: error: not found" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:8402: result: $cf_cv_ncurses_h2" >&5
++echo "$as_me:8417: 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%/[^/]*$%%'`
+@@ -8432,7 +8447,7 @@
+ 			  cf_save_CPPFLAGS=$CPPFLAGS
+ 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 			  cat >conftest.$ac_ext <<_ACEOF
+-#line 8435 "configure"
++#line 8450 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -8444,16 +8459,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8447: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8462: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8450: \$? = $ac_status" >&5
++  echo "$as_me:8465: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8453: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8468: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8456: \$? = $ac_status" >&5
++  echo "$as_me:8471: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -8470,7 +8485,7 @@
+ 		if test "$cf_have_incdir" = no ; then
+ 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+ 
+-echo "${as_me:-configure}:8473: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:8488: testing adding $cf_add_incdir to include-path ..." 1>&5
+ 
+ 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ 
+@@ -8513,7 +8528,7 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:8516: checking for terminfo header" >&5
++echo "$as_me:8531: 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
+@@ -8531,7 +8546,7 @@
+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 8534 "configure"
++#line 8549 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -8546,16 +8561,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8549: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:8564: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:8552: \$? = $ac_status" >&5
++  echo "$as_me:8567: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:8555: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8570: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8558: \$? = $ac_status" >&5
++  echo "$as_me:8573: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_term_header="$cf_test"
+@@ -8571,7 +8586,7 @@
+ done
+ 
+ fi
+-echo "$as_me:8574: result: $cf_cv_term_header" >&5
++echo "$as_me:8589: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ # Set definitions to allow ifdef'ing to accommodate subdirectories
+@@ -8605,7 +8620,7 @@
+ #define NCURSES 1
+ EOF
+ 
+-echo "$as_me:8608: checking for ncurses version" >&5
++echo "$as_me:8623: 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
+@@ -8631,10 +8646,10 @@
+ #endif
+ EOF
+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
+-	{ (eval echo "$as_me:8634: \"$cf_try\"") >&5
++	{ (eval echo "$as_me:8649: \"$cf_try\"") >&5
+   (eval $cf_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8637: \$? = $ac_status" >&5
++  echo "$as_me:8652: \$? = $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%".*%%'`
+@@ -8644,7 +8659,7 @@
+ 
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 8647 "configure"
++#line 8662 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -8669,15 +8684,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:8672: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8687: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8675: \$? = $ac_status" >&5
++  echo "$as_me:8690: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:8677: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8692: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8680: \$? = $ac_status" >&5
++  echo "$as_me:8695: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+ 
+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
+@@ -8691,7 +8706,7 @@
+ 	rm -f $cf_tempfile
+ 
+ fi
+-echo "$as_me:8694: result: $cf_cv_ncurses_version" >&5
++echo "$as_me:8709: 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
+@@ -8703,7 +8718,7 @@
+ 	# to link gpm.
+ cf_ncurses_LIBS=""
+ cf_ncurses_SAVE="$LIBS"
+-echo "$as_me:8706: checking for Gpm_Open in -lgpm" >&5
++echo "$as_me:8721: 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
+@@ -8711,7 +8726,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 8714 "configure"
++#line 8729 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8730,16 +8745,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:8733: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8748: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8736: \$? = $ac_status" >&5
++  echo "$as_me:8751: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:8739: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8754: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8742: \$? = $ac_status" >&5
++  echo "$as_me:8757: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_gpm_Gpm_Open=yes
+ else
+@@ -8750,10 +8765,10 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8753: result: $ac_cv_lib_gpm_Gpm_Open" >&5
++echo "$as_me:8768: 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:8756: checking for initscr in -lgpm" >&5
++  echo "$as_me:8771: 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
+@@ -8761,7 +8776,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgpm  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 8764 "configure"
++#line 8779 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8780,16 +8795,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:8783: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8798: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8786: \$? = $ac_status" >&5
++  echo "$as_me:8801: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:8789: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8804: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8792: \$? = $ac_status" >&5
++  echo "$as_me:8807: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_gpm_initscr=yes
+ else
+@@ -8800,7 +8815,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8803: result: $ac_cv_lib_gpm_initscr" >&5
++echo "$as_me:8818: 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"
+@@ -8815,7 +8830,7 @@
+ 	# 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:8818: checking for tgoto in -lmytinfo" >&5
++		echo "$as_me:8833: 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
+@@ -8823,7 +8838,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmytinfo  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 8826 "configure"
++#line 8841 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -8842,16 +8857,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:8845: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8860: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8848: \$? = $ac_status" >&5
++  echo "$as_me:8863: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:8851: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8866: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8854: \$? = $ac_status" >&5
++  echo "$as_me:8869: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_mytinfo_tgoto=yes
+ else
+@@ -8862,7 +8877,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:8865: result: $ac_cv_lib_mytinfo_tgoto" >&5
++echo "$as_me:8880: 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"
+@@ -8881,13 +8896,13 @@
+ 
+ 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
+ 	cf_libdir=""
+-	echo "$as_me:8884: checking for initscr" >&5
++	echo "$as_me:8899: 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 8890 "configure"
++#line 8905 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char initscr (); below.  */
+@@ -8918,16 +8933,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:8921: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8936: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8924: \$? = $ac_status" >&5
++  echo "$as_me:8939: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:8927: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8942: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8930: \$? = $ac_status" >&5
++  echo "$as_me:8945: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_initscr=yes
+ else
+@@ -8937,18 +8952,18 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:8940: result: $ac_cv_func_initscr" >&5
++echo "$as_me:8955: 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:8947: checking for initscr in -l$cf_nculib_root" >&5
++		echo "$as_me:8962: 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 8951 "configure"
++#line 8966 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -8960,25 +8975,25 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:8963: \"$ac_link\"") >&5
++if { (eval echo "$as_me:8978: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:8966: \$? = $ac_status" >&5
++  echo "$as_me:8981: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:8969: \"$ac_try\"") >&5
++  { (eval echo "$as_me:8984: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:8972: \$? = $ac_status" >&5
++  echo "$as_me:8987: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  echo "$as_me:8974: result: yes" >&5
++  echo "$as_me:8989: 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:8981: result: no" >&5
++echo "$as_me:8996: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 
+ cf_search=
+@@ -9068,11 +9083,11 @@
+ 
+ 			for cf_libdir in $cf_search
+ 			do
+-				echo "$as_me:9071: checking for -l$cf_nculib_root in $cf_libdir" >&5
++				echo "$as_me:9086: 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 9075 "configure"
++#line 9090 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9084,25 +9099,25 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9087: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9102: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9090: \$? = $ac_status" >&5
++  echo "$as_me:9105: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9093: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9108: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9096: \$? = $ac_status" >&5
++  echo "$as_me:9111: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  echo "$as_me:9098: result: yes" >&5
++  echo "$as_me:9113: 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:9105: result: no" >&5
++echo "$as_me:9120: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 					 LIBS="$cf_save_LIBS"
+ fi
+@@ -9117,7 +9132,7 @@
+ eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
+ 
+ if test $cf_found_library = no ; then
+-	{ { echo "$as_me:9120: error: Cannot link $cf_nculib_root library" >&5
++	{ { echo "$as_me:9135: error: Cannot link $cf_nculib_root library" >&5
+ echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -9125,7 +9140,7 @@
+ fi
+ 
+ if test -n "$cf_ncurses_LIBS" ; then
+-	echo "$as_me:9128: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
++	echo "$as_me:9143: 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
+@@ -9135,7 +9150,7 @@
+ 		fi
+ 	done
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 9138 "configure"
++#line 9153 "configure"
+ #include "confdefs.h"
+ #include <${cf_cv_ncurses_header:-curses.h}>
+ int
+@@ -9147,23 +9162,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9150: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9165: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9153: \$? = $ac_status" >&5
++  echo "$as_me:9168: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9156: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9171: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9159: \$? = $ac_status" >&5
++  echo "$as_me:9174: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  echo "$as_me:9161: result: yes" >&5
++  echo "$as_me:9176: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-echo "$as_me:9166: result: no" >&5
++echo "$as_me:9181: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 		 LIBS="$cf_ncurses_SAVE"
+ fi
+@@ -9181,7 +9196,7 @@
+ 	;;
+ pdcurses) #(vi
+ 
+-echo "$as_me:9184: checking if you want to use pkg-config" >&5
++echo "$as_me:9199: 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.
+@@ -9191,7 +9206,7 @@
+ else
+   cf_pkg_config=yes
+ fi;
+-echo "$as_me:9194: result: $cf_pkg_config" >&5
++echo "$as_me:9209: result: $cf_pkg_config" >&5
+ echo "${ECHO_T}$cf_pkg_config" >&6
+ 
+ case $cf_pkg_config in #(vi
+@@ -9202,7 +9217,7 @@
+ 	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:9205: checking for $ac_word" >&5
++echo "$as_me:9220: 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
+@@ -9219,7 +9234,7 @@
+   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:9222: found $ac_dir/$ac_word" >&5
++   echo "$as_me:9237: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -9230,10 +9245,10 @@
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+ 
+ if test -n "$PKG_CONFIG"; then
+-  echo "$as_me:9233: result: $PKG_CONFIG" >&5
++  echo "$as_me:9248: result: $PKG_CONFIG" >&5
+ echo "${ECHO_T}$PKG_CONFIG" >&6
+ else
+-  echo "$as_me:9236: result: no" >&5
++  echo "$as_me:9251: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9242,7 +9257,7 @@
+   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:9245: checking for $ac_word" >&5
++echo "$as_me:9260: 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
+@@ -9259,7 +9274,7 @@
+   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:9262: found $ac_dir/$ac_word" >&5
++   echo "$as_me:9277: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -9271,10 +9286,10 @@
+ ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+ 
+ if test -n "$ac_pt_PKG_CONFIG"; then
+-  echo "$as_me:9274: result: $ac_pt_PKG_CONFIG" >&5
++  echo "$as_me:9289: result: $ac_pt_PKG_CONFIG" >&5
+ echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
+ else
+-  echo "$as_me:9277: result: no" >&5
++  echo "$as_me:9292: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -9317,7 +9332,7 @@
+   PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
+   ;;
+ *)
+-  { { echo "$as_me:9320: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
++  { { echo "$as_me:9335: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;}
+    { (exit 1); exit 1; }; }
+   ;;
+@@ -9325,7 +9340,7 @@
+ 
+ fi
+ 
+-echo "$as_me:9328: checking for X" >&5
++echo "$as_me:9343: checking for X" >&5
+ echo $ECHO_N "checking for X... $ECHO_C" >&6
+ 
+ # Check whether --with-x or --without-x was given.
+@@ -9422,17 +9437,17 @@
+   # 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 9425 "configure"
++#line 9440 "configure"
+ #include "confdefs.h"
+ #include <X11/Intrinsic.h>
+ _ACEOF
+-if { (eval echo "$as_me:9429: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:9444: \"$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:9435: \$? = $ac_status" >&5
++  echo "$as_me:9450: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -9465,7 +9480,7 @@
+   ac_save_LIBS=$LIBS
+   LIBS="-lXt $LIBS"
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 9468 "configure"
++#line 9483 "configure"
+ #include "confdefs.h"
+ #include <X11/Intrinsic.h>
+ int
+@@ -9477,16 +9492,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9480: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9495: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9483: \$? = $ac_status" >&5
++  echo "$as_me:9498: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9486: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9501: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9489: \$? = $ac_status" >&5
++  echo "$as_me:9504: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   LIBS=$ac_save_LIBS
+ # We can link X programs with no special library path.
+@@ -9524,7 +9539,7 @@
+ fi # $with_x != no
+ 
+ if test "$have_x" != yes; then
+-  echo "$as_me:9527: result: $have_x" >&5
++  echo "$as_me:9542: result: $have_x" >&5
+ echo "${ECHO_T}$have_x" >&6
+   no_x=yes
+ else
+@@ -9534,7 +9549,7 @@
+   # 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:9537: result: libraries $x_libraries, headers $x_includes" >&5
++  echo "$as_me:9552: result: libraries $x_libraries, headers $x_includes" >&5
+ echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
+ fi
+ 
+@@ -9558,11 +9573,11 @@
+     # others require no space.  Words are not sufficient . . . .
+     case `(uname -sr) 2>/dev/null` in
+     "SunOS 5"*)
+-      echo "$as_me:9561: checking whether -R must be followed by a space" >&5
++      echo "$as_me:9576: 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 9565 "configure"
++#line 9580 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -9574,16 +9589,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9577: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9592: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9580: \$? = $ac_status" >&5
++  echo "$as_me:9595: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9583: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9598: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9586: \$? = $ac_status" >&5
++  echo "$as_me:9601: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_R_nospace=yes
+ else
+@@ -9593,13 +9608,13 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+       if test $ac_R_nospace = yes; then
+-	echo "$as_me:9596: result: no" >&5
++	echo "$as_me:9611: 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 9602 "configure"
++#line 9617 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -9611,16 +9626,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9614: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9629: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9617: \$? = $ac_status" >&5
++  echo "$as_me:9632: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9620: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9635: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9623: \$? = $ac_status" >&5
++  echo "$as_me:9638: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_R_space=yes
+ else
+@@ -9630,11 +9645,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 	if test $ac_R_space = yes; then
+-	  echo "$as_me:9633: result: yes" >&5
++	  echo "$as_me:9648: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	  X_LIBS="$X_LIBS -R $x_libraries"
+ 	else
+-	  echo "$as_me:9637: result: neither works" >&5
++	  echo "$as_me:9652: result: neither works" >&5
+ echo "${ECHO_T}neither works" >&6
+ 	fi
+       fi
+@@ -9654,7 +9669,7 @@
+     # the Alpha needs dnet_stub (dnet does not exist).
+     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 9657 "configure"
++#line 9672 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -9673,22 +9688,22 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9676: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9691: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9679: \$? = $ac_status" >&5
++  echo "$as_me:9694: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9682: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9697: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9685: \$? = $ac_status" >&5
++  echo "$as_me:9700: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-echo "$as_me:9691: checking for dnet_ntoa in -ldnet" >&5
++echo "$as_me:9706: 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
+@@ -9696,7 +9711,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9699 "configure"
++#line 9714 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -9715,16 +9730,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9718: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9733: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9721: \$? = $ac_status" >&5
++  echo "$as_me:9736: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9724: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9739: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9727: \$? = $ac_status" >&5
++  echo "$as_me:9742: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dnet_dnet_ntoa=yes
+ else
+@@ -9735,14 +9750,14 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:9738: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
++echo "$as_me:9753: 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:9745: checking for dnet_ntoa in -ldnet_stub" >&5
++      echo "$as_me:9760: 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
+@@ -9750,7 +9765,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet_stub  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9753 "configure"
++#line 9768 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -9769,16 +9784,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9772: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9787: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9775: \$? = $ac_status" >&5
++  echo "$as_me:9790: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9778: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9793: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9781: \$? = $ac_status" >&5
++  echo "$as_me:9796: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dnet_stub_dnet_ntoa=yes
+ else
+@@ -9789,7 +9804,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:9792: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
++echo "$as_me:9807: 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"
+@@ -9808,13 +9823,13 @@
+     # 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:9811: checking for gethostbyname" >&5
++    echo "$as_me:9826: 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 9817 "configure"
++#line 9832 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char gethostbyname (); below.  */
+@@ -9845,16 +9860,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9848: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9863: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9851: \$? = $ac_status" >&5
++  echo "$as_me:9866: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9854: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9869: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9857: \$? = $ac_status" >&5
++  echo "$as_me:9872: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_gethostbyname=yes
+ else
+@@ -9864,11 +9879,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:9867: result: $ac_cv_func_gethostbyname" >&5
++echo "$as_me:9882: 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:9871: checking for gethostbyname in -lnsl" >&5
++      echo "$as_me:9886: 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
+@@ -9876,7 +9891,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lnsl  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9879 "configure"
++#line 9894 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -9895,16 +9910,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9898: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9913: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9901: \$? = $ac_status" >&5
++  echo "$as_me:9916: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9904: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9919: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9907: \$? = $ac_status" >&5
++  echo "$as_me:9922: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_nsl_gethostbyname=yes
+ else
+@@ -9915,14 +9930,14 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:9918: result: $ac_cv_lib_nsl_gethostbyname" >&5
++echo "$as_me:9933: 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:9925: checking for gethostbyname in -lbsd" >&5
++        echo "$as_me:9940: 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
+@@ -9930,7 +9945,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 9933 "configure"
++#line 9948 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -9949,16 +9964,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9952: \"$ac_link\"") >&5
++if { (eval echo "$as_me:9967: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:9955: \$? = $ac_status" >&5
++  echo "$as_me:9970: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:9958: \"$ac_try\"") >&5
++  { (eval echo "$as_me:9973: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:9961: \$? = $ac_status" >&5
++  echo "$as_me:9976: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_bsd_gethostbyname=yes
+ else
+@@ -9969,7 +9984,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:9972: result: $ac_cv_lib_bsd_gethostbyname" >&5
++echo "$as_me:9987: 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"
+@@ -9985,13 +10000,13 @@
+     # 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:9988: checking for connect" >&5
++    echo "$as_me:10003: 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 9994 "configure"
++#line 10009 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char connect (); below.  */
+@@ -10022,16 +10037,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:10025: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10040: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10028: \$? = $ac_status" >&5
++  echo "$as_me:10043: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:10031: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10046: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10034: \$? = $ac_status" >&5
++  echo "$as_me:10049: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_connect=yes
+ else
+@@ -10041,11 +10056,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:10044: result: $ac_cv_func_connect" >&5
++echo "$as_me:10059: 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:10048: checking for connect in -lsocket" >&5
++      echo "$as_me:10063: 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
+@@ -10053,7 +10068,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10056 "configure"
++#line 10071 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -10072,16 +10087,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:10075: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10090: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10078: \$? = $ac_status" >&5
++  echo "$as_me:10093: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:10081: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10096: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10084: \$? = $ac_status" >&5
++  echo "$as_me:10099: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_socket_connect=yes
+ else
+@@ -10092,7 +10107,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10095: result: $ac_cv_lib_socket_connect" >&5
++echo "$as_me:10110: 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"
+@@ -10101,13 +10116,13 @@
+     fi
+ 
+     # Guillermo Gomez says -lposix is necessary on A/UX.
+-    echo "$as_me:10104: checking for remove" >&5
++    echo "$as_me:10119: 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 10110 "configure"
++#line 10125 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char remove (); below.  */
+@@ -10138,16 +10153,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:10141: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10156: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10144: \$? = $ac_status" >&5
++  echo "$as_me:10159: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:10147: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10162: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10150: \$? = $ac_status" >&5
++  echo "$as_me:10165: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_remove=yes
+ else
+@@ -10157,11 +10172,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:10160: result: $ac_cv_func_remove" >&5
++echo "$as_me:10175: 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:10164: checking for remove in -lposix" >&5
++      echo "$as_me:10179: 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
+@@ -10169,7 +10184,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lposix  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10172 "configure"
++#line 10187 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -10188,16 +10203,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:10191: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10206: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10194: \$? = $ac_status" >&5
++  echo "$as_me:10209: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:10197: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10212: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10200: \$? = $ac_status" >&5
++  echo "$as_me:10215: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_posix_remove=yes
+ else
+@@ -10208,7 +10223,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10211: result: $ac_cv_lib_posix_remove" >&5
++echo "$as_me:10226: 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"
+@@ -10217,13 +10232,13 @@
+     fi
+ 
+     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+-    echo "$as_me:10220: checking for shmat" >&5
++    echo "$as_me:10235: 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 10226 "configure"
++#line 10241 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char shmat (); below.  */
+@@ -10254,16 +10269,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:10257: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10272: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10260: \$? = $ac_status" >&5
++  echo "$as_me:10275: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:10263: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10278: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10266: \$? = $ac_status" >&5
++  echo "$as_me:10281: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_shmat=yes
+ else
+@@ -10273,11 +10288,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:10276: result: $ac_cv_func_shmat" >&5
++echo "$as_me:10291: 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:10280: checking for shmat in -lipc" >&5
++      echo "$as_me:10295: 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
+@@ -10285,7 +10300,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lipc  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10288 "configure"
++#line 10303 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -10304,16 +10319,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:10307: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10322: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10310: \$? = $ac_status" >&5
++  echo "$as_me:10325: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:10313: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10328: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10316: \$? = $ac_status" >&5
++  echo "$as_me:10331: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_ipc_shmat=yes
+ else
+@@ -10324,7 +10339,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10327: result: $ac_cv_lib_ipc_shmat" >&5
++echo "$as_me:10342: 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"
+@@ -10342,7 +10357,7 @@
+   # 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:10345: checking for IceConnectionNumber in -lICE" >&5
++  echo "$as_me:10360: 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
+@@ -10350,7 +10365,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10353 "configure"
++#line 10368 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -10369,16 +10384,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:10372: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10387: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10375: \$? = $ac_status" >&5
++  echo "$as_me:10390: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:10378: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10393: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10381: \$? = $ac_status" >&5
++  echo "$as_me:10396: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_ICE_IceConnectionNumber=yes
+ else
+@@ -10389,7 +10404,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10392: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
++echo "$as_me:10407: 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"
+@@ -10401,7 +10416,7 @@
+ 
+ cf_x_athena=${cf_x_athena:-Xaw}
+ 
+-echo "$as_me:10404: checking if you want to link with Xaw 3d library" >&5
++echo "$as_me:10419: 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=
+ 
+@@ -10412,14 +10427,14 @@
+ fi;
+ if test "$withval" = yes ; then
+ 	cf_x_athena=Xaw3d
+-	echo "$as_me:10415: result: yes" >&5
++	echo "$as_me:10430: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-	echo "$as_me:10418: result: no" >&5
++	echo "$as_me:10433: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:10422: checking if you want to link with neXT Athena library" >&5
++echo "$as_me:10437: 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=
+ 
+@@ -10430,14 +10445,14 @@
+ fi;
+ if test "$withval" = yes ; then
+ 	cf_x_athena=neXtaw
+-	echo "$as_me:10433: result: yes" >&5
++	echo "$as_me:10448: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-	echo "$as_me:10436: result: no" >&5
++	echo "$as_me:10451: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:10440: checking if you want to link with Athena-Plus library" >&5
++echo "$as_me:10455: 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=
+ 
+@@ -10448,10 +10463,10 @@
+ fi;
+ if test "$withval" = yes ; then
+ 	cf_x_athena=XawPlus
+-	echo "$as_me:10451: result: yes" >&5
++	echo "$as_me:10466: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-	echo "$as_me:10454: result: no" >&5
++	echo "$as_me:10469: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -10471,17 +10486,17 @@
+ 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}:10474: testing found package $cf_athena_pkg ..." 1>&5
++echo "${as_me:-configure}:10489: 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}:10480: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:10495: 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}:10484: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:10499: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -10571,14 +10586,14 @@
+ #define $cf_x_athena_LIBS 1
+ EOF
+ 
+-echo "$as_me:10574: checking for usable $cf_x_athena/Xmu package" >&5
++echo "$as_me:10589: 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 10581 "configure"
++#line 10596 "configure"
+ #include "confdefs.h"
+ 
+ #include <X11/Xmu/CharSet.h>
+@@ -10594,16 +10609,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:10597: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10612: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10600: \$? = $ac_status" >&5
++  echo "$as_me:10615: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:10603: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10618: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10606: \$? = $ac_status" >&5
++  echo "$as_me:10621: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xaw_compat=yes
+ else
+@@ -10613,7 +10628,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:10616: result: $cf_cv_xaw_compat" >&5
++echo "$as_me:10631: result: $cf_cv_xaw_compat" >&5
+ echo "${ECHO_T}$cf_cv_xaw_compat" >&6
+ 
+ 			if test "$cf_cv_xaw_compat" = no
+@@ -10625,22 +10640,22 @@
+ 				*)
+ 					test -n "$verbose" && echo "	work around broken package" 1>&6
+ 
+-echo "${as_me:-configure}:10628: testing work around broken package ..." 1>&5
++echo "${as_me:-configure}:10643: 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}:10633: testing found package xmu ..." 1>&5
++echo "${as_me:-configure}:10648: 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}:10639: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:10654: 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}:10643: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:10658: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -10726,12 +10741,12 @@
+ 
+ test -n "$verbose" && echo "	...before $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:10729: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:10744: testing ...before $LIBS ..." 1>&5
+ 
+ LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s,-lXt ,-lXt -lXmu ," -e 's/  / /g'`
+ test -n "$verbose" && echo "	...after  $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:10734: testing ...after  $LIBS ..." 1>&5
++echo "${as_me:-configure}:10749: testing ...after  $LIBS ..." 1>&5
+ 
+ fi
+ 
+@@ -10752,17 +10767,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists Xext; then
+ 	test -n "$verbose" && echo "	found package Xext" 1>&6
+ 
+-echo "${as_me:-configure}:10755: testing found package Xext ..." 1>&5
++echo "${as_me:-configure}:10770: 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}:10761: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:10776: 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}:10765: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:10780: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -10846,7 +10861,7 @@
+ 	:
+ else
+ 
+-	echo "$as_me:10849: checking for XextCreateExtension in -lXext" >&5
++	echo "$as_me:10864: 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
+@@ -10854,7 +10869,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lXext  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10857 "configure"
++#line 10872 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -10873,16 +10888,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:10876: \"$ac_link\"") >&5
++if { (eval echo "$as_me:10891: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:10879: \$? = $ac_status" >&5
++  echo "$as_me:10894: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:10882: \"$ac_try\"") >&5
++  { (eval echo "$as_me:10897: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:10885: \$? = $ac_status" >&5
++  echo "$as_me:10900: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_Xext_XextCreateExtension=yes
+ else
+@@ -10893,7 +10908,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:10896: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
++echo "$as_me:10911: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+ echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6
+ if test $ac_cv_lib_Xext_XextCreateExtension = yes; then
+   LIBS="-lXext $LIBS"
+@@ -10906,17 +10921,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then
+ 	test -n "$verbose" && echo "	found package xt" 1>&6
+ 
+-echo "${as_me:-configure}:10909: testing found package xt ..." 1>&5
++echo "${as_me:-configure}:10924: 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}:10915: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:10930: 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}:10919: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:10934: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -11003,14 +11018,14 @@
+ 		;;
+ 	*)
+ # we have an "xt" package, but it may omit Xt's dependency on X11
+-echo "$as_me:11006: checking for usable X dependency" >&5
++echo "$as_me:11021: 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 11013 "configure"
++#line 11028 "configure"
+ #include "confdefs.h"
+ 
+ #include <X11/Xlib.h>
+@@ -11029,16 +11044,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11032: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11047: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11035: \$? = $ac_status" >&5
++  echo "$as_me:11050: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11038: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11053: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11041: \$? = $ac_status" >&5
++  echo "$as_me:11056: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xt_x11_compat=yes
+ else
+@@ -11048,30 +11063,30 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:11051: result: $cf_cv_xt_x11_compat" >&5
++echo "$as_me:11066: 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}:11057: testing work around broken X11 dependency ..." 1>&5
++echo "${as_me:-configure}:11072: 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}:11064: testing found package x11 ..." 1>&5
++echo "${as_me:-configure}:11079: 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}:11070: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:11085: 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}:11074: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:11089: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -11157,12 +11172,12 @@
+ 
+ test -n "$verbose" && echo "	...before $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:11160: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:11175: 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}:11165: testing ...after  $LIBS ..." 1>&5
++echo "${as_me:-configure}:11180: testing ...after  $LIBS ..." 1>&5
+ 
+ fi
+ 
+@@ -11170,14 +11185,14 @@
+ 		;;
+ 	esac
+ 
+-echo "$as_me:11173: checking for usable X Toolkit package" >&5
++echo "$as_me:11188: 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 11180 "configure"
++#line 11195 "configure"
+ #include "confdefs.h"
+ 
+ #include <X11/Shell.h>
+@@ -11192,16 +11207,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11195: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11210: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11198: \$? = $ac_status" >&5
++  echo "$as_me:11213: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11201: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11216: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11204: \$? = $ac_status" >&5
++  echo "$as_me:11219: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_xt_ice_compat=yes
+ else
+@@ -11211,7 +11226,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:11214: result: $cf_cv_xt_ice_compat" >&5
++echo "$as_me:11229: result: $cf_cv_xt_ice_compat" >&5
+ echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
+ 
+ 	if test "$cf_cv_xt_ice_compat" = no
+@@ -11225,22 +11240,22 @@
+ 			*)
+ 				test -n "$verbose" && echo "	work around broken ICE dependency" 1>&6
+ 
+-echo "${as_me:-configure}:11228: testing work around broken ICE dependency ..." 1>&5
++echo "${as_me:-configure}:11243: 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}:11233: testing found package ice ..." 1>&5
++echo "${as_me:-configure}:11248: 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}:11239: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:11254: 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}:11243: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:11258: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -11325,17 +11340,17 @@
+ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then
+ 	test -n "$verbose" && echo "	found package sm" 1>&6
+ 
+-echo "${as_me:-configure}:11328: testing found package sm ..." 1>&5
++echo "${as_me:-configure}:11343: 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}:11334: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
++echo "${as_me:-configure}:11349: 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}:11338: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
++echo "${as_me:-configure}:11353: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+ 
+ cf_fix_cppflags=no
+ cf_new_cflags=
+@@ -11425,12 +11440,12 @@
+ 
+ test -n "$verbose" && echo "	...before $LIBS" 1>&6
+ 
+-echo "${as_me:-configure}:11428: testing ...before $LIBS ..." 1>&5
++echo "${as_me:-configure}:11443: 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}:11433: testing ...after  $LIBS ..." 1>&5
++echo "${as_me:-configure}:11448: testing ...after  $LIBS ..." 1>&5
+ 
+ fi
+ 
+@@ -11448,7 +11463,7 @@
+ 
+ test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:11451: testing checking additions to CFLAGS ..." 1>&5
++echo "${as_me:-configure}:11466: testing checking additions to CFLAGS ..." 1>&5
+ 
+ cf_check_cflags="$CFLAGS"
+ cf_check_cppflags="$CPPFLAGS"
+@@ -11519,7 +11534,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:11522: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:11537: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	CFLAGS="$CFLAGS $cf_new_cflags"
+ fi
+@@ -11527,7 +11542,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:11530: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:11545: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+ fi
+@@ -11535,14 +11550,14 @@
+ 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}:11538: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:11553: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+ 
+ 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+ fi
+ 
+ if test "$cf_check_cflags" != "$CFLAGS" ; then
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11545 "configure"
++#line 11560 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -11554,16 +11569,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11557: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11572: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11560: \$? = $ac_status" >&5
++  echo "$as_me:11575: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11563: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11578: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11566: \$? = $ac_status" >&5
++  echo "$as_me:11581: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -11571,12 +11586,12 @@
+ cat conftest.$ac_ext >&5
+ test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:11574: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
++echo "${as_me:-configure}:11589: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+ 
+ 	 if test "$cf_check_cppflags" != "$CPPFLAGS" ; then
+ 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:11579: testing but keeping change to \$CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:11594: testing but keeping change to \$CPPFLAGS ..." 1>&5
+ 
+ 	 fi
+ 	 CFLAGS="$cf_check_flags"
+@@ -11584,13 +11599,13 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+ 
+-	echo "$as_me:11587: checking for XOpenDisplay" >&5
++	echo "$as_me:11602: 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 11593 "configure"
++#line 11608 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char XOpenDisplay (); below.  */
+@@ -11621,16 +11636,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11624: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11639: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11627: \$? = $ac_status" >&5
++  echo "$as_me:11642: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11630: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11645: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11633: \$? = $ac_status" >&5
++  echo "$as_me:11648: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_XOpenDisplay=yes
+ else
+@@ -11640,13 +11655,13 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:11643: result: $ac_cv_func_XOpenDisplay" >&5
++echo "$as_me:11658: 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:11649: checking for XOpenDisplay in -lX11" >&5
++	echo "$as_me:11664: 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
+@@ -11654,7 +11669,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11657 "configure"
++#line 11672 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11673,16 +11688,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11676: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11691: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11679: \$? = $ac_status" >&5
++  echo "$as_me:11694: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11682: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11697: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11685: \$? = $ac_status" >&5
++  echo "$as_me:11700: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_X11_XOpenDisplay=yes
+ else
+@@ -11693,7 +11708,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:11696: result: $ac_cv_lib_X11_XOpenDisplay" >&5
++echo "$as_me:11711: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+ echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
+ if test $ac_cv_lib_X11_XOpenDisplay = yes; then
+   LIBS="-lX11 $LIBS"
+@@ -11701,13 +11716,13 @@
+ 
+ fi
+ 
+-	echo "$as_me:11704: checking for XtAppInitialize" >&5
++	echo "$as_me:11719: 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 11710 "configure"
++#line 11725 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char XtAppInitialize (); below.  */
+@@ -11738,16 +11753,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11741: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11756: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11744: \$? = $ac_status" >&5
++  echo "$as_me:11759: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11747: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11762: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11750: \$? = $ac_status" >&5
++  echo "$as_me:11765: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_XtAppInitialize=yes
+ else
+@@ -11757,13 +11772,13 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:11760: result: $ac_cv_func_XtAppInitialize" >&5
++echo "$as_me:11775: 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:11766: checking for XtAppInitialize in -lXt" >&5
++	echo "$as_me:11781: 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
+@@ -11771,7 +11786,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11774 "configure"
++#line 11789 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11790,16 +11805,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11793: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11808: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11796: \$? = $ac_status" >&5
++  echo "$as_me:11811: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11799: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11814: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11802: \$? = $ac_status" >&5
++  echo "$as_me:11817: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_Xt_XtAppInitialize=yes
+ else
+@@ -11810,7 +11825,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:11813: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
++echo "$as_me:11828: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+ echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6
+ if test $ac_cv_lib_Xt_XtAppInitialize = yes; then
+   cat >>confdefs.h <<\EOF
+@@ -11826,7 +11841,7 @@
+ fi
+ 
+ if test $cf_have_X_LIBS = no ; then
+-	{ echo "$as_me:11829: WARNING: Unable to successfully link X Toolkit library (-lXt) with
++	{ echo "$as_me:11844: 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
+@@ -11848,14 +11863,14 @@
+ 		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:11851: checking for $cf_test in $cf_path" >&5
++			echo "$as_me:11866: 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:11854: checking for $cf_test" >&5
++			echo "$as_me:11869: checking for $cf_test" >&5
+ echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
+ 		fi
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 11858 "configure"
++#line 11873 "configure"
+ #include "confdefs.h"
+ 
+ #include <X11/Intrinsic.h>
+@@ -11869,16 +11884,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11872: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:11887: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:11875: \$? = $ac_status" >&5
++  echo "$as_me:11890: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:11878: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11893: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11881: \$? = $ac_status" >&5
++  echo "$as_me:11896: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -11887,7 +11902,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-		echo "$as_me:11890: result: $cf_result" >&5
++		echo "$as_me:11905: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 		if test "$cf_result" = yes ; then
+ 			cf_x_athena_inc=$cf_path
+@@ -11899,7 +11914,7 @@
+ done
+ 
+ if test -z "$cf_x_athena_inc" ; then
+-	{ echo "$as_me:11902: WARNING: Unable to successfully find Athena header files with test program" >&5
++	{ echo "$as_me:11917: 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"
+@@ -11924,15 +11939,15 @@
+ 			cf_test=XawSimpleMenuAddGlobalActions
+ 			if test $cf_path != default ; then
+ 				LIBS="-L$cf_path/lib $cf_lib $LIBS"
+-				echo "$as_me:11927: checking for $cf_lib in $cf_path" >&5
++				echo "$as_me:11942: checking for $cf_lib in $cf_path" >&5
+ echo $ECHO_N "checking for $cf_lib in $cf_path... $ECHO_C" >&6
+ 			else
+ 				LIBS="$cf_lib $LIBS"
+-				echo "$as_me:11931: checking for $cf_test in $cf_lib" >&5
++				echo "$as_me:11946: checking for $cf_test in $cf_lib" >&5
+ echo $ECHO_N "checking for $cf_test in $cf_lib... $ECHO_C" >&6
+ 			fi
+ 			cat >conftest.$ac_ext <<_ACEOF
+-#line 11935 "configure"
++#line 11950 "configure"
+ #include "confdefs.h"
+ 
+ #include <X11/Intrinsic.h>
+@@ -11948,16 +11963,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11951: \"$ac_link\"") >&5
++if { (eval echo "$as_me:11966: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:11954: \$? = $ac_status" >&5
++  echo "$as_me:11969: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:11957: \"$ac_try\"") >&5
++  { (eval echo "$as_me:11972: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:11960: \$? = $ac_status" >&5
++  echo "$as_me:11975: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -11966,7 +11981,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-			echo "$as_me:11969: result: $cf_result" >&5
++			echo "$as_me:11984: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 			if test "$cf_result" = yes ; then
+ 				cf_x_athena_lib="$cf_lib"
+@@ -11978,7 +11993,7 @@
+ done
+ 
+ if test -z "$cf_x_athena_lib" ; then
+-	{ { echo "$as_me:11981: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
++	{ { echo "$as_me:11996: 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
+@@ -11995,7 +12010,7 @@
+ 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:11998: checking for $ac_word" >&5
++echo "$as_me:12013: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_XCURSES_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12012,7 +12027,7 @@
+   test -z "$ac_dir" && ac_dir=.
+   if $as_executable_p "$ac_dir/$ac_word"; then
+    ac_cv_path_XCURSES_CONFIG="$ac_dir/$ac_word"
+-   echo "$as_me:12015: found $ac_dir/$ac_word" >&5
++   echo "$as_me:12030: found $ac_dir/$ac_word" >&5
+    break
+ fi
+ done
+@@ -12023,10 +12038,10 @@
+ XCURSES_CONFIG=$ac_cv_path_XCURSES_CONFIG
+ 
+ if test -n "$XCURSES_CONFIG"; then
+-  echo "$as_me:12026: result: $XCURSES_CONFIG" >&5
++  echo "$as_me:12041: result: $XCURSES_CONFIG" >&5
+ echo "${ECHO_T}$XCURSES_CONFIG" >&6
+ else
+-  echo "$as_me:12029: result: no" >&5
++  echo "$as_me:12044: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -12047,7 +12062,7 @@
+ 
+ test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:12050: testing checking additions to CFLAGS ..." 1>&5
++echo "${as_me:-configure}:12065: testing checking additions to CFLAGS ..." 1>&5
+ 
+ cf_check_cflags="$CFLAGS"
+ cf_check_cppflags="$CPPFLAGS"
+@@ -12118,7 +12133,7 @@
+ if test -n "$cf_new_cflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
+ 
+-echo "${as_me:-configure}:12121: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
++echo "${as_me:-configure}:12136: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+ 
+ 	CFLAGS="$CFLAGS $cf_new_cflags"
+ fi
+@@ -12126,7 +12141,7 @@
+ if test -n "$cf_new_cppflags" ; then
+ 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+ 
+-echo "${as_me:-configure}:12129: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
++echo "${as_me:-configure}:12144: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+ 
+ 	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+ fi
+@@ -12134,14 +12149,14 @@
+ 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}:12137: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
++echo "${as_me:-configure}:12152: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+ 
+ 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+ fi
+ 
+ if test "$cf_check_cflags" != "$CFLAGS" ; then
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12144 "configure"
++#line 12159 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -12153,16 +12168,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12156: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12171: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12159: \$? = $ac_status" >&5
++  echo "$as_me:12174: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12162: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12177: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12165: \$? = $ac_status" >&5
++  echo "$as_me:12180: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -12170,12 +12185,12 @@
+ cat conftest.$ac_ext >&5
+ test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:12173: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
++echo "${as_me:-configure}:12188: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+ 
+ 	 if test "$cf_check_cppflags" != "$CPPFLAGS" ; then
+ 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
+ 
+-echo "${as_me:-configure}:12178: testing but keeping change to \$CPPFLAGS ..." 1>&5
++echo "${as_me:-configure}:12193: testing but keeping change to \$CPPFLAGS ..." 1>&5
+ 
+ 	 fi
+ 	 CFLAGS="$cf_check_flags"
+@@ -12183,7 +12198,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+ 
+-echo "$as_me:12186: checking for XOpenDisplay in -lX11" >&5
++echo "$as_me:12201: 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
+@@ -12191,7 +12206,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12194 "configure"
++#line 12209 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -12210,16 +12225,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12213: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12228: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12216: \$? = $ac_status" >&5
++  echo "$as_me:12231: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12219: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12234: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12222: \$? = $ac_status" >&5
++  echo "$as_me:12237: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_X11_XOpenDisplay=yes
+ else
+@@ -12230,13 +12245,13 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12233: result: $ac_cv_lib_X11_XOpenDisplay" >&5
++echo "$as_me:12248: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+ echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
+ if test $ac_cv_lib_X11_XOpenDisplay = yes; then
+   LIBS="-lX11 $LIBS"
+ fi
+ 
+-echo "$as_me:12239: checking for XCurses library" >&5
++echo "$as_me:12254: 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
+@@ -12244,7 +12259,7 @@
+ 
+ LIBS="-lXCurses $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12247 "configure"
++#line 12262 "configure"
+ #include "confdefs.h"
+ 
+ #include <xcurses.h>
+@@ -12259,16 +12274,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12262: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12277: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12265: \$? = $ac_status" >&5
++  echo "$as_me:12280: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12268: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12283: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12271: \$? = $ac_status" >&5
++  echo "$as_me:12286: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_lib_XCurses=yes
+ else
+@@ -12279,7 +12294,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:12282: result: $cf_cv_lib_XCurses" >&5
++echo "$as_me:12297: result: $cf_cv_lib_XCurses" >&5
+ echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
+ 
+ fi
+@@ -12293,23 +12308,23 @@
+ #define XCURSES 1
+ EOF
+ 
+-	echo "$as_me:12296: checking for xcurses.h" >&5
++	echo "$as_me:12311: 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 12302 "configure"
++#line 12317 "configure"
+ #include "confdefs.h"
+ #include <xcurses.h>
+ _ACEOF
+-if { (eval echo "$as_me:12306: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:12321: \"$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:12312: \$? = $ac_status" >&5
++  echo "$as_me:12327: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -12328,7 +12343,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:12331: result: $ac_cv_header_xcurses_h" >&5
++echo "$as_me:12346: result: $ac_cv_header_xcurses_h" >&5
+ echo "${ECHO_T}$ac_cv_header_xcurses_h" >&6
+ if test $ac_cv_header_xcurses_h = yes; then
+   cat >>confdefs.h <<\EOF
+@@ -12338,7 +12353,7 @@
+ fi
+ 
+ else
+-	{ { echo "$as_me:12341: error: Cannot link with XCurses" >&5
++	{ { echo "$as_me:12356: error: Cannot link with XCurses" >&5
+ echo "$as_me: error: Cannot link with XCurses" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -12353,7 +12368,7 @@
+ 	# look for curses-related libraries
+ 
+ as_ac_Lib=`echo "ac_cv_lib_panel$cf_cv_libtype''_new_panel" | $as_tr_sh`
+-echo "$as_me:12356: checking for new_panel in -lpanel$cf_cv_libtype" >&5
++echo "$as_me:12371: checking for new_panel in -lpanel$cf_cv_libtype" >&5
+ echo $ECHO_N "checking for new_panel in -lpanel$cf_cv_libtype... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12361,7 +12376,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpanel$cf_cv_libtype  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12364 "configure"
++#line 12379 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -12380,16 +12395,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12383: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12398: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12386: \$? = $ac_status" >&5
++  echo "$as_me:12401: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12389: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12404: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12392: \$? = $ac_status" >&5
++  echo "$as_me:12407: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -12400,7 +12415,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12403: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "$as_me:12418: 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
+   cat >>confdefs.h <<EOF
+@@ -12412,7 +12427,7 @@
+ fi
+ 
+ as_ac_Lib=`echo "ac_cv_lib_menu$cf_cv_libtype''_menu_driver" | $as_tr_sh`
+-echo "$as_me:12415: checking for menu_driver in -lmenu$cf_cv_libtype" >&5
++echo "$as_me:12430: checking for menu_driver in -lmenu$cf_cv_libtype" >&5
+ echo $ECHO_N "checking for menu_driver in -lmenu$cf_cv_libtype... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12420,7 +12435,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmenu$cf_cv_libtype  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12423 "configure"
++#line 12438 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -12439,16 +12454,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12442: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12457: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12445: \$? = $ac_status" >&5
++  echo "$as_me:12460: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12448: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12463: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12451: \$? = $ac_status" >&5
++  echo "$as_me:12466: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -12459,7 +12474,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12462: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "$as_me:12477: 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
+   cat >>confdefs.h <<EOF
+@@ -12471,7 +12486,7 @@
+ fi
+ 
+ as_ac_Lib=`echo "ac_cv_lib_form$cf_cv_libtype''_form_driver" | $as_tr_sh`
+-echo "$as_me:12474: checking for form_driver in -lform$cf_cv_libtype" >&5
++echo "$as_me:12489: checking for form_driver in -lform$cf_cv_libtype" >&5
+ echo $ECHO_N "checking for form_driver in -lform$cf_cv_libtype... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12479,7 +12494,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lform$cf_cv_libtype  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12482 "configure"
++#line 12497 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -12498,16 +12513,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12501: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12516: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12504: \$? = $ac_status" >&5
++  echo "$as_me:12519: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12507: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12522: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12510: \$? = $ac_status" >&5
++  echo "$as_me:12525: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Lib=yes"
+ else
+@@ -12518,7 +12533,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:12521: result: `eval echo '${'$as_ac_Lib'}'`" >&5
++echo "$as_me:12536: 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
+   cat >>confdefs.h <<EOF
+@@ -12541,23 +12556,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:12544: checking for $ac_header" >&5
++echo "$as_me:12559: 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 12550 "configure"
++#line 12565 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:12554: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:12569: \"$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:12560: \$? = $ac_status" >&5
++  echo "$as_me:12575: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -12576,7 +12591,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:12579: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:12594: 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
+@@ -12589,13 +12604,13 @@
+ 	;;
+ esac
+ 
+-echo "$as_me:12592: checking return type of signal handlers" >&5
++echo "$as_me:12607: checking return type of signal handlers" >&5
+ echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
+ if test "${ac_cv_type_signal+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 12598 "configure"
++#line 12613 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <signal.h>
+@@ -12617,16 +12632,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12620: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12635: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12623: \$? = $ac_status" >&5
++  echo "$as_me:12638: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12626: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12641: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12629: \$? = $ac_status" >&5
++  echo "$as_me:12644: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_type_signal=void
+ else
+@@ -12636,20 +12651,20 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:12639: result: $ac_cv_type_signal" >&5
++echo "$as_me:12654: result: $ac_cv_type_signal" >&5
+ echo "${ECHO_T}$ac_cv_type_signal" >&6
+ 
+ cat >>confdefs.h <<EOF
+ #define RETSIGTYPE $ac_cv_type_signal
+ EOF
+ 
+-echo "$as_me:12646: checking for ANSI C header files" >&5
++echo "$as_me:12661: 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 12652 "configure"
++#line 12667 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -12657,13 +12672,13 @@
+ #include <float.h>
+ 
+ _ACEOF
+-if { (eval echo "$as_me:12660: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:12675: \"$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:12666: \$? = $ac_status" >&5
++  echo "$as_me:12681: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -12685,7 +12700,7 @@
+ 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 12688 "configure"
++#line 12703 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ 
+@@ -12703,7 +12718,7 @@
+ 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 12706 "configure"
++#line 12721 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ 
+@@ -12724,7 +12739,7 @@
+   :
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 12727 "configure"
++#line 12742 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -12750,15 +12765,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:12753: \"$ac_link\"") >&5
++if { (eval echo "$as_me:12768: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12756: \$? = $ac_status" >&5
++  echo "$as_me:12771: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:12758: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12773: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12761: \$? = $ac_status" >&5
++  echo "$as_me:12776: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+@@ -12771,7 +12786,7 @@
+ fi
+ fi
+ fi
+-echo "$as_me:12774: result: $ac_cv_header_stdc" >&5
++echo "$as_me:12789: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -12781,13 +12796,13 @@
+ 
+ fi
+ 
+-echo "$as_me:12784: checking whether time.h and sys/time.h may both be included" >&5
++echo "$as_me:12799: 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 12790 "configure"
++#line 12805 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/time.h>
+@@ -12803,16 +12818,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12806: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:12821: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:12809: \$? = $ac_status" >&5
++  echo "$as_me:12824: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:12812: \"$ac_try\"") >&5
++  { (eval echo "$as_me:12827: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12815: \$? = $ac_status" >&5
++  echo "$as_me:12830: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_header_time=yes
+ else
+@@ -12822,7 +12837,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:12825: result: $ac_cv_header_time" >&5
++echo "$as_me:12840: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -12845,23 +12860,23 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:12848: checking for $ac_header" >&5
++echo "$as_me:12863: 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 12854 "configure"
++#line 12869 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:12858: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:12873: \"$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:12864: \$? = $ac_status" >&5
++  echo "$as_me:12879: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -12880,7 +12895,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:12883: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:12898: 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
+@@ -12892,25 +12907,97 @@
+ 
+ for ac_func in \
+ gettimeofday \
++strdup \
++
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:12914: 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 12920 "configure"
++#include "confdefs.h"
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.  */
++#include <assert.h>
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++char (*f) ();
++
++int
++main ()
++{
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++f = $ac_func;
++#endif
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:12951: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:12954: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:12957: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:12960: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++eval "$as_ac_var=no"
++fi
++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:12970: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<EOF
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++EOF
++
++fi
++done
++
++if test "$cf_enable_widec" = yes; then
++
++for ac_func in \
+ mblen \
+ mbrlen \
+ mbrtowc \
+ mbsrtowcs \
+ mbstowcs \
+ mbtowc \
+-strdup \
+ wcsrtombs \
+ wcstombs \
+ 
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:12907: checking for $ac_func" >&5
++echo "$as_me:12994: 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 12913 "configure"
++#line 13000 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -12941,16 +13028,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12944: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13031: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:12947: \$? = $ac_status" >&5
++  echo "$as_me:13034: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:12950: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13037: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:12953: \$? = $ac_status" >&5
++  echo "$as_me:13040: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+@@ -12960,7 +13047,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:12963: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:13050: 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
+@@ -12970,14 +13057,16 @@
+ fi
+ done
+ 
+-echo "$as_me:12973: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
++fi
++
++echo "$as_me:13062: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+ echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6
+ if test "${cf_cv_need_xopen_extension+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 12980 "configure"
++#line 13069 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -12999,23 +13088,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13002: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13091: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13005: \$? = $ac_status" >&5
++  echo "$as_me:13094: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:13008: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13097: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13011: \$? = $ac_status" >&5
++  echo "$as_me:13100: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_need_xopen_extension=no
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 13018 "configure"
++#line 13107 "configure"
+ #include "confdefs.h"
+ 
+ #define _XOPEN_SOURCE_EXTENDED
+@@ -13037,16 +13126,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13040: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13129: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13043: \$? = $ac_status" >&5
++  echo "$as_me:13132: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:13046: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13135: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13049: \$? = $ac_status" >&5
++  echo "$as_me:13138: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_need_xopen_extension=yes
+ else
+@@ -13058,11 +13147,11 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:13061: result: $cf_cv_need_xopen_extension" >&5
++echo "$as_me:13150: result: $cf_cv_need_xopen_extension" >&5
+ echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
+ test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
+ 
+-echo "$as_me:13065: checking for term.h" >&5
++echo "$as_me:13154: 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
+@@ -13070,12 +13159,20 @@
+ 
+ # If we found <ncurses/curses.h>, look for <ncurses/term.h>, but always look
+ # for <term.h> if we do not find the variant.
+-for cf_header in \
+-	`echo ${cf_cv_ncurses_header:-curses.h} | sed -e 's%/.*%/%'`term.h \
+-	term.h
++
++cf_header_list="term.h ncurses/term.h ncursesw/term.h"
++
++case ${cf_cv_ncurses_header:-curses.h} in #(vi
++*/*)
++	cf_header_item=`echo ${cf_cv_ncurses_header:-curses.h} | sed -e 's%\..*%%' -e 's%/.*%/%'`term.h
++	cf_header_list="$cf_header_item $cf_header_list"
++	;;
++esac
++
++for cf_header in $cf_header_list
+ do
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 13078 "configure"
++#line 13175 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -13089,16 +13186,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13092: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13189: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13095: \$? = $ac_status" >&5
++  echo "$as_me:13192: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13098: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13195: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13101: \$? = $ac_status" >&5
++  echo "$as_me:13198: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_term_header=$cf_header
+ 	 break
+@@ -13117,7 +13214,7 @@
+ 	for cf_header in ncurses/term.h ncursesw/term.h
+ 	do
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 13120 "configure"
++#line 13217 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -13135,16 +13232,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13138: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13235: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13141: \$? = $ac_status" >&5
++  echo "$as_me:13238: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13144: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13241: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13147: \$? = $ac_status" >&5
++  echo "$as_me:13244: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_term_header=$cf_header
+ 			 break
+@@ -13159,7 +13256,7 @@
+ esac
+ 
+ fi
+-echo "$as_me:13162: result: $cf_cv_term_header" >&5
++echo "$as_me:13259: result: $cf_cv_term_header" >&5
+ echo "${ECHO_T}$cf_cv_term_header" >&6
+ 
+ case $cf_cv_term_header in #(vi
+@@ -13183,6 +13280,94 @@
+ 	;;
+ esac
+ 
++echo "$as_me:13283: 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
++else
++
++# If we found <ncurses/curses.h>, look for <ncurses/unctrl.h>, but always look
++# for <unctrl.h> if we do not find the variant.
++
++cf_header_list="unctrl.h ncurses/unctrl.h ncursesw/unctrl.h"
++
++case ${cf_cv_ncurses_header:-curses.h} in #(vi
++*/*)
++	cf_header_item=`echo ${cf_cv_ncurses_header:-curses.h} | sed -e 's%\..*%%' -e 's%/.*%/%'`unctrl.h
++	cf_header_list="$cf_header_item $cf_header_list"
++	;;
++esac
++
++for cf_header in $cf_header_list
++do
++	cat >conftest.$ac_ext <<_ACEOF
++#line 13304 "configure"
++#include "confdefs.h"
++
++#include <${cf_cv_ncurses_header:-curses.h}>
++#include <${cf_header}>
++int
++main ()
++{
++WINDOW *x
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:13318: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:13321: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:13324: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:13327: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  cf_cv_unctrl_header=$cf_header
++	 break
++else
++  echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++cf_cv_unctrl_header=no
++fi
++rm -f conftest.$ac_objext conftest.$ac_ext
++done
++
++case $cf_cv_unctrl_header in #(vi
++no)
++	{ echo "$as_me:13341: WARNING: unctrl.h header not found" >&5
++echo "$as_me: WARNING: unctrl.h header not found" >&2;}
++	;;
++esac
++
++fi
++echo "$as_me:13347: result: $cf_cv_unctrl_header" >&5
++echo "${ECHO_T}$cf_cv_unctrl_header" >&6
++
++case $cf_cv_unctrl_header in #(vi
++unctrl.h) #(vi
++	cat >>confdefs.h <<\EOF
++#define HAVE_UNCTRL_H 1
++EOF
++
++	;;
++ncurses/unctrl.h) #(vi
++	cat >>confdefs.h <<\EOF
++#define HAVE_NCURSES_UNCTRL_H 1
++EOF
++
++	;;
++ncursesw/unctrl.h)
++	cat >>confdefs.h <<\EOF
++#define HAVE_NCURSESW_UNCTRL_H 1
++EOF
++
++	;;
++esac
++
+ for cf_func in \
+ chgat \
+ color_set \
+@@ -13221,10 +13406,10 @@
+ 
+ cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+ 
+-	echo "$as_me:13224: checking for ${cf_func}" >&5
++	echo "$as_me:13409: checking for ${cf_func}" >&5
+ echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
+ 
+-echo "${as_me:-configure}:13227: testing ${cf_func} ..." 1>&5
++echo "${as_me:-configure}:13412: testing ${cf_func} ..." 1>&5
+ 
+ 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13233,7 +13418,7 @@
+ 		eval cf_result='$ac_cv_func_'$cf_func
+ 		if test ".$cf_result" != ".no"; then
+ 			cat >conftest.$ac_ext <<_ACEOF
+-#line 13236 "configure"
++#line 13421 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -13264,16 +13449,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13267: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13452: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13270: \$? = $ac_status" >&5
++  echo "$as_me:13455: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:13273: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13458: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13276: \$? = $ac_status" >&5
++  echo "$as_me:13461: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -13289,7 +13474,7 @@
+ 
+ 	# use the computed/retrieved cache-value:
+ 	eval 'cf_result=$cf_cv_func_'$cf_func
+-	echo "$as_me:13292: result: $cf_result" >&5
++	echo "$as_me:13477: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test $cf_result != no; then
+ 		cat >>confdefs.h <<EOF
+@@ -13299,14 +13484,14 @@
+ 	fi
+ done
+ 
+-echo "$as_me:13302: checking for ncurses extended functions" >&5
++echo "$as_me:13487: checking for ncurses extended functions" >&5
+ echo $ECHO_N "checking for ncurses extended functions... $ECHO_C" >&6
+ if test "${cf_cv_ncurses_ext_funcs+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 13309 "configure"
++#line 13494 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -13321,16 +13506,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13324: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13509: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13327: \$? = $ac_status" >&5
++  echo "$as_me:13512: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13330: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13515: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13333: \$? = $ac_status" >&5
++  echo "$as_me:13518: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_ext_funcs=defined
+ else
+@@ -13338,7 +13523,7 @@
+ cat conftest.$ac_ext >&5
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 13341 "configure"
++#line 13526 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -13363,16 +13548,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13366: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13551: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13369: \$? = $ac_status" >&5
++  echo "$as_me:13554: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:13372: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13557: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13375: \$? = $ac_status" >&5
++  echo "$as_me:13560: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_ncurses_ext_funcs=yes
+ else
+@@ -13386,20 +13571,22 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:13389: result: $cf_cv_ncurses_ext_funcs" >&5
++echo "$as_me:13574: result: $cf_cv_ncurses_ext_funcs" >&5
+ echo "${ECHO_T}$cf_cv_ncurses_ext_funcs" >&6
+ test "$cf_cv_ncurses_ext_funcs" = yes && cat >>confdefs.h <<\EOF
+ #define NCURSES_EXT_FUNCS 1
+ EOF
+ 
+-echo "$as_me:13395: checking for wide-character functions" >&5
++if test "$cf_enable_widec" = yes
++then
++	echo "$as_me:13582: checking for wide-character functions" >&5
+ echo $ECHO_N "checking for wide-character functions... $ECHO_C" >&6
+ if test "${cf_cv_widechar_funcs+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<_ACEOF
+-#line 13402 "configure"
++	cat >conftest.$ac_ext <<_ACEOF
++#line 13589 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -13407,25 +13594,25 @@
+ main ()
+ {
+ 
+-	static wchar_t src_wchar[2];
+-	static cchar_t dst_cchar;
+-	setcchar(&dst_cchar, src_wchar, A_NORMAL, 0, (void *) 0);
++		static wchar_t src_wchar[2];
++		static cchar_t dst_cchar;
++		setcchar(&dst_cchar, src_wchar, A_NORMAL, 0, (void *) 0);
+ 
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13419: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13606: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13422: \$? = $ac_status" >&5
++  echo "$as_me:13609: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:13425: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13612: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13428: \$? = $ac_status" >&5
++  echo "$as_me:13615: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_widechar_funcs=yes
+ else
+@@ -13436,465 +13623,34 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:13439: result: $cf_cv_widechar_funcs" >&5
++echo "$as_me:13626: result: $cf_cv_widechar_funcs" >&5
+ echo "${ECHO_T}$cf_cv_widechar_funcs" >&6
+-if test "$cf_cv_widechar_funcs" != no ; then
+-	cat >>confdefs.h <<\EOF
++	if test "$cf_cv_widechar_funcs" != no ; then
++		cat >>confdefs.h <<\EOF
+ #define USE_WIDEC_SUPPORT 1
+ EOF
+ 
+-else
+-	cat >>confdefs.h <<\EOF
++	else
++		cat >>confdefs.h <<\EOF
+ #define USE_WIDEC_SUPPORT 0
+ EOF
+ 
+-fi
+-
+-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+-
+-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:13459: 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 13465 "configure"
+-#include "confdefs.h"
+-$ac_includes_default
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13471: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:13474: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13477: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:13480: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; 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.$ac_objext conftest.$ac_ext
+-fi
+-echo "$as_me:13490: 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
+-
+-echo "$as_me:13500: 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 13506 "configure"
+-#include "confdefs.h"
+-$ac_includes_default
+-int
+-main ()
+-{
+-if ((pid_t *) 0)
+-  return 0;
+-if (sizeof (pid_t))
+-  return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13521: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:13524: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13527: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:13530: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_type_pid_t=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_type_pid_t=no
+-fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
+-fi
+-echo "$as_me:13540: 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
+-  :
+-else
+-
+-cat >>confdefs.h <<EOF
+-#define pid_t int
+-EOF
+-
+-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:13555: 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 13561 "configure"
+-#include "confdefs.h"
+-#include <$ac_header>
+-_ACEOF
+-if { (eval echo "$as_me:13565: \"$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:13571: \$? = $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:13590: 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
+-
+-for ac_func in fork vfork
+-do
+-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:13603: 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 13609 "configure"
+-#include "confdefs.h"
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.  */
+-#include <assert.h>
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char $ac_func ();
+-char (*f) ();
+-
+-int
+-main ()
+-{
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+-choke me
+-#else
+-f = $ac_func;
+-#endif
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13640: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:13643: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:13646: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:13649: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  eval "$as_ac_var=yes"
+-else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "$as_ac_var=no"
+-fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-fi
+-echo "$as_me:13659: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+-if test `eval echo '${'$as_ac_var'}'` = yes; then
+-  cat >>confdefs.h <<EOF
+-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-EOF
+-
+-fi
+-done
+-
+-ac_cv_func_fork_works=$ac_cv_func_fork
+-if test "x$ac_cv_func_fork" = xyes; then
+-  echo "$as_me:13671: 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
+-else
+-  if test "$cross_compiling" = yes; then
+-  ac_cv_func_fork_works=cross
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* By RÃŒdiger Kuhlmann. */
+-      #include <sys/types.h>
+-      #if HAVE_UNISTD_H
+-      # include <unistd.h>
+-      #endif
+-      /* Some systems only have a dummy stub for fork() */
+-      int main ()
+-      {
+-        if (fork() < 0)
+-          $ac_main_return (1);
+-        $ac_main_return (0);
+-      }
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:13694: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:13697: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:13699: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:13702: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_func_fork_works=yes
+-else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_func_fork_works=no
+-fi
+-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-fi
+-echo "$as_me:13714: result: $ac_cv_func_fork_works" >&5
+-echo "${ECHO_T}$ac_cv_func_fork_works" >&6
+-
+-fi
+-if test "x$ac_cv_func_fork_works" = xcross; then
+-  case $host in
+-    *-*-amigaos* | *-*-msdosdjgpp*)
+-      # Override, as these systems have only a dummy fork() stub
+-      ac_cv_func_fork_works=no
+-      ;;
+-    *)
+-      ac_cv_func_fork_works=yes
+-      ;;
+-  esac
+-  { echo "$as_me:13728: 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:13733: 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
+-else
+-  if test "$cross_compiling" = yes; then
+-  ac_cv_func_vfork_works=cross
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-#line 13742 "configure"
+-#include "confdefs.h"
+-/* Thanks to Paul Eggert for this test.  */
+-#include <stdio.h>
+-#include <sys/types.h>
+-#include <sys/stat.h>
+-#if HAVE_UNISTD_H
+-# include <unistd.h>
+-#endif
+-#if HAVE_VFORK_H
+-# include <vfork.h>
+-#endif
+-/* On some sparc systems, changes by the child to local and incoming
+-   argument registers are propagated back to the parent.  The compiler
+-   is told about this with #include <vfork.h>, but some compilers
+-   (e.g. gcc -O) don't grok <vfork.h>.  Test for this by using a
+-   static variable whose address is put into a register that is
+-   clobbered by the vfork.  */
+-static
+-#ifdef __cplusplus
+-sparc_address_test (int arg)
+-# else
+-sparc_address_test (arg) int arg;
+-#endif
+-{
+-  static pid_t child;
+-  if (!child) {
+-    child = vfork ();
+-    if (child < 0) {
+-      perror ("vfork");
+-      _exit(2);
+-    }
+-    if (!child) {
+-      arg = getpid();
+-      write(-1, "", 0);
+-      _exit (arg);
+-    }
+-  }
+-}
+-
+-int
+-main ()
+-{
+-  pid_t parent = getpid ();
+-  pid_t child;
+-
+-  sparc_address_test ();
+-
+-  child = vfork ();
+-
+-  if (child == 0) {
+-    /* Here is another test for sparc vfork register problems.  This
+-       test uses lots of local variables, at least as many local
+-       variables as main has allocated so far including compiler
+-       temporaries.  4 locals are enough for gcc 1.40.3 on a Solaris
+-       4.1.3 sparc, but we use 8 to be safe.  A buggy compiler should
+-       reuse the register of parent for one of the local variables,
+-       since it will think that parent can't possibly be used any more
+-       in this routine.  Assigning to the local variable will thus
+-       munge parent in the parent process.  */
+-    pid_t
+-      p = getpid(), p1 = getpid(), p2 = getpid(), p3 = getpid(),
+-      p4 = getpid(), p5 = getpid(), p6 = getpid(), p7 = getpid();
+-    /* Convince the compiler that p..p7 are live; otherwise, it might
+-       use the same hardware register for all 8 local variables.  */
+-    if (p != p1 || p != p2 || p != p3 || p != p4
+-	|| p != p5 || p != p6 || p != p7)
+-      _exit(1);
+-
+-    /* On some systems (e.g. IRIX 3.3), vfork doesn't separate parent
+-       from child file descriptors.  If the child closes a descriptor
+-       before it execs or exits, this munges the parent's descriptor
+-       as well.  Test for this by closing stdout in the child.  */
+-    _exit(close(fileno(stdout)) != 0);
+-  } else {
+-    int status;
+-    struct stat st;
+-
+-    while (wait(&status) != child)
+-      ;
+-    $ac_main_return(
+-	 /* Was there some problem with vforking?  */
+-	 child < 0
+-
+-	 /* Did the child fail?  (This shouldn't happen.)  */
+-	 || status
+-
+-	 /* Did the vfork/compiler bug occur?  */
+-	 || parent != getpid()
+-
+-	 /* Did the file descriptor bug occur?  */
+-	 || fstat(fileno(stdout), &st) != 0
+-	 );
+-  }
+-}
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:13839: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:13842: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:13844: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:13847: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_func_vfork_works=yes
+-else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_func_vfork_works=no
+-fi
+-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-fi
+-echo "$as_me:13859: 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:13865: 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
+-
+-if test "x$ac_cv_func_vfork_works" = xyes; then
+-
+-cat >>confdefs.h <<\EOF
+-#define HAVE_WORKING_VFORK 1
+-EOF
+-
++	fi
+ else
+-
+-cat >>confdefs.h <<\EOF
+-#define vfork fork
+-EOF
+-
+-fi
+-if test "x$ac_cv_func_fork_works" = xyes; then
+-
+-cat >>confdefs.h <<\EOF
+-#define HAVE_WORKING_FORK 1
++	cat >>confdefs.h <<\EOF
++#define USE_WIDEC_SUPPORT 0
+ EOF
+ 
+ fi
+ 
+-echo "$as_me:13890: checking if sys/time.h works with sys/select.h" >&5
++echo "$as_me:13646: checking if sys/time.h works with sys/select.h" >&5
+ echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6
+ if test "${cf_cv_sys_time_select+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 13897 "configure"
++#line 13653 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -13914,16 +13670,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13917: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13673: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:13920: \$? = $ac_status" >&5
++  echo "$as_me:13676: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:13923: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13679: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13926: \$? = $ac_status" >&5
++  echo "$as_me:13682: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_sys_time_select=yes
+ else
+@@ -13935,13 +13691,13 @@
+ 
+ fi
+ 
+-echo "$as_me:13938: result: $cf_cv_sys_time_select" >&5
++echo "$as_me:13694: result: $cf_cv_sys_time_select" >&5
+ echo "${ECHO_T}$cf_cv_sys_time_select" >&6
+ test "$cf_cv_sys_time_select" = yes && cat >>confdefs.h <<\EOF
+ #define HAVE_SYS_TIME_SELECT 1
+ EOF
+ 
+-echo "$as_me:13944: checking for function curses_version" >&5
++echo "$as_me:13700: 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
+@@ -13951,7 +13707,7 @@
+   cf_cv_func_curses_version=unknown
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 13954 "configure"
++#line 13710 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -13964,15 +13720,15 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:13967: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13723: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:13970: \$? = $ac_status" >&5
++  echo "$as_me:13726: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:13972: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13728: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:13975: \$? = $ac_status" >&5
++  echo "$as_me:13731: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_func_curses_version=yes
+ 
+@@ -13987,13 +13743,13 @@
+ fi
+ rm -f core
+ fi
+-echo "$as_me:13990: result: $cf_cv_func_curses_version" >&5
++echo "$as_me:13746: result: $cf_cv_func_curses_version" >&5
+ echo "${ECHO_T}$cf_cv_func_curses_version" >&6
+ test "$cf_cv_func_curses_version" = yes && cat >>confdefs.h <<\EOF
+ #define HAVE_CURSES_VERSION 1
+ EOF
+ 
+-echo "$as_me:13996: checking for ncurses wrap-prefix" >&5
++echo "$as_me:13752: checking for ncurses wrap-prefix" >&5
+ echo $ECHO_N "checking for ncurses wrap-prefix... $ECHO_C" >&6
+ 
+ # Check whether --with-ncurses-wrap-prefix or --without-ncurses-wrap-prefix was given.
+@@ -14003,10 +13759,10 @@
+ else
+   NCURSES_WRAP_PREFIX=_nc_
+ fi;
+-echo "$as_me:14006: result: $NCURSES_WRAP_PREFIX" >&5
++echo "$as_me:13762: result: $NCURSES_WRAP_PREFIX" >&5
+ echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
+ 
+-echo "$as_me:14009: checking for alternate character set array" >&5
++echo "$as_me:13765: checking for alternate character set array" >&5
+ echo $ECHO_N "checking for alternate character set array... $ECHO_C" >&6
+ if test "${cf_cv_curses_acs_map+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14016,7 +13772,7 @@
+ for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14019 "configure"
++#line 13775 "configure"
+ #include "confdefs.h"
+ 
+ #include <${cf_cv_ncurses_header:-curses.h}>
+@@ -14032,16 +13788,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14035: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13791: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14038: \$? = $ac_status" >&5
++  echo "$as_me:13794: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14041: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13797: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14044: \$? = $ac_status" >&5
++  echo "$as_me:13800: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_curses_acs_map=$name; break
+ else
+@@ -14052,14 +13808,16 @@
+ done
+ 
+ fi
+-echo "$as_me:14055: result: $cf_cv_curses_acs_map" >&5
++echo "$as_me:13811: result: $cf_cv_curses_acs_map" >&5
+ echo "${ECHO_T}$cf_cv_curses_acs_map" >&6
+ 
+ test "$cf_cv_curses_acs_map" != unknown && cat >>confdefs.h <<EOF
+ #define CURSES_ACS_ARRAY $cf_cv_curses_acs_map
+ EOF
+ 
+-echo "$as_me:14062: checking for wide alternate character set array" >&5
++if test "$cf_enable_widec" = yes; then
++
++echo "$as_me:13820: checking for wide alternate character set array" >&5
+ echo $ECHO_N "checking for wide alternate character set array... $ECHO_C" >&6
+ if test "${cf_cv_curses_wacs_map+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14069,7 +13827,7 @@
+ 	for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
+ 	do
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 14072 "configure"
++#line 13830 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -14085,16 +13843,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14088: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13846: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14091: \$? = $ac_status" >&5
++  echo "$as_me:13849: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14094: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13852: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14097: \$? = $ac_status" >&5
++  echo "$as_me:13855: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_curses_wacs_map=$name
+ 	 break
+@@ -14105,14 +13863,14 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 	done
+ fi
+-echo "$as_me:14108: result: $cf_cv_curses_wacs_map" >&5
++echo "$as_me:13866: result: $cf_cv_curses_wacs_map" >&5
+ echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
+ 
+ test "$cf_cv_curses_wacs_map" != unknown && cat >>confdefs.h <<EOF
+ #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map
+ EOF
+ 
+-echo "$as_me:14115: checking for wide alternate character constants" >&5
++echo "$as_me:13873: checking for wide alternate character constants" >&5
+ echo $ECHO_N "checking for wide alternate character constants... $ECHO_C" >&6
+ if test "${cf_cv_curses_wacs_symbols+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14122,7 +13880,7 @@
+ if test "$cf_cv_curses_wacs_map" != unknown
+ then
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 14125 "configure"
++#line 13883 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -14139,16 +13897,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14142: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13900: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14145: \$? = $ac_status" >&5
++  echo "$as_me:13903: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14148: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13906: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14151: \$? = $ac_status" >&5
++  echo "$as_me:13909: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_curses_wacs_symbols=yes
+ else
+@@ -14158,7 +13916,7 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ else
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 14161 "configure"
++#line 13919 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -14174,16 +13932,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14177: \"$ac_link\"") >&5
++if { (eval echo "$as_me:13935: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14180: \$? = $ac_status" >&5
++  echo "$as_me:13938: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14183: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13941: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14186: \$? = $ac_status" >&5
++  echo "$as_me:13944: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_curses_wacs_symbols=yes
+ else
+@@ -14194,17 +13952,19 @@
+ fi
+ 
+ fi
+-echo "$as_me:14197: result: $cf_cv_curses_wacs_symbols" >&5
++echo "$as_me:13955: result: $cf_cv_curses_wacs_symbols" >&5
+ echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6
+ 
+ test "$cf_cv_curses_wacs_symbols" != no && cat >>confdefs.h <<\EOF
+ #define CURSES_WACS_SYMBOLS 1
+ EOF
+ 
+-echo "$as_me:14204: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++fi
++
++echo "$as_me:13964: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14207 "configure"
++#line 13967 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -14222,16 +13982,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:14225: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:13985: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14228: \$? = $ac_status" >&5
++  echo "$as_me:13988: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:14231: \"$ac_try\"") >&5
++  { (eval echo "$as_me:13991: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14234: \$? = $ac_status" >&5
++  echo "$as_me:13994: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -14240,7 +14000,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:14243: result: $cf_result" >&5
++echo "$as_me:14003: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test $cf_result = yes ; then
+ 
+@@ -14257,15 +14017,17 @@
+ 
+ fi
+ 
++if test "$cf_enable_widec" = yes; then
++
+ # This is needed on Tru64 5.0 to declare mbstate_t
+-echo "$as_me:14261: checking if we must include wchar.h to declare mbstate_t" >&5
++echo "$as_me:14023: 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_mbstate_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14268 "configure"
++#line 14030 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -14283,23 +14045,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:14286: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14048: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14289: \$? = $ac_status" >&5
++  echo "$as_me:14051: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:14292: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14054: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14295: \$? = $ac_status" >&5
++  echo "$as_me:14057: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_mbstate_t=no
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14302 "configure"
++#line 14064 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -14318,16 +14080,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:14321: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14083: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14324: \$? = $ac_status" >&5
++  echo "$as_me:14086: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:14327: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14089: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14330: \$? = $ac_status" >&5
++  echo "$as_me:14092: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_mbstate_t=yes
+ else
+@@ -14339,7 +14101,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:14342: result: $cf_cv_mbstate_t" >&5
++echo "$as_me:14104: result: $cf_cv_mbstate_t" >&5
+ echo "${ECHO_T}$cf_cv_mbstate_t" >&6
+ 
+ if test "$cf_cv_mbstate_t" = yes ; then
+@@ -14361,14 +14123,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wchar_t
+-echo "$as_me:14364: checking if we must include wchar.h to declare wchar_t" >&5
++echo "$as_me:14126: checking if we must include wchar.h to declare wchar_t" >&5
+ echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6
+ if test "${cf_cv_wchar_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14371 "configure"
++#line 14133 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -14386,23 +14148,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:14389: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14151: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14392: \$? = $ac_status" >&5
++  echo "$as_me:14154: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:14395: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14157: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14398: \$? = $ac_status" >&5
++  echo "$as_me:14160: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_wchar_t=no
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14405 "configure"
++#line 14167 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -14421,16 +14183,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:14424: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14186: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14427: \$? = $ac_status" >&5
++  echo "$as_me:14189: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:14430: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14192: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14433: \$? = $ac_status" >&5
++  echo "$as_me:14195: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_wchar_t=yes
+ else
+@@ -14442,7 +14204,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:14445: result: $cf_cv_wchar_t" >&5
++echo "$as_me:14207: result: $cf_cv_wchar_t" >&5
+ echo "${ECHO_T}$cf_cv_wchar_t" >&6
+ 
+ if test "$cf_cv_wchar_t" = yes ; then
+@@ -14464,14 +14226,14 @@
+ fi
+ 
+ # This is needed on Tru64 5.0 to declare wint_t
+-echo "$as_me:14467: checking if we must include wchar.h to declare wint_t" >&5
++echo "$as_me:14229: checking if we must include wchar.h to declare wint_t" >&5
+ echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6
+ if test "${cf_cv_wint_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14474 "configure"
++#line 14236 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -14489,23 +14251,23 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:14492: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14254: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14495: \$? = $ac_status" >&5
++  echo "$as_me:14257: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:14498: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14260: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14501: \$? = $ac_status" >&5
++  echo "$as_me:14263: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_wint_t=no
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14508 "configure"
++#line 14270 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -14524,16 +14286,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:14527: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14289: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14530: \$? = $ac_status" >&5
++  echo "$as_me:14292: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:14533: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14295: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14536: \$? = $ac_status" >&5
++  echo "$as_me:14298: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_cv_wint_t=yes
+ else
+@@ -14545,7 +14307,7 @@
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:14548: result: $cf_cv_wint_t" >&5
++echo "$as_me:14310: result: $cf_cv_wint_t" >&5
+ echo "${ECHO_T}$cf_cv_wint_t" >&6
+ 
+ if test "$cf_cv_wint_t" = yes ; then
+@@ -14566,12 +14328,12 @@
+ 	NCURSES_OK_WINT_T=1
+ fi
+ 
+-if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
++	if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
+ 
+-echo "$as_me:14571: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:14333: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14574 "configure"
++#line 14336 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -14589,16 +14351,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:14592: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14354: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14595: \$? = $ac_status" >&5
++  echo "$as_me:14357: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:14598: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14360: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14601: \$? = $ac_status" >&5
++  echo "$as_me:14363: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -14607,7 +14369,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:14610: result: $cf_result" >&5
++echo "$as_me:14372: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test $cf_result = yes ; then
+ 
+@@ -14624,14 +14386,14 @@
+ 
+ fi
+ 
+-fi
++	fi
+ 
+-if test "$NCURSES_OK_WCHAR_T" = 0 ; then
++	if test "$NCURSES_OK_WCHAR_T" = 0 ; then
+ 
+-echo "$as_me:14631: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:14393: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14634 "configure"
++#line 14396 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -14649,16 +14411,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:14652: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14414: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14655: \$? = $ac_status" >&5
++  echo "$as_me:14417: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:14658: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14420: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14661: \$? = $ac_status" >&5
++  echo "$as_me:14423: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -14667,7 +14429,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:14670: result: $cf_result" >&5
++echo "$as_me:14432: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test $cf_result = yes ; then
+ 
+@@ -14684,14 +14446,14 @@
+ 
+ fi
+ 
+-fi
++	fi
+ 
+-if test "$NCURSES_OK_WINT_T" = 0 ; then
++	if test "$NCURSES_OK_WINT_T" = 0 ; then
+ 
+-echo "$as_me:14691: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:14453: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14694 "configure"
++#line 14456 "configure"
+ #include "confdefs.h"
+ 
+ #ifndef _XOPEN_SOURCE_EXTENDED
+@@ -14709,16 +14471,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:14712: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14474: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14715: \$? = $ac_status" >&5
++  echo "$as_me:14477: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:14718: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14480: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14721: \$? = $ac_status" >&5
++  echo "$as_me:14483: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -14727,7 +14489,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:14730: result: $cf_result" >&5
++echo "$as_me:14492: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ if test $cf_result = yes ; then
+ 
+@@ -14744,13 +14506,14 @@
+ 
+ fi
+ 
++	fi
+ fi
+ 
+-echo "$as_me:14749: checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:14512: checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14753 "configure"
++#line 14516 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -14778,16 +14541,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:14781: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14544: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14784: \$? = $ac_status" >&5
++  echo "$as_me:14547: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:14787: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14550: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14790: \$? = $ac_status" >&5
++  echo "$as_me:14553: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -14796,7 +14559,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:14799: result: $cf_result" >&5
++echo "$as_me:14562: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 
+ if test $cf_result = yes ; then
+@@ -14808,14 +14571,14 @@
+ EOF
+ 
+ else
+-	echo "$as_me:14811: checking for data boolnames in library" >&5
++	echo "$as_me:14574: checking for data boolnames in library" >&5
+ echo $ECHO_N "checking for data boolnames in library... $ECHO_C" >&6
+ 	# BSD linkers insist on making weak linkage, but resolve at runtime.
+ 	if test "$cross_compiling" = yes; then
+ 
+ 	# cross-compiling
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 14818 "configure"
++#line 14581 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -14847,16 +14610,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14850: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14613: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14853: \$? = $ac_status" >&5
++  echo "$as_me:14616: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:14856: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14619: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14859: \$? = $ac_status" >&5
++  echo "$as_me:14622: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -14868,7 +14631,7 @@
+ 
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 14871 "configure"
++#line 14634 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -14893,15 +14656,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:14896: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14659: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:14899: \$? = $ac_status" >&5
++  echo "$as_me:14662: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:14901: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14664: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14904: \$? = $ac_status" >&5
++  echo "$as_me:14667: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -14912,7 +14675,7 @@
+ fi
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+-	echo "$as_me:14915: result: $cf_result" >&5
++	echo "$as_me:14678: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test $cf_result = yes ; then
+ 
+@@ -14925,11 +14688,11 @@
+ 	fi
+ fi
+ 
+-echo "$as_me:14928: checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
++echo "$as_me:14691: checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+ echo $ECHO_N "checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14932 "configure"
++#line 14695 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -14957,16 +14720,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:14960: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:14723: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  echo "$as_me:14963: \$? = $ac_status" >&5
++  echo "$as_me:14726: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:14966: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14729: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:14969: \$? = $ac_status" >&5
++  echo "$as_me:14732: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -14975,7 +14738,7 @@
+ cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:14978: result: $cf_result" >&5
++echo "$as_me:14741: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 
+ if test $cf_result = yes ; then
+@@ -14987,14 +14750,14 @@
+ EOF
+ 
+ else
+-	echo "$as_me:14990: checking for data boolfnames in library" >&5
++	echo "$as_me:14753: checking for data boolfnames in library" >&5
+ echo $ECHO_N "checking for data boolfnames in library... $ECHO_C" >&6
+ 	# BSD linkers insist on making weak linkage, but resolve at runtime.
+ 	if test "$cross_compiling" = yes; then
+ 
+ 	# cross-compiling
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 14997 "configure"
++#line 14760 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -15026,16 +14789,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15029: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14792: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15032: \$? = $ac_status" >&5
++  echo "$as_me:14795: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:15035: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14798: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15038: \$? = $ac_status" >&5
++  echo "$as_me:14801: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -15047,7 +14810,7 @@
+ 
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 15050 "configure"
++#line 14813 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_XCURSES
+@@ -15072,15 +14835,15 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:15075: \"$ac_link\"") >&5
++if { (eval echo "$as_me:14838: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  echo "$as_me:15078: \$? = $ac_status" >&5
++  echo "$as_me:14841: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:15080: \"$ac_try\"") >&5
++  { (eval echo "$as_me:14843: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+-  echo "$as_me:15083: \$? = $ac_status" >&5
++  echo "$as_me:14846: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   cf_result=yes
+ else
+@@ -15091,7 +14854,7 @@
+ fi
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+-	echo "$as_me:15094: result: $cf_result" >&5
++	echo "$as_me:14857: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ 	if test $cf_result = yes ; then
+ 
+@@ -15188,7 +14951,7 @@
+ : ${CONFIG_STATUS=./config.status}
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:15191: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:14954: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >$CONFIG_STATUS <<_ACEOF
+ #! $SHELL
+@@ -15364,7 +15127,7 @@
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { { echo "$as_me:15367: error: ambiguous option: $1
++    { { echo "$as_me:15130: 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;}
+@@ -15383,7 +15146,7 @@
+     ac_need_defaults=false;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:15386: error: unrecognized option: $1
++  -*) { { echo "$as_me:15149: 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;}
+@@ -15431,7 +15194,7 @@
+   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
+   "ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS ncurses_cfg.h:ncurses_tst.hin" ;;
+-  *) { { echo "$as_me:15434: error: invalid argument: $ac_config_target" >&5
++  *) { { echo "$as_me:15197: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+@@ -15694,7 +15457,7 @@
+   esac
+ 
+   if test x"$ac_file" != x-; then
+-    { echo "$as_me:15697: creating $ac_file" >&5
++    { echo "$as_me:15460: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+@@ -15712,7 +15475,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:15715: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:15478: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -15725,7 +15488,7 @@
+            echo $srcdir/$f
+          else
+            # /dev/null tree
+-           { { echo "$as_me:15728: error: cannot find input file: $f" >&5
++           { { echo "$as_me:15491: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -15791,7 +15554,7 @@
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+-  test x"$ac_file" != x- && { echo "$as_me:15794: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:15557: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ 
+   # First look for the input files in the build tree, otherwise in the
+@@ -15802,7 +15565,7 @@
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:15805: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:15568: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+@@ -15815,7 +15578,7 @@
+            echo $srcdir/$f
+          else
+            # /dev/null tree
+-           { { echo "$as_me:15818: error: cannot find input file: $f" >&5
++           { { echo "$as_me:15581: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+@@ -15873,7 +15636,7 @@
+   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:15876: $ac_file is unchanged" >&5
++      { echo "$as_me:15639: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+diff -Naur ncurses-5.9.orig/test/configure.in ncurses-5.9/test/configure.in
+--- ncurses-5.9.orig/test/configure.in	2011-03-22 05:15:08.000000000 -0400
++++ ncurses-5.9/test/configure.in	2011-04-16 13:56:50.779211046 -0400
+@@ -28,7 +28,7 @@
+ dnl
+ dnl Author: Thomas E. Dickey 1996, etc.
+ dnl
+-dnl $Id: configure.in,v 1.90 2011/03/22 09:15:08 tom Exp $
++dnl $Id: configure.in,v 1.93 2011/04/09 20:11:47 tom Exp $
+ dnl This is a simple configuration-script for the ncurses test programs that
+ dnl allows the test-directory to be separately configured against a reference
+ dnl system (i.e., sysvr4 curses)
+@@ -101,16 +101,21 @@
+ CF_ENABLE_WARNINGS
+ 
+ CF_DISABLE_LEAKS
+-CF_WITH_CURSES_DIR
+ 
+-dnl SunOS 4.x
+-AC_ARG_WITH(5lib,
+-	[  --with-5lib             use SunOS sysv-libraries],
+-	[LIBS="-L/usr/5lib $LIBS"
+-	 CPPFLAGS="$CPPFLAGS -I/usr/5include"])
++dnl ---------------------------------------------------------------------------
++AC_MSG_CHECKING(if you want to check for wide-character functions)
++CF_ARG_DISABLE(widec,
++	[--disable-widec           disable checks for wide-character functions],
++	cf_enable_widec=no,
++	cf_enable_widec=yes,
++	yes)
++AC_MSG_RESULT($cf_enable_widec)
++
++CF_WITH_CURSES_DIR
+ 
+ dnl ---------------------------------------------------------------------------
+ dnl NcursesW, installed in conventional location
++AC_MSG_CHECKING(for specified curses library type)
+ AC_ARG_WITH(ncursesw,
+ 	[  --with-ncursesw         use wide ncurses-libraries (installed)],
+ 	[cf_cv_screen=ncursesw],[
+@@ -122,10 +127,20 @@
+ 
+ AC_ARG_WITH(pdcurses,
+ 	[  --with-pdcurses         compile/link with pdcurses X11 library],
+-	[cf_cv_screen=pdcurses])])])
++	[cf_cv_screen=pdcurses],[
++
++AC_ARG_WITH(curses-colr,
++	[  --with-curses-colr      compile/link with HPUX 10.x color-curses],
++	[cf_cv_screen=curses_colr],[
++
++AC_ARG_WITH(curses-5lib,
++	[  --with-curses-5lib      compile/link with SunOS 5lib curses],
++	[cf_cv_screen=curses_5lib])])])])])
++
++AC_MSG_RESULT($cf_cv_screen)
+ 
+ case $cf_cv_screen in
+-curses)
++curses|curses_*)
+ 	CF_CURSES_CONFIG
+ 	CF_NETBSD_FORM_H
+ 	CF_NETBSD_MENU_H
+@@ -187,16 +202,21 @@
+ 
+ AC_CHECK_FUNCS( \
+ gettimeofday \
++strdup \
++)
++
++if test "$cf_enable_widec" = yes; then
++AC_CHECK_FUNCS( \
+ mblen \
+ mbrlen \
+ mbrtowc \
+ mbsrtowcs \
+ mbstowcs \
+ mbtowc \
+-strdup \
+ wcsrtombs \
+ wcstombs \
+ )
++fi
+ 
+ CF_CURSES_FUNCS( \
+ chgat \
+@@ -235,46 +255,55 @@
+ 
+ CF_NCURSES_EXT_FUNCS
+ 
+-AC_CACHE_CHECK(for wide-character functions,cf_cv_widechar_funcs,[
+-AC_TRY_LINK([
++if test "$cf_enable_widec" = yes
++then
++	AC_CACHE_CHECK(for wide-character functions,cf_cv_widechar_funcs,[
++	AC_TRY_LINK([
+ #include <${cf_cv_ncurses_header:-curses.h}>],
+-[
+-	static wchar_t src_wchar[2];
+-	static cchar_t dst_cchar;
+-	setcchar(&dst_cchar, src_wchar, A_NORMAL, 0, (void *) 0);
+-	],
+-	[cf_cv_widechar_funcs=yes],
+-	[cf_cv_widechar_funcs=no])
+-])
+-if test "$cf_cv_widechar_funcs" != no ; then
+-	AC_DEFINE(USE_WIDEC_SUPPORT,1)
++	[
++		static wchar_t src_wchar[2];
++		static cchar_t dst_cchar;
++		setcchar(&dst_cchar, src_wchar, A_NORMAL, 0, (void *) 0);
++		],
++		[cf_cv_widechar_funcs=yes],
++		[cf_cv_widechar_funcs=no])
++	])
++	if test "$cf_cv_widechar_funcs" != no ; then
++		AC_DEFINE(USE_WIDEC_SUPPORT,1)
++	else
++		AC_DEFINE(USE_WIDEC_SUPPORT,0)
++	fi
+ else
+ 	AC_DEFINE(USE_WIDEC_SUPPORT,0)
+ fi
+ 
+-AC_FUNC_VFORK
+ CF_SYS_TIME_SELECT
+ CF_FUNC_CURSES_VERSION
+ CF_CURSES_ACS_MAP
+-CF_CURSES_WACS_MAP
+-CF_CURSES_WACS_SYMBOLS
+ 
+-CF_CURSES_CHECK_TYPE(attr_t,long)
+-
+-CF_WCHAR_TYPE(mbstate_t, NCURSES_MBSTATE_T, NCURSES_OK_MBSTATE_T)
+-CF_WCHAR_TYPE(wchar_t,   NCURSES_WCHAR_T,   NCURSES_OK_WCHAR_T)
+-CF_WCHAR_TYPE(wint_t,    NCURSES_WINT_T,    NCURSES_OK_WINT_T)
+-
+-if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
+-	CF_CURSES_CHECK_TYPE(mbstate_t,long)
++if test "$cf_enable_widec" = yes; then
++	CF_CURSES_WACS_MAP
++	CF_CURSES_WACS_SYMBOLS
+ fi
+ 
+-if test "$NCURSES_OK_WCHAR_T" = 0 ; then
+-	CF_CURSES_CHECK_TYPE(wchar_t,long)
+-fi
++CF_CURSES_CHECK_TYPE(attr_t,long)
+ 
+-if test "$NCURSES_OK_WINT_T" = 0 ; then
+-	CF_CURSES_CHECK_TYPE(wint_t,long)
++if test "$cf_enable_widec" = yes; then
++	CF_WCHAR_TYPE(mbstate_t, NCURSES_MBSTATE_T, NCURSES_OK_MBSTATE_T)
++	CF_WCHAR_TYPE(wchar_t,   NCURSES_WCHAR_T,   NCURSES_OK_WCHAR_T)
++	CF_WCHAR_TYPE(wint_t,    NCURSES_WINT_T,    NCURSES_OK_WINT_T)
++
++	if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
++		CF_CURSES_CHECK_TYPE(mbstate_t,long)
++	fi
++
++	if test "$NCURSES_OK_WCHAR_T" = 0 ; then
++		CF_CURSES_CHECK_TYPE(wchar_t,long)
++	fi
++
++	if test "$NCURSES_OK_WINT_T" = 0 ; then
++		CF_CURSES_CHECK_TYPE(wint_t,long)
++	fi
+ fi
+ 
+ CF_CURSES_CHECK_DATA(boolnames)
+diff -Naur ncurses-5.9.orig/test/test.priv.h ncurses-5.9/test/test.priv.h
+--- ncurses-5.9.orig/test/test.priv.h	2011-03-22 05:15:45.000000000 -0400
++++ ncurses-5.9/test/test.priv.h	2011-04-16 13:56:50.779211046 -0400
+@@ -29,7 +29,7 @@
+ /****************************************************************************
+  *  Author: Thomas E. Dickey                    1996-on                     *
+  ****************************************************************************/
+-/* $Id: test.priv.h,v 1.103 2011/03/22 09:15:45 tom Exp $ */
++/* $Id: test.priv.h,v 1.105 2011/04/09 20:41:51 tom Exp $ */
+ 
+ #ifndef __TEST_PRIV_H
+ #define __TEST_PRIV_H 1
+@@ -222,6 +222,13 @@
+ #define NO_LEAKS 0
+ #endif
+ 
++/*
++ * Workaround for HPUX
++ */
++#if defined(__hpux) && !defined(NCURSES_VERSION)
++#define _ACS_COMPAT_CODE	/* needed for acs_map vs __acs_map */
++#endif
++
+ #include <stdlib.h>
+ #include <stdarg.h>
+ #include <string.h>
+@@ -269,17 +276,14 @@
+ 
+ /*
+  * Not all curses.h implementations include unctrl.h,
+- * Solaris 10 xpg4 for example.
+  */
+-#if defined(NCURSES_VERSION) || defined(_XOPEN_CURSES)
+-#if defined(HAVE_NCURSESW_NCURSES_H)
++#if defined(HAVE_NCURSESW_UNCTRL_H)
+ #include <ncursesw/unctrl.h>
+-#elif defined(HAVE_NCURSES_NCURSES_H)
++#elif defined(HAVE_NCURSES_UNCTRL_H)
+ #include <ncurses/unctrl.h>
+-#else
++#elif defined(HAVE_UNCTRL_H)
+ #include <unctrl.h>
+ #endif
+-#endif
+ 
+ #if HAVE_GETOPT_H
+ #include <getopt.h>
