288 files changed, 2347 insertions, 1431 deletions

diff --git a/Build/source/utils/README b/Build/source/utils/README
index 0c258b5928e..3a3a16aee76 100644
--- a/Build/source/utils/README
+++ b/Build/source/utils/README
@@ -12,7 +12,7 @@ asymptote 2.02 - checked 12jul10
 chktex 1.6.4 - checked 3may10
   http://baruch.ev-en.org/proj/chktex/chktex-1.6.4.tar.gz
 
-dialog 1.1-20100119 - checked 21jan10
+dialog 1.1-20100428 - checked 26oct10
   ftp://invisible-island.net/dialog/dialog.tar.gz
 
 ps2eps 1.64 - checked 19feb08
diff --git a/Build/source/utils/dialog/configure b/Build/source/utils/dialog/configure
index ce045552b8a..d944df3e3d8 100755
--- a/Build/source/utils/dialog/configure
+++ b/Build/source/utils/dialog/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for dialog for TeX Live 1.1-20100119.
+# Generated by GNU Autoconf 2.68 for dialog for TeX Live 1.1-20100428.
 #
 # Report bugs to <peb@mppmu.mpg.de>.
 #
@@ -559,12 +559,12 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='dialog for TeX Live'
 PACKAGE_TARNAME='dialog-for-tex-live'
-PACKAGE_VERSION='1.1-20100119'
-PACKAGE_STRING='dialog for TeX Live 1.1-20100119'
+PACKAGE_VERSION='1.1-20100428'
+PACKAGE_STRING='dialog for TeX Live 1.1-20100428'
 PACKAGE_BUGREPORT='peb@mppmu.mpg.de'
 PACKAGE_URL=''
 
-ac_unique_file="dialog-1.1-20100119/dialog.c"
+ac_unique_file="dialog-1.1-20100428/dialog.c"
 enable_option_checking=no
 ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
@@ -1208,7 +1208,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures dialog for TeX Live 1.1-20100119 to adapt to many kinds of systems.
+\`configure' configures dialog for TeX Live 1.1-20100428 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1275,7 +1275,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of dialog for TeX Live 1.1-20100119:";;
+     short | recursive ) echo "Configuration of dialog for TeX Live 1.1-20100428:";;
    esac
   cat <<\_ACEOF
 
@@ -1363,7 +1363,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-dialog for TeX Live configure 1.1-20100119
+dialog for TeX Live configure 1.1-20100428
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1418,7 +1418,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by dialog for TeX Live $as_me 1.1-20100119, which was
+It was created by dialog for TeX Live $as_me 1.1-20100428, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2236,7 +2236,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='dialog-for-tex-live'
- VERSION='1.1-20100119'
+ VERSION='1.1-20100428'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3313,7 +3313,7 @@ fi
 
 
 
-DIALOG_TREE=dialog-1.1-20100119
+DIALOG_TREE=dialog-1.1-20100428
 
 
 # Initialize the subdir machinery
@@ -3906,7 +3906,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by dialog for TeX Live $as_me 1.1-20100119, which was
+This file was extended by dialog for TeX Live $as_me 1.1-20100428, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -3963,7 +3963,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-dialog for TeX Live config.status 1.1-20100119
+dialog for TeX Live config.status 1.1-20100428
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/utils/dialog/configure.ac b/Build/source/utils/dialog/configure.ac
index a1e950ef8fe..b994ed44f3a 100644
--- a/Build/source/utils/dialog/configure.ac
+++ b/Build/source/utils/dialog/configure.ac
@@ -6,7 +6,7 @@ dnl   This file is free software; the copyright holder
 dnl   gives unlimited permission to copy and/or distribute it,
 dnl   with or without modifications, as long as this notice is preserved.
 dnl
-m4_define([dialog_version], [1.1-20100119])[]dnl using unmodified dialog source tree
+m4_define([dialog_version], [1.1-20100428])[]dnl using unmodified dialog source tree
 AC_PREREQ([2.65])
 AC_INIT([dialog for TeX Live], dialog_version, [peb@mppmu.mpg.de])
 AC_CONFIG_SRCDIR([dialog-]dialog_version[/dialog.c])
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/VERSION b/Build/source/utils/dialog/dialog-1.1-20100119/VERSION
deleted file mode 100644
index 8a14058d0c4..00000000000
--- a/Build/source/utils/dialog/dialog-1.1-20100119/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-7:0:0	1.1	20100119
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/mkdirs.sh b/Build/source/utils/dialog/dialog-1.1-20100119/mkdirs.sh
deleted file mode 100755
index 59fc39c21ae..00000000000
--- a/Build/source/utils/dialog/dialog-1.1-20100119/mkdirs.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#! /bin/sh
-# $Id: mkdirs.sh,v 1.5 2007/03/25 22:29:46 tom Exp $
-# -----------------------------------------------------------------------------
-# mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Last modified: 1994-03-25
-# Public domain
-# -----------------------------------------------------------------------------
-
-errstatus=0
-umask 022
-
-for file in ${1+"$@"} ; do
-   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-   shift
-
-   pathcomp=
-   for d in ${1+"$@"} ; do
-     pathcomp="$pathcomp$d"
-     case "$pathcomp" in
-       -* ) pathcomp=./$pathcomp ;;
-     esac
-
-     if test ! -d "$pathcomp"; then
-        echo "mkdir $pathcomp" 1>&2
-        case "$pathcomp" in
-          [abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ]: )
-            ;;               # DOSISH systems
-          * )
-            mkdir "$pathcomp"
-            errstatus=$?
-            if test $errstatus != 0
-            then
-               # may have failed if invoked in a parallel "make -j# install"
-               if test -d "$pathcomp"
-               then
-                  errstatus=0
-               fi
-            fi
-            ;;
-        esac
-     fi
-
-     pathcomp="$pathcomp/"
-   done
-done
-
-exit $errstatus
-
-# mkinstalldirs ends here
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/gauge3 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/gauge3
deleted file mode 100755
index 1792e8321d7..00000000000
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/gauge3
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-# $Id: gauge3,v 1.6 2010/01/13 10:20:03 tom Exp $
-
-. ./setup-vars
-
-(
-sleep 1
-for n in 0 1 2 3 4 5 4 3 2 1 0
-do
-PCT=`expr $n \* $n \* 4`
-cat <<EOF
-XXX
-$PCT
-The new\n\
-message ($PCT percent)
-XXX
-EOF
-sleep 1
-done
-) |
-
-$DIALOG --title "GAUGE" "$@" --gauge "Hi, this is a gauge widget" 10 70 0
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/CHANGES b/Build/source/utils/dialog/dialog-1.1-20100428/CHANGES
index a5b518880b6..3ed4d0d00af 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/CHANGES
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/CHANGES
@@ -1,9 +1,45 @@
--- $Id: CHANGES,v 1.291 2010/01/19 00:33:27 tom Exp $
+-- $Id: CHANGES,v 1.300 2010/04/28 21:27:22 tom Exp $
 -- Thomas E. Dickey <dickey@invisible-island.net>
 
 This version of dialog was originally from a Debian snapshot.  I've done this
 to it:
 
+2010/04/28
+	+ several improvements to configure script:
+	  + modify CF_CURSES_TERM_H to handle cases such as cygwin where
+	    packager has installed curses.h and term.h in different
+	    directories, e.g., to wedge in a termcap library.
+	  + modify CF_XOPEN_SOURCE, adding special case for OpenSolaris
+	  + modify CF_MAKE_TAGS to add check for exctags and exetags, prefer to
+	    ctags and etags to work around pkgsrc (NetBSD) renaming.
+	  + correct CF_FIND_LINKAGE, setting cache variable for library_file in
+	    the special case where no directory search is made.
+	  + improve CF_GCC_VERSION, suppress stderr for c89 alias of gcc.
+	  + improve CF_GCC_WARNINGS, moving -W and -Wall into the list to
+	    check, since c89 alias for gcc complains about these options.
+	  + modify CF_HEADER_PATH, to not search for variations of everything
+	    in the current include-path
+	  + use "mkdir -p", remove mkdirs.sh
+	  + use CF_CURSES_HEADER to fill in possible subdirectory used for
+	    ncurses header filename.
+	  + modify CF_XOPEN_CURSES to work around current ncurse header loss of
+	    predefinition of _XOPEN_SOURCE_EXTENDED
+	  + add "--disable-rpath-hack" option, along with scripting to add
+	    rpath option to libraries found in unusual places.
+	+ modify pause widget to autosize like gauge, and to omit the area for
+	  buttons when none are displayed.
+	+ fix an infinite loop in dlg_button_layout() if there are no buttons
+	  to display (Debian #579390).
+	+ add makefile rules for generating html, etc., documentation from
+	  nroff.
+	> patches by Samuel Martín Moro
+	+ reset errors in tailbox before reading new character.
+	+ modify dlg_draw_scrollbar(), omitting hiding percentages in boxes
+	  when no arrows or scrollbar are needed.
+	+ correct value of row for scrollbars in formbox.
+	+ update es.po from
+		http://translationproject.org/latest/dialog/
+
 2010/01/19
 	+ split up binding tables in inputbox and similar widgets to avoid
 	  conflict between cursor-key use for input-string versus navigation
@@ -1486,3 +1522,5 @@ The relevant portions of the Debian change log for the original version
 	+ Added '^U' support in input box (Bug #9915, patch by joey@debian.org).
 	+ Wrote patch to fix core-dumping problem (Bug #13170).  Sven Rudolph
 	  <sr1@inf.tu-dresden.de>:
+
+-- vile:fk=8bit
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/COPYING b/Build/source/utils/dialog/dialog-1.1-20100428/COPYING
index 8add30ad590..8add30ad590 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/COPYING
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/COPYING
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/README b/Build/source/utils/dialog/dialog-1.1-20100428/README
index b2c9b8595db..b2c9b8595db 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/README
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/README
diff --git a/Build/source/utils/dialog/dialog-1.1-20100428/VERSION b/Build/source/utils/dialog/dialog-1.1-20100428/VERSION
new file mode 100644
index 00000000000..06853702a84
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/VERSION
@@ -0,0 +1 @@
+7:1:0	1.1	20100428
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/aclocal.m4 b/Build/source/utils/dialog/dialog-1.1-20100428/aclocal.m4
index dd7309f85cb..cc00e7db618 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/aclocal.m4
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/aclocal.m4
@@ -4,7 +4,7 @@ dnl
 dnl see
 dnl http://invisible-island.net/autoconf/ 
 dnl
-dnl $Id: aclocal.m4,v 1.72 2010/01/18 01:38:22 tom Exp $
+dnl $Id: aclocal.m4,v 1.75 2010/04/28 20:36:28 tom Exp $
 dnl ---------------------------------------------------------------------------
 dnl ---------------------------------------------------------------------------
 dnl AM_GNU_GETTEXT version: 11 updated: 2004/01/26 20:58:40
@@ -1153,20 +1153,20 @@ ${cf_cv_main_return-return}(foo == 0);
 done
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_HEADER version: 1 updated: 2005/12/31 13:28:25
+dnl CF_CURSES_HEADER version: 2 updated: 2010/04/28 06:02:16
 dnl ----------------
 dnl Find a "curses" header file, e.g,. "curses.h", or one of the more common
 dnl variations of ncurses' installs.
 dnl
-dnl See also CF_NCURSES_HEADER, which sets the same cache variable.
+dnl $1 = ncurses when looking for ncurses, or is empty
 AC_DEFUN([CF_CURSES_HEADER],[
 AC_CACHE_CHECK(if we have identified curses headers,cf_cv_ncurses_header,[
 cf_cv_ncurses_header=none
-for cf_header in \
+for cf_header in ifelse($1,,,[ \
+    $1/curses.h \
+	$1/ncurses.h]) \
 	curses.h \
-	ncurses.h \
-	ncurses/curses.h \
-	ncurses/ncurses.h
+	ncurses.h ifelse($1,,[ncurses/curses.h ncurses/ncurses.h])
 do
 AC_TRY_COMPILE([#include <${cf_header}>],
 	[initscr(); tgoto("?", 0,0)],
@@ -1284,7 +1284,7 @@ fi
 
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_TERM_H version: 6 updated: 2003/11/06 19:59:57
+dnl CF_CURSES_TERM_H version: 7 updated: 2010/01/24 18:40:06
 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,
@@ -1292,9 +1292,10 @@ dnl as well as in misconfigured systems (e.g., gcc configured for Solaris 2.4
 dnl running with Solaris 2.5.1).
 AC_DEFUN([CF_CURSES_TERM_H],
 [
+AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl
+
 AC_CACHE_CHECK(for term.h, cf_cv_term_header,[
 
-AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl
 # 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 \
@@ -1309,13 +1310,34 @@ do
 	 break],
 	[cf_cv_term_header=no])
 done
+
+case $cf_cv_term_header in #(vi
+no)
+	# If curses is ncurses, some packagers still mess it up by trying to make
+	# us use GNU termcap.  This handles the most common case.
+	for cf_header in ncurses/term.h ncursesw/term.h
+	do
+		AC_TRY_COMPILE([
+#include <${cf_cv_ncurses_header-curses.h}>
+#ifdef NCURSES_VERSION
+#include <${cf_header}>
+#else
+make an error
+#endif],
+			[WINDOW *x],
+			[cf_cv_term_header=$cf_header
+			 break],
+			[cf_cv_term_header=no])
+	done
+	;;
+esac
 ])
 
 case $cf_cv_term_header in #(vi
 term.h) #(vi
 	AC_DEFINE(HAVE_TERM_H)
 	;;
-ncurses/term.h)
+ncurses/term.h) #(vi
 	AC_DEFINE(HAVE_NCURSES_TERM_H)
 	;;
 ncursesw/term.h)
@@ -1366,6 +1388,25 @@ AC_SUBST(SHOW_CC)
 AC_SUBST(ECHO_CC)
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_DISABLE_RPATH_HACK version: 1 updated: 2010/04/11 10:54:00
+dnl ---------------------
+dnl The rpath-hack makes it simpler to build programs, particularly with the
+dnl *BSD ports which may have essential libraries in unusual places.  But it
+dnl can interfere with building an executable for the base system.  Use this
+dnl option in that case.
+AC_DEFUN([CF_DISABLE_RPATH_HACK],
+[
+AC_MSG_CHECKING(if rpath should be not be set)
+CF_ARG_DISABLE(rpath-hack,
+	[  --disable-rpath-hack    don't add rpath options for additional libraries],
+	[cf_disable_rpath_hack=yes],
+	[cf_disable_rpath_hack=no])
+AC_MSG_RESULT($cf_disable_rpath_hack)
+if test "$cf_disable_rpath_hack" = no ; then
+	CF_RPATH_HACK
+fi
+])
+dnl ---------------------------------------------------------------------------
 dnl CF_FIND_HEADER version: 2 updated: 2007/07/29 11:32:00
 dnl --------------
 dnl Find a header file, searching for it if it is not already in the include
@@ -1448,7 +1489,7 @@ fi
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_FIND_LINKAGE version: 13 updated: 2008/12/24 07:59:55
+dnl CF_FIND_LINKAGE version: 16 updated: 2010/04/21 06:20:50
 dnl ---------------
 dnl Find a library (specifically the linkage used in the code fragment),
 dnl searching for it if it is not already in the library path.
@@ -1477,9 +1518,19 @@ cf_cv_library_path_$3=
 
 CF_MSG_LOG([Starting [FIND_LINKAGE]($3,$6)])
 
-AC_TRY_LINK([$1],[$2],
-    cf_cv_find_linkage_$3=yes,[
+AC_TRY_LINK([$1],[$2],[
+	cf_cv_find_linkage_$3=yes
+],[
+
+cf_save_LIBS="$LIBS"
+LIBS="-l$3 $7 $cf_save_LIBS"
+
+AC_TRY_LINK([$1],[$2],[
+	cf_cv_find_linkage_$3=yes
+	cf_cv_library_file_$3="-l$3"
+],[
     cf_cv_find_linkage_$3=no
+	LIBS="$cf_save_LIBS"
 
     CF_VERBOSE(find linkage for $3 library)
     CF_MSG_LOG([Searching for headers in [FIND_LINKAGE]($3,$6)])
@@ -1549,12 +1600,13 @@ AC_TRY_LINK([$1],[$2],
       cf_cv_find_linkage_$3=no
     fi
     ],$7)
+])
 
 if test "$cf_cv_find_linkage_$3" = yes ; then
 ifelse([$4],,[
-  CF_ADD_INCDIR($cf_cv_header_path_$3)
-  CF_ADD_LIBDIR($cf_cv_library_path_$3)
-  LIBS="-l$3 $LIBS"
+	CF_ADD_INCDIR($cf_cv_header_path_$3)
+	CF_ADD_LIBDIR($cf_cv_library_path_$3)
+	LIBS="-l$3 $LIBS"
 ],[$4])
 else
 ifelse([$5],,AC_MSG_WARN(Cannot find $3 library),[$5])
@@ -1711,7 +1763,7 @@ rm -rf conftest*
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_GCC_VERSION version: 4 updated: 2005/08/27 09:53:42
+dnl CF_GCC_VERSION version: 5 updated: 2010/04/24 11:02:31
 dnl --------------
 dnl Find version of gcc
 AC_DEFUN([CF_GCC_VERSION],[
@@ -1719,13 +1771,13 @@ AC_REQUIRE([AC_PROG_CC])
 GCC_VERSION=none
 if test "$GCC" = yes ; then
 	AC_MSG_CHECKING(version of $CC)
-	GCC_VERSION="`${CC} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`"
+	GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`"
 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
 	AC_MSG_RESULT($GCC_VERSION)
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_GCC_WARNINGS version: 24 updated: 2009/02/01 15:21:00
+dnl CF_GCC_WARNINGS version: 25 updated: 2010/04/24 11:03:31
 dnl ---------------
 dnl Check if the compiler supports useful warning options.  There's a few that
 dnl we don't use, simply because they're too noisy:
@@ -1793,10 +1845,10 @@ elif test "$GCC" = yes
 then
 	AC_CHECKING([for $CC warning options])
 	cf_save_CFLAGS="$CFLAGS"
-	EXTRA_CFLAGS="-W -Wall"
+	EXTRA_CFLAGS=
 	cf_warn_CONST=""
 	test "$with_ext_const" = yes && cf_warn_CONST="Wwrite-strings"
-	for cf_opt in \
+	for cf_opt in W Wall \
 		Wbad-function-cast \
 		Wcast-align \
 		Wcast-qual \
@@ -1875,7 +1927,7 @@ AC_SUBST(PACKAGE_CONFIG)
 EXTRA_OUTPUT="$EXTRA_OUTPUT headers-sh:$srcdir/headers-sh.in"
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_HEADER_PATH version: 10 updated: 2010/01/17 20:36:17
+dnl CF_HEADER_PATH version: 11 updated: 2010/04/21 06:20:50
 dnl --------------
 dnl Construct a search-list of directories for a nonstandard header-file
 dnl
@@ -1885,6 +1937,8 @@ dnl	$2 = the package name
 AC_DEFUN([CF_HEADER_PATH],
 [
 $1=
+
+# collect the current set of include-directories from compiler flags
 cf_header_path_list=""
 if test -n "${CFLAGS}${CPPFLAGS}" ; then
 	for cf_header_path in $CPPFLAGS $CFLAGS
@@ -1892,13 +1946,13 @@ if test -n "${CFLAGS}${CPPFLAGS}" ; then
 		case $cf_header_path in #(vi
 		-I*)
 			cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
-			CF_ADD_SUBDIR_PATH($1,$2,include,$cf_header_path,NONE)
-			cf_header_path_list="$cf_header_path_list [$]$1"
+			cf_header_path_list="$cf_header_path_list $cf_header_path"
 			;;
 		esac
 	done
 fi
 
+# add the variations for the package we are looking for
 CF_SUBDIR_PATH($1,$2,include)
 
 test "$includedir" != NONE && \
@@ -1915,7 +1969,7 @@ test -d "$oldincludedir" && {
 	test -d $oldincludedir/$2 && $1="[$]$1 $oldincludedir/$2"
 }
 
-$1="$cf_header_path_list [$]$1"
+$1="[$]$1 $cf_header_path_list"
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_HELP_MESSAGE version: 3 updated: 1998/01/14 10:56:23
@@ -2065,7 +2119,61 @@ ifdef([AC_FUNC_FSEEKO],[
 ])
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_LIBRARY_PATH version: 8 updated: 2008/12/07 19:38:31
+dnl CF_LD_RPATH_OPT version: 2 updated: 2010/03/27 19:27:54
+dnl ---------------
+dnl For the given system and compiler, find the compiler flags to pass to the
+dnl loader to use the "rpath" feature.
+AC_DEFUN([CF_LD_RPATH_OPT],
+[
+AC_REQUIRE([CF_CHECK_CACHE])
+
+LD_RPATH_OPT=
+AC_MSG_CHECKING(for an rpath option)
+case $cf_cv_system_name in #(vi
+irix*) #(vi
+	if test "$GCC" = yes; then
+		LD_RPATH_OPT="-Wl,-rpath,"
+	else
+		LD_RPATH_OPT="-rpath "
+	fi
+	;;
+linux*|gnu*|k*bsd*-gnu) #(vi
+	LD_RPATH_OPT="-Wl,-rpath,"
+	;;
+openbsd[[2-9]].*) #(vi
+	LD_RPATH_OPT="-Wl,-rpath,"
+	;;
+freebsd*) #(vi
+	LD_RPATH_OPT="-rpath "
+	;;
+netbsd*) #(vi
+	LD_RPATH_OPT="-Wl,-rpath,"
+	;;
+osf*|mls+*) #(vi
+	LD_RPATH_OPT="-rpath "
+	;;
+solaris2*) #(vi
+	LD_RPATH_OPT="-R"
+	;;
+*)
+	;;
+esac
+AC_MSG_RESULT($LD_RPATH_OPT)
+
+case "x$LD_RPATH_OPT" in #(vi
+x-R*)
+	AC_MSG_CHECKING(if we need a space after rpath option)
+	cf_save_LIBS="$LIBS"
+	LIBS="${LD_RPATH_OPT}$libdir $LIBS"
+	AC_TRY_LINK(, , cf_rpath_space=no, cf_rpath_space=yes)
+	LIBS="$cf_save_LIBS"
+	AC_MSG_RESULT($cf_rpath_space)
+	test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
+	;;
+esac
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_LIBRARY_PATH version: 9 updated: 2010/03/28 12:52:50
 dnl ---------------
 dnl Construct a search-list of directories for a nonstandard library-file
 dnl
@@ -2074,6 +2182,7 @@ dnl	$1 = the variable to return as result
 dnl	$2 = the package name
 AC_DEFUN([CF_LIBRARY_PATH],
 [
+$1=
 cf_library_path_list=""
 if test -n "${LDFLAGS}${LIBS}" ; then
 	for cf_library_path in $LDFLAGS $LIBS
@@ -2150,16 +2259,20 @@ CF_EOF
 AC_SUBST(cf_cv_makeflags)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_MAKE_TAGS version: 2 updated: 2000/10/04 09:18:40
+dnl CF_MAKE_TAGS version: 5 updated: 2010/04/03 20:07:32
 dnl ------------
 dnl Generate tags/TAGS targets for makefiles.  Do not generate TAGS if we have
 dnl a monocase filesystem.
 AC_DEFUN([CF_MAKE_TAGS],[
 AC_REQUIRE([CF_MIXEDCASE_FILENAMES])
-AC_CHECK_PROG(MAKE_LOWER_TAGS, ctags, yes, no)
+
+AC_CHECK_PROGS(CTAGS, exctags ctags)
+AC_CHECK_PROGS(ETAGS, exetags etags)
+
+AC_CHECK_PROG(MAKE_LOWER_TAGS, ${CTAGS-ctags}, yes, no)
 
 if test "$cf_cv_mixedcase" = yes ; then
-	AC_CHECK_PROG(MAKE_UPPER_TAGS, etags, yes, no)
+	AC_CHECK_PROG(MAKE_UPPER_TAGS, ${ETAGS-etags}, yes, no)
 else
 	MAKE_UPPER_TAGS=no
 fi
@@ -2169,13 +2282,17 @@ if test "$MAKE_UPPER_TAGS" = yes ; then
 else
 	MAKE_UPPER_TAGS="#"
 fi
-AC_SUBST(MAKE_UPPER_TAGS)
 
 if test "$MAKE_LOWER_TAGS" = yes ; then
 	MAKE_LOWER_TAGS=
 else
 	MAKE_LOWER_TAGS="#"
 fi
+
+AC_SUBST(CTAGS)
+AC_SUBST(ETAGS)
+
+AC_SUBST(MAKE_UPPER_TAGS)
 AC_SUBST(MAKE_LOWER_TAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
@@ -2310,7 +2427,7 @@ printf("old\n");
 	,[$1=no])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_NCURSES_CONFIG version: 5 updated: 2009/01/11 15:31:22
+dnl CF_NCURSES_CONFIG version: 6 updated: 2010/04/28 06:02:16
 dnl -----------------
 dnl Tie together the configure-script macros for ncurses.
 dnl Prefer the "-config" script from ncurses 5.6, to simplify analysis.
@@ -2326,11 +2443,12 @@ AC_PATH_PROGS(NCURSES_CONFIG,${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-
 
 if test "$NCURSES_CONFIG" != none ; then
 
-cf_cv_ncurses_header=curses.h
-
 CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`"
 LIBS="`$NCURSES_CONFIG --libs` $LIBS"
 
+# even with config script, some packages use no-override for curses.h
+CF_CURSES_HEADER(ifelse($1,,ncurses,$1))
+
 dnl like CF_NCURSES_CPPFLAGS
 AC_DEFINE(NCURSES)
 
@@ -2853,14 +2971,103 @@ $1=`echo "$2" | \
 		-e 's/-[[UD]]'"$3"'\(=[[^ 	]]*\)\?[$]//g'`
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_SUBDIR_PATH version: 5 updated: 2007/07/29 09:55:12
+dnl CF_RPATH_HACK version: 8 updated: 2010/04/17 15:38:58
+dnl -------------
+AC_DEFUN([CF_RPATH_HACK],
+[
+AC_REQUIRE([CF_LD_RPATH_OPT])
+AC_MSG_CHECKING(for updated LDFLAGS)
+if test -n "$LD_RPATH_OPT" ; then
+	AC_MSG_RESULT(maybe)
+
+	AC_CHECK_PROGS(cf_ldd_prog,ldd,no)
+	cf_rpath_list="/usr/lib /lib"
+	if test "$cf_ldd_prog" != no
+	then
+AC_TRY_LINK([#include <stdio.h>],
+		[printf("Hello");],
+		[cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[[ 	]]/%/%' -e 's%/[[^/]][[^/]]*$%%' |sort -u`])
+	fi
+
+	CF_VERBOSE(...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS)
+
+	CF_RPATH_HACK_2(LDFLAGS)
+	CF_RPATH_HACK_2(LIBS)
+
+	CF_VERBOSE(...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS)
+fi
+AC_SUBST(EXTRA_LDFLAGS)
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_RPATH_HACK_2 version: 6 updated: 2010/04/17 16:31:24
+dnl ---------------
+dnl Do one set of substitutions for CF_RPATH_HACK, adding an rpath option to
+dnl EXTRA_LDFLAGS for each -L option found.
+dnl
+dnl $cf_rpath_list contains a list of directories to ignore.
+dnl
+dnl $1 = variable name to update.  The LDFLAGS variable should be the only one,
+dnl      but LIBS often has misplaced -L options.
+AC_DEFUN([CF_RPATH_HACK_2],
+[
+CF_VERBOSE(...checking $1 [$]$1)
+
+cf_rpath_dst=
+for cf_rpath_src in [$]$1
+do
+	case $cf_rpath_src in #(vi
+	-L*) #(vi
+
+		# check if this refers to a directory which we will ignore
+		cf_rpath_skip=no
+		if test -n "$cf_rpath_list"
+		then
+			for cf_rpath_item in $cf_rpath_list
+			do
+				if test "x$cf_rpath_src" = "x-L$cf_rpath_item"
+				then
+					cf_rpath_skip=yes
+					break
+				fi
+			done
+		fi
+
+		if test "$cf_rpath_skip" = no
+		then
+			# transform the option
+			if test "$LD_RPATH_OPT" = "-R " ; then
+				cf_rpath_tmp=`echo "$cf_rpath_src" |sed -e "s%-L%-R %"`
+			else
+				cf_rpath_tmp=`echo "$cf_rpath_src" |sed -e "s%-L%$LD_RPATH_OPT%"`
+			fi
+
+			# if we have not already added this, add it now
+			cf_rpath_tst=`echo "$EXTRA_LDFLAGS" | sed -e "s%$cf_rpath_tmp %%"`
+			if test "x$cf_rpath_tst" = "x$EXTRA_LDFLAGS"
+			then
+				CF_VERBOSE(...Filter $cf_rpath_src ->$cf_rpath_tmp)
+				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+			fi
+		fi
+		;;
+	esac
+	cf_rpath_dst="$cf_rpath_dst $cf_rpath_src"
+done
+$1=$cf_rpath_dst
+
+CF_VERBOSE(...checked $1 [$]$1)
+AC_SUBST(EXTRA_LDFLAGS)
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_SUBDIR_PATH version: 6 updated: 2010/04/21 06:20:50
 dnl --------------
 dnl Construct a search-list for a nonstandard header/lib-file
 dnl	$1 = the variable to return as result
 dnl	$2 = the package name
 dnl	$3 = the subdirectory, e.g., bin, include or lib
 AC_DEFUN([CF_SUBDIR_PATH],
-[$1=""
+[
+$1=
 
 CF_ADD_SUBDIR_PATH($1,$2,$3,/usr,$prefix)
 CF_ADD_SUBDIR_PATH($1,$2,$3,$prefix,NONE)
@@ -3022,7 +3229,7 @@ AC_DEFUN([CF_UPPER],
 $1=`echo "$2" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_UTF8_LIB version: 5 updated: 2008/10/17 19:37:52
+dnl CF_UTF8_LIB version: 6 updated: 2010/04/21 06:20:50
 dnl -----------
 dnl Check for multibyte support, and if not found, utf8 compatibility library
 AC_DEFUN([CF_UTF8_LIB],
@@ -3044,7 +3251,7 @@ if test "$cf_cv_utf8_lib" = "add-on" ; then
 	AC_DEFINE(HAVE_LIBUTF8_H)
 	CF_ADD_INCDIR($cf_cv_header_path_utf8)
 	CF_ADD_LIBDIR($cf_cv_library_path_utf8)
-	LIBS="-lutf8 $LIBS"
+	LIBS="$cf_cv_library_file_utf8 $LIBS"
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
@@ -3442,7 +3649,7 @@ fi
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_XOPEN_CURSES version: 8 updated: 2003/11/07 19:47:46
+dnl CF_XOPEN_CURSES version: 9 updated: 2010/04/28 06:02:16
 dnl ---------------
 dnl Test if we should define X/Open source for curses, needed on Digital Unix
 dnl 4.x, to see the extended functions, but breaks on IRIX 6.x.
@@ -3456,6 +3663,11 @@ AC_CACHE_CHECK(if we must define _XOPEN_SOURCE_EXTENDED,cf_cv_need_xopen_extensi
 AC_TRY_LINK([
 #include <stdlib.h>
 #include <${cf_cv_ncurses_header-curses.h}>],[
+#if defined(NCURSES_VERSION_PATCH)
+if (NCURSES_VERSION_PATCH < 20100501) && (NCURSES_VERSION_PATCH >= 20100403)
+	make an error
+#endif
+#endif
 	long x = winnstr(stdscr, "", 0);
 	int x1, y1;
 	getbegyx(stdscr, y1, x1)],
@@ -3464,6 +3676,10 @@ AC_TRY_LINK([
 #define _XOPEN_SOURCE_EXTENDED
 #include <stdlib.h>
 #include <${cf_cv_ncurses_header-curses.h}>],[
+#ifdef NCURSES_VERSION
+	cchar_t check;
+	int check2 = curs_set((int)sizeof(check));
+#endif
 	long x = winnstr(stdscr, "", 0);
 	int x1, y1;
 	getbegyx(stdscr, y1, x1)],
@@ -3472,7 +3688,7 @@ AC_TRY_LINK([
 test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_XOPEN_SOURCE version: 32 updated: 2010/01/09 11:05:50
+dnl CF_XOPEN_SOURCE version: 33 updated: 2010/03/28 15:35:52
 dnl ---------------
 dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
 dnl or adapt to the vendor's definitions to get equivalent functionality,
@@ -3535,7 +3751,10 @@ nto-qnx*) #(vi
 sco*) #(vi
 	# setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer
 	;;
-solaris*) #(vi
+solaris2.1[[0-9]]) #(vi
+	cf_xopen_source="-D__EXTENSIONS__ -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+	;;
+solaris2.[[1-9]]) #(vi
 	cf_xopen_source="-D__EXTENSIONS__"
 	;;
 *)
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/arrows.c b/Build/source/utils/dialog/dialog-1.1-20100428/arrows.c
index b507fe1b486..536e277e826 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/arrows.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/arrows.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: arrows.c,v 1.28 2010/01/19 10:07:36 tom Exp $
+ *  $Id: arrows.c,v 1.29 2010/02/24 09:17:00 Samuel.Martin.Moro Exp $
  *
  *  arrows.c -- draw arrows to indicate end-of-range for lists
  *
@@ -134,23 +134,25 @@ dlg_draw_scrollbar(WINDOW *win,
     getyx(win, oldy, oldx);
     getmaxyx(win, maxy, maxx);
 
-    percent = (!total_data
-	       ? 100
-	       : (int) ((next_data * 100)
-			/ total_data));
-
-    if (percent < 0)
-	percent = 0;
-    if (percent > 100)
-	percent = 100;
-
-    wattrset(win, position_indicator_attr);
-    (void) sprintf(buffer, "%d%%", percent);
-    (void) wmove(win, bottom, right - 7);
-    (void) waddstr(win, buffer);
-    if ((len = dlg_count_columns(buffer)) < 4) {
-	wattrset(win, border_attr);
-	whline(win, dlg_boxchar(ACS_HLINE), 4 - len);
+    if (bottom_arrow || top_arrow || dialog_state.use_scrollbar) {
+	percent = (!total_data
+		   ? 100
+		   : (int) ((next_data * 100)
+			    / total_data));
+
+	if (percent < 0)
+	    percent = 0;
+	else if (percent > 100)
+	    percent = 100;
+
+	wattrset(win, position_indicator_attr);
+	(void) sprintf(buffer, "%d%%", percent);
+	(void) wmove(win, bottom, right - 7);
+	(void) waddstr(win, buffer);
+	if ((len = dlg_count_columns(buffer)) < 4) {
+	    wattrset(win, border_attr);
+	    whline(win, dlg_boxchar(ACS_HLINE), 4 - len);
+	}
     }
 #define BARSIZE(num) ((all_high * (num)) + all_high - 1) / total_data
 
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/buttons.c b/Build/source/utils/dialog/dialog-1.1-20100428/buttons.c
index 1ffa4f00446..9c489dd7961 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/buttons.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/buttons.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: buttons.c,v 1.79 2010/01/14 02:01:36 tom Exp $
+ *  $Id: buttons.c,v 1.81 2010/04/28 20:57:29 tom Exp $
  *
  * buttons.c -- draw buttons, e.g., OK/Cancel
  *
@@ -142,7 +142,7 @@ print_button(WINDOW *win, char *label, int y, int x, int selected)
 	     ? button_active_attr
 	     : button_inactive_attr);
     (void) waddstr(win, ">");
-    (void) wmove(win, y, x + strspn(label, " ") + 1);
+    (void) wmove(win, y, x + ((int) strspn(label, " ")) + 1);
 }
 
 /*
@@ -230,7 +230,7 @@ dlg_button_layout(const char **labels, int *limit)
     int width = 1;
     int gap, margin, step;
 
-    if (labels != 0) {
+    if (labels != 0 && dlg_button_count(labels)) {
 	while (!dlg_button_x_step(labels, width, &gap, &margin, &step))
 	    ++width;
 	width += (4 * MARGIN);
@@ -261,7 +261,7 @@ dlg_draw_buttons(WINDOW *win,
     int final_y;
     int gap;
     int margin;
-    unsigned need;
+    size_t need;
     char *buffer;
 
     dlg_mouse_setbase(getbegx(win), getbegy(win));
@@ -281,7 +281,7 @@ dlg_draw_buttons(WINDOW *win,
     /*
      * Allocate a buffer big enough for any label.
      */
-    need = longest;
+    need = (size_t) longest;
     for (n = 0; labels[n] != 0; ++n) {
 	need += strlen(labels[n]) + 1;
     }
@@ -367,7 +367,7 @@ dlg_char_to_button(int ch, const char **labels)
     if (labels != 0) {
 	int j;
 
-	ch = dlg_toupper(dlg_last_getc());
+	ch = (int) dlg_toupper(dlg_last_getc());
 	for (j = 0; labels[j] != 0; ++j) {
 	    int cmp = dlg_button_to_char(labels[j]);
 	    if (ch == cmp) {
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/calendar.c b/Build/source/utils/dialog/dialog-1.1-20100428/calendar.c
index 09eb92c564d..09eb92c564d 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/calendar.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/calendar.c
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/checklist.c b/Build/source/utils/dialog/dialog-1.1-20100428/checklist.c
index 0115288b45c..0115288b45c 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/checklist.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/checklist.c
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/columns.c b/Build/source/utils/dialog/dialog-1.1-20100428/columns.c
index 4abfe8d66d4..4abfe8d66d4 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/columns.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/columns.c
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/config.guess b/Build/source/utils/dialog/dialog-1.1-20100428/config.guess
index 4c8f032e786..4c8f032e786 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/config.guess
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/config.guess
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/config.hin b/Build/source/utils/dialog/dialog-1.1-20100428/config.hin
index e8fc0a919ee..e8fc0a919ee 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/config.hin
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/config.hin
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/config.sub b/Build/source/utils/dialog/dialog-1.1-20100428/config.sub
index 320e3038811..320e3038811 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/config.sub
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/config.sub
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/configure b/Build/source/utils/dialog/dialog-1.1-20100428/configure
index 128be9d9324..8ceb1d5bc1f 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/configure
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by Autoconf 2.52.20081225.
+# Generated by Autoconf 2.52.20100320.
 #
 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -705,6 +705,7 @@ Optional Packages:
   --disable-mixedform     do not include the mixedform dialog
   --disable-mixedgauge    do not include the mixedgauge dialog
   --enable-widec          enable wide-curses features
+  --disable-rpath-hack    don't add rpath options for additional libraries
 
 Some influential environment variables:
   CC          C compiler command
@@ -774,7 +775,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.52.20081225.  Invocation command line was
+generated by GNU Autoconf 2.52.20100320.  Invocation command line was
 
   $ $0 $@
 
@@ -898,7 +899,7 @@ if test -z "$CONFIG_SITE"; then
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
-    { echo "$as_me:901: loading site script $ac_site_file" >&5
+    { echo "$as_me:902: 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"
@@ -909,7 +910,7 @@ if test -r "$cache_file"; then
   # 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:912: loading cache $cache_file" >&5
+    { echo "$as_me:913: loading cache $cache_file" >&5
 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . $cache_file;;
@@ -917,7 +918,7 @@ echo "$as_me: loading cache $cache_file" >&6;}
     esac
   fi
 else
-  { echo "$as_me:920: creating cache $cache_file" >&5
+  { echo "$as_me:921: creating cache $cache_file" >&5
 echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -933,21 +934,21 @@ for ac_var in `(set) 2>&1 |
   eval ac_new_val="\$ac_env_${ac_var}_value"
   case $ac_old_set,$ac_new_set in
     set,)
-      { echo "$as_me:936: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { echo "$as_me:937: 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:940: error: \`$ac_var' was not set in the previous run" >&5
+      { echo "$as_me:941: 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:946: error: \`$ac_var' has changed since the previous run:" >&5
+        { echo "$as_me:947: 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:948:   former value:  $ac_old_val" >&5
+        { echo "$as_me:949:   former value:  $ac_old_val" >&5
 echo "$as_me:   former value:  $ac_old_val" >&2;}
-        { echo "$as_me:950:   current value: $ac_new_val" >&5
+        { echo "$as_me:951:   current value: $ac_new_val" >&5
 echo "$as_me:   current value: $ac_new_val" >&2;}
         ac_cache_corrupted=:
       fi;;
@@ -966,9 +967,9 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
   fi
 done
 if $ac_cache_corrupted; then
-  { echo "$as_me:969: error: changes in the environment can compromise the build" >&5
+  { echo "$as_me:970: 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:971: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+  { { echo "$as_me:972: 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
@@ -989,10 +990,10 @@ esac
 echo "#! $SHELL" >conftest.sh
 echo  "exit 0"   >>conftest.sh
 chmod +x conftest.sh
-if { (echo "$as_me:992: PATH=\".;.\"; conftest.sh") >&5
+if { (echo "$as_me:993: PATH=\".;.\"; conftest.sh") >&5
   (PATH=".;."; conftest.sh) 2>&5
   ac_status=$?
-  echo "$as_me:995: \$? = $ac_status" >&5
+  echo "$as_me:996: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   ac_path_separator=';'
 else
@@ -1004,7 +1005,7 @@ rm -f conftest.sh
 ac_config_headers="$ac_config_headers dlg_config.h:config.hin"
 
 if test -f $srcdir/VERSION ; then
-	echo "$as_me:1007: checking for package version" >&5
+	echo "$as_me:1008: checking for package version" >&5
 echo $ECHO_N "checking for package version... $ECHO_C" >&6
 
 	# if there are not enough fields, cut returns the last one...
@@ -1016,39 +1017,39 @@ echo $ECHO_N "checking for package version... $ECHO_C" >&6
 	VERSION="$cf_field1"
 
 	VERSION_MAJOR=`echo "$cf_field2" | sed -e 's/\..*//'`
-	test -z "$VERSION_MAJOR" && { { echo "$as_me:1019: error: missing major-version" >&5
+	test -z "$VERSION_MAJOR" && { { echo "$as_me:1020: error: missing major-version" >&5
 echo "$as_me: error: missing major-version" >&2;}
    { (exit 1); exit 1; }; }
 
 	VERSION_MINOR=`echo "$cf_field2" | sed -e 's/^[^.]*\.//' -e 's/-.*//'`
-	test -z "$VERSION_MINOR" && { { echo "$as_me:1024: error: missing minor-version" >&5
+	test -z "$VERSION_MINOR" && { { echo "$as_me:1025: error: missing minor-version" >&5
 echo "$as_me: error: missing minor-version" >&2;}
    { (exit 1); exit 1; }; }
 
-	echo "$as_me:1028: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5
+	echo "$as_me:1029: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5
 echo "${ECHO_T}${VERSION_MAJOR}.${VERSION_MINOR}" >&6
 
-	echo "$as_me:1031: checking for package patch date" >&5
+	echo "$as_me:1032: checking for package patch date" >&5
 echo $ECHO_N "checking for package patch date... $ECHO_C" >&6
 	VERSION_PATCH=`echo "$cf_field3" | sed -e 's/^[^-]*-//'`
 	case .$VERSION_PATCH in
 	.)
-		{ { echo "$as_me:1036: error: missing patch-date $VERSION_PATCH" >&5
+		{ { echo "$as_me:1037: error: missing patch-date $VERSION_PATCH" >&5
 echo "$as_me: error: missing patch-date $VERSION_PATCH" >&2;}
    { (exit 1); exit 1; }; }
 		;;
 	.[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9])
 		;;
 	*)
-		{ { echo "$as_me:1043: error: illegal patch-date $VERSION_PATCH" >&5
+		{ { echo "$as_me:1044: error: illegal patch-date $VERSION_PATCH" >&5
 echo "$as_me: error: illegal patch-date $VERSION_PATCH" >&2;}
    { (exit 1); exit 1; }; }
 		;;
 	esac
-	echo "$as_me:1048: result: $VERSION_PATCH" >&5
+	echo "$as_me:1049: result: $VERSION_PATCH" >&5
 echo "${ECHO_T}$VERSION_PATCH" >&6
 else
-	{ { echo "$as_me:1051: error: did not find $srcdir/VERSION" >&5
+	{ { echo "$as_me:1052: error: did not find $srcdir/VERSION" >&5
 echo "$as_me: error: did not find $srcdir/VERSION" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1056,19 +1057,19 @@ fi
 # show the actual data that we have for versions:
 test -n "$verbose" && echo "	VERSION $VERSION" 1>&6
 
-echo "${as_me-configure}:1059: testing VERSION $VERSION ..." 1>&5
+echo "${as_me-configure}:1060: testing VERSION $VERSION ..." 1>&5
 
 test -n "$verbose" && echo "	VERSION_MAJOR $VERSION_MAJOR" 1>&6
 
-echo "${as_me-configure}:1063: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5
+echo "${as_me-configure}:1064: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5
 
 test -n "$verbose" && echo "	VERSION_MINOR $VERSION_MINOR" 1>&6
 
-echo "${as_me-configure}:1067: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5
+echo "${as_me-configure}:1068: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5
 
 test -n "$verbose" && echo "	VERSION_PATCH $VERSION_PATCH" 1>&6
 
-echo "${as_me-configure}:1071: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5
+echo "${as_me-configure}:1072: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5
 
 	PACKAGE=dialog
 	cat >>confdefs.h <<EOF
@@ -1109,7 +1110,7 @@ ac_main_return=return
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:1112: checking for $ac_word" >&5
+echo "$as_me:1113: 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
@@ -1124,7 +1125,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}gcc"
-echo "$as_me:1127: found $ac_dir/$ac_word" >&5
+echo "$as_me:1128: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1132,10 +1133,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1135: result: $CC" >&5
+  echo "$as_me:1136: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1138: result: no" >&5
+  echo "$as_me:1139: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1144,7 +1145,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-echo "$as_me:1147: checking for $ac_word" >&5
+echo "$as_me:1148: 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
@@ -1159,7 +1160,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="gcc"
-echo "$as_me:1162: found $ac_dir/$ac_word" >&5
+echo "$as_me:1163: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1167,10 +1168,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1170: result: $ac_ct_CC" >&5
+  echo "$as_me:1171: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1173: result: no" >&5
+  echo "$as_me:1174: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1183,7 +1184,7 @@ if test -z "$CC"; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:1186: checking for $ac_word" >&5
+echo "$as_me:1187: 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
@@ -1198,7 +1199,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}cc"
-echo "$as_me:1201: found $ac_dir/$ac_word" >&5
+echo "$as_me:1202: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1206,10 +1207,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1209: result: $CC" >&5
+  echo "$as_me:1210: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1212: result: no" >&5
+  echo "$as_me:1213: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1218,7 +1219,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:1221: checking for $ac_word" >&5
+echo "$as_me:1222: 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
@@ -1233,7 +1234,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="cc"
-echo "$as_me:1236: found $ac_dir/$ac_word" >&5
+echo "$as_me:1237: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1241,10 +1242,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1244: result: $ac_ct_CC" >&5
+  echo "$as_me:1245: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1247: result: no" >&5
+  echo "$as_me:1248: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1257,7 +1258,7 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:1260: checking for $ac_word" >&5
+echo "$as_me:1261: 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
@@ -1277,7 +1278,7 @@ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
   continue
 fi
 ac_cv_prog_CC="cc"
-echo "$as_me:1280: found $ac_dir/$ac_word" >&5
+echo "$as_me:1281: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1299,10 +1300,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1302: result: $CC" >&5
+  echo "$as_me:1303: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1305: result: no" >&5
+  echo "$as_me:1306: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1313,7 +1314,7 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:1316: checking for $ac_word" >&5
+echo "$as_me:1317: 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
@@ -1328,7 +1329,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-echo "$as_me:1331: found $ac_dir/$ac_word" >&5
+echo "$as_me:1332: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1336,10 +1337,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1339: result: $CC" >&5
+  echo "$as_me:1340: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1342: result: no" >&5
+  echo "$as_me:1343: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1352,7 +1353,7 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1355: checking for $ac_word" >&5
+echo "$as_me:1356: 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
@@ -1367,7 +1368,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="$ac_prog"
-echo "$as_me:1370: found $ac_dir/$ac_word" >&5
+echo "$as_me:1371: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1375,10 +1376,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1378: result: $ac_ct_CC" >&5
+  echo "$as_me:1379: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1381: result: no" >&5
+  echo "$as_me:1382: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1390,32 +1391,32 @@ fi
 
 fi
 
-test -z "$CC" && { { echo "$as_me:1393: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:1394: 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:1398:" \
+echo "$as_me:1399:" \
      "checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:1401: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1402: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1404: \$? = $ac_status" >&5
+  echo "$as_me:1405: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:1406: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1407: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1409: \$? = $ac_status" >&5
+  echo "$as_me:1410: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:1411: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1412: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1414: \$? = $ac_status" >&5
+  echo "$as_me:1415: \$? = $ac_status" >&5
   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 1418 "configure"
+#line 1419 "configure"
 #include "confdefs.h"
 
 int
@@ -1431,13 +1432,13 @@ ac_clean_files="$ac_clean_files a.out a.exe"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-echo "$as_me:1434: checking for C compiler default output" >&5
+echo "$as_me:1435: 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:1437: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:1438: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5
   ac_status=$?
-  echo "$as_me:1440: \$? = $ac_status" >&5
+  echo "$as_me:1441: \$? = $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
@@ -1460,34 +1461,34 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:1463: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:1464: 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:1469: result: $ac_file" >&5
+echo "$as_me:1470: 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:1474: checking whether the C compiler works" >&5
+echo "$as_me:1475: 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:1480: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1481: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1483: \$? = $ac_status" >&5
+  echo "$as_me:1484: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:1490: error: cannot run C compiled programs.
+	{ { echo "$as_me:1491: 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;}
@@ -1495,24 +1496,24 @@ If you meant to cross compile, use \`--host'." >&2;}
     fi
   fi
 fi
-echo "$as_me:1498: result: yes" >&5
+echo "$as_me:1499: 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:1505: checking whether we are cross compiling" >&5
+echo "$as_me:1506: checking whether we are cross compiling" >&5
 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:1507: result: $cross_compiling" >&5
+echo "$as_me:1508: result: $cross_compiling" >&5
 echo "${ECHO_T}$cross_compiling" >&6
 
-echo "$as_me:1510: checking for executable suffix" >&5
+echo "$as_me:1511: checking for executable suffix" >&5
 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:1512: \"$ac_link\"") >&5
+if { (eval echo "$as_me:1513: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:1515: \$? = $ac_status" >&5
+  echo "$as_me:1516: \$? = $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
@@ -1528,25 +1529,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
   esac
 done
 else
-  { { echo "$as_me:1531: error: cannot compute EXEEXT: cannot compile and link" >&5
+  { { echo "$as_me:1532: 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:1537: result: $ac_cv_exeext" >&5
+echo "$as_me:1538: 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:1543: checking for object suffix" >&5
+echo "$as_me:1544: 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 1549 "configure"
+#line 1550 "configure"
 #include "confdefs.h"
 
 int
@@ -1558,10 +1559,10 @@ main ()
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:1561: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1562: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1564: \$? = $ac_status" >&5
+  echo "$as_me:1565: \$? = $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
@@ -1573,24 +1574,24 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:1576: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:1577: 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:1583: result: $ac_cv_objext" >&5
+echo "$as_me:1584: result: $ac_cv_objext" >&5
 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:1587: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:1588: 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 1593 "configure"
+#line 1594 "configure"
 #include "confdefs.h"
 
 int
@@ -1605,16 +1606,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1608: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1609: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1611: \$? = $ac_status" >&5
+  echo "$as_me:1612: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1614: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1615: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1617: \$? = $ac_status" >&5
+  echo "$as_me:1618: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_compiler_gnu=yes
 else
@@ -1626,19 +1627,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:1629: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:1630: 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:1635: checking whether $CC accepts -g" >&5
+echo "$as_me:1636: 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 1641 "configure"
+#line 1642 "configure"
 #include "confdefs.h"
 
 int
@@ -1650,16 +1651,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1653: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1654: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1656: \$? = $ac_status" >&5
+  echo "$as_me:1657: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1659: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1660: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1662: \$? = $ac_status" >&5
+  echo "$as_me:1663: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_cc_g=yes
 else
@@ -1669,7 +1670,7 @@ ac_cv_prog_cc_g=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:1672: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:1673: 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
@@ -1696,16 +1697,16 @@ cat >conftest.$ac_ext <<_ACEOF
 #endif
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1699: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1700: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1702: \$? = $ac_status" >&5
+  echo "$as_me:1703: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1705: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1706: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1708: \$? = $ac_status" >&5
+  echo "$as_me:1709: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   for ac_declaration in \
    ''\
@@ -1717,7 +1718,7 @@ if { (eval echo "$as_me:1699: \"$ac_compile\"") >&5
    'void exit (int);'
 do
   cat >conftest.$ac_ext <<_ACEOF
-#line 1720 "configure"
+#line 1721 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -1730,16 +1731,16 @@ exit (42);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1733: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1734: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1736: \$? = $ac_status" >&5
+  echo "$as_me:1737: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1739: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1740: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1742: \$? = $ac_status" >&5
+  echo "$as_me:1743: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -1749,7 +1750,7 @@ continue
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 1752 "configure"
+#line 1753 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -1761,16 +1762,16 @@ exit (42);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1764: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1765: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1767: \$? = $ac_status" >&5
+  echo "$as_me:1768: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1770: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1771: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1773: \$? = $ac_status" >&5
+  echo "$as_me:1774: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -1804,7 +1805,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return=return
-echo "$as_me:1807: checking how to run the C preprocessor" >&5
+echo "$as_me:1808: 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
@@ -1825,18 +1826,18 @@ do
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
-#line 1828 "configure"
+#line 1829 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:1833: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:1834: \"$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:1839: \$? = $ac_status" >&5
+  echo "$as_me:1840: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -1859,17 +1860,17 @@ rm -f conftest.err conftest.$ac_ext
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line 1862 "configure"
+#line 1863 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:1866: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:1867: \"$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:1872: \$? = $ac_status" >&5
+  echo "$as_me:1873: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -1906,7 +1907,7 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:1909: result: $CPP" >&5
+echo "$as_me:1910: result: $CPP" >&5
 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -1916,18 +1917,18 @@ do
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
-#line 1919 "configure"
+#line 1920 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:1924: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:1925: \"$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:1930: \$? = $ac_status" >&5
+  echo "$as_me:1931: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -1950,17 +1951,17 @@ rm -f conftest.err conftest.$ac_ext
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line 1953 "configure"
+#line 1954 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:1957: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:1958: \"$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:1963: \$? = $ac_status" >&5
+  echo "$as_me:1964: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -1988,7 +1989,7 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:1991: error: C preprocessor \"$CPP\" fails sanity check" >&5
+  { { echo "$as_me:1992: error: C preprocessor \"$CPP\" fails sanity check" >&5
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -2001,14 +2002,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return=return
 
 if test $ac_cv_c_compiler_gnu = yes; then
-    echo "$as_me:2004: checking whether $CC needs -traditional" >&5
+    echo "$as_me:2005: checking whether $CC needs -traditional" >&5
 echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6
 if test "${ac_cv_prog_gcc_traditional+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
     ac_pattern="Autoconf.*'x'"
   cat >conftest.$ac_ext <<_ACEOF
-#line 2011 "configure"
+#line 2012 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
 int Autoconf = TIOCGETP;
@@ -2023,7 +2024,7 @@ rm -f conftest*
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat >conftest.$ac_ext <<_ACEOF
-#line 2026 "configure"
+#line 2027 "configure"
 #include "confdefs.h"
 #include <termio.h>
 int Autoconf = TCGETA;
@@ -2036,14 +2037,14 @@ rm -f conftest*
 
   fi
 fi
-echo "$as_me:2039: result: $ac_cv_prog_gcc_traditional" >&5
+echo "$as_me:2040: result: $ac_cv_prog_gcc_traditional" >&5
 echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6
   if test $ac_cv_prog_gcc_traditional = yes; then
     CC="$CC -traditional"
   fi
 fi
 
-echo "$as_me:2046: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:2047: 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
@@ -2063,11 +2064,11 @@ fi
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:2066: result: yes" >&5
+  echo "$as_me:2067: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:2070: result: no" >&5
+  echo "$as_me:2071: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
@@ -2075,7 +2076,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:2078: checking for $ac_word" >&5
+echo "$as_me:2079: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2090,7 +2091,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-echo "$as_me:2093: found $ac_dir/$ac_word" >&5
+echo "$as_me:2094: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2098,10 +2099,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:2101: result: $RANLIB" >&5
+  echo "$as_me:2102: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:2104: result: no" >&5
+  echo "$as_me:2105: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2110,7 +2111,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:2113: checking for $ac_word" >&5
+echo "$as_me:2114: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2125,7 +2126,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:2128: found $ac_dir/$ac_word" >&5
+echo "$as_me:2129: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2134,10 +2135,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:2137: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:2138: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:2140: result: no" >&5
+  echo "$as_me:2141: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2163,7 +2164,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:2166: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+  { { echo "$as_me:2167: 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
@@ -2183,7 +2184,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 # 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:2186: checking for a BSD compatible install" >&5
+echo "$as_me:2187: 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
@@ -2232,7 +2233,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:2235: result: $INSTALL" >&5
+echo "$as_me:2236: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -2246,7 +2247,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:2249: checking for $ac_word" >&5
+echo "$as_me:2250: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_AR+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2261,7 +2262,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AR="${ac_tool_prefix}ar"
-echo "$as_me:2264: found $ac_dir/$ac_word" >&5
+echo "$as_me:2265: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2269,10 +2270,10 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:2272: result: $AR" >&5
+  echo "$as_me:2273: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 else
-  echo "$as_me:2275: result: no" >&5
+  echo "$as_me:2276: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2281,7 +2282,7 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-echo "$as_me:2284: checking for $ac_word" >&5
+echo "$as_me:2285: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2296,7 +2297,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_AR="ar"
-echo "$as_me:2299: found $ac_dir/$ac_word" >&5
+echo "$as_me:2300: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2305,10 +2306,10 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:2308: result: $ac_ct_AR" >&5
+  echo "$as_me:2309: result: $ac_ct_AR" >&5
 echo "${ECHO_T}$ac_ct_AR" >&6
 else
-  echo "$as_me:2311: result: no" >&5
+  echo "$as_me:2312: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2317,12 +2318,12 @@ else
   AR="$ac_cv_prog_AR"
 fi
 
-echo "$as_me:2320: checking for POSIXized ISC" >&5
+echo "$as_me:2321: checking for POSIXized ISC" >&5
 echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6
 if test -d /etc/conf/kconfig.d &&
    grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
 then
-  echo "$as_me:2325: result: yes" >&5
+  echo "$as_me:2326: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   ISC=yes # If later tests want to check for ISC.
 
@@ -2336,12 +2337,12 @@ EOF
     CC="$CC -Xp"
   fi
 else
-  echo "$as_me:2339: result: no" >&5
+  echo "$as_me:2340: result: no" >&5
 echo "${ECHO_T}no" >&6
   ISC=
 fi
 
-echo "$as_me:2344: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:2345: 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
@@ -2349,7 +2350,7 @@ else
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >conftest.$ac_ext <<_ACEOF
-#line 2352 "configure"
+#line 2353 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -2398,16 +2399,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO
 do
   CC="$ac_save_CC $ac_arg"
   rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2401: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2402: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2404: \$? = $ac_status" >&5
+  echo "$as_me:2405: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2407: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2408: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2410: \$? = $ac_status" >&5
+  echo "$as_me:2411: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_cc_stdc=$ac_arg
 break
@@ -2424,21 +2425,21 @@ fi
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)
-    echo "$as_me:2427: result: none needed" >&5
+    echo "$as_me:2428: result: none needed" >&5
 echo "${ECHO_T}none needed" >&6 ;;
   *)
-    echo "$as_me:2430: result: $ac_cv_prog_cc_stdc" >&5
+    echo "$as_me:2431: 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:2435: checking for an ANSI C-conforming const" >&5
+echo "$as_me:2436: 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 2441 "configure"
+#line 2442 "configure"
 #include "confdefs.h"
 
 int
@@ -2496,16 +2497,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2499: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2500: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2502: \$? = $ac_status" >&5
+  echo "$as_me:2503: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2505: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2506: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2508: \$? = $ac_status" >&5
+  echo "$as_me:2509: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_const=yes
 else
@@ -2515,7 +2516,7 @@ ac_cv_c_const=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:2518: result: $ac_cv_c_const" >&5
+echo "$as_me:2519: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -2525,7 +2526,7 @@ EOF
 
 fi
 
-echo "$as_me:2528: checking for makeflags variable" >&5
+echo "$as_me:2529: checking for makeflags variable" >&5
 echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6
 if test "${cf_cv_makeflags+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2559,10 +2560,10 @@ CF_EOF
 	rm -f cf_makeflags.tmp
 
 fi
-echo "$as_me:2562: result: $cf_cv_makeflags" >&5
+echo "$as_me:2563: result: $cf_cv_makeflags" >&5
 echo "${ECHO_T}$cf_cv_makeflags" >&6
 
-echo "$as_me:2565: checking if filesystem supports mixed-case filenames" >&5
+echo "$as_me:2566: 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
@@ -2589,15 +2590,89 @@ else
 fi
 
 fi
-echo "$as_me:2592: result: $cf_cv_mixedcase" >&5
+echo "$as_me:2593: 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
 EOF
 
-# Extract the first word of "ctags", so it can be a program name with args.
-set dummy ctags; ac_word=$2
-echo "$as_me:2600: checking for $ac_word" >&5
+for ac_prog in exctags ctags
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo "$as_me:2603: 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
+else
+  if test -n "$CTAGS"; then
+  ac_cv_prog_CTAGS="$CTAGS" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_CTAGS="$ac_prog"
+echo "$as_me:2618: found $ac_dir/$ac_word" >&5
+break
+done
+
+fi
+fi
+CTAGS=$ac_cv_prog_CTAGS
+if test -n "$CTAGS"; then
+  echo "$as_me:2626: result: $CTAGS" >&5
+echo "${ECHO_T}$CTAGS" >&6
+else
+  echo "$as_me:2629: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  test -n "$CTAGS" && break
+done
+
+for ac_prog in exetags etags
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo "$as_me:2640: 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
+else
+  if test -n "$ETAGS"; then
+  ac_cv_prog_ETAGS="$ETAGS" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_ETAGS="$ac_prog"
+echo "$as_me:2655: found $ac_dir/$ac_word" >&5
+break
+done
+
+fi
+fi
+ETAGS=$ac_cv_prog_ETAGS
+if test -n "$ETAGS"; then
+  echo "$as_me:2663: result: $ETAGS" >&5
+echo "${ECHO_T}$ETAGS" >&6
+else
+  echo "$as_me:2666: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  test -n "$ETAGS" && break
+done
+
+# Extract the first word of "${CTAGS-ctags}", so it can be a program name with args.
+set dummy ${CTAGS-ctags}; ac_word=$2
+echo "$as_me:2675: 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
@@ -2612,7 +2687,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_LOWER_TAGS="yes"
-echo "$as_me:2615: found $ac_dir/$ac_word" >&5
+echo "$as_me:2690: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2621,17 +2696,17 @@ fi
 fi
 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
 if test -n "$MAKE_LOWER_TAGS"; then
-  echo "$as_me:2624: result: $MAKE_LOWER_TAGS" >&5
+  echo "$as_me:2699: result: $MAKE_LOWER_TAGS" >&5
 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
 else
-  echo "$as_me:2627: result: no" >&5
+  echo "$as_me:2702: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 if test "$cf_cv_mixedcase" = yes ; then
-	# Extract the first word of "etags", so it can be a program name with args.
-set dummy etags; ac_word=$2
-echo "$as_me:2634: checking for $ac_word" >&5
+	# 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:2709: 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
@@ -2646,7 +2721,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_UPPER_TAGS="yes"
-echo "$as_me:2649: found $ac_dir/$ac_word" >&5
+echo "$as_me:2724: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2655,10 +2730,10 @@ fi
 fi
 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
 if test -n "$MAKE_UPPER_TAGS"; then
-  echo "$as_me:2658: result: $MAKE_UPPER_TAGS" >&5
+  echo "$as_me:2733: result: $MAKE_UPPER_TAGS" >&5
 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
 else
-  echo "$as_me:2661: result: no" >&5
+  echo "$as_me:2736: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2678,7 +2753,7 @@ else
 	MAKE_LOWER_TAGS="#"
 fi
 
-echo "$as_me:2681: checking if you want to see long compiling messages" >&5
+echo "$as_me:2756: 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.
@@ -2712,16 +2787,16 @@ else
     ECHO_CC=''
 
 fi;
-echo "$as_me:2715: result: $enableval" >&5
+echo "$as_me:2790: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 # Make sure we can run config.sub.
 $ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:2720: error: cannot run $ac_config_sub" >&5
+  { { echo "$as_me:2795: error: cannot run $ac_config_sub" >&5
 echo "$as_me: error: cannot run $ac_config_sub" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:2724: checking build system type" >&5
+echo "$as_me:2799: 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
@@ -2730,16 +2805,16 @@ else
 test -z "$ac_cv_build_alias" &&
   ac_cv_build_alias=`$ac_config_guess`
 test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:2733: error: cannot guess build type; you must specify one" >&5
+  { { echo "$as_me:2808: 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:2737: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+  { { echo "$as_me:2812: 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:2742: result: $ac_cv_build" >&5
+echo "$as_me:2817: 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/'`
@@ -2747,7 +2822,7 @@ build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 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:2750: checking host system type" >&5
+	echo "$as_me:2825: 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
@@ -2756,12 +2831,12 @@ else
 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:2759: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+  { { echo "$as_me:2834: 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:2764: result: $ac_cv_host" >&5
+echo "$as_me:2839: 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/'`
@@ -2786,13 +2861,13 @@ else
 fi
 
 test -z "$system_name" && system_name="$cf_cv_system_name"
-test -n "$cf_cv_system_name" && echo "$as_me:2789: result: Configuring for $cf_cv_system_name" >&5
+test -n "$cf_cv_system_name" && echo "$as_me:2864: 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:2793: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
+	echo "$as_me:2868: 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:2795: error: \"Please remove config.cache and try again.\"" >&5
+	{ { echo "$as_me:2870: 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
@@ -2860,14 +2935,14 @@ irix[56].*) #(vi
 	;;
 linux*|gnu*|mint*|k*bsd*-gnu) #(vi
 
-echo "$as_me:2863: checking if we must define _GNU_SOURCE" >&5
+echo "$as_me:2938: 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 2870 "configure"
+#line 2945 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -2882,16 +2957,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2885: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2960: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2888: \$? = $ac_status" >&5
+  echo "$as_me:2963: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2891: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2966: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2894: \$? = $ac_status" >&5
+  echo "$as_me:2969: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_gnu_source=no
 else
@@ -2900,7 +2975,7 @@ cat conftest.$ac_ext >&5
 cf_save="$CPPFLAGS"
 	 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 2903 "configure"
+#line 2978 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -2915,16 +2990,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2918: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2993: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2921: \$? = $ac_status" >&5
+  echo "$as_me:2996: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2924: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2999: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2927: \$? = $ac_status" >&5
+  echo "$as_me:3002: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_gnu_source=no
 else
@@ -2939,7 +3014,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:2942: result: $cf_cv_gnu_source" >&5
+echo "$as_me:3017: 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"
 
@@ -2962,18 +3037,21 @@ nto-qnx*) #(vi
 sco*) #(vi
 	# setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer
 	;;
-solaris*) #(vi
+solaris2.1[0-9]) #(vi
+	cf_xopen_source="-D__EXTENSIONS__ -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+	;;
+solaris2.[1-9]) #(vi
 	cf_xopen_source="-D__EXTENSIONS__"
 	;;
 *)
-	echo "$as_me:2969: checking if we should define _XOPEN_SOURCE" >&5
+	echo "$as_me:3047: 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 2976 "configure"
+#line 3054 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -2988,16 +3066,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2991: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3069: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2994: \$? = $ac_status" >&5
+  echo "$as_me:3072: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2997: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3075: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3000: \$? = $ac_status" >&5
+  echo "$as_me:3078: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
@@ -3006,7 +3084,7 @@ cat conftest.$ac_ext >&5
 cf_save="$CPPFLAGS"
 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 3009 "configure"
+#line 3087 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -3021,16 +3099,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3024: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3102: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3027: \$? = $ac_status" >&5
+  echo "$as_me:3105: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3030: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3108: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3033: \$? = $ac_status" >&5
+  echo "$as_me:3111: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
@@ -3045,7 +3123,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:3048: result: $cf_cv_xopen_source" >&5
+echo "$as_me:3126: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 	if test "$cf_cv_xopen_source" != no ; then
 
@@ -3152,16 +3230,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:3155: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:3233: 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}:3161: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me-configure}:3239: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 3164 "configure"
+#line 3242 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -3176,16 +3254,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3179: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3257: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3182: \$? = $ac_status" >&5
+  echo "$as_me:3260: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3185: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3263: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3188: \$? = $ac_status" >&5
+  echo "$as_me:3266: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -3206,7 +3284,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >conftest.$ac_ext <<_ACEOF
-#line 3209 "configure"
+#line 3287 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -3221,16 +3299,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3224: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3302: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3227: \$? = $ac_status" >&5
+  echo "$as_me:3305: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3230: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3308: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3233: \$? = $ac_status" >&5
+  echo "$as_me:3311: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -3241,15 +3319,15 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 	 fi
 
-echo "${as_me-configure}:3244: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me-configure}:3322: 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}:3249: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me-configure}:3327: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 3252 "configure"
+#line 3330 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -3264,16 +3342,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3267: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3345: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3270: \$? = $ac_status" >&5
+  echo "$as_me:3348: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3273: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3351: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3276: \$? = $ac_status" >&5
+  echo "$as_me:3354: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -3289,7 +3367,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:3292: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:3370: 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
@@ -3468,7 +3546,7 @@ if test "${enable_largefile+set}" = set; then
 fi;
 if test "$enable_largefile" != no; then
 
-  echo "$as_me:3471: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:3549: checking for special C compiler options needed for large files" >&5
 echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_largefile_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3480,7 +3558,7 @@ else
      	 # IRIX 6.2 and later do not support large files by default,
      	 # so use the C compiler's -n32 option if that helps.
          cat >conftest.$ac_ext <<_ACEOF
-#line 3483 "configure"
+#line 3561 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -3500,16 +3578,16 @@ main ()
 }
 _ACEOF
      	 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3503: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3581: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3506: \$? = $ac_status" >&5
+  echo "$as_me:3584: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3509: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3587: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3512: \$? = $ac_status" >&5
+  echo "$as_me:3590: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -3519,16 +3597,16 @@ fi
 rm -f conftest.$ac_objext
      	 CC="$CC -n32"
      	 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3522: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3600: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3525: \$? = $ac_status" >&5
+  echo "$as_me:3603: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3528: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3606: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3531: \$? = $ac_status" >&5
+  echo "$as_me:3609: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else
@@ -3542,13 +3620,13 @@ rm -f conftest.$ac_objext
        rm -f conftest.$ac_ext
     fi
 fi
-echo "$as_me:3545: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:3623: result: $ac_cv_sys_largefile_CC" >&5
 echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
   if test "$ac_cv_sys_largefile_CC" != no; then
     CC=$CC$ac_cv_sys_largefile_CC
   fi
 
-  echo "$as_me:3551: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:3629: checking for _FILE_OFFSET_BITS value needed for large files" >&5
 echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_file_offset_bits+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3556,7 +3634,7 @@ else
   while :; do
   ac_cv_sys_file_offset_bits=no
   cat >conftest.$ac_ext <<_ACEOF
-#line 3559 "configure"
+#line 3637 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -3576,16 +3654,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3579: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3657: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3582: \$? = $ac_status" >&5
+  echo "$as_me:3660: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3585: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3663: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3588: \$? = $ac_status" >&5
+  echo "$as_me:3666: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -3594,7 +3672,7 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 3597 "configure"
+#line 3675 "configure"
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -3615,16 +3693,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3618: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3696: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3621: \$? = $ac_status" >&5
+  echo "$as_me:3699: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3624: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3702: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3627: \$? = $ac_status" >&5
+  echo "$as_me:3705: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else
@@ -3635,7 +3713,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
   break
 done
 fi
-echo "$as_me:3638: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:3716: result: $ac_cv_sys_file_offset_bits" >&5
 echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
 if test "$ac_cv_sys_file_offset_bits" != no; then
 
@@ -3645,7 +3723,7 @@ EOF
 
 fi
 rm -f conftest*
-  echo "$as_me:3648: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:3726: checking for _LARGE_FILES value needed for large files" >&5
 echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_large_files+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3653,7 +3731,7 @@ else
   while :; do
   ac_cv_sys_large_files=no
   cat >conftest.$ac_ext <<_ACEOF
-#line 3656 "configure"
+#line 3734 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -3673,16 +3751,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3676: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3754: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3679: \$? = $ac_status" >&5
+  echo "$as_me:3757: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3682: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3760: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3685: \$? = $ac_status" >&5
+  echo "$as_me:3763: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -3691,7 +3769,7 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 3694 "configure"
+#line 3772 "configure"
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
@@ -3712,16 +3790,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3715: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3793: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3718: \$? = $ac_status" >&5
+  echo "$as_me:3796: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3721: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3799: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3724: \$? = $ac_status" >&5
+  echo "$as_me:3802: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_large_files=1; break
 else
@@ -3732,7 +3810,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
   break
 done
 fi
-echo "$as_me:3735: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:3813: result: $ac_cv_sys_large_files" >&5
 echo "${ECHO_T}$ac_cv_sys_large_files" >&6
 if test "$ac_cv_sys_large_files" != no; then
 
@@ -3745,7 +3823,7 @@ rm -f conftest*
 fi
 
     if test "$enable_largefile" != no ; then
-	echo "$as_me:3748: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+	echo "$as_me:3826: checking for _LARGEFILE_SOURCE value needed for large files" >&5
 echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_largefile_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3753,7 +3831,7 @@ else
   while :; do
   ac_cv_sys_largefile_source=no
   cat >conftest.$ac_ext <<_ACEOF
-#line 3756 "configure"
+#line 3834 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -3765,16 +3843,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3768: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3846: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3771: \$? = $ac_status" >&5
+  echo "$as_me:3849: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3774: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3852: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3777: \$? = $ac_status" >&5
+  echo "$as_me:3855: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -3783,7 +3861,7 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 3786 "configure"
+#line 3864 "configure"
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
@@ -3796,16 +3874,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3799: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3877: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3802: \$? = $ac_status" >&5
+  echo "$as_me:3880: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3805: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3883: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3808: \$? = $ac_status" >&5
+  echo "$as_me:3886: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_largefile_source=1; break
 else
@@ -3816,7 +3894,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
   break
 done
 fi
-echo "$as_me:3819: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:3897: result: $ac_cv_sys_largefile_source" >&5
 echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
 if test "$ac_cv_sys_largefile_source" != no; then
 
@@ -3830,13 +3908,13 @@ rm -f conftest*
 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
 # in glibc 2.1.3, but that breaks too many other things.
 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-echo "$as_me:3833: checking for fseeko" >&5
+echo "$as_me:3911: checking for fseeko" >&5
 echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
 if test "${ac_cv_func_fseeko+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3839 "configure"
+#line 3917 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -3848,16 +3926,16 @@ return fseeko && fseeko (stdin, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3851: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3929: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3854: \$? = $ac_status" >&5
+  echo "$as_me:3932: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3857: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3935: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3860: \$? = $ac_status" >&5
+  echo "$as_me:3938: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_fseeko=yes
 else
@@ -3867,7 +3945,7 @@ ac_cv_func_fseeko=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:3870: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:3948: result: $ac_cv_func_fseeko" >&5
 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
 if test $ac_cv_func_fseeko = yes; then
 
@@ -3888,14 +3966,14 @@ fi
 	test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE "
 	test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits "
 
-	echo "$as_me:3891: checking whether to use struct dirent64" >&5
+	echo "$as_me:3969: checking whether to use struct dirent64" >&5
 echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6
 if test "${cf_cv_struct_dirent64+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 3898 "configure"
+#line 3976 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -3916,16 +3994,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3919: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3997: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3922: \$? = $ac_status" >&5
+  echo "$as_me:4000: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3925: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4003: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3928: \$? = $ac_status" >&5
+  echo "$as_me:4006: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_struct_dirent64=yes
 else
@@ -3936,7 +4014,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:3939: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:4017: result: $cf_cv_struct_dirent64" >&5
 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
 	test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF
 #define HAVE_STRUCT_DIRENT64 1
@@ -3946,17 +4024,17 @@ EOF
 
 GCC_VERSION=none
 if test "$GCC" = yes ; then
-	echo "$as_me:3949: checking version of $CC" >&5
+	echo "$as_me:4027: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
-	GCC_VERSION="`${CC} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
+	GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
-	echo "$as_me:3953: result: $GCC_VERSION" >&5
+	echo "$as_me:4031: result: $GCC_VERSION" >&5
 echo "${ECHO_T}$GCC_VERSION" >&6
 fi
 
 if ( test "$GCC" = yes || test "$GXX" = yes )
 then
-echo "$as_me:3959: checking if you want to check for gcc warnings" >&5
+echo "$as_me:4037: checking if you want to check for gcc warnings" >&5
 echo $ECHO_N "checking if you want to check for gcc warnings... $ECHO_C" >&6
 
 # Check whether --with-warnings or --without-warnings was given.
@@ -3966,7 +4044,7 @@ if test "${with_warnings+set}" = set; then
 else
   cf_opt_with_warnings=no
 fi;
-echo "$as_me:3969: result: $cf_opt_with_warnings" >&5
+echo "$as_me:4047: result: $cf_opt_with_warnings" >&5
 echo "${ECHO_T}$cf_opt_with_warnings" >&6
 if test "$cf_opt_with_warnings" != no ; then
 
@@ -3988,10 +4066,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:3991: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:4069: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > conftest.$ac_ext <<EOF
-#line 3994 "${as_me-configure}"
+#line 4072 "${as_me-configure}"
 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"
@@ -4040,12 +4118,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:4043: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:4121: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4046: \$? = $ac_status" >&5
+  echo "$as_me:4124: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-			test -n "$verbose" && echo "$as_me:4048: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:4126: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case $cf_attribute in #(vi
@@ -4085,12 +4163,12 @@ INTEL_COMPILER=no
 if test "$GCC" = yes ; then
 	case $host_os in
 	linux*|gnu*)
-		echo "$as_me:4088: checking if this is really Intel C compiler" >&5
+		echo "$as_me:4166: 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 4093 "configure"
+#line 4171 "configure"
 #include "confdefs.h"
 
 int
@@ -4107,16 +4185,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4110: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4188: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4113: \$? = $ac_status" >&5
+  echo "$as_me:4191: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4116: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4194: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4119: \$? = $ac_status" >&5
+  echo "$as_me:4197: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
@@ -4127,14 +4205,14 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 		CFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:4130: result: $INTEL_COMPILER" >&5
+		echo "$as_me:4208: result: $INTEL_COMPILER" >&5
 echo "${ECHO_T}$INTEL_COMPILER" >&6
 		;;
 	esac
 fi
 
 cat > conftest.$ac_ext <<EOF
-#line 4137 "${as_me-configure}"
+#line 4215 "${as_me-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 
@@ -4151,7 +4229,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:4154: checking for $CC warning options..." >&5
+	{ echo "$as_me:4232: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="-Wall"
@@ -4167,12 +4245,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:4170: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:4248: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4173: \$? = $ac_status" >&5
+  echo "$as_me:4251: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-			test -n "$verbose" && echo "$as_me:4175: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:4253: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -4181,13 +4259,13 @@ echo "${ECHO_T}... -$cf_opt" >&6
 
 elif test "$GCC" = yes
 then
-	{ echo "$as_me:4184: checking for $CC warning options..." >&5
+	{ echo "$as_me:4262: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
-	EXTRA_CFLAGS="-W -Wall"
+	EXTRA_CFLAGS=
 	cf_warn_CONST=""
 	test "$with_ext_const" = yes && cf_warn_CONST="Wwrite-strings"
-	for cf_opt in \
+	for cf_opt in W Wall \
 		Wbad-function-cast \
 		Wcast-align \
 		Wcast-qual \
@@ -4201,12 +4279,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef $cf_warn_CONST
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:4204: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:4282: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4207: \$? = $ac_status" >&5
+  echo "$as_me:4285: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-			test -n "$verbose" && echo "$as_me:4209: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:4287: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case $cf_opt in #(vi
 			Wcast-qual) #(vi
@@ -4217,7 +4295,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				[34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me-configure}:4220: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me-configure}:4298: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -4234,13 +4312,13 @@ fi
 fi
 
 EXTRAOBJS=""
-echo "$as_me:4237: checking for ANSI C header files" >&5
+echo "$as_me:4315: 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 4243 "configure"
+#line 4321 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -4248,13 +4326,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:4251: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4329: \"$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:4257: \$? = $ac_status" >&5
+  echo "$as_me:4335: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4276,7 +4354,7 @@ rm -f conftest.err conftest.$ac_ext
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 4279 "configure"
+#line 4357 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -4294,7 +4372,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 4297 "configure"
+#line 4375 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -4315,7 +4393,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4318 "configure"
+#line 4396 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -4341,15 +4419,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:4344: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4422: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4347: \$? = $ac_status" >&5
+  echo "$as_me:4425: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:4349: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4427: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4352: \$? = $ac_status" >&5
+  echo "$as_me:4430: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -4362,7 +4440,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:4365: result: $ac_cv_header_stdc" >&5
+echo "$as_me:4443: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -4372,7 +4450,7 @@ EOF
 
 fi
 
-echo "$as_me:4375: checking for inline" >&5
+echo "$as_me:4453: checking for inline" >&5
 echo $ECHO_N "checking for inline... $ECHO_C" >&6
 if test "${ac_cv_c_inline+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4380,7 +4458,7 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >conftest.$ac_ext <<_ACEOF
-#line 4383 "configure"
+#line 4461 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo () {return 0; }
@@ -4389,16 +4467,16 @@ $ac_kw int foo () {return 0; }
 
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4392: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4470: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4395: \$? = $ac_status" >&5
+  echo "$as_me:4473: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4398: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4476: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4401: \$? = $ac_status" >&5
+  echo "$as_me:4479: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
@@ -4409,7 +4487,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:4412: result: $ac_cv_c_inline" >&5
+echo "$as_me:4490: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -4430,28 +4508,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:4433: checking for $ac_header" >&5
+echo "$as_me:4511: 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 4439 "configure"
+#line 4517 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4445: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4523: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4448: \$? = $ac_status" >&5
+  echo "$as_me:4526: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4451: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4529: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4454: \$? = $ac_status" >&5
+  echo "$as_me:4532: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -4461,7 +4539,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4464: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:4542: 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
@@ -4471,13 +4549,13 @@ EOF
 fi
 done
 
-echo "$as_me:4474: checking for off_t" >&5
+echo "$as_me:4552: checking for off_t" >&5
 echo $ECHO_N "checking for off_t... $ECHO_C" >&6
 if test "${ac_cv_type_off_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4480 "configure"
+#line 4558 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -4492,16 +4570,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4495: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4573: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4498: \$? = $ac_status" >&5
+  echo "$as_me:4576: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4501: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4579: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4504: \$? = $ac_status" >&5
+  echo "$as_me:4582: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -4511,7 +4589,7 @@ ac_cv_type_off_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4514: result: $ac_cv_type_off_t" >&5
+echo "$as_me:4592: result: $ac_cv_type_off_t" >&5
 echo "${ECHO_T}$ac_cv_type_off_t" >&6
 if test $ac_cv_type_off_t = yes; then
   :
@@ -4523,13 +4601,13 @@ EOF
 
 fi
 
-echo "$as_me:4526: checking for size_t" >&5
+echo "$as_me:4604: checking for size_t" >&5
 echo $ECHO_N "checking for size_t... $ECHO_C" >&6
 if test "${ac_cv_type_size_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4532 "configure"
+#line 4610 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -4544,16 +4622,16 @@ if (sizeof (size_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4547: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4625: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4550: \$? = $ac_status" >&5
+  echo "$as_me:4628: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4553: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4631: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4556: \$? = $ac_status" >&5
+  echo "$as_me:4634: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_size_t=yes
 else
@@ -4563,7 +4641,7 @@ ac_cv_type_size_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4566: result: $ac_cv_type_size_t" >&5
+echo "$as_me:4644: result: $ac_cv_type_size_t" >&5
 echo "${ECHO_T}$ac_cv_type_size_t" >&6
 if test $ac_cv_type_size_t = yes; then
   :
@@ -4577,13 +4655,13 @@ fi
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:4580: checking for working alloca.h" >&5
+echo "$as_me:4658: checking for working alloca.h" >&5
 echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6
 if test "${ac_cv_working_alloca_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4586 "configure"
+#line 4664 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int
@@ -4595,16 +4673,16 @@ char *p = (char *) alloca (2 * sizeof (int));
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4598: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4676: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4601: \$? = $ac_status" >&5
+  echo "$as_me:4679: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4604: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4682: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4607: \$? = $ac_status" >&5
+  echo "$as_me:4685: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_working_alloca_h=yes
 else
@@ -4614,7 +4692,7 @@ ac_cv_working_alloca_h=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4617: result: $ac_cv_working_alloca_h" >&5
+echo "$as_me:4695: result: $ac_cv_working_alloca_h" >&5
 echo "${ECHO_T}$ac_cv_working_alloca_h" >&6
 if test $ac_cv_working_alloca_h = yes; then
 
@@ -4624,13 +4702,13 @@ EOF
 
 fi
 
-echo "$as_me:4627: checking for alloca" >&5
+echo "$as_me:4705: checking for alloca" >&5
 echo $ECHO_N "checking for alloca... $ECHO_C" >&6
 if test "${ac_cv_func_alloca_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4633 "configure"
+#line 4711 "configure"
 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -4662,16 +4740,16 @@ char *p = (char *) alloca (1);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4665: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4743: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4668: \$? = $ac_status" >&5
+  echo "$as_me:4746: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4671: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4749: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4674: \$? = $ac_status" >&5
+  echo "$as_me:4752: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_alloca_works=yes
 else
@@ -4681,7 +4759,7 @@ ac_cv_func_alloca_works=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4684: result: $ac_cv_func_alloca_works" >&5
+echo "$as_me:4762: result: $ac_cv_func_alloca_works" >&5
 echo "${ECHO_T}$ac_cv_func_alloca_works" >&6
 
 if test $ac_cv_func_alloca_works = yes; then
@@ -4702,13 +4780,13 @@ cat >>confdefs.h <<\EOF
 #define C_ALLOCA 1
 EOF
 
-echo "$as_me:4705: checking whether \`alloca.c' needs Cray hooks" >&5
+echo "$as_me:4783: checking whether \`alloca.c' needs Cray hooks" >&5
 echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6
 if test "${ac_cv_os_cray+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4711 "configure"
+#line 4789 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -4726,18 +4804,18 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:4729: result: $ac_cv_os_cray" >&5
+echo "$as_me:4807: result: $ac_cv_os_cray" >&5
 echo "${ECHO_T}$ac_cv_os_cray" >&6
 if test $ac_cv_os_cray = yes; then
   for ac_func in _getb67 GETB67 getb67; do
     as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:4734: checking for $ac_func" >&5
+echo "$as_me:4812: 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 4740 "configure"
+#line 4818 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -4768,16 +4846,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4771: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4849: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4774: \$? = $ac_status" >&5
+  echo "$as_me:4852: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4777: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4855: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4780: \$? = $ac_status" >&5
+  echo "$as_me:4858: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -4787,7 +4865,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4790: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:4868: 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
 
@@ -4801,7 +4879,7 @@ fi
   done
 fi
 
-echo "$as_me:4804: checking stack direction for C alloca" >&5
+echo "$as_me:4882: checking stack direction for C alloca" >&5
 echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6
 if test "${ac_cv_c_stack_direction+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4810,7 +4888,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4813 "configure"
+#line 4891 "configure"
 #include "confdefs.h"
 int
 find_stack_direction ()
@@ -4833,15 +4911,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:4836: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4914: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4839: \$? = $ac_status" >&5
+  echo "$as_me:4917: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:4841: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4919: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4844: \$? = $ac_status" >&5
+  echo "$as_me:4922: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_stack_direction=1
 else
@@ -4853,7 +4931,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:4856: result: $ac_cv_c_stack_direction" >&5
+echo "$as_me:4934: result: $ac_cv_c_stack_direction" >&5
 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
 cat >>confdefs.h <<EOF
@@ -4865,23 +4943,23 @@ fi
 for ac_header in stdlib.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:4868: checking for $ac_header" >&5
+echo "$as_me:4946: 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 4874 "configure"
+#line 4952 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:4878: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4956: \"$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:4884: \$? = $ac_status" >&5
+  echo "$as_me:4962: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4900,7 +4978,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:4903: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:4981: 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
@@ -4913,13 +4991,13 @@ done
 for ac_func in getpagesize
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:4916: checking for $ac_func" >&5
+echo "$as_me:4994: 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 4922 "configure"
+#line 5000 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -4950,16 +5028,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4953: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5031: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4956: \$? = $ac_status" >&5
+  echo "$as_me:5034: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4959: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5037: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4962: \$? = $ac_status" >&5
+  echo "$as_me:5040: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -4969,7 +5047,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4972: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:5050: 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
@@ -4979,7 +5057,7 @@ EOF
 fi
 done
 
-echo "$as_me:4982: checking for working mmap" >&5
+echo "$as_me:5060: checking for working mmap" >&5
 echo $ECHO_N "checking for working mmap... $ECHO_C" >&6
 if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4988,7 +5066,7 @@ else
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4991 "configure"
+#line 5069 "configure"
 #include "confdefs.h"
 $ac_includes_default
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -5115,15 +5193,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:5118: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5196: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5121: \$? = $ac_status" >&5
+  echo "$as_me:5199: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:5123: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5201: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5126: \$? = $ac_status" >&5
+  echo "$as_me:5204: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -5135,7 +5213,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:5138: result: $ac_cv_func_mmap_fixed_mapped" >&5
+echo "$as_me:5216: result: $ac_cv_func_mmap_fixed_mapped" >&5
 echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6
 if test $ac_cv_func_mmap_fixed_mapped = yes; then
 
@@ -5146,13 +5224,13 @@ EOF
 fi
 rm -f conftest.mmap
 
-    echo "$as_me:5149: checking whether we are using the GNU C Library 2.1 or newer" >&5
+    echo "$as_me:5227: checking whether we are using the GNU C Library 2.1 or newer" >&5
 echo $ECHO_N "checking whether we are using the GNU C Library 2.1 or newer... $ECHO_C" >&6
 if test "${ac_cv_gnu_library_2_1+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5155 "configure"
+#line 5233 "configure"
 #include "confdefs.h"
 
 #include <features.h>
@@ -5172,7 +5250,7 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:5175: result: $ac_cv_gnu_library_2_1" >&5
+echo "$as_me:5253: result: $ac_cv_gnu_library_2_1" >&5
 echo "${ECHO_T}$ac_cv_gnu_library_2_1" >&6
 
     GLIBC21="$ac_cv_gnu_library_2_1"
@@ -5196,23 +5274,23 @@ for ac_header in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
 stdlib.h string.h unistd.h sys/param.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:5199: checking for $ac_header" >&5
+echo "$as_me:5277: 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 5205 "configure"
+#line 5283 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:5209: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5287: \"$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:5215: \$? = $ac_status" >&5
+  echo "$as_me:5293: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5231,7 +5309,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:5234: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:5312: 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
@@ -5246,13 +5324,13 @@ getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \
 strdup strtoul tsearch __argz_count __argz_stringify __argz_next
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:5249: checking for $ac_func" >&5
+echo "$as_me:5327: 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 5255 "configure"
+#line 5333 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -5283,16 +5361,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5286: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5364: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5289: \$? = $ac_status" >&5
+  echo "$as_me:5367: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5292: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5370: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5295: \$? = $ac_status" >&5
+  echo "$as_me:5373: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -5302,7 +5380,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:5305: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:5383: 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
@@ -5350,7 +5428,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 5353 "configure"
+#line 5431 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -5362,16 +5440,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5365: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5443: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5368: \$? = $ac_status" >&5
+  echo "$as_me:5446: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5371: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5449: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5374: \$? = $ac_status" >&5
+  echo "$as_me:5452: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -5388,7 +5466,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:5391: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:5469: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -5429,7 +5507,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 5432 "configure"
+#line 5510 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -5441,16 +5519,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5444: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5522: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5447: \$? = $ac_status" >&5
+  echo "$as_me:5525: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5450: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5528: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5453: \$? = $ac_status" >&5
+  echo "$as_me:5531: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -5467,7 +5545,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:5470: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:5548: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -5483,7 +5561,7 @@ echo "${as_me-configure}:5470: testing adding $cf_add_incdir to include-path ...
 fi
 
 	else
-{ { echo "$as_me:5486: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:5564: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -5508,7 +5586,7 @@ if test -n "$cf_searchpath/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:5511: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:5589: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -5537,7 +5615,7 @@ if test -n "$cf_searchpath" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:5540: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:5618: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -5546,7 +5624,7 @@ echo "${as_me-configure}:5540: testing adding $cf_add_libdir to library-path ...
 fi
 
 	else
-{ { echo "$as_me:5549: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:5627: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -5557,7 +5635,7 @@ done
 
 fi;
 
-  echo "$as_me:5560: checking for iconv" >&5
+  echo "$as_me:5638: checking for iconv" >&5
 echo $ECHO_N "checking for iconv... $ECHO_C" >&6
 if test "${am_cv_func_iconv+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5568,10 +5646,51 @@ else
 cf_cv_header_path_iconv=
 cf_cv_library_path_iconv=
 
-echo "${as_me-configure}:5571: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me-configure}:5649: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
+
+cat >conftest.$ac_ext <<_ACEOF
+#line 5652 "configure"
+#include "confdefs.h"
+
+#include <stdlib.h>
+#include <iconv.h>
+
+int
+main ()
+{
+
+	iconv_t cd = iconv_open("","");
+	iconv(cd,NULL,NULL,NULL,NULL);
+	iconv_close(cd);
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:5671: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:5674: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:5677: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:5680: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+	cf_cv_find_linkage_iconv=yes
+
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+
+cf_save_LIBS="$LIBS"
+LIBS="-liconv  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 5574 "configure"
+#line 5693 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -5590,34 +5709,40 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5593: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5712: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5596: \$? = $ac_status" >&5
+  echo "$as_me:5715: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5599: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5718: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5602: \$? = $ac_status" >&5
+  echo "$as_me:5721: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  cf_cv_find_linkage_iconv=yes
+
+	cf_cv_find_linkage_iconv=yes
+	cf_cv_library_file_iconv="-liconv"
+
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
     cf_cv_find_linkage_iconv=no
+	LIBS="$cf_save_LIBS"
 
     test -n "$verbose" && echo "	find linkage for iconv library" 1>&6
 
-echo "${as_me-configure}:5613: testing find linkage for iconv library ..." 1>&5
+echo "${as_me-configure}:5736: testing find linkage for iconv library ..." 1>&5
 
-echo "${as_me-configure}:5615: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me-configure}:5738: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
 
 cf_search=
+
+# collect the current set of include-directories from compiler flags
 cf_header_path_list=""
 if test -n "${CFLAGS}${CPPFLAGS}" ; then
 	for cf_header_path in $CPPFLAGS $CFLAGS
@@ -5625,25 +5750,15 @@ if test -n "${CFLAGS}${CPPFLAGS}" ; then
 		case $cf_header_path in #(vi
 		-I*)
 			cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
-
-test "$cf_header_path" != "NONE" && \
-test -d "$cf_header_path" && \
- {
-	test -n "$verbose" && echo "	... testing for include-directories under $cf_header_path"
-	test -d $cf_header_path/include &&          cf_search="$cf_search $cf_header_path/include"
-	test -d $cf_header_path/include/iconv &&       cf_search="$cf_search $cf_header_path/include/iconv"
-	test -d $cf_header_path/include/iconv/include &&    cf_search="$cf_search $cf_header_path/include/iconv/include"
-	test -d $cf_header_path/iconv/include &&       cf_search="$cf_search $cf_header_path/iconv/include"
-	test -d $cf_header_path/iconv/include/iconv &&    cf_search="$cf_search $cf_header_path/iconv/include/iconv"
-}
-
-			cf_header_path_list="$cf_header_path_list $cf_search"
+			cf_header_path_list="$cf_header_path_list $cf_header_path"
 			;;
 		esac
 	done
 fi
 
-cf_search=""
+# add the variations for the package we are looking for
+
+cf_search=
 
 test "/usr" != "$prefix" && \
 test -d "/usr" && \
@@ -5714,18 +5829,18 @@ test -d "$oldincludedir" && {
 	test -d $oldincludedir/iconv && cf_search="$cf_search $oldincludedir/iconv"
 }
 
-cf_search="$cf_header_path_list $cf_search"
+cf_search="$cf_search $cf_header_path_list"
 
     for cf_cv_header_path_iconv in $cf_search
     do
       if test -d $cf_cv_header_path_iconv ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_iconv" 1>&6
 
-echo "${as_me-configure}:5724: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me-configure}:5839: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_iconv"
         cat >conftest.$ac_ext <<_ACEOF
-#line 5728 "configure"
+#line 5843 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -5744,21 +5859,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5747: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5862: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5750: \$? = $ac_status" >&5
+  echo "$as_me:5865: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5753: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5868: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5756: \$? = $ac_status" >&5
+  echo "$as_me:5871: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found iconv headers in $cf_cv_header_path_iconv" 1>&6
 
-echo "${as_me-configure}:5761: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me-configure}:5876: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
 
             cf_cv_find_linkage_iconv=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -5776,13 +5891,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_iconv" = maybe ; then
 
-echo "${as_me-configure}:5779: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me-configure}:5894: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
 
       if test "$cf_cv_find_linkage_iconv" != yes ; then
 
+cf_search=
 cf_library_path_list=""
 if test -n "${LDFLAGS}${LIBS}" ; then
 	for cf_library_path in $LDFLAGS $LIBS
@@ -5808,7 +5924,7 @@ test -d "$cf_library_path" && \
 	done
 fi
 
-cf_search=""
+cf_search=
 
 test "/usr" != "$prefix" && \
 test -d "/usr" && \
@@ -5872,13 +5988,13 @@ cf_search="$cf_library_path_list $cf_search"
           if test -d $cf_cv_library_path_iconv ; then
             test -n "$verbose" && echo "	... testing $cf_cv_library_path_iconv" 1>&6
 
-echo "${as_me-configure}:5875: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me-configure}:5991: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-liconv  $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_iconv"
             cat >conftest.$ac_ext <<_ACEOF
-#line 5881 "configure"
+#line 5997 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -5897,21 +6013,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5900: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6016: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5903: \$? = $ac_status" >&5
+  echo "$as_me:6019: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5906: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6022: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5909: \$? = $ac_status" >&5
+  echo "$as_me:6025: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
                 test -n "$verbose" && echo "	... found iconv library in $cf_cv_library_path_iconv" 1>&6
 
-echo "${as_me-configure}:5914: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me-configure}:6030: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
 
                 cf_cv_find_linkage_iconv=yes
                 cf_cv_library_file_iconv="-liconv"
@@ -5940,6 +6056,9 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+
 if test "$cf_cv_find_linkage_iconv" = yes ; then
 am_cv_func_iconv=yes
 else
@@ -5947,7 +6066,7 @@ am_cv_func_iconv="no, consider installing GNU libiconv"
 fi
 
 fi
-echo "$as_me:5950: result: $am_cv_func_iconv" >&5
+echo "$as_me:6069: result: $am_cv_func_iconv" >&5
 echo "${ECHO_T}$am_cv_func_iconv" >&6
 
   if test "$am_cv_func_iconv" = yes; then
@@ -5956,14 +6075,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_ICONV 1
 EOF
 
-    echo "$as_me:5959: checking if the declaration of iconv() needs const." >&5
+    echo "$as_me:6078: checking if the declaration of iconv() needs const." >&5
 echo $ECHO_N "checking if the declaration of iconv() needs const.... $ECHO_C" >&6
 if test "${am_cv_proto_iconv_const+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
       cat >conftest.$ac_ext <<_ACEOF
-#line 5966 "configure"
+#line 6085 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -5988,16 +6107,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5991: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6110: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5994: \$? = $ac_status" >&5
+  echo "$as_me:6113: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5997: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6116: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6000: \$? = $ac_status" >&5
+  echo "$as_me:6119: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_proto_iconv_const=no
 else
@@ -6007,7 +6126,7 @@ am_cv_proto_iconv_const=yes
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:6010: result: $am_cv_proto_iconv_const" >&5
+echo "$as_me:6129: result: $am_cv_proto_iconv_const" >&5
 echo "${ECHO_T}$am_cv_proto_iconv_const" >&6
 
     if test "$am_cv_proto_iconv_const" = yes ; then
@@ -6049,7 +6168,7 @@ if test -n "$cf_cv_header_path_iconv" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 6052 "configure"
+#line 6171 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -6061,16 +6180,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6064: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6183: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6067: \$? = $ac_status" >&5
+  echo "$as_me:6186: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6070: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6189: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6073: \$? = $ac_status" >&5
+  echo "$as_me:6192: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -6087,7 +6206,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:6090: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:6209: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -6124,7 +6243,7 @@ if test -n "$cf_cv_library_path_iconv" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:6127: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:6246: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -6135,13 +6254,13 @@ fi
     fi
   fi
 
-  echo "$as_me:6138: checking for nl_langinfo and CODESET" >&5
+  echo "$as_me:6257: checking for nl_langinfo and CODESET" >&5
 echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
 if test "${am_cv_langinfo_codeset+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6144 "configure"
+#line 6263 "configure"
 #include "confdefs.h"
 #include <langinfo.h>
 int
@@ -6153,16 +6272,16 @@ char* cs = nl_langinfo(CODESET);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6156: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6275: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6159: \$? = $ac_status" >&5
+  echo "$as_me:6278: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6162: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6281: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6165: \$? = $ac_status" >&5
+  echo "$as_me:6284: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_langinfo_codeset=yes
 else
@@ -6173,7 +6292,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:6176: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:6295: result: $am_cv_langinfo_codeset" >&5
 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
   if test $am_cv_langinfo_codeset = yes; then
 
@@ -6184,13 +6303,13 @@ EOF
   fi
 
    if test $ac_cv_header_locale_h = yes; then
-    echo "$as_me:6187: checking for LC_MESSAGES" >&5
+    echo "$as_me:6306: checking for LC_MESSAGES" >&5
 echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6
 if test "${am_cv_val_LC_MESSAGES+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6193 "configure"
+#line 6312 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int
@@ -6202,16 +6321,16 @@ return LC_MESSAGES
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6205: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6324: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6208: \$? = $ac_status" >&5
+  echo "$as_me:6327: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6211: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6330: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6214: \$? = $ac_status" >&5
+  echo "$as_me:6333: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_val_LC_MESSAGES=yes
 else
@@ -6221,7 +6340,7 @@ am_cv_val_LC_MESSAGES=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6224: result: $am_cv_val_LC_MESSAGES" >&5
+echo "$as_me:6343: result: $am_cv_val_LC_MESSAGES" >&5
 echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6
     if test $am_cv_val_LC_MESSAGES = yes; then
 
@@ -6231,7 +6350,7 @@ EOF
 
     fi
   fi
-   echo "$as_me:6234: checking whether NLS is requested" >&5
+   echo "$as_me:6353: checking whether NLS is requested" >&5
 echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6
 
 # Check whether --enable-nls or --disable-nls was given.
@@ -6241,7 +6360,7 @@ if test "${enable_nls+set}" = set; then
 else
   USE_NLS=no
 fi;
-  echo "$as_me:6244: result: $USE_NLS" >&5
+  echo "$as_me:6363: result: $USE_NLS" >&5
 echo "${ECHO_T}$USE_NLS" >&6
 
   BUILD_INCLUDED_LIBINTL=no
@@ -6254,7 +6373,7 @@ cat >>confdefs.h <<\EOF
 #define ENABLE_NLS 1
 EOF
 
-    echo "$as_me:6257: checking whether included gettext is requested" >&5
+    echo "$as_me:6376: checking whether included gettext is requested" >&5
 echo $ECHO_N "checking whether included gettext is requested... $ECHO_C" >&6
 
 # Check whether --with-included-gettext or --without-included-gettext was given.
@@ -6264,7 +6383,7 @@ if test "${with_included_gettext+set}" = set; then
 else
   nls_cv_force_use_gnu_gettext=no
 fi;
-    echo "$as_me:6267: result: $nls_cv_force_use_gnu_gettext" >&5
+    echo "$as_me:6386: result: $nls_cv_force_use_gnu_gettext" >&5
 echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6
 
     nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
@@ -6273,7 +6392,7 @@ echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6
 
       cf_save_LIBS_1="$LIBS"
       LIBS="$LIBICONV $LIBS"
-      echo "$as_me:6276: checking for libintl.h and gettext()" >&5
+      echo "$as_me:6395: checking for libintl.h and gettext()" >&5
 echo $ECHO_N "checking for libintl.h and gettext()... $ECHO_C" >&6
 if test "${cf_cv_func_gettext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6284,10 +6403,10 @@ else
 cf_cv_header_path_intl=
 cf_cv_library_path_intl=
 
-echo "${as_me-configure}:6287: testing Starting FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me-configure}:6406: testing Starting FIND_LINKAGE(intl,) ..." 1>&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 6290 "configure"
+#line 6409 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -6307,34 +6426,82 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6310: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6429: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6313: \$? = $ac_status" >&5
+  echo "$as_me:6432: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6316: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6435: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6319: \$? = $ac_status" >&5
+  echo "$as_me:6438: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  cf_cv_find_linkage_intl=yes
+
+	cf_cv_find_linkage_intl=yes
+
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+
+cf_save_LIBS="$LIBS"
+LIBS="-lintl  $cf_save_LIBS"
+
+cat >conftest.$ac_ext <<_ACEOF
+#line 6451 "configure"
+#include "confdefs.h"
+
+#include <libintl.h>
+extern int _nl_msg_cat_cntr;
+
+int
+main ()
+{
+
+    bindtextdomain ("", "");
+    return (int) gettext ("")
+
+             + _nl_msg_cat_cntr
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:6471: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:6474: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:6477: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6480: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+	cf_cv_find_linkage_intl=yes
+	cf_cv_library_file_intl="-lintl"
+
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
     cf_cv_find_linkage_intl=no
+	LIBS="$cf_save_LIBS"
 
     test -n "$verbose" && echo "	find linkage for intl library" 1>&6
 
-echo "${as_me-configure}:6330: testing find linkage for intl library ..." 1>&5
+echo "${as_me-configure}:6495: testing find linkage for intl library ..." 1>&5
 
-echo "${as_me-configure}:6332: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me-configure}:6497: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
 
 cf_search=
+
+# collect the current set of include-directories from compiler flags
 cf_header_path_list=""
 if test -n "${CFLAGS}${CPPFLAGS}" ; then
 	for cf_header_path in $CPPFLAGS $CFLAGS
@@ -6342,25 +6509,15 @@ if test -n "${CFLAGS}${CPPFLAGS}" ; then
 		case $cf_header_path in #(vi
 		-I*)
 			cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
-
-test "$cf_header_path" != "NONE" && \
-test -d "$cf_header_path" && \
- {
-	test -n "$verbose" && echo "	... testing for include-directories under $cf_header_path"
-	test -d $cf_header_path/include &&          cf_search="$cf_search $cf_header_path/include"
-	test -d $cf_header_path/include/intl &&       cf_search="$cf_search $cf_header_path/include/intl"
-	test -d $cf_header_path/include/intl/include &&    cf_search="$cf_search $cf_header_path/include/intl/include"
-	test -d $cf_header_path/intl/include &&       cf_search="$cf_search $cf_header_path/intl/include"
-	test -d $cf_header_path/intl/include/intl &&    cf_search="$cf_search $cf_header_path/intl/include/intl"
-}
-
-			cf_header_path_list="$cf_header_path_list $cf_search"
+			cf_header_path_list="$cf_header_path_list $cf_header_path"
 			;;
 		esac
 	done
 fi
 
-cf_search=""
+# add the variations for the package we are looking for
+
+cf_search=
 
 test "/usr" != "$prefix" && \
 test -d "/usr" && \
@@ -6431,18 +6588,18 @@ test -d "$oldincludedir" && {
 	test -d $oldincludedir/intl && cf_search="$cf_search $oldincludedir/intl"
 }
 
-cf_search="$cf_header_path_list $cf_search"
+cf_search="$cf_search $cf_header_path_list"
 
     for cf_cv_header_path_intl in $cf_search
     do
       if test -d $cf_cv_header_path_intl ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_intl" 1>&6
 
-echo "${as_me-configure}:6441: testing ... testing $cf_cv_header_path_intl ..." 1>&5
+echo "${as_me-configure}:6598: testing ... testing $cf_cv_header_path_intl ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_intl"
         cat >conftest.$ac_ext <<_ACEOF
-#line 6445 "configure"
+#line 6602 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -6462,21 +6619,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6465: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6622: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6468: \$? = $ac_status" >&5
+  echo "$as_me:6625: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6471: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6628: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6474: \$? = $ac_status" >&5
+  echo "$as_me:6631: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found intl headers in $cf_cv_header_path_intl" 1>&6
 
-echo "${as_me-configure}:6479: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5
+echo "${as_me-configure}:6636: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5
 
             cf_cv_find_linkage_intl=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -6494,13 +6651,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_intl" = maybe ; then
 
-echo "${as_me-configure}:6497: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me-configure}:6654: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
 
       if test "$cf_cv_find_linkage_intl" != yes ; then
 
+cf_search=
 cf_library_path_list=""
 if test -n "${LDFLAGS}${LIBS}" ; then
 	for cf_library_path in $LDFLAGS $LIBS
@@ -6526,7 +6684,7 @@ test -d "$cf_library_path" && \
 	done
 fi
 
-cf_search=""
+cf_search=
 
 test "/usr" != "$prefix" && \
 test -d "/usr" && \
@@ -6590,13 +6748,13 @@ cf_search="$cf_library_path_list $cf_search"
           if test -d $cf_cv_library_path_intl ; then
             test -n "$verbose" && echo "	... testing $cf_cv_library_path_intl" 1>&6
 
-echo "${as_me-configure}:6593: testing ... testing $cf_cv_library_path_intl ..." 1>&5
+echo "${as_me-configure}:6751: testing ... testing $cf_cv_library_path_intl ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-lintl  $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_intl"
             cat >conftest.$ac_ext <<_ACEOF
-#line 6599 "configure"
+#line 6757 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -6616,21 +6774,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6619: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6777: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6622: \$? = $ac_status" >&5
+  echo "$as_me:6780: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6625: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6783: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6628: \$? = $ac_status" >&5
+  echo "$as_me:6786: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
                 test -n "$verbose" && echo "	... found intl library in $cf_cv_library_path_intl" 1>&6
 
-echo "${as_me-configure}:6633: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5
+echo "${as_me-configure}:6791: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5
 
                 cf_cv_find_linkage_intl=yes
                 cf_cv_library_file_intl="-lintl"
@@ -6659,6 +6817,9 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+
 if test "$cf_cv_find_linkage_intl" = yes ; then
 cf_cv_func_gettext=yes
 else
@@ -6666,7 +6827,7 @@ cf_cv_func_gettext=no
 fi
 
 fi
-echo "$as_me:6669: result: $cf_cv_func_gettext" >&5
+echo "$as_me:6830: result: $cf_cv_func_gettext" >&5
 echo "${ECHO_T}$cf_cv_func_gettext" >&6
       LIBS="$cf_save_LIBS_1"
 
@@ -6705,7 +6866,7 @@ if test -n "$cf_cv_header_path_intl" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 6708 "configure"
+#line 6869 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -6717,16 +6878,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6720: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6881: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6723: \$? = $ac_status" >&5
+  echo "$as_me:6884: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6726: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6887: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6729: \$? = $ac_status" >&5
+  echo "$as_me:6890: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -6743,7 +6904,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:6746: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:6907: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -6780,7 +6941,7 @@ if test -n "$cf_cv_library_path_intl" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:6783: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:6944: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         INTLLIBS="-L$cf_add_libdir $INTLLIBS"
       fi
@@ -6796,13 +6957,13 @@ fi
 for ac_func in dcgettext
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:6799: checking for $ac_func" >&5
+echo "$as_me:6960: 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 6805 "configure"
+#line 6966 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -6833,16 +6994,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6836: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6997: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6839: \$? = $ac_status" >&5
+  echo "$as_me:7000: \$? = $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:7003: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6845: \$? = $ac_status" >&5
+  echo "$as_me:7006: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -6852,7 +7013,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6855: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:7016: 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
@@ -6867,7 +7028,7 @@ done
                     # Extract the first word of "msgfmt", so it can be a program name with args.
 
 set dummy msgfmt; ac_word=$2
-echo "$as_me:6870: checking for $ac_word" >&5
+echo "$as_me:7031: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_MSGFMT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6894,16 +7055,16 @@ esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != ":"; then
-  echo "$as_me:6897: result: $MSGFMT" >&5
+  echo "$as_me:7058: result: $MSGFMT" >&5
 echo "${ECHO_T}$MSGFMT" >&6
 else
-  echo "$as_me:6900: result: no" >&5
+  echo "$as_me:7061: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
           # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
-echo "$as_me:6906: checking for $ac_word" >&5
+echo "$as_me:7067: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_GMSGFMT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6920,7 +7081,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
-   echo "$as_me:6923: found $ac_dir/$ac_word" >&5
+   echo "$as_me:7084: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -6932,17 +7093,17 @@ fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 
 if test -n "$GMSGFMT"; then
-  echo "$as_me:6935: result: $GMSGFMT" >&5
+  echo "$as_me:7096: result: $GMSGFMT" >&5
 echo "${ECHO_T}$GMSGFMT" >&6
 else
-  echo "$as_me:6938: result: no" >&5
+  echo "$as_me:7099: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
                     # Extract the first word of "xgettext", so it can be a program name with args.
 
 set dummy xgettext; ac_word=$2
-echo "$as_me:6945: checking for $ac_word" >&5
+echo "$as_me:7106: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_XGETTEXT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6969,10 +7130,10 @@ esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
-  echo "$as_me:6972: result: $XGETTEXT" >&5
+  echo "$as_me:7133: result: $XGETTEXT" >&5
 echo "${ECHO_T}$XGETTEXT" >&6
 else
-  echo "$as_me:6975: result: no" >&5
+  echo "$as_me:7136: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -6987,7 +7148,7 @@ fi
 
     if test "$nls_cv_use_gnu_gettext" = "yes"; then
       if test ! -d $srcdir/intl ; then
-        { { echo "$as_me:6990: error: no NLS library is packaged with this application" >&5
+        { { echo "$as_me:7151: error: no NLS library is packaged with this application" >&5
 echo "$as_me: error: no NLS library is packaged with this application" >&2;}
    { (exit 1); exit 1; }; }
       fi
@@ -6995,7 +7156,7 @@ echo "$as_me: error: no NLS library is packaged with this application" >&2;}
       # Extract the first word of "msgfmt", so it can be a program name with args.
 
 set dummy msgfmt; ac_word=$2
-echo "$as_me:6998: checking for $ac_word" >&5
+echo "$as_me:7159: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_MSGFMT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7022,16 +7183,16 @@ esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != ":"; then
-  echo "$as_me:7025: result: $MSGFMT" >&5
+  echo "$as_me:7186: result: $MSGFMT" >&5
 echo "${ECHO_T}$MSGFMT" >&6
 else
-  echo "$as_me:7028: result: no" >&5
+  echo "$as_me:7189: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
       # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
-echo "$as_me:7034: checking for $ac_word" >&5
+echo "$as_me:7195: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_GMSGFMT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7048,7 +7209,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
-   echo "$as_me:7051: found $ac_dir/$ac_word" >&5
+   echo "$as_me:7212: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -7060,17 +7221,17 @@ fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 
 if test -n "$GMSGFMT"; then
-  echo "$as_me:7063: result: $GMSGFMT" >&5
+  echo "$as_me:7224: result: $GMSGFMT" >&5
 echo "${ECHO_T}$GMSGFMT" >&6
 else
-  echo "$as_me:7066: result: no" >&5
+  echo "$as_me:7227: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
       # Extract the first word of "xgettext", so it can be a program name with args.
 
 set dummy xgettext; ac_word=$2
-echo "$as_me:7073: checking for $ac_word" >&5
+echo "$as_me:7234: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_XGETTEXT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7097,10 +7258,10 @@ esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
-  echo "$as_me:7100: result: $XGETTEXT" >&5
+  echo "$as_me:7261: result: $XGETTEXT" >&5
 echo "${ECHO_T}$XGETTEXT" >&6
 else
-  echo "$as_me:7103: result: no" >&5
+  echo "$as_me:7264: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -7115,7 +7276,7 @@ fi
                   if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then
         : ;
       else
-        echo "$as_me:7118: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
+        echo "$as_me:7279: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
 echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6
         GMSGFMT=":"
       fi
@@ -7125,7 +7286,7 @@ echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6
                       if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then
         : ;
       else
-        echo "$as_me:7128: result: found xgettext program is not GNU xgettext; ignore it" >&5
+        echo "$as_me:7289: result: found xgettext program is not GNU xgettext; ignore it" >&5
 echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6
         XGETTEXT=":"
       fi
@@ -7145,7 +7306,7 @@ echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:7148: checking for $ac_word" >&5
+echo "$as_me:7309: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_INTLBISON+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7160,7 +7321,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_INTLBISON="$ac_prog"
-echo "$as_me:7163: found $ac_dir/$ac_word" >&5
+echo "$as_me:7324: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -7168,10 +7329,10 @@ fi
 fi
 INTLBISON=$ac_cv_prog_INTLBISON
 if test -n "$INTLBISON"; then
-  echo "$as_me:7171: result: $INTLBISON" >&5
+  echo "$as_me:7332: result: $INTLBISON" >&5
 echo "${ECHO_T}$INTLBISON" >&6
 else
-  echo "$as_me:7174: result: no" >&5
+  echo "$as_me:7335: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -7181,7 +7342,7 @@ done
     if test -z "$INTLBISON"; then
       ac_verc_fail=yes
     else
-            echo "$as_me:7184: checking version of bison" >&5
+            echo "$as_me:7345: checking version of bison" >&5
 echo $ECHO_N "checking version of bison... $ECHO_C" >&6
       ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
       case $ac_prog_version in
@@ -7190,7 +7351,7 @@ echo $ECHO_N "checking version of bison... $ECHO_C" >&6
            ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
         *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
       esac
-    echo "$as_me:7193: result: $ac_prog_version" >&5
+    echo "$as_me:7354: result: $ac_prog_version" >&5
 echo "${ECHO_T}$ac_prog_version" >&6
     fi
     if test $ac_verc_fail = yes; then
@@ -7216,7 +7377,7 @@ echo "${ECHO_T}$ac_prog_version" >&6
      if test "x$ALL_LINGUAS" = "x"; then
        LINGUAS=
      else
-       echo "$as_me:7219: checking for catalogs to be installed" >&5
+       echo "$as_me:7380: checking for catalogs to be installed" >&5
 echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
        NEW_LINGUAS=
        for presentlang in $ALL_LINGUAS; do
@@ -7236,7 +7397,7 @@ echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
          fi
        done
        LINGUAS=$NEW_LINGUAS
-       echo "$as_me:7239: result: $LINGUAS" >&5
+       echo "$as_me:7400: result: $LINGUAS" >&5
 echo "${ECHO_T}$LINGUAS" >&6
      fi
 
@@ -7269,7 +7430,7 @@ cf_makefile=makefile
 use_our_messages=no
 if test "$USE_NLS" = yes ; then
 if test -d $srcdir/po ; then
-echo "$as_me:7272: checking if we should use included message-library" >&5
+echo "$as_me:7433: checking if we should use included message-library" >&5
 echo $ECHO_N "checking if we should use included message-library... $ECHO_C" >&6
 
 # Check whether --enable-included-msgs or --disable-included-msgs was given.
@@ -7280,7 +7441,7 @@ else
   use_our_messages=yes
 fi;
 fi
-echo "$as_me:7283: result: $use_our_messages" >&5
+echo "$as_me:7444: result: $use_our_messages" >&5
 echo "${ECHO_T}$use_our_messages" >&6
 fi
 
@@ -7321,23 +7482,23 @@ else
 for ac_header in libintl.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:7324: checking for $ac_header" >&5
+echo "$as_me:7485: 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 7330 "configure"
+#line 7491 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:7334: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7495: \"$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:7340: \$? = $ac_status" >&5
+  echo "$as_me:7501: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7356,7 +7517,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:7359: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:7520: 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
@@ -7401,14 +7562,14 @@ EOF
 	fi
 fi
 
-echo "$as_me:7404: checking if -lm needed for math functions" >&5
+echo "$as_me:7565: 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 7411 "configure"
+#line 7572 "configure"
 #include "confdefs.h"
 
 	#include <stdio.h>
@@ -7423,16 +7584,16 @@ double x = rand(); printf("result = %g\n", sqrt(x))
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7426: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7587: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7429: \$? = $ac_status" >&5
+  echo "$as_me:7590: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7432: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7593: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7435: \$? = $ac_status" >&5
+  echo "$as_me:7596: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_libm=no
 else
@@ -7442,7 +7603,7 @@ cf_cv_need_libm=yes
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7445: result: $cf_cv_need_libm" >&5
+echo "$as_me:7606: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 if test "$cf_cv_need_libm" = yes
 then
@@ -7451,7 +7612,7 @@ then
 
 fi
 
-echo "$as_me:7454: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:7615: 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.
@@ -7467,7 +7628,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:7470: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:7631: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case .$with_cflags in #(vi
@@ -7561,23 +7722,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:7564: checking for dmalloc.h" >&5
+	echo "$as_me:7725: 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 7570 "configure"
+#line 7731 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:7574: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7735: \"$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:7580: \$? = $ac_status" >&5
+  echo "$as_me:7741: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7596,11 +7757,11 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:7599: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:7760: 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:7603: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:7764: 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
@@ -7608,7 +7769,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7611 "configure"
+#line 7772 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7627,16 +7788,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7630: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7791: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7633: \$? = $ac_status" >&5
+  echo "$as_me:7794: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7636: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7797: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7639: \$? = $ac_status" >&5
+  echo "$as_me:7800: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -7647,7 +7808,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7650: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:7811: 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
@@ -7662,7 +7823,7 @@ fi
 
 fi
 
-echo "$as_me:7665: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:7826: 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.
@@ -7678,7 +7839,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:7681: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:7842: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case .$with_cflags in #(vi
@@ -7772,23 +7933,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:7775: checking for dbmalloc.h" >&5
+	echo "$as_me:7936: 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 7781 "configure"
+#line 7942 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:7785: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7946: \"$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:7791: \$? = $ac_status" >&5
+  echo "$as_me:7952: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7807,11 +7968,11 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:7810: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:7971: 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:7814: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:7975: 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
@@ -7819,7 +7980,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7822 "configure"
+#line 7983 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7838,16 +7999,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7841: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8002: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7844: \$? = $ac_status" >&5
+  echo "$as_me:8005: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7847: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8008: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7850: \$? = $ac_status" >&5
+  echo "$as_me:8011: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -7858,7 +8019,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7861: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:8022: 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
@@ -7873,7 +8034,7 @@ fi
 
 fi
 
-echo "$as_me:7876: checking if you want to use purify for testing" >&5
+echo "$as_me:8037: checking if you want to use purify for testing" >&5
 echo $ECHO_N "checking if you want to use purify for testing... $ECHO_C" >&6
 
 # Check whether --with-purify or --without-purify was given.
@@ -7889,7 +8050,7 @@ EOF
 else
   with_purify=
 fi;
-echo "$as_me:7892: result: ${with_purify:-no}" >&5
+echo "$as_me:8053: result: ${with_purify:-no}" >&5
 echo "${ECHO_T}${with_purify:-no}" >&6
 
 case .$with_cflags in #(vi
@@ -7982,7 +8143,7 @@ fi
 	;;
 esac
 
-echo "$as_me:7985: checking if you want to use valgrind for testing" >&5
+echo "$as_me:8146: 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.
@@ -7998,7 +8159,7 @@ EOF
 else
   with_valgrind=
 fi;
-echo "$as_me:8001: result: ${with_valgrind:-no}" >&5
+echo "$as_me:8162: result: ${with_valgrind:-no}" >&5
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case .$with_cflags in #(vi
@@ -8091,7 +8252,7 @@ fi
 	;;
 esac
 
-echo "$as_me:8094: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:8255: 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 --with-no-leaks or --without-no-leaks was given.
@@ -8113,10 +8274,10 @@ EOF
 else
   with_no_leaks=
 fi;
-echo "$as_me:8116: result: $with_no_leaks" >&5
+echo "$as_me:8277: result: $with_no_leaks" >&5
 echo "${ECHO_T}$with_no_leaks" >&6
 
-echo "$as_me:8119: checking if you want --trace option" >&5
+echo "$as_me:8280: checking if you want --trace option" >&5
 echo $ECHO_N "checking if you want --trace option... $ECHO_C" >&6
 
 # Check whether --enable-trace or --disable-trace was given.
@@ -8126,7 +8287,7 @@ if test "${enable_trace+set}" = set; then
 else
   enableval=yes
 fi;
-echo "$as_me:8129: result: $enableval" >&5
+echo "$as_me:8290: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 if test "$enableval" != no ; then
 EXTRAOBJS="$EXTRAOBJS trace\$o"
@@ -8156,7 +8317,7 @@ LIB_LINK='${CC}'
 LIB_INSTALL=
 LIB_UNINSTALL=
 
-echo "$as_me:8159: checking if you want to build libraries with libtool" >&5
+echo "$as_me:8320: checking if you want to build libraries with libtool" >&5
 echo $ECHO_N "checking if you want to build libraries with libtool... $ECHO_C" >&6
 
 # Check whether --with-libtool or --without-libtool was given.
@@ -8166,7 +8327,7 @@ if test "${with_libtool+set}" = set; then
 else
   with_libtool=no
 fi;
-echo "$as_me:8169: result: $with_libtool" >&5
+echo "$as_me:8330: result: $with_libtool" >&5
 echo "${ECHO_T}$with_libtool" >&6
 if test "$with_libtool" != "no"; then
 
@@ -8197,7 +8358,7 @@ case ".$with_libtool" in #(vi
   with_libtool=`echo $with_libtool | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:8200: error: expected a pathname, not \"$with_libtool\"" >&5
+  { { echo "$as_me:8361: error: expected a pathname, not \"$with_libtool\"" >&5
 echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -8207,7 +8368,7 @@ esac
 	else
 		# Extract the first word of "libtool", so it can be a program name with args.
 set dummy libtool; ac_word=$2
-echo "$as_me:8210: checking for $ac_word" >&5
+echo "$as_me:8371: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_LIBTOOL+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8224,7 +8385,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_LIBTOOL="$ac_dir/$ac_word"
-   echo "$as_me:8227: found $ac_dir/$ac_word" >&5
+   echo "$as_me:8388: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -8235,16 +8396,16 @@ fi
 LIBTOOL=$ac_cv_path_LIBTOOL
 
 if test -n "$LIBTOOL"; then
-  echo "$as_me:8238: result: $LIBTOOL" >&5
+  echo "$as_me:8399: result: $LIBTOOL" >&5
 echo "${ECHO_T}$LIBTOOL" >&6
 else
-  echo "$as_me:8241: result: no" >&5
+  echo "$as_me:8402: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 	fi
 	if test -z "$LIBTOOL" ; then
-		{ { echo "$as_me:8247: error: Cannot find libtool" >&5
+		{ { echo "$as_me:8408: error: Cannot find libtool" >&5
 echo "$as_me: error: Cannot find libtool" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -8259,17 +8420,17 @@ echo "$as_me: error: Cannot find libtool" >&2;}
 	LIB_PREP=:
 
 	# Show the version of libtool
-	echo "$as_me:8262: checking version of libtool" >&5
+	echo "$as_me:8423: checking version of libtool" >&5
 echo $ECHO_N "checking version of libtool... $ECHO_C" >&6
 
 	# Save the version in a cache variable - this is not entirely a good
 	# thing, but the version string from libtool is very ugly, and for
 	# bug reports it might be useful to have the original string. "("
 	cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' |sed -e '2,$d' -e 's/([^)]*)//g' -e 's/^[^1-9]*//' -e 's/[^0-9.].*//'`
-	echo "$as_me:8269: result: $cf_cv_libtool_version" >&5
+	echo "$as_me:8430: result: $cf_cv_libtool_version" >&5
 echo "${ECHO_T}$cf_cv_libtool_version" >&6
 	if test -z "$cf_cv_libtool_version" ; then
-		{ { echo "$as_me:8272: error: This is not GNU libtool" >&5
+		{ { echo "$as_me:8433: error: This is not GNU libtool" >&5
 echo "$as_me: error: This is not GNU libtool" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -8303,7 +8464,7 @@ if test "$with_libtool" = "yes" ; then
 	OBJEXT="lo"
 	LIBTOOL_MAKE=
 
-echo "$as_me:8306: checking for additional libtool options" >&5
+echo "$as_me:8467: checking for additional libtool options" >&5
 echo $ECHO_N "checking for additional libtool options... $ECHO_C" >&6
 
 # Check whether --with-libtool-opts or --without-libtool-opts was given.
@@ -8313,7 +8474,7 @@ if test "${with_libtool_opts+set}" = set; then
 else
   with_libtool_opts=no
 fi;
-echo "$as_me:8316: result: $with_libtool_opts" >&5
+echo "$as_me:8477: result: $with_libtool_opts" >&5
 echo "${ECHO_T}$with_libtool_opts" >&6
 
 case .$with_libtool_opts in
@@ -8343,7 +8504,7 @@ if test $use_ncurses != no ; then
 	cf_wide_curses=yes
 	if test $use_ncurses = ncursesw ; then
 
-echo "$as_me:8346: checking for multibyte character support" >&5
+echo "$as_me:8507: 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
@@ -8351,7 +8512,7 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 8354 "configure"
+#line 8515 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -8364,16 +8525,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8367: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8528: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8370: \$? = $ac_status" >&5
+  echo "$as_me:8531: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8373: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8534: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8376: \$? = $ac_status" >&5
+  echo "$as_me:8537: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_utf8_lib=yes
 else
@@ -8385,10 +8546,45 @@ cat conftest.$ac_ext >&5
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
-echo "${as_me-configure}:8388: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me-configure}:8549: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+
+cat >conftest.$ac_ext <<_ACEOF
+#line 8552 "configure"
+#include "confdefs.h"
+
+#include <libutf8.h>
+int
+main ()
+{
+putwc(0,0);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:8565: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:8568: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:8571: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:8574: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+	cf_cv_find_linkage_utf8=yes
+
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+
+cf_save_LIBS="$LIBS"
+LIBS="-lutf8  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 8391 "configure"
+#line 8587 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -8401,34 +8597,40 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8404: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8600: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8407: \$? = $ac_status" >&5
+  echo "$as_me:8603: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8410: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8606: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8413: \$? = $ac_status" >&5
+  echo "$as_me:8609: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  cf_cv_find_linkage_utf8=yes
+
+	cf_cv_find_linkage_utf8=yes
+	cf_cv_library_file_utf8="-lutf8"
+
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
     cf_cv_find_linkage_utf8=no
+	LIBS="$cf_save_LIBS"
 
     test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
 
-echo "${as_me-configure}:8424: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me-configure}:8624: testing find linkage for utf8 library ..." 1>&5
 
-echo "${as_me-configure}:8426: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me-configure}:8626: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
 
 cf_search=
+
+# collect the current set of include-directories from compiler flags
 cf_header_path_list=""
 if test -n "${CFLAGS}${CPPFLAGS}" ; then
 	for cf_header_path in $CPPFLAGS $CFLAGS
@@ -8436,25 +8638,15 @@ if test -n "${CFLAGS}${CPPFLAGS}" ; then
 		case $cf_header_path in #(vi
 		-I*)
 			cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
-
-test "$cf_header_path" != "NONE" && \
-test -d "$cf_header_path" && \
- {
-	test -n "$verbose" && echo "	... testing for include-directories under $cf_header_path"
-	test -d $cf_header_path/include &&          cf_search="$cf_search $cf_header_path/include"
-	test -d $cf_header_path/include/utf8 &&       cf_search="$cf_search $cf_header_path/include/utf8"
-	test -d $cf_header_path/include/utf8/include &&    cf_search="$cf_search $cf_header_path/include/utf8/include"
-	test -d $cf_header_path/utf8/include &&       cf_search="$cf_search $cf_header_path/utf8/include"
-	test -d $cf_header_path/utf8/include/utf8 &&    cf_search="$cf_search $cf_header_path/utf8/include/utf8"
-}
-
-			cf_header_path_list="$cf_header_path_list $cf_search"
+			cf_header_path_list="$cf_header_path_list $cf_header_path"
 			;;
 		esac
 	done
 fi
 
-cf_search=""
+# add the variations for the package we are looking for
+
+cf_search=
 
 test "/usr" != "$prefix" && \
 test -d "/usr" && \
@@ -8525,18 +8717,18 @@ test -d "$oldincludedir" && {
 	test -d $oldincludedir/utf8 && cf_search="$cf_search $oldincludedir/utf8"
 }
 
-cf_search="$cf_header_path_list $cf_search"
+cf_search="$cf_search $cf_header_path_list"
 
     for cf_cv_header_path_utf8 in $cf_search
     do
       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}:8535: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me-configure}:8727: 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 8539 "configure"
+#line 8731 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -8549,21 +8741,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8552: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8744: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8555: \$? = $ac_status" >&5
+  echo "$as_me:8747: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8558: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8750: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8561: \$? = $ac_status" >&5
+  echo "$as_me:8753: \$? = $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}:8566: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me-configure}:8758: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
 
             cf_cv_find_linkage_utf8=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -8581,13 +8773,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
-echo "${as_me-configure}:8584: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me-configure}:8776: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
 
       if test "$cf_cv_find_linkage_utf8" != yes ; then
 
+cf_search=
 cf_library_path_list=""
 if test -n "${LDFLAGS}${LIBS}" ; then
 	for cf_library_path in $LDFLAGS $LIBS
@@ -8613,7 +8806,7 @@ test -d "$cf_library_path" && \
 	done
 fi
 
-cf_search=""
+cf_search=
 
 test "/usr" != "$prefix" && \
 test -d "/usr" && \
@@ -8677,13 +8870,13 @@ cf_search="$cf_library_path_list $cf_search"
           if test -d $cf_cv_library_path_utf8 ; then
             test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
 
-echo "${as_me-configure}:8680: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me-configure}:8873: 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 8686 "configure"
+#line 8879 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -8696,21 +8889,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8699: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8892: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8702: \$? = $ac_status" >&5
+  echo "$as_me:8895: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8705: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8898: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8708: \$? = $ac_status" >&5
+  echo "$as_me:8901: \$? = $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}:8713: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me-configure}:8906: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
 
                 cf_cv_find_linkage_utf8=yes
                 cf_cv_library_file_utf8="-lutf8"
@@ -8739,6 +8932,9 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+
 if test "$cf_cv_find_linkage_utf8" = yes ; then
 cf_cv_utf8_lib=add-on
 else
@@ -8748,7 +8944,7 @@ fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8751: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:8947: 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
@@ -8782,7 +8978,7 @@ if test -n "$cf_cv_header_path_utf8" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 8785 "configure"
+#line 8981 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8794,16 +8990,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8797: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8993: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8800: \$? = $ac_status" >&5
+  echo "$as_me:8996: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8803: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8999: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8806: \$? = $ac_status" >&5
+  echo "$as_me:9002: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -8820,7 +9016,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:8823: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:9019: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -8854,7 +9050,7 @@ if test -n "$cf_cv_library_path_utf8" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:8857: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:9053: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -8862,7 +9058,7 @@ echo "${as_me-configure}:8857: testing adding $cf_add_libdir to library-path ...
   done
 fi
 
-	LIBS="-lutf8 $LIBS"
+	LIBS="$cf_cv_library_file_utf8 $LIBS"
 fi
 
 	fi
@@ -8896,7 +9092,7 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:8899: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:9095: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -8914,7 +9110,7 @@ for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:8917: checking for $ac_word" >&5
+echo "$as_me:9113: 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
@@ -8931,7 +9127,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_NCURSES_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:8934: found $ac_dir/$ac_word" >&5
+   echo "$as_me:9130: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -8942,10 +9138,10 @@ fi
 NCURSES_CONFIG=$ac_cv_path_NCURSES_CONFIG
 
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:8945: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:9141: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:8948: result: no" >&5
+  echo "$as_me:9144: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8955,11 +9151,116 @@ test -n "$NCURSES_CONFIG" || NCURSES_CONFIG="none"
 
 if test "$NCURSES_CONFIG" != none ; then
 
-cf_cv_ncurses_header=curses.h
-
 CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`"
 LIBS="`$NCURSES_CONFIG --libs` $LIBS"
 
+# even with config script, some packages use no-override for curses.h
+
+echo "$as_me:9159: 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
+else
+
+cf_cv_ncurses_header=none
+for cf_header in  \
+    $use_ncurses/curses.h \
+	$use_ncurses/ncurses.h \
+	curses.h \
+	ncurses.h
+do
+cat >conftest.$ac_ext <<_ACEOF
+#line 9173 "configure"
+#include "confdefs.h"
+#include <${cf_header}>
+int
+main ()
+{
+initscr(); tgoto("?", 0,0)
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:9185: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:9188: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:9191: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:9194: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  cf_cv_ncurses_header=$cf_header; break
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+done
+
+fi
+echo "$as_me:9205: 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:9209: error: No curses header-files found" >&5
+echo "$as_me: error: No curses header-files found" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+# cheat, to get the right #define's for HAVE_NCURSES_H, etc.
+
+for ac_header in $cf_cv_ncurses_header
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:9219: 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 9225 "configure"
+#include "confdefs.h"
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:9229: \"$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:9235: \$? = $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:9254: 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
+
 cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
@@ -9003,7 +9304,7 @@ if test -n "$cf_cv_curses_dir/include $cf_cv_curses_dir/include/$cf_ncuhdr_root"
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 9006 "configure"
+#line 9307 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9015,16 +9316,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9018: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9319: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9021: \$? = $ac_status" >&5
+  echo "$as_me:9322: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9024: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9325: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9027: \$? = $ac_status" >&5
+  echo "$as_me:9328: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9041,7 +9342,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:9044: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:9345: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -9058,7 +9359,7 @@ fi
 
 }
 
-echo "$as_me:9061: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:9362: 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
@@ -9070,7 +9371,7 @@ else
 	do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 9073 "configure"
+#line 9374 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -9094,16 +9395,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9097: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9398: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9100: \$? = $ac_status" >&5
+  echo "$as_me:9401: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9103: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9404: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9106: \$? = $ac_status" >&5
+  echo "$as_me:9407: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -9118,14 +9419,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 	done
 
 fi
-echo "$as_me:9121: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:9422: 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:9128: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:9429: 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
@@ -9134,6 +9435,8 @@ else
 	test -n "$verbose" && echo
 
 cf_search=
+
+# collect the current set of include-directories from compiler flags
 cf_header_path_list=""
 if test -n "${CFLAGS}${CPPFLAGS}" ; then
 	for cf_header_path in $CPPFLAGS $CFLAGS
@@ -9141,25 +9444,15 @@ if test -n "${CFLAGS}${CPPFLAGS}" ; then
 		case $cf_header_path in #(vi
 		-I*)
 			cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
-
-test "$cf_header_path" != "NONE" && \
-test -d "$cf_header_path" && \
- {
-	test -n "$verbose" && echo "	... testing for include-directories under $cf_header_path"
-	test -d $cf_header_path/include &&          cf_search="$cf_search $cf_header_path/include"
-	test -d $cf_header_path/include/$cf_ncuhdr_root &&       cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root"
-	test -d $cf_header_path/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root/include"
-	test -d $cf_header_path/$cf_ncuhdr_root/include &&       cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include"
-	test -d $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
-}
-
-			cf_header_path_list="$cf_header_path_list $cf_search"
+			cf_header_path_list="$cf_header_path_list $cf_header_path"
 			;;
 		esac
 	done
 fi
 
-cf_search=""
+# add the variations for the package we are looking for
+
+cf_search=
 
 test "/usr" != "$prefix" && \
 test -d "/usr" && \
@@ -9230,7 +9523,7 @@ test -d "$oldincludedir" && {
 	test -d $oldincludedir/$cf_ncuhdr_root && cf_search="$cf_search $oldincludedir/$cf_ncuhdr_root"
 }
 
-cf_search="$cf_header_path_list $cf_search"
+cf_search="$cf_search $cf_header_path_list"
 
 	test -n "$verbose" && echo search path $cf_search
 	cf_save2_CPPFLAGS="$CPPFLAGS"
@@ -9261,7 +9554,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 9264 "configure"
+#line 9557 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9273,16 +9566,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9276: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9569: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9279: \$? = $ac_status" >&5
+  echo "$as_me:9572: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9282: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9575: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9285: \$? = $ac_status" >&5
+  echo "$as_me:9578: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9299,7 +9592,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:9302: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:9595: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -9320,7 +9613,7 @@ fi
 		do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 9323 "configure"
+#line 9616 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -9344,16 +9637,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9347: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9640: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9350: \$? = $ac_status" >&5
+  echo "$as_me:9643: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9353: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9646: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9356: \$? = $ac_status" >&5
+  echo "$as_me:9649: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -9374,12 +9667,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9377: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9670: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:9382: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:9675: 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%/[^/]*$%%'`
@@ -9412,7 +9705,7 @@ if test -n "$cf_1st_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 9415 "configure"
+#line 9708 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9424,16 +9717,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9427: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9720: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9430: \$? = $ac_status" >&5
+  echo "$as_me:9723: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9433: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9726: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9436: \$? = $ac_status" >&5
+  echo "$as_me:9729: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9450,7 +9743,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:9453: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:9746: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -9493,7 +9786,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:9496: checking for terminfo header" >&5
+echo "$as_me:9789: 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
@@ -9511,7 +9804,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 9514 "configure"
+#line 9807 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -9526,16 +9819,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9529: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9822: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9532: \$? = $ac_status" >&5
+  echo "$as_me:9825: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9535: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9828: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9538: \$? = $ac_status" >&5
+  echo "$as_me:9831: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -9551,7 +9844,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:9554: result: $cf_cv_term_header" >&5
+echo "$as_me:9847: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -9585,7 +9878,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:9588: checking for ncurses version" >&5
+echo "$as_me:9881: 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
@@ -9611,10 +9904,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:9614: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:9907: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:9617: \$? = $ac_status" >&5
+  echo "$as_me:9910: \$? = $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%".*%%'`
@@ -9624,7 +9917,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9627 "configure"
+#line 9920 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -9649,15 +9942,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:9652: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9945: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9655: \$? = $ac_status" >&5
+  echo "$as_me:9948: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:9657: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9950: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9660: \$? = $ac_status" >&5
+  echo "$as_me:9953: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -9671,7 +9964,7 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:9674: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:9967: 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
@@ -9683,7 +9976,7 @@ cf_nculib_root=$use_ncurses
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:9686: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:9979: 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
@@ -9691,7 +9984,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9694 "configure"
+#line 9987 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9710,16 +10003,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9713: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10006: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9716: \$? = $ac_status" >&5
+  echo "$as_me:10009: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9719: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10012: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9722: \$? = $ac_status" >&5
+  echo "$as_me:10015: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -9730,10 +10023,10 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9733: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:10026: 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:9736: checking for initscr in -lgpm" >&5
+  echo "$as_me:10029: 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
@@ -9741,7 +10034,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9744 "configure"
+#line 10037 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9760,16 +10053,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9763: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10056: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9766: \$? = $ac_status" >&5
+  echo "$as_me:10059: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9769: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10062: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9772: \$? = $ac_status" >&5
+  echo "$as_me:10065: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -9780,7 +10073,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9783: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:10076: 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"
@@ -9795,7 +10088,7 @@ freebsd*)
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it's static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:9798: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:10091: 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
@@ -9803,7 +10096,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9806 "configure"
+#line 10099 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9822,16 +10115,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9825: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10118: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9828: \$? = $ac_status" >&5
+  echo "$as_me:10121: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9831: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10124: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9834: \$? = $ac_status" >&5
+  echo "$as_me:10127: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -9842,7 +10135,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9845: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:10138: 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"
@@ -9876,7 +10169,7 @@ if test -n "$cf_cv_curses_dir/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:9879: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:10172: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -9889,13 +10182,13 @@ else
 
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
-	echo "$as_me:9892: checking for initscr" >&5
+	echo "$as_me:10185: 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 9898 "configure"
+#line 10191 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */
@@ -9926,16 +10219,16 @@ f = initscr;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9929: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10222: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9932: \$? = $ac_status" >&5
+  echo "$as_me:10225: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9935: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10228: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9938: \$? = $ac_status" >&5
+  echo "$as_me:10231: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -9945,18 +10238,18 @@ ac_cv_func_initscr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9948: result: $ac_cv_func_initscr" >&5
+echo "$as_me:10241: 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:9955: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:10248: 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 9959 "configure"
+#line 10252 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -9968,27 +10261,28 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9971: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10264: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9974: \$? = $ac_status" >&5
+  echo "$as_me:10267: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9977: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10270: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9980: \$? = $ac_status" >&5
+  echo "$as_me:10273: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:9982: result: yes" >&5
+  echo "$as_me:10275: 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:9989: result: no" >&5
+echo "$as_me:10282: result: no" >&5
 echo "${ECHO_T}no" >&6
 
+cf_search=
 cf_library_path_list=""
 if test -n "${LDFLAGS}${LIBS}" ; then
 	for cf_library_path in $LDFLAGS $LIBS
@@ -10014,7 +10308,7 @@ test -d "$cf_library_path" && \
 	done
 fi
 
-cf_search=""
+cf_search=
 
 test "/usr" != "$prefix" && \
 test -d "/usr" && \
@@ -10075,11 +10369,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:10078: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:10372: 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 10082 "configure"
+#line 10376 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -10091,25 +10385,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10094: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10388: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10097: \$? = $ac_status" >&5
+  echo "$as_me:10391: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10100: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10394: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10103: \$? = $ac_status" >&5
+  echo "$as_me:10397: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:10105: result: yes" >&5
+  echo "$as_me:10399: 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:10112: result: no" >&5
+echo "$as_me:10406: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -10124,7 +10418,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:10127: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:10421: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -10132,7 +10426,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:10135: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:10429: 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
@@ -10142,7 +10436,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >conftest.$ac_ext <<_ACEOF
-#line 10145 "configure"
+#line 10439 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -10154,23 +10448,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10157: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10451: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10160: \$? = $ac_status" >&5
+  echo "$as_me:10454: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10163: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10457: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10166: \$? = $ac_status" >&5
+  echo "$as_me:10460: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:10168: result: yes" >&5
+  echo "$as_me:10462: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:10173: result: no" >&5
+echo "$as_me:10467: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -10188,7 +10482,7 @@ fi
 else
 	cf_wide_curses=no
 
-echo "$as_me:10191: checking for extra include directories" >&5
+echo "$as_me:10485: 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
@@ -10208,25 +10502,23 @@ sunos3*|sunos4*)
 esac
 
 fi
-echo "$as_me:10211: result: $cf_cv_curses_incdir" >&5
+echo "$as_me:10505: 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:10215: checking if we have identified curses headers" >&5
+echo "$as_me:10509: 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
 else
 
 cf_cv_ncurses_header=none
-for cf_header in \
+for cf_header in  \
 	curses.h \
-	ncurses.h \
-	ncurses/curses.h \
-	ncurses/ncurses.h
+	ncurses.h ncurses/curses.h ncurses/ncurses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 10229 "configure"
+#line 10521 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -10238,16 +10530,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10241: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10533: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10244: \$? = $ac_status" >&5
+  echo "$as_me:10536: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10247: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10539: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10250: \$? = $ac_status" >&5
+  echo "$as_me:10542: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -10258,11 +10550,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:10261: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:10553: 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:10265: error: No curses header-files found" >&5
+	{ { echo "$as_me:10557: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -10272,23 +10564,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:10275: checking for $ac_header" >&5
+echo "$as_me:10567: 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 10281 "configure"
+#line 10573 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:10285: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:10577: \"$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:10291: \$? = $ac_status" >&5
+  echo "$as_me:10583: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -10307,7 +10599,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:10310: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:10602: 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
@@ -10317,7 +10609,7 @@ EOF
 fi
 done
 
-echo "$as_me:10320: checking for terminfo header" >&5
+echo "$as_me:10612: 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
@@ -10335,7 +10627,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 10338 "configure"
+#line 10630 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -10350,16 +10642,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10353: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10645: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10356: \$? = $ac_status" >&5
+  echo "$as_me:10648: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10359: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10651: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10362: \$? = $ac_status" >&5
+  echo "$as_me:10654: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -10375,7 +10667,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:10378: result: $cf_cv_term_header" >&5
+echo "$as_me:10670: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -10404,7 +10696,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:10407: checking for ncurses version" >&5
+echo "$as_me:10699: 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
@@ -10430,10 +10722,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:10433: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:10725: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:10436: \$? = $ac_status" >&5
+  echo "$as_me:10728: \$? = $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%".*%%'`
@@ -10443,7 +10735,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10446 "configure"
+#line 10738 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -10468,15 +10760,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:10471: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10763: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10474: \$? = $ac_status" >&5
+  echo "$as_me:10766: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:10476: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10768: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10479: \$? = $ac_status" >&5
+  echo "$as_me:10771: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -10490,16 +10782,16 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:10493: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:10785: 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:10499: checking if we have identified curses libraries" >&5
+echo "$as_me:10791: 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 10502 "configure"
+#line 10794 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -10511,16 +10803,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10514: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10806: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10517: \$? = $ac_status" >&5
+  echo "$as_me:10809: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10520: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10812: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10523: \$? = $ac_status" >&5
+  echo "$as_me:10815: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -10529,13 +10821,13 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:10532: result: $cf_result" >&5
+echo "$as_me:10824: 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:10538: checking for tgoto in -lmytinfo" >&5
+    echo "$as_me:10830: 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
@@ -10543,7 +10835,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10546 "configure"
+#line 10838 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10562,16 +10854,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10565: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10857: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10568: \$? = $ac_status" >&5
+  echo "$as_me:10860: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10571: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10863: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10574: \$? = $ac_status" >&5
+  echo "$as_me:10866: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -10582,7 +10874,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10585: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:10877: 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"
@@ -10590,7 +10882,7 @@ fi
 
     ;;
 hpux10.*) #(vi
-    echo "$as_me:10593: checking for initscr in -lcur_colr" >&5
+    echo "$as_me:10885: 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
@@ -10598,7 +10890,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcur_colr  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10601 "configure"
+#line 10893 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10617,16 +10909,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10620: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10912: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10623: \$? = $ac_status" >&5
+  echo "$as_me:10915: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10626: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10918: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10629: \$? = $ac_status" >&5
+  echo "$as_me:10921: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_cur_colr_initscr=yes
 else
@@ -10637,7 +10929,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10640: result: $ac_cv_lib_cur_colr_initscr" >&5
+echo "$as_me:10932: 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
 
@@ -10646,7 +10938,7 @@ if test $ac_cv_lib_cur_colr_initscr = yes; then
 
 else
 
-    echo "$as_me:10649: checking for initscr in -lHcurses" >&5
+    echo "$as_me:10941: 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
@@ -10654,7 +10946,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lHcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10657 "configure"
+#line 10949 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10673,16 +10965,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10676: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10968: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10679: \$? = $ac_status" >&5
+  echo "$as_me:10971: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10682: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10974: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10685: \$? = $ac_status" >&5
+  echo "$as_me:10977: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Hcurses_initscr=yes
 else
@@ -10693,7 +10985,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10696: result: $ac_cv_lib_Hcurses_initscr" >&5
+echo "$as_me:10988: 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
 
@@ -10728,7 +11020,7 @@ if test -n "/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:10731: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:11023: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -10759,7 +11051,7 @@ if test -n "/usr/5lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:10762: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:11054: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -10787,13 +11079,13 @@ if test ".$ac_cv_func_initscr" != .yes ; then
 
     # Check for library containing tgoto.  Do this before curses library
     # because it may be needed to link the test-case for initscr.
-    echo "$as_me:10790: checking for tgoto" >&5
+    echo "$as_me:11082: 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 10796 "configure"
+#line 11088 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char tgoto (); below.  */
@@ -10824,16 +11116,16 @@ f = tgoto;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10827: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11119: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10830: \$? = $ac_status" >&5
+  echo "$as_me:11122: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10833: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11125: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10836: \$? = $ac_status" >&5
+  echo "$as_me:11128: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_tgoto=yes
 else
@@ -10843,7 +11135,7 @@ ac_cv_func_tgoto=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10846: result: $ac_cv_func_tgoto" >&5
+echo "$as_me:11138: 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
@@ -10852,7 +11144,7 @@ else
         for cf_term_lib in $cf_check_list termcap termlib unknown
         do
             as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh`
-echo "$as_me:10855: checking for tgoto in -l$cf_term_lib" >&5
+echo "$as_me:11147: 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
@@ -10860,7 +11152,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_term_lib  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10863 "configure"
+#line 11155 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10879,16 +11171,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10882: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11174: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10885: \$? = $ac_status" >&5
+  echo "$as_me:11177: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10888: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11180: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10891: \$? = $ac_status" >&5
+  echo "$as_me:11183: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -10899,7 +11191,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10902: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:11194: 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
@@ -10914,7 +11206,7 @@ fi
  	for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown
     do
         as_ac_Lib=`echo "ac_cv_lib_$cf_curs_lib''_initscr" | $as_tr_sh`
-echo "$as_me:10917: checking for initscr in -l$cf_curs_lib" >&5
+echo "$as_me:11209: 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
@@ -10922,7 +11214,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_curs_lib  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10925 "configure"
+#line 11217 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10941,16 +11233,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10944: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11236: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10947: \$? = $ac_status" >&5
+  echo "$as_me:11239: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10950: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11242: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10953: \$? = $ac_status" >&5
+  echo "$as_me:11245: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -10961,23 +11253,23 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10964: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:11256: 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:10971: error: no curses library found" >&5
+    test $cf_curs_lib = unknown && { { echo "$as_me:11263: 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:10977: checking if we can link with $cf_curs_lib library" >&5
+        echo "$as_me:11269: 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 10980 "configure"
+#line 11272 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -10989,16 +11281,16 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10992: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11284: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10995: \$? = $ac_status" >&5
+  echo "$as_me:11287: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10998: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11290: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11001: \$? = $ac_status" >&5
+  echo "$as_me:11293: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -11007,18 +11299,18 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-        echo "$as_me:11010: result: $cf_result" >&5
+        echo "$as_me:11302: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
-        test $cf_result = no && { { echo "$as_me:11012: error: Cannot link curses library" >&5
+        test $cf_result = no && { { echo "$as_me:11304: 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:11018: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+        echo "$as_me:11310: 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 11021 "configure"
+#line 11313 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -11030,16 +11322,16 @@ initscr(); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11033: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11325: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11036: \$? = $ac_status" >&5
+  echo "$as_me:11328: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11039: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11331: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11042: \$? = $ac_status" >&5
+  echo "$as_me:11334: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=no
 else
@@ -11048,7 +11340,7 @@ cat conftest.$ac_ext >&5
 
             LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
             cat >conftest.$ac_ext <<_ACEOF
-#line 11051 "configure"
+#line 11343 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -11060,16 +11352,16 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11063: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11355: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11066: \$? = $ac_status" >&5
+  echo "$as_me:11358: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11069: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11361: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11072: \$? = $ac_status" >&5
+  echo "$as_me:11364: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -11081,7 +11373,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-        echo "$as_me:11084: result: $cf_result" >&5
+        echo "$as_me:11376: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
     fi
 fi
@@ -11091,7 +11383,7 @@ fi
 
 cf_all_widgets=yes
 
-echo "$as_me:11094: checking if you want extra dialogs" >&5
+echo "$as_me:11386: checking if you want extra dialogs" >&5
 echo $ECHO_N "checking if you want extra dialogs... $ECHO_C" >&6
 
 # Check whether --enable-extras or --disable-extras was given.
@@ -11101,7 +11393,7 @@ if test "${enable_extras+set}" = set; then
 else
   enableval=yes
 fi;
-echo "$as_me:11104: result: $enableval" >&5
+echo "$as_me:11396: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 if test "$enableval" != no ; then
 cf_all_widgets=yes
@@ -11109,7 +11401,7 @@ else
 cf_all_widgets=no
 fi
 
-echo "$as_me:11112: checking if you want config-file support" >&5
+echo "$as_me:11404: checking if you want config-file support" >&5
 echo $ECHO_N "checking if you want config-file support... $ECHO_C" >&6
 
 # Check whether --enable-rc-file or --disable-rc-file was given.
@@ -11119,7 +11411,7 @@ if test "${enable_rc_file+set}" = set; then
 else
   enableval=$cf_all_widgets
 fi;
-echo "$as_me:11122: result: $enableval" >&5
+echo "$as_me:11414: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 if test "$enableval" != no ; then
 EXTRAOBJS="$EXTRAOBJS rc\$o"
@@ -11131,7 +11423,7 @@ else
 	:
 fi
 
-echo "$as_me:11134: checking if you want Xdialog-style dialogs" >&5
+echo "$as_me:11426: checking if you want Xdialog-style dialogs" >&5
 echo $ECHO_N "checking if you want Xdialog-style dialogs... $ECHO_C" >&6
 
 # Check whether --enable-Xdialog or --disable-Xdialog was given.
@@ -11141,7 +11433,7 @@ if test "${enable_Xdialog+set}" = set; then
 else
   enableval=$cf_all_widgets
 fi;
-echo "$as_me:11144: result: $enableval" >&5
+echo "$as_me:11436: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 if test "$enableval" != no ; then
 EXTRAOBJS="$EXTRAOBJS calendar\$o fselect\$o timebox\$o"
@@ -11153,7 +11445,7 @@ else
 	:
 fi
 
-echo "$as_me:11156: checking if you want the form dialog" >&5
+echo "$as_me:11448: checking if you want the form dialog" >&5
 echo $ECHO_N "checking if you want the form dialog... $ECHO_C" >&6
 
 # Check whether --enable-form or --disable-form was given.
@@ -11163,7 +11455,7 @@ if test "${enable_form+set}" = set; then
 else
   enableval=$cf_all_widgets
 fi;
-echo "$as_me:11166: result: $enableval" >&5
+echo "$as_me:11458: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 if test "$enableval" != no ; then
 EXTRAOBJS="$EXTRAOBJS formbox\$o"
@@ -11175,7 +11467,7 @@ else
 	:
 fi
 
-echo "$as_me:11178: checking if you want the gauge dialog" >&5
+echo "$as_me:11470: checking if you want the gauge dialog" >&5
 echo $ECHO_N "checking if you want the gauge dialog... $ECHO_C" >&6
 
 # Check whether --enable-gauge or --disable-gauge was given.
@@ -11185,7 +11477,7 @@ if test "${enable_gauge+set}" = set; then
 else
   enableval=$cf_all_widgets
 fi;
-echo "$as_me:11188: result: $enableval" >&5
+echo "$as_me:11480: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 if test "$enableval" != no ; then
 EXTRAOBJS="$EXTRAOBJS guage\$o pause\$o progressbox\$o"
@@ -11197,7 +11489,7 @@ else
 	:
 fi
 
-echo "$as_me:11200: checking if you want the tailbox dialog" >&5
+echo "$as_me:11492: checking if you want the tailbox dialog" >&5
 echo $ECHO_N "checking if you want the tailbox dialog... $ECHO_C" >&6
 
 # Check whether --enable-tailbox or --disable-tailbox was given.
@@ -11207,7 +11499,7 @@ if test "${enable_tailbox+set}" = set; then
 else
   enableval=$cf_all_widgets
 fi;
-echo "$as_me:11210: result: $enableval" >&5
+echo "$as_me:11502: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 if test "$enableval" != no ; then
 EXTRAOBJS="$EXTRAOBJS tailbox\$o"
@@ -11219,7 +11511,7 @@ else
 	:
 fi
 
-echo "$as_me:11222: checking if you want the mixedform dialog" >&5
+echo "$as_me:11514: checking if you want the mixedform dialog" >&5
 echo $ECHO_N "checking if you want the mixedform dialog... $ECHO_C" >&6
 
 # Check whether --enable-mixedform or --disable-mixedform was given.
@@ -11229,7 +11521,7 @@ if test "${enable_mixedform+set}" = set; then
 else
   enableval=$cf_all_widgets
 fi;
-echo "$as_me:11232: result: $enableval" >&5
+echo "$as_me:11524: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 if test "$enableval" != no ; then
 EXTRAOBJS="$EXTRAOBJS mixedform\$o"
@@ -11241,7 +11533,7 @@ else
 	:
 fi
 
-echo "$as_me:11244: checking if you want the mixedgauge dialog" >&5
+echo "$as_me:11536: checking if you want the mixedgauge dialog" >&5
 echo $ECHO_N "checking if you want the mixedgauge dialog... $ECHO_C" >&6
 
 # Check whether --enable-mixedgauge or --disable-mixedgauge was given.
@@ -11251,7 +11543,7 @@ if test "${enable_mixedgauge+set}" = set; then
 else
   enableval=$cf_all_widgets
 fi;
-echo "$as_me:11254: result: $enableval" >&5
+echo "$as_me:11546: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 if test "$enableval" != no ; then
 EXTRAOBJS="$EXTRAOBJS mixedgauge\$o"
@@ -11263,7 +11555,7 @@ else
 	:
 fi
 
-echo "$as_me:11266: checking if you want the wide-curses features" >&5
+echo "$as_me:11558: checking if you want the wide-curses features" >&5
 echo $ECHO_N "checking if you want the wide-curses features... $ECHO_C" >&6
 
 # Check whether --enable-widec or --disable-widec was given.
@@ -11273,7 +11565,7 @@ if test "${enable_widec+set}" = set; then
 else
   enableval=$cf_wide_curses
 fi;
-echo "$as_me:11276: result: $enableval" >&5
+echo "$as_me:11568: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 if test "$enableval" != no ; then
 cat >>confdefs.h <<\EOF
@@ -11284,13 +11576,13 @@ else
 	:
 fi
 
-echo "$as_me:11287: checking for ANSI C header files" >&5
+echo "$as_me:11579: 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 11293 "configure"
+#line 11585 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -11298,13 +11590,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:11301: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:11593: \"$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:11307: \$? = $ac_status" >&5
+  echo "$as_me:11599: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11326,7 +11618,7 @@ rm -f conftest.err conftest.$ac_ext
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 11329 "configure"
+#line 11621 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -11344,7 +11636,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 11347 "configure"
+#line 11639 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -11365,7 +11657,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11368 "configure"
+#line 11660 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -11391,15 +11683,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:11394: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11686: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11397: \$? = $ac_status" >&5
+  echo "$as_me:11689: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:11399: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11691: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11402: \$? = $ac_status" >&5
+  echo "$as_me:11694: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11412,7 +11704,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:11415: result: $ac_cv_header_stdc" >&5
+echo "$as_me:11707: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -11422,13 +11714,13 @@ EOF
 
 fi
 
-echo "$as_me:11425: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:11717: 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 11431 "configure"
+#line 11723 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -11444,16 +11736,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11447: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11739: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11450: \$? = $ac_status" >&5
+  echo "$as_me:11742: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11453: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11745: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11456: \$? = $ac_status" >&5
+  echo "$as_me:11748: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_header_time=yes
 else
@@ -11463,7 +11755,7 @@ ac_cv_header_time=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:11466: result: $ac_cv_header_time" >&5
+echo "$as_me:11758: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -11476,13 +11768,13 @@ fi
 ac_header_dirent=no
 for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
   as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-echo "$as_me:11479: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:11771: checking for $ac_hdr that defines DIR" >&5
 echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11485 "configure"
+#line 11777 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -11497,16 +11789,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11500: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11792: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11503: \$? = $ac_status" >&5
+  echo "$as_me:11795: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11506: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11798: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11509: \$? = $ac_status" >&5
+  echo "$as_me:11801: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -11516,7 +11808,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:11519: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:11811: 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
@@ -11529,7 +11821,7 @@ fi
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  echo "$as_me:11532: checking for opendir in -ldir" >&5
+  echo "$as_me:11824: checking for opendir in -ldir" >&5
 echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
 if test "${ac_cv_lib_dir_opendir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11537,7 +11829,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 11540 "configure"
+#line 11832 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11556,16 +11848,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11559: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11851: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11562: \$? = $ac_status" >&5
+  echo "$as_me:11854: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11565: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11857: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11568: \$? = $ac_status" >&5
+  echo "$as_me:11860: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -11576,14 +11868,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11579: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:11871: result: $ac_cv_lib_dir_opendir" >&5
 echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
 if test $ac_cv_lib_dir_opendir = yes; then
   LIBS="$LIBS -ldir"
 fi
 
 else
-  echo "$as_me:11586: checking for opendir in -lx" >&5
+  echo "$as_me:11878: checking for opendir in -lx" >&5
 echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
 if test "${ac_cv_lib_x_opendir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11591,7 +11883,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 11594 "configure"
+#line 11886 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11610,16 +11902,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11613: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11905: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11616: \$? = $ac_status" >&5
+  echo "$as_me:11908: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11619: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11911: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11622: \$? = $ac_status" >&5
+  echo "$as_me:11914: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -11630,7 +11922,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11633: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:11925: result: $ac_cv_lib_x_opendir" >&5
 echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
 if test $ac_cv_lib_x_opendir = yes; then
   LIBS="$LIBS -lx"
@@ -11641,23 +11933,23 @@ fi
 for ac_header in search.h unctrl.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:11644: checking for $ac_header" >&5
+echo "$as_me:11936: 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 11650 "configure"
+#line 11942 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:11654: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:11946: \"$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:11660: \$? = $ac_status" >&5
+  echo "$as_me:11952: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11676,7 +11968,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:11679: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:11971: 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
@@ -11686,7 +11978,7 @@ EOF
 fi
 done
 
-echo "$as_me:11689: checking for term.h" >&5
+echo "$as_me:11981: 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
@@ -11699,7 +11991,7 @@ for cf_header in \
 	term.h
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 11702 "configure"
+#line 11994 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -11713,16 +12005,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11716: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12008: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11719: \$? = $ac_status" >&5
+  echo "$as_me:12011: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11722: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12014: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11725: \$? = $ac_status" >&5
+  echo "$as_me:12017: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_term_header=$cf_header
 	 break
@@ -11734,8 +12026,56 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
+case $cf_cv_term_header in #(vi
+no)
+	# If curses is ncurses, some packagers still mess it up by trying to make
+	# us use GNU termcap.  This handles the most common case.
+	for cf_header in ncurses/term.h ncursesw/term.h
+	do
+		cat >conftest.$ac_ext <<_ACEOF
+#line 12036 "configure"
+#include "confdefs.h"
+
+#include <${cf_cv_ncurses_header-curses.h}>
+#ifdef NCURSES_VERSION
+#include <${cf_header}>
+#else
+make an error
+#endif
+int
+main ()
+{
+WINDOW *x
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:12054: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:12057: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:12060: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:12063: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  cf_cv_term_header=$cf_header
+			 break
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+cf_cv_term_header=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+	done
+	;;
+esac
+
 fi
-echo "$as_me:11738: result: $cf_cv_term_header" >&5
+echo "$as_me:12078: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 case $cf_cv_term_header in #(vi
@@ -11745,7 +12085,7 @@ term.h) #(vi
 EOF
 
 	;;
-ncurses/term.h)
+ncurses/term.h) #(vi
 	cat >>confdefs.h <<\EOF
 #define HAVE_NCURSES_TERM_H 1
 EOF
@@ -11759,13 +12099,13 @@ EOF
 	;;
 esac
 
-echo "$as_me:11762: checking return type of signal handlers" >&5
+echo "$as_me:12102: 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 11768 "configure"
+#line 12108 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -11787,16 +12127,16 @@ int i;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11790: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12130: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11793: \$? = $ac_status" >&5
+  echo "$as_me:12133: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11796: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12136: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11799: \$? = $ac_status" >&5
+  echo "$as_me:12139: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_signal=void
 else
@@ -11806,7 +12146,7 @@ ac_cv_type_signal=int
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:11809: result: $ac_cv_type_signal" >&5
+echo "$as_me:12149: result: $ac_cv_type_signal" >&5
 echo "${ECHO_T}$ac_cv_type_signal" >&6
 
 cat >>confdefs.h <<EOF
@@ -11822,13 +12162,13 @@ waitpid \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:11825: checking for $ac_func" >&5
+echo "$as_me:12165: 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 11831 "configure"
+#line 12171 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -11859,16 +12199,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11862: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12202: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11865: \$? = $ac_status" >&5
+  echo "$as_me:12205: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11868: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12208: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11871: \$? = $ac_status" >&5
+  echo "$as_me:12211: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -11878,7 +12218,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:11881: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:12221: 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
@@ -11888,14 +12228,14 @@ EOF
 fi
 done
 
-echo "$as_me:11891: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+echo "$as_me:12231: 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 11898 "configure"
+#line 12238 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -11904,6 +12244,11 @@ int
 main ()
 {
 
+#if defined(NCURSES_VERSION_PATCH)
+if (NCURSES_VERSION_PATCH < 20100501) && (NCURSES_VERSION_PATCH >= 20100403)
+	make an error
+#endif
+#endif
 	long x = winnstr(stdscr, "", 0);
 	int x1, y1;
 	getbegyx(stdscr, y1, x1)
@@ -11912,23 +12257,23 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11915: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12260: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11918: \$? = $ac_status" >&5
+  echo "$as_me:12263: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11921: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12266: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11924: \$? = $ac_status" >&5
+  echo "$as_me:12269: \$? = $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 11931 "configure"
+#line 12276 "configure"
 #include "confdefs.h"
 
 #define _XOPEN_SOURCE_EXTENDED
@@ -11938,6 +12283,10 @@ int
 main ()
 {
 
+#ifdef NCURSES_VERSION
+	cchar_t check;
+	int check2 = curs_set((int)sizeof(check));
+#endif
 	long x = winnstr(stdscr, "", 0);
 	int x1, y1;
 	getbegyx(stdscr, y1, x1)
@@ -11946,16 +12295,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11949: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12298: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11952: \$? = $ac_status" >&5
+  echo "$as_me:12301: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11955: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12304: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11958: \$? = $ac_status" >&5
+  echo "$as_me:12307: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_xopen_extension=yes
 else
@@ -11967,7 +12316,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:11970: result: $cf_cv_need_xopen_extension" >&5
+echo "$as_me:12319: 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"
 
@@ -11991,10 +12340,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:11994: checking for ${cf_func}" >&5
+	echo "$as_me:12343: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me-configure}:11997: testing ${cf_func} ..." 1>&5
+echo "${as_me-configure}:12346: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12003,7 +12352,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >conftest.$ac_ext <<_ACEOF
-#line 12006 "configure"
+#line 12355 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -12034,16 +12383,16 @@ ${cf_cv_main_return-return}(foo == 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12037: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12386: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12040: \$? = $ac_status" >&5
+  echo "$as_me:12389: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12043: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12392: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12046: \$? = $ac_status" >&5
+  echo "$as_me:12395: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -12059,7 +12408,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:12062: result: $cf_result" >&5
+	echo "$as_me:12411: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test $cf_result != no; then
 		cat >>confdefs.h <<EOF
@@ -12069,13 +12418,13 @@ EOF
 	fi
 done
 
-echo "$as_me:12072: checking for start_color" >&5
+echo "$as_me:12421: checking for start_color" >&5
 echo $ECHO_N "checking for start_color... $ECHO_C" >&6
 if test "${ac_cv_func_start_color+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12078 "configure"
+#line 12427 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char start_color (); below.  */
@@ -12106,16 +12455,16 @@ f = start_color;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12109: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12458: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12112: \$? = $ac_status" >&5
+  echo "$as_me:12461: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12115: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12464: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12118: \$? = $ac_status" >&5
+  echo "$as_me:12467: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_start_color=yes
 else
@@ -12125,7 +12474,7 @@ ac_cv_func_start_color=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12128: result: $ac_cv_func_start_color" >&5
+echo "$as_me:12477: result: $ac_cv_func_start_color" >&5
 echo "${ECHO_T}$ac_cv_func_start_color" >&6
 if test $ac_cv_func_start_color = yes; then
   cat >>confdefs.h <<\EOF
@@ -12134,14 +12483,14 @@ EOF
 
 fi
 
-echo "$as_me:12137: checking for chtype typedef" >&5
+echo "$as_me:12486: checking for chtype typedef" >&5
 echo $ECHO_N "checking for chtype typedef... $ECHO_C" >&6
 if test "${cf_cv_chtype_decl+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 12144 "configure"
+#line 12493 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -12153,16 +12502,16 @@ chtype foo
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12156: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12505: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12159: \$? = $ac_status" >&5
+  echo "$as_me:12508: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12162: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12511: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12165: \$? = $ac_status" >&5
+  echo "$as_me:12514: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_chtype_decl=yes
 else
@@ -12172,21 +12521,21 @@ cf_cv_chtype_decl=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12175: result: $cf_cv_chtype_decl" >&5
+echo "$as_me:12524: result: $cf_cv_chtype_decl" >&5
 echo "${ECHO_T}$cf_cv_chtype_decl" >&6
 if test $cf_cv_chtype_decl = yes ; then
 	cat >>confdefs.h <<\EOF
 #define HAVE_TYPE_CHTYPE 1
 EOF
 
-	echo "$as_me:12182: checking if chtype is scalar or struct" >&5
+	echo "$as_me:12531: checking if chtype is scalar or struct" >&5
 echo $ECHO_N "checking if chtype is scalar or struct... $ECHO_C" >&6
 if test "${cf_cv_chtype_type+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 12189 "configure"
+#line 12538 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -12198,16 +12547,16 @@ chtype foo; long x = foo
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12201: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12550: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12204: \$? = $ac_status" >&5
+  echo "$as_me:12553: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12207: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12556: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12210: \$? = $ac_status" >&5
+  echo "$as_me:12559: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_chtype_type=scalar
 else
@@ -12217,7 +12566,7 @@ cf_cv_chtype_type=struct
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12220: result: $cf_cv_chtype_type" >&5
+echo "$as_me:12569: result: $cf_cv_chtype_type" >&5
 echo "${ECHO_T}$cf_cv_chtype_type" >&6
 	if test $cf_cv_chtype_type = scalar ; then
 		cat >>confdefs.h <<\EOF
@@ -12230,23 +12579,23 @@ fi
 for ac_header in sys/wait.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:12233: checking for $ac_header" >&5
+echo "$as_me:12582: 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 12239 "configure"
+#line 12588 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:12243: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:12592: \"$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:12249: \$? = $ac_status" >&5
+  echo "$as_me:12598: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12265,7 +12614,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:12268: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:12617: 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
@@ -12286,23 +12635,23 @@ else
 for ac_header in wait.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:12289: checking for $ac_header" >&5
+echo "$as_me:12638: 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 12295 "configure"
+#line 12644 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:12299: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:12648: \"$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:12305: \$? = $ac_status" >&5
+  echo "$as_me:12654: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12321,7 +12670,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:12324: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:12673: 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
@@ -12334,23 +12683,23 @@ done
 for ac_header in waitstatus.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:12337: checking for $ac_header" >&5
+echo "$as_me:12686: 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 12343 "configure"
+#line 12692 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:12347: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:12696: \"$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:12353: \$? = $ac_status" >&5
+  echo "$as_me:12702: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12369,7 +12718,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:12372: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:12721: 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
@@ -12391,14 +12740,14 @@ cf_wait_headers="$cf_wait_headers
 fi
 fi
 
-echo "$as_me:12394: checking for union wait" >&5
+echo "$as_me:12743: checking for union wait" >&5
 echo $ECHO_N "checking for union wait... $ECHO_C" >&6
 if test "${cf_cv_type_unionwait+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 12401 "configure"
+#line 12750 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -12414,16 +12763,16 @@ int x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12417: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12766: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12420: \$? = $ac_status" >&5
+  echo "$as_me:12769: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12423: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12772: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12426: \$? = $ac_status" >&5
+  echo "$as_me:12775: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_unionwait=no
 	 echo compiles ok w/o union wait 1>&5
@@ -12433,7 +12782,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 12436 "configure"
+#line 12785 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -12453,16 +12802,16 @@ union wait x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12456: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12805: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12459: \$? = $ac_status" >&5
+  echo "$as_me:12808: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12462: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12811: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12465: \$? = $ac_status" >&5
+  echo "$as_me:12814: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_unionwait=yes
 	 echo compiles ok with union wait and possibly macros too 1>&5
@@ -12477,7 +12826,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:12480: result: $cf_cv_type_unionwait" >&5
+echo "$as_me:12829: result: $cf_cv_type_unionwait" >&5
 echo "${ECHO_T}$cf_cv_type_unionwait" >&6
 test $cf_cv_type_unionwait = yes && cat >>confdefs.h <<\EOF
 #define HAVE_TYPE_UNIONWAIT 1
@@ -12485,14 +12834,14 @@ EOF
 
 if test $cf_cv_type_unionwait = yes; then
 
-	echo "$as_me:12488: checking if union wait can be used as wait-arg" >&5
+	echo "$as_me:12837: checking if union wait can be used as wait-arg" >&5
 echo $ECHO_N "checking if union wait can be used as wait-arg... $ECHO_C" >&6
 	if test "${cf_cv_arg_union_wait+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 12495 "configure"
+#line 12844 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -12504,16 +12853,16 @@ union wait x; wait(&x)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12507: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12856: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12510: \$? = $ac_status" >&5
+  echo "$as_me:12859: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12513: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12862: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12516: \$? = $ac_status" >&5
+  echo "$as_me:12865: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_arg_union_wait=yes
 else
@@ -12525,20 +12874,20 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-	echo "$as_me:12528: result: $cf_cv_arg_union_wait" >&5
+	echo "$as_me:12877: result: $cf_cv_arg_union_wait" >&5
 echo "${ECHO_T}$cf_cv_arg_union_wait" >&6
 	test $cf_cv_arg_union_wait = yes && cat >>confdefs.h <<\EOF
 #define WAIT_USES_UNION 1
 EOF
 
-	echo "$as_me:12534: checking if union wait can be used as waitpid-arg" >&5
+	echo "$as_me:12883: checking if union wait can be used as waitpid-arg" >&5
 echo $ECHO_N "checking if union wait can be used as waitpid-arg... $ECHO_C" >&6
 	if test "${cf_cv_arg_union_waitpid+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 12541 "configure"
+#line 12890 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -12550,16 +12899,16 @@ union wait x; waitpid(0, &x, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12553: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12902: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12556: \$? = $ac_status" >&5
+  echo "$as_me:12905: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12559: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12908: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12562: \$? = $ac_status" >&5
+  echo "$as_me:12911: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_arg_union_waitpid=yes
 else
@@ -12571,7 +12920,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-	echo "$as_me:12574: result: $cf_cv_arg_union_waitpid" >&5
+	echo "$as_me:12923: result: $cf_cv_arg_union_waitpid" >&5
 echo "${ECHO_T}$cf_cv_arg_union_waitpid" >&6
 	test $cf_cv_arg_union_waitpid = yes && cat >>confdefs.h <<\EOF
 #define WAITPID_USES_UNION 1
@@ -12579,14 +12928,14 @@ EOF
 
 fi
 
-echo "$as_me:12582: checking if we must include wchar.h to declare mbstate_t" >&5
+echo "$as_me:12931: 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 12589 "configure"
+#line 12938 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -12603,23 +12952,23 @@ mbstate_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12606: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12955: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12609: \$? = $ac_status" >&5
+  echo "$as_me:12958: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12612: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12961: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12615: \$? = $ac_status" >&5
+  echo "$as_me:12964: \$? = $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 12622 "configure"
+#line 12971 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -12637,16 +12986,16 @@ mbstate_t value
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12640: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12989: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12643: \$? = $ac_status" >&5
+  echo "$as_me:12992: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12646: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12995: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12649: \$? = $ac_status" >&5
+  echo "$as_me:12998: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_mbstate_t=yes
 else
@@ -12658,7 +13007,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12661: result: $cf_cv_mbstate_t" >&5
+echo "$as_me:13010: result: $cf_cv_mbstate_t" >&5
 echo "${ECHO_T}$cf_cv_mbstate_t" >&6
 
 if test "$cf_cv_mbstate_t" = yes ; then
@@ -12681,7 +13030,7 @@ PACKAGE_CONFIG=dlg_config.h
 EXTRA_OUTPUT="$EXTRA_OUTPUT headers-sh:$srcdir/headers-sh.in"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 12684 "configure"
+#line 13033 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int
@@ -12693,16 +13042,16 @@ setlocale(LC_ALL, "")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12696: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13045: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12699: \$? = $ac_status" >&5
+  echo "$as_me:13048: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12702: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13051: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12705: \$? = $ac_status" >&5
+  echo "$as_me:13054: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >>confdefs.h <<\EOF
 #define HAVE_SETLOCALE 1
@@ -12714,6 +13063,305 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
+LD_RPATH_OPT=
+echo "$as_me:13067: checking for an rpath option" >&5
+echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
+case $cf_cv_system_name in #(vi
+irix*) #(vi
+	if test "$GCC" = yes; then
+		LD_RPATH_OPT="-Wl,-rpath,"
+	else
+		LD_RPATH_OPT="-rpath "
+	fi
+	;;
+linux*|gnu*|k*bsd*-gnu) #(vi
+	LD_RPATH_OPT="-Wl,-rpath,"
+	;;
+openbsd[2-9].*) #(vi
+	LD_RPATH_OPT="-Wl,-rpath,"
+	;;
+freebsd*) #(vi
+	LD_RPATH_OPT="-rpath "
+	;;
+netbsd*) #(vi
+	LD_RPATH_OPT="-Wl,-rpath,"
+	;;
+osf*|mls+*) #(vi
+	LD_RPATH_OPT="-rpath "
+	;;
+solaris2*) #(vi
+	LD_RPATH_OPT="-R"
+	;;
+*)
+	;;
+esac
+echo "$as_me:13098: result: $LD_RPATH_OPT" >&5
+echo "${ECHO_T}$LD_RPATH_OPT" >&6
+
+case "x$LD_RPATH_OPT" in #(vi
+x-R*)
+	echo "$as_me:13103: checking if we need a space after rpath option" >&5
+echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
+	cf_save_LIBS="$LIBS"
+	LIBS="${LD_RPATH_OPT}$libdir $LIBS"
+	cat >conftest.$ac_ext <<_ACEOF
+#line 13108 "configure"
+#include "confdefs.h"
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:13120: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:13123: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:13126: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:13129: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  cf_rpath_space=no
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+cf_rpath_space=yes
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+	LIBS="$cf_save_LIBS"
+	echo "$as_me:13139: result: $cf_rpath_space" >&5
+echo "${ECHO_T}$cf_rpath_space" >&6
+	test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
+	;;
+esac
+
+echo "$as_me:13145: checking if rpath should be not be set" >&5
+echo $ECHO_N "checking if rpath should be not be set... $ECHO_C" >&6
+
+# Check whether --enable-rpath-hack or --disable-rpath-hack was given.
+if test "${enable_rpath_hack+set}" = set; then
+  enableval="$enable_rpath_hack"
+  test "$enableval" != no && enableval=yes
+  if test "$enableval" != "yes" ; then
+    cf_disable_rpath_hack=yes
+  else
+    cf_disable_rpath_hack=no
+  fi
+else
+  enableval=yes
+  cf_disable_rpath_hack=no
+
+fi;
+echo "$as_me:13162: result: $cf_disable_rpath_hack" >&5
+echo "${ECHO_T}$cf_disable_rpath_hack" >&6
+if test "$cf_disable_rpath_hack" = no ; then
+
+echo "$as_me:13166: checking for updated LDFLAGS" >&5
+echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
+if test -n "$LD_RPATH_OPT" ; then
+	echo "$as_me:13169: result: maybe" >&5
+echo "${ECHO_T}maybe" >&6
+
+	for ac_prog in ldd
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo "$as_me:13176: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$cf_ldd_prog"; then
+  ac_cv_prog_cf_ldd_prog="$cf_ldd_prog" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_cf_ldd_prog="$ac_prog"
+echo "$as_me:13191: found $ac_dir/$ac_word" >&5
+break
+done
+
+fi
+fi
+cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
+if test -n "$cf_ldd_prog"; then
+  echo "$as_me:13199: result: $cf_ldd_prog" >&5
+echo "${ECHO_T}$cf_ldd_prog" >&6
+else
+  echo "$as_me:13202: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  test -n "$cf_ldd_prog" && break
+done
+test -n "$cf_ldd_prog" || cf_ldd_prog="no"
+
+	cf_rpath_list="/usr/lib /lib"
+	if test "$cf_ldd_prog" != no
+	then
+cat >conftest.$ac_ext <<_ACEOF
+#line 13214 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+int
+main ()
+{
+printf("Hello");
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:13226: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:13229: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:13232: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:13235: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort -u`
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+	fi
+
+	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+
+echo "${as_me-configure}:13247: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+
+test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
+
+echo "${as_me-configure}:13251: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+
+cf_rpath_dst=
+for cf_rpath_src in $LDFLAGS
+do
+	case $cf_rpath_src in #(vi
+	-L*) #(vi
+
+		# check if this refers to a directory which we will ignore
+		cf_rpath_skip=no
+		if test -n "$cf_rpath_list"
+		then
+			for cf_rpath_item in $cf_rpath_list
+			do
+				if test "x$cf_rpath_src" = "x-L$cf_rpath_item"
+				then
+					cf_rpath_skip=yes
+					break
+				fi
+			done
+		fi
+
+		if test "$cf_rpath_skip" = no
+		then
+			# transform the option
+			if test "$LD_RPATH_OPT" = "-R " ; then
+				cf_rpath_tmp=`echo "$cf_rpath_src" |sed -e "s%-L%-R %"`
+			else
+				cf_rpath_tmp=`echo "$cf_rpath_src" |sed -e "s%-L%$LD_RPATH_OPT%"`
+			fi
+
+			# if we have not already added this, add it now
+			cf_rpath_tst=`echo "$EXTRA_LDFLAGS" | sed -e "s%$cf_rpath_tmp %%"`
+			if test "x$cf_rpath_tst" = "x$EXTRA_LDFLAGS"
+			then
+				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+
+echo "${as_me-configure}:13288: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+
+				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+			fi
+		fi
+		;;
+	esac
+	cf_rpath_dst="$cf_rpath_dst $cf_rpath_src"
+done
+LDFLAGS=$cf_rpath_dst
+
+test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
+
+echo "${as_me-configure}:13301: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+
+test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
+
+echo "${as_me-configure}:13305: testing ...checking LIBS $LIBS ..." 1>&5
+
+cf_rpath_dst=
+for cf_rpath_src in $LIBS
+do
+	case $cf_rpath_src in #(vi
+	-L*) #(vi
+
+		# check if this refers to a directory which we will ignore
+		cf_rpath_skip=no
+		if test -n "$cf_rpath_list"
+		then
+			for cf_rpath_item in $cf_rpath_list
+			do
+				if test "x$cf_rpath_src" = "x-L$cf_rpath_item"
+				then
+					cf_rpath_skip=yes
+					break
+				fi
+			done
+		fi
+
+		if test "$cf_rpath_skip" = no
+		then
+			# transform the option
+			if test "$LD_RPATH_OPT" = "-R " ; then
+				cf_rpath_tmp=`echo "$cf_rpath_src" |sed -e "s%-L%-R %"`
+			else
+				cf_rpath_tmp=`echo "$cf_rpath_src" |sed -e "s%-L%$LD_RPATH_OPT%"`
+			fi
+
+			# if we have not already added this, add it now
+			cf_rpath_tst=`echo "$EXTRA_LDFLAGS" | sed -e "s%$cf_rpath_tmp %%"`
+			if test "x$cf_rpath_tst" = "x$EXTRA_LDFLAGS"
+			then
+				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
+
+echo "${as_me-configure}:13342: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+
+				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+			fi
+		fi
+		;;
+	esac
+	cf_rpath_dst="$cf_rpath_dst $cf_rpath_src"
+done
+LIBS=$cf_rpath_dst
+
+test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
+
+echo "${as_me-configure}:13355: testing ...checked LIBS $LIBS ..." 1>&5
+
+	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+
+echo "${as_me-configure}:13359: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+
+fi
+
+fi
+
 ac_config_files="$ac_config_files dialog-config makefile $EXTRA_OUTPUT $SUB_MAKEFILE samples/install/makefile"
 ac_config_commands="$ac_config_commands default"
 cat >confcache <<\_ACEOF
@@ -12795,7 +13443,7 @@ DEFS=-DHAVE_CONFIG_H
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:12798: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:13446: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -12927,7 +13575,7 @@ EOF
 cat >>$CONFIG_STATUS <<EOF
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.52.20081225,
+configured by $0, generated by GNU Autoconf 2.52.20100320,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
@@ -12971,7 +13619,7 @@ cat >>$CONFIG_STATUS <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:12974: error: ambiguous option: $1
+    { { echo "$as_me:13622: 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;}
@@ -12990,7 +13638,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:12993: error: unrecognized option: $1
+  -*) { { echo "$as_me:13641: 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;}
@@ -13009,7 +13657,7 @@ cat >&5 << _ACEOF
 ## Running config.status.  ##
 ## ----------------------- ##
 
-This file was extended by $as_me 2.52.20081225, executed with
+This file was extended by $as_me 2.52.20100320, executed with
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
   CONFIG_LINKS    = $CONFIG_LINKS
@@ -13040,7 +13688,7 @@ do
   "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
   "dlg_config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS dlg_config.h:config.hin" ;;
-  *) { { echo "$as_me:13043: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:13691: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -13145,6 +13793,8 @@ s,@INSTALL_DATA@,$INSTALL_DATA,;t t
 s,@AR@,$AR,;t t
 s,@ac_ct_AR@,$ac_ct_AR,;t t
 s,@cf_cv_makeflags@,$cf_cv_makeflags,;t t
+s,@CTAGS@,$CTAGS,;t t
+s,@ETAGS@,$ETAGS,;t t
 s,@MAKE_LOWER_TAGS@,$MAKE_LOWER_TAGS,;t t
 s,@MAKE_UPPER_TAGS@,$MAKE_UPPER_TAGS,;t t
 s,@ECHO_LT@,$ECHO_LT,;t t
@@ -13211,6 +13861,8 @@ s,@NCURSES_CONFIG@,$NCURSES_CONFIG,;t t
 s,@EXTRAOBJS@,$EXTRAOBJS,;t t
 s,@PACKAGE_PREFIX@,$PACKAGE_PREFIX,;t t
 s,@PACKAGE_CONFIG@,$PACKAGE_CONFIG,;t t
+s,@cf_ldd_prog@,$cf_ldd_prog,;t t
+s,@EXTRA_LDFLAGS@,$EXTRA_LDFLAGS,;t t
 CEOF
 
 EOF
@@ -13325,7 +13977,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:13328: creating $ac_file" >&5
+    { echo "$as_me:13980: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -13343,7 +13995,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:13346: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:13998: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -13356,7 +14008,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:13359: error: cannot find input file: $f" >&5
+           { { echo "$as_me:14011: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -13422,7 +14074,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:13425: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:14077: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -13433,7 +14085,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:13436: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:14088: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -13446,7 +14098,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:13449: error: cannot find input file: $f" >&5
+           { { echo "$as_me:14101: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -13504,7 +14156,7 @@ cat >>$CONFIG_STATUS <<\EOF
   rm -f $tmp/in
   if test x"$ac_file" != x-; then
     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
-      { echo "$as_me:13507: $ac_file is unchanged" >&5
+      { echo "$as_me:14159: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/configure.in b/Build/source/utils/dialog/dialog-1.1-20100428/configure.in
index a36e5c33b11..c4007f0e5c8 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/configure.in
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.56 2010/01/19 10:36:21 tom Exp $
+dnl $Id: configure.in,v 1.57 2010/04/28 20:33:01 tom Exp $
 dnl Process this file with autoconf to produce a configure script.
 dnl
 AC_PREREQ(2.13.20020210)
@@ -182,4 +182,6 @@ CF_HEADERS_SH(DLG,dlg_config.h)
 
 AC_TRY_LINK([#include <locale.h>],[setlocale(LC_ALL, "")],[AC_DEFINE(HAVE_SETLOCALE)])
 
+CF_DISABLE_RPATH_HACK
+
 AC_OUTPUT(dialog-config makefile $EXTRA_OUTPUT $SUB_MAKEFILE samples/install/makefile,,,sort -u)
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/dialog-config.in b/Build/source/utils/dialog/dialog-1.1-20100428/dialog-config.in
index 39541c6fc24..39541c6fc24 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/dialog-config.in
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/dialog-config.in
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/dialog.1 b/Build/source/utils/dialog/dialog-1.1-20100428/dialog.1
index 5168fb3dd62..5168fb3dd62 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/dialog.1
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/dialog.1
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/dialog.3 b/Build/source/utils/dialog/dialog-1.1-20100428/dialog.3
index 3ed08a90d2c..55ea36c22bf 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/dialog.3
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/dialog.3
@@ -1,4 +1,4 @@
-.\" $Id: dialog.3,v 1.48 2010/01/18 10:22:47 tom Exp $
+.\" $Id: dialog.3,v 1.49 2010/02/23 10:33:59 tom Exp $
 .\" Copyright 2005-2009,2010  Thomas E. Dickey
 .\"
 .\" This program is free software; you can redistribute it and/or modify
@@ -15,7 +15,7 @@
 .\"	Free Software Foundation, Inc.
 .\"	51 Franklin St., Fifth Floor
 .\"	Boston, MA 02110, USA.
-.TH DIALOG 3 "" "$Date: 2010/01/18 10:22:47 $"
+.TH DIALOG 3 "" "$Date: 2010/02/23 10:33:59 $"
 .SH NAME
 dialog \- widgets and utilities for the dialog program
 .SH SYNOPSIS
@@ -37,7 +37,7 @@ are likely to be important to developers using the widgets directly.
 Some hints are also given for developing new widgets.
 .
 .\" ************************************************************************
-.SS DEFINITIONS
+.SH DEFINITIONS
 Exit codes (passed back to the main program for its use)
 are defined with a "\fIDLG_EXIT_\fP prefix.
 The defined constants can be mapped using environment variables
@@ -68,7 +68,7 @@ are used for convenience in building the library or main program.
 These include definitions based on the generated \fI<dlg_config.h>\fP header.
 
 .\" ************************************************************************
-.SS DATA STRUCTURES
+.SH DATA STRUCTURES
 All of the global data for the \fBdialog\fP library is stored in
 a few structures: \fIDIALOG_STATE\fP, \fIDIALOG_VARS\fP and \fIDIALOG_COLORS\fP.
 The corresponding \fIdialog_state\fP, \fIdialog_vars\fP and \fIdlg_color_table\fP
@@ -478,7 +478,7 @@ The given string overrides the label used for "Yes" buttons.
 .
 .\" ************************************************************************
 .\" ************************************************************************
-.SS WIDGETS
+.SH WIDGETS
 Functions that implement major functionality for the command-line \fBdialog\fP
 program, e.g., widgets, have names beginning "\fIdialog_\fP".
 
@@ -496,7 +496,7 @@ the width of the dialog box.
 Other parameters depend on the box type.
 .
 .\" ************************************************************************
-.IP dialog_calendar
+.IP \fBdialog_calendar
 implements the "\fB--calendar\fP" option.
 .RS
 .IP title
@@ -524,7 +524,7 @@ If the value is negative,
 the current year is used.
 .RE
 .\" ************************************************************************
-.IP dialog_checklist
+.IP \fBdialog_checklist
 implements the "\fB--checklist\fP" and "\fB--radiolist\fP" options
 depending on the \fIflag\fP parameter.
 .RS
@@ -560,7 +560,7 @@ is either \fIFLAG_CHECK\fP, for checklists,
 or \fIFLAG_RADIO\fP for radiolists.
 .RE
 .\" ************************************************************************
-.IP dialog_dselect
+.IP \fBdialog_dselect
 implements the "\fB--dselect\fP" option.
 .RS
 .IP title
@@ -576,7 +576,7 @@ is the desired width of the box.
 If zero, the height is based on the screen size.
 .RE
 .\" ************************************************************************
-.IP dialog_editbox
+.IP \fBdialog_editbox
 implements the "\fB--editbox\fP" option.
 .RS
 .IP title
@@ -591,7 +591,7 @@ is the desired width of the box.
 If zero, the height is adjusted to use the available screen size.
 .RE
 .\" ************************************************************************
-.IP dialog_form
+.IP \fBdialog_form
 implements the "\fB--form\fP" option.
 .RS
 .IP title
@@ -623,7 +623,7 @@ or
 depending on whether \fIdialog_vars.item_help\fP is set.
 .RE
 .\" ************************************************************************
-.IP dialog_fselect
+.IP \fBdialog_fselect
 implements the "\fB--fselect\fP" option.
 .RS
 .IP title
@@ -639,7 +639,7 @@ is the desired width of the box.
 If zero, the height is based on the screen size.
 .RE
 .\" ************************************************************************
-.IP dialog_gauge
+.IP \fBdialog_gauge
 implements the "\fB--gauge\fP" option.
 .RS
 .IP title
@@ -656,7 +656,7 @@ If zero, the height is based on the screen size.
 is the percentage to show in the progress bar.
 .RE
 .\" ************************************************************************
-.IP dialog_inputbox
+.IP \fBdialog_inputbox
 implements the "\fB--inputbox\fP" or
 "\fB--password\fP" option, depending on the value of \fIpassword\fP.
 .RS
@@ -677,7 +677,7 @@ when auto-sizing the width of the dialog box.
 if true, causes typed input to be echoed as asterisks.
 .RE
 .\" ************************************************************************
-.IP dialog_menu
+.IP \fBdialog_menu
 implements the "\fB--menu\fP" or "\fB--inputmenu\fP" option
 depending on whether \fIdialog_vars.input_menu\fP is set.
 .RS
@@ -710,7 +710,7 @@ or
 depending on whether \fIdialog_vars.item_help\fP is set.
 .RE
 .\" ************************************************************************
-.IP dialog_mixedform
+.IP \fBdialog_mixedform
 implements the "\fB--mixedform\fP" option.
 .RS
 .IP title
@@ -742,7 +742,7 @@ or
 depending on whether \fIdialog_vars.item_help\fP is set.
 .RE
 .\" ************************************************************************
-.IP dialog_mixedgauge
+.IP \fBdialog_mixedgauge
 implements the "\fB--mixedgauge\fP" option
 .RS
 .IP title
@@ -793,7 +793,7 @@ For example, "-75" is displayed as "75%".
 Other strings are displayed as is.
 .RE
 .\" ************************************************************************
-.IP dialog_msgbox
+.IP \fBdialog_msgbox
 implements the "\fB--msgbox\fP" or "\fB--infobox\fP" option
 depending on whether \fIpauseopt\fP is set.
 .RS
@@ -814,7 +814,7 @@ With an "OK" button, it is denoted a "msgbox",
 without an "OK" button, it is denoted an "infobox".
 .RE
 .\" ************************************************************************
-.IP dialog_pause
+.IP \fBdialog_pause
 implements the "\fB--pause\fP" option.
 .RS
 .IP title
@@ -829,7 +829,7 @@ If zero, the height is based on the screen size.
 is the timeout to use for the progress bar.
 .RE
 .\" ************************************************************************
-.IP dialog_progressbox
+.IP \fBdialog_progressbox
 implements the "\fB--progressbox\fP" option.
 .RS
 .IP title
@@ -845,7 +845,7 @@ is the desired width of the box.
 If zero, the height is based on the screen size.
 .RE
 .\" ************************************************************************
-.IP dialog_tailbox
+.IP \fBdialog_tailbox
 implements the "\fB--tailbox\fP" or "\fB--tailboxbg\fP" option
 depending on whether \fIbg_task\fP is set.
 .RS
@@ -867,7 +867,7 @@ Otherwise an "OK" button is added to the window,
 and it will be closed when the button is activated.
 .RE
 .\" ************************************************************************
-.IP dialog_textbox
+.IP \fBdialog_textbox
 implements the "\fB--textbox\fP" option.
 .RS
 .IP title
@@ -882,7 +882,7 @@ is the desired width of the box.
 If zero, the height is based on the screen size.
 .RE
 .\" ************************************************************************
-.IP dialog_timebox
+.IP \fBdialog_timebox
 implements the "\fB--timebox\fP" option.
 .RS
 .IP title
@@ -909,7 +909,7 @@ If the value is negative,
 the current second is used.
 .RE
 .\" ************************************************************************
-.IP dialog_yesno
+.IP \fBdialog_yesno
 implements the "\fB--yesno\fP" option.
 .RS
 .IP title
@@ -925,7 +925,7 @@ If zero, the height is based on the screen size.
 .RE
 .
 .\" ************************************************************************
-.SS UTILITY FUNCTIONS
+.SH UTILITY FUNCTIONS
 Most functions that implement lower-level
 functionality for the command-line \fBdialog\fP
 program or widgets, have names beginning "\fIdlg_\fP".
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/dialog.c b/Build/source/utils/dialog/dialog-1.1-20100428/dialog.c
index 3f718b485eb..3f718b485eb 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/dialog.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/dialog.c
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/dialog.h b/Build/source/utils/dialog/dialog-1.1-20100428/dialog.h
index 1c36c398fb3..e8f5e756ba7 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/dialog.h
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/dialog.h
@@ -1,5 +1,5 @@
 /*
- *  $Id: dialog.h,v 1.213 2010/01/19 10:47:42 tom Exp $
+ *  $Id: dialog.h,v 1.214 2010/04/28 21:11:49 tom Exp $
  *
  * dialog.h -- common declarations for all dialog modules
  *
@@ -161,7 +161,7 @@
 #define A_CHARTEXT 0xff
 #endif
 
-#define CharOf(ch)  ((ch) & A_CHARTEXT)
+#define CharOf(ch)  ((ch) & 0xff)
 
 #ifndef ACS_ULCORNER
 #define ACS_ULCORNER '+'
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/dialog.lsm b/Build/source/utils/dialog/dialog-1.1-20100428/dialog.lsm
index be527abbdf9..be527abbdf9 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/dialog.lsm
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/dialog.lsm
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/dialog.pl b/Build/source/utils/dialog/dialog-1.1-20100428/dialog.pl
index 8fbb68fd8eb..8fbb68fd8eb 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/dialog.pl
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/dialog.pl
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/dlg_colors.h b/Build/source/utils/dialog/dialog-1.1-20100428/dlg_colors.h
index f8d8b119106..f8d8b119106 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/dlg_colors.h
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/dlg_colors.h
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/dlg_keys.c b/Build/source/utils/dialog/dialog-1.1-20100428/dlg_keys.c
index 97ca8654d06..97ca8654d06 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/dlg_keys.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/dlg_keys.c
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/dlg_keys.h b/Build/source/utils/dialog/dialog-1.1-20100428/dlg_keys.h
index 6a96c0fec8e..6a96c0fec8e 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/dlg_keys.h
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/dlg_keys.h
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/editbox.c b/Build/source/utils/dialog/dialog-1.1-20100428/editbox.c
index f5384932201..7889024196d 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/editbox.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/editbox.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: editbox.c,v 1.53 2010/01/19 00:59:50 tom Exp $
+ *  $Id: editbox.c,v 1.54 2010/04/28 21:02:01 tom Exp $
  *
  *  editbox.c -- implements the edit box
  *
@@ -37,9 +37,9 @@ static void
 grow_list(char ***list, int *have, int want)
 {
     if (want > *have) {
-	unsigned last = *have;
-	unsigned need = (want | 31) + 3;
-	*have = need;
+	size_t last = (size_t) *have;
+	size_t need = (size_t) (want | 31) + 3;
+	*have = (int) need;
 	(*list) = dlg_realloc(char *, need, *list);
 	if ((*list) == 0) {
 	    fail_list();
@@ -103,7 +103,7 @@ load_list(const char *file, char ***list, int *rows)
 		(*list)[need] = 0;
 	    }
 	} else {
-	    grow_list(list, rows, need + 1);
+	    grow_list(list, rows, (int) need + 1);
 	}
     }
     free(blob);
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/formbox.c b/Build/source/utils/dialog/dialog-1.1-20100428/formbox.c
index 751888c8da3..18f20545c6f 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/formbox.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/formbox.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: formbox.c,v 1.70 2010/01/19 01:16:30 tom Exp $
+ *  $Id: formbox.c,v 1.71 2010/02/24 10:45:57 Samuel.Martin.Moro Exp $
  *
  *  formbox.c -- implements the form (i.e, some pairs label/editbox)
  *
@@ -557,7 +557,7 @@ dlg_form(const char *title,
 			       scrollamt,
 			       scrollamt,
 			       scrollamt + form_height + 1,
-			       item_no,
+			       min_height,
 			       box_x + 1,
 			       box_x + form_width,
 			       box_y,
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/fselect.c b/Build/source/utils/dialog/dialog-1.1-20100428/fselect.c
index d4fcf39c85e..d184a7652ff 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/fselect.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/fselect.c
@@ -1,5 +1,5 @@
 /*
- * $Id: fselect.c,v 1.73 2010/01/19 01:11:31 tom Exp $
+ * $Id: fselect.c,v 1.74 2010/04/28 20:45:40 tom Exp $
  *
  * fselect.c -- implements the file-selector box
  *
@@ -142,7 +142,7 @@ add_to_list(LIST * list, char *text)
 {
     unsigned need;
 
-    need = list->length + 1;
+    need = (unsigned) (list->length + 1);
     if (need + 1 > list->allocd) {
 	list->allocd = 2 * (need + 1);
 	if (list->data == 0) {
@@ -347,13 +347,13 @@ compar(const void *a, const void *b)
     return strcmp(*(const char *const *) a, *(const char *const *) b);
 }
 
-static int
+static void
 match(char *name, LIST * d_list, LIST * f_list, MATCH * match_list)
 {
     char *test = leaf_of(name);
-    int test_len = strlen(test);
-    char **matches = dlg_malloc(char *, (d_list->length + f_list->length));
-    int data_len = 0;
+    size_t test_len = strlen(test);
+    char **matches = dlg_malloc(char *, (size_t) (d_list->length + f_list->length));
+    size_t data_len = 0;
     int i;
     for (i = 2; i < d_list->length; i++) {
 	if (strncmp(test, d_list->data[i], test_len) == 0) {
@@ -367,8 +367,7 @@ match(char *name, LIST * d_list, LIST * f_list, MATCH * match_list)
     }
     matches = dlg_realloc(char *, data_len, matches);
     match_list->data = matches;
-    match_list->length = data_len;
-    return data_len;
+    match_list->length = (int) data_len;
 }
 
 static void
@@ -383,14 +382,17 @@ complete(char *name, LIST * d_list, LIST * f_list, char **buff_ptr)
 {
     MATCH match_list;
     char *test;
-    int test_len;
-    int i, j;
+    size_t test_len;
+    size_t i;
+    int j;
     char *buff;
+
     match(name, d_list, f_list, &match_list);
     if (match_list.length == 0) {
 	*buff_ptr = NULL;
 	return 0;
     }
+
     test = match_list.data[0];
     test_len = strlen(test);
     buff = dlg_malloc(char, test_len + 2);
@@ -421,7 +423,7 @@ complete(char *name, LIST * d_list, LIST * f_list, char **buff_ptr)
     free_match(&match_list);
     buff[i] = '\0';
     *buff_ptr = buff;
-    return i;
+    return (i != 0);
 }
 
 static bool
@@ -470,8 +472,14 @@ fill_lists(char *current, char *input, LIST * d_list, LIST * f_list, bool keep)
 	}
 	(void) closedir(dp);
 	/* sort the lists */
-	qsort(d_list->data, d_list->length, sizeof(d_list->data[0]), compar);
-	qsort(f_list->data, f_list->length, sizeof(f_list->data[0]), compar);
+	qsort(d_list->data,
+	      (size_t) d_list->length,
+	      sizeof(d_list->data[0]),
+	      compar);
+	qsort(f_list->data,
+	      (size_t) f_list->length,
+	      sizeof(f_list->data[0]),
+	      compar);
     }
 
     (void) show_both_lists(input, d_list, f_list, FALSE);
@@ -571,7 +579,7 @@ dlg_fselect(const char *title, const char *path, int height, int width, bool dse
 
     /* Set up the initial value */
     input = dlg_set_result(path);
-    offset = strlen(input);
+    offset = (int) strlen(input);
     *current = 0;
 
     dlg_button_layout(buttons, &min_wide);
@@ -775,7 +783,7 @@ dlg_fselect(const char *title, const char *path, int height, int width, bool dse
 		    state = sTEXT;
 		    show_buttons = TRUE;
 		    strcpy(leaf_of(input), completed);
-		    offset = strlen(input);
+		    offset = (int) strlen(input);
 		    dlg_show_string(w_text, input, offset, inputbox_attr,
 				    0, 0, tbox_width, 0, first);
 		    if (partial != NULL)
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/guage.c b/Build/source/utils/dialog/dialog-1.1-20100428/guage.c
index a3d5cc0f8a7..a3d5cc0f8a7 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/guage.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/guage.c
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/headers-sh.in b/Build/source/utils/dialog/dialog-1.1-20100428/headers-sh.in
index 930f420a8de..930f420a8de 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/headers-sh.in
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/headers-sh.in
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/inputbox.c b/Build/source/utils/dialog/dialog-1.1-20100428/inputbox.c
index 6e83cbc93c3..6e83cbc93c3 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/inputbox.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/inputbox.c
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/inputstr.c b/Build/source/utils/dialog/dialog-1.1-20100428/inputstr.c
index 4d95e684dc8..4d95e684dc8 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/inputstr.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/inputstr.c
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/install-sh b/Build/source/utils/dialog/dialog-1.1-20100428/install-sh
index 3f83ce9b555..3f83ce9b555 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/install-sh
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/install-sh
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/makefile.in b/Build/source/utils/dialog/dialog-1.1-20100428/makefile.in
index 926f5a213d5..83ab164cb70 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/makefile.in
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/makefile.in
@@ -1,4 +1,4 @@
-# $Id: makefile.in,v 1.64 2010/01/18 01:27:42 tom Exp $
+# $Id: makefile.in,v 1.71 2010/04/28 00:45:38 tom Exp $
 # template makefile for DIALOG
 #
 SHELL		= /bin/sh
@@ -46,6 +46,9 @@ RANLIB		= @LIB_PREP@
 RM		= rm -f
 LINT		= lint
 
+CTAGS		= @CTAGS@
+ETAGS		= @ETAGS@
+
 LIBTOOL		= @LIBTOOL@ @ECHO_LT@
 LIBTOOL_OPTS	= @LIBTOOL_OPTS@
 LIBTOOL_CLEAN	= @LIB_CLEAN@
@@ -66,7 +69,7 @@ PACKAGE		= `echo @PACKAGE@ |sed @program_transform_name@`
 #
 # Standard .c to .o compile line.
 #
-.SUFFIXES: .c .i $o
+.SUFFIXES: .c .i $o .html .1 .3 .man .ps .pdf .txt
 .c.i :
 	@RULE_CC@
 	@ECHO_CC@$(CPP) $(CPPFLAGS) -c $< >$@
@@ -74,6 +77,18 @@ PACKAGE		= `echo @PACKAGE@ |sed @program_transform_name@`
 	@RULE_CC@
 	@ECHO_CC@$(LIBTOOL_COMPILE) $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CPPFLAGS) -c $<
 
+.1.html :
+	GROFF_NO_SGR=stupid $(SHELL) -c "tbl $< | groff -Thtml -man" >$@
+
+.1.ps :
+	$(SHELL) -c "tbl $< | groff -man" >$@
+
+.1.txt :
+	GROFF_NO_SGR=stupid $(SHELL) -c "tbl $< | nroff -Tascii -man | col -bx" >$@
+
+.ps.pdf :
+	ps2pdf $*.ps
+
 EXTRAOBJS = @EXTRAOBJS@
 OBJECTS = $(EXTRAOBJS) \
 	arrows$o \
@@ -146,6 +161,7 @@ clean	::
 	- $(RM) *.*cov *.da *.bb *.bbg
 	- $(LIBTOOL_CLEAN) $(RM) *.i *$o $(ALL)
 	- $(RM) headers.sed
+	- $(RM) *.html *.pdf *.png *.ps *.txt dialog_lib.1
 	- $(RM) core *~ tags TAGS
 
 distclean :: clean
@@ -215,17 +231,49 @@ uninstall-lib ::
 headers.sed : $(srcdir)/headers-sh
 	$(SHELL) $(srcdir)/headers-sh $(INCLUDEDIR) $(srcdir)
 
+################################################################################
+TOP_DOCS = \
+	dialog.html \
+	dialog.pdf \
+	dialog.ps \
+	dialog.txt
+dialog.html : dialog.1
+dialog.pdf : dialog.ps
+dialog.ps : dialog.1
+dialog.txt : dialog.1
+################################################################################
+# rename, to use suffix-rules
+dialog_lib.1 : dialog.3
+	-$(RM) $@
+	cp dialog.3 $@
+
+LIB_DOCS = \
+	dialog_lib.1 \
+	dialog_lib.html \
+	dialog_lib.pdf \
+	dialog_lib.ps \
+	dialog_lib.txt
+dialog_lib.html : dialog_lib.1
+dialog_lib.pdf : dialog_lib.ps
+dialog_lib.ps : dialog_lib.1
+dialog_lib.txt : dialog_lib.1
+################################################################################
+docs: $(TOP_DOCS) $(LIB_DOCS)
+clean-docs:
+	-$(RM) $(TOP_DOCS) $(LIB_DOCS)
+################################################################################
+
 $(MAN1DIR) \
 $(MAN3DIR) \
 $(BINDIR) \
 $(INCLUDEDIR) \
-$(LIBDIR) : ; $(srcdir)/mkdirs.sh $@
+$(LIBDIR) : ; mkdir -p $@
 
 @MAKE_LOWER_TAGS@tags :
-@MAKE_LOWER_TAGS@	ctags $(SRCS) $(HDRS)
+@MAKE_LOWER_TAGS@	$(CTAGS) $(SRCS) $(HDRS)
 
 @MAKE_LOWER_TAGS@TAGS :
-@MAKE_LOWER_TAGS@	etags $(SRCS) $(HDRS)
+@MAKE_LOWER_TAGS@	$(ETAGS) $(SRCS) $(HDRS)
 
 update-po:
 	rsync -Lrtvz  translationproject.org::tp/latest/dialog/  $(PO_DIR)
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/menubox.c b/Build/source/utils/dialog/dialog-1.1-20100428/menubox.c
index 4c32bd71667..4c32bd71667 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/menubox.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/menubox.c
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/mixedform.c b/Build/source/utils/dialog/dialog-1.1-20100428/mixedform.c
index aa2851056d1..b2fe5385842 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/mixedform.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/mixedform.c
@@ -1,9 +1,9 @@
 /*
- *  $Id: mixedform.c,v 1.7 2008/06/21 12:11:42 tom Exp $
+ *  $Id: mixedform.c,v 1.8 2010/04/28 20:54:11 tom Exp $
  *
  *  formbox.c -- implements the form (i.e, some pairs label/editbox)
  *
- *  Copyright 2007,2008	Thomas E. Dickey
+ *  Copyright 2007-2008,2010	Thomas E. Dickey
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License, version 2.1
@@ -58,24 +58,24 @@ dialog_mixedform(const char *title,
     dlg_save_vars(&save_vars);
     dialog_vars.separate_output = TRUE;
 
-    listitems = dlg_calloc(DIALOG_FORMITEM, item_no + 1);
+    listitems = dlg_calloc(DIALOG_FORMITEM, (size_t) item_no + 1);
     assert_ptr(listitems, "dialog_mixedform");
 
     for (i = 0; i < item_no; ++i) {
 	listitems[i].type = dialog_vars.formitem_type;
 	listitems[i].name = ItemName(i);
-	listitems[i].name_len = strlen(ItemName(i));
+	listitems[i].name_len = (int) strlen(ItemName(i));
 	listitems[i].name_y = dlg_ordinate(ItemNameY(i));
 	listitems[i].name_x = dlg_ordinate(ItemNameX(i));
 	listitems[i].text = ItemText(i);
-	listitems[i].text_len = strlen(ItemText(i));
+	listitems[i].text_len = (int) strlen(ItemText(i));
 	listitems[i].text_y = dlg_ordinate(ItemTextY(i));
 	listitems[i].text_x = dlg_ordinate(ItemTextX(i));
 	listitems[i].text_flen = atoi(ItemTextFLen(i));
 	listitems[i].text_ilen = atoi(ItemTextILen(i));
 	listitems[i].help = (dialog_vars.item_help ? ItemHelp(i) :
 			     dlg_strempty());
-	listitems[i].type = atoi(ItemTypep(i));
+	listitems[i].type = (unsigned) atoi(ItemTypep(i));
     }
 
     result = dlg_form(title,
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/mixedgauge.c b/Build/source/utils/dialog/dialog-1.1-20100428/mixedgauge.c
index d8b355694ab..d8b355694ab 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/mixedgauge.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/mixedgauge.c
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/mouse.c b/Build/source/utils/dialog/dialog-1.1-20100428/mouse.c
index 1dfcb435ff1..1dfcb435ff1 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/mouse.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/mouse.c
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/mousewget.c b/Build/source/utils/dialog/dialog-1.1-20100428/mousewget.c
index 13a021bfc02..13a021bfc02 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/mousewget.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/mousewget.c
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/msgbox.c b/Build/source/utils/dialog/dialog-1.1-20100428/msgbox.c
index 91606af024f..91606af024f 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/msgbox.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/msgbox.c
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/pause.c b/Build/source/utils/dialog/dialog-1.1-20100428/pause.c
index 4ac13e1e32d..4efeb4788cf 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/pause.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/pause.c
@@ -1,9 +1,9 @@
 /*
- *  $Id: pause.c,v 1.21 2009/02/22 19:12:47 tom Exp $
+ *  $Id: pause.c,v 1.22 2010/04/28 00:29:50 tom Exp $
  *
  *  pause.c -- implements the pause dialog
  *
- *  Copyright 2004-2008,2009	Thomas E. Dickey
+ *  Copyright 2004-2009,2010	Thomas E. Dickey
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License, version 2.1
@@ -29,6 +29,10 @@
 
 #define MY_TIMEOUT 50
 
+#define MIN_HIGH (4)
+#define MIN_WIDE (10 + 2 * (2 + MARGIN))
+#define BTN_HIGH (1 + 2 * MARGIN)
+
 /*
  * This is like gauge, but can be interrupted.
  *
@@ -71,8 +75,11 @@ dialog_pause(const char *title,
     int seconds_orig;
     WINDOW *dialog;
     const char **buttons = dlg_ok_labels();
+    bool have_buttons = (dlg_button_count(buttons) != 0);
     int key = 0, fkey;
     int result = DLG_EXIT_UNKNOWN;
+    int button_high = (have_buttons ? BTN_HIGH : MARGIN);
+    int guage_y;
     char *prompt = dlg_strclone(cprompt);
 
     curs_set(0);
@@ -87,8 +94,17 @@ dialog_pause(const char *title,
     width = old_width;
 #endif
 
-    dlg_auto_size(title, prompt, &height, &width, 0, 0);
-    dlg_button_layout(buttons, &width);
+    if (have_buttons) {
+	dlg_auto_size(title, prompt, &height, &width,
+		      MIN_HIGH,
+		      MIN_WIDE);
+	dlg_button_layout(buttons, &width);
+    } else {
+	dlg_auto_size(title, prompt, &height, &width,
+		      MIN_HIGH + MARGIN - BTN_HIGH,
+		      MIN_WIDE);
+    }
+    guage_y = height - button_high - (1 + 2 * MARGIN);
     dlg_print_size(height, width);
     dlg_ctl_size(height, width);
 
@@ -113,7 +129,7 @@ dialog_pause(const char *title,
 	dlg_print_autowrap(dialog, prompt, height, width);
 
 	dlg_draw_box(dialog,
-		     height - 6, 2 + MARGIN,
+		     guage_y, 2 + MARGIN,
 		     2 + MARGIN, width - 2 * (2 + MARGIN),
 		     dialog_attr,
 		     border_attr);
@@ -123,13 +139,13 @@ dialog_pause(const char *title,
 	 * in the title-attribute, and write the percentage with that
 	 * attribute.
 	 */
-	(void) wmove(dialog, height - 5, 4);
+	(void) wmove(dialog, guage_y + MARGIN, 4);
 	wattrset(dialog, title_attr);
 
 	for (i = 0; i < (width - 2 * (3 + MARGIN)); i++)
 	    (void) waddch(dialog, ' ');
 
-	(void) wmove(dialog, height - 5, (width / 2) - 2);
+	(void) wmove(dialog, guage_y + MARGIN, (width / 2) - 2);
 	(void) wprintw(dialog, "%3d", seconds);
 
 	/*
@@ -143,7 +159,7 @@ dialog_pause(const char *title,
 	} else {
 	    wattrset(dialog, A_REVERSE);
 	}
-	(void) wmove(dialog, height - 5, 4);
+	(void) wmove(dialog, guage_y + MARGIN, 4);
 	for (i = 0; i < x; i++) {
 	    chtype ch = winch(dialog);
 	    if (title_attr & A_REVERSE) {
@@ -152,9 +168,11 @@ dialog_pause(const char *title,
 	    (void) waddch(dialog, ch);
 	}
 
-	dlg_draw_bottom_box(dialog);
 	mouse_mkbutton(height - 2, width / 2 - 4, 6, '\n');
-	dlg_draw_buttons(dialog, height - 2, 0, buttons, button, FALSE, width);
+	if (have_buttons) {
+	    dlg_draw_bottom_box(dialog);
+	    dlg_draw_buttons(dialog, height - 2, 0, buttons, button, FALSE, width);
+	}
 	(void) wrefresh(dialog);
 
 	for (step = 0;
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/POTFILES.in b/Build/source/utils/dialog/dialog-1.1-20100428/po/POTFILES.in
index 48ea956a00b..48ea956a00b 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/po/POTFILES.in
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/po/POTFILES.in
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/ar.po b/Build/source/utils/dialog/dialog-1.1-20100428/po/ar.po
index 7dbd72c3e52..7dbd72c3e52 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/po/ar.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/po/ar.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/be@latin.po b/Build/source/utils/dialog/dialog-1.1-20100428/po/be@latin.po
index 6a45d8d8533..6a45d8d8533 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/po/be@latin.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/po/be@latin.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/bg.po b/Build/source/utils/dialog/dialog-1.1-20100428/po/bg.po
index 255776a0cb1..255776a0cb1 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/po/bg.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/po/bg.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/ca.po b/Build/source/utils/dialog/dialog-1.1-20100428/po/ca.po
index 985d2e609d8..985d2e609d8 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/po/ca.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/po/ca.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/cs.po b/Build/source/utils/dialog/dialog-1.1-20100428/po/cs.po
index b4a40e97dec..b4a40e97dec 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/po/cs.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/po/cs.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/cy.po b/Build/source/utils/dialog/dialog-1.1-20100428/po/cy.po
index 39423edf952..39423edf952 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/po/cy.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/po/cy.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/da.po b/Build/source/utils/dialog/dialog-1.1-20100428/po/da.po
index b5983695614..b5983695614 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/po/da.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/po/da.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/de.po b/Build/source/utils/dialog/dialog-1.1-20100428/po/de.po
index 413685e3060..413685e3060 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/po/de.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/po/de.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/dialog.pot b/Build/source/utils/dialog/dialog-1.1-20100428/po/dialog.pot
index 0631e83aee5..0631e83aee5 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/po/dialog.pot
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/po/dialog.pot
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/el.po b/Build/source/utils/dialog/dialog-1.1-20100428/po/el.po
index 3b87e8e6034..3b87e8e6034 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/po/el.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/po/el.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/eo.po b/Build/source/utils/dialog/dialog-1.1-20100428/po/eo.po
index fa3dbf31a99..fa3dbf31a99 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/po/eo.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/po/eo.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/es.po b/Build/source/utils/dialog/dialog-1.1-20100428/po/es.po
index d8884a3ef6f..4647a51c7fa 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/po/es.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/po/es.po
@@ -1,13 +1,14 @@
 # Mensajes en español para dialog.
 # Copyright (C) 2001, 2003, 2004 Thomas Dickey.
-# Santiago Vila Doncel <sanvila@unex.es>, 2001, 2003, 2004.
+# This file is distributed under the same license as the dialog package.
+# Santiago Vila Doncel <sanvila@unex.es>, 2001, 2003, 2004, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: dialog 1.0-20041219\n"
+"Project-Id-Version: dialog 1.1.20080819\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-06-18 18:26-0400\n"
-"PO-Revision-Date: 2004-12-21 17:06+0100\n"
+"PO-Revision-Date: 2010-02-14 14:26+0100\n"
 "Last-Translator: Santiago Vila Doncel <sanvila@unex.es>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -66,44 +67,44 @@ msgstr "Ficheros"
 
 #: mixedgauge.c:58
 msgid "Succeeded"
-msgstr ""
+msgstr "Finalizado con éxito"
 
 #: mixedgauge.c:61
-#, fuzzy
 msgid "Failed"
-msgstr "Ficheros"
+msgstr "Falló"
 
+# Esta no me convence mucho. Se admiten sugerencias
 #: mixedgauge.c:64
 msgid "Passed"
-msgstr ""
+msgstr "Pasado"
 
 #: mixedgauge.c:67
 msgid "Completed"
-msgstr ""
+msgstr "Completado"
 
 #: mixedgauge.c:70
 msgid "Checked"
-msgstr ""
+msgstr "Comprobado"
 
 #: mixedgauge.c:73
 msgid "Done"
-msgstr ""
+msgstr "Hecho"
 
 #: mixedgauge.c:76
 msgid "Skipped"
-msgstr ""
+msgstr "Saltado"
 
 #: mixedgauge.c:79
 msgid "In Progress"
-msgstr ""
+msgstr "En progreso"
 
 #: mixedgauge.c:85
 msgid "N/A"
-msgstr ""
+msgstr "N/A"
 
 #: mixedgauge.c:193
 msgid "Overall Progress"
-msgstr ""
+msgstr "Progreso total"
 
 #: textbox.c:489
 msgid "Search"
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/et.po b/Build/source/utils/dialog/dialog-1.1-20100428/po/et.po
index d8757d9f3d1..d8757d9f3d1 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/po/et.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/po/et.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/eu.po b/Build/source/utils/dialog/dialog-1.1-20100428/po/eu.po
index 21944143af0..21944143af0 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/po/eu.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/po/eu.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/fi.po b/Build/source/utils/dialog/dialog-1.1-20100428/po/fi.po
index ab1f8bd6ada..ab1f8bd6ada 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/po/fi.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/po/fi.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/fr.po b/Build/source/utils/dialog/dialog-1.1-20100428/po/fr.po
index a121c21602f..a121c21602f 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/po/fr.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/po/fr.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/ga.po b/Build/source/utils/dialog/dialog-1.1-20100428/po/ga.po
index 092a37f7453..092a37f7453 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/po/ga.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/po/ga.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/gl.po b/Build/source/utils/dialog/dialog-1.1-20100428/po/gl.po
index 68552c7fa80..68552c7fa80 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/po/gl.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/po/gl.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/hi.po b/Build/source/utils/dialog/dialog-1.1-20100428/po/hi.po
index 57459fe9cd3..57459fe9cd3 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/po/hi.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/po/hi.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/hr.po b/Build/source/utils/dialog/dialog-1.1-20100428/po/hr.po
index 65248795e70..65248795e70 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/po/hr.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/po/hr.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/hu.po b/Build/source/utils/dialog/dialog-1.1-20100428/po/hu.po
index 6975b92be3d..6975b92be3d 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/po/hu.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/po/hu.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/id.po b/Build/source/utils/dialog/dialog-1.1-20100428/po/id.po
index b4e07c585d9..b4e07c585d9 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/po/id.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/po/id.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/is.po b/Build/source/utils/dialog/dialog-1.1-20100428/po/is.po
index e9b1e86f5df..e9b1e86f5df 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/po/is.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/po/is.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/it.po b/Build/source/utils/dialog/dialog-1.1-20100428/po/it.po
index 6aad5d40023..6aad5d40023 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/po/it.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/po/it.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/ja.po b/Build/source/utils/dialog/dialog-1.1-20100428/po/ja.po
index 9ab538ca6df..9ab538ca6df 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/po/ja.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/po/ja.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/ku.po b/Build/source/utils/dialog/dialog-1.1-20100428/po/ku.po
index 3f78769e709..3f78769e709 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/po/ku.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/po/ku.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/lt.po b/Build/source/utils/dialog/dialog-1.1-20100428/po/lt.po
index dd93625a27f..dd93625a27f 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/po/lt.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/po/lt.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/lv.po b/Build/source/utils/dialog/dialog-1.1-20100428/po/lv.po
index 042920fc57c..042920fc57c 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/po/lv.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/po/lv.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/makefile.inn b/Build/source/utils/dialog/dialog-1.1-20100428/po/makefile.inn
index dab2964ba97..615934f5307 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/po/makefile.inn
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/po/makefile.inn
@@ -114,7 +114,7 @@ install-data-yes: all
 	if test -r "$(MKINSTALLDIRS)"; then \
 	  $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
 	else \
-	  $(SHELL) $(top_srcdir)/mkdirs.sh $(DESTDIR)$(datadir); \
+	  mkdir -p $(DESTDIR)$(datadir); \
 	fi
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
@@ -128,7 +128,7 @@ install-data-yes: all
 	  if test -r "$(MKINSTALLDIRS)"; then \
 	    $(MKINSTALLDIRS) $$dir; \
 	  else \
-	    $(SHELL) $(top_srcdir)/mkdirs.sh $$dir; \
+	    mkdir -p $$dir; \
 	  fi; \
 	  if test -r $$cat; then \
 	    $(INSTALL_DATA) $$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
@@ -156,7 +156,7 @@ install-data-yes: all
 	  if test -r "$(MKINSTALLDIRS)"; then \
 	    $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
 	  else \
-	    $(SHELL) $(top_srcdir)/mkdirs.sh $(DESTDIR)$(gettextsrcdir); \
+	    mkdir -p $(DESTDIR)$(gettextsrcdir); \
 	  fi; \
 	  $(INSTALL_DATA) $(srcdir)/makefile.inn \
 			  $(DESTDIR)$(gettextsrcdir)/makefile.inn; \
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/mg.po b/Build/source/utils/dialog/dialog-1.1-20100428/po/mg.po
index 558754a4421..558754a4421 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/po/mg.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/po/mg.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/mk.po b/Build/source/utils/dialog/dialog-1.1-20100428/po/mk.po
index 898e76e282d..898e76e282d 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/po/mk.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/po/mk.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/ms.po b/Build/source/utils/dialog/dialog-1.1-20100428/po/ms.po
index e3167c8af46..e3167c8af46 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/po/ms.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/po/ms.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/nb.po b/Build/source/utils/dialog/dialog-1.1-20100428/po/nb.po
index 2781d9992f0..2781d9992f0 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/po/nb.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/po/nb.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/nl.po b/Build/source/utils/dialog/dialog-1.1-20100428/po/nl.po
index d57099b9b66..d57099b9b66 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/po/nl.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/po/nl.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/pl.po b/Build/source/utils/dialog/dialog-1.1-20100428/po/pl.po
index 107fd8ccd23..107fd8ccd23 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/po/pl.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/po/pl.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/pt.po b/Build/source/utils/dialog/dialog-1.1-20100428/po/pt.po
index 4a06e012eda..4a06e012eda 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/po/pt.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/po/pt.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/pt_BR.po b/Build/source/utils/dialog/dialog-1.1-20100428/po/pt_BR.po
index af80a8fd156..af80a8fd156 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/po/pt_BR.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/po/pt_BR.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/rm.po b/Build/source/utils/dialog/dialog-1.1-20100428/po/rm.po
index d4d81977e47..d4d81977e47 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/po/rm.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/po/rm.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/ro.po b/Build/source/utils/dialog/dialog-1.1-20100428/po/ro.po
index f680d05a30b..f680d05a30b 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/po/ro.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/po/ro.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/ru.po b/Build/source/utils/dialog/dialog-1.1-20100428/po/ru.po
index f92328f2453..f92328f2453 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/po/ru.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/po/ru.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/rw.po b/Build/source/utils/dialog/dialog-1.1-20100428/po/rw.po
index 0aad78f1bea..0aad78f1bea 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/po/rw.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/po/rw.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/sq.po b/Build/source/utils/dialog/dialog-1.1-20100428/po/sq.po
index b804bbbc5b7..b804bbbc5b7 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/po/sq.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/po/sq.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/sr.po b/Build/source/utils/dialog/dialog-1.1-20100428/po/sr.po
index 9414692d6b5..9414692d6b5 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/po/sr.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/po/sr.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/sv.po b/Build/source/utils/dialog/dialog-1.1-20100428/po/sv.po
index ef71d76b4f2..ef71d76b4f2 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/po/sv.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/po/sv.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/sw.po b/Build/source/utils/dialog/dialog-1.1-20100428/po/sw.po
index eb3ef8d5334..eb3ef8d5334 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/po/sw.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/po/sw.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/th.po b/Build/source/utils/dialog/dialog-1.1-20100428/po/th.po
index d3dcbf65a6f..d3dcbf65a6f 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/po/th.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/po/th.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/tr.po b/Build/source/utils/dialog/dialog-1.1-20100428/po/tr.po
index e6c052f302d..e6c052f302d 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/po/tr.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/po/tr.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/uk.po b/Build/source/utils/dialog/dialog-1.1-20100428/po/uk.po
index 47269fe8030..47269fe8030 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/po/uk.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/po/uk.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/vi.po b/Build/source/utils/dialog/dialog-1.1-20100428/po/vi.po
index 5af66005efb..5af66005efb 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/po/vi.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/po/vi.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/wa.po b/Build/source/utils/dialog/dialog-1.1-20100428/po/wa.po
index ac2a6f52564..ac2a6f52564 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/po/wa.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/po/wa.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/zh_CN.po b/Build/source/utils/dialog/dialog-1.1-20100428/po/zh_CN.po
index 367c6bc943c..367c6bc943c 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/po/zh_CN.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/po/zh_CN.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/zh_TW.po b/Build/source/utils/dialog/dialog-1.1-20100428/po/zh_TW.po
index ebfa74df60f..ebfa74df60f 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/po/zh_TW.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/po/zh_TW.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/progressbox.c b/Build/source/utils/dialog/dialog-1.1-20100428/progressbox.c
index b470dc11d30..b470dc11d30 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/progressbox.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/progressbox.c
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/rc.c b/Build/source/utils/dialog/dialog-1.1-20100428/rc.c
index 77dd586dfce..77dd586dfce 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/rc.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/rc.c
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/README b/Build/source/utils/dialog/dialog-1.1-20100428/samples/README
index 91f668f014e..91f668f014e 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/README
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/README
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/calendar b/Build/source/utils/dialog/dialog-1.1-20100428/samples/calendar
index e984bcea186..e984bcea186 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/calendar
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/calendar
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/calendar-stdout b/Build/source/utils/dialog/dialog-1.1-20100428/samples/calendar-stdout
index 5dbbbce9d05..5dbbbce9d05 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/calendar-stdout
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/calendar-stdout
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/calendar2 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/calendar2
index f6214ce662c..f6214ce662c 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/calendar2
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/calendar2
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/calendar2-stdout b/Build/source/utils/dialog/dialog-1.1-20100428/samples/calendar2-stdout
index af731d9d226..af731d9d226 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/calendar2-stdout
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/calendar2-stdout
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/calendar3 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/calendar3
index aece69ceb4f..aece69ceb4f 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/calendar3
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/calendar3
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/calendar3-stdout b/Build/source/utils/dialog/dialog-1.1-20100428/samples/calendar3-stdout
index 4b7ecdbeafb..4b7ecdbeafb 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/calendar3-stdout
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/calendar3-stdout
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist b/Build/source/utils/dialog/dialog-1.1-20100428/samples/checklist
index be3c8c69304..be3c8c69304 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/checklist
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist-8bit b/Build/source/utils/dialog/dialog-1.1-20100428/samples/checklist-8bit
index 20b23f13c27..20b23f13c27 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist-8bit
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/checklist-8bit
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist-utf8 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/checklist-utf8
index 12ed7239502..12ed7239502 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist-utf8
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/checklist-utf8
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist1 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/checklist1
index a0e19b6c81d..a0e19b6c81d 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist1
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/checklist1
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist10 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/checklist10
index 2ebd5575a8c..2ebd5575a8c 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist10
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/checklist10
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist11 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/checklist11
index 85e234991f8..85e234991f8 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist11
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/checklist11
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist2 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/checklist2
index c672a682e1b..c672a682e1b 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist2
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/checklist2
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist3 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/checklist3
index ce713d4546b..ce713d4546b 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist3
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/checklist3
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist4 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/checklist4
index 53adeedf95a..53adeedf95a 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist4
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/checklist4
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist5 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/checklist5
index 3890c85e09d..3890c85e09d 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist5
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/checklist5
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist6 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/checklist6
index 1a05d06e3d8..1a05d06e3d8 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist6
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/checklist6
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist7 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/checklist7
index 1080b7eee86..1080b7eee86 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist7
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/checklist7
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist8 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/checklist8
index 2ec1bbde620..2ec1bbde620 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist8
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/checklist8
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist9 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/checklist9
index e8d913fdada..e8d913fdada 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist9
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/checklist9
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist9.txt b/Build/source/utils/dialog/dialog-1.1-20100428/samples/checklist9.txt
index cdb26522170..cdb26522170 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist9.txt
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/checklist9.txt
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/admin.funcs b/Build/source/utils/dialog/dialog-1.1-20100428/samples/copifuncs/admin.funcs
index 27800dc876f..27800dc876f 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/admin.funcs
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/copifuncs/admin.funcs
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/common.funcs b/Build/source/utils/dialog/dialog-1.1-20100428/samples/copifuncs/common.funcs
index 04eca9a8400..04eca9a8400 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/common.funcs
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/copifuncs/common.funcs
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.funcs b/Build/source/utils/dialog/dialog-1.1-20100428/samples/copifuncs/copi.funcs
index 7be4bdb4151..7be4bdb4151 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.funcs
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/copifuncs/copi.funcs
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.ifman1 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/copifuncs/copi.ifman1
index 3e271a532e2..3e271a532e2 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.ifman1
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/copifuncs/copi.ifman1
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.ifman2 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/copifuncs/copi.ifman2
index 0b6dbb77ded..0b6dbb77ded 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.ifman2
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/copifuncs/copi.ifman2
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.ifmcfg2 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/copifuncs/copi.ifmcfg2
index c8a8c03d664..c8a8c03d664 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.ifmcfg2
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/copifuncs/copi.ifmcfg2
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.ifmcfg4 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/copifuncs/copi.ifmcfg4
index 4cb7a75b1fc..4cb7a75b1fc 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.ifmcfg4
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/copifuncs/copi.ifmcfg4
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.ifmcfg5 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/copifuncs/copi.ifmcfg5
index 8221c1cf160..8221c1cf160 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.ifmcfg5
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/copifuncs/copi.ifmcfg5
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.ifpoll1 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/copifuncs/copi.ifpoll1
index 812c8e9cd0d..812c8e9cd0d 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.ifpoll1
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/copifuncs/copi.ifpoll1
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.ifpoll2 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/copifuncs/copi.ifpoll2
index 216bff08583..216bff08583 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.ifpoll2
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/copifuncs/copi.ifpoll2
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.ifreq1 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/copifuncs/copi.ifreq1
index 637293954bd..637293954bd 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.ifreq1
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/copifuncs/copi.ifreq1
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.ifreq2 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/copifuncs/copi.ifreq2
index 9ee78ff73fe..9ee78ff73fe 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.ifreq2
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/copifuncs/copi.ifreq2
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.rcnews b/Build/source/utils/dialog/dialog-1.1-20100428/samples/copifuncs/copi.rcnews
index 957a272ee49..957a272ee49 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.rcnews
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/copifuncs/copi.rcnews
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.sendifm1 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/copifuncs/copi.sendifm1
index 564b9c60533..564b9c60533 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.sendifm1
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/copifuncs/copi.sendifm1
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.sendifm2 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/copifuncs/copi.sendifm2
index 1a34a1fabbc..1a34a1fabbc 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.sendifm2
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/copifuncs/copi.sendifm2
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.trnrc b/Build/source/utils/dialog/dialog-1.1-20100428/samples/copifuncs/copi.trnrc
index 7be596f74db..7be596f74db 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.trnrc
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/copifuncs/copi.trnrc
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.wheel b/Build/source/utils/dialog/dialog-1.1-20100428/samples/copifuncs/copi.wheel
index 567e559a5ab..567e559a5ab 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.wheel
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/copifuncs/copi.wheel
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/ifpatch b/Build/source/utils/dialog/dialog-1.1-20100428/samples/copifuncs/ifpatch
index 1e7c7ee510e..1e7c7ee510e 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/ifpatch
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/copifuncs/ifpatch
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/copismall b/Build/source/utils/dialog/dialog-1.1-20100428/samples/copismall
index 3dfb485a4c9..3dfb485a4c9 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/copismall
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/copismall
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/debian.rc b/Build/source/utils/dialog/dialog-1.1-20100428/samples/debian.rc
index f624dba846e..f624dba846e 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/debian.rc
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/debian.rc
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/dialog.py b/Build/source/utils/dialog/dialog-1.1-20100428/samples/dialog.py
index db66fd7f2f4..db66fd7f2f4 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/dialog.py
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/dialog.py
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/dselect b/Build/source/utils/dialog/dialog-1.1-20100428/samples/dselect
index 22995b4e9fd..22995b4e9fd 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/dselect
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/dselect
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/editbox b/Build/source/utils/dialog/dialog-1.1-20100428/samples/editbox
index 8ae4c63721d..8ae4c63721d 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/editbox
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/editbox
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/editbox-utf8 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/editbox-utf8
index 94f2fab69d2..94f2fab69d2 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/editbox-utf8
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/editbox-utf8
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/editbox2 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/editbox2
index 66623948751..66623948751 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/editbox2
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/editbox2
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/editbox3 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/editbox3
index aba30bd6f71..aba30bd6f71 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/editbox3
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/editbox3
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/editbox4 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/editbox4
index 8153facf1e8..8153facf1e8 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/editbox4
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/editbox4
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/form1 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/form1
index cfa8a4a5d8f..cfa8a4a5d8f 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/form1
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/form1
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/form1-both b/Build/source/utils/dialog/dialog-1.1-20100428/samples/form1-both
index f571830fc45..f571830fc45 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/form1-both
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/form1-both
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/form1-extra b/Build/source/utils/dialog/dialog-1.1-20100428/samples/form1-extra
index ca180a96ec1..ca180a96ec1 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/form1-extra
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/form1-extra
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/form1-help b/Build/source/utils/dialog/dialog-1.1-20100428/samples/form1-help
index 44c5543f60e..44c5543f60e 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/form1-help
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/form1-help
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/form1-utf8 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/form1-utf8
index a2be4a6cf15..a2be4a6cf15 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/form1-utf8
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/form1-utf8
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/form2 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/form2
index a005be3c2bf..a005be3c2bf 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/form2
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/form2
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/form3 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/form3
index c3ac6d5306e..c3ac6d5306e 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/form3
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/form3
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/form4 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/form4
index a733865015c..a733865015c 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/form4
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/form4
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/form5 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/form5
index 649c3872d12..649c3872d12 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/form5
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/form5
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/form6 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/form6
index 8b5483f4f4c..8b5483f4f4c 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/form6
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/form6
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/fselect b/Build/source/utils/dialog/dialog-1.1-20100428/samples/fselect
index 20b8304331a..20b8304331a 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/fselect
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/fselect
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/fselect-stdout b/Build/source/utils/dialog/dialog-1.1-20100428/samples/fselect-stdout
index 02eefdb7b34..02eefdb7b34 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/fselect-stdout
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/fselect-stdout
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/fselect1 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/fselect1
index 59137941717..59137941717 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/fselect1
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/fselect1
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/fselect1-stdout b/Build/source/utils/dialog/dialog-1.1-20100428/samples/fselect1-stdout
index 01d1135622f..01d1135622f 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/fselect1-stdout
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/fselect1-stdout
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/fselect2 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/fselect2
index 6480c753bb1..6480c753bb1 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/fselect2
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/fselect2
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/fselect2-stdout b/Build/source/utils/dialog/dialog-1.1-20100428/samples/fselect2-stdout
index 644fb2a5bf7..644fb2a5bf7 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/fselect2-stdout
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/fselect2-stdout
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/gauge b/Build/source/utils/dialog/dialog-1.1-20100428/samples/gauge
index 80dc188dc1c..80dc188dc1c 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/gauge
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/gauge
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/gauge0 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/gauge0
index 97e654cef71..97e654cef71 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/gauge0
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/gauge0
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/gauge0-input-fd b/Build/source/utils/dialog/dialog-1.1-20100428/samples/gauge0-input-fd
index 0b96fe4a756..0b96fe4a756 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/gauge0-input-fd
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/gauge0-input-fd
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/gauge2 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/gauge2
index 10455d144c6..10455d144c6 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/gauge2
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/gauge2
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/infobox b/Build/source/utils/dialog/dialog-1.1-20100428/samples/infobox
index 91dd5dd9e05..91dd5dd9e05 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/infobox
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/infobox
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/infobox1 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/infobox1
index 4ee6c9ff799..4ee6c9ff799 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/infobox1
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/infobox1
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/infobox2 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/infobox2
index fdf64caa85f..fdf64caa85f 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/infobox2
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/infobox2
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/infobox3 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/infobox3
index edba1dfd98f..edba1dfd98f 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/infobox3
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/infobox3
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/infobox4 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/infobox4
index 7c96d6b4e46..7c96d6b4e46 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/infobox4
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/infobox4
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/infobox5 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/infobox5
index 7f4599e6671..7f4599e6671 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/infobox5
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/infobox5
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/infobox6 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/infobox6
index 2e4505cbe89..2e4505cbe89 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/infobox6
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/infobox6
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputbox b/Build/source/utils/dialog/dialog-1.1-20100428/samples/inputbox
index 9975d441d75..9975d441d75 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputbox
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/inputbox
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputbox-both b/Build/source/utils/dialog/dialog-1.1-20100428/samples/inputbox-both
index 4103ccf811c..4103ccf811c 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputbox-both
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/inputbox-both
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputbox-extra b/Build/source/utils/dialog/dialog-1.1-20100428/samples/inputbox-extra
index 9f2277c940a..9f2277c940a 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputbox-extra
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/inputbox-extra
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputbox-help b/Build/source/utils/dialog/dialog-1.1-20100428/samples/inputbox-help
index 0dfe7c81462..0dfe7c81462 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputbox-help
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/inputbox-help
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputbox1 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/inputbox1
index 487aa8c5edf..487aa8c5edf 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputbox1
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/inputbox1
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputbox2 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/inputbox2
index f7b4b5f7df6..f7b4b5f7df6 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputbox2
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/inputbox2
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputbox3 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/inputbox3
index d343e0a64cc..d343e0a64cc 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputbox3
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/inputbox3
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputbox4 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/inputbox4
index 416bf86a860..416bf86a860 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputbox4
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/inputbox4
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputbox5 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/inputbox5
index ad726234169..ad726234169 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputbox5
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/inputbox5
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputbox6-8bit b/Build/source/utils/dialog/dialog-1.1-20100428/samples/inputbox6-8bit
index b7692e8826a..b7692e8826a 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputbox6-8bit
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/inputbox6-8bit
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputbox6-utf8 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/inputbox6-utf8
index 605382f20a0..605382f20a0 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputbox6-utf8
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/inputbox6-utf8
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputbox7 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/inputbox7
index e79d9cc584b..e79d9cc584b 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputbox7
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/inputbox7
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputmenu b/Build/source/utils/dialog/dialog-1.1-20100428/samples/inputmenu
index 5053cda6a45..5053cda6a45 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputmenu
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/inputmenu
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputmenu-stdout b/Build/source/utils/dialog/dialog-1.1-20100428/samples/inputmenu-stdout
index 22fce044204..22fce044204 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputmenu-stdout
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/inputmenu-stdout
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputmenu1 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/inputmenu1
index 4e9bae26e56..4e9bae26e56 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputmenu1
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/inputmenu1
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputmenu2 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/inputmenu2
index f560aba3d21..f560aba3d21 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputmenu2
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/inputmenu2
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputmenu3 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/inputmenu3
index e3250d8a761..e3250d8a761 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputmenu3
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/inputmenu3
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputmenu4 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/inputmenu4
index a872527c915..a872527c915 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputmenu4
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/inputmenu4
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/install/FDISK.TEST b/Build/source/utils/dialog/dialog-1.1-20100428/samples/install/FDISK.TEST
index 2ad568a62d7..2ad568a62d7 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/install/FDISK.TEST
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/install/FDISK.TEST
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/install/makefile.in b/Build/source/utils/dialog/dialog-1.1-20100428/samples/install/makefile.in
index 3dcdc09ba2c..3dcdc09ba2c 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/install/makefile.in
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/install/makefile.in
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/install/setup.c b/Build/source/utils/dialog/dialog-1.1-20100428/samples/install/setup.c
index ae569813e86..ae569813e86 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/install/setup.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/install/setup.c
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/install/setup.help b/Build/source/utils/dialog/dialog-1.1-20100428/samples/install/setup.help
index 7ac8369d4e6..7ac8369d4e6 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/install/setup.help
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/install/setup.help
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/killall b/Build/source/utils/dialog/dialog-1.1-20100428/samples/killall
index 9d233f0a92d..9d233f0a92d 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/killall
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/killall
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/listing b/Build/source/utils/dialog/dialog-1.1-20100428/samples/listing
index 71d85aa6df9..71d85aa6df9 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/listing
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/listing
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/menubox b/Build/source/utils/dialog/dialog-1.1-20100428/samples/menubox
index 0cea3bb0000..0cea3bb0000 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/menubox
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/menubox
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/menubox-8bit b/Build/source/utils/dialog/dialog-1.1-20100428/samples/menubox-8bit
index 91faa5cfea2..91faa5cfea2 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/menubox-8bit
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/menubox-8bit
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/menubox-utf8 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/menubox-utf8
index cd6e429c2c3..cd6e429c2c3 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/menubox-utf8
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/menubox-utf8
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/menubox1 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/menubox1
index dc40d027e75..dc40d027e75 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/menubox1
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/menubox1
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/menubox10 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/menubox10
index 86069342199..86069342199 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/menubox10
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/menubox10
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/menubox2 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/menubox2
index d81ba792a76..d81ba792a76 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/menubox2
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/menubox2
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/menubox3 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/menubox3
index d33b5d6fdef..d33b5d6fdef 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/menubox3
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/menubox3
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/menubox4 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/menubox4
index e95342de9d8..e95342de9d8 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/menubox4
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/menubox4
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/menubox5 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/menubox5
index c89be3a0e74..c89be3a0e74 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/menubox5
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/menubox5
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/menubox6 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/menubox6
index afcc90de2b0..afcc90de2b0 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/menubox6
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/menubox6
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/menubox7 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/menubox7
index 2e85b435608..2e85b435608 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/menubox7
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/menubox7
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/menubox8 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/menubox8
index 85448d05841..85448d05841 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/menubox8
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/menubox8
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/menubox9 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/menubox9
index 83739395189..83739395189 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/menubox9
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/menubox9
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/mixedform b/Build/source/utils/dialog/dialog-1.1-20100428/samples/mixedform
index 617847682ce..617847682ce 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/mixedform
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/mixedform
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/mixedform2 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/mixedform2
index 07f1d664617..07f1d664617 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/mixedform2
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/mixedform2
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/mixedgauge b/Build/source/utils/dialog/dialog-1.1-20100428/samples/mixedgauge
index 517ba1134ce..517ba1134ce 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/mixedgauge
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/mixedgauge
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/msgbox b/Build/source/utils/dialog/dialog-1.1-20100428/samples/msgbox
index adc204e11f7..adc204e11f7 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/msgbox
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/msgbox
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/msgbox-help b/Build/source/utils/dialog/dialog-1.1-20100428/samples/msgbox-help
index 3825f6b9819..3825f6b9819 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/msgbox-help
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/msgbox-help
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/msgbox1 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/msgbox1
index b7ef8244bef..b7ef8244bef 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/msgbox1
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/msgbox1
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/msgbox2 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/msgbox2
index b39f65a634d..b39f65a634d 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/msgbox2
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/msgbox2
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/msgbox3 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/msgbox3
index d1ea1080f88..d1ea1080f88 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/msgbox3
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/msgbox3
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/msgbox4-8bit b/Build/source/utils/dialog/dialog-1.1-20100428/samples/msgbox4-8bit
index 216ac8eccb5..216ac8eccb5 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/msgbox4-8bit
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/msgbox4-8bit
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/msgbox4-eucjp b/Build/source/utils/dialog/dialog-1.1-20100428/samples/msgbox4-eucjp
index 9969c082453..9969c082453 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/msgbox4-eucjp
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/msgbox4-eucjp
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/msgbox4-utf8 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/msgbox4-utf8
index acbbebe5eab..acbbebe5eab 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/msgbox4-utf8
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/msgbox4-utf8
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/msgbox5 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/msgbox5
index f5d942725d5..f5d942725d5 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/msgbox5
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/msgbox5
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/msgbox6 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/msgbox6
index 1d30f021897..1d30f021897 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/msgbox6
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/msgbox6
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/msgbox6a b/Build/source/utils/dialog/dialog-1.1-20100428/samples/msgbox6a
index e84edbf5f75..e84edbf5f75 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/msgbox6a
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/msgbox6a
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/password b/Build/source/utils/dialog/dialog-1.1-20100428/samples/password
index 4517043ac28..4517043ac28 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/password
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/password
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/password1 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/password1
index adeabc09b1f..adeabc09b1f 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/password1
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/password1
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/password2 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/password2
index 91a7e455fb3..91a7e455fb3 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/password2
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/password2
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/passwordform1 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/passwordform1
index 7c3c1f03928..7c3c1f03928 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/passwordform1
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/passwordform1
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/passwordform1-utf8 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/passwordform1-utf8
index 3dda34c0e62..3dda34c0e62 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/passwordform1-utf8
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/passwordform1-utf8
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/pause b/Build/source/utils/dialog/dialog-1.1-20100428/samples/pause
index 64e211b7f69..64e211b7f69 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/pause
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/pause
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/pause-help b/Build/source/utils/dialog/dialog-1.1-20100428/samples/pause-help
index 2d3656e7196..2d3656e7196 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/pause-help
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/pause-help
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/progress b/Build/source/utils/dialog/dialog-1.1-20100428/samples/progress
index 6ad45d8b04c..6ad45d8b04c 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/progress
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/progress
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/progress2 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/progress2
index 564433b1c37..564433b1c37 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/progress2
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/progress2
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/radiolist b/Build/source/utils/dialog/dialog-1.1-20100428/samples/radiolist
index 602ad82044a..602ad82044a 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/radiolist
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/radiolist
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/radiolist1 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/radiolist1
index 77defa52ced..77defa52ced 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/radiolist1
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/radiolist1
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/radiolist10 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/radiolist10
index 2953871c5f8..2953871c5f8 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/radiolist10
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/radiolist10
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/radiolist2 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/radiolist2
index e2965eac1ee..e2965eac1ee 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/radiolist2
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/radiolist2
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/radiolist3 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/radiolist3
index 6c695e7197c..6c695e7197c 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/radiolist3
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/radiolist3
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/radiolist4 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/radiolist4
index 67d920f3294..67d920f3294 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/radiolist4
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/radiolist4
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/report-button b/Build/source/utils/dialog/dialog-1.1-20100428/samples/report-button
index e13b03afb7c..e13b03afb7c 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/report-button
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/report-button
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/report-edit b/Build/source/utils/dialog/dialog-1.1-20100428/samples/report-edit
index f17b6d32a98..f17b6d32a98 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/report-edit
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/report-edit
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/report-string b/Build/source/utils/dialog/dialog-1.1-20100428/samples/report-string
index a674517c75e..a674517c75e 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/report-string
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/report-string
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/report-tempfile b/Build/source/utils/dialog/dialog-1.1-20100428/samples/report-tempfile
index 5a88d443cf3..5a88d443cf3 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/report-tempfile
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/report-tempfile
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/report-yesno b/Build/source/utils/dialog/dialog-1.1-20100428/samples/report-yesno
index 81da89b525e..81da89b525e 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/report-yesno
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/report-yesno
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/rotated-data b/Build/source/utils/dialog/dialog-1.1-20100428/samples/rotated-data
index dc407144e7e..dc407144e7e 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/rotated-data
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/rotated-data
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/setup-edit b/Build/source/utils/dialog/dialog-1.1-20100428/samples/setup-edit
index df86297764a..df86297764a 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/setup-edit
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/setup-edit
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/setup-tempfile b/Build/source/utils/dialog/dialog-1.1-20100428/samples/setup-tempfile
index 6db551f0342..6db551f0342 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/setup-tempfile
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/setup-tempfile
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/setup-utf8 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/setup-utf8
index 2fd70d42a4c..2fd70d42a4c 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/setup-utf8
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/setup-utf8
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/setup-vars b/Build/source/utils/dialog/dialog-1.1-20100428/samples/setup-vars
index cf79353c553..cf79353c553 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/setup-vars
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/setup-vars
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/slackware.rc b/Build/source/utils/dialog/dialog-1.1-20100428/samples/slackware.rc
index 9942db6e1cf..9942db6e1cf 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/slackware.rc
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/slackware.rc
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/sourcemage.rc b/Build/source/utils/dialog/dialog-1.1-20100428/samples/sourcemage.rc
index bf187ea5e6c..bf187ea5e6c 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/sourcemage.rc
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/sourcemage.rc
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/suse.rc b/Build/source/utils/dialog/dialog-1.1-20100428/samples/suse.rc
index 233157d94ad..233157d94ad 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/suse.rc
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/suse.rc
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/tailbox b/Build/source/utils/dialog/dialog-1.1-20100428/samples/tailbox
index 227104e2fcf..227104e2fcf 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/tailbox
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/tailbox
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/tailboxbg b/Build/source/utils/dialog/dialog-1.1-20100428/samples/tailboxbg
index 957d7744655..957d7744655 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/tailboxbg
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/tailboxbg
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/tailboxbg1 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/tailboxbg1
index 2955ad03486..2955ad03486 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/tailboxbg1
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/tailboxbg1
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/tailboxbg2 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/tailboxbg2
index 061770895f1..061770895f1 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/tailboxbg2
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/tailboxbg2
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/testdata-8bit b/Build/source/utils/dialog/dialog-1.1-20100428/samples/testdata-8bit
index 7810f9e34f2..7810f9e34f2 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/testdata-8bit
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/testdata-8bit
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/textbox b/Build/source/utils/dialog/dialog-1.1-20100428/samples/textbox
index d3c7698c85e..d3c7698c85e 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/textbox
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/textbox
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/textbox.txt b/Build/source/utils/dialog/dialog-1.1-20100428/samples/textbox.txt
index 3aaec0f8e5c..3aaec0f8e5c 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/textbox.txt
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/textbox.txt
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/textbox2 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/textbox2
index 7c97de8cb38..7c97de8cb38 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/textbox2
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/textbox2
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/textbox3 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/textbox3
index 2c076e95556..2c076e95556 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/textbox3
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/textbox3
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/timebox b/Build/source/utils/dialog/dialog-1.1-20100428/samples/timebox
index cb6bf5c6f4f..cb6bf5c6f4f 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/timebox
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/timebox
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/timebox-stdout b/Build/source/utils/dialog/dialog-1.1-20100428/samples/timebox-stdout
index 10a00262bbd..10a00262bbd 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/timebox-stdout
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/timebox-stdout
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/timebox2 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/timebox2
index 088acdff39b..088acdff39b 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/timebox2
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/timebox2
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/timebox2-stdout b/Build/source/utils/dialog/dialog-1.1-20100428/samples/timebox2-stdout
index 922921fc2e2..922921fc2e2 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/timebox2-stdout
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/timebox2-stdout
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/wheel b/Build/source/utils/dialog/dialog-1.1-20100428/samples/wheel
index ff75f71d6e0..ff75f71d6e0 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/wheel
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/wheel
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/whiptail.rc b/Build/source/utils/dialog/dialog-1.1-20100428/samples/whiptail.rc
index 47d5032a733..47d5032a733 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/whiptail.rc
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/whiptail.rc
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/yesno b/Build/source/utils/dialog/dialog-1.1-20100428/samples/yesno
index fa1ea444ce4..fa1ea444ce4 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/yesno
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/yesno
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/yesno-both b/Build/source/utils/dialog/dialog-1.1-20100428/samples/yesno-both
index a408bdba4b5..a408bdba4b5 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/yesno-both
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/yesno-both
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/yesno-extra b/Build/source/utils/dialog/dialog-1.1-20100428/samples/yesno-extra
index ce31b810794..ce31b810794 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/yesno-extra
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/yesno-extra
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/yesno-help b/Build/source/utils/dialog/dialog-1.1-20100428/samples/yesno-help
index 1333f1cbc09..1333f1cbc09 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/yesno-help
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/yesno-help
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/yesno-utf8 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/yesno-utf8
index 4a6be30eb80..4a6be30eb80 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/yesno-utf8
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/yesno-utf8
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/yesno2 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/yesno2
index d022352e630..d022352e630 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/yesno2
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/yesno2
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/yesno3 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/yesno3
index f67fb85b600..f67fb85b600 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/yesno3
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/yesno3
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/yesno4 b/Build/source/utils/dialog/dialog-1.1-20100428/samples/yesno4
index 99f65e86125..99f65e86125 100755
--- a/Build/source/utils/dialog/dialog-1.1-20100119/samples/yesno4
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/samples/yesno4
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/tailbox.c b/Build/source/utils/dialog/dialog-1.1-20100428/tailbox.c
index ea4457cfa1e..51db836f471 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/tailbox.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/tailbox.c
@@ -1,9 +1,9 @@
 /*
- *  $Id: tailbox.c,v 1.54 2010/01/12 11:58:43 tom Exp $
+ *  $Id: tailbox.c,v 1.56 2010/04/28 20:52:20 tom Exp $
  *
  * tailbox.c -- implements the tail box
  *
- * Copyright 2000-2007,2009 Thomas E. Dickey
+ * Copyright 2000-2009,2010 Thomas E. Dickey
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License, version 2.1
@@ -106,11 +106,11 @@ static void
 last_lines(MY_OBJ * obj, int target)
 {
     FILE *fp = obj->obj.input;
-    int inx;
+    long inx;
     int count = 0;
     char buf[BUFSIZ + 1];
-    size_t size_to_read;
-    size_t offset = 0;
+    long size_to_read;
+    long offset = 0;
     long fpos = 0;
 
     if (fseek(fp, 0, SEEK_END) == -1
@@ -121,14 +121,14 @@ last_lines(MY_OBJ * obj, int target)
 	++target;
 	for (;;) {
 	    if (fpos >= BUFSIZ) {
-		size_to_read = (size_t) BUFSIZ;
+		size_to_read = BUFSIZ;
 	    } else {
-		size_to_read = ((size_t) fpos);
+		size_to_read = fpos;
 	    }
-	    fpos -= size_to_read;
+	    fpos = fpos - size_to_read;
 	    if (fseek(fp, fpos, SEEK_SET) == -1)
 		dlg_exiterr("Error moving file pointer in last_lines().");
-	    (void) fread(buf, size_to_read, 1, fp);
+	    (void) fread(buf, (size_t) size_to_read, 1, fp);
 	    if (ferror(fp))
 		dlg_exiterr("Error reading file in last_lines().");
 
@@ -228,6 +228,7 @@ handle_my_getc(DIALOG_CALLBACK * cb, int ch, int fkey, int *result)
     } else {
 	switch (ch) {
 	case ERR:
+	    clearerr(cb->input);
 	    ch = getc(cb->input);
 	    (void) ungetc(ch, cb->input);
 	    if ((ch != EOF) || (obj->hscroll != obj->old_hscroll)) {
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/textbox.c b/Build/source/utils/dialog/dialog-1.1-20100428/textbox.c
index 5a4181b9e21..5b8c5aade80 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/textbox.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/textbox.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: textbox.c,v 1.96 2010/01/17 18:23:56 tom Exp $
+ *  $Id: textbox.c,v 1.97 2010/04/28 21:03:44 tom Exp $
  *
  * textbox.c -- implements the text box
  *
@@ -53,7 +53,7 @@ static long
 lseek_obj(MY_OBJ * obj, long offset, int mode)
 {
     long fpos;
-    if ((fpos = lseek(obj->fd, offset, mode)) == -1) {
+    if ((fpos = (long) lseek(obj->fd, (off_t) offset, mode)) == -1) {
 	switch (mode) {
 	case SEEK_CUR:
 	    dlg_exiterr("Cannot get file position");
@@ -131,7 +131,7 @@ read_high(MY_OBJ * obj, size_t size_read)
 		obj->buffer_len = obj->bytes_read;
 
 		/* Allocate space for read buffer */
-		obj->buf = xalloc(obj->buffer_len + 1);
+		obj->buf = xalloc((size_t) obj->buffer_len + 1);
 	    }
 
 	} else {
@@ -200,9 +200,9 @@ tabize(MY_OBJ * obj, long val, long *first_pos)
     lseek_obj(obj, fpos - obj->fd_bytes_read, SEEK_SET);
 
     /* Allocate space for read buffer */
-    buftab = xalloc(val + 1);
+    buftab = xalloc((size_t) val + 1);
 
-    if ((read(obj->fd, buftab, val)) == -1)
+    if ((read(obj->fd, buftab, (size_t) val)) == -1)
 	dlg_exiterr("Error reading file in tabize().");
 
     begin_line = count = 0;
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/timebox.c b/Build/source/utils/dialog/dialog-1.1-20100428/timebox.c
index acea1c2f48d..acea1c2f48d 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/timebox.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/timebox.c
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/trace.c b/Build/source/utils/dialog/dialog-1.1-20100428/trace.c
index 6148ee8bc67..6148ee8bc67 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/trace.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/trace.c
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/ui_getc.c b/Build/source/utils/dialog/dialog-1.1-20100428/ui_getc.c
index bce890c630b..bce890c630b 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/ui_getc.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/ui_getc.c
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/util.c b/Build/source/utils/dialog/dialog-1.1-20100428/util.c
index e0565de3a8d..5559052faf9 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/util.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/util.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: util.c,v 1.200 2010/01/15 23:49:38 tom Exp $
+ *  $Id: util.c,v 1.201 2010/04/28 21:12:42 tom Exp $
  *
  *  util.c -- miscellaneous utilities for dialog
  *
@@ -412,18 +412,18 @@ dlg_color_pair(int foreground, int background)
     bool found = FALSE;
 
     for (pair = 1; pair < defined_colors; ++pair) {
-	if (pair_content(pair, &fg, &bg) != ERR
+	if (pair_content((short) pair, &fg, &bg) != ERR
 	    && fg == foreground
 	    && bg == background) {
-	    result = COLOR_PAIR(pair);
+	    result = (chtype) COLOR_PAIR(pair);
 	    found = TRUE;
 	    break;
 	}
     }
     if (!found && (defined_colors + 1) < COLOR_PAIRS) {
 	pair = defined_colors++;
-	(void) init_pair(pair, foreground, background);
-	result = COLOR_PAIR(pair);
+	(void) init_pair((short) pair, (short) foreground, (short) background);
+	result = (chtype) COLOR_PAIR(pair);
     }
     return result;
 }
@@ -441,7 +441,7 @@ define_color(WINDOW *win, int foreground)
     short fg, bg, background;
 
     if ((pair = PAIR_NUMBER(attrs)) != 0
-	&& pair_content(pair, &fg, &bg) != ERR) {
+	&& pair_content((short) pair, &fg, &bg) != ERR) {
 	background = bg;
     } else {
 	background = COLOR_BLACK;
@@ -558,7 +558,7 @@ dlg_print_text(WINDOW *win, const char *txt, int cols, chtype *attr)
 	 * attribute.
 	 */
 	if ((useattr & A_COLOR) != 0 && (useattr & A_BOLD) == 0) {
-	    short pair = PAIR_NUMBER(useattr);
+	    short pair = (short) PAIR_NUMBER(useattr);
 	    short fg, bg;
 	    if (pair_content(pair, &fg, &bg) != ERR
 		&& fg == bg) {
@@ -925,9 +925,9 @@ auto_size_preformatted(const char *prompt, int *height, int *width)
      */
     if (car > ar) {
 	diff = car / (float) ar;
-	max_x = (int) (wide / diff + 4);
+	max_x = (int) ((float) wide / diff + 4);
 	justify_text((WINDOW *) 0, prompt, max_y, max_x, &high, &wide);
-	car = (float) wide / high;
+	car = (float) wide / (float) high;
     }
 
     /*
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/version.c b/Build/source/utils/dialog/dialog-1.1-20100428/version.c
index 1e72ce4789f..1e72ce4789f 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/version.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/version.c
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/yesno.c b/Build/source/utils/dialog/dialog-1.1-20100428/yesno.c
index c666154c6d3..c666154c6d3 100644
--- a/Build/source/utils/dialog/dialog-1.1-20100119/yesno.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100428/yesno.c