Update dialog to 20110302 version.vendor/dialog/1.1-20110302

98 files changed, 5179 insertions, 2868 deletions

diff --git a/CHANGES b/CHANGES
index 3ed4d0d00af9..f35790b6faab 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,77 @@
--- $Id: CHANGES,v 1.300 2010/04/28 21:27:22 tom Exp $
+-- $Id: CHANGES,v 1.333 2011/03/02 10:06:37 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:
 
+2011/03/02
+	+ add --prgbox and --programbox (adapted from patch by David Boyd).
+	+ add sl.po from
+		http://translationproject.org/latest/dialog/
+	+ fix timeouts from 2011/01/18, which were being interpreted as
+	  milliseconds rather than seconds (report by Luis Moreira).
+
+2011/01/18
+	+ fix inconsistency in return-codes for textbox when help-button is
+	  used by making dlg_exit_buttoncode() a wrapper for
+	  dlg_ok_buttoncode().
+	+ modify pause widget to use dlg_ok_buttoncode(), so help-button works.
+	+ correct two infobox sample scripts, which did not pass extra
+	  command-line parameters due to quoting problems.
+	+ add a limit-check to the timebox widget (patch by Garrett Cooper).
+	+ modify --trace option to also trace the command-line parameters.
+	+ account for combining characters when wrapping text (Debian #570634).
+	+ correct handling of SIGWINCH in gauge widget (Debian #305705).
+	+ add gauge_color, to make guage's progress-bar distinct from
+	  title_color (request by Dominic Derdau).
+	+ update fi.po from
+		http://translationproject.org/latest/dialog/
+	  as well as resync line-numbers in the other po-files.
+	+ modify configure script and dialog program to build with NetBSD's
+	  wide-character curses functions, including workarounds for its
+	  incorrect WACS_xxx definitions.  Some of the UTF-8 examples work.
+	+ add back-tab for traversal of tailboxbg widgets, for symmetry with
+	  tab-traversal.
+	+ reduce flicker in tailboxbg by checking if the input file size has
+	  changed.
+	+ modify internals of callbacks to avoid blocking reads of their
+	  associated files by keyboard input.
+	+ add command-line option --no-mouse, to suppress use of mouse.
+	+ add configure option --enable-header-subdir to allow the header files
+	  to be installed into a subdirectory named for the package.
+	+ modify dlg_restore_vars() to retain the updated values of
+	  input_result and input_length, eliminating the need for a caller to
+	  provide their own user buffer (prompted by report by Thiago Bimbatti
+	  Felicio).
+	+ add a null-pointer check in show_result() for
+	  dialog_vars.input_result, and ensure it is set to null after freeing
+	  (prompted by report by Thiago Bimbatti Felicio).
+	+ change order of -I options in CPPFLAGS (report by Michel Feldheim)
+	+ modify pause-widget so that it no longer exits when an unrecognized
+	  key is pressed (patch by Creidieki M Crouch).
+	+ add --with-package option to configure script to allow renaming
+	  of the dialog program and library, to support the package scripts.
+	+ add Debian and RPM package scripts for test-builds.
+	+ several improvements to configure script:
+	  + quote params of ifelse()
+	  + change obsolete ${name-value} to standard ${name:-value}
+	  + use new macros CF_ADD_LIB/CF_ADD_LIBS to enforce consistency.
+	  + AM_GNU_GETTEXT, drop $MKINSTALLDIRS, use "mkdir -p" consistently.
+	  + CF_ADD_SUBDIR_PATH, workaround - if $prefix was not mkdir'd yet, no
+	    directories were added.
+	  + CF_BUNDLED_INTL, add --with-textdomain option, to use with lynx-dev
+	    package
+	  + CF_FIND_LINKAGE, simplify save/restore of $LIBS
+	  + CF_GCC_WARNINGS, fix for Mac OS X (compiler makes conftest.dSYM
+	    directory)
+	  + CF_HEADER_PATH, don't search for variations of everything in the
+	    current include-path
+	  + CF_WITH_CURSES_DIR, move the calls to CF_ADD_INCDIR and
+	    CF_ADD_LIBDIR for the curses-directory here, from
+	    CF_NCURSES_CPPFLAGS and CF_NCURSES_LDFLAGS, so it will work even
+	    with the default checking, e.g., no --with-ncurses, etc.
+	+ updated config.guess, config.sub
+
 2010/04/28
 	+ several improvements to configure script:
 	  + modify CF_CURSES_TERM_H to handle cases such as cygwin where
@@ -278,7 +346,7 @@ to it:
 	+ make --program-prefix, etc., work in configure script, e.g., to make
 	  program install as "cdialog".  This does not alter the library name.
 	+ add install-bin, install-man (and uninstall) rules to makefile.
-	+ updates for configure script macros (originally vile, lynx, xterm): 
+	+ updates for configure script macros (originally vile, lynx, xterm):
 	  AM_PATH_PROG_WITH_TEST, AM_WITH_NLS, CF_CURSES_CPPFLAGS,
 	  CF_CURSES_LIBS, CF_INCLUDE_DIRS, CF_LARGEFILE, CF_MAKEFLAGS,
 	  CF_PATH_SYNTAX, CF_SUBDIR_PATH, CF_SUBST, CF_WITH_DBMALLOC,
@@ -407,7 +475,7 @@ to it:
 	+ fix marker in textbox.c to make it disappear at the top of the file
 	  (report by Patrick J. Volkerding).
 	+ fix marker shown in arrows.c for checklists, etc., which was "(+)"
-	  where it should have been "(-)" (report/patch by Patrick J. 
+	  where it should have been "(-)" (report/patch by Patrick J.
 	  Volkerding).
 	+ fix --input-fd (changes in glibc since 2003 made dialog hang on exit
 	  due to the way dialog updated stdin).
diff --git a/VERSION b/VERSION
index 06853702a849..0cc90f574258 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-7:1:0	1.1	20100428
+9:0:0	1.1	20110302
diff --git a/aclocal.m4 b/aclocal.m4
index cc00e7db6180..20e0fa921897 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,13 +1,37 @@
 dnl macros used for DIALOG configure script
-dnl Copyright 1999-2009,2010 -- Thomas E. Dickey
+dnl $Id: aclocal.m4,v 1.80 2011/01/18 23:17:01 tom Exp $
+dnl ---------------------------------------------------------------------------
+dnl Copyright 1999-2010,2011 -- Thomas E. Dickey
+dnl
+dnl Permission is hereby granted, free of charge, to any person obtaining a
+dnl copy of this software and associated documentation files (the
+dnl "Software"), to deal in the Software without restriction, including
+dnl without limitation the rights to use, copy, modify, merge, publish,
+dnl distribute, distribute with modifications, sublicense, and/or sell
+dnl copies of the Software, and to permit persons to whom the Software is
+dnl furnished to do so, subject to the following conditions:
+dnl 
+dnl The above copyright notice and this permission notice shall be included
+dnl in all copies or portions of the Software.
+dnl 
+dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+dnl IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+dnl DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+dnl OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+dnl THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+dnl 
+dnl Except as contained in this notice, the name(s) of the above copyright
+dnl holders shall not be used in advertising or otherwise to promote the
+dnl sale, use or other dealings in this Software without prior written
+dnl authorization.
 dnl
 dnl see
 dnl http://invisible-island.net/autoconf/ 
-dnl
-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
+dnl AM_GNU_GETTEXT version: 12 updated: 2010/06/19 07:02:11
 dnl --------------
 dnl Usage: Just like AM_WITH_NLS, which see.
 AC_DEFUN([AM_GNU_GETTEXT],
@@ -68,25 +92,6 @@ strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
      fi
    fi
 
-   dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
-   dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
-   dnl Try to locate it.
-   dnl changed mkinstalldirs to mkdirs.sh for Lynx /je spath 1998-Aug-21
-   dnl added check for separate locations of scripts -mirabile 2004-Jan-18
-   MKINSTALLDIRS=
-   if test -n "$ac_aux_dir"; then
-     MKINSTALLDIRS="$ac_aux_dir/mkdirs.sh"
-   fi
-   if test -z "$MKINSTALLDIRS"; then
-     MKINSTALLDIRS="\$(top_srcdir)/mkdirs.sh"
-   fi
-   if test -n "$GNUSYSTEM_AUX_DIR" ; then
-     if test -e "${GNUSYSTEM_AUX_DIR}/mkinstalldirs"; then
-       MKINSTALLDIRS="${GNUSYSTEM_AUX_DIR}/mkinstalldirs"
-     fi
-   fi
-   AC_SUBST(MKINSTALLDIRS)
-
    dnl Enable libtool support if the surrounding package wishes it.
    INTL_LIBTOOL_SUFFIX_PREFIX=ifelse([$1], use-libtool, [l], [])
    AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
@@ -277,7 +282,7 @@ fi
 AC_SUBST($1)dnl
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl AM_WITH_NLS version: 23 updated: 2009/01/11 19:52:42
+dnl AM_WITH_NLS version: 24 updated: 2010/06/20 09:24:28
 dnl -----------
 dnl Inserted as requested by gettext 0.10.40
 dnl File from /usr/share/aclocal
@@ -369,7 +374,7 @@ AC_DEFUN([AM_WITH_NLS],
       CATOBJEXT=NONE
 
       cf_save_LIBS_1="$LIBS"
-      LIBS="$LIBICONV $LIBS"
+      CF_ADD_LIBS($LIBICONV)
       AC_CACHE_CHECK([for libintl.h and gettext()], cf_cv_func_gettext,[
         CF_FIND_LINKAGE(CF__INTL_HEAD,
         CF__INTL_BODY,
@@ -597,7 +602,7 @@ define(CF_AC_PREREQ,
 AC_PREREQ_CANON(AC_PREREQ_SPLIT(AC_ACVERSION)),
 AC_PREREQ_CANON(AC_PREREQ_SPLIT([$1])), [$1], [$2], [$3])])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_ADD_CFLAGS version: 9 updated: 2010/01/09 11:05:50
+dnl CF_ADD_CFLAGS version: 10 updated: 2010/05/26 05:38:42
 dnl -------------
 dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS
 dnl The second parameter if given makes this macro verbose.
@@ -667,17 +672,17 @@ esac
 done
 
 if test -n "$cf_new_cflags" ; then
-	ifelse($2,,,[CF_VERBOSE(add to \$CFLAGS $cf_new_cflags)])
+	ifelse([$2],,,[CF_VERBOSE(add to \$CFLAGS $cf_new_cflags)])
 	CFLAGS="$CFLAGS $cf_new_cflags"
 fi
 
 if test -n "$cf_new_cppflags" ; then
-	ifelse($2,,,[CF_VERBOSE(add to \$CPPFLAGS $cf_new_cppflags)])
+	ifelse([$2],,,[CF_VERBOSE(add to \$CPPFLAGS $cf_new_cppflags)])
 	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
-	ifelse($2,,,[CF_VERBOSE(add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags)])
+	ifelse([$2],,,[CF_VERBOSE(add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags)])
 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
 fi
 
@@ -685,7 +690,7 @@ AC_SUBST(EXTRA_CPPFLAGS)
 
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_ADD_INCDIR version: 12 updated: 2009/01/18 10:00:47
+dnl CF_ADD_INCDIR version: 13 updated: 2010/05/26 16:44:57
 dnl -------------
 dnl Add an include-directory to $CPPFLAGS.  Don't add /usr/include, since it's
 dnl redundant.  We don't normally need to add -I/usr/local/include for gcc,
@@ -728,7 +733,7 @@ if test -n "$1" ; then
 
 		if test "$cf_have_incdir" = no ; then
 		  CF_VERBOSE(adding $cf_add_incdir to include-path)
-		  ifelse($2,,CPPFLAGS,$2)="$ifelse($2,,CPPFLAGS,$2) -I$cf_add_incdir"
+		  ifelse([$2],,CPPFLAGS,[$2])="$ifelse([$2],,CPPFLAGS,[$2]) -I$cf_add_incdir"
 
 		  cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
 		  test "$cf_top_incdir" = "$cf_add_incdir" && break
@@ -742,7 +747,15 @@ if test -n "$1" ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_ADD_LIBDIR version: 8 updated: 2009/01/18 10:01:08
+dnl CF_ADD_LIB version: 2 updated: 2010/06/02 05:03:05
+dnl ----------
+dnl Add a library, used to enforce consistency.
+dnl
+dnl $1 = library to add, without the "-l"
+dnl $2 = variable to update (default $LIBS)
+AC_DEFUN([CF_ADD_LIB],[CF_ADD_LIBS(-l$1,ifelse($2,,LIBS,[$2]))])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_ADD_LIBDIR version: 9 updated: 2010/05/26 16:44:57
 dnl -------------
 dnl	Adds to the library-path
 dnl
@@ -771,13 +784,21 @@ if test -n "$1" ; then
       fi
       if test "$cf_have_libdir" = no ; then
         CF_VERBOSE(adding $cf_add_libdir to library-path)
-        ifelse($2,,LDFLAGS,$2)="-L$cf_add_libdir $ifelse($2,,LDFLAGS,$2)"
+        ifelse([$2],,LDFLAGS,[$2])="-L$cf_add_libdir $ifelse([$2],,LDFLAGS,[$2])"
       fi
     fi
   done
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_ADD_LIBS version: 1 updated: 2010/06/02 05:03:05
+dnl -----------
+dnl Add one or more libraries, used to enforce consistency.
+dnl
+dnl $1 = libraries to add, with the "-l", etc.
+dnl $2 = variable to update (default $LIBS)
+AC_DEFUN([CF_ADD_LIBS],[ifelse($2,,LIBS,[$2])="$1 [$]ifelse($2,,LIBS,[$2])"])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_ADD_OPTIONAL_PATH version: 1 updated: 2007/07/29 12:33:33
 dnl --------------------
 dnl Add an optional search-path to the compile/link variables.
@@ -827,7 +848,7 @@ $2])
 done
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_ADD_SUBDIR_PATH version: 2 updated: 2007/07/29 10:12:59
+dnl CF_ADD_SUBDIR_PATH version: 3 updated: 2010/07/03 20:58:12
 dnl ------------------
 dnl Append to a search-list for a nonstandard header/lib-file
 dnl	$1 = the variable to return as result
@@ -839,7 +860,7 @@ AC_DEFUN([CF_ADD_SUBDIR_PATH],
 [
 test "$4" != "$5" && \
 test -d "$4" && \
-ifelse([$5],NONE,,[(test $5 = NONE || test -d $5) &&]) {
+ifelse([$5],NONE,,[(test $5 = NONE || test "$4" != "$5") &&]) {
 	test -n "$verbose" && echo "	... testing for $3-directories under $4"
 	test -d $4/$3 &&          $1="[$]$1 $4/$3"
 	test -d $4/$3/$2 &&       $1="[$]$1 $4/$3/$2"
@@ -883,7 +904,7 @@ ifelse($5,,[	:],$5)
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_ARG_OPTION version: 3 updated: 1997/10/18 14:42:41
+dnl CF_ARG_OPTION version: 4 updated: 2010/05/26 05:38:42
 dnl -------------
 dnl Restricted form of AC_ARG_ENABLE that ensures user doesn't give bogus
 dnl values.
@@ -895,18 +916,18 @@ dnl $3 = action to perform if option is not default
 dnl $4 = action if perform if option is default
 dnl $5 = default option value (either 'yes' or 'no')
 AC_DEFUN([CF_ARG_OPTION],
-[AC_ARG_ENABLE($1,[$2],[test "$enableval" != ifelse($5,no,yes,no) && enableval=ifelse($5,no,no,yes)
+[AC_ARG_ENABLE([$1],[$2],[test "$enableval" != ifelse([$5],no,yes,no) && enableval=ifelse([$5],no,no,yes)
   if test "$enableval" != "$5" ; then
-ifelse($3,,[    :]dnl
-,[    $3]) ifelse($4,,,[
+ifelse([$3],,[    :]dnl
+,[    $3]) ifelse([$4],,,[
   else
     $4])
-  fi],[enableval=$5 ifelse($4,,,[
+  fi],[enableval=$5 ifelse([$4],,,[
   $4
 ])dnl
   ])])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_BUNDLED_INTL version: 14 updated: 2010/01/17 20:37:27
+dnl CF_BUNDLED_INTL version: 16 updated: 2010/10/23 15:55:05
 dnl ---------------
 dnl Top-level macro for configuring an application with a bundled copy of
 dnl the intl and po directories for gettext.
@@ -920,12 +941,15 @@ dnl	GT_NO        - "#" comment if building intl library, otherwise empty
 dnl	INTLDIR_MAKE - to make ./intl directory
 dnl	MSG_DIR_MAKE - to make ./po directory
 dnl	SUB_MAKEFILE - list of makefiles in ./intl, ./po directories
-dnl Defines
+dnl
+dnl Defines:
 dnl	HAVE_LIBGETTEXT_H if we're using ./intl
+dnl	NLS_TEXTDOMAIN
 dnl
 dnl Environment:
 dnl	ALL_LINGUAS if set, lists the root names of the ".po" files.
 dnl	CONFIG_H assumed to be "config.h"
+dnl	PACKAGE must be set, used as default for textdomain
 dnl	VERSION may be set, otherwise extract from "VERSION" file.
 dnl
 AC_DEFUN([CF_BUNDLED_INTL],[
@@ -937,9 +961,13 @@ dnl rather than $LC_ALL
 test -z "$ALL_LINGUAS" && ALL_LINGUAS=`test -d $srcdir/po && cd $srcdir/po && echo *.po|sed -e 's/\.po//g' -e 's/*//'`
 
 # Allow override of "config.h" definition:
-: ${CONFIG_H=config.h}
+: ${CONFIG_H:=config.h}
 AC_SUBST(CONFIG_H)
 
+if test -z "$PACKAGE" ; then
+	AC_MSG_ERROR([[CF_BUNDLED_INTL] used without setting [PACKAGE] variable])
+fi
+
 if test -z "$VERSION" ; then
 if test -f $srcdir/VERSION ; then
 	VERSION=`sed -e '2,$d' $srcdir/VERSION|cut -f1`
@@ -951,6 +979,15 @@ AC_SUBST(VERSION)
 
 AM_GNU_GETTEXT(,,,[$2])
 
+if test "$USE_NLS" = yes ; then
+	AC_ARG_WITH(textdomain,
+		[  --with-textdomain=PKG   NLS text-domain (default is package name)],
+		[NLS_TEXTDOMAIN=$withval],
+		[NLS_TEXTDOMAIN=$PACKAGE])
+	AC_DEFINE_UNQUOTED(NLS_TEXTDOMAIN,"$NLS_TEXTDOMAIN")
+	AC_SUBST(NLS_TEXTDOMAIN)
+fi
+
 INTLDIR_MAKE=
 MSG_DIR_MAKE=
 SUB_MAKEFILE=
@@ -1055,21 +1092,21 @@ if test ".$system_name" != ".$cf_cv_system_name" ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_CHTYPE version: 6 updated: 2003/11/06 19:59:57
+dnl CF_CURSES_CHTYPE version: 7 updated: 2010/10/23 15:54:49
 dnl ----------------
 dnl Test if curses defines 'chtype' (usually a 'long' type for SysV curses).
 AC_DEFUN([CF_CURSES_CHTYPE],
 [
 AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl
 AC_CACHE_CHECK(for chtype typedef,cf_cv_chtype_decl,[
-	AC_TRY_COMPILE([#include <${cf_cv_ncurses_header-curses.h}>],
+	AC_TRY_COMPILE([#include <${cf_cv_ncurses_header:-curses.h}>],
 		[chtype foo],
 		[cf_cv_chtype_decl=yes],
 		[cf_cv_chtype_decl=no])])
 if test $cf_cv_chtype_decl = yes ; then
 	AC_DEFINE(HAVE_TYPE_CHTYPE)
 	AC_CACHE_CHECK(if chtype is scalar or struct,cf_cv_chtype_type,[
-		AC_TRY_COMPILE([#include <${cf_cv_ncurses_header-curses.h}>],
+		AC_TRY_COMPILE([#include <${cf_cv_ncurses_header:-curses.h}>],
 			[chtype foo; long x = foo],
 			[cf_cv_chtype_type=scalar],
 			[cf_cv_chtype_type=struct])])
@@ -1116,7 +1153,7 @@ CF_CURSES_HEADER
 CF_TERM_HEADER
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_FUNCS version: 14 updated: 2009/07/16 19:34:55
+dnl CF_CURSES_FUNCS version: 15 updated: 2010/10/23 15:52:32
 dnl ---------------
 dnl Curses-functions are a little complicated, since a lot of them are macros.
 AC_DEFUN([CF_CURSES_FUNCS],
@@ -1136,7 +1173,7 @@ do
 			[
 #ifndef ${cf_func}
 long foo = (long)(&${cf_func});
-${cf_cv_main_return-return}(foo == 0);
+${cf_cv_main_return:-return}(foo == 0);
 #endif
 			],
 			[cf_result=yes],
@@ -1182,7 +1219,7 @@ fi
 AC_CHECK_HEADERS($cf_cv_ncurses_header)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_LIBS version: 29 updated: 2009/01/06 19:34:57
+dnl CF_CURSES_LIBS version: 32 updated: 2011/01/16 17:43:15
 dnl --------------
 dnl Look for the curses libraries.  Older curses implementations may require
 dnl termcap/termlib to be linked as well.  Call CF_CURSES_CPPFLAGS first.
@@ -1190,7 +1227,7 @@ AC_DEFUN([CF_CURSES_LIBS],[
 
 AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl
 AC_MSG_CHECKING(if we have identified curses libraries)
-AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>],
+AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
     [initscr(); tgoto("?", 0,0)],
     cf_result=yes,
     cf_result=no)
@@ -1199,27 +1236,39 @@ AC_MSG_RESULT($cf_result)
 if test "$cf_result" = no ; then
 case $host_os in #(vi
 freebsd*) #(vi
-    AC_CHECK_LIB(mytinfo,tgoto,[LIBS="-lmytinfo $LIBS"])
+    AC_CHECK_LIB(mytinfo,tgoto,[CF_ADD_LIBS(-lmytinfo)])
     ;;
 hpux10.*) #(vi
     AC_CHECK_LIB(cur_colr,initscr,[
-        LIBS="-lcur_colr $LIBS"
+        CF_ADD_LIBS(-lcur_colr)
         ac_cv_func_initscr=yes
         ],[
     AC_CHECK_LIB(Hcurses,initscr,[
         # HP's header uses __HP_CURSES, but user claims _HP_CURSES.
-        LIBS="-lHcurses $LIBS"
+        CF_ADD_LIBS(-lHcurses)
         CPPFLAGS="$CPPFLAGS -D__HP_CURSES -D_HP_CURSES"
         ac_cv_func_initscr=yes
         ])])
     ;;
-linux*) # Suse Linux does not follow /usr/lib convention
-    CF_ADD_LIBDIR(/lib)
+linux*)
+	case `arch` in
+	x86_64)
+		if test -d /lib64
+		then
+			CF_ADD_LIBDIR(/lib64)
+		else
+			CF_ADD_LIBDIR(/lib)
+		fi
+		;;
+	*)
+		CF_ADD_LIBDIR(/lib)
+		;;
+	esac
     ;;
 sunos3*|sunos4*)
     if test -d /usr/5lib ; then
       CF_ADD_LIBDIR(/usr/5lib)
-      LIBS="$LIBS -lcurses -ltermcap"
+      CF_ADD_LIBS(-lcurses -ltermcap)
     fi
     ac_cv_func_initscr=yes
     ;;
@@ -1230,7 +1279,7 @@ if test ".$ac_cv_func_initscr" != .yes ; then
     cf_term_lib=""
     cf_curs_lib=""
 
-    if test ".${cf_cv_ncurses_version-no}" != .no
+    if test ".${cf_cv_ncurses_version:-no}" != .no
     then
         cf_check_list="ncurses curses cursesX"
     else
@@ -1257,7 +1306,7 @@ if test ".$ac_cv_func_initscr" != .yes ; then
     LIBS="-l$cf_curs_lib $cf_save_LIBS"
     if test "$cf_term_lib" = unknown ; then
         AC_MSG_CHECKING(if we can link with $cf_curs_lib library)
-        AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>],
+        AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
             [initscr()],
             [cf_result=yes],
             [cf_result=no])
@@ -1267,12 +1316,12 @@ if test ".$ac_cv_func_initscr" != .yes ; then
         :
     elif test "$cf_term_lib" != predefined ; then
         AC_MSG_CHECKING(if we need both $cf_curs_lib and $cf_term_lib libraries)
-        AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>],
+        AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
             [initscr(); tgoto((char *)0, 0, 0);],
             [cf_result=no],
             [
             LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
-            AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>],
+            AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
                 [initscr()],
                 [cf_result=yes],
                 [cf_result=error])
@@ -1284,7 +1333,7 @@ fi
 
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_TERM_H version: 7 updated: 2010/01/24 18:40:06
+dnl CF_CURSES_TERM_H version: 8 updated: 2010/10/23 15:54:49
 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,
@@ -1299,11 +1348,11 @@ AC_CACHE_CHECK(for term.h, cf_cv_term_header,[
 # If we found <ncurses/curses.h>, look for <ncurses/term.h>, but always look
 # for <term.h> if we do not find the variant.
 for cf_header in \
-	`echo ${cf_cv_ncurses_header-curses.h} | sed -e 's%/.*%/%'`term.h \
+	`echo ${cf_cv_ncurses_header:-curses.h} | sed -e 's%/.*%/%'`term.h \
 	term.h
 do
 	AC_TRY_COMPILE([
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 #include <${cf_header}>],
 	[WINDOW *x],
 	[cf_cv_term_header=$cf_header
@@ -1318,7 +1367,7 @@ no)
 	for cf_header in ncurses/term.h ncursesw/term.h
 	do
 		AC_TRY_COMPILE([
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 #ifdef NCURSES_VERSION
 #include <${cf_header}>
 #else
@@ -1346,6 +1395,63 @@ ncursesw/term.h)
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_CURSES_WACS_MAP version: 5 updated: 2011/01/15 11:28:59
+dnl ------------------
+dnl Check for likely values of wacs_map[].
+AC_DEFUN([CF_CURSES_WACS_MAP],
+[
+AC_CACHE_CHECK(for wide alternate character set array, cf_cv_curses_wacs_map,[
+	cf_cv_curses_wacs_map=unknown
+	for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
+	do
+	AC_TRY_LINK([
+#ifndef _XOPEN_SOURCE_EXTENDED
+#define _XOPEN_SOURCE_EXTENDED
+#endif
+#include <${cf_cv_ncurses_header:-curses.h}>],
+	[void *foo = &($name['k'])],
+	[cf_cv_curses_wacs_map=$name
+	 break])
+	done])
+
+test "$cf_cv_curses_wacs_map" != unknown && AC_DEFINE_UNQUOTED(CURSES_WACS_ARRAY,$cf_cv_curses_wacs_map)
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_CURSES_WACS_SYMBOLS version: 1 updated: 2011/01/15 11:28:59
+dnl ----------------------
+dnl Do a check to see if the WACS_xxx constants are defined compatibly with
+dnl X/Open Curses.  In particular, NetBSD's implementation of the WACS_xxx
+dnl constants is broken since those constants do not point to cchar_t's.
+AC_DEFUN([CF_CURSES_WACS_SYMBOLS],
+[
+AC_REQUIRE([CF_CURSES_WACS_MAP])
+
+AC_CACHE_CHECK(for wide alternate character constants, cf_cv_curses_wacs_symbols,[
+cf_cv_curses_wacs_symbols=no
+if test "$cf_cv_curses_wacs_map" != unknown
+then
+	AC_TRY_LINK([
+#ifndef _XOPEN_SOURCE_EXTENDED
+#define _XOPEN_SOURCE_EXTENDED
+#endif
+#include <${cf_cv_ncurses_header:-curses.h}>],
+	[cchar_t *foo = WACS_PLUS;
+	 $cf_cv_curses_wacs_map['k'] = *WACS_PLUS],
+	[cf_cv_curses_wacs_symbols=yes])
+else
+	AC_TRY_LINK([
+#ifndef _XOPEN_SOURCE_EXTENDED
+#define _XOPEN_SOURCE_EXTENDED
+#endif
+#include <${cf_cv_ncurses_header:-curses.h}>],
+	[cchar_t *foo = WACS_PLUS],
+	[cf_cv_curses_wacs_symbols=yes])
+fi
+])
+
+test "$cf_cv_curses_wacs_symbols" != no && AC_DEFINE(CURSES_WACS_SYMBOLS)
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_DIRNAME version: 4 updated: 2002/12/21 19:25:52
 dnl ----------
 dnl "dirname" is not portable, so we fake it with a shell script.
@@ -1388,6 +1494,30 @@ AC_SUBST(SHOW_CC)
 AC_SUBST(ECHO_CC)
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_DISABLE_LIBTOOL_VERSION version: 1 updated: 2010/05/15 15:45:59
+dnl --------------------------
+dnl Check if we should use the libtool 1.5 feature "-version-number" instead of
+dnl the older "-version-info" feature.  The newer feature allows us to use
+dnl version numbering on shared libraries which make them compatible with
+dnl various systems.
+AC_DEFUN([CF_DISABLE_LIBTOOL_VERSION],
+[
+AC_MSG_CHECKING(if libtool -version-number should be used)
+CF_ARG_DISABLE(libtool-version,
+	[  --disable-libtool-version  enable to use libtool's incompatible naming scheme],
+	[cf_libtool_version=no],
+	[cf_libtool_version=yes])
+AC_MSG_RESULT($cf_libtool_version)
+
+if test "$cf_libtool_version" = yes ; then
+	LIBTOOL_VERSION="-version-number"
+else
+	LIBTOOL_VERSION="-version-info"
+fi
+
+AC_SUBST(LIBTOOL_VERSION)
+])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
@@ -1489,7 +1619,7 @@ fi
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_FIND_LINKAGE version: 16 updated: 2010/04/21 06:20:50
+dnl CF_FIND_LINKAGE version: 19 updated: 2010/05/29 16:31:02
 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.
@@ -1518,18 +1648,23 @@ cf_cv_library_path_$3=
 
 CF_MSG_LOG([Starting [FIND_LINKAGE]($3,$6)])
 
+cf_save_LIBS="$LIBS"
+
 AC_TRY_LINK([$1],[$2],[
 	cf_cv_find_linkage_$3=yes
+	cf_cv_header_path_$3=/usr/include
+	cf_cv_library_path_$3=/usr/lib
 ],[
 
-cf_save_LIBS="$LIBS"
 LIBS="-l$3 $7 $cf_save_LIBS"
 
 AC_TRY_LINK([$1],[$2],[
 	cf_cv_find_linkage_$3=yes
+	cf_cv_header_path_$3=/usr/include
+	cf_cv_library_path_$3=/usr/lib
 	cf_cv_library_file_$3="-l$3"
 ],[
-    cf_cv_find_linkage_$3=no
+	cf_cv_find_linkage_$3=no
 	LIBS="$cf_save_LIBS"
 
     CF_VERBOSE(find linkage for $3 library)
@@ -1591,7 +1726,6 @@ AC_TRY_LINK([$1],[$2],[
                 ])
           fi
         done
-        LIBS="$cf_save_LIBS"
         CPPFLAGS="$cf_save_CPPFLAGS"
         LDFLAGS="$cf_save_LDFLAGS"
       fi
@@ -1602,11 +1736,13 @@ AC_TRY_LINK([$1],[$2],[
     ],$7)
 ])
 
+LIBS="$cf_save_LIBS"
+
 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_LIB($3)
 ],[$4])
 else
 ifelse([$5],,AC_MSG_WARN(Cannot find $3 library),[$5])
@@ -1653,7 +1789,7 @@ if test $cf_cv_type_unionwait = yes; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_GCC_ATTRIBUTES version: 13 updated: 2009/08/11 20:19:56
+dnl CF_GCC_ATTRIBUTES version: 14 updated: 2010/10/23 15:52:32
 dnl -----------------
 dnl Test for availability of useful gcc __attribute__ directives to quiet
 dnl compiler warnings.  Though useful, not all are supported -- and contrary
@@ -1680,7 +1816,7 @@ if test "$GCC" = yes
 then
 	AC_CHECKING([for $CC __attribute__ directives])
 cat > conftest.$ac_ext <<EOF
-#line __oline__ "${as_me-configure}"
+#line __oline__ "${as_me:-configure}"
 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"
@@ -1777,7 +1913,7 @@ if test "$GCC" = yes ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_GCC_WARNINGS version: 25 updated: 2010/04/24 11:03:31
+dnl CF_GCC_WARNINGS version: 27 updated: 2010/10/23 15:52:32
 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:
@@ -1802,7 +1938,7 @@ AC_REQUIRE([CF_GCC_VERSION])
 CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS)
 
 cat > conftest.$ac_ext <<EOF
-#line __oline__ "${as_me-configure}"
+#line __oline__ "${as_me:-configure}"
 int main(int argc, char *argv[[]]) { return (argv[[argc-1]] == 0) ; }
 EOF
 
@@ -1881,7 +2017,7 @@ then
 	done
 	CFLAGS="$cf_save_CFLAGS"
 fi
-rm -f conftest*
+rm -rf conftest*
 
 AC_SUBST(EXTRA_CFLAGS)
 ])dnl
@@ -1927,7 +2063,7 @@ AC_SUBST(PACKAGE_CONFIG)
 EXTRA_OUTPUT="$EXTRA_OUTPUT headers-sh:$srcdir/headers-sh.in"
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_HEADER_PATH version: 11 updated: 2010/04/21 06:20:50
+dnl CF_HEADER_PATH version: 12 updated: 2010/05/05 05:22:40
 dnl --------------
 dnl Construct a search-list of directories for a nonstandard header-file
 dnl
@@ -1946,7 +2082,8 @@ 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_header_path_list="$cf_header_path_list $cf_header_path"
+			CF_ADD_SUBDIR_PATH($1,$2,include,$cf_header_path,NONE)
+			cf_header_path_list="$cf_header_path_list [$]$1"
 			;;
 		esac
 	done
@@ -2043,7 +2180,7 @@ do
 done
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_INTEL_COMPILER version: 3 updated: 2005/08/06 18:37:29
+dnl CF_INTEL_COMPILER version: 4 updated: 2010/05/26 05:38:42
 dnl -----------------
 dnl Check if the given compiler is really the Intel compiler for Linux.  It
 dnl tries to imitate gcc, but does not return an error when it finds a mismatch
@@ -2057,24 +2194,24 @@ dnl $1 = GCC (default) or GXX
 dnl $2 = INTEL_COMPILER (default) or INTEL_CPLUSPLUS
 dnl $3 = CFLAGS (default) or CXXFLAGS
 AC_DEFUN([CF_INTEL_COMPILER],[
-ifelse($2,,INTEL_COMPILER,[$2])=no
+ifelse([$2],,INTEL_COMPILER,[$2])=no
 
-if test "$ifelse($1,,[$1],GCC)" = yes ; then
+if test "$ifelse([$1],,[$1],GCC)" = yes ; then
 	case $host_os in
 	linux*|gnu*)
-		AC_MSG_CHECKING(if this is really Intel ifelse($1,GXX,C++,C) compiler)
-		cf_save_CFLAGS="$ifelse($3,,CFLAGS,[$3])"
-		ifelse($3,,CFLAGS,[$3])="$ifelse($3,,CFLAGS,[$3]) -no-gcc"
+		AC_MSG_CHECKING(if this is really Intel ifelse([$1],GXX,C++,C) compiler)
+		cf_save_CFLAGS="$ifelse([$3],,CFLAGS,[$3])"
+		ifelse([$3],,CFLAGS,[$3])="$ifelse([$3],,CFLAGS,[$3]) -no-gcc"
 		AC_TRY_COMPILE([],[
 #ifdef __INTEL_COMPILER
 #else
 make an error
 #endif
-],[ifelse($2,,INTEL_COMPILER,[$2])=yes
+],[ifelse([$2],,INTEL_COMPILER,[$2])=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
 ],[])
-		ifelse($3,,CFLAGS,[$3])="$cf_save_CFLAGS"
-		AC_MSG_RESULT($ifelse($2,,INTEL_COMPILER,[$2]))
+		ifelse([$3],,CFLAGS,[$3])="$cf_save_CFLAGS"
+		AC_MSG_RESULT($ifelse([$2],,INTEL_COMPILER,[$2]))
 		;;
 	esac
 fi
@@ -2119,7 +2256,7 @@ ifdef([AC_FUNC_FSEEKO],[
 ])
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_LD_RPATH_OPT version: 2 updated: 2010/03/27 19:27:54
+dnl CF_LD_RPATH_OPT version: 3 updated: 2010/06/02 05:03:05
 dnl ---------------
 dnl For the given system and compiler, find the compiler flags to pass to the
 dnl loader to use the "rpath" feature.
@@ -2164,7 +2301,7 @@ 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"
+	CF_ADD_LIBS(${LD_RPATH_OPT}$libdir)
 	AC_TRY_LINK(, , cf_rpath_space=no, cf_rpath_space=yes)
 	LIBS="$cf_save_LIBS"
 	AC_MSG_RESULT($cf_rpath_space)
@@ -2219,7 +2356,7 @@ ifelse($1,,,[$1=$LIB_PREFIX])
 	AC_SUBST(LIB_PREFIX)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_MAKEFLAGS version: 12 updated: 2006/10/21 08:27:03
+dnl CF_MAKEFLAGS version: 13 updated: 2010/10/23 15:52:32
 dnl ------------
 dnl Some 'make' programs support ${MAKEFLAGS}, some ${MFLAGS}, to pass 'make'
 dnl options to lower-levels.  It's very useful for "make -n" -- if we have it.
@@ -2236,10 +2373,10 @@ SHELL = /bin/sh
 all :
 	@ echo '.$cf_option'
 CF_EOF
-		cf_result=`${MAKE-make} -k -f cf_makeflags.tmp 2>/dev/null | sed -e 's,[[ 	]]*$,,'`
+		cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | sed -e 's,[[ 	]]*$,,'`
 		case "$cf_result" in
 		.*k)
-			cf_result=`${MAKE-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null`
+			cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null`
 			case "$cf_result" in
 			.*CC=*)	cf_cv_makeflags=
 				;;
@@ -2259,7 +2396,7 @@ CF_EOF
 AC_SUBST(cf_cv_makeflags)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_MAKE_TAGS version: 5 updated: 2010/04/03 20:07:32
+dnl CF_MAKE_TAGS version: 6 updated: 2010/10/23 15:52:32
 dnl ------------
 dnl Generate tags/TAGS targets for makefiles.  Do not generate TAGS if we have
 dnl a monocase filesystem.
@@ -2269,10 +2406,10 @@ AC_REQUIRE([CF_MIXEDCASE_FILENAMES])
 AC_CHECK_PROGS(CTAGS, exctags ctags)
 AC_CHECK_PROGS(ETAGS, exetags etags)
 
-AC_CHECK_PROG(MAKE_LOWER_TAGS, ${CTAGS-ctags}, yes, no)
+AC_CHECK_PROG(MAKE_LOWER_TAGS, ${CTAGS:-ctags}, yes, no)
 
 if test "$cf_cv_mixedcase" = yes ; then
-	AC_CHECK_PROG(MAKE_UPPER_TAGS, ${ETAGS-etags}, yes, no)
+	AC_CHECK_PROG(MAKE_UPPER_TAGS, ${ETAGS:-etags}, yes, no)
 else
 	MAKE_UPPER_TAGS=no
 fi
@@ -2296,7 +2433,7 @@ AC_SUBST(MAKE_UPPER_TAGS)
 AC_SUBST(MAKE_LOWER_TAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_MATH_LIB version: 6 updated: 2009/12/19 13:46:49
+dnl CF_MATH_LIB version: 8 updated: 2010/05/29 16:31:02
 dnl -----------
 dnl Checks for libraries.  At least one UNIX system, Apple Macintosh
 dnl Rhapsody 5.5, does not have -lm.  We cannot use the simpler
@@ -2309,13 +2446,13 @@ AC_CACHE_CHECK(if -lm needed for math functions,
 	#include <stdio.h>
 	#include <math.h>
 	],
-	[double x = rand(); printf("result = %g\n", ]ifelse($2,,sin(x),$2)[)],
+	[double x = rand(); printf("result = %g\n", ]ifelse([$2],,sin(x),$2)[)],
 	[cf_cv_need_libm=no],
 	[cf_cv_need_libm=yes])])
 if test "$cf_cv_need_libm" = yes
 then
 ifelse($1,,[
-	LIBS="-lm $LIBS"
+	CF_ADD_LIB(m)
 ],[$1=-lm])
 fi
 ])
@@ -2386,12 +2523,12 @@ fi
 test "$cf_cv_mixedcase" = yes && AC_DEFINE(MIXEDCASE_FILENAMES)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_MSG_LOG version: 4 updated: 2007/07/29 09:55:12
+dnl CF_MSG_LOG version: 5 updated: 2010/10/23 15:52:32
 dnl ----------
 dnl Write a debug message to config.log, along with the line number in the
 dnl configure script.
 AC_DEFUN([CF_MSG_LOG],[
-echo "${as_me-configure}:__oline__: testing $* ..." 1>&AC_FD_CC
+echo "${as_me:-configure}:__oline__: testing $* ..." 1>&AC_FD_CC
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_NCURSES_CC_CHECK version: 4 updated: 2007/07/29 10:39:05
@@ -2427,10 +2564,10 @@ printf("old\n");
 	,[$1=no])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_NCURSES_CONFIG version: 6 updated: 2010/04/28 06:02:16
+dnl CF_NCURSES_CONFIG version: 8 updated: 2010/07/08 05:17:30
 dnl -----------------
 dnl Tie together the configure-script macros for ncurses.
-dnl Prefer the "-config" script from ncurses 5.6, to simplify analysis.
+dnl Prefer the "-config" script from ncurses 6.x, to simplify analysis.
 dnl Allow that to be overridden using the $NCURSES_CONFIG environment variable.
 dnl
 dnl $1 is the root library name (default: "ncurses")
@@ -2444,7 +2581,7 @@ AC_PATH_PROGS(NCURSES_CONFIG,${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-
 if test "$NCURSES_CONFIG" != none ; then
 
 CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`"
-LIBS="`$NCURSES_CONFIG --libs` $LIBS"
+CF_ADD_LIBS(`$NCURSES_CONFIG --libs`)
 
 # even with config script, some packages use no-override for curses.h
 CF_CURSES_HEADER(ifelse($1,,ncurses,$1))
@@ -2467,7 +2604,7 @@ CF_NCURSES_LIBS(ifelse($1,,ncurses,$1))
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_NCURSES_CPPFLAGS version: 19 updated: 2007/07/29 13:35:20
+dnl CF_NCURSES_CPPFLAGS version: 20 updated: 2010/11/20 17:02:38
 dnl -------------------
 dnl Look for the SVr4 curses clone 'ncurses' in the standard places, adjusting
 dnl the CPPFLAGS variable so we can include its header.
@@ -2496,7 +2633,7 @@ cf_ncuhdr_root=ifelse($1,,ncurses,$1)
 
 test -n "$cf_cv_curses_dir" && \
 test "$cf_cv_curses_dir" != "no" && { \
-  CF_ADD_INCDIR($cf_cv_curses_dir/include $cf_cv_curses_dir/include/$cf_ncuhdr_root)
+  CF_ADD_INCDIR($cf_cv_curses_dir/include/$cf_ncuhdr_root)
 }
 
 AC_CACHE_CHECK(for $cf_ncuhdr_root header in include-path, cf_cv_ncurses_h,[
@@ -2584,7 +2721,7 @@ esac
 
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_NCURSES_LIBS version: 13 updated: 2007/07/29 10:29:20
+dnl CF_NCURSES_LIBS version: 16 updated: 2010/11/20 17:02:38
 dnl ---------------
 dnl Look for the ncurses library.  This is a little complicated on Linux,
 dnl because it may be linked with the gpm (general purpose mouse) library.
@@ -2620,15 +2757,14 @@ freebsd*)
 	;;
 esac
 
-LIBS="$cf_ncurses_LIBS $LIBS"
+CF_ADD_LIBS($cf_ncurses_LIBS)
 
 if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
 then
-	CF_ADD_LIBDIR($cf_cv_curses_dir/lib)
-	LIBS="-l$cf_nculib_root $LIBS"
+	CF_ADD_LIBS(-l$cf_nculib_root)
 else
 	CF_FIND_LIBRARY($cf_nculib_root,$cf_nculib_root,
-		[#include <${cf_cv_ncurses_header-curses.h}>],
+		[#include <${cf_cv_ncurses_header:-curses.h}>],
 		[initscr()],
 		initscr)
 fi
@@ -2642,7 +2778,7 @@ if test -n "$cf_ncurses_LIBS" ; then
 			LIBS="$q"
 		fi
 	done
-	AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>],
+	AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
 		[initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);],
 		[AC_MSG_RESULT(yes)],
 		[AC_MSG_RESULT(no)
@@ -2653,7 +2789,7 @@ CF_UPPER(cf_nculib_ROOT,HAVE_LIB$cf_nculib_root)
 AC_DEFINE_UNQUOTED($cf_nculib_ROOT)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_NCURSES_VERSION version: 12 updated: 2007/04/28 09:15:55
+dnl CF_NCURSES_VERSION version: 13 updated: 2010/10/23 15:54:49
 dnl ------------------
 dnl Check for the version of ncurses, to aid in reporting bugs, etc.
 dnl Call CF_CURSES_CPPFLAGS first, or CF_NCURSES_CPPFLAGS.  We don't use
@@ -2666,7 +2802,7 @@ AC_CACHE_CHECK(for ncurses version, cf_cv_ncurses_version,[
 	cf_tempfile=out$$
 	rm -f $cf_tempfile
 	AC_TRY_RUN([
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 #include <stdio.h>
 int main()
 {
@@ -2684,14 +2820,14 @@ int main()
 	make an error
 # endif
 #endif
-	${cf_cv_main_return-return}(0);
+	${cf_cv_main_return:-return}(0);
 }],[
 	cf_cv_ncurses_version=`cat $cf_tempfile`],,[
 
 	# This will not work if the preprocessor splits the line after the
 	# Autoconf token.  The 'unproto' program does that.
 	cat > conftest.$ac_ext <<EOF
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 #undef Autoconf
 #ifdef NCURSES_VERSION
 Autoconf NCURSES_VERSION
@@ -2781,7 +2917,7 @@ AC_SUBST(MSG_DIR_MAKE)
 AC_SUBST(SUB_MAKEFILE)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_PATHSEP version: 4 updated: 2009/01/11 20:30:23
+dnl CF_PATHSEP version: 5 updated: 2010/05/26 05:38:42
 dnl ----------
 dnl Provide a value for the $PATH and similar separator
 AC_DEFUN([CF_PATHSEP],
@@ -2790,11 +2926,11 @@ AC_DEFUN([CF_PATHSEP],
 	os2*)	PATH_SEPARATOR=';'  ;;
 	*)	PATH_SEPARATOR=':'  ;;
 	esac
-ifelse($1,,,[$1=$PATH_SEPARATOR])
+ifelse([$1],,,[$1=$PATH_SEPARATOR])
 	AC_SUBST(PATH_SEPARATOR)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_PATH_SYNTAX version: 12 updated: 2008/03/23 14:45:59
+dnl CF_PATH_SYNTAX version: 13 updated: 2010/05/26 05:38:42
 dnl --------------
 dnl Check the argument to see that it looks like a pathname.  Rewrite it if it
 dnl begins with one of the prefix/exec_prefix variables, and then again if the
@@ -2826,12 +2962,12 @@ case ".[$]$1" in #(vi
   $1=`echo [$]$1 | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  ifelse($2,,[AC_MSG_ERROR([expected a pathname, not \"[$]$1\"])],$2)
+  ifelse([$2],,[AC_MSG_ERROR([expected a pathname, not \"[$]$1\"])],$2)
   ;;
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_POSIX_C_SOURCE version: 7 updated: 2010/01/09 11:05:50
+dnl CF_POSIX_C_SOURCE version: 8 updated: 2010/05/26 05:38:42
 dnl -----------------
 dnl Define _POSIX_C_SOURCE to the given level, and _POSIX_SOURCE if needed.
 dnl
@@ -2847,7 +2983,7 @@ dnl Parameters:
 dnl	$1 is the nominal value for _POSIX_C_SOURCE
 AC_DEFUN([CF_POSIX_C_SOURCE],
 [
-cf_POSIX_C_SOURCE=ifelse($1,,199506L,$1)
+cf_POSIX_C_SOURCE=ifelse([$1],,199506L,[$1])
 
 cf_save_CFLAGS="$CFLAGS"
 cf_save_CPPFLAGS="$CPPFLAGS"
@@ -3127,7 +3263,7 @@ if test ".$SYS_NAME" != ".$cf_cv_system_name" ; then
 	AC_MSG_ERROR("Please remove config.cache and try again.")
 fi])
 dnl ---------------------------------------------------------------------------
-dnl CF_TERM_HEADER version: 1 updated: 2005/12/31 13:26:39
+dnl CF_TERM_HEADER version: 2 updated: 2010/10/23 15:54:49
 dnl --------------
 dnl Look for term.h, which is part of X/Open curses.  It defines the interface
 dnl to terminfo database.  Usually it is in the same include-path as curses.h,
@@ -3146,7 +3282,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 AC_TRY_COMPILE([#include <stdio.h>
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 #include <$cf_test>
 ],[int x = auto_left_margin],[
 	cf_cv_term_header="$cf_test"],[
@@ -3229,7 +3365,7 @@ AC_DEFUN([CF_UPPER],
 $1=`echo "$2" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_UTF8_LIB version: 6 updated: 2010/04/21 06:20:50
+dnl CF_UTF8_LIB version: 7 updated: 2010/06/20 09:24:28
 dnl -----------
 dnl Check for multibyte support, and if not found, utf8 compatibility library
 AC_DEFUN([CF_UTF8_LIB],
@@ -3251,7 +3387,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="$cf_cv_library_file_utf8 $LIBS"
+	CF_ADD_LIBS($cf_cv_library_file_utf8)
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
@@ -3263,7 +3399,7 @@ AC_DEFUN([CF_VERBOSE],
 CF_MSG_LOG([$1])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_VERSION_INFO version: 3 updated: 2003/11/22 12:22:45
+dnl CF_VERSION_INFO version: 4 updated: 2011/01/02 19:09:47
 dnl ---------------
 dnl Define several useful symbols derived from the VERSION file.  A separate
 dnl file is preferred to embedding the version numbers in various scripts.
@@ -3285,6 +3421,10 @@ dnl		scripts can easily compare versions.
 dnl
 dnl If libtool is used, the first form is required, since CF_WITH_LIBTOOL
 dnl simply extracts the first field using 'cut -f1'.
+dnl
+dnl Optional parameters:
+dnl $1 = internal name for package
+dnl $2 = external name for package
 AC_DEFUN([CF_VERSION_INFO],
 [
 if test -f $srcdir/VERSION ; then
@@ -3337,10 +3477,11 @@ AC_SUBST(VERSION_PATCH)
 dnl if a package name is given, define its corresponding version info.  We
 dnl need the package name to ensure that the defined symbols are unique.
 ifelse($1,,,[
-	PACKAGE=$1
+	cf_PACKAGE=$1
+	PACKAGE=ifelse($2,,$1,$2)
 	AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
 	AC_SUBST(PACKAGE)
-	CF_UPPER(cf_PACKAGE,$PACKAGE)
+	CF_UPPER(cf_PACKAGE,$cf_PACKAGE)
 	AC_DEFINE_UNQUOTED(${cf_PACKAGE}_VERSION,"${VERSION_MAJOR}.${VERSION_MINOR}")
 	AC_DEFINE_UNQUOTED(${cf_PACKAGE}_PATCHDATE,${VERSION_PATCH})
 ])
@@ -3377,19 +3518,31 @@ fi
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_CURSES_DIR version: 2 updated: 2002/11/10 14:46:59
+dnl CF_WITH_CURSES_DIR version: 3 updated: 2010/11/20 17:02:38
 dnl ------------------
 dnl Wrapper for AC_ARG_WITH to specify directory under which to look for curses
 dnl libraries.
 AC_DEFUN([CF_WITH_CURSES_DIR],[
+
+AC_MSG_CHECKING(for specific curses-directory)
 AC_ARG_WITH(curses-dir,
 	[  --with-curses-dir=DIR   directory in which (n)curses is installed],
-	[CF_PATH_SYNTAX(withval)
-	 cf_cv_curses_dir=$withval],
+	[cf_cv_curses_dir=$withval],
 	[cf_cv_curses_dir=no])
+AC_MSG_RESULT($cf_cv_curses_dir)
+
+if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
+then
+	CF_PATH_SYNTAX(withval)
+	if test -d "$cf_cv_curses_dir"
+	then
+		CF_ADD_INCDIR($cf_cv_curses_dir/include)
+		CF_ADD_LIBDIR($cf_cv_curses_dir/lib)
+	fi
+fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_DBMALLOC version: 6 updated: 2006/12/16 14:24:05
+dnl CF_WITH_DBMALLOC version: 7 updated: 2010/06/21 17:26:47
 dnl ----------------
 dnl Configure-option for dbmalloc.  The optional parameter is used to override
 dnl the updating of $LIBS, e.g., to avoid conflict with subsequent tests.
@@ -3400,11 +3553,11 @@ CF_NO_LEAKS_OPTION(dbmalloc,
 
 if test "$with_dbmalloc" = yes ; then
 	AC_CHECK_HEADER(dbmalloc.h,
-		[AC_CHECK_LIB(dbmalloc,[debug_malloc]ifelse($1,,[],[,$1]))])
+		[AC_CHECK_LIB(dbmalloc,[debug_malloc]ifelse([$1],,[],[,$1]))])
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_DMALLOC version: 6 updated: 2006/12/16 14:24:05
+dnl CF_WITH_DMALLOC version: 7 updated: 2010/06/21 17:26:47
 dnl ---------------
 dnl Configure-option for dmalloc.  The optional parameter is used to override
 dnl the updating of $LIBS, e.g., to avoid conflict with subsequent tests.
@@ -3415,11 +3568,11 @@ CF_NO_LEAKS_OPTION(dmalloc,
 
 if test "$with_dmalloc" = yes ; then
 	AC_CHECK_HEADER(dmalloc.h,
-		[AC_CHECK_LIB(dmalloc,[dmalloc_debug]ifelse($1,,[],[,$1]))])
+		[AC_CHECK_LIB(dmalloc,[dmalloc_debug]ifelse([$1],,[],[,$1]))])
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_LIBTOOL version: 23 updated: 2009/03/28 14:26:27
+dnl CF_WITH_LIBTOOL version: 26 updated: 2010/10/23 15:55:24
 dnl ---------------
 dnl Provide a configure option to incorporate libtool.  Define several useful
 dnl symbols for the makefile rules.
@@ -3448,13 +3601,14 @@ dnl	rm -f $ORIG
 dnl	mv $LOCAL $ORIG
 dnl
 dnl	# sed the LIBTOOL= assignment to omit the current directory?
-dnl	sed -e 's/^LIBTOOL=.*/LIBTOOL=${LIBTOOL-libtool}/' $ACLOCAL/libtool.m4 >>$LOCAL
+dnl	sed -e 's/^LIBTOOL=.*/LIBTOOL=${LIBTOOL:-libtool}/' $ACLOCAL/libtool.m4 >>$LOCAL
 dnl	cat $ORIG >>$LOCAL
 dnl
 dnl	autoconf-257 $*
 dnl
 AC_DEFUN([CF_WITH_LIBTOOL],
 [
+AC_REQUIRE([CF_DISABLE_LIBTOOL_VERSION])
 ifdef([AC_PROG_LIBTOOL],,[
 LIBTOOL=
 ])
@@ -3494,7 +3648,7 @@ ifdef([AC_PROG_LIBTOOL],[
 		AC_MSG_ERROR(Cannot find libtool)
 	fi
 ])dnl
-	LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} -o'
+	LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} ${LIBTOOL_VERSION} `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} -o'
 	LIB_OBJECT='${OBJECTS:.o=.lo}'
 	LIB_SUFFIX=.la
 	LIB_CLEAN='${LIBTOOL} --mode=clean'
@@ -3649,7 +3803,7 @@ fi
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_XOPEN_CURSES version: 9 updated: 2010/04/28 06:02:16
+dnl CF_XOPEN_CURSES version: 11 updated: 2011/01/18 18:15:30
 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.
@@ -3662,9 +3816,9 @@ AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl
 AC_CACHE_CHECK(if we must define _XOPEN_SOURCE_EXTENDED,cf_cv_need_xopen_extension,[
 AC_TRY_LINK([
 #include <stdlib.h>
-#include <${cf_cv_ncurses_header-curses.h}>],[
+#include <${cf_cv_ncurses_header:-curses.h}>],[
 #if defined(NCURSES_VERSION_PATCH)
-if (NCURSES_VERSION_PATCH < 20100501) && (NCURSES_VERSION_PATCH >= 20100403)
+#if (NCURSES_VERSION_PATCH < 20100501) && (NCURSES_VERSION_PATCH >= 20100403)
 	make an error
 #endif
 #endif
@@ -3675,7 +3829,7 @@ if (NCURSES_VERSION_PATCH < 20100501) && (NCURSES_VERSION_PATCH >= 20100403)
 	[AC_TRY_LINK([
 #define _XOPEN_SOURCE_EXTENDED
 #include <stdlib.h>
-#include <${cf_cv_ncurses_header-curses.h}>],[
+#include <${cf_cv_ncurses_header:-curses.h}>],[
 #ifdef NCURSES_VERSION
 	cchar_t check;
 	int check2 = curs_set((int)sizeof(check));
@@ -3688,7 +3842,7 @@ if (NCURSES_VERSION_PATCH < 20100501) && (NCURSES_VERSION_PATCH >= 20100403)
 test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_XOPEN_SOURCE version: 33 updated: 2010/03/28 15:35:52
+dnl CF_XOPEN_SOURCE version: 34 updated: 2010/05/26 05:38:42
 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,
@@ -3699,8 +3853,8 @@ dnl	$1 is the nominal value for _XOPEN_SOURCE
 dnl	$2 is the nominal value for _POSIX_C_SOURCE
 AC_DEFUN([CF_XOPEN_SOURCE],[
 
-cf_XOPEN_SOURCE=ifelse($1,,500,$1)
-cf_POSIX_C_SOURCE=ifelse($2,,199506L,$2)
+cf_XOPEN_SOURCE=ifelse([$1],,500,[$1])
+cf_POSIX_C_SOURCE=ifelse([$2],,199506L,[$2])
 cf_xopen_source=
 
 case $host_os in #(vi
@@ -3790,7 +3944,7 @@ if test -n "$cf_xopen_source" ; then
 fi
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF__CURSES_HEAD version: 1 updated: 2009/07/16 19:32:31
+dnl CF__CURSES_HEAD version: 2 updated: 2010/10/23 15:54:49
 dnl ---------------
 dnl Define a reusable chunk which includes <curses.h> and <term.h> when they
 dnl are both available.
@@ -3799,7 +3953,7 @@ define([CF__CURSES_HEAD],[
 #include <xcurses.h>
 char * XCursesProgramName = "test";
 #else
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 #if defined(NCURSES_VERSION) && defined(HAVE_NCURSESW_TERM_H)
 #include <ncursesw/term.h>
 #elif defined(NCURSES_VERSION) && defined(HAVE_NCURSES_TERM_H)
diff --git a/argv.c b/argv.c
new file mode 100644
index 000000000000..c09029044062
--- /dev/null
+++ b/argv.c
@@ -0,0 +1,128 @@
+/*
+ * $Id: argv.c,v 1.1 2011/03/02 09:56:39 tom Exp $
+ *
+ *  argv - Reusable functions for argv-parsing.
+ *
+ *  Copyright 2011	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
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful, but
+ *  WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this program; if not, write to
+ *	Free Software Foundation, Inc.
+ *	51 Franklin St., Fifth Floor
+ *	Boston, MA 02110, USA.
+ */
+
+#include <dialog.h>
+#include <string.h>
+
+/*
+ * Convert a string to an argv[], returning a char** index (which must be
+ * freed by the caller).  The string is modified (replacing gaps between
+ * tokens with nulls).
+ */
+char **
+dlg_string_to_argv(char *blob)
+{
+    size_t n;
+    int pass;
+    size_t length = strlen(blob);
+    char **result = 0;
+
+    for (pass = 0; pass < 2; ++pass) {
+	bool inparm = FALSE;
+	bool quoted = FALSE;
+	char *param = blob;
+	size_t count = 0;
+
+	for (n = 0; n < length; ++n) {
+	    if (quoted && blob[n] == '"') {
+		quoted = FALSE;
+	    } else if (blob[n] == '"') {
+		quoted = TRUE;
+		if (!inparm) {
+		    if (pass)
+			result[count] = param;
+		    ++count;
+		    inparm = TRUE;
+		}
+	    } else if (blob[n] == '\\') {
+		if (quoted && !isspace(UCH(blob[n + 1]))) {
+		    if (!inparm) {
+			if (pass)
+			    result[count] = param;
+			++count;
+			inparm = TRUE;
+		    }
+		    if (pass) {
+			*param++ = blob[n];
+			*param++ = blob[n + 1];
+		    }
+		}
+		++n;
+	    } else if (!quoted && isspace(UCH(blob[n]))) {
+		inparm = FALSE;
+		if (pass) {
+		    *param++ = '\0';
+		}
+	    } else {
+		if (!inparm) {
+		    if (pass)
+			result[count] = param;
+		    ++count;
+		    inparm = TRUE;
+		}
+		if (pass) {
+		    *param++ = blob[n];
+		}
+	    }
+	}
+
+	if (!pass) {
+	    if (count) {
+		result = dlg_calloc(char *, count + 1);
+		assert_ptr(result, "string_to_argv");
+	    } else {
+		break;		/* no tokens found */
+	    }
+	} else {
+	    *param = '\0';
+	}
+    }
+    return result;
+}
+
+/*
+ * Count the entries in an argv list.
+ */
+int
+dlg_count_argv(char **argv)
+{
+    int result = 0;
+
+    if (argv != 0) {
+	while (argv[result] != 0)
+	    ++result;
+    }
+    return result;
+}
+
+int
+dlg_eat_argv(int *argcp, char ***argvp, int start, int count)
+{
+    int k;
+
+    *argcp -= count;
+    for (k = start; k <= *argcp; k++)
+	(*argvp)[k] = (*argvp)[k + count];
+    (*argvp)[*argcp] = 0;
+    return TRUE;
+}
diff --git a/arrows.c b/arrows.c
index 536e277e8269..65af804b3f9d 100644
--- a/arrows.c
+++ b/arrows.c
@@ -1,9 +1,9 @@
 /*
- *  $Id: arrows.c,v 1.29 2010/02/24 09:17:00 Samuel.Martin.Moro Exp $
+ *  $Id: arrows.c,v 1.33 2011/01/19 00:27:53 tom Exp $
  *
  *  arrows.c -- draw arrows to indicate end-of-range for lists
  *
- * Copyright 2000-2009,2010   Thomas E. Dickey
+ *  Copyright 2000-2010,2011	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
@@ -24,6 +24,13 @@
 #include <dialog.h>
 
 #ifdef USE_WIDE_CURSES
+#if defined(CURSES_WACS_ARRAY) && !defined(CURSES_WACS_SYMBOLS)
+/* workaround for NetBSD 5.1 curses */
+#undef WACS_DARROW
+#undef WACS_UARROW
+#define WACS_DARROW &(CURSES_WACS_ARRAY['.'])
+#define WACS_UARROW &(CURSES_WACS_ARRAY['-'])
+#endif
 #define add_acs(win, code) wadd_wch(win, W ## code)
 #else
 #define add_acs(win, code) waddch(win, dlg_boxchar(code))
@@ -62,7 +69,7 @@ dlg_draw_arrows2(WINDOW *win,
 		 chtype attr,
 		 chtype borderattr)
 {
-    chtype save = getattrs(win);
+    chtype save = dlg_get_attrs(win);
     int cur_x, cur_y;
     int limit_x = getmaxx(win);
     bool draw_top = TRUE;
@@ -127,7 +134,7 @@ dlg_draw_scrollbar(WINDOW *win,
     int len;
     int oldy, oldx, maxy, maxx;
 
-    chtype save = getattrs(win);
+    chtype save = dlg_get_attrs(win);
     int top_arrow = (first_data != 0);
     int bottom_arrow = (next_data < total_data);
 
@@ -154,7 +161,7 @@ dlg_draw_scrollbar(WINDOW *win,
 	    whline(win, dlg_boxchar(ACS_HLINE), 4 - len);
 	}
     }
-#define BARSIZE(num) ((all_high * (num)) + all_high - 1) / total_data
+#define BARSIZE(num) (int) (((all_high * (num)) + all_high - 1) / total_data)
 
     if (dialog_state.use_scrollbar) {
 	int all_high = (bottom - top - 1);
diff --git a/buttons.c b/buttons.c
index 9c489dd79619..d82c4558d7ce 100644
--- a/buttons.c
+++ b/buttons.c
@@ -1,9 +1,9 @@
 /*
- *  $Id: buttons.c,v 1.81 2010/04/28 20:57:29 tom Exp $
+ *  $Id: buttons.c,v 1.84 2011/01/19 00:27:53 tom Exp $
  *
- * buttons.c -- draw buttons, e.g., OK/Cancel
+ *  buttons.c -- draw buttons, e.g., OK/Cancel
  *
- * Copyright 2000-2007,2010 Thomas E. Dickey
+ *  Copyright 2000-2010,2011	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
@@ -252,7 +252,7 @@ dlg_draw_buttons(WINDOW *win,
 		 int vertical,
 		 int limit)
 {
-    chtype save = getattrs(win);
+    chtype save = dlg_get_attrs(win);
     int n;
     int step = 0;
     int length;
@@ -465,16 +465,7 @@ dlg_exit_label(void)
 int
 dlg_exit_buttoncode(int button)
 {
-    int result = DLG_EXIT_ERROR;
-
-    if (dialog_vars.extra_button) {
-	result = dlg_ok_buttoncode(button);
-    } else if (button == 0) {
-	result = DLG_EXIT_OK;
-    } else if (button == 1 && dialog_vars.help_button) {
-	result = DLG_EXIT_HELP;
-    }
-    return result;
+    return dlg_ok_buttoncode(button);
 }
 
 const char **
diff --git a/calendar.c b/calendar.c
index 09eb92c564d1..3958145adc66 100644
--- a/calendar.c
+++ b/calendar.c
@@ -1,9 +1,9 @@
 /*
- * $Id: calendar.c,v 1.59 2010/01/18 09:50:44 tom Exp $
+ * $Id: calendar.c,v 1.60 2011/01/03 23:29:51 tom Exp $
  *
  *  calendar.c -- implements the calendar box
  *
- *  Copyright 2001-2009,2010	Thomas E. Dickey
+ *  Copyright 2001-2010,2011	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
@@ -661,10 +661,10 @@ dialog_calendar(const char *title,
 		src.tm_mday, src.tm_mon + 1, src.tm_year + 1900)
 #ifdef HAVE_STRFTIME
     if (dialog_vars.date_format != 0) {
-       size_t used = strftime(buffer,
-			      sizeof(buffer) - 1,
-			      dialog_vars.date_format,
-			      &current);
+	size_t used = strftime(buffer,
+			       sizeof(buffer) - 1,
+			       dialog_vars.date_format,
+			       &current);
 	if (used == 0 || *buffer == '\0')
 	    DefaultFormat(buffer, current);
     } else
diff --git a/checklist.c b/checklist.c
index 0115288b45c5..cdefe77a64ef 100644
--- a/checklist.c
+++ b/checklist.c
@@ -1,9 +1,9 @@
 /*
- *  $Id: checklist.c,v 1.121 2010/01/17 19:32:17 tom Exp $
+ *  $Id: checklist.c,v 1.124 2011/01/19 00:27:53 tom Exp $
  *
  *  checklist.c -- implements the checklist box
  *
- *  Copyright 2000-2009,2010	Thomas E. Dickey
+ *  Copyright 2000-2010,2011	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
@@ -50,10 +50,10 @@ print_arrows(WINDOW *win,
 	     int list_height)
 {
     dlg_draw_scrollbar(win,
-		       scrollamt,
-		       scrollamt,
-		       scrollamt + choice,
-		       item_no,
+		       (long) (scrollamt),
+		       (long) (scrollamt),
+		       (long) (scrollamt + choice),
+		       (long) (item_no),
 		       box_x + check_x,
 		       box_x + list_width,
 		       box_y,
@@ -73,7 +73,7 @@ print_item(WINDOW *win,
 	   int choice,
 	   int selected)
 {
-    chtype save = getattrs(win);
+    chtype save = dlg_get_attrs(win);
     int i;
     chtype attr = A_NORMAL;
     const int *cols;
@@ -643,7 +643,7 @@ dialog_checklist(const char *title,
 			     : dlg_strempty());
 	listitems[i].state = !dlg_strcmp(ItemStatus(i), "on");
     }
-    dlg_align_columns(&listitems[0].text, sizeof(DIALOG_LISTITEM), item_no);
+    dlg_align_columns(&listitems[0].text, (int) sizeof(DIALOG_LISTITEM), item_no);
 
     result = dlg_checklist(title,
 			   cprompt,
@@ -706,7 +706,7 @@ dialog_checklist(const char *title,
 	}
     }
 
-    dlg_free_columns(&listitems[0].text, sizeof(DIALOG_LISTITEM), item_no);
+    dlg_free_columns(&listitems[0].text, (int) sizeof(DIALOG_LISTITEM), item_no);
     free(listitems);
     return result;
 }
diff --git a/columns.c b/columns.c
index 4abfe8d66d44..2ca5be4a97c2 100644
--- a/columns.c
+++ b/columns.c
@@ -1,9 +1,9 @@
 /*
- *  $Id: columns.c,v 1.5 2010/01/18 10:26:36 tom Exp $
+ *  $Id: columns.c,v 1.7 2011/01/16 21:51:44 tom Exp $
  *
  *  columns.c -- implements column-alignment
  *
- *  Copyright 2008,2010	Thomas E. Dickey
+ *  Copyright 2008-2010,2011	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
@@ -79,7 +79,7 @@ split_row(char *source, unsigned *offsets, unsigned *widths)
 	++result;
     } while ((next = next_col(source, offset)) != 0);
 
-    offset = strlen(source);
+    offset = (unsigned) strlen(source);
     widths[result - 1] = offset - offsets[result - 1];
 
     return result;
@@ -98,7 +98,7 @@ dlg_align_columns(char **target, int per_row, int num_rows)
     if (column_separator()) {
 	char **value;
 	unsigned numcols = 1;
-	unsigned maxcols = 0;
+	size_t maxcols = 0;
 	unsigned *widths;
 	unsigned *offsets;
 	unsigned *maxwidth;
@@ -107,7 +107,7 @@ dlg_align_columns(char **target, int per_row, int num_rows)
 
 	/* first allocate arrays for workspace */
 	for (each(row, value)) {
-	    unsigned len = strlen(*value);
+	    size_t len = strlen(*value);
 	    if (maxcols < len)
 		maxcols = len;
 	}
@@ -143,9 +143,9 @@ dlg_align_columns(char **target, int per_row, int num_rows)
 
 	    assert_ptr(text, "dlg_align_columns");
 
-	    memset(text, ' ', realwidth);
+	    memset(text, ' ', (size_t) realwidth);
 	    for (n = 0; n < cols; ++n) {
-		memcpy(text + offset, *value + offsets[n], widths[n]);
+		memcpy(text + offset, *value + offsets[n], (size_t) widths[n]);
 		offset += maxwidth[n] + 1;
 	    }
 	    *value = text;
diff --git a/config.guess b/config.guess
index c2246a4f7f4c..bec935b96fca 100755
--- a/config.guess
+++ b/config.guess
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 #   Free Software Foundation, Inc.
 
-timestamp='2009-12-30'
+timestamp='2010-09-24'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -92,7 +92,7 @@ if test $# != 0; then
   exit 1
 fi
 
-trap 'exit 1' 1 2 15
+trap 'exit 1' HUP INT TERM
 
 # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
 # compiler to aid in system detection is discouraged as it requires
@@ -106,7 +106,7 @@ trap 'exit 1' 1 2 15
 
 set_cc_for_build='
 trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" HUP INT PIPE TERM ;
 : ${TMPDIR=/tmp} ;
  { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
@@ -181,7 +181,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		fi
 		;;
 	    *)
-	        os=netbsd
+		os=netbsd
 		;;
 	esac
 	# The OS release
@@ -220,11 +220,11 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	exit ;;
     alpha:OSF1:*:*)
 	case $UNAME_RELEASE in
-	*4.0)
+	    *4.0)
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 		;;
-	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+	    *5.*)
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 		;;
 	esac
 	# According to Compaq, /usr/sbin/psrinfo has been available on
@@ -296,7 +296,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	echo s390-ibm-zvmoe
 	exit ;;
     *:OS400:*:*)
-        echo powerpc-ibm-os400
+	echo powerpc-ibm-os400
 	exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
@@ -326,8 +326,8 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	    sparc) echo sparc-icl-nx7; exit ;;
 	esac ;;
     s390x:SunOS:*:*)
-	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
+    	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+    	exit ;;
     sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
@@ -395,23 +395,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     # MiNT.  But MiNT is downward compatible to TOS, so this should
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
+	exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-milan-mint${UNAME_RELEASE}
+	exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-hades-mint${UNAME_RELEASE}
+	exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-unknown-mint${UNAME_RELEASE}
+	exit ;;
     m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
 	exit ;;
@@ -481,8 +481,8 @@ EOF
 	echo m88k-motorola-sysv3
 	exit ;;
     AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
 	then
 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -552,7 +552,7 @@ EOF
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:[456])
+    *:AIX:*:[4567])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@@ -595,8 +595,8 @@ EOF
 	    9000/[678][0-9][0-9])
 		if [ -x /usr/bin/getconf ]; then
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+		    case "${sc_cpu_version}" in
                       523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
                       528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
                       532)                      # CPU_PA_RISC2_0
@@ -731,22 +731,22 @@ EOF
 	exit ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-        exit ;;
+	exit ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-        exit ;;
+	exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-        exit ;;
+	exit ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-        exit ;;
+	exit ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-        exit ;;
+	exit ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit ;;
@@ -770,14 +770,14 @@ EOF
 	exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit ;;
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
     5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -805,14 +805,14 @@ EOF
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
     i*:windows32*:*)
-    	# uname -m includes "-pc" on this system.
-    	echo ${UNAME_MACHINE}-mingw32
+	# uname -m includes "-pc" on this system.
+	echo ${UNAME_MACHINE}-mingw32
 	exit ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
     *:Interix*:*)
-    	case ${UNAME_MACHINE} in
+	case ${UNAME_MACHINE} in
 	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
@@ -820,8 +820,8 @@ EOF
 		echo x86_64-unknown-interix${UNAME_RELEASE}
 		exit ;;
 	    IA64)
-		echo ia64-unknown-interix${UNAME_RELEASE}
-		exit ;;
+	    	echo ia64-unknown-interix${UNAME_RELEASE}
+	    	exit ;;
 	esac ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
@@ -860,22 +860,22 @@ EOF
 	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
+	    EV5)   UNAME_MACHINE=alphaev5 ;;
+	    EV56)  UNAME_MACHINE=alphaev56 ;;
+	    PCA56) UNAME_MACHINE=alphapca56 ;;
+	    PCA57) UNAME_MACHINE=alphapca56 ;;
+	    EV6)   UNAME_MACHINE=alphaev6 ;;
+	    EV67)  UNAME_MACHINE=alphaev67 ;;
+	    EV68*) UNAME_MACHINE=alphaev68 ;;
+	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
 	exit ;;
     arm*:Linux:*:*)
 	eval $set_cc_for_build
-	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-	    | grep -q __ARM_EABI__
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null | \
+	    grep -q __ARM_EABI__
 	then
 	    echo ${UNAME_MACHINE}-unknown-linux-gnu
 	else
@@ -892,12 +892,12 @@ EOF
 	echo crisv32-axis-linux-gnu
 	exit ;;
     frv:Linux:*:*)
-    	echo frv-unknown-linux-gnu
+	echo frv-unknown-linux-gnu
 	exit ;;
     i*86:Linux:*:*)
 	LIBC=gnu
 	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
+	sed 's/^        //' << EOF >$dummy.c
 	#ifdef __dietlibc__
 	LIBC=dietlibc
 	#endif
@@ -934,14 +934,14 @@ EOF
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     or32:Linux:*:*)
-	echo or32-unknown-linux-gnu
-	exit ;;
+    	echo or32-unknown-linux-gnu
+    	exit ;;
     padre:Linux:*:*)
 	echo sparc-unknown-linux-gnu
 	exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
-	exit ;;
+    	echo hppa64-unknown-linux-gnu
+    	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -960,7 +960,7 @@ EOF
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit ;;
     sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -968,6 +968,9 @@ EOF
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
+    tile*:Linux:*:*)
+	echo ${UNAME_MACHINE}-tilera-linux-gnu
+	exit ;;
     vax:Linux:*:*)
 	echo ${UNAME_MACHINE}-dec-linux-gnu
 	exit ;;
@@ -975,7 +978,7 @@ EOF
 	echo x86_64-unknown-linux-gnu
 	exit ;;
     xtensa*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -984,11 +987,11 @@ EOF
 	echo i386-sequent-sysv4
 	exit ;;
     i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
+	# Unixware is an offshoot of SVR4, but it has its own version
+	# number series starting with 2...
+	# I am not positive that other SVR4 systems won't match this,
 	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
+	# Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit ;;
     i*86:OS/2:*:*)
@@ -1020,7 +1023,7 @@ EOF
 	fi
 	exit ;;
     i*86:*:5:[678]*)
-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
@@ -1048,13 +1051,13 @@ EOF
 	exit ;;
     pc:*:*:*)
 	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i586.
+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
+	# the processor, so we play safe by assuming i586.
 	# Note: whatever this is, it MUST be the same as what config.sub
 	# prints for the "djgpp" host, or else GDB configury will decide that
 	# this is a cross-build.
 	echo i586-pc-msdosdjgpp
-        exit ;;
+	exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
 	exit ;;
@@ -1089,8 +1092,8 @@ EOF
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
 	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4; exit; } ;;
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	   && { echo i486-ncr-sysv4; exit; } ;;
     NCR*:*:4.2:* | MPRAS*:*:4.2:*)
 	OS_REL='.3'
 	test -r /etc/.relid \
@@ -1134,9 +1137,9 @@ EOF
 	fi
 	exit ;;
     PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit ;;
+	              # says <Richard.M.Bartel@ccMail.Census.GOV>
+	echo i586-unisys-sysv4
+	exit ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes@openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
@@ -1166,7 +1169,7 @@ EOF
 	else
 	        echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-        exit ;;
+	exit ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
 	exit ;;
@@ -1209,12 +1212,12 @@ EOF
 	    i386)
 		eval $set_cc_for_build
 		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		      grep IS_64BIT_ARCH >/dev/null
-		  then
-		      UNAME_PROCESSOR="x86_64"
-		  fi
+		    if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+			(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+			grep IS_64BIT_ARCH >/dev/null
+		    then
+			UNAME_PROCESSOR="x86_64"
+		    fi
 		fi ;;
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
@@ -1223,14 +1226,17 @@ EOF
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
 	UNAME_PROCESSOR=`uname -p`
 	if test "$UNAME_PROCESSOR" = "x86"; then
-		UNAME_PROCESSOR=i386
-		UNAME_MACHINE=pc
+	    UNAME_PROCESSOR=i386
+	    UNAME_MACHINE=pc
 	fi
 	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
 	exit ;;
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit ;;
+    NEO-?:NONSTOP_KERNEL:*:*)
+	echo neo-tandem-nsk${UNAME_RELEASE}
+	exit ;;
     NSE-?:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
 	exit ;;
@@ -1276,13 +1282,13 @@ EOF
 	echo pdp10-unknown-its
 	exit ;;
     SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
+	echo mips-sei-seiux${UNAME_RELEASE}
 	exit ;;
     *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit ;;
     *:*VMS:*:*)
-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 	case "${UNAME_MACHINE}" in
 	    A*) echo alpha-dec-vms ; exit ;;
 	    I*) echo ia64-dec-vms ; exit ;;
diff --git a/config.sub b/config.sub
index 85186096a9e1..de11910f0b15 100755
--- a/config.sub
+++ b/config.sub
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 #   Free Software Foundation, Inc.
 
-timestamp='2009-12-31'
+timestamp='2010-09-11'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -124,8 +124,9 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | \
   kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
@@ -157,8 +158,8 @@ case $os in
 		os=
 		basic_machine=$1
 		;;
-        -bluegene*)
-	        os=-cnk
+	-bluegene*)
+		os=-cnk
 		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
@@ -282,6 +283,7 @@ case $basic_machine in
 	| moxie \
 	| mt \
 	| msp430 \
+	| nds32 | nds32le | nds32be\
 	| nios | nios2 \
 	| ns16k | ns32k \
 	| or32 \
@@ -295,7 +297,7 @@ case $basic_machine in
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
 	| spu | strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
+	| tahoe | thumb | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 	| ubicom32 \
 	| v850 | v850e \
 	| we32k \
@@ -303,6 +305,15 @@ case $basic_machine in
 	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
+	c54x)
+		basic_machine=tic54x-unknown
+		;;
+	c55x)
+		basic_machine=tic55x-unknown
+		;;
+	c6x)
+		basic_machine=tic6x-unknown
+		;;
 	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
@@ -318,8 +329,8 @@ case $basic_machine in
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
 	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
+		basic_machine=$basic_machine-pc
+		;;
 	# Object if more than one company name word.
 	*-*-*)
 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
@@ -334,7 +345,7 @@ case $basic_machine in
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
 	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
@@ -368,6 +379,7 @@ case $basic_machine in
 	| mmix-* \
 	| mt-* \
 	| msp430-* \
+	| nds32-* | nds32le-* | nds32be-* \
 	| nios-* | nios2-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
@@ -381,7 +393,8 @@ case $basic_machine in
 	| sparclite-* \
 	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tile-* | tilegx-* \
 	| tron-* \
 	| ubicom32-* \
 	| v850-* | v850e-* | vax-* \
@@ -411,7 +424,7 @@ case $basic_machine in
 		basic_machine=a29k-amd
 		os=-udi
 		;;
-    	abacus)
+	abacus)
 		basic_machine=abacus-unknown
 		;;
 	adobe68k)
@@ -481,11 +494,20 @@ case $basic_machine in
 		basic_machine=powerpc-ibm
 		os=-cnk
 		;;
+	c54x-*)
+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c55x-*)
+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c6x-*)
+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
 		;;
-        cegcc)
+	cegcc)
 		basic_machine=arm-unknown
 		os=-cegcc
 		;;
@@ -733,7 +755,7 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
-        microblaze)
+	microblaze)
 		basic_machine=microblaze-xilinx
 		;;
 	mingw32)
@@ -840,6 +862,12 @@ case $basic_machine in
 	np1)
 		basic_machine=np1-gould
 		;;
+	neo-tandem)
+		basic_machine=neo-tandem
+		;;
+	nse-tandem)
+		basic_machine=nse-tandem
+		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
@@ -1074,17 +1102,10 @@ case $basic_machine in
 		basic_machine=t90-cray
 		os=-unicos
 		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
+	# This must be matched before tile*.
+	tilegx*)
+		basic_machine=tilegx-unknown
+		os=-linux-gnu
 		;;
 	tile*)
 		basic_machine=tile-unknown
@@ -1254,11 +1275,11 @@ esac
 if [ x"$os" != x"" ]
 then
 case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
+	# First match some system type aliases
+	# that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
-        -auroraux)
-	        os=-auroraux
+	-auroraux)
+		os=-auroraux
 		;;
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
@@ -1295,7 +1316,8 @@ case $os in
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* | -cegcc* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+	      | -mingw32* | -linux-gnu* | -linux-android* \
+	      | -linux-newlib* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1342,7 +1364,7 @@ case $os in
 	-opened*)
 		os=-openedition
 		;;
-        -os400*)
+	-os400*)
 		os=-os400
 		;;
 	-wince*)
@@ -1391,7 +1413,7 @@ case $os in
 	-sinix*)
 		os=-sysv4
 		;;
-        -tpf*)
+	-tpf*)
 		os=-tpf
 		;;
 	-triton*)
@@ -1436,8 +1458,8 @@ case $os in
 	-dicos*)
 		os=-dicos
 		;;
-        -nacl*)
-	        ;;
+	-nacl*)
+		;;
 	-none)
 		;;
 	*)
@@ -1460,10 +1482,10 @@ else
 # system, and we'll never get to this point.
 
 case $basic_machine in
-        score-*)
+	score-*)
 		os=-elf
 		;;
-        spu-*)
+	spu-*)
 		os=-elf
 		;;
 	*-acorn)
@@ -1475,8 +1497,17 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
-        c4x-* | tic4x-*)
-        	os=-coff
+	c4x-* | tic4x-*)
+		os=-coff
+		;;
+	tic54x-*)
+		os=-coff
+		;;
+	tic55x-*)
+		os=-coff
+		;;
+	tic6x-*)
+		os=-coff
 		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
@@ -1503,7 +1534,7 @@ case $basic_machine in
 	m68*-cisco)
 		os=-aout
 		;;
-        mep-*)
+	mep-*)
 		os=-elf
 		;;
 	mips*-cisco)
@@ -1530,7 +1561,7 @@ case $basic_machine in
 	*-ibm)
 		os=-aix
 		;;
-    	*-knuth)
+	*-knuth)
 		os=-mmixware
 		;;
 	*-wec)
diff --git a/configure b/configure
index 8ceb1d5bc1f3..2d90644e2a8e 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by Autoconf 2.52.20100320.
+# Generated by Autoconf 2.52.20101002.
 #
 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -680,10 +680,13 @@ Optional Packages:
   --disable-echo          display "compiling" commands
   --disable-largefile     omit support for large files
   --with-warnings         test: turn on gcc warnings
+  --with-package=XXX      rename dialog to XXX, library to libXXX.a, etc
+  --enable-header-subdir  install dlg_XXX headers to subdirectory
   --with-libiconv-prefix=DIR
                           search for libiconv in DIR/include and DIR/lib
   --enable-nls            use Native Language Support
   --with-included-gettext use the GNU gettext library included here
+  --with-textdomain=PKG   NLS text-domain (default is package name)
   --disable-included-msgs use included messages, for i18n support
   --with-dmalloc          test: use Gray Watson's dmalloc library
   --with-dbmalloc         test: use Conor Cahill's dbmalloc library
@@ -691,11 +694,12 @@ Optional Packages:
   --with-valgrind         test: use valgrind
   --with-no-leaks         test: free permanent memory, analyze leaks
   --disable-trace         do not support --trace option
+  --disable-libtool-version  enable to use libtool's incompatible naming scheme
   --with-libtool          generate libraries with libtool
   --with-libtool-opts=XXX specify additional libtool options
+  --with-curses-dir=DIR   directory in which (n)curses is installed
   --with-ncurses          compile/link with ncurses library
   --with-ncursesw         compile/link with wide-char ncurses library
-  --with-curses-dir=DIR   directory in which (n)curses is installed
   --disable-extras        do not include extra dialogs
   --disable-rc-file       do not include config-file support
   --disable-Xdialog       do not include Xdialog-style dialogs
@@ -775,7 +779,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.20100320.  Invocation command line was
+generated by GNU Autoconf 2.52.20101002.  Invocation command line was
 
   $ $0 $@
 
@@ -899,7 +903,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:902: loading site script $ac_site_file" >&5
+    { echo "$as_me:906: 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"
@@ -910,7 +914,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:913: loading cache $cache_file" >&5
+    { echo "$as_me:917: loading cache $cache_file" >&5
 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . $cache_file;;
@@ -918,7 +922,7 @@ echo "$as_me: loading cache $cache_file" >&6;}
     esac
   fi
 else
-  { echo "$as_me:921: creating cache $cache_file" >&5
+  { echo "$as_me:925: creating cache $cache_file" >&5
 echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -934,21 +938,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:937: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { echo "$as_me:941: 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:941: error: \`$ac_var' was not set in the previous run" >&5
+      { echo "$as_me:945: 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:947: error: \`$ac_var' has changed since the previous run:" >&5
+        { echo "$as_me:951: 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:949:   former value:  $ac_old_val" >&5
+        { echo "$as_me:953:   former value:  $ac_old_val" >&5
 echo "$as_me:   former value:  $ac_old_val" >&2;}
-        { echo "$as_me:951:   current value: $ac_new_val" >&5
+        { echo "$as_me:955:   current value: $ac_new_val" >&5
 echo "$as_me:   current value: $ac_new_val" >&2;}
         ac_cache_corrupted=:
       fi;;
@@ -967,9 +971,9 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
   fi
 done
 if $ac_cache_corrupted; then
-  { echo "$as_me:970: error: changes in the environment can compromise the build" >&5
+  { echo "$as_me:974: 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:972: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+  { { echo "$as_me:976: 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
@@ -990,10 +994,10 @@ esac
 echo "#! $SHELL" >conftest.sh
 echo  "exit 0"   >>conftest.sh
 chmod +x conftest.sh
-if { (echo "$as_me:993: PATH=\".;.\"; conftest.sh") >&5
+if { (echo "$as_me:997: PATH=\".;.\"; conftest.sh") >&5
   (PATH=".;."; conftest.sh) 2>&5
   ac_status=$?
-  echo "$as_me:996: \$? = $ac_status" >&5
+  echo "$as_me:1000: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   ac_path_separator=';'
 else
@@ -1004,88 +1008,6 @@ rm -f conftest.sh
 
 ac_config_headers="$ac_config_headers dlg_config.h:config.hin"
 
-if test -f $srcdir/VERSION ; then
-	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...
-	cf_field1=`sed -e '2,$d' $srcdir/VERSION|cut -f1`
-	cf_field2=`sed -e '2,$d' $srcdir/VERSION|cut -f2`
-	cf_field3=`sed -e '2,$d' $srcdir/VERSION|cut -f3`
-
-	# this is how CF_BUNDLED_INTL uses $VERSION:
-	VERSION="$cf_field1"
-
-	VERSION_MAJOR=`echo "$cf_field2" | sed -e 's/\..*//'`
-	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:1025: error: missing minor-version" >&5
-echo "$as_me: error: missing minor-version" >&2;}
-   { (exit 1); exit 1; }; }
-
-	echo "$as_me:1029: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5
-echo "${ECHO_T}${VERSION_MAJOR}.${VERSION_MINOR}" >&6
-
-	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: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: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:1049: result: $VERSION_PATCH" >&5
-echo "${ECHO_T}$VERSION_PATCH" >&6
-else
-	{ { 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
-
-# show the actual data that we have for versions:
-test -n "$verbose" && echo "	VERSION $VERSION" 1>&6
-
-echo "${as_me-configure}:1060: testing VERSION $VERSION ..." 1>&5
-
-test -n "$verbose" && echo "	VERSION_MAJOR $VERSION_MAJOR" 1>&6
-
-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}:1068: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5
-
-test -n "$verbose" && echo "	VERSION_PATCH $VERSION_PATCH" 1>&6
-
-echo "${as_me-configure}:1072: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5
-
-	PACKAGE=dialog
-	cat >>confdefs.h <<EOF
-#define PACKAGE "$PACKAGE"
-EOF
-
-cf_PACKAGE=`echo "$PACKAGE" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
-
-	cat >>confdefs.h <<EOF
-#define ${cf_PACKAGE}_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}"
-EOF
-
-	cat >>confdefs.h <<EOF
-#define ${cf_PACKAGE}_PATCHDATE ${VERSION_PATCH}
-EOF
-
 test "$program_prefix" != NONE &&
   program_transform_name="s,^,$program_prefix,;$program_transform_name"
 # Use a double $ so make ignores it.
@@ -1110,7 +1032,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:1113: checking for $ac_word" >&5
+echo "$as_me:1035: 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
@@ -1125,7 +1047,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:1128: found $ac_dir/$ac_word" >&5
+echo "$as_me:1050: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1133,10 +1055,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1136: result: $CC" >&5
+  echo "$as_me:1058: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1139: result: no" >&5
+  echo "$as_me:1061: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1145,7 +1067,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:1148: checking for $ac_word" >&5
+echo "$as_me:1070: 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
@@ -1160,7 +1082,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:1163: found $ac_dir/$ac_word" >&5
+echo "$as_me:1085: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1168,10 +1090,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1171: result: $ac_ct_CC" >&5
+  echo "$as_me:1093: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1174: result: no" >&5
+  echo "$as_me:1096: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1184,7 +1106,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:1187: checking for $ac_word" >&5
+echo "$as_me:1109: 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
@@ -1199,7 +1121,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:1202: found $ac_dir/$ac_word" >&5
+echo "$as_me:1124: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1207,10 +1129,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1210: result: $CC" >&5
+  echo "$as_me:1132: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1213: result: no" >&5
+  echo "$as_me:1135: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1219,7 +1141,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:1222: checking for $ac_word" >&5
+echo "$as_me:1144: 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
@@ -1234,7 +1156,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:1237: found $ac_dir/$ac_word" >&5
+echo "$as_me:1159: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1242,10 +1164,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1245: result: $ac_ct_CC" >&5
+  echo "$as_me:1167: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1248: result: no" >&5
+  echo "$as_me:1170: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1258,7 +1180,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:1261: checking for $ac_word" >&5
+echo "$as_me:1183: 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
@@ -1278,7 +1200,7 @@ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
   continue
 fi
 ac_cv_prog_CC="cc"
-echo "$as_me:1281: found $ac_dir/$ac_word" >&5
+echo "$as_me:1203: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1300,10 +1222,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1303: result: $CC" >&5
+  echo "$as_me:1225: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1306: result: no" >&5
+  echo "$as_me:1228: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1314,7 +1236,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:1317: checking for $ac_word" >&5
+echo "$as_me:1239: 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
@@ -1329,7 +1251,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:1332: found $ac_dir/$ac_word" >&5
+echo "$as_me:1254: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1337,10 +1259,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1340: result: $CC" >&5
+  echo "$as_me:1262: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1343: result: no" >&5
+  echo "$as_me:1265: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1353,7 +1275,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:1356: checking for $ac_word" >&5
+echo "$as_me:1278: 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
@@ -1368,7 +1290,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:1371: found $ac_dir/$ac_word" >&5
+echo "$as_me:1293: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1376,10 +1298,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1379: result: $ac_ct_CC" >&5
+  echo "$as_me:1301: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1382: result: no" >&5
+  echo "$as_me:1304: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1391,32 +1313,32 @@ fi
 
 fi
 
-test -z "$CC" && { { echo "$as_me:1394: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:1316: 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:1399:" \
+echo "$as_me:1321:" \
      "checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:1402: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1324: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1405: \$? = $ac_status" >&5
+  echo "$as_me:1327: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:1407: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1329: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1410: \$? = $ac_status" >&5
+  echo "$as_me:1332: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:1412: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1334: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1415: \$? = $ac_status" >&5
+  echo "$as_me:1337: \$? = $ac_status" >&5
   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 1419 "configure"
+#line 1341 "configure"
 #include "confdefs.h"
 
 int
@@ -1432,13 +1354,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:1435: checking for C compiler default output" >&5
+echo "$as_me:1357: 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:1438: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:1360: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5
   ac_status=$?
-  echo "$as_me:1441: \$? = $ac_status" >&5
+  echo "$as_me:1363: \$? = $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
@@ -1461,34 +1383,34 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:1464: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:1386: 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:1470: result: $ac_file" >&5
+echo "$as_me:1392: 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:1475: checking whether the C compiler works" >&5
+echo "$as_me:1397: 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:1481: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1403: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1484: \$? = $ac_status" >&5
+  echo "$as_me:1406: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:1491: error: cannot run C compiled programs.
+	{ { echo "$as_me:1413: 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;}
@@ -1496,24 +1418,24 @@ If you meant to cross compile, use \`--host'." >&2;}
     fi
   fi
 fi
-echo "$as_me:1499: result: yes" >&5
+echo "$as_me:1421: 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:1506: checking whether we are cross compiling" >&5
+echo "$as_me:1428: checking whether we are cross compiling" >&5
 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:1508: result: $cross_compiling" >&5
+echo "$as_me:1430: result: $cross_compiling" >&5
 echo "${ECHO_T}$cross_compiling" >&6
 
-echo "$as_me:1511: checking for executable suffix" >&5
+echo "$as_me:1433: checking for executable suffix" >&5
 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:1513: \"$ac_link\"") >&5
+if { (eval echo "$as_me:1435: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:1516: \$? = $ac_status" >&5
+  echo "$as_me:1438: \$? = $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
@@ -1529,25 +1451,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
   esac
 done
 else
-  { { echo "$as_me:1532: error: cannot compute EXEEXT: cannot compile and link" >&5
+  { { echo "$as_me:1454: 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:1538: result: $ac_cv_exeext" >&5
+echo "$as_me:1460: 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:1544: checking for object suffix" >&5
+echo "$as_me:1466: 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 1550 "configure"
+#line 1472 "configure"
 #include "confdefs.h"
 
 int
@@ -1559,10 +1481,10 @@ main ()
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:1562: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1484: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1565: \$? = $ac_status" >&5
+  echo "$as_me:1487: \$? = $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
@@ -1574,24 +1496,24 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:1577: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:1499: 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:1584: result: $ac_cv_objext" >&5
+echo "$as_me:1506: result: $ac_cv_objext" >&5
 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:1588: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:1510: 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 1594 "configure"
+#line 1516 "configure"
 #include "confdefs.h"
 
 int
@@ -1606,16 +1528,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1609: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1531: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1612: \$? = $ac_status" >&5
+  echo "$as_me:1534: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1615: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1537: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1618: \$? = $ac_status" >&5
+  echo "$as_me:1540: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_compiler_gnu=yes
 else
@@ -1627,19 +1549,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:1630: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:1552: 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:1636: checking whether $CC accepts -g" >&5
+echo "$as_me:1558: 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 1642 "configure"
+#line 1564 "configure"
 #include "confdefs.h"
 
 int
@@ -1651,16 +1573,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1654: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1576: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1657: \$? = $ac_status" >&5
+  echo "$as_me:1579: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1660: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1582: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1663: \$? = $ac_status" >&5
+  echo "$as_me:1585: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_cc_g=yes
 else
@@ -1670,7 +1592,7 @@ ac_cv_prog_cc_g=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:1673: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:1595: 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
@@ -1697,16 +1619,16 @@ cat >conftest.$ac_ext <<_ACEOF
 #endif
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1700: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1622: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1703: \$? = $ac_status" >&5
+  echo "$as_me:1625: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1706: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1628: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1709: \$? = $ac_status" >&5
+  echo "$as_me:1631: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   for ac_declaration in \
    ''\
@@ -1718,7 +1640,7 @@ if { (eval echo "$as_me:1700: \"$ac_compile\"") >&5
    'void exit (int);'
 do
   cat >conftest.$ac_ext <<_ACEOF
-#line 1721 "configure"
+#line 1643 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -1731,16 +1653,16 @@ exit (42);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1734: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1656: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1737: \$? = $ac_status" >&5
+  echo "$as_me:1659: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1740: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1662: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1743: \$? = $ac_status" >&5
+  echo "$as_me:1665: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -1750,7 +1672,7 @@ continue
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 1753 "configure"
+#line 1675 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -1762,16 +1684,16 @@ exit (42);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1765: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1687: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1768: \$? = $ac_status" >&5
+  echo "$as_me:1690: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1771: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1693: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1774: \$? = $ac_status" >&5
+  echo "$as_me:1696: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -1780,7 +1702,7 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 done
-rm -f conftest*
+rm -rf conftest*
 if test -n "$ac_declaration"; then
   echo '#ifdef __cplusplus' >>confdefs.h
   echo $ac_declaration      >>confdefs.h
@@ -1805,7 +1727,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:1808: checking how to run the C preprocessor" >&5
+echo "$as_me:1730: 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
@@ -1826,18 +1748,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 1829 "configure"
+#line 1751 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:1834: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:1756: \"$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:1840: \$? = $ac_status" >&5
+  echo "$as_me:1762: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -1860,17 +1782,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 1863 "configure"
+#line 1785 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:1867: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:1789: \"$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:1873: \$? = $ac_status" >&5
+  echo "$as_me:1795: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -1907,7 +1829,7 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:1910: result: $CPP" >&5
+echo "$as_me:1832: result: $CPP" >&5
 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -1917,18 +1839,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 1920 "configure"
+#line 1842 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:1925: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:1847: \"$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:1931: \$? = $ac_status" >&5
+  echo "$as_me:1853: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -1951,17 +1873,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 1954 "configure"
+#line 1876 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:1958: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:1880: \"$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:1964: \$? = $ac_status" >&5
+  echo "$as_me:1886: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -1989,7 +1911,7 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:1992: error: C preprocessor \"$CPP\" fails sanity check" >&5
+  { { echo "$as_me:1914: error: C preprocessor \"$CPP\" fails sanity check" >&5
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -2002,14 +1924,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:2005: checking whether $CC needs -traditional" >&5
+    echo "$as_me:1927: 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 2012 "configure"
+#line 1934 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
 int Autoconf = TIOCGETP;
@@ -2020,11 +1942,11 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 else
   ac_cv_prog_gcc_traditional=no
 fi
-rm -f conftest*
+rm -rf conftest*
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat >conftest.$ac_ext <<_ACEOF
-#line 2027 "configure"
+#line 1949 "configure"
 #include "confdefs.h"
 #include <termio.h>
 int Autoconf = TCGETA;
@@ -2033,18 +1955,18 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   egrep "$ac_pattern" >/dev/null 2>&1; then
   ac_cv_prog_gcc_traditional=yes
 fi
-rm -f conftest*
+rm -rf conftest*
 
   fi
 fi
-echo "$as_me:2040: result: $ac_cv_prog_gcc_traditional" >&5
+echo "$as_me:1962: 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:2047: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:1969: 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
@@ -2064,11 +1986,11 @@ fi
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:2067: result: yes" >&5
+  echo "$as_me:1989: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:2071: result: no" >&5
+  echo "$as_me:1993: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
@@ -2076,7 +1998,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:2079: checking for $ac_word" >&5
+echo "$as_me:2001: 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
@@ -2091,7 +2013,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:2094: found $ac_dir/$ac_word" >&5
+echo "$as_me:2016: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2099,10 +2021,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:2102: result: $RANLIB" >&5
+  echo "$as_me:2024: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:2105: result: no" >&5
+  echo "$as_me:2027: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2111,7 +2033,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:2114: checking for $ac_word" >&5
+echo "$as_me:2036: 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
@@ -2126,7 +2048,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:2129: found $ac_dir/$ac_word" >&5
+echo "$as_me:2051: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2135,10 +2057,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:2138: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:2060: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:2141: result: no" >&5
+  echo "$as_me:2063: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2164,7 +2086,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:2167: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+  { { echo "$as_me:2089: 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
@@ -2184,7 +2106,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:2187: checking for a BSD compatible install" >&5
+echo "$as_me:2109: 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
@@ -2233,7 +2155,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:2236: result: $INSTALL" >&5
+echo "$as_me:2158: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -2247,7 +2169,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:2250: checking for $ac_word" >&5
+echo "$as_me:2172: 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
@@ -2262,7 +2184,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:2265: found $ac_dir/$ac_word" >&5
+echo "$as_me:2187: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2270,10 +2192,10 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:2273: result: $AR" >&5
+  echo "$as_me:2195: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 else
-  echo "$as_me:2276: result: no" >&5
+  echo "$as_me:2198: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2282,7 +2204,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:2285: checking for $ac_word" >&5
+echo "$as_me:2207: 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
@@ -2297,7 +2219,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:2300: found $ac_dir/$ac_word" >&5
+echo "$as_me:2222: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2306,10 +2228,10 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:2309: result: $ac_ct_AR" >&5
+  echo "$as_me:2231: result: $ac_ct_AR" >&5
 echo "${ECHO_T}$ac_ct_AR" >&6
 else
-  echo "$as_me:2312: result: no" >&5
+  echo "$as_me:2234: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2318,12 +2240,12 @@ else
   AR="$ac_cv_prog_AR"
 fi
 
-echo "$as_me:2321: checking for POSIXized ISC" >&5
+echo "$as_me:2243: 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:2326: result: yes" >&5
+  echo "$as_me:2248: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   ISC=yes # If later tests want to check for ISC.
 
@@ -2337,12 +2259,12 @@ EOF
     CC="$CC -Xp"
   fi
 else
-  echo "$as_me:2340: result: no" >&5
+  echo "$as_me:2262: result: no" >&5
 echo "${ECHO_T}no" >&6
   ISC=
 fi
 
-echo "$as_me:2345: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:2267: 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
@@ -2350,7 +2272,7 @@ else
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >conftest.$ac_ext <<_ACEOF
-#line 2353 "configure"
+#line 2275 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -2399,16 +2321,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:2402: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2324: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2405: \$? = $ac_status" >&5
+  echo "$as_me:2327: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2408: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2330: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2411: \$? = $ac_status" >&5
+  echo "$as_me:2333: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_cc_stdc=$ac_arg
 break
@@ -2425,21 +2347,21 @@ fi
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)
-    echo "$as_me:2428: result: none needed" >&5
+    echo "$as_me:2350: result: none needed" >&5
 echo "${ECHO_T}none needed" >&6 ;;
   *)
-    echo "$as_me:2431: result: $ac_cv_prog_cc_stdc" >&5
+    echo "$as_me:2353: 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:2436: checking for an ANSI C-conforming const" >&5
+echo "$as_me:2358: 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 2442 "configure"
+#line 2364 "configure"
 #include "confdefs.h"
 
 int
@@ -2497,16 +2419,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2500: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2422: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2503: \$? = $ac_status" >&5
+  echo "$as_me:2425: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2506: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2428: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2509: \$? = $ac_status" >&5
+  echo "$as_me:2431: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_const=yes
 else
@@ -2516,7 +2438,7 @@ ac_cv_c_const=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:2519: result: $ac_cv_c_const" >&5
+echo "$as_me:2441: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -2526,7 +2448,7 @@ EOF
 
 fi
 
-echo "$as_me:2529: checking for makeflags variable" >&5
+echo "$as_me:2451: 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
@@ -2540,10 +2462,10 @@ SHELL = /bin/sh
 all :
 	@ echo '.$cf_option'
 CF_EOF
-		cf_result=`${MAKE-make} -k -f cf_makeflags.tmp 2>/dev/null | sed -e 's,[ 	]*$,,'`
+		cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | sed -e 's,[ 	]*$,,'`
 		case "$cf_result" in
 		.*k)
-			cf_result=`${MAKE-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null`
+			cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null`
 			case "$cf_result" in
 			.*CC=*)	cf_cv_makeflags=
 				;;
@@ -2560,10 +2482,10 @@ CF_EOF
 	rm -f cf_makeflags.tmp
 
 fi
-echo "$as_me:2563: result: $cf_cv_makeflags" >&5
+echo "$as_me:2485: result: $cf_cv_makeflags" >&5
 echo "${ECHO_T}$cf_cv_makeflags" >&6
 
-echo "$as_me:2566: checking if filesystem supports mixed-case filenames" >&5
+echo "$as_me:2488: 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
@@ -2590,7 +2512,7 @@ else
 fi
 
 fi
-echo "$as_me:2593: result: $cf_cv_mixedcase" >&5
+echo "$as_me:2515: 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
@@ -2600,7 +2522,7 @@ for ac_prog in exctags ctags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:2603: checking for $ac_word" >&5
+echo "$as_me:2525: 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
@@ -2615,7 +2537,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CTAGS="$ac_prog"
-echo "$as_me:2618: found $ac_dir/$ac_word" >&5
+echo "$as_me:2540: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2623,10 +2545,10 @@ fi
 fi
 CTAGS=$ac_cv_prog_CTAGS
 if test -n "$CTAGS"; then
-  echo "$as_me:2626: result: $CTAGS" >&5
+  echo "$as_me:2548: result: $CTAGS" >&5
 echo "${ECHO_T}$CTAGS" >&6
 else
-  echo "$as_me:2629: result: no" >&5
+  echo "$as_me:2551: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2637,7 +2559,7 @@ for ac_prog in exetags etags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:2640: checking for $ac_word" >&5
+echo "$as_me:2562: 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
@@ -2652,7 +2574,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ETAGS="$ac_prog"
-echo "$as_me:2655: found $ac_dir/$ac_word" >&5
+echo "$as_me:2577: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2660,19 +2582,19 @@ fi
 fi
 ETAGS=$ac_cv_prog_ETAGS
 if test -n "$ETAGS"; then
-  echo "$as_me:2663: result: $ETAGS" >&5
+  echo "$as_me:2585: result: $ETAGS" >&5
 echo "${ECHO_T}$ETAGS" >&6
 else
-  echo "$as_me:2666: result: no" >&5
+  echo "$as_me:2588: 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
+# 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:2597: 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
@@ -2687,7 +2609,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:2690: found $ac_dir/$ac_word" >&5
+echo "$as_me:2612: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2696,17 +2618,17 @@ fi
 fi
 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
 if test -n "$MAKE_LOWER_TAGS"; then
-  echo "$as_me:2699: result: $MAKE_LOWER_TAGS" >&5
+  echo "$as_me:2621: result: $MAKE_LOWER_TAGS" >&5
 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
 else
-  echo "$as_me:2702: result: no" >&5
+  echo "$as_me:2624: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 if test "$cf_cv_mixedcase" = yes ; then
-	# Extract the first word of "${ETAGS-etags}", so it can be a program name with args.
-set dummy ${ETAGS-etags}; ac_word=$2
-echo "$as_me:2709: 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:2631: 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
@@ -2721,7 +2643,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:2724: found $ac_dir/$ac_word" >&5
+echo "$as_me:2646: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2730,10 +2652,10 @@ fi
 fi
 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
 if test -n "$MAKE_UPPER_TAGS"; then
-  echo "$as_me:2733: result: $MAKE_UPPER_TAGS" >&5
+  echo "$as_me:2655: result: $MAKE_UPPER_TAGS" >&5
 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
 else
-  echo "$as_me:2736: result: no" >&5
+  echo "$as_me:2658: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2753,7 +2675,7 @@ else
 	MAKE_LOWER_TAGS="#"
 fi
 
-echo "$as_me:2756: checking if you want to see long compiling messages" >&5
+echo "$as_me:2678: 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.
@@ -2787,16 +2709,16 @@ else
     ECHO_CC=''
 
 fi;
-echo "$as_me:2790: result: $enableval" >&5
+echo "$as_me:2712: 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:2795: error: cannot run $ac_config_sub" >&5
+  { { echo "$as_me:2717: error: cannot run $ac_config_sub" >&5
 echo "$as_me: error: cannot run $ac_config_sub" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:2799: checking build system type" >&5
+echo "$as_me:2721: 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
@@ -2805,16 +2727,16 @@ else
 test -z "$ac_cv_build_alias" &&
   ac_cv_build_alias=`$ac_config_guess`
 test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:2808: error: cannot guess build type; you must specify one" >&5
+  { { echo "$as_me:2730: 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:2812: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+  { { echo "$as_me:2734: 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:2817: result: $ac_cv_build" >&5
+echo "$as_me:2739: 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/'`
@@ -2822,7 +2744,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:2825: checking host system type" >&5
+	echo "$as_me:2747: 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
@@ -2831,12 +2753,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:2834: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+  { { echo "$as_me:2756: 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:2839: result: $ac_cv_host" >&5
+echo "$as_me:2761: 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/'`
@@ -2861,13 +2783,13 @@ else
 fi
 
 test -z "$system_name" && system_name="$cf_cv_system_name"
-test -n "$cf_cv_system_name" && echo "$as_me:2864: result: Configuring for $cf_cv_system_name" >&5
+test -n "$cf_cv_system_name" && echo "$as_me:2786: 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:2868: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
+	echo "$as_me:2790: 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:2870: error: \"Please remove config.cache and try again.\"" >&5
+	{ { echo "$as_me:2792: 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
@@ -2935,14 +2857,14 @@ irix[56].*) #(vi
 	;;
 linux*|gnu*|mint*|k*bsd*-gnu) #(vi
 
-echo "$as_me:2938: checking if we must define _GNU_SOURCE" >&5
+echo "$as_me:2860: 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 2945 "configure"
+#line 2867 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -2957,16 +2879,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2960: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2882: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2963: \$? = $ac_status" >&5
+  echo "$as_me:2885: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2966: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2888: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2969: \$? = $ac_status" >&5
+  echo "$as_me:2891: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_gnu_source=no
 else
@@ -2975,7 +2897,7 @@ cat conftest.$ac_ext >&5
 cf_save="$CPPFLAGS"
 	 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 2978 "configure"
+#line 2900 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -2990,16 +2912,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2993: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2915: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2996: \$? = $ac_status" >&5
+  echo "$as_me:2918: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2999: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2921: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3002: \$? = $ac_status" >&5
+  echo "$as_me:2924: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_gnu_source=no
 else
@@ -3014,7 +2936,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:3017: result: $cf_cv_gnu_source" >&5
+echo "$as_me:2939: 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"
 
@@ -3044,14 +2966,14 @@ solaris2.[1-9]) #(vi
 	cf_xopen_source="-D__EXTENSIONS__"
 	;;
 *)
-	echo "$as_me:3047: checking if we should define _XOPEN_SOURCE" >&5
+	echo "$as_me:2969: 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 3054 "configure"
+#line 2976 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -3066,16 +2988,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3069: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2991: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3072: \$? = $ac_status" >&5
+  echo "$as_me:2994: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3075: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2997: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3078: \$? = $ac_status" >&5
+  echo "$as_me:3000: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
@@ -3084,7 +3006,7 @@ cat conftest.$ac_ext >&5
 cf_save="$CPPFLAGS"
 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 3087 "configure"
+#line 3009 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -3099,16 +3021,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3102: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3024: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3105: \$? = $ac_status" >&5
+  echo "$as_me:3027: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3108: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3030: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3111: \$? = $ac_status" >&5
+  echo "$as_me:3033: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
@@ -3123,7 +3045,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:3126: result: $cf_cv_xopen_source" >&5
+echo "$as_me:3048: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 	if test "$cf_cv_xopen_source" != no ; then
 
@@ -3230,16 +3152,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:3233: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:3155: 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}:3239: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:3161: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 3242 "configure"
+#line 3164 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -3254,16 +3176,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3257: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3179: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3260: \$? = $ac_status" >&5
+  echo "$as_me:3182: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3263: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3185: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3266: \$? = $ac_status" >&5
+  echo "$as_me:3188: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -3284,7 +3206,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >conftest.$ac_ext <<_ACEOF
-#line 3287 "configure"
+#line 3209 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -3299,16 +3221,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3302: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3224: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3305: \$? = $ac_status" >&5
+  echo "$as_me:3227: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3308: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3230: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3311: \$? = $ac_status" >&5
+  echo "$as_me:3233: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -3319,15 +3241,15 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 	 fi
 
-echo "${as_me-configure}:3322: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:3244: 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}:3327: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:3249: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 3330 "configure"
+#line 3252 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -3342,16 +3264,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3345: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3267: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3348: \$? = $ac_status" >&5
+  echo "$as_me:3270: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3351: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3273: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3354: \$? = $ac_status" >&5
+  echo "$as_me:3276: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -3367,7 +3289,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:3370: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:3292: 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
@@ -3546,7 +3468,7 @@ if test "${enable_largefile+set}" = set; then
 fi;
 if test "$enable_largefile" != no; then
 
-  echo "$as_me:3549: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:3471: 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
@@ -3558,7 +3480,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 3561 "configure"
+#line 3483 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -3578,16 +3500,16 @@ main ()
 }
 _ACEOF
      	 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3581: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3503: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3584: \$? = $ac_status" >&5
+  echo "$as_me:3506: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3587: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3509: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3590: \$? = $ac_status" >&5
+  echo "$as_me:3512: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -3597,16 +3519,16 @@ fi
 rm -f conftest.$ac_objext
      	 CC="$CC -n32"
      	 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3600: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3522: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3603: \$? = $ac_status" >&5
+  echo "$as_me:3525: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3606: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3528: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3609: \$? = $ac_status" >&5
+  echo "$as_me:3531: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else
@@ -3620,13 +3542,13 @@ rm -f conftest.$ac_objext
        rm -f conftest.$ac_ext
     fi
 fi
-echo "$as_me:3623: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:3545: 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:3629: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:3551: 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
@@ -3634,7 +3556,7 @@ else
   while :; do
   ac_cv_sys_file_offset_bits=no
   cat >conftest.$ac_ext <<_ACEOF
-#line 3637 "configure"
+#line 3559 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -3654,16 +3576,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3657: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3579: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3660: \$? = $ac_status" >&5
+  echo "$as_me:3582: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3663: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3585: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3666: \$? = $ac_status" >&5
+  echo "$as_me:3588: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -3672,7 +3594,7 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 3675 "configure"
+#line 3597 "configure"
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -3693,16 +3615,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3696: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3618: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3699: \$? = $ac_status" >&5
+  echo "$as_me:3621: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3702: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3624: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3705: \$? = $ac_status" >&5
+  echo "$as_me:3627: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else
@@ -3713,7 +3635,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
   break
 done
 fi
-echo "$as_me:3716: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:3638: 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
 
@@ -3722,8 +3644,8 @@ cat >>confdefs.h <<EOF
 EOF
 
 fi
-rm -f conftest*
-  echo "$as_me:3726: checking for _LARGE_FILES value needed for large files" >&5
+rm -rf conftest*
+  echo "$as_me:3648: 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
@@ -3731,7 +3653,7 @@ else
   while :; do
   ac_cv_sys_large_files=no
   cat >conftest.$ac_ext <<_ACEOF
-#line 3734 "configure"
+#line 3656 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -3751,16 +3673,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3754: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3676: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3757: \$? = $ac_status" >&5
+  echo "$as_me:3679: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3760: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3682: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3763: \$? = $ac_status" >&5
+  echo "$as_me:3685: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -3769,7 +3691,7 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 3772 "configure"
+#line 3694 "configure"
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
@@ -3790,16 +3712,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3793: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3715: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3796: \$? = $ac_status" >&5
+  echo "$as_me:3718: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3799: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3721: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3802: \$? = $ac_status" >&5
+  echo "$as_me:3724: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_large_files=1; break
 else
@@ -3810,7 +3732,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
   break
 done
 fi
-echo "$as_me:3813: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:3735: 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
 
@@ -3819,11 +3741,11 @@ cat >>confdefs.h <<EOF
 EOF
 
 fi
-rm -f conftest*
+rm -rf conftest*
 fi
 
     if test "$enable_largefile" != no ; then
-	echo "$as_me:3826: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+	echo "$as_me:3748: 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
@@ -3831,7 +3753,7 @@ else
   while :; do
   ac_cv_sys_largefile_source=no
   cat >conftest.$ac_ext <<_ACEOF
-#line 3834 "configure"
+#line 3756 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -3843,16 +3765,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3846: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3768: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3849: \$? = $ac_status" >&5
+  echo "$as_me:3771: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3852: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3774: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3855: \$? = $ac_status" >&5
+  echo "$as_me:3777: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -3861,7 +3783,7 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 3864 "configure"
+#line 3786 "configure"
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
@@ -3874,16 +3796,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3877: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3799: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3880: \$? = $ac_status" >&5
+  echo "$as_me:3802: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3883: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3805: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3886: \$? = $ac_status" >&5
+  echo "$as_me:3808: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_largefile_source=1; break
 else
@@ -3894,7 +3816,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
   break
 done
 fi
-echo "$as_me:3897: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:3819: 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
 
@@ -3903,18 +3825,18 @@ cat >>confdefs.h <<EOF
 EOF
 
 fi
-rm -f conftest*
+rm -rf conftest*
 
 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
 # in glibc 2.1.3, but that breaks too many other things.
 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-echo "$as_me:3911: checking for fseeko" >&5
+echo "$as_me:3833: 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 3917 "configure"
+#line 3839 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -3926,16 +3848,16 @@ return fseeko && fseeko (stdin, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3929: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3851: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3932: \$? = $ac_status" >&5
+  echo "$as_me:3854: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3935: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3857: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3938: \$? = $ac_status" >&5
+  echo "$as_me:3860: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_fseeko=yes
 else
@@ -3945,7 +3867,7 @@ ac_cv_func_fseeko=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:3948: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:3870: result: $ac_cv_func_fseeko" >&5
 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
 if test $ac_cv_func_fseeko = yes; then
 
@@ -3966,14 +3888,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:3969: checking whether to use struct dirent64" >&5
+	echo "$as_me:3891: 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 3976 "configure"
+#line 3898 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -3994,16 +3916,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3997: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3919: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4000: \$? = $ac_status" >&5
+  echo "$as_me:3922: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4003: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3925: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4006: \$? = $ac_status" >&5
+  echo "$as_me:3928: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_struct_dirent64=yes
 else
@@ -4014,7 +3936,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:4017: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:3939: 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
@@ -4024,17 +3946,17 @@ EOF
 
 GCC_VERSION=none
 if test "$GCC" = yes ; then
-	echo "$as_me:4027: checking version of $CC" >&5
+	echo "$as_me:3949: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
-	echo "$as_me:4031: result: $GCC_VERSION" >&5
+	echo "$as_me:3953: result: $GCC_VERSION" >&5
 echo "${ECHO_T}$GCC_VERSION" >&6
 fi
 
 if ( test "$GCC" = yes || test "$GXX" = yes )
 then
-echo "$as_me:4037: checking if you want to check for gcc warnings" >&5
+echo "$as_me:3959: 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.
@@ -4044,7 +3966,7 @@ if test "${with_warnings+set}" = set; then
 else
   cf_opt_with_warnings=no
 fi;
-echo "$as_me:4047: result: $cf_opt_with_warnings" >&5
+echo "$as_me:3969: result: $cf_opt_with_warnings" >&5
 echo "${ECHO_T}$cf_opt_with_warnings" >&6
 if test "$cf_opt_with_warnings" != no ; then
 
@@ -4066,10 +3988,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:4069: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:3991: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > conftest.$ac_ext <<EOF
-#line 4072 "${as_me-configure}"
+#line 3994 "${as_me:-configure}"
 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"
@@ -4118,12 +4040,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:4121: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:4043: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4124: \$? = $ac_status" >&5
+  echo "$as_me:4046: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-			test -n "$verbose" && echo "$as_me:4126: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:4048: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case $cf_attribute in #(vi
@@ -4163,12 +4085,12 @@ INTEL_COMPILER=no
 if test "$GCC" = yes ; then
 	case $host_os in
 	linux*|gnu*)
-		echo "$as_me:4166: checking if this is really Intel C compiler" >&5
+		echo "$as_me:4088: 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 4171 "configure"
+#line 4093 "configure"
 #include "confdefs.h"
 
 int
@@ -4185,16 +4107,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4188: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4110: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4191: \$? = $ac_status" >&5
+  echo "$as_me:4113: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4194: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4116: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4197: \$? = $ac_status" >&5
+  echo "$as_me:4119: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
@@ -4205,14 +4127,14 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 		CFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:4208: result: $INTEL_COMPILER" >&5
+		echo "$as_me:4130: result: $INTEL_COMPILER" >&5
 echo "${ECHO_T}$INTEL_COMPILER" >&6
 		;;
 	esac
 fi
 
 cat > conftest.$ac_ext <<EOF
-#line 4215 "${as_me-configure}"
+#line 4137 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 
@@ -4229,7 +4151,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:4232: checking for $CC warning options..." >&5
+	{ echo "$as_me:4154: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="-Wall"
@@ -4245,12 +4167,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:4248: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:4170: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4251: \$? = $ac_status" >&5
+  echo "$as_me:4173: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-			test -n "$verbose" && echo "$as_me:4253: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:4175: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -4259,7 +4181,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 
 elif test "$GCC" = yes
 then
-	{ echo "$as_me:4262: checking for $CC warning options..." >&5
+	{ echo "$as_me:4184: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS=
@@ -4279,12 +4201,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:4282: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:4204: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4285: \$? = $ac_status" >&5
+  echo "$as_me:4207: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-			test -n "$verbose" && echo "$as_me:4287: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:4209: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case $cf_opt in #(vi
 			Wcast-qual) #(vi
@@ -4295,7 +4217,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}:4298: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:4220: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -4306,19 +4228,118 @@ echo "${as_me-configure}:4298: testing feature is broken in gcc $GCC_VERSION ...
 	done
 	CFLAGS="$cf_save_CFLAGS"
 fi
-rm -f conftest*
+rm -rf conftest*
 
 fi
 fi
 
+# Check whether --with-package or --without-package was given.
+if test "${with_package+set}" = set; then
+  withval="$with_package"
+  PACKAGE=$withval
+else
+  PACKAGE=dialog
+fi;
+
+if test -f $srcdir/VERSION ; then
+	echo "$as_me:4245: 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...
+	cf_field1=`sed -e '2,$d' $srcdir/VERSION|cut -f1`
+	cf_field2=`sed -e '2,$d' $srcdir/VERSION|cut -f2`
+	cf_field3=`sed -e '2,$d' $srcdir/VERSION|cut -f3`
+
+	# this is how CF_BUNDLED_INTL uses $VERSION:
+	VERSION="$cf_field1"
+
+	VERSION_MAJOR=`echo "$cf_field2" | sed -e 's/\..*//'`
+	test -z "$VERSION_MAJOR" && { { echo "$as_me:4257: 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:4262: error: missing minor-version" >&5
+echo "$as_me: error: missing minor-version" >&2;}
+   { (exit 1); exit 1; }; }
+
+	echo "$as_me:4266: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5
+echo "${ECHO_T}${VERSION_MAJOR}.${VERSION_MINOR}" >&6
+
+	echo "$as_me:4269: 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:4274: 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:4281: 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:4286: result: $VERSION_PATCH" >&5
+echo "${ECHO_T}$VERSION_PATCH" >&6
+else
+	{ { echo "$as_me:4289: error: did not find $srcdir/VERSION" >&5
+echo "$as_me: error: did not find $srcdir/VERSION" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+# show the actual data that we have for versions:
+test -n "$verbose" && echo "	VERSION $VERSION" 1>&6
+
+echo "${as_me:-configure}:4297: testing VERSION $VERSION ..." 1>&5
+
+test -n "$verbose" && echo "	VERSION_MAJOR $VERSION_MAJOR" 1>&6
+
+echo "${as_me:-configure}:4301: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5
+
+test -n "$verbose" && echo "	VERSION_MINOR $VERSION_MINOR" 1>&6
+
+echo "${as_me:-configure}:4305: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5
+
+test -n "$verbose" && echo "	VERSION_PATCH $VERSION_PATCH" 1>&6
+
+echo "${as_me:-configure}:4309: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5
+
+	cf_PACKAGE=dialog
+	PACKAGE=$PACKAGE
+	cat >>confdefs.h <<EOF
+#define PACKAGE "$PACKAGE"
+EOF
+
+cf_PACKAGE=`echo "$cf_PACKAGE" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+
+	cat >>confdefs.h <<EOF
+#define ${cf_PACKAGE}_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}"
+EOF
+
+	cat >>confdefs.h <<EOF
+#define ${cf_PACKAGE}_PATCHDATE ${VERSION_PATCH}
+EOF
+
+# Check whether --enable-header-subdir or --disable-header-subdir was given.
+if test "${enable_header_subdir+set}" = set; then
+  enableval="$enable_header_subdir"
+  SUB_INC=$enableval
+else
+  SUB_INC=no
+fi;
+
 EXTRAOBJS=""
-echo "$as_me:4315: checking for ANSI C header files" >&5
+echo "$as_me:4336: 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 4321 "configure"
+#line 4342 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -4326,13 +4347,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:4329: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4350: \"$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:4335: \$? = $ac_status" >&5
+  echo "$as_me:4356: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4354,7 +4375,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 4357 "configure"
+#line 4378 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -4365,14 +4386,14 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 else
   ac_cv_header_stdc=no
 fi
-rm -f conftest*
+rm -rf conftest*
 
 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 4375 "configure"
+#line 4396 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -4383,7 +4404,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 else
   ac_cv_header_stdc=no
 fi
-rm -f conftest*
+rm -rf conftest*
 
 fi
 
@@ -4393,7 +4414,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4396 "configure"
+#line 4417 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -4419,15 +4440,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:4422: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4443: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4425: \$? = $ac_status" >&5
+  echo "$as_me:4446: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:4427: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4448: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4430: \$? = $ac_status" >&5
+  echo "$as_me:4451: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -4440,7 +4461,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:4443: result: $ac_cv_header_stdc" >&5
+echo "$as_me:4464: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -4450,7 +4471,7 @@ EOF
 
 fi
 
-echo "$as_me:4453: checking for inline" >&5
+echo "$as_me:4474: 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
@@ -4458,7 +4479,7 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >conftest.$ac_ext <<_ACEOF
-#line 4461 "configure"
+#line 4482 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo () {return 0; }
@@ -4467,16 +4488,16 @@ $ac_kw int foo () {return 0; }
 
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4470: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4491: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4473: \$? = $ac_status" >&5
+  echo "$as_me:4494: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4476: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4497: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4479: \$? = $ac_status" >&5
+  echo "$as_me:4500: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
@@ -4487,7 +4508,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:4490: result: $ac_cv_c_inline" >&5
+echo "$as_me:4511: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -4508,28 +4529,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:4511: checking for $ac_header" >&5
+echo "$as_me:4532: 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 4517 "configure"
+#line 4538 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4523: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4544: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4526: \$? = $ac_status" >&5
+  echo "$as_me:4547: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4529: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4550: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4532: \$? = $ac_status" >&5
+  echo "$as_me:4553: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -4539,7 +4560,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4542: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:4563: 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
@@ -4549,13 +4570,13 @@ EOF
 fi
 done
 
-echo "$as_me:4552: checking for off_t" >&5
+echo "$as_me:4573: 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 4558 "configure"
+#line 4579 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -4570,16 +4591,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4573: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4594: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4576: \$? = $ac_status" >&5
+  echo "$as_me:4597: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4579: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4600: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4582: \$? = $ac_status" >&5
+  echo "$as_me:4603: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -4589,7 +4610,7 @@ ac_cv_type_off_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4592: result: $ac_cv_type_off_t" >&5
+echo "$as_me:4613: 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
   :
@@ -4601,13 +4622,13 @@ EOF
 
 fi
 
-echo "$as_me:4604: checking for size_t" >&5
+echo "$as_me:4625: 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 4610 "configure"
+#line 4631 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -4622,16 +4643,16 @@ if (sizeof (size_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4625: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4646: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4628: \$? = $ac_status" >&5
+  echo "$as_me:4649: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4631: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4652: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4634: \$? = $ac_status" >&5
+  echo "$as_me:4655: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_size_t=yes
 else
@@ -4641,7 +4662,7 @@ ac_cv_type_size_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4644: result: $ac_cv_type_size_t" >&5
+echo "$as_me:4665: 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
   :
@@ -4655,13 +4676,13 @@ fi
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:4658: checking for working alloca.h" >&5
+echo "$as_me:4679: 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 4664 "configure"
+#line 4685 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int
@@ -4673,16 +4694,16 @@ char *p = (char *) alloca (2 * sizeof (int));
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4676: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4697: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4679: \$? = $ac_status" >&5
+  echo "$as_me:4700: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4682: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4703: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4685: \$? = $ac_status" >&5
+  echo "$as_me:4706: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_working_alloca_h=yes
 else
@@ -4692,7 +4713,7 @@ ac_cv_working_alloca_h=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4695: result: $ac_cv_working_alloca_h" >&5
+echo "$as_me:4716: 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
 
@@ -4702,13 +4723,13 @@ EOF
 
 fi
 
-echo "$as_me:4705: checking for alloca" >&5
+echo "$as_me:4726: 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 4711 "configure"
+#line 4732 "configure"
 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -4740,16 +4761,16 @@ char *p = (char *) alloca (1);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4743: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4764: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4746: \$? = $ac_status" >&5
+  echo "$as_me:4767: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4749: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4770: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4752: \$? = $ac_status" >&5
+  echo "$as_me:4773: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_alloca_works=yes
 else
@@ -4759,7 +4780,7 @@ ac_cv_func_alloca_works=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4762: result: $ac_cv_func_alloca_works" >&5
+echo "$as_me:4783: 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
@@ -4780,13 +4801,13 @@ cat >>confdefs.h <<\EOF
 #define C_ALLOCA 1
 EOF
 
-echo "$as_me:4783: checking whether \`alloca.c' needs Cray hooks" >&5
+echo "$as_me:4804: 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 4789 "configure"
+#line 4810 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -4801,21 +4822,21 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 else
   ac_cv_os_cray=no
 fi
-rm -f conftest*
+rm -rf conftest*
 
 fi
-echo "$as_me:4807: result: $ac_cv_os_cray" >&5
+echo "$as_me:4828: 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:4812: checking for $ac_func" >&5
+echo "$as_me:4833: 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 4818 "configure"
+#line 4839 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -4846,16 +4867,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4849: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4870: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4852: \$? = $ac_status" >&5
+  echo "$as_me:4873: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4855: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4876: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4858: \$? = $ac_status" >&5
+  echo "$as_me:4879: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -4865,7 +4886,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4868: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:4889: 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
 
@@ -4879,7 +4900,7 @@ fi
   done
 fi
 
-echo "$as_me:4882: checking stack direction for C alloca" >&5
+echo "$as_me:4903: 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
@@ -4888,7 +4909,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4891 "configure"
+#line 4912 "configure"
 #include "confdefs.h"
 int
 find_stack_direction ()
@@ -4911,15 +4932,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:4914: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4935: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4917: \$? = $ac_status" >&5
+  echo "$as_me:4938: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:4919: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4940: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4922: \$? = $ac_status" >&5
+  echo "$as_me:4943: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_stack_direction=1
 else
@@ -4931,7 +4952,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:4934: result: $ac_cv_c_stack_direction" >&5
+echo "$as_me:4955: result: $ac_cv_c_stack_direction" >&5
 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
 cat >>confdefs.h <<EOF
@@ -4943,23 +4964,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:4946: checking for $ac_header" >&5
+echo "$as_me:4967: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4952 "configure"
+#line 4973 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:4956: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4977: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:4962: \$? = $ac_status" >&5
+  echo "$as_me:4983: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4978,7 +4999,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:4981: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:5002: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -4991,13 +5012,13 @@ done
 for ac_func in getpagesize
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:4994: checking for $ac_func" >&5
+echo "$as_me:5015: 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 5000 "configure"
+#line 5021 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -5028,16 +5049,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5031: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5052: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5034: \$? = $ac_status" >&5
+  echo "$as_me:5055: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5037: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5058: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5040: \$? = $ac_status" >&5
+  echo "$as_me:5061: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -5047,7 +5068,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:5050: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:5071: 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
@@ -5057,7 +5078,7 @@ EOF
 fi
 done
 
-echo "$as_me:5060: checking for working mmap" >&5
+echo "$as_me:5081: 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
@@ -5066,7 +5087,7 @@ else
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5069 "configure"
+#line 5090 "configure"
 #include "confdefs.h"
 $ac_includes_default
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -5193,15 +5214,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:5196: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5217: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5199: \$? = $ac_status" >&5
+  echo "$as_me:5220: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:5201: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5222: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5204: \$? = $ac_status" >&5
+  echo "$as_me:5225: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -5213,7 +5234,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:5216: result: $ac_cv_func_mmap_fixed_mapped" >&5
+echo "$as_me:5237: 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
 
@@ -5224,13 +5245,13 @@ EOF
 fi
 rm -f conftest.mmap
 
-    echo "$as_me:5227: checking whether we are using the GNU C Library 2.1 or newer" >&5
+    echo "$as_me:5248: 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 5233 "configure"
+#line 5254 "configure"
 #include "confdefs.h"
 
 #include <features.h>
@@ -5247,10 +5268,10 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 else
   ac_cv_gnu_library_2_1=no
 fi
-rm -f conftest*
+rm -rf conftest*
 
 fi
-echo "$as_me:5253: result: $ac_cv_gnu_library_2_1" >&5
+echo "$as_me:5274: 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"
@@ -5260,7 +5281,13 @@ cf_makefile=makefile
 test -z "$ALL_LINGUAS" && ALL_LINGUAS=`test -d $srcdir/po && cd $srcdir/po && echo *.po|sed -e 's/\.po//g' -e 's/*//'`
 
 # Allow override of "config.h" definition:
-: ${CONFIG_H=config.h}
+: ${CONFIG_H:=config.h}
+
+if test -z "$PACKAGE" ; then
+	{ { echo "$as_me:5287: error: CF_BUNDLED_INTL used without setting PACKAGE variable" >&5
+echo "$as_me: error: CF_BUNDLED_INTL used without setting PACKAGE variable" >&2;}
+   { (exit 1); exit 1; }; }
+fi
 
 if test -z "$VERSION" ; then
 if test -f $srcdir/VERSION ; then
@@ -5274,23 +5301,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:5277: checking for $ac_header" >&5
+echo "$as_me:5304: 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 5283 "configure"
+#line 5310 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:5287: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5314: \"$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:5293: \$? = $ac_status" >&5
+  echo "$as_me:5320: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5309,7 +5336,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:5312: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:5339: 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
@@ -5324,13 +5351,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:5327: checking for $ac_func" >&5
+echo "$as_me:5354: 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 5333 "configure"
+#line 5360 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -5361,16 +5388,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5364: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5391: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5367: \$? = $ac_status" >&5
+  echo "$as_me:5394: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5370: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5397: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5373: \$? = $ac_status" >&5
+  echo "$as_me:5400: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -5380,7 +5407,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:5383: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:5410: 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
@@ -5428,7 +5455,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 5431 "configure"
+#line 5458 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -5440,16 +5467,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5443: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5470: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5446: \$? = $ac_status" >&5
+  echo "$as_me:5473: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5449: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5476: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5452: \$? = $ac_status" >&5
+  echo "$as_me:5479: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -5466,7 +5493,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}:5469: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:5496: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -5507,7 +5534,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 5510 "configure"
+#line 5537 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -5519,16 +5546,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5522: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5549: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5525: \$? = $ac_status" >&5
+  echo "$as_me:5552: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5528: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5555: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5531: \$? = $ac_status" >&5
+  echo "$as_me:5558: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -5545,7 +5572,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}:5548: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:5575: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -5561,7 +5588,7 @@ echo "${as_me-configure}:5548: testing adding $cf_add_incdir to include-path ...
 fi
 
 	else
-{ { echo "$as_me:5564: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:5591: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -5586,7 +5613,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}:5589: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:5616: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -5615,7 +5642,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}:5618: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:5645: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -5624,7 +5651,7 @@ echo "${as_me-configure}:5618: testing adding $cf_add_libdir to library-path ...
 fi
 
 	else
-{ { echo "$as_me:5627: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:5654: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -5635,7 +5662,7 @@ done
 
 fi;
 
-  echo "$as_me:5638: checking for iconv" >&5
+  echo "$as_me:5665: 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
@@ -5646,10 +5673,12 @@ else
 cf_cv_header_path_iconv=
 cf_cv_library_path_iconv=
 
-echo "${as_me-configure}:5649: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:5676: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
+
+cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 5652 "configure"
+#line 5681 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -5668,29 +5697,30 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5671: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5700: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5674: \$? = $ac_status" >&5
+  echo "$as_me:5703: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5677: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5706: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5680: \$? = $ac_status" >&5
+  echo "$as_me:5709: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
+	cf_cv_header_path_iconv=/usr/include
+	cf_cv_library_path_iconv=/usr/lib
 
 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 5693 "configure"
+#line 5723 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -5709,33 +5739,35 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5712: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5742: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5715: \$? = $ac_status" >&5
+  echo "$as_me:5745: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5718: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5748: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5721: \$? = $ac_status" >&5
+  echo "$as_me:5751: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
+	cf_cv_header_path_iconv=/usr/include
+	cf_cv_library_path_iconv=/usr/lib
 	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
+	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}:5736: testing find linkage for iconv library ..." 1>&5
+echo "${as_me:-configure}:5768: testing find linkage for iconv library ..." 1>&5
 
-echo "${as_me-configure}:5738: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:5770: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -5750,7 +5782,19 @@ 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_header_path_list="$cf_header_path_list $cf_header_path"
+
+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"
 			;;
 		esac
 	done
@@ -5762,7 +5806,7 @@ cf_search=
 
 test "/usr" != "$prefix" && \
 test -d "/usr" && \
-(test $prefix = NONE || test -d $prefix) && {
+(test $prefix = NONE || test "/usr" != "$prefix") && {
 	test -n "$verbose" && echo "	... testing for include-directories under /usr"
 	test -d /usr/include &&          cf_search="$cf_search /usr/include"
 	test -d /usr/include/iconv &&       cf_search="$cf_search /usr/include/iconv"
@@ -5784,7 +5828,7 @@ test -d "$prefix" && \
 
 test "/usr/local" != "$prefix" && \
 test -d "/usr/local" && \
-(test $prefix = NONE || test -d $prefix) && {
+(test $prefix = NONE || test "/usr/local" != "$prefix") && {
 	test -n "$verbose" && echo "	... testing for include-directories under /usr/local"
 	test -d /usr/local/include &&          cf_search="$cf_search /usr/local/include"
 	test -d /usr/local/include/iconv &&       cf_search="$cf_search /usr/local/include/iconv"
@@ -5795,7 +5839,7 @@ test -d "/usr/local" && \
 
 test "/opt" != "$prefix" && \
 test -d "/opt" && \
-(test $prefix = NONE || test -d $prefix) && {
+(test $prefix = NONE || test "/opt" != "$prefix") && {
 	test -n "$verbose" && echo "	... testing for include-directories under /opt"
 	test -d /opt/include &&          cf_search="$cf_search /opt/include"
 	test -d /opt/include/iconv &&       cf_search="$cf_search /opt/include/iconv"
@@ -5806,7 +5850,7 @@ test -d "/opt" && \
 
 test "$HOME" != "$prefix" && \
 test -d "$HOME" && \
-(test $prefix = NONE || test -d $prefix) && {
+(test $prefix = NONE || test "$HOME" != "$prefix") && {
 	test -n "$verbose" && echo "	... testing for include-directories under $HOME"
 	test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
 	test -d $HOME/include/iconv &&       cf_search="$cf_search $HOME/include/iconv"
@@ -5836,11 +5880,11 @@ cf_search="$cf_search $cf_header_path_list"
       if test -d $cf_cv_header_path_iconv ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_iconv" 1>&6
 
-echo "${as_me-configure}:5839: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:5883: 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 5843 "configure"
+#line 5887 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -5859,21 +5903,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5862: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5906: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5865: \$? = $ac_status" >&5
+  echo "$as_me:5909: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5868: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5912: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5871: \$? = $ac_status" >&5
+  echo "$as_me:5915: \$? = $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}:5876: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:5920: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
 
             cf_cv_find_linkage_iconv=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -5891,7 +5935,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_iconv" = maybe ; then
 
-echo "${as_me-configure}:5894: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:5938: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -5928,7 +5972,7 @@ cf_search=
 
 test "/usr" != "$prefix" && \
 test -d "/usr" && \
-(test $prefix = NONE || test -d $prefix) && {
+(test $prefix = NONE || test "/usr" != "$prefix") && {
 	test -n "$verbose" && echo "	... testing for lib-directories under /usr"
 	test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
 	test -d /usr/lib/iconv &&       cf_search="$cf_search /usr/lib/iconv"
@@ -5950,7 +5994,7 @@ test -d "$prefix" && \
 
 test "/usr/local" != "$prefix" && \
 test -d "/usr/local" && \
-(test $prefix = NONE || test -d $prefix) && {
+(test $prefix = NONE || test "/usr/local" != "$prefix") && {
 	test -n "$verbose" && echo "	... testing for lib-directories under /usr/local"
 	test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
 	test -d /usr/local/lib/iconv &&       cf_search="$cf_search /usr/local/lib/iconv"
@@ -5961,7 +6005,7 @@ test -d "/usr/local" && \
 
 test "/opt" != "$prefix" && \
 test -d "/opt" && \
-(test $prefix = NONE || test -d $prefix) && {
+(test $prefix = NONE || test "/opt" != "$prefix") && {
 	test -n "$verbose" && echo "	... testing for lib-directories under /opt"
 	test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
 	test -d /opt/lib/iconv &&       cf_search="$cf_search /opt/lib/iconv"
@@ -5972,7 +6016,7 @@ test -d "/opt" && \
 
 test "$HOME" != "$prefix" && \
 test -d "$HOME" && \
-(test $prefix = NONE || test -d $prefix) && {
+(test $prefix = NONE || test "$HOME" != "$prefix") && {
 	test -n "$verbose" && echo "	... testing for lib-directories under $HOME"
 	test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
 	test -d $HOME/lib/iconv &&       cf_search="$cf_search $HOME/lib/iconv"
@@ -5988,13 +6032,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}:5991: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:6035: 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 5997 "configure"
+#line 6041 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -6013,21 +6057,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6016: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6060: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6019: \$? = $ac_status" >&5
+  echo "$as_me:6063: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6022: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6066: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6025: \$? = $ac_status" >&5
+  echo "$as_me:6069: \$? = $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}:6030: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:6074: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
 
                 cf_cv_find_linkage_iconv=yes
                 cf_cv_library_file_iconv="-liconv"
@@ -6044,7 +6088,6 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
           fi
         done
-        LIBS="$cf_save_LIBS"
         CPPFLAGS="$cf_save_CPPFLAGS"
         LDFLAGS="$cf_save_LDFLAGS"
       fi
@@ -6059,6 +6102,8 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
+LIBS="$cf_save_LIBS"
+
 if test "$cf_cv_find_linkage_iconv" = yes ; then
 am_cv_func_iconv=yes
 else
@@ -6066,7 +6111,7 @@ am_cv_func_iconv="no, consider installing GNU libiconv"
 fi
 
 fi
-echo "$as_me:6069: result: $am_cv_func_iconv" >&5
+echo "$as_me:6114: result: $am_cv_func_iconv" >&5
 echo "${ECHO_T}$am_cv_func_iconv" >&6
 
   if test "$am_cv_func_iconv" = yes; then
@@ -6075,14 +6120,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_ICONV 1
 EOF
 
-    echo "$as_me:6078: checking if the declaration of iconv() needs const." >&5
+    echo "$as_me:6123: 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 6085 "configure"
+#line 6130 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -6107,16 +6152,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6110: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6155: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6113: \$? = $ac_status" >&5
+  echo "$as_me:6158: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6116: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6161: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6119: \$? = $ac_status" >&5
+  echo "$as_me:6164: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_proto_iconv_const=no
 else
@@ -6126,7 +6171,7 @@ am_cv_proto_iconv_const=yes
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:6129: result: $am_cv_proto_iconv_const" >&5
+echo "$as_me:6174: 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
@@ -6168,7 +6213,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 6171 "configure"
+#line 6216 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -6180,16 +6225,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6183: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6228: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6186: \$? = $ac_status" >&5
+  echo "$as_me:6231: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6189: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6234: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6192: \$? = $ac_status" >&5
+  echo "$as_me:6237: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -6206,7 +6251,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}:6209: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:6254: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -6243,7 +6288,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}:6246: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:6291: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -6254,13 +6299,13 @@ fi
     fi
   fi
 
-  echo "$as_me:6257: checking for nl_langinfo and CODESET" >&5
+  echo "$as_me:6302: 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 6263 "configure"
+#line 6308 "configure"
 #include "confdefs.h"
 #include <langinfo.h>
 int
@@ -6272,16 +6317,16 @@ char* cs = nl_langinfo(CODESET);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6275: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6320: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6278: \$? = $ac_status" >&5
+  echo "$as_me:6323: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6281: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6326: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6284: \$? = $ac_status" >&5
+  echo "$as_me:6329: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_langinfo_codeset=yes
 else
@@ -6292,7 +6337,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:6295: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:6340: result: $am_cv_langinfo_codeset" >&5
 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
   if test $am_cv_langinfo_codeset = yes; then
 
@@ -6303,13 +6348,13 @@ EOF
   fi
 
    if test $ac_cv_header_locale_h = yes; then
-    echo "$as_me:6306: checking for LC_MESSAGES" >&5
+    echo "$as_me:6351: 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 6312 "configure"
+#line 6357 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int
@@ -6321,16 +6366,16 @@ return LC_MESSAGES
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6324: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6369: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6327: \$? = $ac_status" >&5
+  echo "$as_me:6372: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6330: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6375: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6333: \$? = $ac_status" >&5
+  echo "$as_me:6378: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_val_LC_MESSAGES=yes
 else
@@ -6340,7 +6385,7 @@ am_cv_val_LC_MESSAGES=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6343: result: $am_cv_val_LC_MESSAGES" >&5
+echo "$as_me:6388: 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
 
@@ -6350,7 +6395,7 @@ EOF
 
     fi
   fi
-   echo "$as_me:6353: checking whether NLS is requested" >&5
+   echo "$as_me:6398: 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.
@@ -6360,7 +6405,7 @@ if test "${enable_nls+set}" = set; then
 else
   USE_NLS=no
 fi;
-  echo "$as_me:6363: result: $USE_NLS" >&5
+  echo "$as_me:6408: result: $USE_NLS" >&5
 echo "${ECHO_T}$USE_NLS" >&6
 
   BUILD_INCLUDED_LIBINTL=no
@@ -6373,7 +6418,7 @@ cat >>confdefs.h <<\EOF
 #define ENABLE_NLS 1
 EOF
 
-    echo "$as_me:6376: checking whether included gettext is requested" >&5
+    echo "$as_me:6421: 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.
@@ -6383,7 +6428,7 @@ if test "${with_included_gettext+set}" = set; then
 else
   nls_cv_force_use_gnu_gettext=no
 fi;
-    echo "$as_me:6386: result: $nls_cv_force_use_gnu_gettext" >&5
+    echo "$as_me:6431: 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"
@@ -6392,7 +6437,7 @@ echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6
 
       cf_save_LIBS_1="$LIBS"
       LIBS="$LIBICONV $LIBS"
-      echo "$as_me:6395: checking for libintl.h and gettext()" >&5
+      echo "$as_me:6440: 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
@@ -6403,10 +6448,12 @@ else
 cf_cv_header_path_intl=
 cf_cv_library_path_intl=
 
-echo "${as_me-configure}:6406: testing Starting FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me:-configure}:6451: testing Starting FIND_LINKAGE(intl,) ..." 1>&5
+
+cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 6409 "configure"
+#line 6456 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -6426,29 +6473,30 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6429: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6476: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6432: \$? = $ac_status" >&5
+  echo "$as_me:6479: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6435: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6482: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6438: \$? = $ac_status" >&5
+  echo "$as_me:6485: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_intl=yes
+	cf_cv_header_path_intl=/usr/include
+	cf_cv_library_path_intl=/usr/lib
 
 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"
+#line 6499 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -6468,33 +6516,35 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6471: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6519: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6474: \$? = $ac_status" >&5
+  echo "$as_me:6522: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6477: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6525: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6480: \$? = $ac_status" >&5
+  echo "$as_me:6528: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_intl=yes
+	cf_cv_header_path_intl=/usr/include
+	cf_cv_library_path_intl=/usr/lib
 	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
+	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}:6495: testing find linkage for intl library ..." 1>&5
+echo "${as_me:-configure}:6545: testing find linkage for intl library ..." 1>&5
 
-echo "${as_me-configure}:6497: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me:-configure}:6547: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -6509,7 +6559,19 @@ 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_header_path_list="$cf_header_path_list $cf_header_path"
+
+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"
 			;;
 		esac
 	done
@@ -6521,7 +6583,7 @@ cf_search=
 
 test "/usr" != "$prefix" && \
 test -d "/usr" && \
-(test $prefix = NONE || test -d $prefix) && {
+(test $prefix = NONE || test "/usr" != "$prefix") && {
 	test -n "$verbose" && echo "	... testing for include-directories under /usr"
 	test -d /usr/include &&          cf_search="$cf_search /usr/include"
 	test -d /usr/include/intl &&       cf_search="$cf_search /usr/include/intl"
@@ -6543,7 +6605,7 @@ test -d "$prefix" && \
 
 test "/usr/local" != "$prefix" && \
 test -d "/usr/local" && \
-(test $prefix = NONE || test -d $prefix) && {
+(test $prefix = NONE || test "/usr/local" != "$prefix") && {
 	test -n "$verbose" && echo "	... testing for include-directories under /usr/local"
 	test -d /usr/local/include &&          cf_search="$cf_search /usr/local/include"
 	test -d /usr/local/include/intl &&       cf_search="$cf_search /usr/local/include/intl"
@@ -6554,7 +6616,7 @@ test -d "/usr/local" && \
 
 test "/opt" != "$prefix" && \
 test -d "/opt" && \
-(test $prefix = NONE || test -d $prefix) && {
+(test $prefix = NONE || test "/opt" != "$prefix") && {
 	test -n "$verbose" && echo "	... testing for include-directories under /opt"
 	test -d /opt/include &&          cf_search="$cf_search /opt/include"
 	test -d /opt/include/intl &&       cf_search="$cf_search /opt/include/intl"
@@ -6565,7 +6627,7 @@ test -d "/opt" && \
 
 test "$HOME" != "$prefix" && \
 test -d "$HOME" && \
-(test $prefix = NONE || test -d $prefix) && {
+(test $prefix = NONE || test "$HOME" != "$prefix") && {
 	test -n "$verbose" && echo "	... testing for include-directories under $HOME"
 	test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
 	test -d $HOME/include/intl &&       cf_search="$cf_search $HOME/include/intl"
@@ -6595,11 +6657,11 @@ cf_search="$cf_search $cf_header_path_list"
       if test -d $cf_cv_header_path_intl ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_intl" 1>&6
 
-echo "${as_me-configure}:6598: testing ... testing $cf_cv_header_path_intl ..." 1>&5
+echo "${as_me:-configure}:6660: 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 6602 "configure"
+#line 6664 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -6619,21 +6681,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6622: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6684: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6625: \$? = $ac_status" >&5
+  echo "$as_me:6687: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6628: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6690: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6631: \$? = $ac_status" >&5
+  echo "$as_me:6693: \$? = $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}:6636: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5
+echo "${as_me:-configure}:6698: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5
 
             cf_cv_find_linkage_intl=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -6651,7 +6713,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_intl" = maybe ; then
 
-echo "${as_me-configure}:6654: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me:-configure}:6716: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -6688,7 +6750,7 @@ cf_search=
 
 test "/usr" != "$prefix" && \
 test -d "/usr" && \
-(test $prefix = NONE || test -d $prefix) && {
+(test $prefix = NONE || test "/usr" != "$prefix") && {
 	test -n "$verbose" && echo "	... testing for lib-directories under /usr"
 	test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
 	test -d /usr/lib/intl &&       cf_search="$cf_search /usr/lib/intl"
@@ -6710,7 +6772,7 @@ test -d "$prefix" && \
 
 test "/usr/local" != "$prefix" && \
 test -d "/usr/local" && \
-(test $prefix = NONE || test -d $prefix) && {
+(test $prefix = NONE || test "/usr/local" != "$prefix") && {
 	test -n "$verbose" && echo "	... testing for lib-directories under /usr/local"
 	test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
 	test -d /usr/local/lib/intl &&       cf_search="$cf_search /usr/local/lib/intl"
@@ -6721,7 +6783,7 @@ test -d "/usr/local" && \
 
 test "/opt" != "$prefix" && \
 test -d "/opt" && \
-(test $prefix = NONE || test -d $prefix) && {
+(test $prefix = NONE || test "/opt" != "$prefix") && {
 	test -n "$verbose" && echo "	... testing for lib-directories under /opt"
 	test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
 	test -d /opt/lib/intl &&       cf_search="$cf_search /opt/lib/intl"
@@ -6732,7 +6794,7 @@ test -d "/opt" && \
 
 test "$HOME" != "$prefix" && \
 test -d "$HOME" && \
-(test $prefix = NONE || test -d $prefix) && {
+(test $prefix = NONE || test "$HOME" != "$prefix") && {
 	test -n "$verbose" && echo "	... testing for lib-directories under $HOME"
 	test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
 	test -d $HOME/lib/intl &&       cf_search="$cf_search $HOME/lib/intl"
@@ -6748,13 +6810,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}:6751: testing ... testing $cf_cv_library_path_intl ..." 1>&5
+echo "${as_me:-configure}:6813: 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 6757 "configure"
+#line 6819 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -6774,21 +6836,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6777: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6839: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6780: \$? = $ac_status" >&5
+  echo "$as_me:6842: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6783: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6845: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6786: \$? = $ac_status" >&5
+  echo "$as_me:6848: \$? = $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}:6791: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5
+echo "${as_me:-configure}:6853: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5
 
                 cf_cv_find_linkage_intl=yes
                 cf_cv_library_file_intl="-lintl"
@@ -6805,7 +6867,6 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
           fi
         done
-        LIBS="$cf_save_LIBS"
         CPPFLAGS="$cf_save_CPPFLAGS"
         LDFLAGS="$cf_save_LDFLAGS"
       fi
@@ -6820,6 +6881,8 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
+LIBS="$cf_save_LIBS"
+
 if test "$cf_cv_find_linkage_intl" = yes ; then
 cf_cv_func_gettext=yes
 else
@@ -6827,7 +6890,7 @@ cf_cv_func_gettext=no
 fi
 
 fi
-echo "$as_me:6830: result: $cf_cv_func_gettext" >&5
+echo "$as_me:6893: result: $cf_cv_func_gettext" >&5
 echo "${ECHO_T}$cf_cv_func_gettext" >&6
       LIBS="$cf_save_LIBS_1"
 
@@ -6866,7 +6929,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 6869 "configure"
+#line 6932 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -6878,16 +6941,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6881: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6944: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6884: \$? = $ac_status" >&5
+  echo "$as_me:6947: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6887: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6950: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6890: \$? = $ac_status" >&5
+  echo "$as_me:6953: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -6904,7 +6967,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}:6907: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:6970: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -6941,7 +7004,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}:6944: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:7007: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         INTLLIBS="-L$cf_add_libdir $INTLLIBS"
       fi
@@ -6957,13 +7020,13 @@ fi
 for ac_func in dcgettext
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:6960: checking for $ac_func" >&5
+echo "$as_me:7023: 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 6966 "configure"
+#line 7029 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -6994,16 +7057,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6997: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7060: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7000: \$? = $ac_status" >&5
+  echo "$as_me:7063: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7003: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7066: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7006: \$? = $ac_status" >&5
+  echo "$as_me:7069: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -7013,7 +7076,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7016: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:7079: 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
@@ -7028,7 +7091,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:7031: checking for $ac_word" >&5
+echo "$as_me:7094: 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
@@ -7055,16 +7118,16 @@ esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != ":"; then
-  echo "$as_me:7058: result: $MSGFMT" >&5
+  echo "$as_me:7121: result: $MSGFMT" >&5
 echo "${ECHO_T}$MSGFMT" >&6
 else
-  echo "$as_me:7061: result: no" >&5
+  echo "$as_me:7124: 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:7067: checking for $ac_word" >&5
+echo "$as_me:7130: 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
@@ -7081,7 +7144,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:7084: found $ac_dir/$ac_word" >&5
+   echo "$as_me:7147: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -7093,17 +7156,17 @@ fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 
 if test -n "$GMSGFMT"; then
-  echo "$as_me:7096: result: $GMSGFMT" >&5
+  echo "$as_me:7159: result: $GMSGFMT" >&5
 echo "${ECHO_T}$GMSGFMT" >&6
 else
-  echo "$as_me:7099: result: no" >&5
+  echo "$as_me:7162: 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:7106: checking for $ac_word" >&5
+echo "$as_me:7169: 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
@@ -7130,10 +7193,10 @@ esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
-  echo "$as_me:7133: result: $XGETTEXT" >&5
+  echo "$as_me:7196: result: $XGETTEXT" >&5
 echo "${ECHO_T}$XGETTEXT" >&6
 else
-  echo "$as_me:7136: result: no" >&5
+  echo "$as_me:7199: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -7148,7 +7211,7 @@ fi
 
     if test "$nls_cv_use_gnu_gettext" = "yes"; then
       if test ! -d $srcdir/intl ; then
-        { { echo "$as_me:7151: error: no NLS library is packaged with this application" >&5
+        { { echo "$as_me:7214: 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
@@ -7156,7 +7219,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:7159: checking for $ac_word" >&5
+echo "$as_me:7222: 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
@@ -7183,16 +7246,16 @@ esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != ":"; then
-  echo "$as_me:7186: result: $MSGFMT" >&5
+  echo "$as_me:7249: result: $MSGFMT" >&5
 echo "${ECHO_T}$MSGFMT" >&6
 else
-  echo "$as_me:7189: result: no" >&5
+  echo "$as_me:7252: 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:7195: checking for $ac_word" >&5
+echo "$as_me:7258: 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
@@ -7209,7 +7272,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:7212: found $ac_dir/$ac_word" >&5
+   echo "$as_me:7275: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -7221,17 +7284,17 @@ fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 
 if test -n "$GMSGFMT"; then
-  echo "$as_me:7224: result: $GMSGFMT" >&5
+  echo "$as_me:7287: result: $GMSGFMT" >&5
 echo "${ECHO_T}$GMSGFMT" >&6
 else
-  echo "$as_me:7227: result: no" >&5
+  echo "$as_me:7290: 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:7234: checking for $ac_word" >&5
+echo "$as_me:7297: 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
@@ -7258,10 +7321,10 @@ esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
-  echo "$as_me:7261: result: $XGETTEXT" >&5
+  echo "$as_me:7324: result: $XGETTEXT" >&5
 echo "${ECHO_T}$XGETTEXT" >&6
 else
-  echo "$as_me:7264: result: no" >&5
+  echo "$as_me:7327: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -7276,7 +7339,7 @@ fi
                   if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then
         : ;
       else
-        echo "$as_me:7279: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
+        echo "$as_me:7342: 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
@@ -7286,7 +7349,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:7289: result: found xgettext program is not GNU xgettext; ignore it" >&5
+        echo "$as_me:7352: 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
@@ -7306,7 +7369,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:7309: checking for $ac_word" >&5
+echo "$as_me:7372: 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
@@ -7321,7 +7384,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:7324: found $ac_dir/$ac_word" >&5
+echo "$as_me:7387: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -7329,10 +7392,10 @@ fi
 fi
 INTLBISON=$ac_cv_prog_INTLBISON
 if test -n "$INTLBISON"; then
-  echo "$as_me:7332: result: $INTLBISON" >&5
+  echo "$as_me:7395: result: $INTLBISON" >&5
 echo "${ECHO_T}$INTLBISON" >&6
 else
-  echo "$as_me:7335: result: no" >&5
+  echo "$as_me:7398: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -7342,7 +7405,7 @@ done
     if test -z "$INTLBISON"; then
       ac_verc_fail=yes
     else
-            echo "$as_me:7345: checking version of bison" >&5
+            echo "$as_me:7408: 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
@@ -7351,7 +7414,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:7354: result: $ac_prog_version" >&5
+    echo "$as_me:7417: result: $ac_prog_version" >&5
 echo "${ECHO_T}$ac_prog_version" >&6
     fi
     if test $ac_verc_fail = yes; then
@@ -7377,7 +7440,7 @@ echo "${ECHO_T}$ac_prog_version" >&6
      if test "x$ALL_LINGUAS" = "x"; then
        LINGUAS=
      else
-       echo "$as_me:7380: checking for catalogs to be installed" >&5
+       echo "$as_me:7443: 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
@@ -7397,7 +7460,7 @@ echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
          fi
        done
        LINGUAS=$NEW_LINGUAS
-       echo "$as_me:7400: result: $LINGUAS" >&5
+       echo "$as_me:7463: result: $LINGUAS" >&5
 echo "${ECHO_T}$LINGUAS" >&6
      fi
 
@@ -7406,21 +7469,23 @@ echo "${ECHO_T}$LINGUAS" >&6
      fi
    fi
 
-                  MKINSTALLDIRS=
-   if test -n "$ac_aux_dir"; then
-     MKINSTALLDIRS="$ac_aux_dir/mkdirs.sh"
-   fi
-   if test -z "$MKINSTALLDIRS"; then
-     MKINSTALLDIRS="\$(top_srcdir)/mkdirs.sh"
-   fi
-   if test -n "$GNUSYSTEM_AUX_DIR" ; then
-     if test -e "${GNUSYSTEM_AUX_DIR}/mkinstalldirs"; then
-       MKINSTALLDIRS="${GNUSYSTEM_AUX_DIR}/mkinstalldirs"
-     fi
-   fi
-
       INTL_LIBTOOL_SUFFIX_PREFIX=
 
+if test "$USE_NLS" = yes ; then
+
+# Check whether --with-textdomain or --without-textdomain was given.
+if test "${with_textdomain+set}" = set; then
+  withval="$with_textdomain"
+  NLS_TEXTDOMAIN=$withval
+else
+  NLS_TEXTDOMAIN=$PACKAGE
+fi;
+	cat >>confdefs.h <<EOF
+#define NLS_TEXTDOMAIN "$NLS_TEXTDOMAIN"
+EOF
+
+fi
+
 INTLDIR_MAKE=
 MSG_DIR_MAKE=
 SUB_MAKEFILE=
@@ -7430,7 +7495,7 @@ cf_makefile=makefile
 use_our_messages=no
 if test "$USE_NLS" = yes ; then
 if test -d $srcdir/po ; then
-echo "$as_me:7433: checking if we should use included message-library" >&5
+echo "$as_me:7498: 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.
@@ -7441,7 +7506,7 @@ else
   use_our_messages=yes
 fi;
 fi
-echo "$as_me:7444: result: $use_our_messages" >&5
+echo "$as_me:7509: result: $use_our_messages" >&5
 echo "${ECHO_T}$use_our_messages" >&6
 fi
 
@@ -7482,23 +7547,23 @@ else
 for ac_header in libintl.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:7485: checking for $ac_header" >&5
+echo "$as_me:7550: 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 7491 "configure"
+#line 7556 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:7495: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7560: \"$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:7501: \$? = $ac_status" >&5
+  echo "$as_me:7566: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7517,7 +7582,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:7520: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:7585: 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
@@ -7562,14 +7627,14 @@ EOF
 	fi
 fi
 
-echo "$as_me:7565: checking if -lm needed for math functions" >&5
+echo "$as_me:7630: 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 7572 "configure"
+#line 7637 "configure"
 #include "confdefs.h"
 
 	#include <stdio.h>
@@ -7584,16 +7649,16 @@ double x = rand(); printf("result = %g\n", sqrt(x))
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7587: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7652: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7590: \$? = $ac_status" >&5
+  echo "$as_me:7655: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7593: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7658: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7596: \$? = $ac_status" >&5
+  echo "$as_me:7661: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_libm=no
 else
@@ -7603,7 +7668,7 @@ cf_cv_need_libm=yes
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7606: result: $cf_cv_need_libm" >&5
+echo "$as_me:7671: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 if test "$cf_cv_need_libm" = yes
 then
@@ -7612,7 +7677,7 @@ then
 
 fi
 
-echo "$as_me:7615: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:7680: 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.
@@ -7628,7 +7693,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:7631: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:7696: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case .$with_cflags in #(vi
@@ -7722,23 +7787,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:7725: checking for dmalloc.h" >&5
+	echo "$as_me:7790: 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 7731 "configure"
+#line 7796 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:7735: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7800: \"$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:7741: \$? = $ac_status" >&5
+  echo "$as_me:7806: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7757,11 +7822,11 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:7760: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:7825: 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:7764: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:7829: 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
@@ -7769,7 +7834,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7772 "configure"
+#line 7837 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7788,16 +7853,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7791: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7856: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7794: \$? = $ac_status" >&5
+  echo "$as_me:7859: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7797: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7862: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7800: \$? = $ac_status" >&5
+  echo "$as_me:7865: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -7808,7 +7873,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7811: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:7876: 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
@@ -7823,7 +7888,7 @@ fi
 
 fi
 
-echo "$as_me:7826: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:7891: 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.
@@ -7839,7 +7904,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:7842: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:7907: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case .$with_cflags in #(vi
@@ -7933,23 +7998,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:7936: checking for dbmalloc.h" >&5
+	echo "$as_me:8001: 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 7942 "configure"
+#line 8007 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:7946: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:8011: \"$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:7952: \$? = $ac_status" >&5
+  echo "$as_me:8017: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7968,11 +8033,11 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:7971: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:8036: 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:7975: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:8040: 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
@@ -7980,7 +8045,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7983 "configure"
+#line 8048 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7999,16 +8064,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8002: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8067: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8005: \$? = $ac_status" >&5
+  echo "$as_me:8070: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8008: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8073: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8011: \$? = $ac_status" >&5
+  echo "$as_me:8076: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -8019,7 +8084,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8022: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:8087: 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
@@ -8034,7 +8099,7 @@ fi
 
 fi
 
-echo "$as_me:8037: checking if you want to use purify for testing" >&5
+echo "$as_me:8102: 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.
@@ -8050,7 +8115,7 @@ EOF
 else
   with_purify=
 fi;
-echo "$as_me:8053: result: ${with_purify:-no}" >&5
+echo "$as_me:8118: result: ${with_purify:-no}" >&5
 echo "${ECHO_T}${with_purify:-no}" >&6
 
 case .$with_cflags in #(vi
@@ -8143,7 +8208,7 @@ fi
 	;;
 esac
 
-echo "$as_me:8146: checking if you want to use valgrind for testing" >&5
+echo "$as_me:8211: 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.
@@ -8159,7 +8224,7 @@ EOF
 else
   with_valgrind=
 fi;
-echo "$as_me:8162: result: ${with_valgrind:-no}" >&5
+echo "$as_me:8227: result: ${with_valgrind:-no}" >&5
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case .$with_cflags in #(vi
@@ -8252,7 +8317,7 @@ fi
 	;;
 esac
 
-echo "$as_me:8255: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:8320: 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.
@@ -8274,10 +8339,10 @@ EOF
 else
   with_no_leaks=
 fi;
-echo "$as_me:8277: result: $with_no_leaks" >&5
+echo "$as_me:8342: result: $with_no_leaks" >&5
 echo "${ECHO_T}$with_no_leaks" >&6
 
-echo "$as_me:8280: checking if you want --trace option" >&5
+echo "$as_me:8345: 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.
@@ -8287,7 +8352,7 @@ if test "${enable_trace+set}" = set; then
 else
   enableval=yes
 fi;
-echo "$as_me:8290: result: $enableval" >&5
+echo "$as_me:8355: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 if test "$enableval" != no ; then
 EXTRAOBJS="$EXTRAOBJS trace\$o"
@@ -8301,6 +8366,32 @@ fi
 
 LIBTOOL_MAKE="#"
 
+echo "$as_me:8369: checking if libtool -version-number should be used" >&5
+echo $ECHO_N "checking if libtool -version-number should be used... $ECHO_C" >&6
+
+# Check whether --enable-libtool-version or --disable-libtool-version was given.
+if test "${enable_libtool_version+set}" = set; then
+  enableval="$enable_libtool_version"
+  test "$enableval" != no && enableval=yes
+  if test "$enableval" != "yes" ; then
+    cf_libtool_version=no
+  else
+    cf_libtool_version=yes
+  fi
+else
+  enableval=yes
+  cf_libtool_version=yes
+
+fi;
+echo "$as_me:8386: result: $cf_libtool_version" >&5
+echo "${ECHO_T}$cf_libtool_version" >&6
+
+if test "$cf_libtool_version" = yes ; then
+	LIBTOOL_VERSION="-version-number"
+else
+	LIBTOOL_VERSION="-version-info"
+fi
+
 LIBTOOL=
 
 # common library maintenance symbols that are convenient for libtool scripts:
@@ -8317,7 +8408,7 @@ LIB_LINK='${CC}'
 LIB_INSTALL=
 LIB_UNINSTALL=
 
-echo "$as_me:8320: checking if you want to build libraries with libtool" >&5
+echo "$as_me:8411: 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.
@@ -8327,7 +8418,7 @@ if test "${with_libtool+set}" = set; then
 else
   with_libtool=no
 fi;
-echo "$as_me:8330: result: $with_libtool" >&5
+echo "$as_me:8421: result: $with_libtool" >&5
 echo "${ECHO_T}$with_libtool" >&6
 if test "$with_libtool" != "no"; then
 
@@ -8358,7 +8449,7 @@ case ".$with_libtool" in #(vi
   with_libtool=`echo $with_libtool | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:8361: error: expected a pathname, not \"$with_libtool\"" >&5
+  { { echo "$as_me:8452: error: expected a pathname, not \"$with_libtool\"" >&5
 echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -8368,7 +8459,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:8371: checking for $ac_word" >&5
+echo "$as_me:8462: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_LIBTOOL+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8385,7 +8476,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:8388: found $ac_dir/$ac_word" >&5
+   echo "$as_me:8479: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -8396,20 +8487,20 @@ fi
 LIBTOOL=$ac_cv_path_LIBTOOL
 
 if test -n "$LIBTOOL"; then
-  echo "$as_me:8399: result: $LIBTOOL" >&5
+  echo "$as_me:8490: result: $LIBTOOL" >&5
 echo "${ECHO_T}$LIBTOOL" >&6
 else
-  echo "$as_me:8402: result: no" >&5
+  echo "$as_me:8493: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 	fi
 	if test -z "$LIBTOOL" ; then
-		{ { echo "$as_me:8408: error: Cannot find libtool" >&5
+		{ { echo "$as_me:8499: error: Cannot find libtool" >&5
 echo "$as_me: error: Cannot find libtool" >&2;}
    { (exit 1); exit 1; }; }
 	fi
-	LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} -o'
+	LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} ${LIBTOOL_VERSION} `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} -o'
 	LIB_OBJECT='${OBJECTS:.o=.lo}'
 	LIB_SUFFIX=.la
 	LIB_CLEAN='${LIBTOOL} --mode=clean'
@@ -8420,17 +8511,17 @@ echo "$as_me: error: Cannot find libtool" >&2;}
 	LIB_PREP=:
 
 	# Show the version of libtool
-	echo "$as_me:8423: checking version of libtool" >&5
+	echo "$as_me:8514: 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:8430: result: $cf_cv_libtool_version" >&5
+	echo "$as_me:8521: 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:8433: error: This is not GNU libtool" >&5
+		{ { echo "$as_me:8524: error: This is not GNU libtool" >&5
 echo "$as_me: error: This is not GNU libtool" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -8464,7 +8555,7 @@ if test "$with_libtool" = "yes" ; then
 	OBJEXT="lo"
 	LIBTOOL_MAKE=
 
-echo "$as_me:8467: checking for additional libtool options" >&5
+echo "$as_me:8558: 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.
@@ -8474,7 +8565,7 @@ if test "${with_libtool_opts+set}" = set; then
 else
   with_libtool_opts=no
 fi;
-echo "$as_me:8477: result: $with_libtool_opts" >&5
+echo "$as_me:8568: result: $with_libtool_opts" >&5
 echo "${ECHO_T}$with_libtool_opts" >&6
 
 case .$with_libtool_opts in
@@ -8487,6 +8578,163 @@ esac
 
 fi
 
+echo "$as_me:8581: checking for specific curses-directory" >&5
+echo $ECHO_N "checking for specific curses-directory... $ECHO_C" >&6
+
+# Check whether --with-curses-dir or --without-curses-dir was given.
+if test "${with_curses_dir+set}" = set; then
+  withval="$with_curses_dir"
+  cf_cv_curses_dir=$withval
+else
+  cf_cv_curses_dir=no
+fi;
+echo "$as_me:8591: result: $cf_cv_curses_dir" >&5
+echo "${ECHO_T}$cf_cv_curses_dir" >&6
+
+if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
+then
+
+if test "x$prefix" != xNONE; then
+  cf_path_syntax="$prefix"
+else
+  cf_path_syntax="$ac_default_prefix"
+fi
+
+case ".$withval" in #(vi
+.\$\(*\)*|.\'*\'*) #(vi
+  ;;
+..|./*|.\\*) #(vi
+  ;;
+.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
+  ;;
+.\${*prefix}*) #(vi
+  eval withval="$withval"
+  case ".$withval" in #(vi
+  .NONE/*)
+    withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+    ;;
+  esac
+  ;; #(vi
+.no|.NONE/*)
+  withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+  ;;
+*)
+  { { echo "$as_me:8622: error: expected a pathname, not \"$withval\"" >&5
+echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+   { (exit 1); exit 1; }; }
+  ;;
+esac
+
+	if test -d "$cf_cv_curses_dir"
+	then
+
+if test -n "$cf_cv_curses_dir/include" ; then
+  for cf_add_incdir in $cf_cv_curses_dir/include
+  do
+	while test $cf_add_incdir != /usr/include
+	do
+	  if test -d $cf_add_incdir
+	  then
+		cf_have_incdir=no
+		if test -n "$CFLAGS$CPPFLAGS" ; then
+		  # a loop is needed to ensure we can add subdirs of existing dirs
+		  for cf_test_incdir in $CFLAGS $CPPFLAGS ; do
+			if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then
+			  cf_have_incdir=yes; break
+			fi
+		  done
+		fi
+
+		if test "$cf_have_incdir" = no ; then
+		  if test "$cf_add_incdir" = /usr/local/include ; then
+			if test "$GCC" = yes
+			then
+			  cf_save_CPPFLAGS=$CPPFLAGS
+			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+			  cat >conftest.$ac_ext <<_ACEOF
+#line 8655 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+int
+main ()
+{
+printf("Hello")
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:8667: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:8670: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:8673: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:8676: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+cf_have_incdir=yes
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+			  CPPFLAGS=$cf_save_CPPFLAGS
+			fi
+		  fi
+		fi
+
+		if test "$cf_have_incdir" = no ; then
+		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+
+echo "${as_me:-configure}:8693: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+		  cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
+		  test "$cf_top_incdir" = "$cf_add_incdir" && break
+		  cf_add_incdir="$cf_top_incdir"
+		else
+		  break
+		fi
+	  fi
+	done
+  done
+fi
+
+if test -n "$cf_cv_curses_dir/lib" ; then
+  for cf_add_libdir in $cf_cv_curses_dir/lib
+  do
+    if test $cf_add_libdir = /usr/lib ; then
+      :
+    elif test -d $cf_add_libdir
+    then
+      cf_have_libdir=no
+      if test -n "$LDFLAGS$LIBS" ; then
+        # a loop is needed to ensure we can add subdirs of existing dirs
+        for cf_test_libdir in $LDFLAGS $LIBS ; do
+          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+            cf_have_libdir=yes; break
+          fi
+        done
+      fi
+      if test "$cf_have_libdir" = no ; then
+        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+
+echo "${as_me:-configure}:8727: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+      fi
+    fi
+  done
+fi
+
+	fi
+fi
+
 use_ncurses=no
 
 # Check whether --with-ncurses or --without-ncurses was given.
@@ -8504,7 +8752,7 @@ if test $use_ncurses != no ; then
 	cf_wide_curses=yes
 	if test $use_ncurses = ncursesw ; then
 
-echo "$as_me:8507: checking for multibyte character support" >&5
+echo "$as_me:8755: 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
@@ -8512,7 +8760,7 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 8515 "configure"
+#line 8763 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -8525,16 +8773,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8528: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8776: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8531: \$? = $ac_status" >&5
+  echo "$as_me:8779: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8534: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8782: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8537: \$? = $ac_status" >&5
+  echo "$as_me:8785: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_utf8_lib=yes
 else
@@ -8546,10 +8794,12 @@ cat conftest.$ac_ext >&5
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
-echo "${as_me-configure}:8549: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:8797: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+
+cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 8552 "configure"
+#line 8802 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -8562,29 +8812,30 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8565: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8815: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8568: \$? = $ac_status" >&5
+  echo "$as_me:8818: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8571: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8821: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8574: \$? = $ac_status" >&5
+  echo "$as_me:8824: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
+	cf_cv_header_path_utf8=/usr/include
+	cf_cv_library_path_utf8=/usr/lib
 
 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 8587 "configure"
+#line 8838 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -8597,33 +8848,35 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8600: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8851: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8603: \$? = $ac_status" >&5
+  echo "$as_me:8854: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8606: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8857: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8609: \$? = $ac_status" >&5
+  echo "$as_me:8860: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
+	cf_cv_header_path_utf8=/usr/include
+	cf_cv_library_path_utf8=/usr/lib
 	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
+	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}:8624: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:8877: testing find linkage for utf8 library ..." 1>&5
 
-echo "${as_me-configure}:8626: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:8879: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -8638,7 +8891,19 @@ 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_header_path_list="$cf_header_path_list $cf_header_path"
+
+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"
 			;;
 		esac
 	done
@@ -8650,7 +8915,7 @@ cf_search=
 
 test "/usr" != "$prefix" && \
 test -d "/usr" && \
-(test $prefix = NONE || test -d $prefix) && {
+(test $prefix = NONE || test "/usr" != "$prefix") && {
 	test -n "$verbose" && echo "	... testing for include-directories under /usr"
 	test -d /usr/include &&          cf_search="$cf_search /usr/include"
 	test -d /usr/include/utf8 &&       cf_search="$cf_search /usr/include/utf8"
@@ -8672,7 +8937,7 @@ test -d "$prefix" && \
 
 test "/usr/local" != "$prefix" && \
 test -d "/usr/local" && \
-(test $prefix = NONE || test -d $prefix) && {
+(test $prefix = NONE || test "/usr/local" != "$prefix") && {
 	test -n "$verbose" && echo "	... testing for include-directories under /usr/local"
 	test -d /usr/local/include &&          cf_search="$cf_search /usr/local/include"
 	test -d /usr/local/include/utf8 &&       cf_search="$cf_search /usr/local/include/utf8"
@@ -8683,7 +8948,7 @@ test -d "/usr/local" && \
 
 test "/opt" != "$prefix" && \
 test -d "/opt" && \
-(test $prefix = NONE || test -d $prefix) && {
+(test $prefix = NONE || test "/opt" != "$prefix") && {
 	test -n "$verbose" && echo "	... testing for include-directories under /opt"
 	test -d /opt/include &&          cf_search="$cf_search /opt/include"
 	test -d /opt/include/utf8 &&       cf_search="$cf_search /opt/include/utf8"
@@ -8694,7 +8959,7 @@ test -d "/opt" && \
 
 test "$HOME" != "$prefix" && \
 test -d "$HOME" && \
-(test $prefix = NONE || test -d $prefix) && {
+(test $prefix = NONE || test "$HOME" != "$prefix") && {
 	test -n "$verbose" && echo "	... testing for include-directories under $HOME"
 	test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
 	test -d $HOME/include/utf8 &&       cf_search="$cf_search $HOME/include/utf8"
@@ -8724,11 +8989,11 @@ cf_search="$cf_search $cf_header_path_list"
       if test -d $cf_cv_header_path_utf8 ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
 
-echo "${as_me-configure}:8727: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:8992: 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 8731 "configure"
+#line 8996 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -8741,21 +9006,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8744: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9009: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8747: \$? = $ac_status" >&5
+  echo "$as_me:9012: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8750: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9015: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8753: \$? = $ac_status" >&5
+  echo "$as_me:9018: \$? = $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}:8758: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:9023: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
 
             cf_cv_find_linkage_utf8=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -8773,7 +9038,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
-echo "${as_me-configure}:8776: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:9041: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -8810,7 +9075,7 @@ cf_search=
 
 test "/usr" != "$prefix" && \
 test -d "/usr" && \
-(test $prefix = NONE || test -d $prefix) && {
+(test $prefix = NONE || test "/usr" != "$prefix") && {
 	test -n "$verbose" && echo "	... testing for lib-directories under /usr"
 	test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
 	test -d /usr/lib/utf8 &&       cf_search="$cf_search /usr/lib/utf8"
@@ -8832,7 +9097,7 @@ test -d "$prefix" && \
 
 test "/usr/local" != "$prefix" && \
 test -d "/usr/local" && \
-(test $prefix = NONE || test -d $prefix) && {
+(test $prefix = NONE || test "/usr/local" != "$prefix") && {
 	test -n "$verbose" && echo "	... testing for lib-directories under /usr/local"
 	test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
 	test -d /usr/local/lib/utf8 &&       cf_search="$cf_search /usr/local/lib/utf8"
@@ -8843,7 +9108,7 @@ test -d "/usr/local" && \
 
 test "/opt" != "$prefix" && \
 test -d "/opt" && \
-(test $prefix = NONE || test -d $prefix) && {
+(test $prefix = NONE || test "/opt" != "$prefix") && {
 	test -n "$verbose" && echo "	... testing for lib-directories under /opt"
 	test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
 	test -d /opt/lib/utf8 &&       cf_search="$cf_search /opt/lib/utf8"
@@ -8854,7 +9119,7 @@ test -d "/opt" && \
 
 test "$HOME" != "$prefix" && \
 test -d "$HOME" && \
-(test $prefix = NONE || test -d $prefix) && {
+(test $prefix = NONE || test "$HOME" != "$prefix") && {
 	test -n "$verbose" && echo "	... testing for lib-directories under $HOME"
 	test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
 	test -d $HOME/lib/utf8 &&       cf_search="$cf_search $HOME/lib/utf8"
@@ -8870,13 +9135,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}:8873: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:9138: 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 8879 "configure"
+#line 9144 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -8889,21 +9154,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8892: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9157: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8895: \$? = $ac_status" >&5
+  echo "$as_me:9160: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8898: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9163: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8901: \$? = $ac_status" >&5
+  echo "$as_me:9166: \$? = $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}:8906: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:9171: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
 
                 cf_cv_find_linkage_utf8=yes
                 cf_cv_library_file_utf8="-lutf8"
@@ -8920,7 +9185,6 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
           fi
         done
-        LIBS="$cf_save_LIBS"
         CPPFLAGS="$cf_save_CPPFLAGS"
         LDFLAGS="$cf_save_LDFLAGS"
       fi
@@ -8935,6 +9199,8 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
+LIBS="$cf_save_LIBS"
+
 if test "$cf_cv_find_linkage_utf8" = yes ; then
 cf_cv_utf8_lib=add-on
 else
@@ -8944,7 +9210,7 @@ fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8947: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:9213: 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
@@ -8978,7 +9244,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 8981 "configure"
+#line 9247 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8990,16 +9256,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8993: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9259: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8996: \$? = $ac_status" >&5
+  echo "$as_me:9262: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8999: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9265: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9002: \$? = $ac_status" >&5
+  echo "$as_me:9268: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9016,7 +9282,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}:9019: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9285: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -9050,7 +9316,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}:9053: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:9319: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -9063,46 +9329,6 @@ fi
 
 	fi
 
-# Check whether --with-curses-dir or --without-curses-dir was given.
-if test "${with_curses_dir+set}" = set; then
-  withval="$with_curses_dir"
-
-if test "x$prefix" != xNONE; then
-  cf_path_syntax="$prefix"
-else
-  cf_path_syntax="$ac_default_prefix"
-fi
-
-case ".$withval" in #(vi
-.\$\(*\)*|.\'*\'*) #(vi
-  ;;
-..|./*|.\\*) #(vi
-  ;;
-.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
-  ;;
-.\${*prefix}*) #(vi
-  eval withval="$withval"
-  case ".$withval" in #(vi
-  .NONE/*)
-    withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
-    ;;
-  esac
-  ;; #(vi
-.no|.NONE/*)
-  withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
-  ;;
-*)
-  { { 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; }; }
-  ;;
-esac
-
-	 cf_cv_curses_dir=$withval
-else
-  cf_cv_curses_dir=no
-fi;
-
 cf_ncuconfig_root=$use_ncurses
 
 echo "Looking for ${cf_ncuconfig_root}-config"
@@ -9110,7 +9336,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:9113: checking for $ac_word" >&5
+echo "$as_me:9339: 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
@@ -9127,7 +9353,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:9130: found $ac_dir/$ac_word" >&5
+   echo "$as_me:9356: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -9138,10 +9364,10 @@ fi
 NCURSES_CONFIG=$ac_cv_path_NCURSES_CONFIG
 
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:9141: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:9367: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:9144: result: no" >&5
+  echo "$as_me:9370: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9156,7 +9382,7 @@ 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 "$as_me:9385: 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
@@ -9170,7 +9396,7 @@ for cf_header in  \
 	ncurses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 9173 "configure"
+#line 9399 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -9182,16 +9408,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9185: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9411: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9188: \$? = $ac_status" >&5
+  echo "$as_me:9414: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9191: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9417: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9194: \$? = $ac_status" >&5
+  echo "$as_me:9420: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -9202,11 +9428,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:9205: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:9431: 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:9435: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -9216,23 +9442,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:9219: checking for $ac_header" >&5
+echo "$as_me:9445: 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"
+#line 9451 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:9229: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:9455: \"$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
+  echo "$as_me:9461: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9251,7 +9477,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:9254: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:9480: 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
@@ -9280,8 +9506,8 @@ cf_ncuhdr_root=$use_ncurses
 test -n "$cf_cv_curses_dir" && \
 test "$cf_cv_curses_dir" != "no" && { \
 
-if test -n "$cf_cv_curses_dir/include $cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
-  for cf_add_incdir in $cf_cv_curses_dir/include $cf_cv_curses_dir/include/$cf_ncuhdr_root
+if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
+  for cf_add_incdir in $cf_cv_curses_dir/include/$cf_ncuhdr_root
   do
 	while test $cf_add_incdir != /usr/include
 	do
@@ -9304,7 +9530,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 9307 "configure"
+#line 9533 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9316,16 +9542,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9319: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9545: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9322: \$? = $ac_status" >&5
+  echo "$as_me:9548: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9325: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9551: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9328: \$? = $ac_status" >&5
+  echo "$as_me:9554: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9342,7 +9568,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}:9345: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9571: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -9359,7 +9585,7 @@ fi
 
 }
 
-echo "$as_me:9362: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:9588: 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
@@ -9371,7 +9597,7 @@ else
 	do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 9374 "configure"
+#line 9600 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -9395,16 +9621,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9398: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9624: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9401: \$? = $ac_status" >&5
+  echo "$as_me:9627: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9404: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9630: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9407: \$? = $ac_status" >&5
+  echo "$as_me:9633: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -9419,14 +9645,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 	done
 
 fi
-echo "$as_me:9422: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:9648: 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:9429: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:9655: 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
@@ -9444,7 +9670,19 @@ 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_header_path_list="$cf_header_path_list $cf_header_path"
+
+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"
 			;;
 		esac
 	done
@@ -9456,7 +9694,7 @@ cf_search=
 
 test "/usr" != "$prefix" && \
 test -d "/usr" && \
-(test $prefix = NONE || test -d $prefix) && {
+(test $prefix = NONE || test "/usr" != "$prefix") && {
 	test -n "$verbose" && echo "	... testing for include-directories under /usr"
 	test -d /usr/include &&          cf_search="$cf_search /usr/include"
 	test -d /usr/include/$cf_ncuhdr_root &&       cf_search="$cf_search /usr/include/$cf_ncuhdr_root"
@@ -9478,7 +9716,7 @@ test -d "$prefix" && \
 
 test "/usr/local" != "$prefix" && \
 test -d "/usr/local" && \
-(test $prefix = NONE || test -d $prefix) && {
+(test $prefix = NONE || test "/usr/local" != "$prefix") && {
 	test -n "$verbose" && echo "	... testing for include-directories under /usr/local"
 	test -d /usr/local/include &&          cf_search="$cf_search /usr/local/include"
 	test -d /usr/local/include/$cf_ncuhdr_root &&       cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root"
@@ -9489,7 +9727,7 @@ test -d "/usr/local" && \
 
 test "/opt" != "$prefix" && \
 test -d "/opt" && \
-(test $prefix = NONE || test -d $prefix) && {
+(test $prefix = NONE || test "/opt" != "$prefix") && {
 	test -n "$verbose" && echo "	... testing for include-directories under /opt"
 	test -d /opt/include &&          cf_search="$cf_search /opt/include"
 	test -d /opt/include/$cf_ncuhdr_root &&       cf_search="$cf_search /opt/include/$cf_ncuhdr_root"
@@ -9500,7 +9738,7 @@ test -d "/opt" && \
 
 test "$HOME" != "$prefix" && \
 test -d "$HOME" && \
-(test $prefix = NONE || test -d $prefix) && {
+(test $prefix = NONE || test "$HOME" != "$prefix") && {
 	test -n "$verbose" && echo "	... testing for include-directories under $HOME"
 	test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
 	test -d $HOME/include/$cf_ncuhdr_root &&       cf_search="$cf_search $HOME/include/$cf_ncuhdr_root"
@@ -9554,7 +9792,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 9557 "configure"
+#line 9795 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9566,16 +9804,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9569: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9807: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9572: \$? = $ac_status" >&5
+  echo "$as_me:9810: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9575: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9813: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9578: \$? = $ac_status" >&5
+  echo "$as_me:9816: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9592,7 +9830,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}:9595: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9833: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -9613,7 +9851,7 @@ fi
 		do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 9616 "configure"
+#line 9854 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -9637,16 +9875,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9640: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9878: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9643: \$? = $ac_status" >&5
+  echo "$as_me:9881: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9646: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9884: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9649: \$? = $ac_status" >&5
+  echo "$as_me:9887: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -9667,12 +9905,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:9670: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9908: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:9675: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:9913: 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%/[^/]*$%%'`
@@ -9705,7 +9943,7 @@ if test -n "$cf_1st_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 9708 "configure"
+#line 9946 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9717,16 +9955,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9720: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9958: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9723: \$? = $ac_status" >&5
+  echo "$as_me:9961: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9726: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9964: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9729: \$? = $ac_status" >&5
+  echo "$as_me:9967: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9743,7 +9981,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}:9746: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9984: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -9786,7 +10024,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:9789: checking for terminfo header" >&5
+echo "$as_me:10027: 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
@@ -9804,10 +10042,10 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 9807 "configure"
+#line 10045 "configure"
 #include "confdefs.h"
 #include <stdio.h>
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 #include <$cf_test>
 
 int
@@ -9819,16 +10057,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9822: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10060: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9825: \$? = $ac_status" >&5
+  echo "$as_me:10063: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9828: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10066: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9831: \$? = $ac_status" >&5
+  echo "$as_me:10069: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -9844,7 +10082,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:9847: result: $cf_cv_term_header" >&5
+echo "$as_me:10085: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -9878,7 +10116,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:9881: checking for ncurses version" >&5
+echo "$as_me:10119: 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
@@ -9892,7 +10130,7 @@ else
 	# This will not work if the preprocessor splits the line after the
 	# Autoconf token.  The 'unproto' program does that.
 	cat > conftest.$ac_ext <<EOF
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 #undef Autoconf
 #ifdef NCURSES_VERSION
 Autoconf NCURSES_VERSION
@@ -9904,10 +10142,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:9907: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:10145: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:9910: \$? = $ac_status" >&5
+  echo "$as_me:10148: \$? = $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%".*%%'`
@@ -9917,10 +10155,10 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9920 "configure"
+#line 10158 "configure"
 #include "confdefs.h"
 
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 #include <stdio.h>
 int main()
 {
@@ -9938,19 +10176,19 @@ int main()
 	make an error
 # endif
 #endif
-	${cf_cv_main_return-return}(0);
+	${cf_cv_main_return:-return}(0);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:9945: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10183: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9948: \$? = $ac_status" >&5
+  echo "$as_me:10186: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:9950: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10188: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9953: \$? = $ac_status" >&5
+  echo "$as_me:10191: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -9964,7 +10202,7 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:9967: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:10205: 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
@@ -9976,7 +10214,7 @@ cf_nculib_root=$use_ncurses
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:9979: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:10217: 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
@@ -9984,7 +10222,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9987 "configure"
+#line 10225 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10003,16 +10241,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10006: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10244: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10009: \$? = $ac_status" >&5
+  echo "$as_me:10247: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10012: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10250: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10015: \$? = $ac_status" >&5
+  echo "$as_me:10253: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -10023,10 +10261,10 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10026: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:10264: 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:10029: checking for initscr in -lgpm" >&5
+  echo "$as_me:10267: 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
@@ -10034,7 +10272,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10037 "configure"
+#line 10275 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10053,16 +10291,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10056: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10294: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10059: \$? = $ac_status" >&5
+  echo "$as_me:10297: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10062: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10300: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10065: \$? = $ac_status" >&5
+  echo "$as_me:10303: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -10073,7 +10311,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10076: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:10314: 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"
@@ -10088,7 +10326,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:10091: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:10329: 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
@@ -10096,7 +10334,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10099 "configure"
+#line 10337 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10115,16 +10353,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10118: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10356: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10121: \$? = $ac_status" >&5
+  echo "$as_me:10359: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10124: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10362: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10127: \$? = $ac_status" >&5
+  echo "$as_me:10365: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -10135,7 +10373,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10138: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:10376: 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"
@@ -10149,46 +10387,18 @@ LIBS="$cf_ncurses_LIBS $LIBS"
 
 if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
 then
-
-if test -n "$cf_cv_curses_dir/lib" ; then
-  for cf_add_libdir in $cf_cv_curses_dir/lib
-  do
-    if test $cf_add_libdir = /usr/lib ; then
-      :
-    elif test -d $cf_add_libdir
-    then
-      cf_have_libdir=no
-      if test -n "$LDFLAGS$LIBS" ; then
-        # a loop is needed to ensure we can add subdirs of existing dirs
-        for cf_test_libdir in $LDFLAGS $LIBS ; do
-          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
-            cf_have_libdir=yes; break
-          fi
-        done
-      fi
-      if test "$cf_have_libdir" = no ; then
-        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
-
-echo "${as_me-configure}:10172: testing adding $cf_add_libdir to library-path ..." 1>&5
-
-        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-      fi
-    fi
-  done
-fi
-
 	LIBS="-l$cf_nculib_root $LIBS"
 else
 
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
-	echo "$as_me:10185: checking for initscr" >&5
+	echo "$as_me:10395: 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 10191 "configure"
+#line 10401 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */
@@ -10219,16 +10429,16 @@ f = initscr;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10222: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10432: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10225: \$? = $ac_status" >&5
+  echo "$as_me:10435: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10228: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10438: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10231: \$? = $ac_status" >&5
+  echo "$as_me:10441: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -10238,20 +10448,20 @@ ac_cv_func_initscr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10241: result: $ac_cv_func_initscr" >&5
+echo "$as_me:10451: 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:10248: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:10458: 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 10252 "configure"
+#line 10462 "configure"
 #include "confdefs.h"
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 int
 main ()
 {
@@ -10261,25 +10471,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10264: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10474: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10267: \$? = $ac_status" >&5
+  echo "$as_me:10477: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10270: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10480: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10273: \$? = $ac_status" >&5
+  echo "$as_me:10483: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:10275: result: yes" >&5
+  echo "$as_me:10485: 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:10282: result: no" >&5
+echo "$as_me:10492: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -10312,7 +10522,7 @@ cf_search=
 
 test "/usr" != "$prefix" && \
 test -d "/usr" && \
-(test $prefix = NONE || test -d $prefix) && {
+(test $prefix = NONE || test "/usr" != "$prefix") && {
 	test -n "$verbose" && echo "	... testing for lib-directories under /usr"
 	test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
 	test -d /usr/lib/$cf_nculib_root &&       cf_search="$cf_search /usr/lib/$cf_nculib_root"
@@ -10334,7 +10544,7 @@ test -d "$prefix" && \
 
 test "/usr/local" != "$prefix" && \
 test -d "/usr/local" && \
-(test $prefix = NONE || test -d $prefix) && {
+(test $prefix = NONE || test "/usr/local" != "$prefix") && {
 	test -n "$verbose" && echo "	... testing for lib-directories under /usr/local"
 	test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
 	test -d /usr/local/lib/$cf_nculib_root &&       cf_search="$cf_search /usr/local/lib/$cf_nculib_root"
@@ -10345,7 +10555,7 @@ test -d "/usr/local" && \
 
 test "/opt" != "$prefix" && \
 test -d "/opt" && \
-(test $prefix = NONE || test -d $prefix) && {
+(test $prefix = NONE || test "/opt" != "$prefix") && {
 	test -n "$verbose" && echo "	... testing for lib-directories under /opt"
 	test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
 	test -d /opt/lib/$cf_nculib_root &&       cf_search="$cf_search /opt/lib/$cf_nculib_root"
@@ -10356,7 +10566,7 @@ test -d "/opt" && \
 
 test "$HOME" != "$prefix" && \
 test -d "$HOME" && \
-(test $prefix = NONE || test -d $prefix) && {
+(test $prefix = NONE || test "$HOME" != "$prefix") && {
 	test -n "$verbose" && echo "	... testing for lib-directories under $HOME"
 	test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
 	test -d $HOME/lib/$cf_nculib_root &&       cf_search="$cf_search $HOME/lib/$cf_nculib_root"
@@ -10369,13 +10579,13 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:10372: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:10582: 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 10376 "configure"
+#line 10586 "configure"
 #include "confdefs.h"
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 int
 main ()
 {
@@ -10385,25 +10595,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10388: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10598: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10391: \$? = $ac_status" >&5
+  echo "$as_me:10601: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10394: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10604: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10397: \$? = $ac_status" >&5
+  echo "$as_me:10607: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:10399: result: yes" >&5
+  echo "$as_me:10609: 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:10406: result: no" >&5
+echo "$as_me:10616: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -10418,7 +10628,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:10421: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:10631: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -10426,7 +10636,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:10429: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:10639: 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
@@ -10436,9 +10646,9 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >conftest.$ac_ext <<_ACEOF
-#line 10439 "configure"
+#line 10649 "configure"
 #include "confdefs.h"
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 int
 main ()
 {
@@ -10448,23 +10658,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10451: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10661: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10454: \$? = $ac_status" >&5
+  echo "$as_me:10664: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10457: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10667: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10460: \$? = $ac_status" >&5
+  echo "$as_me:10670: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:10462: result: yes" >&5
+  echo "$as_me:10672: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:10467: result: no" >&5
+echo "$as_me:10677: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -10482,7 +10692,7 @@ fi
 else
 	cf_wide_curses=no
 
-echo "$as_me:10485: checking for extra include directories" >&5
+echo "$as_me:10695: 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
@@ -10502,11 +10712,11 @@ sunos3*|sunos4*)
 esac
 
 fi
-echo "$as_me:10505: result: $cf_cv_curses_incdir" >&5
+echo "$as_me:10715: 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:10509: checking if we have identified curses headers" >&5
+echo "$as_me:10719: 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
@@ -10518,7 +10728,7 @@ for cf_header in  \
 	ncurses.h ncurses/curses.h ncurses/ncurses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 10521 "configure"
+#line 10731 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -10530,16 +10740,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10533: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10743: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10536: \$? = $ac_status" >&5
+  echo "$as_me:10746: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10539: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10749: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10542: \$? = $ac_status" >&5
+  echo "$as_me:10752: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -10550,11 +10760,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:10553: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:10763: 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:10557: error: No curses header-files found" >&5
+	{ { echo "$as_me:10767: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -10564,23 +10774,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:10567: checking for $ac_header" >&5
+echo "$as_me:10777: 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 10573 "configure"
+#line 10783 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:10577: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:10787: \"$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:10583: \$? = $ac_status" >&5
+  echo "$as_me:10793: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -10599,7 +10809,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:10602: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:10812: 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
@@ -10609,7 +10819,7 @@ EOF
 fi
 done
 
-echo "$as_me:10612: checking for terminfo header" >&5
+echo "$as_me:10822: 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
@@ -10627,10 +10837,10 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 10630 "configure"
+#line 10840 "configure"
 #include "confdefs.h"
 #include <stdio.h>
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 #include <$cf_test>
 
 int
@@ -10642,16 +10852,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10645: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10855: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10648: \$? = $ac_status" >&5
+  echo "$as_me:10858: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10651: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10861: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10654: \$? = $ac_status" >&5
+  echo "$as_me:10864: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -10667,7 +10877,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:10670: result: $cf_cv_term_header" >&5
+echo "$as_me:10880: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -10696,7 +10906,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:10699: checking for ncurses version" >&5
+echo "$as_me:10909: 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
@@ -10710,7 +10920,7 @@ else
 	# This will not work if the preprocessor splits the line after the
 	# Autoconf token.  The 'unproto' program does that.
 	cat > conftest.$ac_ext <<EOF
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 #undef Autoconf
 #ifdef NCURSES_VERSION
 Autoconf NCURSES_VERSION
@@ -10722,10 +10932,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:10725: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:10935: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:10728: \$? = $ac_status" >&5
+  echo "$as_me:10938: \$? = $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%".*%%'`
@@ -10735,10 +10945,10 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10738 "configure"
+#line 10948 "configure"
 #include "confdefs.h"
 
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 #include <stdio.h>
 int main()
 {
@@ -10756,19 +10966,19 @@ int main()
 	make an error
 # endif
 #endif
-	${cf_cv_main_return-return}(0);
+	${cf_cv_main_return:-return}(0);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:10763: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10973: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10766: \$? = $ac_status" >&5
+  echo "$as_me:10976: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:10768: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10978: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10771: \$? = $ac_status" >&5
+  echo "$as_me:10981: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -10782,18 +10992,18 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:10785: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:10995: 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:10791: checking if we have identified curses libraries" >&5
+echo "$as_me:11001: 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 10794 "configure"
+#line 11004 "configure"
 #include "confdefs.h"
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 int
 main ()
 {
@@ -10803,16 +11013,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10806: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11016: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10809: \$? = $ac_status" >&5
+  echo "$as_me:11019: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10812: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11022: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10815: \$? = $ac_status" >&5
+  echo "$as_me:11025: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -10821,13 +11031,13 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:10824: result: $cf_result" >&5
+echo "$as_me:11034: 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:10830: checking for tgoto in -lmytinfo" >&5
+    echo "$as_me:11040: 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
@@ -10835,7 +11045,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10838 "configure"
+#line 11048 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10854,16 +11064,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10857: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11067: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10860: \$? = $ac_status" >&5
+  echo "$as_me:11070: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10863: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11073: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10866: \$? = $ac_status" >&5
+  echo "$as_me:11076: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -10874,7 +11084,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10877: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:11087: 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"
@@ -10882,7 +11092,7 @@ fi
 
     ;;
 hpux10.*) #(vi
-    echo "$as_me:10885: checking for initscr in -lcur_colr" >&5
+    echo "$as_me:11095: 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
@@ -10890,7 +11100,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcur_colr  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10893 "configure"
+#line 11103 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10909,16 +11119,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10912: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11122: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10915: \$? = $ac_status" >&5
+  echo "$as_me:11125: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10918: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11128: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10921: \$? = $ac_status" >&5
+  echo "$as_me:11131: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_cur_colr_initscr=yes
 else
@@ -10929,7 +11139,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10932: result: $ac_cv_lib_cur_colr_initscr" >&5
+echo "$as_me:11142: 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
 
@@ -10938,7 +11148,7 @@ if test $ac_cv_lib_cur_colr_initscr = yes; then
 
 else
 
-    echo "$as_me:10941: checking for initscr in -lHcurses" >&5
+    echo "$as_me:11151: 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
@@ -10946,7 +11156,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lHcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10949 "configure"
+#line 11159 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10965,16 +11175,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10968: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11178: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10971: \$? = $ac_status" >&5
+  echo "$as_me:11181: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10974: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11184: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10977: \$? = $ac_status" >&5
+  echo "$as_me:11187: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Hcurses_initscr=yes
 else
@@ -10985,7 +11195,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10988: result: $ac_cv_lib_Hcurses_initscr" >&5
+echo "$as_me:11198: 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
 
@@ -10999,7 +11209,40 @@ fi
 fi
 
     ;;
-linux*) # Suse Linux does not follow /usr/lib convention
+linux*)
+	case `arch` in
+	x86_64)
+		if test -d /lib64
+		then
+
+if test -n "/lib64" ; then
+  for cf_add_libdir in /lib64
+  do
+    if test $cf_add_libdir = /usr/lib ; then
+      :
+    elif test -d $cf_add_libdir
+    then
+      cf_have_libdir=no
+      if test -n "$LDFLAGS$LIBS" ; then
+        # a loop is needed to ensure we can add subdirs of existing dirs
+        for cf_test_libdir in $LDFLAGS $LIBS ; do
+          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+            cf_have_libdir=yes; break
+          fi
+        done
+      fi
+      if test "$cf_have_libdir" = no ; then
+        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+
+echo "${as_me:-configure}:11237: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+      fi
+    fi
+  done
+fi
+
+		else
 
 if test -n "/lib" ; then
   for cf_add_libdir in /lib
@@ -11020,7 +11263,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}:11023: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:11266: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -11028,6 +11271,39 @@ echo "${as_me-configure}:11023: testing adding $cf_add_libdir to library-path ..
   done
 fi
 
+		fi
+		;;
+	*)
+
+if test -n "/lib" ; then
+  for cf_add_libdir in /lib
+  do
+    if test $cf_add_libdir = /usr/lib ; then
+      :
+    elif test -d $cf_add_libdir
+    then
+      cf_have_libdir=no
+      if test -n "$LDFLAGS$LIBS" ; then
+        # a loop is needed to ensure we can add subdirs of existing dirs
+        for cf_test_libdir in $LDFLAGS $LIBS ; do
+          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+            cf_have_libdir=yes; break
+          fi
+        done
+      fi
+      if test "$cf_have_libdir" = no ; then
+        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+
+echo "${as_me:-configure}:11297: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+      fi
+    fi
+  done
+fi
+
+		;;
+	esac
     ;;
 sunos3*|sunos4*)
     if test -d /usr/5lib ; then
@@ -11051,7 +11327,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}:11054: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:11330: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -11059,7 +11335,7 @@ echo "${as_me-configure}:11054: testing adding $cf_add_libdir to library-path ..
   done
 fi
 
-      LIBS="$LIBS -lcurses -ltermcap"
+      LIBS="-lcurses -ltermcap $LIBS"
     fi
     ac_cv_func_initscr=yes
     ;;
@@ -11070,7 +11346,7 @@ if test ".$ac_cv_func_initscr" != .yes ; then
     cf_term_lib=""
     cf_curs_lib=""
 
-    if test ".${cf_cv_ncurses_version-no}" != .no
+    if test ".${cf_cv_ncurses_version:-no}" != .no
     then
         cf_check_list="ncurses curses cursesX"
     else
@@ -11079,13 +11355,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:11082: checking for tgoto" >&5
+    echo "$as_me:11358: 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 11088 "configure"
+#line 11364 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char tgoto (); below.  */
@@ -11116,16 +11392,16 @@ f = tgoto;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11119: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11395: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11122: \$? = $ac_status" >&5
+  echo "$as_me:11398: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11125: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11401: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11128: \$? = $ac_status" >&5
+  echo "$as_me:11404: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_tgoto=yes
 else
@@ -11135,7 +11411,7 @@ ac_cv_func_tgoto=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:11138: result: $ac_cv_func_tgoto" >&5
+echo "$as_me:11414: 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
@@ -11144,7 +11420,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:11147: checking for tgoto in -l$cf_term_lib" >&5
+echo "$as_me:11423: 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
@@ -11152,7 +11428,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_term_lib  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 11155 "configure"
+#line 11431 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11171,16 +11447,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11174: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11450: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11177: \$? = $ac_status" >&5
+  echo "$as_me:11453: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11180: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11456: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11183: \$? = $ac_status" >&5
+  echo "$as_me:11459: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -11191,7 +11467,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11194: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:11470: 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
@@ -11206,7 +11482,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:11209: checking for initscr in -l$cf_curs_lib" >&5
+echo "$as_me:11485: 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
@@ -11214,7 +11490,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_curs_lib  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 11217 "configure"
+#line 11493 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11233,16 +11509,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11236: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11512: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11239: \$? = $ac_status" >&5
+  echo "$as_me:11515: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11242: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11518: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11245: \$? = $ac_status" >&5
+  echo "$as_me:11521: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -11253,25 +11529,25 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11256: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:11532: 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:11263: error: no curses library found" >&5
+    test $cf_curs_lib = unknown && { { echo "$as_me:11539: 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:11269: checking if we can link with $cf_curs_lib library" >&5
+        echo "$as_me:11545: 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 11272 "configure"
+#line 11548 "configure"
 #include "confdefs.h"
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 int
 main ()
 {
@@ -11281,16 +11557,16 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11284: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11560: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11287: \$? = $ac_status" >&5
+  echo "$as_me:11563: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11290: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11566: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11293: \$? = $ac_status" >&5
+  echo "$as_me:11569: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -11299,20 +11575,20 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-        echo "$as_me:11302: result: $cf_result" >&5
+        echo "$as_me:11578: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
-        test $cf_result = no && { { echo "$as_me:11304: error: Cannot link curses library" >&5
+        test $cf_result = no && { { echo "$as_me:11580: 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:11310: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+        echo "$as_me:11586: 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 11313 "configure"
+#line 11589 "configure"
 #include "confdefs.h"
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 int
 main ()
 {
@@ -11322,16 +11598,16 @@ initscr(); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11325: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11601: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11328: \$? = $ac_status" >&5
+  echo "$as_me:11604: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11331: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11607: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11334: \$? = $ac_status" >&5
+  echo "$as_me:11610: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=no
 else
@@ -11340,9 +11616,9 @@ cat conftest.$ac_ext >&5
 
             LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
             cat >conftest.$ac_ext <<_ACEOF
-#line 11343 "configure"
+#line 11619 "configure"
 #include "confdefs.h"
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 int
 main ()
 {
@@ -11352,16 +11628,16 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11355: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11631: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11358: \$? = $ac_status" >&5
+  echo "$as_me:11634: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11361: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11637: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11364: \$? = $ac_status" >&5
+  echo "$as_me:11640: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -11373,7 +11649,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:11376: result: $cf_result" >&5
+        echo "$as_me:11652: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
     fi
 fi
@@ -11383,7 +11659,7 @@ fi
 
 cf_all_widgets=yes
 
-echo "$as_me:11386: checking if you want extra dialogs" >&5
+echo "$as_me:11662: 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.
@@ -11393,7 +11669,7 @@ if test "${enable_extras+set}" = set; then
 else
   enableval=yes
 fi;
-echo "$as_me:11396: result: $enableval" >&5
+echo "$as_me:11672: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 if test "$enableval" != no ; then
 cf_all_widgets=yes
@@ -11401,7 +11677,7 @@ else
 cf_all_widgets=no
 fi
 
-echo "$as_me:11404: checking if you want config-file support" >&5
+echo "$as_me:11680: 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.
@@ -11411,7 +11687,7 @@ if test "${enable_rc_file+set}" = set; then
 else
   enableval=$cf_all_widgets
 fi;
-echo "$as_me:11414: result: $enableval" >&5
+echo "$as_me:11690: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 if test "$enableval" != no ; then
 EXTRAOBJS="$EXTRAOBJS rc\$o"
@@ -11423,7 +11699,7 @@ else
 	:
 fi
 
-echo "$as_me:11426: checking if you want Xdialog-style dialogs" >&5
+echo "$as_me:11702: 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.
@@ -11433,7 +11709,7 @@ if test "${enable_Xdialog+set}" = set; then
 else
   enableval=$cf_all_widgets
 fi;
-echo "$as_me:11436: result: $enableval" >&5
+echo "$as_me:11712: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 if test "$enableval" != no ; then
 EXTRAOBJS="$EXTRAOBJS calendar\$o fselect\$o timebox\$o"
@@ -11445,7 +11721,7 @@ else
 	:
 fi
 
-echo "$as_me:11448: checking if you want the form dialog" >&5
+echo "$as_me:11724: 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.
@@ -11455,7 +11731,7 @@ if test "${enable_form+set}" = set; then
 else
   enableval=$cf_all_widgets
 fi;
-echo "$as_me:11458: result: $enableval" >&5
+echo "$as_me:11734: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 if test "$enableval" != no ; then
 EXTRAOBJS="$EXTRAOBJS formbox\$o"
@@ -11467,7 +11743,7 @@ else
 	:
 fi
 
-echo "$as_me:11470: checking if you want the gauge dialog" >&5
+echo "$as_me:11746: 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.
@@ -11477,10 +11753,10 @@ if test "${enable_gauge+set}" = set; then
 else
   enableval=$cf_all_widgets
 fi;
-echo "$as_me:11480: result: $enableval" >&5
+echo "$as_me:11756: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 if test "$enableval" != no ; then
-EXTRAOBJS="$EXTRAOBJS guage\$o pause\$o progressbox\$o"
+EXTRAOBJS="$EXTRAOBJS guage\$o pause\$o prgbox\$o progressbox\$o"
 	 cat >>confdefs.h <<\EOF
 #define HAVE_DLG_GAUGE 1
 EOF
@@ -11489,7 +11765,7 @@ else
 	:
 fi
 
-echo "$as_me:11492: checking if you want the tailbox dialog" >&5
+echo "$as_me:11768: 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.
@@ -11499,7 +11775,7 @@ if test "${enable_tailbox+set}" = set; then
 else
   enableval=$cf_all_widgets
 fi;
-echo "$as_me:11502: result: $enableval" >&5
+echo "$as_me:11778: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 if test "$enableval" != no ; then
 EXTRAOBJS="$EXTRAOBJS tailbox\$o"
@@ -11511,7 +11787,7 @@ else
 	:
 fi
 
-echo "$as_me:11514: checking if you want the mixedform dialog" >&5
+echo "$as_me:11790: 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.
@@ -11521,7 +11797,7 @@ if test "${enable_mixedform+set}" = set; then
 else
   enableval=$cf_all_widgets
 fi;
-echo "$as_me:11524: result: $enableval" >&5
+echo "$as_me:11800: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 if test "$enableval" != no ; then
 EXTRAOBJS="$EXTRAOBJS mixedform\$o"
@@ -11533,7 +11809,7 @@ else
 	:
 fi
 
-echo "$as_me:11536: checking if you want the mixedgauge dialog" >&5
+echo "$as_me:11812: 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.
@@ -11543,7 +11819,7 @@ if test "${enable_mixedgauge+set}" = set; then
 else
   enableval=$cf_all_widgets
 fi;
-echo "$as_me:11546: result: $enableval" >&5
+echo "$as_me:11822: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 if test "$enableval" != no ; then
 EXTRAOBJS="$EXTRAOBJS mixedgauge\$o"
@@ -11555,7 +11831,7 @@ else
 	:
 fi
 
-echo "$as_me:11558: checking if you want the wide-curses features" >&5
+echo "$as_me:11834: 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.
@@ -11565,7 +11841,7 @@ if test "${enable_widec+set}" = set; then
 else
   enableval=$cf_wide_curses
 fi;
-echo "$as_me:11568: result: $enableval" >&5
+echo "$as_me:11844: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 if test "$enableval" != no ; then
 cat >>confdefs.h <<\EOF
@@ -11576,13 +11852,13 @@ else
 	:
 fi
 
-echo "$as_me:11579: checking for ANSI C header files" >&5
+echo "$as_me:11855: 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 11585 "configure"
+#line 11861 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -11590,13 +11866,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:11593: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:11869: \"$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:11599: \$? = $ac_status" >&5
+  echo "$as_me:11875: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11618,7 +11894,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 11621 "configure"
+#line 11897 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -11629,14 +11905,14 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 else
   ac_cv_header_stdc=no
 fi
-rm -f conftest*
+rm -rf conftest*
 
 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 11639 "configure"
+#line 11915 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -11647,7 +11923,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 else
   ac_cv_header_stdc=no
 fi
-rm -f conftest*
+rm -rf conftest*
 
 fi
 
@@ -11657,7 +11933,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11660 "configure"
+#line 11936 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -11683,15 +11959,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:11686: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11962: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11689: \$? = $ac_status" >&5
+  echo "$as_me:11965: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:11691: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11967: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11694: \$? = $ac_status" >&5
+  echo "$as_me:11970: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11704,7 +11980,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:11707: result: $ac_cv_header_stdc" >&5
+echo "$as_me:11983: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -11714,13 +11990,13 @@ EOF
 
 fi
 
-echo "$as_me:11717: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:11993: 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 11723 "configure"
+#line 11999 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -11736,16 +12012,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11739: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12015: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11742: \$? = $ac_status" >&5
+  echo "$as_me:12018: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11745: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12021: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11748: \$? = $ac_status" >&5
+  echo "$as_me:12024: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_header_time=yes
 else
@@ -11755,7 +12031,7 @@ ac_cv_header_time=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:11758: result: $ac_cv_header_time" >&5
+echo "$as_me:12034: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -11768,13 +12044,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:11771: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:12047: 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 11777 "configure"
+#line 12053 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -11789,16 +12065,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11792: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12068: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11795: \$? = $ac_status" >&5
+  echo "$as_me:12071: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11798: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12074: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11801: \$? = $ac_status" >&5
+  echo "$as_me:12077: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -11808,7 +12084,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:11811: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:12087: 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
@@ -11821,7 +12097,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:11824: checking for opendir in -ldir" >&5
+  echo "$as_me:12100: 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
@@ -11829,7 +12105,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 11832 "configure"
+#line 12108 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11848,16 +12124,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11851: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12127: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11854: \$? = $ac_status" >&5
+  echo "$as_me:12130: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11857: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12133: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11860: \$? = $ac_status" >&5
+  echo "$as_me:12136: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -11868,14 +12144,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11871: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:12147: 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:11878: checking for opendir in -lx" >&5
+  echo "$as_me:12154: 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
@@ -11883,7 +12159,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 11886 "configure"
+#line 12162 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11902,16 +12178,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11905: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12181: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11908: \$? = $ac_status" >&5
+  echo "$as_me:12184: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11911: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12187: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11914: \$? = $ac_status" >&5
+  echo "$as_me:12190: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -11922,7 +12198,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11925: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:12201: 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"
@@ -11933,23 +12209,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:11936: checking for $ac_header" >&5
+echo "$as_me:12212: 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 11942 "configure"
+#line 12218 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:11946: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:12222: \"$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:11952: \$? = $ac_status" >&5
+  echo "$as_me:12228: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11968,7 +12244,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:11971: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:12247: 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
@@ -11978,7 +12254,7 @@ EOF
 fi
 done
 
-echo "$as_me:11981: checking for term.h" >&5
+echo "$as_me:12257: 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
@@ -11987,14 +12263,14 @@ else
 # If we found <ncurses/curses.h>, look for <ncurses/term.h>, but always look
 # for <term.h> if we do not find the variant.
 for cf_header in \
-	`echo ${cf_cv_ncurses_header-curses.h} | sed -e 's%/.*%/%'`term.h \
+	`echo ${cf_cv_ncurses_header:-curses.h} | sed -e 's%/.*%/%'`term.h \
 	term.h
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 11994 "configure"
+#line 12270 "configure"
 #include "confdefs.h"
 
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 #include <${cf_header}>
 int
 main ()
@@ -12005,16 +12281,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12008: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12284: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12011: \$? = $ac_status" >&5
+  echo "$as_me:12287: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12014: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12290: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12017: \$? = $ac_status" >&5
+  echo "$as_me:12293: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_term_header=$cf_header
 	 break
@@ -12033,10 +12309,10 @@ no)
 	for cf_header in ncurses/term.h ncursesw/term.h
 	do
 		cat >conftest.$ac_ext <<_ACEOF
-#line 12036 "configure"
+#line 12312 "configure"
 #include "confdefs.h"
 
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 #ifdef NCURSES_VERSION
 #include <${cf_header}>
 #else
@@ -12051,16 +12327,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12054: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12330: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12057: \$? = $ac_status" >&5
+  echo "$as_me:12333: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12060: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12336: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12063: \$? = $ac_status" >&5
+  echo "$as_me:12339: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_term_header=$cf_header
 			 break
@@ -12075,7 +12351,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 esac
 
 fi
-echo "$as_me:12078: result: $cf_cv_term_header" >&5
+echo "$as_me:12354: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 case $cf_cv_term_header in #(vi
@@ -12099,13 +12375,13 @@ EOF
 	;;
 esac
 
-echo "$as_me:12102: checking return type of signal handlers" >&5
+echo "$as_me:12378: 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 12108 "configure"
+#line 12384 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -12127,16 +12403,16 @@ int i;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12130: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12406: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12133: \$? = $ac_status" >&5
+  echo "$as_me:12409: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12136: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12412: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12139: \$? = $ac_status" >&5
+  echo "$as_me:12415: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_signal=void
 else
@@ -12146,7 +12422,7 @@ ac_cv_type_signal=int
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12149: result: $ac_cv_type_signal" >&5
+echo "$as_me:12425: result: $ac_cv_type_signal" >&5
 echo "${ECHO_T}$ac_cv_type_signal" >&6
 
 cat >>confdefs.h <<EOF
@@ -12155,20 +12431,29 @@ EOF
 
 for ac_func in \
 _nc_free_and_exit \
+btowc \
+mblen \
+mbrlen \
+mbrtowc \
+mbtowc \
 strcasecmp \
 strftime \
 tsearch \
 waitpid \
+wcsrtombs \
+wcstombs \
+wctob \
+wctomb \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:12165: checking for $ac_func" >&5
+echo "$as_me:12450: 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 12171 "configure"
+#line 12456 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -12199,16 +12484,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12202: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12487: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12205: \$? = $ac_status" >&5
+  echo "$as_me:12490: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12208: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12493: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12211: \$? = $ac_status" >&5
+  echo "$as_me:12496: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -12218,7 +12503,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12221: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:12506: 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
@@ -12228,24 +12513,24 @@ EOF
 fi
 done
 
-echo "$as_me:12231: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+echo "$as_me:12516: 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 12238 "configure"
+#line 12523 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 int
 main ()
 {
 
 #if defined(NCURSES_VERSION_PATCH)
-if (NCURSES_VERSION_PATCH < 20100501) && (NCURSES_VERSION_PATCH >= 20100403)
+#if (NCURSES_VERSION_PATCH < 20100501) && (NCURSES_VERSION_PATCH >= 20100403)
 	make an error
 #endif
 #endif
@@ -12257,28 +12542,28 @@ if (NCURSES_VERSION_PATCH < 20100501) && (NCURSES_VERSION_PATCH >= 20100403)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12260: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12545: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12263: \$? = $ac_status" >&5
+  echo "$as_me:12548: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12266: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12551: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12269: \$? = $ac_status" >&5
+  echo "$as_me:12554: \$? = $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 12276 "configure"
+#line 12561 "configure"
 #include "confdefs.h"
 
 #define _XOPEN_SOURCE_EXTENDED
 #include <stdlib.h>
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 int
 main ()
 {
@@ -12295,16 +12580,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12298: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12583: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12301: \$? = $ac_status" >&5
+  echo "$as_me:12586: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12304: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12589: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12307: \$? = $ac_status" >&5
+  echo "$as_me:12592: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_xopen_extension=yes
 else
@@ -12316,12 +12601,13 @@ 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:12319: result: $cf_cv_need_xopen_extension" >&5
+echo "$as_me:12604: 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"
 
 for cf_func in \
 flushinp \
+getattrs \
 getbegx \
 getbegy \
 getbegyx \
@@ -12340,10 +12626,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:12343: checking for ${cf_func}" >&5
+	echo "$as_me:12629: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me-configure}:12346: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:12632: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12352,14 +12638,14 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >conftest.$ac_ext <<_ACEOF
-#line 12355 "configure"
+#line 12641 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
 #include <xcurses.h>
 char * XCursesProgramName = "test";
 #else
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 #if defined(NCURSES_VERSION) && defined(HAVE_NCURSESW_TERM_H)
 #include <ncursesw/term.h>
 #elif defined(NCURSES_VERSION) && defined(HAVE_NCURSES_TERM_H)
@@ -12375,7 +12661,7 @@ main ()
 
 #ifndef ${cf_func}
 long foo = (long)(&${cf_func});
-${cf_cv_main_return-return}(foo == 0);
+${cf_cv_main_return:-return}(foo == 0);
 #endif
 
   ;
@@ -12383,16 +12669,16 @@ ${cf_cv_main_return-return}(foo == 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12386: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12672: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12389: \$? = $ac_status" >&5
+  echo "$as_me:12675: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12392: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12678: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12395: \$? = $ac_status" >&5
+  echo "$as_me:12681: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -12408,7 +12694,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:12411: result: $cf_result" >&5
+	echo "$as_me:12697: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test $cf_result != no; then
 		cat >>confdefs.h <<EOF
@@ -12418,13 +12704,13 @@ EOF
 	fi
 done
 
-echo "$as_me:12421: checking for start_color" >&5
+echo "$as_me:12707: 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 12427 "configure"
+#line 12713 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char start_color (); below.  */
@@ -12455,16 +12741,16 @@ f = start_color;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12458: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12744: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12461: \$? = $ac_status" >&5
+  echo "$as_me:12747: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12464: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12750: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12467: \$? = $ac_status" >&5
+  echo "$as_me:12753: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_start_color=yes
 else
@@ -12474,7 +12760,7 @@ ac_cv_func_start_color=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12477: result: $ac_cv_func_start_color" >&5
+echo "$as_me:12763: 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
@@ -12483,16 +12769,16 @@ EOF
 
 fi
 
-echo "$as_me:12486: checking for chtype typedef" >&5
+echo "$as_me:12772: 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 12493 "configure"
+#line 12779 "configure"
 #include "confdefs.h"
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 int
 main ()
 {
@@ -12502,16 +12788,16 @@ chtype foo
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12505: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12791: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12508: \$? = $ac_status" >&5
+  echo "$as_me:12794: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12511: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12797: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12514: \$? = $ac_status" >&5
+  echo "$as_me:12800: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_chtype_decl=yes
 else
@@ -12521,23 +12807,23 @@ cf_cv_chtype_decl=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12524: result: $cf_cv_chtype_decl" >&5
+echo "$as_me:12810: 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:12531: checking if chtype is scalar or struct" >&5
+	echo "$as_me:12817: 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 12538 "configure"
+#line 12824 "configure"
 #include "confdefs.h"
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
 int
 main ()
 {
@@ -12547,16 +12833,16 @@ chtype foo; long x = foo
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12550: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12836: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12553: \$? = $ac_status" >&5
+  echo "$as_me:12839: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12556: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12842: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12559: \$? = $ac_status" >&5
+  echo "$as_me:12845: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_chtype_type=scalar
 else
@@ -12566,7 +12852,7 @@ cf_cv_chtype_type=struct
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12569: result: $cf_cv_chtype_type" >&5
+echo "$as_me:12855: 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
@@ -12576,26 +12862,168 @@ EOF
 	fi
 fi
 
+echo "$as_me:12865: checking for wide alternate character set array" >&5
+echo $ECHO_N "checking for wide alternate character set array... $ECHO_C" >&6
+if test "${cf_cv_curses_wacs_map+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+	cf_cv_curses_wacs_map=unknown
+	for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
+	do
+	cat >conftest.$ac_ext <<_ACEOF
+#line 12875 "configure"
+#include "confdefs.h"
+
+#ifndef _XOPEN_SOURCE_EXTENDED
+#define _XOPEN_SOURCE_EXTENDED
+#endif
+#include <${cf_cv_ncurses_header:-curses.h}>
+int
+main ()
+{
+void *foo = &($name['k'])
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:12891: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:12894: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:12897: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:12900: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  cf_cv_curses_wacs_map=$name
+	 break
+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
+	done
+fi
+echo "$as_me:12911: result: $cf_cv_curses_wacs_map" >&5
+echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
+
+test "$cf_cv_curses_wacs_map" != unknown && cat >>confdefs.h <<EOF
+#define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map
+EOF
+
+echo "$as_me:12918: checking for wide alternate character constants" >&5
+echo $ECHO_N "checking for wide alternate character constants... $ECHO_C" >&6
+if test "${cf_cv_curses_wacs_symbols+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+cf_cv_curses_wacs_symbols=no
+if test "$cf_cv_curses_wacs_map" != unknown
+then
+	cat >conftest.$ac_ext <<_ACEOF
+#line 12928 "configure"
+#include "confdefs.h"
+
+#ifndef _XOPEN_SOURCE_EXTENDED
+#define _XOPEN_SOURCE_EXTENDED
+#endif
+#include <${cf_cv_ncurses_header:-curses.h}>
+int
+main ()
+{
+cchar_t *foo = WACS_PLUS;
+	 $cf_cv_curses_wacs_map['k'] = *WACS_PLUS
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:12945: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:12948: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:12951: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:12954: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  cf_cv_curses_wacs_symbols=yes
+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
+else
+	cat >conftest.$ac_ext <<_ACEOF
+#line 12964 "configure"
+#include "confdefs.h"
+
+#ifndef _XOPEN_SOURCE_EXTENDED
+#define _XOPEN_SOURCE_EXTENDED
+#endif
+#include <${cf_cv_ncurses_header:-curses.h}>
+int
+main ()
+{
+cchar_t *foo = WACS_PLUS
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:12980: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:12983: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:12986: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:12989: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  cf_cv_curses_wacs_symbols=yes
+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
+
+fi
+echo "$as_me:13000: result: $cf_cv_curses_wacs_symbols" >&5
+echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6
+
+test "$cf_cv_curses_wacs_symbols" != no && cat >>confdefs.h <<\EOF
+#define CURSES_WACS_SYMBOLS 1
+EOF
+
 for ac_header in sys/wait.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:12582: checking for $ac_header" >&5
+echo "$as_me:13010: 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 12588 "configure"
+#line 13016 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:12592: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:13020: \"$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:12598: \$? = $ac_status" >&5
+  echo "$as_me:13026: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12614,7 +13042,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:12617: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:13045: 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
@@ -12635,23 +13063,23 @@ else
 for ac_header in wait.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:12638: checking for $ac_header" >&5
+echo "$as_me:13066: 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 12644 "configure"
+#line 13072 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:12648: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:13076: \"$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:12654: \$? = $ac_status" >&5
+  echo "$as_me:13082: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12670,7 +13098,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:12673: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:13101: 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
@@ -12683,23 +13111,23 @@ done
 for ac_header in waitstatus.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:12686: checking for $ac_header" >&5
+echo "$as_me:13114: 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 12692 "configure"
+#line 13120 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:12696: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:13124: \"$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:12702: \$? = $ac_status" >&5
+  echo "$as_me:13130: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12718,7 +13146,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:12721: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:13149: 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
@@ -12740,14 +13168,14 @@ cf_wait_headers="$cf_wait_headers
 fi
 fi
 
-echo "$as_me:12743: checking for union wait" >&5
+echo "$as_me:13171: 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 12750 "configure"
+#line 13178 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -12763,16 +13191,16 @@ int x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12766: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13194: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12769: \$? = $ac_status" >&5
+  echo "$as_me:13197: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12772: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13200: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12775: \$? = $ac_status" >&5
+  echo "$as_me:13203: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_unionwait=no
 	 echo compiles ok w/o union wait 1>&5
@@ -12782,7 +13210,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 12785 "configure"
+#line 13213 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -12802,16 +13230,16 @@ union wait x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12805: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13233: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12808: \$? = $ac_status" >&5
+  echo "$as_me:13236: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12811: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13239: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12814: \$? = $ac_status" >&5
+  echo "$as_me:13242: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_unionwait=yes
 	 echo compiles ok with union wait and possibly macros too 1>&5
@@ -12826,7 +13254,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:12829: result: $cf_cv_type_unionwait" >&5
+echo "$as_me:13257: 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
@@ -12834,14 +13262,14 @@ EOF
 
 if test $cf_cv_type_unionwait = yes; then
 
-	echo "$as_me:12837: checking if union wait can be used as wait-arg" >&5
+	echo "$as_me:13265: 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 12844 "configure"
+#line 13272 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -12853,16 +13281,16 @@ union wait x; wait(&x)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12856: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13284: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12859: \$? = $ac_status" >&5
+  echo "$as_me:13287: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12862: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13290: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12865: \$? = $ac_status" >&5
+  echo "$as_me:13293: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_arg_union_wait=yes
 else
@@ -12874,20 +13302,20 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-	echo "$as_me:12877: result: $cf_cv_arg_union_wait" >&5
+	echo "$as_me:13305: 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:12883: checking if union wait can be used as waitpid-arg" >&5
+	echo "$as_me:13311: 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 12890 "configure"
+#line 13318 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -12899,16 +13327,16 @@ union wait x; waitpid(0, &x, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12902: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13330: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12905: \$? = $ac_status" >&5
+  echo "$as_me:13333: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12908: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13336: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12911: \$? = $ac_status" >&5
+  echo "$as_me:13339: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_arg_union_waitpid=yes
 else
@@ -12920,7 +13348,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-	echo "$as_me:12923: result: $cf_cv_arg_union_waitpid" >&5
+	echo "$as_me:13351: 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
@@ -12928,14 +13356,14 @@ EOF
 
 fi
 
-echo "$as_me:12931: checking if we must include wchar.h to declare mbstate_t" >&5
+echo "$as_me:13359: 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 12938 "configure"
+#line 13366 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -12952,23 +13380,23 @@ mbstate_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12955: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13383: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12958: \$? = $ac_status" >&5
+  echo "$as_me:13386: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12961: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13389: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12964: \$? = $ac_status" >&5
+  echo "$as_me:13392: \$? = $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 12971 "configure"
+#line 13399 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -12986,16 +13414,16 @@ mbstate_t value
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12989: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13417: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12992: \$? = $ac_status" >&5
+  echo "$as_me:13420: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12995: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13423: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12998: \$? = $ac_status" >&5
+  echo "$as_me:13426: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_mbstate_t=yes
 else
@@ -13007,7 +13435,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:13010: result: $cf_cv_mbstate_t" >&5
+echo "$as_me:13438: result: $cf_cv_mbstate_t" >&5
 echo "${ECHO_T}$cf_cv_mbstate_t" >&6
 
 if test "$cf_cv_mbstate_t" = yes ; then
@@ -13030,7 +13458,7 @@ PACKAGE_CONFIG=dlg_config.h
 EXTRA_OUTPUT="$EXTRA_OUTPUT headers-sh:$srcdir/headers-sh.in"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 13033 "configure"
+#line 13461 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int
@@ -13042,16 +13470,16 @@ setlocale(LC_ALL, "")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13045: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13473: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13048: \$? = $ac_status" >&5
+  echo "$as_me:13476: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13051: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13479: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13054: \$? = $ac_status" >&5
+  echo "$as_me:13482: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >>confdefs.h <<\EOF
 #define HAVE_SETLOCALE 1
@@ -13064,7 +13492,7 @@ 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 "$as_me:13495: 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
@@ -13095,17 +13523,17 @@ solaris2*) #(vi
 *)
 	;;
 esac
-echo "$as_me:13098: result: $LD_RPATH_OPT" >&5
+echo "$as_me:13526: 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 "$as_me:13531: 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"
+#line 13536 "configure"
 #include "confdefs.h"
 
 int
@@ -13117,16 +13545,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13120: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13548: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13123: \$? = $ac_status" >&5
+  echo "$as_me:13551: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13126: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13554: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13129: \$? = $ac_status" >&5
+  echo "$as_me:13557: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_rpath_space=no
 else
@@ -13136,13 +13564,13 @@ 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 "$as_me:13567: 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 "$as_me:13573: 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.
@@ -13159,21 +13587,21 @@ else
   cf_disable_rpath_hack=no
 
 fi;
-echo "$as_me:13162: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:13590: 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 "$as_me:13594: 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 "$as_me:13597: 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 "$as_me:13604: 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
@@ -13188,7 +13616,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_cf_ldd_prog="$ac_prog"
-echo "$as_me:13191: found $ac_dir/$ac_word" >&5
+echo "$as_me:13619: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -13196,10 +13624,10 @@ 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 "$as_me:13627: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:13202: result: no" >&5
+  echo "$as_me:13630: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -13211,7 +13639,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
 	if test "$cf_ldd_prog" != no
 	then
 cat >conftest.$ac_ext <<_ACEOF
-#line 13214 "configure"
+#line 13642 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13223,16 +13651,16 @@ printf("Hello");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13226: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13654: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13229: \$? = $ac_status" >&5
+  echo "$as_me:13657: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13232: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13660: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13235: \$? = $ac_status" >&5
+  echo "$as_me:13663: \$? = $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
@@ -13244,11 +13672,11 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me-configure}:13247: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:13675: 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
+echo "${as_me:-configure}:13679: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -13285,7 +13713,7 @@ do
 			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
+echo "${as_me:-configure}:13716: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -13298,11 +13726,11 @@ LDFLAGS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me-configure}:13301: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:13729: 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
+echo "${as_me:-configure}:13733: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -13339,7 +13767,7 @@ do
 			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
+echo "${as_me:-configure}:13770: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -13352,11 +13780,11 @@ LIBS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me-configure}:13355: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:13783: 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
+echo "${as_me:-configure}:13787: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 fi
 
@@ -13443,7 +13871,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:13446: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:13874: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -13569,13 +13997,13 @@ $config_headers
 Configuration commands:
 $config_commands
 
-Report bugs to <bug-autoconf@gnu.org>."
+Report bugs to <dickey@invisible-island.net>."
 EOF
 
 cat >>$CONFIG_STATUS <<EOF
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.52.20100320,
+configured by $0, generated by GNU Autoconf 2.52.20101002,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
@@ -13619,7 +14047,7 @@ cat >>$CONFIG_STATUS <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:13622: error: ambiguous option: $1
+    { { echo "$as_me:14050: 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;}
@@ -13638,7 +14066,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:13641: error: unrecognized option: $1
+  -*) { { echo "$as_me:14069: 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;}
@@ -13657,7 +14085,7 @@ cat >&5 << _ACEOF
 ## Running config.status.  ##
 ## ----------------------- ##
 
-This file was extended by $as_me 2.52.20100320, executed with
+This file was extended by $as_me 2.52.20101002, executed with
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
   CONFIG_LINKS    = $CONFIG_LINKS
@@ -13688,7 +14116,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:13691: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:14119: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -13770,11 +14198,6 @@ s,@ECHO_T@,$ECHO_T,;t t
 s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
 s,@DEFS@,$DEFS,;t t
 s,@LIBS@,$LIBS,;t t
-s,@VERSION@,$VERSION,;t t
-s,@VERSION_MAJOR@,$VERSION_MAJOR,;t t
-s,@VERSION_MINOR@,$VERSION_MINOR,;t t
-s,@VERSION_PATCH@,$VERSION_PATCH,;t t
-s,@PACKAGE@,$PACKAGE,;t t
 s,@DESTDIR@,$DESTDIR,;t t
 s,@CC@,$CC,;t t
 s,@CFLAGS@,$CFLAGS,;t t
@@ -13814,6 +14237,12 @@ s,@PROG_EXT@,$PROG_EXT,;t t
 s,@LIB_PREFIX@,$LIB_PREFIX,;t t
 s,@EXTRA_CPPFLAGS@,$EXTRA_CPPFLAGS,;t t
 s,@EXTRA_CFLAGS@,$EXTRA_CFLAGS,;t t
+s,@VERSION@,$VERSION,;t t
+s,@VERSION_MAJOR@,$VERSION_MAJOR,;t t
+s,@VERSION_MINOR@,$VERSION_MINOR,;t t
+s,@VERSION_PATCH@,$VERSION_PATCH,;t t
+s,@PACKAGE@,$PACKAGE,;t t
+s,@SUB_INC@,$SUB_INC,;t t
 s,@CONFIG_H@,$CONFIG_H,;t t
 s,@ALLOCA@,$ALLOCA,;t t
 s,@GLIBC21@,$GLIBC21,;t t
@@ -13835,14 +14264,15 @@ s,@POSUB@,$POSUB,;t t
 s,@DATADIRNAME@,$DATADIRNAME,;t t
 s,@INSTOBJEXT@,$INSTOBJEXT,;t t
 s,@GENCAT@,$GENCAT,;t t
-s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t
 s,@INTL_LIBTOOL_SUFFIX_PREFIX@,$INTL_LIBTOOL_SUFFIX_PREFIX,;t t
+s,@NLS_TEXTDOMAIN@,$NLS_TEXTDOMAIN,;t t
 s,@MSG_DIR_MAKE@,$MSG_DIR_MAKE,;t t
 s,@SUB_MAKEFILE@,$SUB_MAKEFILE,;t t
 s,@INTLDIR_MAKE@,$INTLDIR_MAKE,;t t
 s,@GT_YES@,$GT_YES,;t t
 s,@GT_NO@,$GT_NO,;t t
 s,@LINK_PREFIX@,$LINK_PREFIX,;t t
+s,@LIBTOOL_VERSION@,$LIBTOOL_VERSION,;t t
 s,@LIBTOOL@,$LIBTOOL,;t t
 s,@LT_UNDEF@,$LT_UNDEF,;t t
 s,@LIBTOOL_CXX@,$LIBTOOL_CXX,;t t
@@ -13977,7 +14407,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:13980: creating $ac_file" >&5
+    { echo "$as_me:14410: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -13995,7 +14425,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:13998: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:14428: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -14008,7 +14438,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:14011: error: cannot find input file: $f" >&5
+           { { echo "$as_me:14441: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -14074,7 +14504,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:14077: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:14507: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -14085,7 +14515,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:14088: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:14518: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -14098,7 +14528,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:14101: error: cannot find input file: $f" >&5
+           { { echo "$as_me:14531: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -14156,7 +14586,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:14159: $ac_file is unchanged" >&5
+      { echo "$as_me:14589: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -14198,7 +14628,6 @@ done; }
 done
 EOF
 cat >>$CONFIG_STATUS <<\EOF
-
 #
 # CONFIG_COMMANDS section.
 #
diff --git a/configure.in b/configure.in
index c4007f0e5c86..5ecd8fbaa33c 100644
--- a/configure.in
+++ b/configure.in
@@ -1,11 +1,36 @@
-dnl $Id: configure.in,v 1.57 2010/04/28 20:33:01 tom Exp $
+dnl $Id: configure.in,v 1.64 2011/03/01 00:59:50 tom Exp $
 dnl Process this file with autoconf to produce a configure script.
+dnl ---------------------------------------------------------------------------
+dnl Copyright 1999-2010,2011 -- Thomas E. Dickey
 dnl
+dnl Permission is hereby granted, free of charge, to any person obtaining a
+dnl copy of this software and associated documentation files (the
+dnl "Software"), to deal in the Software without restriction, including
+dnl without limitation the rights to use, copy, modify, merge, publish,
+dnl distribute, distribute with modifications, sublicense, and/or sell
+dnl copies of the Software, and to permit persons to whom the Software is
+dnl furnished to do so, subject to the following conditions:
+dnl 
+dnl The above copyright notice and this permission notice shall be included
+dnl in all copies or portions of the Software.
+dnl 
+dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+dnl IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+dnl DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+dnl OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+dnl THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+dnl 
+dnl Except as contained in this notice, the name(s) of the above copyright
+dnl holders shall not be used in advertising or otherwise to promote the
+dnl sale, use or other dealings in this Software without prior written
+dnl authorization.
+dnl ---------------------------------------------------------------------------
 AC_PREREQ(2.13.20020210)
 AC_INIT(dialog.h)
 AC_CONFIG_HEADER(dlg_config.h:config.hin)
 
-CF_VERSION_INFO(dialog)
 AC_ARG_PROGRAM
 
 DESTDIR=
@@ -39,6 +64,24 @@ CF_LARGEFILE
 CF_WITH_WARNINGS
 
 dnl
+dnl Allow dialog program and library to be renamed.
+AC_ARG_WITH(package,
+	[  --with-package=XXX      rename dialog to XXX, library to libXXX.a, etc],
+	[PACKAGE=$withval],
+	[PACKAGE=dialog])
+CF_VERSION_INFO(dialog,$PACKAGE)
+
+dnl
+dnl If package is renamed, it is useful to have the dlg_XXX headers in a
+dnl subdirectory (using the package name) so that multiple versions of the
+dnl headers can coexist.
+AC_ARG_ENABLE(header-subdir,
+	[  --enable-header-subdir  install dlg_XXX headers to subdirectory],
+	[SUB_INC=$enableval],
+	[SUB_INC=no])
+AC_SUBST(SUB_INC)
+
+dnl
 dnl Checks for libraries.
 dnl
 EXTRAOBJS=""
@@ -62,6 +105,8 @@ if test "$with_libtool" = "yes" ; then
 fi
 AC_SUBST(LIBTOOL_MAKE)
 
+CF_WITH_CURSES_DIR
+
 use_ncurses=no
 AC_ARG_WITH(ncurses,
 	[  --with-ncurses          compile/link with ncurses library],
@@ -107,7 +152,7 @@ CF_ARG_MSG_ENABLE([if you want the form dialog],
 CF_ARG_MSG_ENABLE([if you want the gauge dialog],
 	gauge,
 	[  --disable-gauge         do not include the gauge dialogs],
-	[EXTRAOBJS="$EXTRAOBJS guage\$o pause\$o progressbox\$o"
+	[EXTRAOBJS="$EXTRAOBJS guage\$o pause\$o prgbox\$o progressbox\$o"
 	 AC_DEFINE(HAVE_DLG_GAUGE)],,$cf_all_widgets)
 
 CF_ARG_MSG_ENABLE([if you want the tailbox dialog],
@@ -150,14 +195,24 @@ dnl
 AC_TYPE_SIGNAL
 AC_CHECK_FUNCS(\
 _nc_free_and_exit \
+btowc \
+mblen \
+mbrlen \
+mbrtowc \
+mbtowc \
 strcasecmp \
 strftime \
 tsearch \
 waitpid \
+wcsrtombs \
+wcstombs \
+wctob \
+wctomb \
 )
 
 CF_CURSES_FUNCS(\
 flushinp \
+getattrs \
 getbegx \
 getbegy \
 getbegyx \
@@ -175,6 +230,7 @@ wget_wch \
 
 AC_CHECK_FUNC(start_color,[AC_DEFINE(HAVE_COLOR)])
 CF_CURSES_CHTYPE
+CF_CURSES_WACS_SYMBOLS
 CF_FUNC_WAIT
 CF_MBSTATE_T
 
diff --git a/dialog-config.in b/dialog-config.in
index 39541c6fc247..443fc97364f1 100644
--- a/dialog-config.in
+++ b/dialog-config.in
@@ -1,7 +1,7 @@
 #!@SHELL@
-# $Id: dialog-config.in,v 1.3 2007/02/25 19:33:58 tom Exp $
+# $Id: dialog-config.in,v 1.5 2011/01/06 09:38:03 tom Exp $
 ##############################################################################
-# Copyright (c) 2007 Thomas E. Dickey                                        #
+# Copyright (c) 2007,2011 Thomas E. Dickey                                   #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #
@@ -36,7 +36,7 @@ libdir="@libdir@"
 datadir="@datadir@"
 mandir="@mandir@"
 
-THIS="dialog"
+THIS="@PACKAGE@"
 
 test $# = 0 && exec @SHELL@ $0 --error
 
diff --git a/dialog.1 b/dialog.1
index 5168fb3dd62c..fc9931168804 100644
--- a/dialog.1
+++ b/dialog.1
@@ -1,6 +1,6 @@
 '\" t
-.\" $Id: dialog.1,v 1.120 2010/01/18 10:19:07 tom Exp $
-.\" Copyright 2005-2008,2010  Thomas E. Dickey
+.\" $Id: dialog.1,v 1.126 2011/03/02 01:24:21 tom Exp $
+.\" Copyright 2005-2010,2011  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
@@ -16,6 +16,13 @@
 .\"	Free Software Foundation, Inc.
 .\"	51 Franklin St., Fifth Floor
 .\"	Boston, MA 02110, USA.
+.\"
+.\" definitions for renaming
+.ds p dialog
+.ds l dialog
+.ds L Dialog
+.ds D DIALOG
+.\"
 .de ES
 .ne 8
 .IP
@@ -29,25 +36,25 @@
 .RE
 ..
 .
-.TH DIALOG 1 "" "$Date: 2010/01/18 10:19:07 $"
+.TH \*D 1 "" "$Date: 2011/03/02 01:24:21 $"
 .SH NAME
-dialog \- display dialog boxes from shell scripts
+\*p \- display dialog boxes from shell scripts
 .SH SYNOPSIS
-\fBdialog --clear\fP
+\fB\*p --clear\fP
 .br
-.BI "dialog --create-rc " file
+.BI "\*p --create-rc " file
 .br
-\fBdialog --print-maxsize\fP
+\fB\*p --print-maxsize\fP
 .br
-\fBdialog\fP
+\fB\*p\fP
 \fIcommon-options\fP
 \fIbox-options\fP
 .SH DESCRIPTION
-\fBDialog\fP
+\fB\*L\fP
 is a program that will let you to present a variety of questions or
 display messages using dialog boxes from a shell script.
 These types of dialog boxes are implemented
-(though not all are necessarily compiled into \fBdialog\fR):
+(though not all are necessarily compiled into \fB\*p\fR):
 .RS
 .LP
 .nh
@@ -69,6 +76,8 @@ These types of dialog boxes are implemented
 .BR passwordbox ", "
 .BR passwordform ", "
 .BR pause ", "
+.BR prgbox ", "
+.BR programbox ", "
 .BR progressbox ", "
 .BR radiolist ", "
 .BR tailbox ", "
@@ -83,19 +92,19 @@ These types of dialog boxes are implemented
 You can put more than one dialog box into a script:
 .TP 5
 -
-Use the "\fB--and-widget\fP" token to force Dialog to proceed to the next
+Use the "\fB--and-widget\fP" token to force \fB\*p\fP to proceed to the next
 dialog unless you have pressed ESC to cancel, or
 .TP 5
 -
 Simply add the tokens for the next dialog box, making a chain.
-Dialog stops chaining when the return code from a dialog is nonzero,
+\*L stops chaining when the return code from a dialog is nonzero,
 e.g., Cancel or No (see DIAGNOSTICS).
 .PP
-Some widgets, e.g., checklist, will write text to \fBdialog\fP's output.
+Some widgets, e.g., checklist, will write text to \fB\*p\fP's output.
 Normally that is the standard error, but there are options for
 changing this: "\fB--output-fd\fP", "\fB--stderr\fP" and "\fB--stdout\fP".
 No text is written if the Cancel button (or ESC) is pressed;
-\fBdialog\fP exits immediately in that case.
+\fB\*p\fP exits immediately in that case.
 .
 .\" ************************************************************************
 .SH OPTIONS
@@ -106,26 +115,26 @@ for the benefit of those using systems with deranged locale support).
 A "\fB--\fP" by itself is used as an escape,
 i.e., the next token on the command-line is not treated as an option.
 .RS
-.B dialog --title -- --Not an option
+.B \*p --title -- --Not an option
 .RE
 .PP
-The "\fB--args\fP" option tells \fBdialog\fP to list the command-line
+The "\fB--args\fP" option tells \fB\*p\fP to list the command-line
 parameters to the standard error.
 This is useful when debugging complex scripts using
 the "\fB--\fP" and "\fB--file\fP",
 since the command-line may be rewritten as these are expanded.
 .PP
-The "\fB--file\fP" option tells \fBdialog\fP to read parameters from
+The "\fB--file\fP" option tells \fB\*p\fP to read parameters from
 the file named as its value.
 .RS
-.B dialog --file \fIparameterfile
+.B \*p --file \fIparameterfile
 .RE
 Blanks not within double-quotes are discarded
 (use backslashes to quote single characters).
 The result is inserted into the command-line,
 replacing "\fB--file\fP" and its option value.
 Interpretation of the command-line resumes from that point.
-If \fIparameterfile\fP begins with "&", \fBdialog\fP
+If \fIparameterfile\fP begins with "&", \fB\*p\fP
 interprets the following text as a file descriptor number
 rather than a filename.
 .
@@ -164,7 +173,8 @@ To compare the effects, use these:
 .ES
 All three widgets visible, staircase effect, ordered 1,2,3:
 .EX
-dialog                         --begin 2 2 --yesno "" 0 0 \\
+\*p \
+                               --begin 2 2 --yesno "" 0 0 \\
     --and-widget               --begin 4 4 --yesno "" 0 0 \\
     --and-widget               --begin 6 6 --yesno "" 0 0
 .EE
@@ -172,7 +182,8 @@ dialog                         --begin 2 2 --yesno "" 0 0 \\
 .ES
 Only the last widget is left visible:
 .EX
-dialog           --clear       --begin 2 2 --yesno "" 0 0 \\
+\*p \
+                 --clear       --begin 2 2 --yesno "" 0 0 \\
     --and-widget --clear       --begin 4 4 --yesno "" 0 0 \\
     --and-widget               --begin 6 6 --yesno "" 0 0
 .EE
@@ -180,7 +191,8 @@ dialog           --clear       --begin 2 2 --yesno "" 0 0 \\
 .ES
 All three widgets visible, staircase effect, ordered 3,2,1:
 .EX
-dialog           --keep-window --begin 2 2 --yesno "" 0 0 \\
+\*p \
+                 --keep-window --begin 2 2 --yesno "" 0 0 \\
     --and-widget --keep-window --begin 4 4 --yesno "" 0 0 \\
     --and-widget               --begin 6 6 --yesno "" 0 0
 .EE
@@ -188,7 +200,8 @@ dialog           --keep-window --begin 2 2 --yesno "" 0 0 \\
 .ES
 First and third widget visible, staircase effect, ordered 3,1:
 .EX
-dialog           --keep-window --begin 2 2 --yesno "" 0 0 \\
+\*p \
+                 --keep-window --begin 2 2 --yesno "" 0 0 \\
     --and-widget --clear       --begin 4 4 --yesno "" 0 0 \\
     --and-widget               --begin 6 6 --yesno "" 0 0
 .EE
@@ -200,7 +213,7 @@ command.
 .IP "\fB--colors"
 Interpret embedded "\\Z" sequences in the dialog text
 by the following character,
-which tells \fBdialog\fP to set colors or video attributes:
+which tells \fB\*p\fP to set colors or video attributes:
 0 through 7 are the ANSI used in curses:
 black,
 red,
@@ -218,14 +231,14 @@ bold (perhaps bright) red.
 Restore normal settings with "\\Zn".
 .
 .IP "\fB--column-separator \fIstring"
-Tell \fBdialog\fP to split data for radio/checkboxes and menus on the
+Tell \fB\*p\fP to split data for radio/checkboxes and menus on the
 occurrences of the given string, and to align the split data into columns.
 .
 .IP "\fB--cr-wrap"
 Interpret embedded newlines in the dialog text as a newline on the screen.
-Otherwise, \fBdialog\fR will only wrap lines where needed to fit inside the text box.
+Otherwise, \fB\*p\fR will only wrap lines where needed to fit inside the text box.
 Even though you can control line breaks with this,
-\fBdialog\fR will still wrap any lines that are too long for the width of the box.
+\fB\*L\fR will still wrap any lines that are too long for the width of the box.
 Without cr-wrap, the layout of your text may be formatted to look nice
 in the source code of your script without affecting the way it will
 look in the dialog.
@@ -234,7 +247,7 @@ See also the "\fB--no-collapse\fP" and "\fB--trim\fP" options.
 .
 .IP "\fB--create-rc \fIfile"
 When
-\fBdialog\fP
+\fB\*p\fP
 supports run-time configuration,
 this can be used to dump a sample configuration file to the file specified
 by
@@ -272,7 +285,7 @@ Override the label used for "Extra" buttons.
 Note: for inputmenu widgets, this defaults to "Rename".
 .
 .IP "\fB--help"
-Prints the help message to \fBdialog\fP's output.
+Prints the help message to \fB\*p\fP's output.
 The help message is printed if no options are given.
 .
 .IP "\fB--help-button"
@@ -280,7 +293,7 @@ Show a help-button after "OK" and "Cancel" buttons,
 i.e., in checklist, radiolist and menu boxes.
 If "\fB--item-help\fR" is also given, on exit
 the return status will be the same as for the "OK" button,
-and the item-help text will be written to \fBdialog\fP's output after the token "HELP".
+and the item-help text will be written to \fB\*p\fP's output after the token "HELP".
 Otherwise, the return status will indicate that the Help button was pressed,
 and no message printed.
 .
@@ -295,16 +308,16 @@ This can be used to reconstruct the state of a checklist after processing
 the help request.
 .
 .IP "\fB--ignore"
-Ignore options that \fBdialog\fP does not recognize.
+Ignore options that \fB\*p\fP does not recognize.
 Some well-known ones such as "\fB--icon\fP" are ignored anyway,
 but this is a better choice for compatibility with other implementations.
 .
 .IP "\fB--input-fd \fIfd"
 Read keyboard input from the given file descriptor.
-Most \fBdialog\fR scripts read from the standard input,
+Most \fB\*p\fR scripts read from the standard input,
 but the gauge widget reads a pipe (which is always standard input).
 Some configurations do not work properly when
-\fBdialog\fP tries to reopen the terminal.
+\fB\*p\fP tries to reopen the terminal.
 Use this option (with appropriate juggling of file-descriptors)
 if your script must work in that type of environment.
 .
@@ -318,21 +331,21 @@ adding a column which is displayed in the bottom line of the
 screen, for the currently selected item.
 .
 .IP "\fB--keep-tite"
-Normally \fBdialog\fP checks to see if it is running in an \fBxterm\fP,
+Normally \fB\*p\fP checks to see if it is running in an \fBxterm\fP,
 and in that case tries to suppress the initialization strings that
 would make it switch to the alternate screen.
 Switching between the normal and alternate screens
-is visually distracting in a script which runs \fBdialog\fP
+is visually distracting in a script which runs \fB\*p\fP
 several times.
-Use this option to allow \fBdialog\fP to use those initialization strings. 
+Use this option to allow \fB\*p\fP to use those initialization strings. 
 .
 .IP "\fB--keep-window"
-Normally when \fBdialog\fR performs several \fBtailboxbg\fR widgets
+Normally when \fB\*p\fR performs several \fBtailboxbg\fR widgets
 connected by "\fB--and-widget\fR",
 it clears the old widget from the screen by painting over it.
 Use this option to suppress that repainting.
 .IP
-At exit, \fBdialog\fR repaints all of the widgets which have been
+At exit, \fB\*p\fR repaints all of the widgets which have been
 marked with "\fB--keep-window\fR", even if they are not \fBtailboxbg\fR widgets.
 That causes them to be repainted in reverse order.
 See the discussion of the "\fB--clear\fR" option for examples.
@@ -347,19 +360,19 @@ Suppress the "Cancel" button in checklist, inputbox and menu box modes.
 A script can still test if the user pressed the ESC key to cancel to quit.
 .
 .IP "\fB--no-collapse"
-Normally \fBdialog\fR converts tabs to spaces and reduces multiple
+Normally \fB\*p\fR converts tabs to spaces and reduces multiple
 spaces to a single space for text which is displayed in a message boxes, etc.
 Use this option to disable that feature.
-Note that \fBdialog\fR will still wrap text,
+Note that \fB\*p\fR will still wrap text,
 subject to the "\fB--cr-wrap\fR" and "\fB--trim\fR" options.
 .
 .IP "\fB--no-kill"
 Tells
-\fBdialog\fP
+\fB\*p\fP
 to put the
 \fBtailboxbg\fP
 box in the background,
-printing its process id to \fBdialog\fP's output.
+printing its process id to \fB\*p\fP's output.
 SIGHUP is disabled for the background process.
 .
 .IP "\fB--no-label \fIstring"
@@ -369,6 +382,9 @@ Override the label used for "No" buttons.
 Rather than draw lines around boxes, draw spaces in the same place.
 See also "\fB--ascii-lines\fR".
 .
+.IP "\fB--no-mouse
+Do not enable the mouse.
+.
 .IP "\fB--no-ok"
 .IP "\fB--nook"
 Suppress the "OK" button in checklist, inputbox and menu box modes.
@@ -383,26 +399,26 @@ Override the label used for "OK" buttons.
 .
 .IP "\fB--output-fd \fIfd"
 Direct output to the given file descriptor.
-Most \fBdialog\fR scripts write to the standard error,
+Most \fB\*p\fR scripts write to the standard error,
 but error messages may also be written there, depending on your script.
 .
 .IP "\fB--separator \fIstring"
 .IP "\fB--output-separator\fIstring"
-Specify a string that will separate the output on \fBdialog\fP's output from
+Specify a string that will separate the output on \fB\*p\fP's output from
 checklists, rather than a newline (for --separate-output) or a space.
 This applies to other widgets such as forms and editboxes which normally
 use a newline.
 .
 .IP "\fB--print-maxsize"
 Print the maximum size of dialog boxes, i.e., the screen size,
-to \fBdialog\fP's output.
+to \fB\*p\fP's output.
 This may be used alone, without other options.
 .
 .IP "\fB--print-size"
-Prints the size of each dialog box to \fBdialog\fP's output.
+Prints the size of each dialog box to \fB\*p\fP's output.
 .
 .IP "\fB--print-version"
-Prints \fBdialog\fR's version to \fBdialog\fP's output.
+Prints \fB\*p\fR's version to \fB\*p\fP's output.
 This may be used alone, without other options.
 .
 .IP "\fB--scrollbar \fIstring"
@@ -415,7 +431,7 @@ For checklist widgets, output result one line at a time, with no quoting.
 This facilitates parsing by another program.
 .
 .IP "\fB--separate-widget \fIstring"
-Specify a string that will separate the output on \fBdialog\fP's output from
+Specify a string that will separate the output on \fB\*p\fP's output from
 each widget.
 This is used to simplify parsing the result of a dialog with several widgets.
 If this option is not given,
@@ -427,7 +443,7 @@ Draw a shadow to the right and bottom of each dialog box.
 .IP "\fB--single-quoted"
 Use single-quoting as needed (and no quotes if unneeded) for the
 output of checklist's as well as the item-help text.
-If this option is not set, \fBdialog\fP uses double quotes around each item.
+If this option is not set, \fB\*p\fP uses double quotes around each item.
 That requires occasional use of backslashes to make the output useful in
 shell scripts.
 .
@@ -449,7 +465,7 @@ Direct output to the standard output.
 This option is provided for compatibility with Xdialog,
 however using it in portable scripts is not recommended,
 since curses normally writes its screen updates to the standard output.
-If you use this option, \fBdialog\fR attempts to reopen the terminal
+If you use this option, \fB\*p\fR attempts to reopen the terminal
 so it can write to the display.
 Depending on the platform and your environment, that may fail.
 .
@@ -482,7 +498,9 @@ Specifies a
 string to be displayed at the top of the dialog box.
 .
 .IP "\fB--trace \fIfilename"
-logs keystrokes to the given file.
+logs the command-line parameters and
+keystrokes to the given file.
+If \fBdialog\fP reads a configure file, it is logged as well.
 Use control/T to log a picture of the current dialog window.
 .
 .IP "\fB--trim"
@@ -556,7 +574,7 @@ The initial on/off state of each entry is specified by
 .IP
 On exit, a list of the \fItag\fP
 strings of those entries that are turned on
-will be printed on \fBdialog\fP's output.
+will be printed on \fB\*p\fP's output.
 If the "\fB--separate-output\fP" option is not given,
 the strings will be quoted to make it simple for scripts to separate them.
 See the "\fB--single-quoted\fP" option, which modifies the quoting behavior.
@@ -585,7 +603,7 @@ window to the closest match.
 Use a carriage return or the "OK" button to accept the current value
 in the text-entry window and exit.
 .IP
-On exit, the contents of the text-entry window are written to \fBdialog\fP's output.
+On exit, the contents of the text-entry window are written to \fB\*p\fP's output.
 .
 .IP "\fB--editbox \fIfilepath height width\fR"
 The edit-box dialog displays a copy of the file.
@@ -597,7 +615,7 @@ Unlike the \fB--inputbox\fP,
 you must tab to the "OK" or "Cancel" buttons to close the dialog.
 Pressing the "Enter" key within the box will split the corresponding line.
 .IP
-On exit, the contents of the edit window are written to \fBdialog\fP's output.
+On exit, the contents of the edit window are written to \fB\*p\fP's output.
 .
 .nf
 .IP "\fB--form \fItext height width formheight \fR[ \fIlabel y x item y x flen ilen \fR] \fI..."
@@ -626,7 +644,7 @@ If \fIilen\fR is zero, it is set to \fIflen\fR.
 Use up/down arrows (or control/N, control/P) to move between fields.
 Use tab to move between windows.
 .IP
-On exit, the contents of the form-fields are written to \fBdialog\fP's output,
+On exit, the contents of the form-fields are written to \fB\*p\fP's output,
 each field separated by a newline.
 The text used to fill non-editable fields
 (\fIflen\fR is zero or negative)
@@ -654,14 +672,14 @@ Typing any printable characters switches focus to the text-entry window,
 entering that character as well as scrolling the directory and filename
 windows to the closest match.
 .IP
-Typing the space character forces \fBdialog\fP to complete the current
+Typing the space character forces \fB\*p\fP to complete the current
 name (up to the point where there may be a match against more than one
 entry).
 .IP
 Use a carriage return or the "OK" button to accept the current value
 in the text-entry window and exit.
 .IP
-On exit, the contents of the text-entry window are written to \fBdialog\fP's output.
+On exit, the contents of the text-entry window are written to \fB\*p\fP's output.
 .
 .
 .IP "\fB--gauge \fItext height width [percent]\fR"
@@ -681,22 +699,22 @@ The gauge exits when EOF is reached on the standard input.
 The \fIpercent\fR value denotes the initial percentage shown in the meter.
 If not specified, it is zero.
 .IP
-On exit, no text is written to \fBdialog\fP's output.
+On exit, no text is written to \fB\*p\fP's output.
 The widget accepts no input, so the exit status is always OK.
 .
 .
 .IP "\fB--infobox \fItext height width"
 An \fBinfo\fP box is basically a \fBmessage\fP box.
-However, in this case, \fBdialog\fP
+However, in this case, \fB\*p\fP
 will exit immediately after displaying the message to the user.
-The screen is not cleared when \fBdialog\fP
+The screen is not cleared when \fB\*p\fP
 exits, so that the message will remain on the screen until the calling
 shell script clears it later.
 This is useful when you want to inform
 the user that some operations are carrying on that may require some
 time to finish.
 .IP
-On exit, no text is written to \fBdialog\fP's output.
+On exit, no text is written to \fB\*p\fP's output.
 Only an "OK" button is provided for input,
 but an ESC exit status may be returned.
 .
@@ -714,7 +732,7 @@ can be used to correct typing errors.
 If the input string is longer than
 can fit in the dialog box, the input field will be scrolled.
 .IP
-On exit, the input string will be printed on \fBdialog\fP's output.
+On exit, the input string will be printed on \fB\*p\fP's output.
 .
 .
 .IP "\fB--inputmenu \fItext height width menu-height \fR[ \fItag item \fR] \fI..."
@@ -733,7 +751,7 @@ the current item when it is pressed.
 It is possible to rename the current entry by pressing the
 \fIRename\fP
 button.
-Then \fBdialog\fP will write the following on \fBdialog\fP's output.
+Then \fB\*p\fP will write the following on \fB\*p\fP's output.
 .IP
 RENAMED <tag> <item>
 .RE
@@ -759,7 +777,7 @@ entries displayed in the menu at one time, but the menu will be
 scrolled if there are more entries than that.
 .IP
 On exit the \fItag\fP
-of the chosen menu entry will be printed on \fBdialog\fP's output.
+of the chosen menu entry will be printed on \fB\*p\fP's output.
 If the "\fB--help-button\fR" option is given, the corresponding help
 text will be printed if the user selects the help button.
 .
@@ -787,7 +805,7 @@ The meter indicates the percentage.
 .IP
 It also displays a list of the \fItag\fP- and \fIitem\fP-values at the
 top of the box.
-See dialog(3) for the tag values.
+See \*l(3) for the tag values.
 .IP
 The \fItext\fP is shown as a caption between the list and meter.
 The \fIpercent\fR value denotes the initial percentage shown in the meter.
@@ -795,7 +813,7 @@ The \fIpercent\fR value denotes the initial percentage shown in the meter.
 No provision is made for reading data from the standard input as \fB--gauge\fP
 does.
 .IP
-On exit, no text is written to \fBdialog\fP's output.
+On exit, no text is written to \fB\*p\fP's output.
 The widget accepts no input, so the exit status is always OK.
 .
 .IP "\fB--msgbox \fItext height width"
@@ -804,14 +822,14 @@ The only difference between a \fBmessage\fP box and a \fByes/no\fP
 box is that a \fBmessage\fP box has only a single \fBOK\fP button.
 You can use this dialog box to display any message you like.
 After reading the message, the user can press the \fIENTER\fP key so that
-\fBdialog\fP will exit and the calling shell script can continue its operation.
+\fB\*p\fP will exit and the calling shell script can continue its operation.
 .IP
 If the message is too large for the space,
-\fBdialog\fP may allow you to scroll it,
+\fB\*p\fP may allow you to scroll it,
 provided that the underlying curses implementation is capable enough.
 In this case, a percentage is shown in the base of the widget.
 .IP
-On exit, no text is written to \fBdialog\fP's output.
+On exit, no text is written to \fB\*p\fP's output.
 Only an "OK" button is provided for input,
 but an ESC exit status may be returned.
 .
@@ -838,7 +856,7 @@ cannot see.
 For these reasons, using "init" is highly discouraged.
 See "\fB--insecure\fP" if you do not care about your password.
 .IP
-On exit, the input string will be printed on \fBdialog\fP's output.
+On exit, the input string will be printed on \fB\*p\fP's output.
 .
 .
 .nf
@@ -848,6 +866,36 @@ This is identical to \fB--form\fP except that all text fields are
 treated as \fBpassword\fP widgets rather than \fBinputbox\fP widgets.
 .
 .
+.IP "\fB--prgbox \fItext command height width"
+.IP "\fB--prgbox \fIcommand height width"
+A \fBprgbox\fP is very similar to a \fBprogrambox\fP.
+.IP
+This dialog box is used to display the output of a command that is
+specified as an argument to \fBprgbox\fP.
+.IP
+After the command completes, the user can press the \fIENTER\fP key so that
+\fBdialog\fP will exit and the calling shell script can continue its operation.
+.IP
+If three parameters are given, it displays the text under the title,
+delineated from the scrolling file's contents.
+If only two parameters are given, this text is omitted.
+.
+.
+.IP "\fB--programbox \fItext height width"
+.IP "\fB--programbox \fIheight width"
+A \fBprogrambox\fP is very similar to a \fBprogressbox\fP.
+The only difference between a \fBprogram\fP box and a \fBprogress\fP
+box is that a \fBprogram\fP box displays an \fBOK\fP button.
+.IP
+This dialog box is used to display the piped output of a command.
+After the command completes, the user can press the \fIENTER\fP key so that
+\fBdialog\fP will exit and the calling shell script can continue its operation.
+.IP
+If three parameters are given, it displays the text under the title,
+delineated from the scrolling file's contents.
+If only two parameters are given, this text is omitted.
+.
+.
 .IP "\fB--progressbox \fItext height width"
 .IP "\fB--progressbox \fIheight width"
 A \fBprogressbox\fP is similar to an \fBtailbox\fP,
@@ -867,7 +915,7 @@ The only difference is
 that you can indicate which entry is currently selected, by setting its
 .IR status " to " on "."
 .IP
-On exit, the name of the selected item is written to \fBdialog\fP's output.
+On exit, the name of the selected item is written to \fB\*p\fP's output.
 .
 .
 .IP "\fB--tailbox \fIfile height width"
@@ -875,7 +923,7 @@ Display text from a file in a dialog box, as in a "tail -f" command.
 Scroll left/right using vi-style 'h' and 'l', or arrow-keys.
 A '0' resets the scrolling.
 .IP
-On exit, no text is written to \fBdialog\fP's output.
+On exit, no text is written to \fB\*p\fP's output.
 Only an "OK" button is provided for input,
 but an ESC exit status may be returned.
 .
@@ -886,23 +934,23 @@ as in a "tail -f &" command.
 Scroll left/right using vi-style 'h' and 'l', or arrow-keys.
 A '0' resets the scrolling.
 .IP
-Dialog treats the background task specially if there are other
+\*L treats the background task specially if there are other
 widgets (\fB--and-widget\fP) on the screen concurrently.
 Until those widgets are closed (e.g., an "OK"),
-\fBdialog\fP will perform all of the tailboxbg widgets in the same process,
+\fB\*p\fP will perform all of the tailboxbg widgets in the same process,
 polling for updates.
 You may use a tab to traverse between the widgets on the screen,
 and close them individually, e.g., by pressing \fIENTER\fP.
-Once the non-tailboxbg widgets are closed, \fBdialog\fP forks a copy of itself
+Once the non-tailboxbg widgets are closed, \fB\*p\fP forks a copy of itself
 into the background, and prints its process id if the "\fB--no-kill\fP" option
 is given.
 .IP
-On exit, no text is written to \fBdialog\fP's output.
+On exit, no text is written to \fB\*p\fP's output.
 Only an "EXIT" button is provided for input,
 but an ESC exit status may be returned.
 .IP
 NOTE:
-Older versions of \fBdialog\fP forked immediately and attempted to
+Older versions of \fB\*p\fP forked immediately and attempted to
 update the screen individually.
 Besides being bad for performance,
 it was unworkable.
@@ -928,7 +976,7 @@ A '0' resets the left/right scrolling.
 For more convenience,
 vi-style forward and backward searching functions are also provided.
 .IP
-On exit, no text is written to \fBdialog\fP's output.
+On exit, no text is written to \fB\*p\fP's output.
 Only an "EXIT" button is provided for input,
 but an ESC exit status may be returned.
 .
@@ -971,7 +1019,7 @@ button and a
 button, in which the user can switch between by pressing the
 .IR TAB " key."
 .IP
-On exit, no text is written to \fBdialog\fP's output.
+On exit, no text is written to \fB\*p\fP's output.
 In addition to the "Yes" and "No" exit codes (see DIAGNOSTICS)
 an ESC exit status may be returned.
 .IP
@@ -996,11 +1044,11 @@ Beep after a user has completed a widget by pressing one of the buttons.
 Create a sample configuration file by typing:
 .LP
 .in +1i
-"dialog --create-rc <file>"
+"\*p --create-rc <file>"
 .TP 4
 2.
 At start,
-\fBdialog\fP
+\fB\*p\fP
 determines the settings to use as follows:
 .RS
 .TP 4
@@ -1024,14 +1072,14 @@ if the file in (c) is not found, use compiled in defaults.
 .TP 4
 3.
 Edit the sample configuration file and copy it to some place that
-\fBdialog\fP
+\fB\*p\fP
 can find, as stated in step 2 above.
 .
 .\" ************************************************************************
 .SH "KEY BINDINGS"
-You can override or add to key bindings in \fBdialog\fP
+You can override or add to key bindings in \fB\*p\fP
 by adding to the configuration file.
-\fBDialog\fP's \fBbindkey\fP command maps single keys to its internal coding.
+\fB\*L\fP's \fBbindkey\fP command maps single keys to its internal coding.
 .EX
 bindkey \fIwidget\fP \fIcurses_key\fP \fIdialog_key\fP
 .EE
@@ -1042,11 +1090,11 @@ User-defined bindings override the built-in bindings.
 .PP
 The \fIcurses_key\fP can be any of the names derived from
 \fBcurses.h\fP, e.g., "HELP" from "KEY_HELP".
-\fBDialog\fP also recognizes ANSI control characters such as "^A", "^?",
+\fB\*L\fP also recognizes ANSI control characters such as "^A", "^?",
 as well as C1-controls such as "~A" and "~?".
 Finally, it allows any single character to be escaped with a backslash.
 .PP
-\fBDialog\fP's internal keycode names correspond to the
+\fB\*L\fP's internal keycode names correspond to the
 \fBDLG_KEYS_ENUM\fP type in
 \fBdlg_keys.h\fP, e.g., "HELP" from "DLGK_HELP".
 .
@@ -1057,7 +1105,7 @@ Finally, it allows any single character to be escaped with a backslash.
 Define this variable to apply any of the common options to each widget.
 Most of the common options are reset before processing each widget.
 If you set the options in this environment variable,
-they are applied to \fBdialog\fP's state after the reset.
+they are applied to \fB\*p\fP's state after the reset.
 As in the "\fB--file\fP" option,
 double-quotes and backslashes are interpreted.
 .IP
@@ -1093,14 +1141,14 @@ Normally shell scripts cannot distinguish between -1 and 255.
 .TP 15
 \fBDIALOG_TTY\fP
 Set this variable to "1" to provide compatibility with older versions
-of \fBdialog\fP which assumed that if the script redirects the standard output,
+of \fB\*p\fP which assumed that if the script redirects the standard output,
 that the "\fB--stdout\fP" option was given.
 .SH FILES
 .TP 20
 \fI$HOME/.dialogrc\fP
 default configuration file
 .SH EXAMPLES
-The \fBdialog\fP sources contain several samples
+The \fB\*p\fP sources contain several samples
 of how to use the different box options and how they look.
 Just take a look into the directory \fBsamples/\fP of the source.
 .SH DIAGNOSTICS
@@ -1109,7 +1157,7 @@ Normally they are:
 .TP 5
 0
 if
-.BR dialog " is exited by pressing the " Yes " or " OK
+.BR \*p " is exited by pressing the " Yes " or " OK
 button.
 .TP 5
 1
@@ -1132,24 +1180,24 @@ if the
 button is pressed.
 .TP 5
 -1
-if errors occur inside \fBdialog\fP
-or \fBdialog\fP is exited by pressing the \fIESC\fP key.
+if errors occur inside \fB\*p\fP
+or \fB\*p\fP is exited by pressing the \fIESC\fP key.
 .
 .\" ************************************************************************
 .SH PORTABILITY
-\fBdialog\fP works with X/Open curses.
+\fB\*L\fP works with X/Open curses.
 However, some implementations have deficiencies:
 .RS 3
 .TP 3
 -
 HPUX curses (and perhaps others) do not open the terminal properly for
 the \fInewterm\fP function.
-This interferes with \fBdialog\fP's \fB--input-fd\fP option,
+This interferes with \fB\*p\fP's \fB--input-fd\fP option,
 by preventing cursor-keys and similar escape sequences from being recognized.
 .TP 3
 -
-NetBSD curses does not support subwindows of subwindows.
-\fBdialog\fP will not display shadows of windows.
+NetBSD 5.1 curses has incomplete support for wide-characters.
+\fB\*p\fP will build, but not all examples display properly.
 .RE
 .\" ************************************************************************
 .SH COMPATIBILITY
@@ -1158,7 +1206,7 @@ You may want to write scripts which run with other \fBdialog\fP "clones".
 First, there is the "original" \fBdialog\fP program to consider (versions
 0.3 to 0.9).
 It had some misspelled (or inconsistent) options.
-The \fBdialog\fP program maps those deprecated options to the preferred ones.
+The \fB\*p\fP program maps those deprecated options to the preferred ones.
 They include:
 .RS
 .TS
@@ -1176,7 +1224,7 @@ this is an X application.
 With some care, it is possible to write useful scripts that work
 with both \fBXdialog\fP and \fBdialog\fP.
 .PP
-The \fBdialog\fP program ignores these options which are recognized
+The \fB\*p\fP program ignores these options which are recognized
 by \fBXdialog\fP:
 .RS
 .TS
@@ -1199,7 +1247,7 @@ l l.
 .TE
 .RE
 .PP
-\fBXdialog\fP's manpage has a section discussing its compatibility with \fBdialog\fP.
+\fBXdialog\fP's manpage has a section discussing its compatibility with \fB\*p\fP.
 .SS WHIPTAIL
 Then there is \fBwhiptail\fP.
 For practical purposes, it is maintained by Debian.
@@ -1207,13 +1255,13 @@ Its documentation claims
 .RS
 .sp
 .nf
-whiptail(1) is a lightweight replacement for dialog(1),
+whiptail(1) is a lightweight replacement for \*p(1),
 to provide dialog boxes for shell scripts. It is built on the 
 newt windowing library rather than the ncurses library, allowing
 it to be smaller in embedded enviroments such as installers,
 rescue disks, etc.
 .sp
-whiptail is designed to be drop-in compatible with dialog, but
+whiptail is designed to be drop-in compatible with \*p, but
 has less features: some dialog boxes are not implemented, such
 as tailbox, timebox, calendarbox, etc.
 .fi
@@ -1221,31 +1269,31 @@ as tailbox, timebox, calendarbox, etc.
 .PP
 Comparing actual sizes (Debian testing, 2007/1/10):
 The total of sizes for \fBwhiptail\fP, the newt, popt and slang libraries is 757kb.
-The comparable number for \fBdialog\fP (counting ncurses) is 520kb.
+The comparable number for \fB\*p\fP (counting ncurses) is 520kb.
 Disregard the first paragraph.
 .PP
 The second paragraph is misleading, since \fBwhiptail\fP
-also does not work for common options of dialog, such as the gauge box.
-\fBwhiptail\fP is less compatible with \fBdialog\fP than the decade-old
+also does not work for common options of \*p, such as the gauge box.
+\fBwhiptail\fP is less compatible with \fB\*p\fP than the decade-old
 original dialog 0.4 program.
 .PP
-\fBwhiptail\fP's manpage borrows features from \fBdialog\fP, e.g.,
+\fBwhiptail\fP's manpage borrows features from \fB\*p\fP, e.g.,
 \fB--default-item\fP, \fB--output-fd\fP,
-but oddly cites only \fBdialog\fP versions up to 0.4 as a source.
+but oddly cites only \fB\*p\fP versions up to 0.4 as a source.
 That is, its manpage refers to features which
-were borrowed from more recent versions of \fBdialog\fP, e.g.,
+were borrowed from more recent versions of \fB\*p\fP, e.g.,
 the \fB--gauge\fP and \fB--password\fP boxes,
 as well as options such as \fB-separate-output\fP.
 Somewhat humorously, one may note that the \fBpopt\fP feature
 (undocumented in its manpage)
-of using a "--" as an escape was documented in \fBdialog\fP's manpage about
+of using a "--" as an escape was documented in \fB\*p\fP's manpage about
 a year before it was mentioned in \fBwhiptail\fP's manpage.
 \fBwhiptail\fP's manpage incorrectly attributes that to \fBgetopt\fP
 (and is inaccurate anyway).
 .PP
-Debian uses \fBwhiptail\fP for the official \fBdialog\fP variation.
+Debian uses \fBwhiptail\fP for the official \fB\*p\fP variation.
 .PP
-The \fBdialog\fP program ignores or maps these options which are recognized
+The \fB\*p\fP program ignores or maps these options which are recognized
 by \fBwhiptail\fP:
 .RS
 .TS
@@ -1275,7 +1323,7 @@ Valery Reznic - the form and progressbox widgets.
 Yura Kalinichenko adapted the gauge widget as "pause".
 .PP
 This is a rewrite (except as needed to provide compatibility)
-of the earlier version of \fBdialog 0.9a\fP,
+of the earlier version of \fB\*p 0.9a\fP,
 which lists as authors:
 .RS
 .LP
diff --git a/dialog.3 b/dialog.3
index 55ea36c22bfb..521684a6121a 100644
--- a/dialog.3
+++ b/dialog.3
@@ -1,5 +1,5 @@
-.\" $Id: dialog.3,v 1.49 2010/02/23 10:33:59 tom Exp $
-.\" Copyright 2005-2009,2010  Thomas E. Dickey
+.\" $Id: dialog.3,v 1.60 2011/03/02 10:19:12 tom Exp $
+.\" Copyright 2005-2010,2011  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
@@ -15,24 +15,38 @@
 .\"	Free Software Foundation, Inc.
 .\"	51 Franklin St., Fifth Floor
 .\"	Boston, MA 02110, USA.
-.TH DIALOG 3 "" "$Date: 2010/02/23 10:33:59 $"
+.\"
+.\" definitions for renaming
+.ds p dialog
+.ds l dialog
+.ds L Dialog
+.ds D DIALOG
+.\" Bulleted paragraph
+.de bP
+.IP \(bu 4
+..
+.TH \*D 3 "" "$Date: 2011/03/02 10:19:12 $"
 .SH NAME
-dialog \- widgets and utilities for the dialog program
+\*l \- widgets and utilities for the \*p program
 .SH SYNOPSIS
-.B cc [ flag ... ] file ...  -ldialog [ library ... ]
-
-.B #include <dialog.h>
+.B cc [ flag ... ] file ...  -l\*l [ library ... ]
+.br
+\ \ \ or
+.br
+.B cc `\*p-config --cflags` file ... `\*p-config --libs` ]
+.sp
+.B #include <\*l.h>
 .PP
-\fBDialog\fP
+\fB\*L\fP
 is a program that will let you to present a variety of questions or
 display messages using dialog boxes from a shell script.
-It is built from the \fBdialog\fP library,
+It is built from the \fB\*l\fP library,
 which consists of several widgets
 as well as utility functions that are used by the widgets
 or the main program.
 .
 .SH DESCRIPTION
-This manpage documents the features from \fI<dialog.h>\fP which
+This manpage documents the features from \fI<\*l.h>\fP which
 are likely to be important to developers using the widgets directly.
 Some hints are also given for developing new widgets.
 .
@@ -41,7 +55,7 @@ Some hints are also given for developing new widgets.
 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
-as described in \fBdialog\fP(1),
+as described in \fB\*p\fP(1),
 e.g., \fIDLG_EXIT_OK\fP corresponds to \fI$DIALOG_OK\fP.
 .PP
 Useful character constants which correspond to user input
@@ -50,11 +64,11 @@ are named with the "\fICHR_\fP" prefix, e.g.,
 .PP
 Colors and video attributes are categorized and associated with
 settings in the configuration file
-(see the discussion of \fI$DIALOGRC\fP in \fBdialog\fP(1)).
+(see the discussion of \fI$DIALOGRC\fP in \fB\*p\fP(1)).
 The \fIDIALOG_ATR(n)\fP macro is used for defining the references
 to the combined color and attribute table \fIdlg_color_table[]\fP.
 .PP
-The \fBdialog\fP application passes its command-line parameters
+The \fB\*p\fP application passes its command-line parameters
 to the widget functions.  Some of those parameters are single values,
 but some of the widgets accept data as an array of values.
 Those include checklist/radiobox, menubox and formbox.
@@ -63,13 +77,13 @@ of data is expected.
 The USE_ITEM_HELP(), CHECKBOX_TAGS, MENUBOX_TAGS and FORMBOX_TAGS
 macros are used to hide this difference from the calling application.
 .PP
-Most of the other definitions found in \fI<dialog.h>\fP
+Most of the other definitions found in \fI<\*l.h>\fP
 are used for convenience in building the library or main program.
 These include definitions based on the generated \fI<dlg_config.h>\fP header.
 
 .\" ************************************************************************
 .SH DATA STRUCTURES
-All of the global data for the \fBdialog\fP library is stored in
+All of the global data for the \fB\*l\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
 global variables should be initialized to zeros,
@@ -79,7 +93,7 @@ As as the case with function names,
 variables beginning with "\fIdialog_\fP"
 are designed for use by the calling application
 while variables beginning with "\fIdlg_\fP"
-are intended for lower levels, e.g., by the \fBdialog\fP library.
+are intended for lower levels, e.g., by the \fB\*l\fP library.
 .\" ---------------------------------------------------------------------------
 .IP \fIDIALOG_STATE.all_windows
 This is a linked list of all windows created by the library.
@@ -104,8 +118,13 @@ If the control window for \fIDIALOG_STATE.getc_callbacks\fP is
 closed, the list is transferred to this variable.
 Closing all windows causes the application to exit.
 .\" ---------------------------------------------------------------------------
+.IP \fIDIALOG_STATE.no_mouse
+This corresponds to the command-line option "\fB--no-mouse\fP".
+If true, \fB\*p\fP will not initialize (and enable) the mouse in
+\fIinit_dialog\fP.
+.\" ---------------------------------------------------------------------------
 .IP \fIDIALOG_STATE.output
-This is set in the \fBdialog\fP application to the stream on
+This is set in the \fB\*p\fP application to the stream on
 which the application and library functions may write text results.
 Normally that is the standard error,
 since the curses library prefers to write its data to the standard output.
@@ -116,7 +135,7 @@ e.g., by using the "\fB--stdout\fP" option.
 .IP \fIDIALOG_STATE.output_count
 This is incremented by \fIdlg_does_output\fP,
 which is called by each widget that writes text to the output.
-The \fBdialog\fP application uses that to decide if it should
+The \fB\*p\fP application uses that to decide if it should
 also write a separator, i.e.,
 \fIDIALOG_STATE.separate_str\fP,
 between calls to each widget.
@@ -124,7 +143,7 @@ between calls to each widget.
 .IP \fIDIALOG_STATE.pipe_input
 This is set in \fIinit_dialog\fP to a stream which can be used by the
 \fBgauge\fP widget, which must be the application's standard input.
-The \fBdialog\fP application calls \fIinit_dialog\fP normally with
+The \fB\*p\fP application calls \fIinit_dialog\fP normally with
 \fIinput\fP set to the standard input, but optionally based on the
 "\fB--input-fd\fP" option.
 Since the application cannot read from
@@ -151,7 +170,7 @@ successfully open the terminal directly).
 .IP \fIDIALOG_STATE.separate_str
 This corresponds to the command-line option "\fB--separate-widget\fP".
 The given string
-specifies a string that will separate the output on \fBdialog\fP's output from
+specifies a string that will separate the output on \fB\*p\fP's output from
 each widget.
 This is used to simplify parsing the result of a dialog with several widgets.
 If this option is not given,
@@ -164,6 +183,10 @@ Specify the number of spaces that a tab character occupies if the
 option is given.
 The default is 8.
 .\" ---------------------------------------------------------------------------
+.IP \fIDIALOG_STATE.trace_output
+This corresponds to the command-line option "\fB--trace\fP \fIfile\fP".
+It is the file pointer to which trace messages are written.
+.\" ---------------------------------------------------------------------------
 .IP \fIDIALOG_STATE.use_colors
 This is set in \fIinit_dialog\fP if the curses implementation supports color.
 .\" ---------------------------------------------------------------------------
@@ -182,9 +205,9 @@ suppress shadows that would be drawn to the right and bottom of each dialog box.
 This corresponds to the command-line option "\fB--visit-items\fP".
 .\" ---------------------------------------------------------------------------
 .PP
-The \fBdialog\fP application resets the \fIdialog_vars\fP data before
+The \fB\*p\fP application resets the \fIdialog_vars\fP data before
 accepting options to invoke each widget.
-Most of the \fIDIALOG_VARS\fP members are set directly from \fBdialog\fP's
+Most of the \fIDIALOG_VARS\fP members are set directly from \fB\*p\fP's
 command-line options:
 .\" ---------------------------------------------------------------------------
 .IP \fIDIALOG_VARS.ascii_lines
@@ -222,18 +245,18 @@ The given \fIstring\fP overrides the label used for "Cancel" buttons.
 .IP \fIDIALOG_VARS.cant_kill
 This corresponds to the command-line option "\fB--no-kill\fP".
 If true, this tells
-\fBdialog\fP
+\fB\*p\fP
 to put the
 \fBtailboxbg\fP
 box in the background,
-printing its process id to \fBdialog\fP's output.
+printing its process id to \fB\*p\fP's output.
 SIGHUP is disabled for the background process.
 .\" ---------------------------------------------------------------------------
 .IP \fIDIALOG_VARS.colors
 This corresponds to the command-line option "\fB--colors\fP".
 If true, interpret embedded "\\Z" sequences in the dialog text
 by the following character,
-which tells dialog to set colors or video attributes:
+which tells \fB\*p\fP to set colors or video attributes:
 0 through 7 are the ANSI codes used in curses:
 black,
 red,
@@ -256,9 +279,9 @@ Restore normal settings with "\\Zn".
 This corresponds to the command-line option "\fB--cr-wrap\fP".
 If true,
 interpret embedded newlines in the dialog text as a newline on the screen.
-Otherwise, \fBdialog\fR will only wrap lines where needed to fit inside the text box.
+Otherwise, \fB\*p\fR will only wrap lines where needed to fit inside the text box.
 Even though you can control line breaks with this,
-\fBdialog\fR will still wrap any lines that are too long for the width of the box.
+\fB\*p\fR will still wrap any lines that are too long for the width of the box.
 Without cr-wrap, the layout of your text may be formatted to look nice
 in the source code of your script without affecting the way it will
 look in the dialog.
@@ -317,7 +340,7 @@ If true, some widgets show a help-button after "OK" and "Cancel" buttons,
 i.e., in checklist, radiolist and menu boxes.
 If \fB--item-help\fR is also given, on exit
 the return status will be the same as for the "OK" button,
-and the item-help text will be written to \fBdialog\fP's output after the token "HELP".
+and the item-help text will be written to \fB\*p\fP's output after the token "HELP".
 Otherwise, the return status will indicate that the Help button was pressed,
 and no message printed.
 .\" ---------------------------------------------------------------------------
@@ -342,11 +365,26 @@ This flag is set to denote whether the menubox widget
 implements a menu versus a inputmenu widget.
 .\" ---------------------------------------------------------------------------
 .IP \fIDIALOG_VARS.input_result
+This may be either a user-supplied buffer,
+or a buffer dynamically allocated by the library,
+depending on \fIDIALOG_VARS.input_length\fP:
+.RS
+.bP
 If \fIDIALOG_VARS.input_length\fP is zero,
 this is a pointer to user buffer (on the stack, or static).
+The buffer size is assumed to be \fBMAX_LEN\fP,
+which is defined in \fI<\*l.h>\fP.
+.bP
 When \fIDIALOG_VARS.input_length\fP is nonzero,
 this is a dynamically-allocated buffer used by the widgets to return
 printable results to the calling application.
+.RE
+.IP
+Certain widgets copy a result to this buffer.
+If the pointer is NULL, or if the length is insufficient for
+the result, then the \fB\*l\fP library allocates a buffer which is large enough,
+and sets \fIDIALOG_VARS.input_length\fP.
+Callers should check for this case if they have supplied their own buffer.
 .\" ---------------------------------------------------------------------------
 .IP \fIDIALOG_VARS.insecure
 This corresponds to the command-line option "\fB--insecure\fP".
@@ -362,10 +400,10 @@ screen, for the currently selected item.
 .\" ---------------------------------------------------------------------------
 .IP \fIDIALOG_VARS.keep_tite
 This is set by the command-line option "\fB--keep-tite\fP"
-to tell \fBdialog\fP to not attempt to cancel the terminal initialization
+to tell \fB\*p\fP to not attempt to cancel the terminal initialization
 (termcap \fIti\fP/\fIte\fP) sequences which correspond to xterm's alternate-screen
 switching.
-Normally \fBdialog\fP does this to avoid flickering when run several times
+Normally \fB\*p\fP does this to avoid flickering when run several times
 in a script.
 .\" ---------------------------------------------------------------------------
 .IP \fIDIALOG_VARS.keep_window
@@ -394,10 +432,10 @@ A script can still test if the user pressed the ESC key to cancel to quit.
 .\" ---------------------------------------------------------------------------
 .IP \fIDIALOG_VARS.nocollapse
 This corresponds to the command-line option "\fB--no-collapse\fP".
-Normally \fBdialog\fR converts tabs to spaces and reduces multiple
+Normally \fB\*p\fR converts tabs to spaces and reduces multiple
 spaces to a single space for text which is displayed in a message boxes, etc.
 It true, that feature is disabled.
-Note that \fBdialog\fR will still wrap text, subject to the \fB--cr-wrap\fR
+Note that \fB\*p\fR will still wrap text, subject to the \fB--cr-wrap\fR
 option.
 .\" ---------------------------------------------------------------------------
 .IP \fIDIALOG_VARS.nook
@@ -409,7 +447,7 @@ The given string overrides the label used for "OK" buttons.
 .IP \fIDIALOG_VARS.print_siz
 This corresponds to the command-line option "\fB--print-size\fP".
 If true,
-each widget prints its size to \fBdialog\fP's output when it is invoked.
+each widget prints its size to \fB\*p\fP's output when it is invoked.
 .\" ---------------------------------------------------------------------------
 .IP \fIDIALOG_VARS.quoted
 .\" ---------------------------------------------------------------------------
@@ -424,7 +462,7 @@ This corresponds to the command-line option "\fB--single-quoted\fP".
 If true,
 Use single-quoting as needed (and no quotes if unneeded) for the
 output of checklist's as well as the item-help text.
-If this option is not set, \fBdialog\fP uses double quotes around each item.
+If this option is not set, \fB\*p\fP uses double quotes around each item.
 That requires occasional use of backslashes to make the output useful in
 shell scripts.
 .IP \fIDIALOG_VARS.size_err
@@ -479,7 +517,7 @@ The given string overrides the label used for "Yes" buttons.
 .\" ************************************************************************
 .\" ************************************************************************
 .SH WIDGETS
-Functions that implement major functionality for the command-line \fBdialog\fP
+Functions that implement major functionality for the command-line \fB\*p\fP
 program, e.g., widgets, have names beginning "\fIdialog_\fP".
 
 All dialog boxes have at least three parameters:
@@ -511,17 +549,14 @@ which is adjusted up to the calendar grid's minimum width if needed.
 .IP day
 is the initial day of the week shown,
 counting zero as Sunday.
-If the value is negative,
-the current day of the week is used.
+If the value is negative, the current day of the week is used.
 .IP month
 is the initial month of the year shown,
 counting one as January.
-If the value is negative,
-the current month of the year is used.
+If the value is negative, the current month of the year is used.
 .IP year
 is the initial year shown.
-If the value is negative,
-the current year is used.
+If the value is negative, the current year is used.
 .RE
 .\" ************************************************************************
 .IP \fBdialog_checklist
@@ -829,6 +864,27 @@ If zero, the height is based on the screen size.
 is the timeout to use for the progress bar.
 .RE
 .\" ************************************************************************
+.IP \fBdialog_prgbox
+implements the "\fB--prgbox\fP" option.
+.RS
+.IP title
+is the title on the top of the widget.
+.IP cprompt
+is the prompt text shown within the widget.
+If empty or null, no prompt is shown.
+.IP command
+is the name of the command to execute.
+.IP height
+is the desired height of the box.
+If zero, the height is based on the screen size.
+.IP width
+is the desired width of the box.
+If zero, the height is based on the screen size.
+.IP pauseopt
+if true, an "OK" button will be shown,
+and the dialog will wait for it to complete.
+.RE
+.\" ************************************************************************
 .IP \fBdialog_progressbox
 implements the "\fB--progressbox\fP" option.
 .RS
@@ -897,16 +953,16 @@ is the desired width of the box.
 If zero, the height is based on the screen size.
 .IP hour
 is the initial hour shown.
-If the value is negative,
-the current hour is used.
+If the value is negative, the current hour is used.
+Returns DLG_EXIT_ERROR if the value specified is greater than or equal to 24.
 .IP minute
 is the initial minute shown.
-If the value is negative,
-the current minute is used.
+If the value is negative, the current minute is used.
+Returns DLG_EXIT_ERROR if the value specified is greater than or equal to 60.
 .IP second
 is the initial second shown.
-If the value is negative,
-the current second is used.
+If the value is negative, the current second is used.
+Returns DLG_EXIT_ERROR if the value specified is greater than or equal to 60.
 .RE
 .\" ************************************************************************
 .IP \fBdialog_yesno
@@ -927,7 +983,7 @@ If zero, the height is based on the screen size.
 .\" ************************************************************************
 .SH UTILITY FUNCTIONS
 Most functions that implement lower-level
-functionality for the command-line \fBdialog\fP
+functionality for the command-line \fB\*p\fP
 program or widgets, have names beginning "\fIdlg_\fP".
 Bowing to longstanding usage, the functions that initialize the
 display and end it are named \fIinit_dialog\fP and \fIend_dialog\fP.
@@ -1025,7 +1081,7 @@ This is the number of rows in the array.
 .TP 5
 .B dlg_asciibox
 returns its parameter transformed to the
-corresponding "+" or "-", etc. for the line-drawing characters used in \fBdialog\fP.
+corresponding "+" or "-", etc. for the line-drawing characters used in \fB\*p\fP.
 If the parameter is not a line-drawing or other special character such as ACS_DARROW, it returns 0.
 .RE
 .\" ---------------------------------------------------------------------------
@@ -1118,7 +1174,7 @@ returns its parameter transformed as follows:
 if neither \fBdialog_vars.ascii_lines\fP nor \fBdialog_vars.no_lines\fP is set.
 .TP 3
 .B -
-if \fBdialog_vars.ascii_lines\fP is set, returns the corresponding "+" or "-", etc. for the line-drawing characters used in \fBdialog\fP.
+if \fBdialog_vars.ascii_lines\fP is set, returns the corresponding "+" or "-", etc. for the line-drawing characters used in \fB\*p\fP.
 .TP 3
 .B -
 otherwise, if \fBdialog_vars.no_lines\fP is set, returns a space for the line-drawing characters.
@@ -1302,7 +1358,7 @@ is a list of (pointers to) button labels terminated by a null pointer.
 .TP 5
 .B dlg_checklist
 This entrypoint provides the \fB--checklist\fP or \fP--radiolist\fP
-functionality without the limitations of \fBdialog\fP's command-line syntax
+functionality without the limitations of \fB\*p\fP's command-line syntax
 (compare to \fBdialog_checklist\fP).
 .RS
 .TP 5
@@ -1400,20 +1456,30 @@ On return, holds the updated starting line number.
 .\" ---------------------------------------------------------------------------
 .TP 5
 .B dlg_clear
-Set window to the default dialog screen attribute.
+Set window to the default \fB\*p\fP screen attribute.
 This is set in the rc-file with \fBscreen_color\fP.
 .\" ---------------------------------------------------------------------------
 .TP 5
 .B dlg_clr_result
 Free storage used for the result buffer (\fBdialog_vars.input_result\fP).
+The corresponding pointer is set to NULL.
 .\" ---------------------------------------------------------------------------
 .TP 5
 .B dlg_color_count
-Return the number of colors that can be configured in \fBdialog\fP.
+Return the number of colors that can be configured in \fB\*p\fP.
 .\" ---------------------------------------------------------------------------
 .TP 5
 .B dlg_color_setup
-Initialize the color pairs used in \fBdialog\fP.
+Initialize the color pairs used in \fB\*p\fP.
+.\" ---------------------------------------------------------------------------
+.TP 5
+.B dlg_count_argv
+Count the entries in an argument vector.
+.RS
+.TP 5
+.B argv
+Points to the argument vector.
+.RE
 .\" ---------------------------------------------------------------------------
 .TP 5
 .B dlg_count_columns
@@ -1437,7 +1503,7 @@ is the string to measure.
 .TP 5
 .B dlg_create_rc
 Create a configuration file,
-i.e., write internal tables to a file which can be read back by \fBdialog\fP
+i.e., write internal tables to a file which can be read back by \fB\*p\fP
 as an rc-file.
 .RS
 .TP 5
@@ -1504,7 +1570,7 @@ is the window to remove.
 .B dlg_does_output
 This is called each time a widget is invoked which may do output.
 It increments \fBdialog_state.output_count\fP,
-so the output function in \fBdialog\fP can test this and add a separator.
+so the output function in \fB\*p\fP can test this and add a separator.
 .\" ---------------------------------------------------------------------------
 .TP 5
 .B dlg_draw_arrows
@@ -1731,10 +1797,25 @@ is the stream on which to write the bindings.
 .RE
 .\" ---------------------------------------------------------------------------
 .TP 5
+.B dlg_eat_argv
+Remove one or more items from an argument vector.
+.RS
+.TP 5
+.B int *argcp
+in/out parameter giving the length of the argument vector.
+.B char ***argvp
+in/out parameter pointing to the argument vector.
+.B int start
+starting index.
+.B int count
+number of arguments to remove.
+.RE
+.\" ---------------------------------------------------------------------------
+.TP 5
 .B dlg_edit_offset
 Given the character-offset in the string,
 returns the display-offset where
-dialog should position the cursor.
+\fB\*p\fP should position the cursor.
 In this context, "characters" may be multicolumn,
 since the string can be a multibyte character string.
 .RS
@@ -1789,13 +1870,13 @@ is the internal exit code, e.g., \fBDLG_EXIT_OK\fP,
 which may be remapped.
 .RE
 .IP
-The \fBdialog\fP program uses this function
+The \fB\*p\fP program uses this function
 to allow shell scripts to remap the exit codes so they can distinguish ESC
 from ERROR.
 .\" ---------------------------------------------------------------------------
 .TP 5
 .B dlg_exit_buttoncode
-Map the given button index for \fBdlg_exit_label\fP into dialog's exit-code.
+Map the given button index for \fBdlg_exit_label\fP into \fB\*p\fP's exit-code.
 .RS
 .TP 5
 .B int \fIbutton
@@ -1844,7 +1925,7 @@ Cancel the local data saved by \fBdlg_last_getc\fP.
 .\" ---------------------------------------------------------------------------
 .IP dlg_editbox
 This entrypoint provides the \fB--editbox\fP
-functionality without the limitations of \fBdialog\fP's command-line syntax
+functionality without the limitations of \fB\*p\fP's command-line syntax
 (compare to \fBdialog_editbox\fP).
 .RS
 .TP 5
@@ -1874,7 +1955,7 @@ If zero, the height is adjusted to use the available screen size.
 .TP 5
 .B dlg_form
 This entrypoint provides the \fB--form\fP
-functionality without the limitations of \fBdialog\fP's command-line syntax
+functionality without the limitations of \fB\*p\fP's command-line syntax
 (compare to \fBdialog_form\fP).
 .RS
 .TP 5
@@ -1951,6 +2032,15 @@ as a side-effect, set this to true if the key-code is really a function-key.
 .RE
 .\" ---------------------------------------------------------------------------
 .TP 5
+.B dlg_get_attrs
+extract the video attributes from the given window.
+.RS
+.TP 5
+.B WINDOW * \fIwin
+is the window from which to get attributes.
+.RE
+.\" ---------------------------------------------------------------------------
+.TP 5
 .B dlg_getc_callbacks
 passes the given key-code \fIch\fP to the current window that
 has established a callback.
@@ -2001,7 +2091,7 @@ is the help-message
 .\" ---------------------------------------------------------------------------
 .TP 5
 .B dlg_killall_bg
-If \fBdialog\fP has callbacks active,
+If \fB\*p\fP has callbacks active,
 purge the list of all that are not marked
 to keep in the background.
 If any remain, run those in a background process.
@@ -2048,7 +2138,7 @@ is the window on which the binding is checked
 is the curses key-code
 .TP 5
 .B int * \fIdialog_key
-is the corresponding dialog internal code
+is the corresponding \fB\*p\fP internal code
 (see \fBDLG_KEYS_ENUM\fP in dlg_key.h).
 .RE
 .\" ---------------------------------------------------------------------------
@@ -2078,7 +2168,7 @@ is the string to search
 .TP 5
 .B dlg_menu
 This entrypoint provides the \fB--menu\fP
-functionality without the limitations of \fBdialog\fP's command-line syntax
+functionality without the limitations of \fB\*p\fP's command-line syntax
 (compare to \fBdialog_menu\fP).
 .RS
 .TP 5
@@ -2344,7 +2434,7 @@ if negative, provides a way to enumerate extra active areas on the widget.
 .TP 5
 .B dlg_ok_buttoncode
 Map the given button index for \fBdlg_ok_labels\fP
-into \fBdialog\fP's exit-code.
+into \fB\*p\fP's exit-code.
 .RS
 .TP 5
 .B int \fIbutton
@@ -2370,7 +2460,7 @@ a curses-ordinate from a dialog-ordinate.
 .B dlg_parse_bindkey
 Parse the parameters of the "bindkeys" configuration-file entry.  This
 expects widget name which may be "*", followed by curses key definition and
-then dialog key definition.
+then \fB\*p\fP key definition.
 .RS
 .TP 5
 .B char * \fIparams
@@ -2394,7 +2484,7 @@ is the current button index
 .RE
 .\" ---------------------------------------------------------------------------
 .TP 5
-dlg_print_scrolled
+.B dlg_print_scrolled
 This is a wrapper for \fBdlg_print_autowrap\fP which allows the user
 to scroll too-long prompt text up/down.
 .IP
@@ -2505,7 +2595,7 @@ is the window's width
 .TP 5
 .B dlg_print_text
 Print up to \fIcols\fP columns from \fBtext\fP,
-optionally rendering \fBdialog\fP's escape sequences for attributes and color.
+optionally rendering \fB\*p\fP's escape sequences for attributes and color.
 .RS
 .TP 5
 .B WINDOW * \fIwin
@@ -2522,6 +2612,29 @@ holds the starting attributes, and is updated to reflect the final attributes
 applied to the string.
 .RE
 .\" ---------------------------------------------------------------------------
+.B dlg_progressbox
+implements the "\fB--prgbox\fP" and "\fB--progressbox\fP" options.
+.RS
+.IP title
+is the title on the top of the widget.
+.IP cprompt
+is the prompt text shown within the widget.
+If empty or null, no prompt is shown.
+.IP height
+is the desired height of the box.
+If zero, the height is based on the screen size.
+.IP width
+is the desired width of the box.
+If zero, the height is based on the screen size.
+.IP pauseopt
+if true, an "OK" button will be shown,
+and the dialog will wait for it to complete.
+With an "OK" button, it is denoted a "programbox",
+without an "OK" button, it is denoted a "progressbox".
+.IP fp
+is the file pointer, which may be a pipe or a regular file.
+.RE
+.\" ---------------------------------------------------------------------------
 .TP 5
 .B dlg_put_backtitle
 Display the background title if \fBdialog_vars.backtitle\fP is non-null.
@@ -2570,16 +2683,22 @@ contains the callback information.
 .\" ---------------------------------------------------------------------------
 .TP 5
 .B dlg_restore_vars
-Restore dialog's variables from the given variable (see \fBdialog_save_vars\fP).
+Restore \fB\*p\fP's variables from the given variable (see \fBdialog_save_vars\fP).
 .RS
 .TP 5
 .B DIALOG_VARS * \fIsave
 is the variable from which to restore.
 .RE
+.IP
+The 
+\fIDIALOG_VARS.input_length\fP and
+\fIDIALOG_VARS.input_result\fP members are treated specially,
+since these are used by a widget to pass data to the caller.
+They are not modified by this function.
 .\" ---------------------------------------------------------------------------
 .TP 5
 .B dlg_result_key
-Test a dialog internal keycode to see if it corresponds to one of the push
+Test a \fB\*p\fP internal keycode to see if it corresponds to one of the push
 buttons on the widget such as "OK".
 This is only useful if there are user-defined key bindings, since there are
 no built-in bindings that map directly to \fBDLGK_OK\fP, etc.
@@ -2587,7 +2706,7 @@ Return true if a mapping was done.
 .RS
 .TP 5
 .B int \fIdialog_key
-is the dialog key to test
+is the \fB\*p\fP key to test
 .TP 5
 .B int \fIfkey
 is true if this is a function key
@@ -2598,7 +2717,7 @@ store the result of the mapping in the referenced location.
 .\" ---------------------------------------------------------------------------
 .TP 5
 .B dlg_save_vars
-Save dialog's variables into the given variable (see \fBdialog_restore_vars\fP).
+Save \fB\*p\fP's variables into the given variable (see \fBdialog_restore_vars\fP).
 .RS
 .TP 5
 .B DIALOG_VARS * \fIsave
@@ -2683,6 +2802,17 @@ is the other string
 .RE
 .\" ---------------------------------------------------------------------------
 .TP 5
+.B dlg_string_to_argv
+Convert a string to an argument vector
+returning an index (which must be freed by the caller).
+The string is modified (replacing gaps between tokens with nulls).
+.RS
+.TP 5
+.B char *\fIblob
+is the string to convert.
+.RE
+.\" ---------------------------------------------------------------------------
+.TP 5
 .B dlg_sub_window
 create a subwindow, e.g., for an input area of a widget
 .RS
@@ -2762,7 +2892,7 @@ is the window from which to remove bindings
 .\" ---------------------------------------------------------------------------
 .TP 5
 .B dlg_yes_buttoncode
-Map the given button index for \fBdlg_yes_labels\fP into \fBdialog\fP's exit-code.
+Map the given button index for \fBdlg_yes_labels\fP into \fB\*p\fP's exit-code.
 .RS
 .TP 5
 .B int \fIbutton
@@ -2775,7 +2905,7 @@ Return a list of buttons for Yes/No labels.
 .
 .\" ************************************************************************
 .SH SEE ALSO
-dialog (1).
+\fB\*p\fP (1).
 .
 .\" ************************************************************************
 .SH AUTHOR
diff --git a/dialog.c b/dialog.c
index 3f718b485eb0..13b2a170a392 100644
--- a/dialog.c
+++ b/dialog.c
@@ -1,9 +1,9 @@
 /*
- * $Id: dialog.c,v 1.177 2010/01/18 09:21:14 tom Exp $
+ * $Id: dialog.c,v 1.186 2011/03/02 09:58:29 tom Exp $
  *
  *  cdialog - Display simple dialog boxes from shell scripts
  *
- *  Copyright 2000-2008,2010	Thomas E. Dickey
+ *  Copyright 2000-2010,2011	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
@@ -95,6 +95,7 @@ typedef enum {
     ,o_no_kill
     ,o_no_label
     ,o_no_lines
+    ,o_no_mouse
     ,o_no_shadow
     ,o_nocancel
     ,o_noitem
@@ -105,9 +106,11 @@ typedef enum {
     ,o_passwordbox
     ,o_passwordform
     ,o_pause
+    ,o_prgbox
     ,o_print_maxsize
     ,o_print_size
     ,o_print_version
+    ,o_programbox
     ,o_progressbox
     ,o_quoted
     ,o_radiolist
@@ -235,6 +238,7 @@ static const Options options[] = {
     { "no-kill",	o_no_kill,		1, "" },
     { "no-label",	o_no_label,		1, "<str>" },
     { "no-lines",	o_no_lines, 		1, "" },
+    { "no-mouse",	o_no_mouse,		1, "" },
     { "no-ok",		o_nook,			1, "" },
     { "no-shadow",	o_no_shadow,		1, "" },
     { "nocancel",	o_nocancel,		1, NULL }, /* see --no-cancel */
@@ -246,10 +250,12 @@ static const Options options[] = {
     { "passwordbox",	o_passwordbox,		2, "<text> <height> <width> [<init>]" },
     { "passwordform",	o_passwordform,		2, "<text> <height> <width> <form height> <label1> <l_y1> <l_x1> <item1> <i_y1> <i_x1> <flen1> <ilen1>..." },
     { "pause",		o_pause,		2, "<text> <height> <width> <seconds>" },
+    { "prgbox",		o_prgbox,		2, "<text> <command> <height> <width>" },
     { "print-maxsize",	o_print_maxsize,	1, "" },
     { "print-size",	o_print_size,		1, "" },
     { "print-version",	o_print_version,	5, "" },
-    { "progressbox",	o_progressbox,		2, "<height> <width>" },
+    { "programbox",	o_programbox,		2, "<text> <height> <width>" },
+    { "progressbox",	o_progressbox,		2, "<text> <height> <width>" },
     { "quoted",		o_quoted,		1, "" },
     { "radiolist",	o_radiolist,		2, "<text> <height> <width> <list height> <tag1> <item1> <status1>..." },
     { "screen-center",	o_screen_center,	1, NULL },
@@ -287,109 +293,6 @@ static const Options options[] = {
 /* *INDENT-ON* */
 
 /*
- * Convert a string to an argv[], returning a char** index (which must be
- * freed by the caller).  The string is modified (replacing gaps between
- * tokens with nulls).
- */
-static char **
-string_to_argv(char *blob)
-{
-    size_t n;
-    int pass;
-    size_t length = strlen(blob);
-    char **result = 0;
-
-    for (pass = 0; pass < 2; ++pass) {
-	bool inparm = FALSE;
-	bool quoted = FALSE;
-	char *param = blob;
-	size_t count = 0;
-
-	for (n = 0; n < length; ++n) {
-	    if (quoted && blob[n] == '"') {
-		quoted = FALSE;
-	    } else if (blob[n] == '"') {
-		quoted = TRUE;
-		if (!inparm) {
-		    if (pass)
-			result[count] = param;
-		    ++count;
-		    inparm = TRUE;
-		}
-	    } else if (blob[n] == '\\') {
-		if (quoted && !isspace(UCH(blob[n + 1]))) {
-		    if (!inparm) {
-			if (pass)
-			    result[count] = param;
-			++count;
-			inparm = TRUE;
-		    }
-		    if (pass) {
-			*param++ = blob[n];
-			*param++ = blob[n + 1];
-		    }
-		}
-		++n;
-	    } else if (!quoted && isspace(UCH(blob[n]))) {
-		inparm = FALSE;
-		if (pass) {
-		    *param++ = '\0';
-		}
-	    } else {
-		if (!inparm) {
-		    if (pass)
-			result[count] = param;
-		    ++count;
-		    inparm = TRUE;
-		}
-		if (pass) {
-		    *param++ = blob[n];
-		}
-	    }
-	}
-
-	if (!pass) {
-	    if (count) {
-		result = dlg_calloc(char *, count + 1);
-		assert_ptr(result, "string_to_argv");
-	    } else {
-		break;		/* no tokens found */
-	    }
-	} else {
-	    *param = '\0';
-	}
-    }
-    return result;
-}
-
-/*
- * Count the entries in an argv list.
- */
-static int
-count_argv(char **argv)
-{
-    int result = 0;
-
-    if (argv != 0) {
-	while (argv[result] != 0)
-	    ++result;
-    }
-    return result;
-}
-
-static int
-eat_argv(int *argcp, char ***argvp, int start, int count)
-{
-    int k;
-
-    *argcp -= count;
-    for (k = start; k <= *argcp; k++)
-	(*argvp)[k] = (*argvp)[k + count];
-    (*argvp)[*argcp] = 0;
-    return TRUE;
-}
-
-/*
  * Make an array showing which argv[] entries are options.  Use "--" as a
  * special token to escape the next argument, allowing it to begin with "--".
  * When we find a "--" argument, also remove it from argv[] and adjust argc.
@@ -419,13 +322,13 @@ unescape_argv(int *argcp, char ***argvp)
 	bool escaped = FALSE;
 	if (!strcmp((*argvp)[j], "--")) {
 	    escaped = TRUE;
-	    changed = eat_argv(argcp, argvp, j, 1);
+	    changed = dlg_eat_argv(argcp, argvp, j, 1);
 	} else if (!strcmp((*argvp)[j], "--args")) {
 	    fprintf(stderr, "Showing arguments at arg%d\n", j);
 	    for (k = 0; k < *argcp; ++k) {
 		fprintf(stderr, " arg%d:%s\n", k, (*argvp)[k]);
 	    }
-	    changed = eat_argv(argcp, argvp, j, 1);
+	    changed = dlg_eat_argv(argcp, argvp, j, 1);
 	} else if (!strcmp((*argvp)[j], "--file")) {
 	    if (++count_includes > limit_includes)
 		dlg_exiterr("Too many --file options");
@@ -453,7 +356,7 @@ unescape_argv(int *argcp, char ***argvp)
 			assert_ptr(blob, "unescape_argv");
 			bytes_read = fread(blob + length,
 					   sizeof(char),
-					   BUFSIZ,
+					     (size_t) BUFSIZ,
 					   fp);
 			length += bytes_read;
 			if (ferror(fp))
@@ -463,8 +366,8 @@ unescape_argv(int *argcp, char ***argvp)
 
 		    blob[length] = '\0';
 
-		    list = string_to_argv(blob);
-		    if ((added = count_argv(list)) != 0) {
+		    list = dlg_string_to_argv(blob);
+		    if ((added = dlg_count_argv(list)) != 0) {
 			if (added > 2) {
 			    size_t need = (size_t) (*argcp + added + 1);
 			    if (doalloc) {
@@ -505,7 +408,7 @@ unescape_argv(int *argcp, char ***argvp)
 	}
 	if (!escaped
 	    && (*argvp)[j] != 0
-	    && !strncmp((*argvp)[j], "--", 2)
+	    && !strncmp((*argvp)[j], "--", (size_t) 2)
 	    && isalpha(UCH((*argvp)[j][2]))) {
 	    dialog_opts[j] = TRUE;
 	}
@@ -538,7 +441,7 @@ isOption(const char *arg)
 		    break;
 		}
 	    }
-	} else if (!strncmp(arg, "--", 2) && isalpha(UCH(arg[2]))) {
+	} else if (!strncmp(arg, "--", (size_t) 2) && isalpha(UCH(arg[2]))) {
 	    result = TRUE;
 	}
     }
@@ -614,7 +517,7 @@ static int
 numeric_arg(char **av, int n)
 {
     char *last = 0;
-    int result = strtol(av[n], &last, 10);
+    int result = (int) strtol(av[n], &last, 10);
     char msg[80];
 
     if (last == 0 || *last != 0) {
@@ -666,7 +569,8 @@ show_result(int ret)
 		  dialog_state.output);
 	    either = TRUE;
 	}
-	if (dialog_vars.input_result[0] != '\0') {
+	if (dialog_vars.input_result != 0
+	    && dialog_vars.input_result[0] != '\0') {
 	    fputs(dialog_vars.input_result, dialog_state.output);
 	    either = TRUE;
 	}
@@ -740,24 +644,33 @@ static int
 call_inputmenu(CALLARGS)
 {
     int tags = howmany_tags(av + 5, MENUBOX_TAGS);
+    bool free_extra_label = FALSE;
+    int result;
 
     dialog_vars.input_menu = TRUE;
 
     if (dialog_vars.max_input == 0)
 	dialog_vars.max_input = MAX_LEN / 2;
 
-    if (dialog_vars.extra_label == 0)
-	dialog_vars.extra_label = _("Rename");
+    if (dialog_vars.extra_label == 0) {
+	free_extra_label = TRUE;
+	dialog_vars.extra_label = dlg_strclone(_("Rename"));
+    }
 
     dialog_vars.extra_button = TRUE;
 
     *offset_add = 5 + tags * MENUBOX_TAGS;
-    return dialog_menu(t,
-		       av[1],
-		       numeric_arg(av, 2),
-		       numeric_arg(av, 3),
-		       numeric_arg(av, 4),
-		       tags, av + 5);
+    result = dialog_menu(t,
+			 av[1],
+			 numeric_arg(av, 2),
+			 numeric_arg(av, 3),
+			 numeric_arg(av, 4),
+			 tags, av + 5);
+    if (free_extra_label) {
+	free(dialog_vars.extra_label);
+	dialog_vars.extra_label = 0;
+    }
+    return result;
 }
 
 static int
@@ -959,6 +872,53 @@ call_mixed_gauge(CALLARGS)
 }
 #endif
 
+static int
+call_prgbox(CALLARGS)
+{
+    *offset_add = arg_rest(av);
+    /* the original version does not accept a prompt string, but for
+     * consistency we allow it.
+     */
+    return ((*offset_add == 5)
+	    ? dialog_prgbox(t,
+			    av[1],
+			    av[2],
+			    numeric_arg(av, 3),
+			    numeric_arg(av, 4), TRUE)
+	    : dialog_prgbox(t,
+			    "",
+			    av[1],
+			    numeric_arg(av, 2),
+			    numeric_arg(av, 3), TRUE));
+}
+
+#ifdef HAVE_DLG_GAUGE
+static int
+call_programbox(CALLARGS)
+{
+    int result;
+
+    *offset_add = arg_rest(av);
+    /* this function is a compromise between --prgbox and --progressbox.
+     */
+    result = ((*offset_add == 4)
+	      ? dlg_progressbox(t,
+				av[1],
+				numeric_arg(av, 2),
+				numeric_arg(av, 3),
+				TRUE,
+				dialog_state.pipe_input)
+	      : dlg_progressbox(t,
+				"",
+				numeric_arg(av, 1),
+				numeric_arg(av, 2),
+				TRUE,
+				dialog_state.pipe_input));
+    dialog_state.pipe_input = 0;
+    return result;
+}
+#endif
+
 #ifdef HAVE_DLG_GAUGE
 static int
 call_progressbox(CALLARGS)
@@ -1018,6 +978,8 @@ static const Mode modes[] =
 #ifdef HAVE_DLG_GAUGE
     {o_gauge,           4, 5, call_gauge},
     {o_pause,           5, 5, call_pause},
+    {o_prgbox,          4, 5, call_prgbox},
+    {o_programbox,      3, 4, call_programbox},
     {o_progressbox,     3, 4, call_progressbox},
 #endif
 #ifdef HAVE_DLG_FORMBOX
@@ -1067,7 +1029,7 @@ optionValue(char **argv, int *num)
     int result = 0;
 
     if (src != 0) {
-	result = strtol(src, &tmp, 0);
+	result = (int) strtol(src, &tmp, 0);
 	if (tmp == 0 || *tmp != 0)
 	    src = 0;
     }
@@ -1135,7 +1097,7 @@ Help(void)
     static const char *const tbl_1[] =
     {
 	"cdialog (ComeOn Dialog!) version %s",
-	"Copyright 2000-2007,2008 Thomas E. Dickey",
+	"Copyright 2000-2008,2011 Thomas E. Dickey",
 	"This is free software; see the source for copying conditions.  There is NO",
 	"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.",
 	"",
@@ -1156,8 +1118,8 @@ Help(void)
 	"Global-auto-size if also menu_height/list_height = 0.",
 	0
     };
-    unsigned limit = sizeof(options) / sizeof(options[0]);
-    unsigned j, k;
+    size_t limit = sizeof(options) / sizeof(options[0]);
+    size_t j, k;
     const Options **opts;
 
     opts = dlg_calloc(const Options *, limit);
@@ -1172,7 +1134,7 @@ Help(void)
     for (j = k = 0; j < limit; j++) {
 	if ((opts[j]->pass & 1)
 	    && opts[j]->help != 0) {
-	    unsigned len = 6 + strlen(opts[j]->name) + strlen(opts[j]->help);
+	    size_t len = 6 + strlen(opts[j]->name) + strlen(opts[j]->help);
 	    k += len;
 	    if (k > 75) {
 		fprintf(dialog_state.output, "\n ");
@@ -1204,6 +1166,9 @@ Help(void)
 static int
 process_common_options(int argc, char **argv, int offset, bool output)
 {
+#ifdef HAVE_DLG_TRACE
+    int n;
+#endif
     bool done = FALSE;
 
     while (offset < argc && !done) {	/* Common options */
@@ -1389,6 +1354,9 @@ process_common_options(int argc, char **argv, int offset, bool output)
 	    dialog_vars.no_lines = TRUE;
 	    dialog_vars.ascii_lines = FALSE;
 	    break;
+	case o_no_mouse:
+	    dialog_state.no_mouse = TRUE;
+	    break;
 	case o_noitem:
 	case o_fullbutton:
 	    /* ignore */
@@ -1418,6 +1386,9 @@ process_common_options(int argc, char **argv, int offset, bool output)
 #ifdef HAVE_DLG_TRACE
 	case o_trace:
 	    dlg_trace(optionString(argv, &offset));
+	    for (n = 0; argv[n] != 0; ++n) {
+		dlg_trace_msg("argv[%d] = %s\n", n, argv[n]);
+	    }
 	    break;
 #endif
 	}
@@ -1453,8 +1424,8 @@ init_result(char *buffer)
 	if (env != 0)
 	    env = dlg_strclone(env);
 	if (env != 0) {
-	    special_argv = string_to_argv(env);
-	    special_argc = count_argv(special_argv);
+	    special_argv = dlg_string_to_argv(env);
+	    special_argc = dlg_count_argv(special_argv);
 	}
     }
     if (special_argv != 0) {
@@ -1487,8 +1458,8 @@ main(int argc, char *argv[])
 #if defined(ENABLE_NLS)
     /* initialize locale support */
     setlocale(LC_ALL, "");
-    bindtextdomain(PACKAGE, LOCALEDIR);
-    textdomain(PACKAGE);
+    bindtextdomain(NLS_TEXTDOMAIN, LOCALEDIR);
+    textdomain(NLS_TEXTDOMAIN);
 #elif defined(HAVE_SETLOCALE)
     (void) setlocale(LC_ALL, "");
 #endif
@@ -1664,8 +1635,10 @@ main(int argc, char *argv[])
 						   &offset_add));
 	offset += offset_add;
 
-	if (dialog_vars.input_result != my_buffer)
+	if (dialog_vars.input_result != my_buffer) {
 	    free(dialog_vars.input_result);
+	    dialog_vars.input_result = 0;
+	}
 
 	if (retval == DLG_EXIT_ESC) {
 	    esc_pressed = TRUE;
diff --git a/dialog.h b/dialog.h
index e8f5e756ba77..e7265734094e 100644
--- a/dialog.h
+++ b/dialog.h
@@ -1,9 +1,9 @@
 /*
- *  $Id: dialog.h,v 1.214 2010/04/28 21:11:49 tom Exp $
+ *  $Id: dialog.h,v 1.223 2011/03/02 10:04:09 tom Exp $
  *
- * dialog.h -- common declarations for all dialog modules
+ *  dialog.h -- common declarations for all dialog modules
  *
- * Copyright 2000-2008,2010 Thomas E. Dickey
+ *  Copyright 2000-2010,2011	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
@@ -26,6 +26,7 @@
 
 #ifndef DIALOG_H_included
 #define DIALOG_H_included 1
+/* *INDENT-OFF* */
 
 #include <dlg_config.h>
 
@@ -43,6 +44,8 @@
 #include <signal.h>	/* fork() etc. */
 #include <math.h>	/* sqrt() */
 
+#undef ERR		/* header conflict with Solaris xpg4 */
+
 #if defined(HAVE_NCURSESW_NCURSES_H)
 #include <ncursesw/ncurses.h>
 #elif defined(HAVE_NCURSES_NCURSES_H)
@@ -60,6 +63,19 @@
 #include <unctrl.h>
 #endif
 
+/* Solaris xpg4 renames these */
+#ifndef KEY_MAX
+#ifdef __KEY_MAX
+#define KEY_MAX __KEY_MAX
+#endif
+#endif
+
+#ifndef KEY_MIN
+#ifdef __KEY_MIN
+#define KEY_MIN __KEY_MIN
+#endif
+#endif
+
 /* possible conflicts with <term.h> which may be included in <curses.h> */
 #ifdef color_names
 #undef color_names
@@ -143,7 +159,7 @@
 #define ARROWS_COL  5
 
 #define MAX_LEN 2048
-#define BUF_SIZE (10*1024)
+#define BUF_SIZE (10L*1024)
 
 #undef  MIN
 #define MIN(x,y) ((x) < (y) ? (x) : (y))
@@ -155,7 +171,7 @@
 #define DEFAULT_ASPECT_RATIO 9
 /* how many spaces is a tab long (default)? */
 #define TAB_LEN 8
-#define WTIMEOUT_VAL        10
+#define WTIMEOUT_VAL        10	/* minimum amount of time needed for curses */
 
 #ifndef A_CHARTEXT
 #define A_CHARTEXT 0xff
@@ -336,6 +352,7 @@ extern int dlg_getpary(WINDOW * /*win*/);
 #define form_active_text_attr         DIALOG_ATR(30)
 #define form_text_attr                DIALOG_ATR(31)
 #define form_item_readonly_attr       DIALOG_ATR(32)
+#define gauge_attr                    DIALOG_ATR(33)
 
 #define DLGK_max (KEY_MAX + 256)
 
@@ -357,6 +374,9 @@ typedef struct _dlg_callback {
     /* data for dlg_add_callback_ref */
     struct _dlg_callback **caller;
     DIALOG_FREEBACK freeback;
+    /* 1.1-20110107 */
+    bool (*handle_input)(struct _dlg_callback *p);
+    bool input_ready;
 } DIALOG_CALLBACK;
 
 typedef struct _dlg_windows {
@@ -389,6 +409,8 @@ typedef struct {
 #ifdef HAVE_DLG_TRACE
     FILE *trace_output;		/* option "--trace file" */
 #endif
+    /* 1.1-20110106 */
+    bool no_mouse;		/* option "--no-mouse" */
 } DIALOG_STATE;
 
 extern DIALOG_STATE dialog_state;
@@ -473,8 +495,8 @@ extern DIALOG_VARS dialog_vars;
 
 #define assert_ptr(ptr,msg) if ((ptr) == 0) dlg_exiterr("cannot allocate memory in " msg)
 
-#define dlg_malloc(t,n)    (t *) malloc((n) * sizeof(t))
-#define dlg_calloc(t,n)    (t *) calloc((n), sizeof(t))
+#define dlg_malloc(t,n)    (t *) malloc((size_t)(n) * sizeof(t))
+#define dlg_calloc(t,n)    (t *) calloc((size_t)(n), sizeof(t))
 #define dlg_realloc(t,n,p) (t *) realloc((p), (n) * sizeof(t))
 
 /*
@@ -514,6 +536,7 @@ extern int dialog_mixedform(const char * /*title*/, const char * /*cprompt*/, in
 extern int dialog_mixedgauge(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/, int /*percent*/, int /*item_no*/, char ** /*items*/);
 extern int dialog_msgbox(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/, int /*pauseopt*/);
 extern int dialog_pause(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/, int /*seconds*/);
+extern int dialog_prgbox(const char * /*title*/, const char * /*cprompt*/, const char * /*command*/, int /*height*/, int /*width*/, int /*pauseopt*/);
 extern int dialog_progressbox(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/);
 extern int dialog_tailbox(const char * /*title*/, const char * /*file*/, int /*height*/, int /*width*/, int /*bg_task*/);
 extern int dialog_textbox(const char * /*title*/, const char * /*file*/, int /*height*/, int /*width*/);
@@ -551,6 +574,12 @@ typedef	int (DIALOG_INPUTMENU) (DIALOG_LISTITEM * /*items*/, int /*current*/, ch
 extern int dlg_checklist(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/, int /*list_height*/, int /*item_no*/, DIALOG_LISTITEM * /*items*/, const char * /*states*/, int /*flag*/, int * /*current_item*/);
 extern int dlg_form(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/, int /*form_height*/, int /*item_no*/, DIALOG_FORMITEM * /*items*/, int * /*current_item*/);
 extern int dlg_menu(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/, int /*menu_height*/, int /*item_no*/, DIALOG_LISTITEM * /*items*/, int * /*current_item*/, DIALOG_INPUTMENU /*rename_menu*/);
+extern int dlg_progressbox(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/, int /*pauseopt*/, FILE * /* fp */);
+
+/* argv.c */
+extern char ** dlg_string_to_argv(char * /* blob */);
+extern int dlg_count_argv(char ** /* argv */);
+extern int dlg_eat_argv(int * /* argcp */, char *** /* argvp */, int /* start */, int /* count */);
 
 /* arrows.c */
 extern void dlg_draw_arrows(WINDOW * /*dialog*/, int /*top_arrow*/, int /*bottom_arrow*/, int /*x*/, int /*top*/, int /*bottom*/);
@@ -627,6 +656,7 @@ extern char * dlg_strclone(const char * /*cprompt*/);
 extern char * dlg_strempty(void);
 extern chtype dlg_asciibox(chtype /*ch*/);
 extern chtype dlg_boxchar(chtype /*ch*/);
+extern chtype dlg_get_attrs(WINDOW * /*win*/);
 extern const char * dlg_print_line(WINDOW */*win*/, chtype */*attr*/, const char */*prompt*/, int /*lm*/, int /*rm*/, int */*x*/);
 extern int dlg_box_x_ordinate(int /*width*/);
 extern int dlg_box_y_ordinate(int /*height*/);
@@ -780,5 +810,6 @@ extern void _nc_free_and_exit(int);	/* nc_alloc.h normally not installed */
 #ifdef __cplusplus
 }
 #endif
+/* *INDENT-ON* */
 
 #endif /* DIALOG_H_included */
diff --git a/dlg_colors.h b/dlg_colors.h
index f8d8b1191060..84123ddcb453 100644
--- a/dlg_colors.h
+++ b/dlg_colors.h
@@ -1,9 +1,9 @@
 /*
- *  $Id: dlg_colors.h,v 1.15 2007/02/18 18:23:29 tom Exp $
+ *  $Id: dlg_colors.h,v 1.16 2011/01/17 00:20:32 tom Exp $
  *
  *  colors.h -- color attribute definitions
  *
- *  Copyright 2000-2005,2006	Thomas E. Dickey
+ *  Copyright 2000-2007,2011	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
@@ -168,6 +168,10 @@
 #define DLGC_BG_FORM_TEXT              COLOR_CYAN
 #define DLGC_HL_FORM_TEXT              TRUE
 
+#define DLGC_FG_GAUGE                  COLOR_BLUE
+#define DLGC_BG_GAUGE                  COLOR_WHITE
+#define DLGC_HL_GAUGE                  TRUE
+
 /* End of default color definitions */
 
 /*
diff --git a/fselect.c b/fselect.c
index d184a7652ff2..09a55604aedd 100644
--- a/fselect.c
+++ b/fselect.c
@@ -1,9 +1,9 @@
 /*
- * $Id: fselect.c,v 1.74 2010/04/28 20:45:40 tom Exp $
+ *  $Id: fselect.c,v 1.76 2011/01/16 22:20:16 tom Exp $
  *
- * fselect.c -- implements the file-selector box
+ *  fselect.c -- implements the file-selector box
  *
- * Copyright 2000-2009,2010 Thomas E. Dickey
+ *  Copyright 2000-2010,2011	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
@@ -241,10 +241,10 @@ display_list(LIST * list)
 	top = y - 1;
 	bottom = y + getmaxy(list->win);
 	dlg_draw_scrollbar(list->par,
-			   list->offset,
-			   list->offset,
-			   list->offset + getmaxy(list->win),
-			   list->length,
+			   (long) list->offset,
+			   (long) list->offset,
+			   (long) (list->offset + getmaxy(list->win)),
+			   (long) (list->length),
 			   x + 1,
 			   x + getmaxx(list->win),
 			   top,
@@ -289,7 +289,7 @@ fix_arrows(LIST * list)
 }
 
 static int
-show_list(char *target, LIST * list, bool keep)
+show_list(char *target, LIST * list, int keep)
 {
     int changed = keep || find_choice(target, list);
     display_list(list);
@@ -301,7 +301,7 @@ show_list(char *target, LIST * list, bool keep)
  * to match.
  */
 static int
-show_both_lists(char *input, LIST * d_list, LIST * f_list, bool keep)
+show_both_lists(char *input, LIST * d_list, LIST * f_list, int keep)
 {
     char *leaf = leaf_of(input);
 
@@ -427,7 +427,7 @@ complete(char *name, LIST * d_list, LIST * f_list, char **buff_ptr)
 }
 
 static bool
-fill_lists(char *current, char *input, LIST * d_list, LIST * f_list, bool keep)
+fill_lists(char *current, char *input, LIST * d_list, LIST * f_list, int keep)
 {
     DIR *dp;
     DIRENT *de;
@@ -528,7 +528,7 @@ usable_state(int state, LIST * dirs, LIST * files)
  * Display a dialog box for entering a filename
  */
 static int
-dlg_fselect(const char *title, const char *path, int height, int width, bool dselect)
+dlg_fselect(const char *title, const char *path, int height, int width, int dselect)
 {
     /* *INDENT-OFF* */
     static DLG_KEYS_BINDING binding[] = {
@@ -568,8 +568,8 @@ dlg_fselect(const char *title, const char *path, int height, int width, bool dse
     WINDOW *w_text = 0;
     WINDOW *w_work = 0;
     const char **buttons = dlg_ok_labels();
-    char *d_label = _("Directories");
-    char *f_label = _("Files");
+    const char *d_label = _("Directories");
+    const char *f_label = _("Files");
     char *partial;
     int min_wide = MIN_WIDE;
     int min_items = height ? 0 : 4;
@@ -682,7 +682,7 @@ dlg_fselect(const char *title, const char *path, int height, int width, bool dse
 	if (resized) {
 	    resized = FALSE;
 	    dlg_show_string(w_text, input, offset, inputbox_attr,
-			    0, 0, tbox_width, 0, first);
+			    0, 0, tbox_width, (bool) 0, (bool) first);
 	}
 #endif
 
diff --git a/guage.c b/guage.c
index a3d5cc0f8a76..d12bc21f919f 100644
--- a/guage.c
+++ b/guage.c
@@ -1,9 +1,9 @@
 /*
- *  $Id: guage.c,v 1.45 2010/01/19 09:15:20 tom Exp $
+ *  $Id: guage.c,v 1.52 2011/01/17 10:39:28 tom Exp $
  *
- * guage.c -- implements the gauge dialog
+ *  guage.c -- implements the gauge dialog
  *
- * Copyright 2000-2007,2010 Thomas E. Dickey
+ *  Copyright 2000-2010,2011	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
@@ -33,12 +33,11 @@
 #define MIN_HIGH (4)
 #define MIN_WIDE (10 + 2 * (2 + MARGIN))
 
-#define isMarker(buf) !strncmp(buf, "XXX", 3)
+#define isMarker(buf) !strncmp(buf, "XXX", (size_t) 3)
 
 typedef struct {
     DIALOG_CALLBACK obj;
     WINDOW *text;
-    bool done;
     const char *title;
     char *prompt;
     char prompt_buf[MY_LEN];
@@ -82,64 +81,70 @@ repaint_text(MY_OBJ * obj)
     WINDOW *dialog = obj->obj.win;
     int i, x;
 
-    (void) werase(dialog);
-    dlg_draw_box(dialog, 0, 0, obj->height, obj->width, dialog_attr, border_attr);
-
-    dlg_draw_title(dialog, obj->title);
-
-    wattrset(dialog, dialog_attr);
-    dlg_print_autowrap(dialog, obj->prompt, obj->height, obj->width);
-
-    dlg_draw_box(dialog,
-		 obj->height - 4, 2 + MARGIN,
-		 2 + MARGIN, obj->width - 2 * (2 + MARGIN),
-		 dialog_attr,
-		 border_attr);
-
-    /*
-     * Clear the area for the progress bar by filling it with spaces
-     * in the title-attribute, and write the percentage with that
-     * attribute.
-     */
-    (void) wmove(dialog, obj->height - 3, 4);
-    wattrset(dialog, title_attr);
-
-    for (i = 0; i < (obj->width - 2 * (3 + MARGIN)); i++)
-	(void) waddch(dialog, ' ');
-
-    (void) wmove(dialog, obj->height - 3, (obj->width / 2) - 2);
-    (void) wprintw(dialog, "%3d%%", obj->percent);
-
-    /*
-     * Now draw a bar in reverse, relative to the background.
-     * The window attribute was useful for painting the background,
-     * but requires some tweaks to reverse it.
-     */
-    x = (obj->percent * (obj->width - 2 * (3 + MARGIN))) / 100;
-    if ((title_attr & A_REVERSE) != 0) {
-	wattroff(dialog, A_REVERSE);
-    } else {
-	wattrset(dialog, A_REVERSE);
-    }
-    (void) wmove(dialog, obj->height - 3, 4);
-    for (i = 0; i < x; i++) {
-	chtype ch2 = winch(dialog);
-	if (title_attr & A_REVERSE) {
-	    ch2 &= ~A_REVERSE;
+    if (dialog != 0 && obj->obj.input != 0) {
+	(void) werase(dialog);
+	dlg_draw_box(dialog, 0, 0, obj->height, obj->width, dialog_attr, border_attr);
+
+	dlg_draw_title(dialog, obj->title);
+
+	wattrset(dialog, dialog_attr);
+	dlg_print_autowrap(dialog, obj->prompt, obj->height, obj->width);
+
+	dlg_draw_box(dialog,
+		     obj->height - 4, 2 + MARGIN,
+		     2 + MARGIN, obj->width - 2 * (2 + MARGIN),
+		     dialog_attr,
+		     border_attr);
+
+	/*
+	 * Clear the area for the progress bar by filling it with spaces
+	 * in the title-attribute, and write the percentage with that
+	 * attribute.
+	 */
+	(void) wmove(dialog, obj->height - 3, 4);
+	wattrset(dialog, gauge_attr);
+
+	for (i = 0; i < (obj->width - 2 * (3 + MARGIN)); i++)
+	    (void) waddch(dialog, ' ');
+
+	(void) wmove(dialog, obj->height - 3, (obj->width / 2) - 2);
+	(void) wprintw(dialog, "%3d%%", obj->percent);
+
+	/*
+	 * Now draw a bar in reverse, relative to the background.
+	 * The window attribute was useful for painting the background,
+	 * but requires some tweaks to reverse it.
+	 */
+	x = (obj->percent * (obj->width - 2 * (3 + MARGIN))) / 100;
+	if ((title_attr & A_REVERSE) != 0) {
+	    wattroff(dialog, A_REVERSE);
+	} else {
+	    wattrset(dialog, A_REVERSE);
+	}
+	(void) wmove(dialog, obj->height - 3, 4);
+	for (i = 0; i < x; i++) {
+	    chtype ch2 = winch(dialog);
+	    if (title_attr & A_REVERSE) {
+		ch2 &= ~A_REVERSE;
+	    }
+	    (void) waddch(dialog, ch2);
 	}
-	(void) waddch(dialog, ch2);
-    }
 
-    (void) wrefresh(dialog);
+	(void) wrefresh(dialog);
+    }
 }
 
-static int
-handle_input(MY_OBJ * obj)
+static bool
+handle_input(DIALOG_CALLBACK * cb)
 {
+    MY_OBJ *obj = (MY_OBJ *) cb;
+    bool result;
     int status;
     char buf[MY_LEN];
 
-    if ((status = read_data(buf, dialog_state.pipe_input)) > 0) {
+    if (dialog_state.pipe_input == 0) {
+	status = -1;
+    } else if ((status = read_data(buf, dialog_state.pipe_input)) > 0) {
 
 	if (isMarker(buf)) {
 	    /*
@@ -172,25 +177,32 @@ handle_input(MY_OBJ * obj)
 	    obj->percent = atoi(buf);
 	}
     } else {
-	obj->done = TRUE;
+	if (feof(dialog_state.pipe_input) ||
+	    (ferror(dialog_state.pipe_input) && errno != EINTR)) {
+	    dlg_remove_callback(cb);
+	}
     }
 
-    return status;
+    if (status > 0) {
+	result = TRUE;
+	repaint_text(obj);
+    } else {
+	result = FALSE;
+    }
+
+    return result;
 }
 
 static bool
 handle_my_getc(DIALOG_CALLBACK * cb, int ch, int fkey, int *result)
 {
-    MY_OBJ *obj = (MY_OBJ *) cb;
     int status = TRUE;
 
     *result = DLG_EXIT_OK;
-    if (obj != 0) {
+    if (cb != 0) {
 	if (!fkey && (ch == ERR)) {
-	    if (handle_input(obj) > 0)
-		repaint_text(obj);
-	    else
-		status = FALSE;
+	    (void) handle_input(cb);
+	    status = (cb->input != 0);
 	}
     } else {
 	status = FALSE;
@@ -265,12 +277,15 @@ dialog_gauge(const char *title,
 	obj->obj.keep_win = TRUE;
 	obj->obj.bg_task = TRUE;
 	obj->obj.handle_getc = handle_my_getc;
+	obj->obj.handle_input = handle_input;
 	obj->title = title;
 	obj->prompt = prompt;
 	obj->percent = percent;
 	obj->height = height;
 	obj->width = width;
 	dlg_add_callback_ref((DIALOG_CALLBACK **) objref, my_cleanup);
+    } else {
+	obj->obj.win = dialog;
     }
 
     repaint_text(obj);
diff --git a/headers-sh.in b/headers-sh.in
index 930f420a8ded..906c018d83e6 100755
--- a/headers-sh.in
+++ b/headers-sh.in
@@ -1,7 +1,7 @@
 #! /bin/sh
-# $Id: headers-sh.in,v 1.5 2007/07/05 00:20:18 tom Exp $
+# $Id: headers-sh.in,v 1.9 2011/01/06 09:38:25 tom Exp $
 ##############################################################################
-# Copyright (c) 2004,2007 Thomas E. Dickey                                   #
+# Copyright (c) 2004-2007,2011 Thomas E. Dickey                              #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #
@@ -43,6 +43,7 @@
 PACKAGE=@PACKAGE@
 PKGNAME=@PACKAGE_PREFIX@
 CONFIGH=@PACKAGE_CONFIG@
+SUB_INC=@SUB_INC@
 
 TMPSED=headers.sed
 
@@ -54,6 +55,8 @@ alnum=_${DIGIT}${alpha}
 ALNUM=_${DIGIT}${ALPHA}
 MIXED=_${DIGIT}${ALPHA}${alpha}
 
+pkgname=`echo "$PKGNAME" | tr "$ALPHA" "$alpha"`
+
 if test $# = 2 ; then
 	rm -f $TMPSED
 	DST=$1
@@ -71,7 +74,7 @@ if test $# = 2 ; then
 		done
 		;;
 	*)
-		echo "" >> $TMPSED
+		touch $TMPSED
 		;;
 	esac
 
@@ -109,7 +112,8 @@ EOF
 	# pick up autoconf-defined symbols in the config.h file
 	for name in `
 	egrep '^#define[ 	][ 	]*['$ALNUM']' $REF/$CONFIGH \
-		| sed	-e 's/^#define[ 	][ 	]*//' \
+		| sed \
+			-e 's/^#define[ 	][ 	]*//' \
 			-e 's/[ 	].*//' \
 		| egrep -v "^${PACKAGE}_" \
 		| sort -u \
@@ -118,6 +122,11 @@ EOF
 		echo "s/\\<$name\\>/${PKGNAME}_$name/g" >>$TMPSED
 	done
 
+	if test "$SUB_INC" = yes
+	then
+		echo "s,#include <${pkgname}_,#include <${PACKAGE}/${pkgname}_," >>$TMPSED
+	fi
+
 	# reduce the count if possible, since some old sed's limit is 100 lines
 	sort -u $TMPSED >headers.tmp
 	mv headers.tmp $TMPSED
@@ -145,6 +154,24 @@ else
 	# Just in case someone gzip'd manpages, remove the conflicting copy.
 	test -f $DST/$NAME.gz && rm -f $DST/$NAME.gz
 
+	if test "$SUB_INC" = yes
+	then
+		case $NAME in #(vi
+		${pkgname}_*) #(vi
+			case "$PRG" in #(vi
+			*install*)
+				test -d $DST/$PACKAGE || mkdir -p $DST/$PACKAGE 
+				;;
+			esac
+			NAME=$PACKAGE/$NAME
+			;;
+		*)
+			NAME=$PACKAGE.h
+			;;
+		esac
+	fi
+
 	eval $PRG $TMPSRC $DST/$NAME
 	rm -f $TMPSRC
 fi
+# vile:ts=4 sw=4
diff --git a/inputstr.c b/inputstr.c
index 4d95e684dc8a..685b1260fc79 100644
--- a/inputstr.c
+++ b/inputstr.c
@@ -1,9 +1,9 @@
 /*
- * $Id: inputstr.c,v 1.66 2010/01/15 23:13:36 tom Exp $
+ *  $Id: inputstr.c,v 1.69 2011/01/16 21:52:35 tom Exp $
  *
- * inputstr.c -- functions for input/display of a string
+ *  inputstr.c -- functions for input/display of a string
  *
- * Copyright 2000-2009,2010 Thomas E. Dickey
+ *  Copyright 2000-2010,2011	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
@@ -54,8 +54,8 @@ typedef struct _cache {
     struct _cache *cache_at;	/* unique: associate caches by CACHE */
     const char *string_at;	/* unique: associate caches by char* */
 #endif
-    unsigned s_len;		/* strlen(string) - we add 1 for EOS */
-    unsigned i_len;		/* length(list) - we add 1 for EOS */
+    size_t s_len;		/* strlen(string) - we add 1 for EOS */
+    size_t i_len;		/* length(list) - we add 1 for EOS */
     char *string;		/* a copy of the last-processed string */
     int *list;			/* indices into the string */
 } CACHE;
@@ -95,9 +95,9 @@ compare_cache(const void *a, const void *b)
     const CACHE *p = (const CACHE *) a;
     const CACHE *q = (const CACHE *) b;
     int result = 0;
-    result = p->cache_at - q->cache_at;
+    result = (int) (p->cache_at - q->cache_at);
     if (result == 0)
-	result = p->string_at - q->string_at;
+	result = (int) (p->string_at - q->string_at);
     return result;
 }
 #endif
@@ -187,12 +187,12 @@ static bool
 same_cache2(CACHE * cache, const char *string, unsigned i_len)
 {
     unsigned need;
-    unsigned s_len = strlen(string);
+    size_t s_len = strlen(string);
 
     if (cache->s_len != 0
 	&& cache->s_len >= s_len
 	&& cache->list != 0
-	&& SAME_CACHE(cache, string, s_len)) {
+	&& SAME_CACHE(cache, string, (size_t) s_len)) {
 	return TRUE;
     }
 
@@ -222,12 +222,12 @@ same_cache2(CACHE * cache, const char *string, unsigned i_len)
  * string and its associated length.
  */
 static bool
-same_cache1(CACHE * cache, const char *string, unsigned i_len)
+same_cache1(CACHE * cache, const char *string, size_t i_len)
 {
-    unsigned s_len = strlen(string);
+    size_t s_len = strlen(string);
 
     if (cache->s_len == s_len
-	&& SAME_CACHE(cache, string, s_len)) {
+	&& SAME_CACHE(cache, string, (size_t) s_len)) {
 	return TRUE;
     }
 
@@ -422,10 +422,10 @@ dlg_index_columns(const char *string)
 			result = wcwidth(temp[0]);
 		    }
 		    if (result < 0) {
-			wchar_t *printable;
-			cchar_t temp2;
-			setcchar(&temp2, temp, 0, 0, 0);
-			printable = wunctrl(&temp2);
+			const wchar_t *printable;
+			cchar_t temp2, *temp2p = &temp2;
+			setcchar(temp2p, temp, 0, 0, 0);
+			printable = wunctrl(temp2p);
 			result = printable ? (int) wcslen(printable) : 1;
 		    }
 		}
diff --git a/makefile.in b/makefile.in
index 83ab164cb705..753f642c9faa 100644
--- a/makefile.in
+++ b/makefile.in
@@ -1,5 +1,32 @@
-# $Id: makefile.in,v 1.71 2010/04/28 00:45:38 tom Exp $
+# $Id: makefile.in,v 1.78 2011/03/02 09:57:24 tom Exp $
 # template makefile for DIALOG
+##############################################################################
+# Copyright (c) 1999-2010,2011 Thomas E. Dickey                              #
+#                                                                            #
+# Permission is hereby granted, free of charge, to any person obtaining a    #
+# copy of this software and associated documentation files (the "Software"), #
+# to deal in the Software without restriction, including without limitation  #
+# the rights to use, copy, modify, merge, publish, distribute, distribute    #
+# with modifications, sublicense, and/or sell copies of the Software, and to #
+# permit persons to whom the Software is furnished to do so, subject to the  #
+# following conditions:                                                      #
+#                                                                            #
+# The above copyright notice and this permission notice shall be included in #
+# all copies or substantial portions of the Software.                        #
+#                                                                            #
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR #
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,   #
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL    #
+# THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER      #
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING    #
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER        #
+# DEALINGS IN THE SOFTWARE.                                                  #
+#                                                                            #
+# Except as contained in this notice, the name(s) of the above copyright     #
+# holders shall not be used in advertising or otherwise to promote the sale, #
+# use or other dealings in this Software without prior written               #
+# authorization.                                                             #
+##############################################################################
 #
 SHELL		= /bin/sh
 
@@ -34,12 +61,12 @@ MAN3DIR		= $(MANDIR)/man3
 localedir       = $(prefix)/@DATADIRNAME@/locale
 
 CFLAGS		= @CFLAGS@
-CPPFLAGS	= @CPPFLAGS@ @DEFS@ -I. -I$(srcdir) -DLOCALEDIR=\"$(localedir)\"
+CPPFLAGS	= -I. -I$(srcdir) @CPPFLAGS@ @DEFS@ -DLOCALEDIR=\"$(localedir)\"
 EXTRA_CFLAGS	= @EXTRA_CFLAGS@
 CC		= @CC@
 CPP		= @CPP@
 AR		= @AR@
-LDFLAGS		= @LDFLAGS@
+LDFLAGS		= @EXTRA_LDFLAGS@ @LDFLAGS@
 LIBS		= @LIBS@ @INTLLIBS@
 RANLIB		= @LIB_PREP@
 
@@ -65,7 +92,16 @@ INSTALL_DATA	= @INSTALL_DATA@
 
 LINK		= $(LIBTOOL_LINK)
 
-PACKAGE		= `echo @PACKAGE@ |sed @program_transform_name@`
+# The library is always named for the package, but the program can be further
+# renamed at install time, starting with the package name.
+PACKAGE		= @PACKAGE@
+ACTUAL_PROG	= `echo $(PACKAGE) |sed @program_transform_name@`
+LIB_CONFIG	= @PACKAGE@-config
+
+# The library name $(LIB) is set at configure/make time, since it is used as a
+# makefile target.  Ditto for $(PROG).
+LIB		= @LIB_PREFIX@@PACKAGE@$a
+PROG		= dialog$x
 #
 # Standard .c to .o compile line.
 #
@@ -91,6 +127,7 @@ PACKAGE		= `echo @PACKAGE@ |sed @program_transform_name@`
 
 EXTRAOBJS = @EXTRAOBJS@
 OBJECTS = $(EXTRAOBJS) \
+	argv$o \
 	arrows$o \
 	buttons$o \
 	checklist$o \
@@ -118,14 +155,12 @@ HDRS = \
 	dlg_config.h \
 	dlg_keys.h
 
-LIB	= @LIB_PREFIX@dialog$a
-PROG	= dialog$x
-ALL	= $(LIB) $(PROG)
+ALL		= $(LIB) $(PROG)
 
 BIN_DIRS	= $(BINDIR) $(MAN1DIR)
 LIB_DIRS	= $(LIBDIR) $(INCLUDEDIR)
 
-PO_DIR	= $(srcdir)/po
+PO_DIR		= $(srcdir)/po
 
 all	:: $(ALL)
 
@@ -144,7 +179,7 @@ $(LIB) : $(LIB_OBJECT)
 	$(RANLIB) $@
 
 dialog$x : $(LIB) dialog$o @INTLDIR_MAKE@ @INTLLIBS@
-	$(LINK) -o $@ dialog$o -L. -ldialog $(LDFLAGS) $(LIBS)
+	$(LINK) -o $@ dialog$o -L. -l@PACKAGE@ $(LDFLAGS) $(LIBS)
 
 clean	\
 distclean \
@@ -186,22 +221,28 @@ uninstall :: uninstall-bin uninstall-man
 uninstall-full :: uninstall-bin uninstall-man uninstall-lib
 	@echo "made $@"
 
-install-bin : $(PROG) $(BINDIR) 
-	$(INSTALL_PROGRAM) $(PROG) $(BINDIR)/$(PACKAGE)$x
+install-bin : $(PROG) $(BINDIR)
+	$(INSTALL_PROGRAM) $(PROG) $(BINDIR)/$(ACTUAL_PROG)$x
 
 uninstall-bin :
-	$(RM) $(BINDIR)/$(PACKAGE)$x
+	$(RM) $(BINDIR)/$(ACTUAL_PROG)$x
 
 install-man :: $(MAN1DIR)
-	$(INSTALL_DATA) $(srcdir)/dialog.1 $(MAN1DIR)/$(PACKAGE).1
+	@ echo "** installing $(ACTUAL_PROG).1"
+	@ $(SHELL) $(srcdir)/rename.sh \
+		$(srcdir)/dialog.1 \
+		$(MAN1DIR)/$(ACTUAL_PROG).1 \
+		$(ACTUAL_PROG) \
+		@PACKAGE@ \
+		$(INSTALL_DATA)
 
 uninstall-man ::
-	$(RM) $(MAN1DIR)/$(PACKAGE).1
+	$(RM) $(MAN1DIR)/$(ACTUAL_PROG).1
 
 # most users do not want/need the library, so the install rules are distinct.
 install-lib :: $(BINDIR) dialog-config
 	@ echo "** installing config script in $(BINDIR)"
-	@ $(INSTALL_SCRIPT) dialog-config $(BINDIR)
+	@ $(INSTALL_SCRIPT) dialog-config $(BINDIR)/$(LIB_CONFIG)
 
 install-lib :: $(LIB_DIRS) $(LIB) headers.sed
 	@ echo "** installing library in $(LIBDIR)"
@@ -213,20 +254,26 @@ install-lib :: $(LIB_DIRS) $(LIB) headers.sed
 	@ $(SHELL) $(srcdir)/headers-sh $(INSTALL_DATA) $(INCLUDEDIR) .         dlg_config.h
 
 uninstall-lib :: $(BINDIR)
-	$(RM) $(BINDIR)/dialog-config
+	$(RM) $(BINDIR)/$(LIB_CONFIG)
 
 uninstall-lib :: $(LIB_DIRS)
 	- $(LIBTOOL_UNINSTALL) $(RM) $(LIBDIR)/$(LIB)
-	$(RM) $(INCLUDEDIR)/dialog.h
-	$(RM) $(INCLUDEDIR)/dlg_colors.h
-	$(RM) $(INCLUDEDIR)/dlg_keys.h
-	$(RM) $(INCLUDEDIR)/dlg_config.h
+	@ $(SHELL) $(srcdir)/headers-sh $(RM) $(INCLUDEDIR) $(srcdir) dialog.h
+	@ $(SHELL) $(srcdir)/headers-sh $(RM) $(INCLUDEDIR) $(srcdir) dlg_colors.h
+	@ $(SHELL) $(srcdir)/headers-sh $(RM) $(INCLUDEDIR) $(srcdir) dlg_keys.h
+	@ $(SHELL) $(srcdir)/headers-sh $(RM) $(INCLUDEDIR) .         dlg_config.h
 
 install-lib :: $(MAN3DIR)
-	$(INSTALL_DATA) $(srcdir)/dialog.3 $(MAN3DIR)/$(PACKAGE).3
+	@ echo "** installing @PACKAGE@.3"
+	@ $(SHELL) $(srcdir)/rename.sh \
+		$(srcdir)/dialog.3 \
+		$(MAN3DIR)/@PACKAGE@.3 \
+		$(ACTUAL_PROG) \
+		@PACKAGE@ \
+		$(INSTALL_DATA)
 
 uninstall-lib ::
-	$(RM) $(MAN3DIR)/$(PACKAGE).3
+	$(RM) $(MAN3DIR)/@PACKAGE@.3
 
 headers.sed : $(srcdir)/headers-sh
 	$(SHELL) $(srcdir)/headers-sh $(INCLUDEDIR) $(srcdir)
diff --git a/menubox.c b/menubox.c
index 4c32bd716676..aa4cc2d89183 100644
--- a/menubox.c
+++ b/menubox.c
@@ -1,9 +1,9 @@
 /*
- *  $Id: menubox.c,v 1.118 2010/01/17 22:24:11 tom Exp $
+ *  $Id: menubox.c,v 1.120 2011/01/19 00:27:53 tom Exp $
  *
  *  menubox.c -- implements the menu box
  *
- *  Copyright 2000-2009,2010	Thomas E. Dickey
+ *  Copyright 2000-2010,2011	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 Licens, version 2.1e
@@ -117,7 +117,7 @@ print_item(WINDOW *win,
 	   Mode selected,
 	   bool is_inputmenu)
 {
-    chtype save = getattrs(win);
+    chtype save = dlg_get_attrs(win);
     int n;
     int my_width = menu_width;
     int my_x = item_x;
@@ -188,7 +188,7 @@ input_menu_edit(WINDOW *win,
 		int choice,
 		char **resultp)
 {
-    chtype save = getattrs(win);
+    chtype save = dlg_get_attrs(win);
     char *result;
     int offset = 0;
     int key = 0, fkey = 0;
diff --git a/mixedgauge.c b/mixedgauge.c
index d8b355694abf..739165de0c6f 100644
--- a/mixedgauge.c
+++ b/mixedgauge.c
@@ -1,9 +1,9 @@
 /*
- *  $Id: mixedgauge.c,v 1.18 2010/01/15 23:43:53 tom Exp $
+ *  $Id: mixedgauge.c,v 1.23 2011/01/19 00:27:53 tom Exp $
  *
  *  mixedgauge.c -- implements the mixedgauge dialog
  *
- *  Copyright 2007,2010	Thomas E. Dickey
+ *  Copyright 2007-2010,2011	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
@@ -89,7 +89,7 @@ status_string(char *given, char **freeMe)
 	    break;
 	}
     } else if (*given == '-') {
-	unsigned need = strlen(++given);
+	size_t need = strlen(++given);
 	char *temp = dlg_malloc(char, need);
 	*freeMe = temp;
 	sprintf(temp, "%3s%%", given);
@@ -190,8 +190,8 @@ mydraw_mixed_box(WINDOW *win, int y, int x, int height, int width,
     dlg_draw_box(win, y, x, height, width, boxchar, borderchar);
     {
 	chtype attr = A_NORMAL;
-	char *message = _("Overall Progress");
-	chtype save2 = getattrs(win);
+	const char *message = _("Overall Progress");
+	chtype save2 = dlg_get_attrs(win);
 	wattrset(win, title_attr);
 	(void) wmove(win, y, x + 2);
 	dlg_print_text(win, message, width, &attr);
@@ -223,7 +223,7 @@ dlg_update_mixedgauge(DIALOG_MIXEDGAUGE * dlg, int percent)
      * attribute.
      */
     (void) wmove(dlg->dialog, dlg->height - 3, 4);
-    wattrset(dlg->dialog, title_attr);
+    wattrset(dlg->dialog, gauge_attr);
 
     for (i = 0; i < (dlg->width - 2 * (3 + MARGIN)); i++)
 	(void) waddch(dlg->dialog, ' ');
diff --git a/package/debian/changelog b/package/debian/changelog
new file mode 100644
index 000000000000..2b15e4cb96c5
--- /dev/null
+++ b/package/debian/changelog
@@ -0,0 +1,12 @@
+cdialog (20110302) unstable; urgency=high
+
+  * Add --prgbox and --progressbox
+  * Bug-fix for --timeout.
+
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 28 Feb 2011 18:42:17 -0500
+
+cdialog (20110118) unstable; urgency=high
+
+  * Initial package release
+
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Thu, 30 Dec 2010 09:23:24 -0500
diff --git a/package/debian/compat b/package/debian/compat
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/package/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/package/debian/control b/package/debian/control
new file mode 100644
index 000000000000..c1ad86ac3546
--- /dev/null
+++ b/package/debian/control
@@ -0,0 +1,24 @@
+Source: cdialog
+Maintainer: Thomas E. Dickey <dickey@invisible-island.net>
+Section: misc
+Priority: optional
+Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 5)
+Homepage: http://invisible-island.net/dialog/
+
+Package: cdialog
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: dialog - display dialog boxes from shell scripts
+ Dialog is a program that will let you to present a variety of questions
+ or display messages using dialog boxes  from  a  shell  script.   These
+ types  of  dialog boxes are implemented (though not all are necessarily
+ compiled into dialog):
+ .
+      calendar, checklist, dselect, editbox, form, fselect, gauge,
+      infobox, inputbox, inputmenu, menu, mixedform, mixedgauge,
+      msgbox (message), passwordbox, passwordform, pause, progressbox,
+      radiolist, tailbox, tailboxbg, textbox, timebox, and yesno
+      (yes/no).
+ .
+ This package installs as "cdialog" to avoid conflict with other packages.
diff --git a/package/debian/copyright b/package/debian/copyright
new file mode 100644
index 000000000000..64da700bc0aa
--- /dev/null
+++ b/package/debian/copyright
@@ -0,0 +1,111 @@
+Upstream source http://invisible-island.net/dialog/dialog.html
+
+Current dialog upstream maintainer: Thomas Dickey <dickey@invisible-island.net>
+
+-------------------------------------------------------------------------------
+Files: *.c *.h
+    Copyright 2000-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
+    as published by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this program; if not, write to
+  	Free Software Foundation, Inc.
+  	51 Franklin St., Fifth Floor
+  	Boston, MA 02110, USA.
+
+    An earlier version of this program lists as authors
+  	Savio Lam (lam836@cs.cuhk.hk)
+-------------------------------------------------------------------------------
+
+Files: aclocal.m4
+Licence: other-BSD
+Copyright:  1999-2009,2010 by Thomas E. Dickey
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the
+    "Software"), to deal in the Software without restriction, including
+    without limitation the rights to use, copy, modify, merge, publish,
+    distribute, distribute with modifications, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+    OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+    IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+    DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+    OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+    THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+    Except as contained in this notice, the name(s) of the above copyright
+    holders shall not be used in advertising or otherwise to promote the
+    sale, use or other dealings in this Software without prior written
+    authorization.
+
+Files: install-sh
+Copyright:  1994 X Consortium
+Licence: other-BSD
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to
+    deal in the Software without restriction, including without limitation the
+    rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+    sell copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+    X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+    AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+    TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+    Except as contained in this notice, the name of the X Consortium shall not
+    be used in advertising or otherwise to promote the sale, use or other deal-
+    ings in this Software without prior written authorization from the X Consor-
+    tium.
+
+    FSF changes to this file are in the public domain.
+
+    Calling this script install-sh is preferred over install.sh, to prevent
+    `make' implicit rules from creating a file called install from it
+    when there is no Makefile.
+
+    This script is compatible with the BSD install script, but was written
+    from scratch.  It can only install one file at a time, a restriction
+    shared with many OS's install programs.
+
+Files: debian/*
+Copyright:  2010 Thomas E. Dickey
+Licence: other-BSD
+    Permission to use, copy, modify, and distribute this software and its
+    documentation for any purpose and without fee is hereby granted,
+    provided that the above copyright notice appear in all copies and that
+    both that copyright notice and this permission notice appear in
+    supporting documentation, and that the name of the above listed
+    copyright holder(s) not be used in advertising or publicity pertaining
+    to distribution of the software without specific, written prior
+    permission.
+
+    THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
+    TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+    AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
+    LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in '/usr/share/common-licenses/GPL-2'
diff --git a/package/debian/docs b/package/debian/docs
new file mode 100644
index 000000000000..e845566c06f9
--- /dev/null
+++ b/package/debian/docs
@@ -0,0 +1 @@
+README
diff --git a/package/debian/rules b/package/debian/rules
new file mode 100755
index 000000000000..fae0138249de
--- /dev/null
+++ b/package/debian/rules
@@ -0,0 +1,95 @@
+#!/usr/bin/make -f
+# MAde with the aid of dh_make, by Craig Small
+# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
+# Some lines taken from debmake, by Cristoph Lameter.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+CFLAGS =
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+        CFLAGS += -O0
+else
+        CFLAGS += -O2
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+        INSTALL_PROGRAM += -s
+endif
+
+
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+
+	CFLAGS="$(CFLAGS)" ./configure \
+		--host=$(DEB_HOST_GNU_TYPE) \
+		--build=$(DEB_BUILD_GNU_TYPE) \
+		--prefix=/usr \
+		--mandir=\$${prefix}/share/man \
+		--enable-nls \
+		--enable-header-subdir \
+		--enable-widec \
+		--with-libtool \
+		--with-ncursesw \
+		--with-package=cdialog \
+		--disable-rpath-hack
+
+	touch configure-stamp
+
+build: build-stamp
+build-stamp: configure-stamp
+	dh_testdir
+
+	$(MAKE)
+
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+
+	[ ! -f makefile ] || $(MAKE) distclean
+
+	rm -f configure-stamp build-stamp install-stamp
+
+	dh_clean
+
+install: install-stamp
+install-stamp: build-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/cdialog
+
+	touch install-stamp
+
+# Build architecture-independent files here.
+binary-indep: build install
+# No binary-indep target.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installdocs
+	dh_installexamples
+	dh_installchangelogs CHANGES
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install install-stamp
diff --git a/package/debian/source/format b/package/debian/source/format
new file mode 100644
index 000000000000..89ae9db8f88b
--- /dev/null
+++ b/package/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)
diff --git a/package/debian/watch b/package/debian/watch
new file mode 100644
index 000000000000..09775875479a
--- /dev/null
+++ b/package/debian/watch
@@ -0,0 +1,4 @@
+version=3
+
+opts=passive ftp://invisible-island.net/dialog/dialog-([\d.]+)\.tgz \
+ debian  uupdate
diff --git a/package/dialog.spec b/package/dialog.spec
new file mode 100644
index 000000000000..a6f43605273b
--- /dev/null
+++ b/package/dialog.spec
@@ -0,0 +1,79 @@
+Summary: dialog - display dialog boxes from shell scripts
+%define AppProgram dialog
+%define AppVersion 1.1
+%define AppRelease 20110302
+%define ActualProg c%{AppProgram}
+# $XTermId: dialog.spec,v 1.16 2011/03/02 10:08:16 tom Exp $
+Name: %{ActualProg}
+Version: %{AppVersion}
+Release: %{AppRelease}
+License: LGPL
+Group: Applications/Development
+URL: ftp://invisible-island.net/%{AppProgram}
+Source0: %{AppProgram}-%{AppVersion}-%{AppRelease}.tgz
+Packager: Thomas Dickey <dickey@invisible-island.net>
+
+%description
+Dialog is a program that will let you to present a variety of questions
+or display messages using dialog boxes  from  a  shell  script.   These
+types  of  dialog boxes are implemented (though not all are necessarily
+compiled into dialog):
+
+      calendar, checklist, dselect, editbox, form, fselect, gauge,
+      infobox, inputbox, inputmenu, menu, mixedform, mixedgauge,
+      msgbox (message), passwordbox, passwordform, pause, progressbox,
+      radiolist, tailbox, tailboxbg, textbox, timebox, and yesno
+      (yes/no).
+
+This package installs as "cdialog" to avoid conflict with other packages.
+%prep
+
+%setup -q -n %{AppProgram}-%{AppVersion}-%{AppRelease}
+
+%build
+
+INSTALL_PROGRAM='${INSTALL}' \
+	./configure \
+		--target %{_target_platform} \
+		--prefix=%{_prefix} \
+		--bindir=%{_bindir} \
+		--libdir=%{_libdir} \
+		--mandir=%{_mandir} \
+		--with-package=%{ActualProg} \
+		--enable-header-subdir \
+		--enable-nls \
+		--enable-widec \
+		--with-libtool \
+		--with-ncursesw \
+		--disable-rpath-hack
+
+make
+
+%install
+[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+
+make install-full               DESTDIR=$RPM_BUILD_ROOT
+
+strip $RPM_BUILD_ROOT%{_bindir}/%{ActualProg}
+
+%clean
+[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root)
+%{_bindir}/%{ActualProg}
+%{_bindir}/%{ActualProg}-config
+%{_mandir}/man1/%{ActualProg}.*
+%{_mandir}/man3/%{ActualProg}.*
+%{_includedir}/%{ActualProg}.h
+%{_includedir}/%{ActualProg}/dlg_colors.h
+%{_includedir}/%{ActualProg}/dlg_config.h
+%{_includedir}/%{ActualProg}/dlg_keys.h
+%{_libdir}/lib%{ActualProg}.*
+%{_datadir}/locale/*/LC_MESSAGES/%{ActualProg}.mo 
+
+%changelog
+# each patch should add its ChangeLog entries here
+
+* Thu Dec 30 2010 Thomas Dickey
+- initial version
diff --git a/pause.c b/pause.c
index 4efeb4788cf7..001753fb9930 100644
--- a/pause.c
+++ b/pause.c
@@ -1,9 +1,9 @@
 /*
- *  $Id: pause.c,v 1.22 2010/04/28 00:29:50 tom Exp $
+ *  $Id: pause.c,v 1.26 2011/01/18 10:16:33 tom Exp $
  *
  *  pause.c -- implements the pause dialog
  *
- *  Copyright 2004-2009,2010	Thomas E. Dickey
+ *  Copyright 2004-2010,2011	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
@@ -79,7 +79,7 @@ dialog_pause(const char *title,
     int key = 0, fkey;
     int result = DLG_EXIT_UNKNOWN;
     int button_high = (have_buttons ? BTN_HIGH : MARGIN);
-    int guage_y;
+    int gauge_y;
     char *prompt = dlg_strclone(cprompt);
 
     curs_set(0);
@@ -104,7 +104,7 @@ dialog_pause(const char *title,
 		      MIN_HIGH + MARGIN - BTN_HIGH,
 		      MIN_WIDE);
     }
-    guage_y = height - button_high - (1 + 2 * MARGIN);
+    gauge_y = height - button_high - (1 + 2 * MARGIN);
     dlg_print_size(height, width);
     dlg_ctl_size(height, width);
 
@@ -129,7 +129,7 @@ dialog_pause(const char *title,
 	dlg_print_autowrap(dialog, prompt, height, width);
 
 	dlg_draw_box(dialog,
-		     guage_y, 2 + MARGIN,
+		     gauge_y, 2 + MARGIN,
 		     2 + MARGIN, width - 2 * (2 + MARGIN),
 		     dialog_attr,
 		     border_attr);
@@ -139,13 +139,13 @@ dialog_pause(const char *title,
 	 * in the title-attribute, and write the percentage with that
 	 * attribute.
 	 */
-	(void) wmove(dialog, guage_y + MARGIN, 4);
+	(void) wmove(dialog, gauge_y + MARGIN, 4);
 	wattrset(dialog, title_attr);
 
 	for (i = 0; i < (width - 2 * (3 + MARGIN)); i++)
 	    (void) waddch(dialog, ' ');
 
-	(void) wmove(dialog, guage_y + MARGIN, (width / 2) - 2);
+	(void) wmove(dialog, gauge_y + MARGIN, (width / 2) - 2);
 	(void) wprintw(dialog, "%3d", seconds);
 
 	/*
@@ -159,7 +159,7 @@ dialog_pause(const char *title,
 	} else {
 	    wattrset(dialog, A_REVERSE);
 	}
-	(void) wmove(dialog, guage_y + MARGIN, 4);
+	(void) wmove(dialog, gauge_y + MARGIN, 4);
 	for (i = 0; i < x; i++) {
 	    chtype ch = winch(dialog);
 	    if (title_attr & A_REVERSE) {
@@ -215,10 +215,7 @@ dialog_pause(const char *title,
 				 FALSE, width);
 		break;
 	    case DLGK_ENTER:
-		/* Do not use dlg_exit_buttoncode() since we want to return
-		 * a cancel rather than ok if the timeout has not expired.
-		 */
-		result = button ? DLG_EXIT_CANCEL : DLG_EXIT_OK;
+		result = dlg_ok_buttoncode(button);
 		break;
 	    case DLGK_MOUSE(0):
 		result = DLG_EXIT_OK;
@@ -229,7 +226,6 @@ dialog_pause(const char *title,
 	    case ERR:
 		break;
 	    default:
-		result = DLG_EXIT_OK;
 		break;
 	    }
 	}
diff --git a/po/ar.po b/po/ar.po
index 7dbd72c3e52b..4f18ccb55391 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,62 +7,63 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Dialog 1.0-20050116\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-18 18:26-0400\n"
+"POT-Creation-Date: 2011-01-16 17:57-0500\n"
 "PO-Revision-Date: 2004-07-21 00:22+0300\n"
 "Last-Translator: Abdulaziz Al-Arfaj <alarfaj0@yahoo.com>\n"
 "Language-Team: Arabic <support@arabeyes.org>\n"
+"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: buttons.c:385
+#: buttons.c:387
 msgid "Yes"
 msgstr "نعم"
 
-#: buttons.c:393
+#: buttons.c:395
 msgid "No"
 msgstr "لا"
 
-#: buttons.c:401
+#: buttons.c:403
 msgid "OK"
 msgstr "موافق"
 
-#: buttons.c:409
+#: buttons.c:411
 msgid "Cancel"
 msgstr "إلغاء"
 
-#: buttons.c:417
+#: buttons.c:419
 msgid "EXIT"
 msgstr ""
 
-#: buttons.c:425
+#: buttons.c:427
 msgid "Extra"
 msgstr ""
 
-#: buttons.c:433
+#: buttons.c:435
 msgid "Help"
 msgstr ""
 
 #. Headline "Month"
-#: calendar.c:273
+#: calendar.c:298
 msgid "Month"
 msgstr ""
 
 #. Headline "Year"
-#: calendar.c:293
+#: calendar.c:318
 msgid "Year"
 msgstr ""
 
-#: dialog.c:741
+#: dialog.c:756
 msgid "Rename"
 msgstr ""
 
-#: fselect.c:550
+#: fselect.c:571
 msgid "Directories"
 msgstr ""
 
-#: fselect.c:551
+#: fselect.c:572
 msgid "Files"
 msgstr ""
 
@@ -106,6 +107,6 @@ msgstr ""
 msgid "Overall Progress"
 msgstr ""
 
-#: textbox.c:489
+#: textbox.c:468
 msgid "Search"
 msgstr ""
diff --git a/po/bg.po b/po/bg.po
index 255776a0cb1a..f11617f378e7 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,61 +8,62 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Dialog 1.0-20050116\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-18 18:26-0400\n"
+"POT-Creation-Date: 2011-01-16 17:57-0500\n"
 "PO-Revision-Date: 2004-09-13 09:02+0300\n"
 "Last-Translator: Ognyan Kulev <ogi@fmi.uni-sofia.bg>\n"
 "Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
+"Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: buttons.c:385
+#: buttons.c:387
 msgid "Yes"
 msgstr "Да"
 
-#: buttons.c:393
+#: buttons.c:395
 msgid "No"
 msgstr "Не"
 
-#: buttons.c:401
+#: buttons.c:403
 msgid "OK"
 msgstr ""
 
-#: buttons.c:409
+#: buttons.c:411
 msgid "Cancel"
 msgstr "Отказ"
 
-#: buttons.c:417
+#: buttons.c:419
 msgid "EXIT"
 msgstr ""
 
-#: buttons.c:425
+#: buttons.c:427
 msgid "Extra"
 msgstr ""
 
-#: buttons.c:433
+#: buttons.c:435
 msgid "Help"
 msgstr ""
 
 #. Headline "Month"
-#: calendar.c:273
+#: calendar.c:298
 msgid "Month"
 msgstr ""
 
 #. Headline "Year"
-#: calendar.c:293
+#: calendar.c:318
 msgid "Year"
 msgstr ""
 
-#: dialog.c:741
+#: dialog.c:756
 msgid "Rename"
 msgstr ""
 
-#: fselect.c:550
+#: fselect.c:571
 msgid "Directories"
 msgstr ""
 
-#: fselect.c:551
+#: fselect.c:572
 msgid "Files"
 msgstr ""
 
@@ -106,6 +107,6 @@ msgstr ""
 msgid "Overall Progress"
 msgstr ""
 
-#: textbox.c:489
+#: textbox.c:468
 msgid "Search"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 985d2e609d86..65f79a7e5795 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,61 +7,62 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dialog 1.1.20070704\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-20 14:31-0400\n"
+"POT-Creation-Date: 2011-01-16 17:57-0500\n"
 "PO-Revision-Date: 2008-06-10 00:50+0200\n"
 "Last-Translator: Jordi Mallach <jordi@gnu.org>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: buttons.c:385
+#: buttons.c:387
 msgid "Yes"
 msgstr "Sí"
 
-#: buttons.c:393
+#: buttons.c:395
 msgid "No"
 msgstr "No"
 
-#: buttons.c:401
+#: buttons.c:403
 msgid "OK"
 msgstr "D'acord"
 
-#: buttons.c:409
+#: buttons.c:411
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: buttons.c:417
+#: buttons.c:419
 msgid "EXIT"
 msgstr "SURT"
 
-#: buttons.c:425
+#: buttons.c:427
 msgid "Extra"
 msgstr "Extra"
 
-#: buttons.c:433
+#: buttons.c:435
 msgid "Help"
 msgstr "Ajuda"
 
 #. Headline "Month"
-#: calendar.c:273
+#: calendar.c:298
 msgid "Month"
 msgstr "Mes"
 
 #. Headline "Year"
-#: calendar.c:293
+#: calendar.c:318
 msgid "Year"
 msgstr "Any"
 
-#: dialog.c:744
+#: dialog.c:756
 msgid "Rename"
 msgstr "Canvia el nom"
 
-#: fselect.c:550
+#: fselect.c:571
 msgid "Directories"
 msgstr "Directoris"
 
-#: fselect.c:551
+#: fselect.c:572
 msgid "Files"
 msgstr "Fitxers"
 
@@ -105,6 +106,6 @@ msgstr "N/D"
 msgid "Overall Progress"
 msgstr "Progrés general"
 
-#: textbox.c:489
+#: textbox.c:468
 msgid "Search"
 msgstr "Cerca"
diff --git a/po/cy.po b/po/cy.po
index 39423edf952d..e3f28272c65b 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -5,61 +5,62 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Dialog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-18 18:26-0400\n"
+"POT-Creation-Date: 2011-01-16 17:57-0500\n"
 "PO-Revision-Date: 2004-03-30 23:00+0100\n"
 "Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n"
 "Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n"
+"Language: cy\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: buttons.c:385
+#: buttons.c:387
 msgid "Yes"
 msgstr "Ie"
 
-#: buttons.c:393
+#: buttons.c:395
 msgid "No"
 msgstr "Na"
 
-#: buttons.c:401
+#: buttons.c:403
 msgid "OK"
 msgstr "Iawn"
 
-#: buttons.c:409
+#: buttons.c:411
 msgid "Cancel"
 msgstr "Diddymu"
 
-#: buttons.c:417
+#: buttons.c:419
 msgid "EXIT"
 msgstr "GADAEL"
 
-#: buttons.c:425
+#: buttons.c:427
 msgid "Extra"
 msgstr "Ychwanegol"
 
-#: buttons.c:433
+#: buttons.c:435
 msgid "Help"
 msgstr "Cymorth"
 
 #. Headline "Month"
-#: calendar.c:273
+#: calendar.c:298
 msgid "Month"
 msgstr "Mis"
 
 #. Headline "Year"
-#: calendar.c:293
+#: calendar.c:318
 msgid "Year"
 msgstr "Blwyddyn"
 
-#: dialog.c:741
+#: dialog.c:756
 msgid "Rename"
 msgstr "Ailenwy"
 
-#: fselect.c:550
+#: fselect.c:571
 msgid "Directories"
 msgstr "Cyfeiriaduron"
 
-#: fselect.c:551
+#: fselect.c:572
 msgid "Files"
 msgstr "Ffeiliau"
 
@@ -104,7 +105,7 @@ msgstr ""
 msgid "Overall Progress"
 msgstr ""
 
-#: textbox.c:489
+#: textbox.c:468
 #, fuzzy
 msgid "Search"
 msgstr "Search"
diff --git a/po/da.po b/po/da.po
index b59836956144..531ba297858a 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,61 +8,62 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dialog-1.1.20070704\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-22 07:05-0500\n"
+"POT-Creation-Date: 2011-01-16 17:57-0500\n"
 "PO-Revision-Date: 2008-08-20 22:53+0200\n"
 "Last-Translator: Keld Jørn Simonsen <keld@dkuug.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: buttons.c:385
+#: buttons.c:387
 msgid "Yes"
 msgstr "Ja"
 
-#: buttons.c:393
+#: buttons.c:395
 msgid "No"
 msgstr "Nej"
 
-#: buttons.c:401
+#: buttons.c:403
 msgid "OK"
 msgstr "O.K."
 
-#: buttons.c:409
+#: buttons.c:411
 msgid "Cancel"
 msgstr "Anullér"
 
-#: buttons.c:417
+#: buttons.c:419
 msgid "EXIT"
 msgstr "AFSLUT"
 
-#: buttons.c:425
+#: buttons.c:427
 msgid "Extra"
 msgstr "Ekstra"
 
-#: buttons.c:433
+#: buttons.c:435
 msgid "Help"
 msgstr "Hjælp"
 
 #. Headline "Month"
-#: calendar.c:273
+#: calendar.c:298
 msgid "Month"
 msgstr "Måned"
 
 #. Headline "Year"
-#: calendar.c:293
+#: calendar.c:318
 msgid "Year"
 msgstr "År"
 
-#: dialog.c:744
+#: dialog.c:756
 msgid "Rename"
 msgstr "Omdøb"
 
-#: fselect.c:550
+#: fselect.c:571
 msgid "Directories"
 msgstr "Kataloger"
 
-#: fselect.c:551
+#: fselect.c:572
 msgid "Files"
 msgstr "Filer"
 
@@ -106,6 +107,6 @@ msgstr "N/A"
 msgid "Overall Progress"
 msgstr "Samlet status"
 
-#: textbox.c:489
+#: textbox.c:468
 msgid "Search"
 msgstr "Søg"
diff --git a/po/de.po b/po/de.po
index 413685e30601..0d176d9eaf16 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,61 +8,62 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dialog 1.1.20080819\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-18 18:26-0400\n"
+"POT-Creation-Date: 2011-01-16 17:57-0500\n"
 "PO-Revision-Date: 2009-11-08 23:48+0100\n"
 "Last-Translator: Roland Illig <roland.illig@gmx.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: buttons.c:385
+#: buttons.c:387
 msgid "Yes"
 msgstr "Ja"
 
-#: buttons.c:393
+#: buttons.c:395
 msgid "No"
 msgstr "Nein"
 
-#: buttons.c:401
+#: buttons.c:403
 msgid "OK"
 msgstr "OK"
 
-#: buttons.c:409
+#: buttons.c:411
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: buttons.c:417
+#: buttons.c:419
 msgid "EXIT"
 msgstr "VERLASSEN"
 
-#: buttons.c:425
+#: buttons.c:427
 msgid "Extra"
 msgstr "Extra"
 
-#: buttons.c:433
+#: buttons.c:435
 msgid "Help"
 msgstr "Hilfe"
 
 #. Headline "Month"
-#: calendar.c:273
+#: calendar.c:298
 msgid "Month"
 msgstr "Monat"
 
 #. Headline "Year"
-#: calendar.c:293
+#: calendar.c:318
 msgid "Year"
 msgstr "Jahr"
 
-#: dialog.c:741
+#: dialog.c:756
 msgid "Rename"
 msgstr "Bearbeiten"
 
-#: fselect.c:550
+#: fselect.c:571
 msgid "Directories"
 msgstr "Verzeichnisse"
 
-#: fselect.c:551
+#: fselect.c:572
 msgid "Files"
 msgstr "Dateien"
 
@@ -106,6 +107,6 @@ msgstr "N/A"
 msgid "Overall Progress"
 msgstr "Gesamtfortschritt"
 
-#: textbox.c:489
+#: textbox.c:468
 msgid "Search"
 msgstr "Suche"
diff --git a/po/dialog.pot b/po/dialog.pot
index 0631e83aee50..8bd8b6d46456 100644
--- a/po/dialog.pot
+++ b/po/dialog.pot
@@ -1,12 +1,12 @@
 # Dialog
-# Copyright 2003-2007,2008 # Thomas Dickey
+# Copyright 2003-2010,2011 # Thomas Dickey
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: dialog 1.1.20080316\n"
+"Project-Id-Version: dialog 1.1.20110116\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-18 18:26-0400\n"
+"POT-Creation-Date: 2011-01-16 17:57-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,53 +14,53 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: buttons.c:385
+#: buttons.c:387
 msgid "Yes"
 msgstr ""
 
-#: buttons.c:393
+#: buttons.c:395
 msgid "No"
 msgstr ""
 
-#: buttons.c:401
+#: buttons.c:403
 msgid "OK"
 msgstr ""
 
-#: buttons.c:409
+#: buttons.c:411
 msgid "Cancel"
 msgstr ""
 
-#: buttons.c:417
+#: buttons.c:419
 msgid "EXIT"
 msgstr ""
 
-#: buttons.c:425
+#: buttons.c:427
 msgid "Extra"
 msgstr ""
 
-#: buttons.c:433
+#: buttons.c:435
 msgid "Help"
 msgstr ""
 
 #. Headline "Month"
-#: calendar.c:273
+#: calendar.c:298
 msgid "Month"
 msgstr ""
 
 #. Headline "Year"
-#: calendar.c:293
+#: calendar.c:318
 msgid "Year"
 msgstr ""
 
-#: dialog.c:741
+#: dialog.c:756
 msgid "Rename"
 msgstr ""
 
-#: fselect.c:550
+#: fselect.c:571
 msgid "Directories"
 msgstr ""
 
-#: fselect.c:551
+#: fselect.c:572
 msgid "Files"
 msgstr ""
 
@@ -104,6 +104,6 @@ msgstr ""
 msgid "Overall Progress"
 msgstr ""
 
-#: textbox.c:489
+#: textbox.c:468
 msgid "Search"
 msgstr ""
diff --git a/po/eo.po b/po/eo.po
index fa3dbf31a993..99e482d025d5 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,61 +6,62 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dialog 1.1.20070704\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-25 16:06-0500\n"
+"POT-Creation-Date: 2011-01-16 17:57-0500\n"
 "PO-Revision-Date: 2008-08-03 15:50-0300\n"
 "Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
+"Language: eo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: buttons.c:379
+#: buttons.c:387
 msgid "Yes"
 msgstr "Jes"
 
-#: buttons.c:387
+#: buttons.c:395
 msgid "No"
 msgstr "Ne"
 
-#: buttons.c:395
+#: buttons.c:403
 msgid "OK"
 msgstr "Certe"
 
-#: buttons.c:403
+#: buttons.c:411
 msgid "Cancel"
 msgstr "Rezigni"
 
-#: buttons.c:411
+#: buttons.c:419
 msgid "EXIT"
 msgstr "ELIRI"
 
-#: buttons.c:419
+#: buttons.c:427
 msgid "Extra"
 msgstr "Krome"
 
-#: buttons.c:427
+#: buttons.c:435
 msgid "Help"
 msgstr "Helpo"
 
 #. Headline "Month"
-#: calendar.c:273
+#: calendar.c:298
 msgid "Month"
 msgstr "Monato"
 
 #. Headline "Year"
-#: calendar.c:293
+#: calendar.c:318
 msgid "Year"
 msgstr "Jaro"
 
-#: dialog.c:727
+#: dialog.c:756
 msgid "Rename"
 msgstr "Renomigi"
 
-#: fselect.c:548
+#: fselect.c:571
 msgid "Directories"
 msgstr "Dosierujoj"
 
-#: fselect.c:549
+#: fselect.c:572
 msgid "Files"
 msgstr "Dosieroj"
 
@@ -104,6 +105,6 @@ msgstr "N/A"
 msgid "Overall Progress"
 msgstr "Tuta Evoluo"
 
-#: textbox.c:489
+#: textbox.c:468
 msgid "Search"
 msgstr "Serĉi"
diff --git a/po/es.po b/po/es.po
index 4647a51c7fae..958b98fe4d07 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,61 +7,62 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dialog 1.1.20080819\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-18 18:26-0400\n"
+"POT-Creation-Date: 2011-01-16 17:57-0500\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"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: buttons.c:385
+#: buttons.c:387
 msgid "Yes"
 msgstr "Sí"
 
-#: buttons.c:393
+#: buttons.c:395
 msgid "No"
 msgstr "No"
 
-#: buttons.c:401
+#: buttons.c:403
 msgid "OK"
 msgstr "Aceptar"
 
-#: buttons.c:409
+#: buttons.c:411
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: buttons.c:417
+#: buttons.c:419
 msgid "EXIT"
 msgstr "Salir"
 
-#: buttons.c:425
+#: buttons.c:427
 msgid "Extra"
 msgstr "Extra"
 
-#: buttons.c:433
+#: buttons.c:435
 msgid "Help"
 msgstr "Ayuda"
 
 #. Headline "Month"
-#: calendar.c:273
+#: calendar.c:298
 msgid "Month"
 msgstr "Mes"
 
 #. Headline "Year"
-#: calendar.c:293
+#: calendar.c:318
 msgid "Year"
 msgstr "Año"
 
-#: dialog.c:741
+#: dialog.c:756
 msgid "Rename"
 msgstr "Renombrar"
 
-#: fselect.c:550
+#: fselect.c:571
 msgid "Directories"
 msgstr "Directorios"
 
-#: fselect.c:551
+#: fselect.c:572
 msgid "Files"
 msgstr "Ficheros"
 
@@ -106,6 +107,6 @@ msgstr "N/A"
 msgid "Overall Progress"
 msgstr "Progreso total"
 
-#: textbox.c:489
+#: textbox.c:468
 msgid "Search"
 msgstr "Buscar"
diff --git a/po/eu.po b/po/eu.po
index 21944143af04..76bfd3084d27 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,62 +7,63 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dialog-1.1.20070704\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-18 18:26-0400\n"
+"POT-Creation-Date: 2011-01-16 17:57-0500\n"
 "PO-Revision-Date: 2007-09-20 00:01+0200\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: Basque  <translation-team-eu@lists.sourceforge.net>\n"
+"Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: buttons.c:385
+#: buttons.c:387
 msgid "Yes"
 msgstr "Bai"
 
-#: buttons.c:393
+#: buttons.c:395
 msgid "No"
 msgstr "Ez"
 
-#: buttons.c:401
+#: buttons.c:403
 msgid "OK"
 msgstr "Ados"
 
-#: buttons.c:409
+#: buttons.c:411
 msgid "Cancel"
 msgstr "Utzi"
 
-#: buttons.c:417
+#: buttons.c:419
 msgid "EXIT"
 msgstr "IRTEN"
 
-#: buttons.c:425
+#: buttons.c:427
 msgid "Extra"
 msgstr "Gehigarria"
 
-#: buttons.c:433
+#: buttons.c:435
 msgid "Help"
 msgstr "Laguntza"
 
 #. Headline "Month"
-#: calendar.c:273
+#: calendar.c:298
 msgid "Month"
 msgstr "Hilabetea"
 
 #. Headline "Year"
-#: calendar.c:293
+#: calendar.c:318
 msgid "Year"
 msgstr "Urtea"
 
-#: dialog.c:741
+#: dialog.c:756
 msgid "Rename"
 msgstr "Berizendatu"
 
-#: fselect.c:550
+#: fselect.c:571
 msgid "Directories"
 msgstr "Direktorioak"
 
-#: fselect.c:551
+#: fselect.c:572
 msgid "Files"
 msgstr "Fitxategiak"
 
@@ -106,6 +107,6 @@ msgstr "E/G"
 msgid "Overall Progress"
 msgstr "Aurrerapen nagusia"
 
-#: textbox.c:489
+#: textbox.c:468
 msgid "Search"
 msgstr "Bilaketa"
diff --git a/po/fi.po b/po/fi.po
index ab1f8bd6adad..e39897ce0404 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,111 +1,114 @@
 # Finnish translation for dialog.
+# Copyright © 2010 Free Software Foundation, Inc.
 # Copyright © 2005 Lauri Nurmi <lanurmi@iki.fi>
 # This file is distributed under the same license as the dialog package.
 # Lauri Nurmi <lanurmi@iki.fi>, 2005.
+# Jorma Karvonen <karvonen.jorma@gmail.com>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: dialog 1.0-rel20041222\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: 2005-03-07 19:15+0200\n"
-"Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
+"POT-Creation-Date: 2011-01-16 17:57-0500\n"
+"PO-Revision-Date: 2010-09-06 21:24+0200\n"
+"Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: buttons.c:385
+#: buttons.c:387
 msgid "Yes"
 msgstr "Kyllä"
 
-#: buttons.c:393
+#: buttons.c:395
 msgid "No"
 msgstr "Ei"
 
-#: buttons.c:401
+#: buttons.c:403
 msgid "OK"
-msgstr "OK"
+msgstr "Valmis"
 
-#: buttons.c:409
+#: buttons.c:411
 msgid "Cancel"
 msgstr "Peru"
 
-#: buttons.c:417
+#: buttons.c:419
 msgid "EXIT"
 msgstr "Poistu"
 
-#: buttons.c:425
+#: buttons.c:427
 msgid "Extra"
 msgstr "Painike"
 
-#: buttons.c:433
+#: buttons.c:435
 msgid "Help"
-msgstr "Ohje"
+msgstr "Opaste"
 
 #. Headline "Month"
-#: calendar.c:273
+#: calendar.c:298
 msgid "Month"
 msgstr "Kuukausi"
 
 #. Headline "Year"
-#: calendar.c:293
+#: calendar.c:318
 msgid "Year"
 msgstr "Vuosi"
 
-#: dialog.c:741
+#: dialog.c:756
 msgid "Rename"
 msgstr "Nimeä"
 
-#: fselect.c:550
+#: fselect.c:571
 msgid "Directories"
 msgstr "Kansiot"
 
-#: fselect.c:551
+#: fselect.c:572
 msgid "Files"
 msgstr "Tiedostot"
 
 #: mixedgauge.c:58
 msgid "Succeeded"
-msgstr ""
+msgstr "Onnistui"
 
 #: mixedgauge.c:61
-#, fuzzy
 msgid "Failed"
-msgstr "Tiedostot"
+msgstr "Epäonnistui"
 
 #: mixedgauge.c:64
 msgid "Passed"
-msgstr ""
+msgstr "Hyväksytty"
 
 #: mixedgauge.c:67
 msgid "Completed"
-msgstr ""
+msgstr "Valmis"
 
 #: mixedgauge.c:70
 msgid "Checked"
-msgstr ""
+msgstr "Valittu"
 
 #: mixedgauge.c:73
 msgid "Done"
-msgstr ""
+msgstr "Valmis"
 
 #: mixedgauge.c:76
 msgid "Skipped"
-msgstr ""
+msgstr "Ohitettiin"
 
 #: mixedgauge.c:79
 msgid "In Progress"
-msgstr ""
+msgstr "Edistyminen"
 
 #: mixedgauge.c:85
 msgid "N/A"
-msgstr ""
+msgstr "N/A"
 
 #: mixedgauge.c:193
 msgid "Overall Progress"
-msgstr ""
+msgstr "Kokonaisedistyminen"
 
-#: textbox.c:489
+#: textbox.c:468
 msgid "Search"
 msgstr "Etsi"
diff --git a/po/fr.po b/po/fr.po
index a121c21602f3..1edb08bd9568 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,61 +7,62 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dialog 1.1.20070704\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-18 18:26-0400\n"
+"POT-Creation-Date: 2011-01-16 17:57-0500\n"
 "PO-Revision-Date: 2008-03-28 23:14+0000\n"
 "Last-Translator: François-Xavier Coudert <fxcoudert@gmail.com>\n"
 "Language-Team: French <traduc@traduc.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: buttons.c:385
+#: buttons.c:387
 msgid "Yes"
 msgstr "Oui"
 
-#: buttons.c:393
+#: buttons.c:395
 msgid "No"
 msgstr "Non"
 
-#: buttons.c:401
+#: buttons.c:403
 msgid "OK"
 msgstr "Accepter"
 
-#: buttons.c:409
+#: buttons.c:411
 msgid "Cancel"
 msgstr "Annuler"
 
-#: buttons.c:417
+#: buttons.c:419
 msgid "EXIT"
 msgstr "SORTIR"
 
-#: buttons.c:425
+#: buttons.c:427
 msgid "Extra"
 msgstr "Extra"
 
-#: buttons.c:433
+#: buttons.c:435
 msgid "Help"
 msgstr "Aide"
 
 #. Headline "Month"
-#: calendar.c:273
+#: calendar.c:298
 msgid "Month"
 msgstr "Mois"
 
 #. Headline "Year"
-#: calendar.c:293
+#: calendar.c:318
 msgid "Year"
 msgstr "Année"
 
-#: dialog.c:741
+#: dialog.c:756
 msgid "Rename"
 msgstr "Renommer"
 
-#: fselect.c:550
+#: fselect.c:571
 msgid "Directories"
 msgstr "Répertoires"
 
-#: fselect.c:551
+#: fselect.c:572
 msgid "Files"
 msgstr "Fichiers"
 
@@ -105,6 +106,6 @@ msgstr "N/A"
 msgid "Overall Progress"
 msgstr "Avancement général"
 
-#: textbox.c:489
+#: textbox.c:468
 msgid "Search"
 msgstr "Rechercher"
diff --git a/po/ga.po b/po/ga.po
index 092a37f7453e..c2d7bfc93f97 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -5,61 +5,62 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dialog 1.1.20070704\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-18 18:26-0400\n"
+"POT-Creation-Date: 2011-01-16 17:57-0500\n"
 "PO-Revision-Date: 2007-07-20 11:57-0500\n"
 "Last-Translator: Kevin Scannell <kscanne@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
+"Language: ga\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: buttons.c:385
+#: buttons.c:387
 msgid "Yes"
 msgstr "Tá"
 
-#: buttons.c:393
+#: buttons.c:395
 msgid "No"
 msgstr "Níl"
 
-#: buttons.c:401
+#: buttons.c:403
 msgid "OK"
 msgstr "OK"
 
-#: buttons.c:409
+#: buttons.c:411
 msgid "Cancel"
 msgstr "Cealaigh"
 
-#: buttons.c:417
+#: buttons.c:419
 msgid "EXIT"
 msgstr "SCOIR"
 
-#: buttons.c:425
+#: buttons.c:427
 msgid "Extra"
 msgstr "Breise"
 
-#: buttons.c:433
+#: buttons.c:435
 msgid "Help"
 msgstr "Cabhair"
 
 #. Headline "Month"
-#: calendar.c:273
+#: calendar.c:298
 msgid "Month"
 msgstr "Mí"
 
 #. Headline "Year"
-#: calendar.c:293
+#: calendar.c:318
 msgid "Year"
 msgstr "Bliain"
 
-#: dialog.c:741
+#: dialog.c:756
 msgid "Rename"
 msgstr "Athainmnigh"
 
-#: fselect.c:550
+#: fselect.c:571
 msgid "Directories"
 msgstr "Comhadlanna"
 
-#: fselect.c:551
+#: fselect.c:572
 msgid "Files"
 msgstr "Comhaid"
 
@@ -103,6 +104,6 @@ msgstr "N/A/F"
 msgid "Overall Progress"
 msgstr "Dul Chun Cinn Iomlán"
 
-#: textbox.c:489
+#: textbox.c:468
 msgid "Search"
 msgstr "Cuardaigh"
diff --git a/po/gl.po b/po/gl.po
index 68552c7fa80c..dc3b90000916 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -7,61 +7,62 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dialog 1.1.20070704\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-18 18:26-0400\n"
+"POT-Creation-Date: 2011-01-16 17:57-0500\n"
 "PO-Revision-Date: 2008-05-13 23:57+0100\n"
 "Last-Translator: Diego Pérez Montes <kabute@gulo.org>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
+"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: buttons.c:385
+#: buttons.c:387
 msgid "Yes"
 msgstr "Sí"
 
-#: buttons.c:393
+#: buttons.c:395
 msgid "No"
 msgstr "Non"
 
-#: buttons.c:401
+#: buttons.c:403
 msgid "OK"
 msgstr "Aceptar"
 
-#: buttons.c:409
+#: buttons.c:411
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: buttons.c:417
+#: buttons.c:419
 msgid "EXIT"
 msgstr "SAÍR"
 
-#: buttons.c:425
+#: buttons.c:427
 msgid "Extra"
 msgstr "Suplementario"
 
-#: buttons.c:433
+#: buttons.c:435
 msgid "Help"
 msgstr "Axuda"
 
 #. Headline "Month"
-#: calendar.c:273
+#: calendar.c:298
 msgid "Month"
 msgstr "Mes"
 
 #. Headline "Year"
-#: calendar.c:293
+#: calendar.c:318
 msgid "Year"
 msgstr "Ano"
 
-#: dialog.c:741
+#: dialog.c:756
 msgid "Rename"
 msgstr "Renomear"
 
-#: fselect.c:550
+#: fselect.c:571
 msgid "Directories"
 msgstr "Directorios"
 
-#: fselect.c:551
+#: fselect.c:572
 msgid "Files"
 msgstr "Ficheiros"
 
@@ -105,6 +106,6 @@ msgstr "Non Dispoñible"
 msgid "Overall Progress"
 msgstr "Progreso Total"
 
-#: textbox.c:489
+#: textbox.c:468
 msgid "Search"
 msgstr "Procurar"
diff --git a/po/hr.po b/po/hr.po
index 65248795e705..6f3f5462b26d 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -6,61 +6,62 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Dialog 1.0-20050116\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-18 18:26-0400\n"
+"POT-Creation-Date: 2011-01-16 17:57-0500\n"
 "PO-Revision-Date: 2004-07-25 14:52+0200\n"
 "Last-Translator: Krunoslav Gernhard <kruno@linux.hr>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
+"Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: buttons.c:385
+#: buttons.c:387
 msgid "Yes"
 msgstr "Da"
 
-#: buttons.c:393
+#: buttons.c:395
 msgid "No"
 msgstr "Ne"
 
-#: buttons.c:401
+#: buttons.c:403
 msgid "OK"
 msgstr "U redu"
 
-#: buttons.c:409
+#: buttons.c:411
 msgid "Cancel"
 msgstr "Otkaži"
 
-#: buttons.c:417
+#: buttons.c:419
 msgid "EXIT"
 msgstr ""
 
-#: buttons.c:425
+#: buttons.c:427
 msgid "Extra"
 msgstr ""
 
-#: buttons.c:433
+#: buttons.c:435
 msgid "Help"
 msgstr ""
 
 #. Headline "Month"
-#: calendar.c:273
+#: calendar.c:298
 msgid "Month"
 msgstr ""
 
 #. Headline "Year"
-#: calendar.c:293
+#: calendar.c:318
 msgid "Year"
 msgstr ""
 
-#: dialog.c:741
+#: dialog.c:756
 msgid "Rename"
 msgstr ""
 
-#: fselect.c:550
+#: fselect.c:571
 msgid "Directories"
 msgstr ""
 
-#: fselect.c:551
+#: fselect.c:572
 msgid "Files"
 msgstr ""
 
@@ -104,6 +105,6 @@ msgstr ""
 msgid "Overall Progress"
 msgstr ""
 
-#: textbox.c:489
+#: textbox.c:468
 msgid "Search"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index b4e07c585d9a..8db832947a9b 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,61 +7,62 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dialog 1.1.20080819\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-29 19:30-0400\n"
+"POT-Creation-Date: 2011-01-16 17:57-0500\n"
 "PO-Revision-Date: 2008-07-21 13:40+0700\n"
 "Last-Translator: Andhika Padmawan <andhika.padmawan@gmail.com>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
+"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: buttons.c:385
+#: buttons.c:387
 msgid "Yes"
 msgstr "Ya"
 
-#: buttons.c:393
+#: buttons.c:395
 msgid "No"
 msgstr "Tidak"
 
-#: buttons.c:401
+#: buttons.c:403
 msgid "OK"
 msgstr "OK"
 
-#: buttons.c:409
+#: buttons.c:411
 msgid "Cancel"
 msgstr "Batal"
 
-#: buttons.c:417
+#: buttons.c:419
 msgid "EXIT"
 msgstr "KELUAR"
 
-#: buttons.c:425
+#: buttons.c:427
 msgid "Extra"
 msgstr "Ekstra"
 
-#: buttons.c:433
+#: buttons.c:435
 msgid "Help"
 msgstr "Bantuan"
 
 #. Headline "Month"
-#: calendar.c:273
+#: calendar.c:298
 msgid "Month"
 msgstr "Bulan"
 
 #. Headline "Year"
-#: calendar.c:293
+#: calendar.c:318
 msgid "Year"
 msgstr "Tahun"
 
-#: dialog.c:744
+#: dialog.c:756
 msgid "Rename"
 msgstr "Ganti Nama"
 
-#: fselect.c:550
+#: fselect.c:571
 msgid "Directories"
 msgstr "Kamus"
 
-#: fselect.c:551
+#: fselect.c:572
 msgid "Files"
 msgstr "Berkas"
 
@@ -105,6 +106,6 @@ msgstr "Tak Tersedia"
 msgid "Overall Progress"
 msgstr "Keseluruhan Proses"
 
-#: textbox.c:489
+#: textbox.c:468
 msgid "Search"
 msgstr "Telusur"
diff --git a/po/is.po b/po/is.po
index e9b1e86f5df0..aaeb8508be0c 100644
--- a/po/is.po
+++ b/po/is.po
@@ -7,62 +7,63 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dialog-1.1.20080819\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-18 18:26-0400\n"
+"POT-Creation-Date: 2011-01-16 17:57-0500\n"
 "PO-Revision-Date: 2009-09-03 17:02+0000\n"
 "Last-Translator: Sveinn í Felli <sveinki@nett.is>\n"
 "Language-Team: Icelandic <(nothing)>\n"
+"Language: is\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: buttons.c:385
+#: buttons.c:387
 msgid "Yes"
 msgstr "Já"
 
-#: buttons.c:393
+#: buttons.c:395
 msgid "No"
 msgstr "Nei"
 
-#: buttons.c:401
+#: buttons.c:403
 msgid "OK"
 msgstr "Í lagi"
 
-#: buttons.c:409
+#: buttons.c:411
 msgid "Cancel"
 msgstr "Hætta við"
 
-#: buttons.c:417
+#: buttons.c:419
 msgid "EXIT"
 msgstr "LOKA"
 
-#: buttons.c:425
+#: buttons.c:427
 msgid "Extra"
 msgstr "Auka"
 
-#: buttons.c:433
+#: buttons.c:435
 msgid "Help"
 msgstr "Hjálp"
 
 #. Headline "Month"
-#: calendar.c:273
+#: calendar.c:298
 msgid "Month"
 msgstr "Mánuður"
 
 #. Headline "Year"
-#: calendar.c:293
+#: calendar.c:318
 msgid "Year"
 msgstr "Ár"
 
-#: dialog.c:741
+#: dialog.c:756
 msgid "Rename"
 msgstr "Endurnefna"
 
-#: fselect.c:550
+#: fselect.c:571
 msgid "Directories"
 msgstr "Möppur"
 
-#: fselect.c:551
+#: fselect.c:572
 msgid "Files"
 msgstr "Skrár"
 
@@ -106,6 +107,6 @@ msgstr "Ekki tiltækt"
 msgid "Overall Progress"
 msgstr "Heildarframvinda"
 
-#: textbox.c:489
+#: textbox.c:468
 msgid "Search"
 msgstr "Leita"
diff --git a/po/it.po b/po/it.po
index 6aad5d400235..c9ad1944fb0d 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,61 +8,62 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dialog 1.1.20070704\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-18 18:26-0400\n"
+"POT-Creation-Date: 2011-01-16 17:57-0500\n"
 "PO-Revision-Date: 2007-08-06 15:47+0100\n"
 "Last-Translator: Marco Colombo <m.colombo@ed.ac.uk>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: buttons.c:385
+#: buttons.c:387
 msgid "Yes"
 msgstr "Sì"
 
-#: buttons.c:393
+#: buttons.c:395
 msgid "No"
 msgstr "No"
 
-#: buttons.c:401
+#: buttons.c:403
 msgid "OK"
 msgstr "OK"
 
-#: buttons.c:409
+#: buttons.c:411
 msgid "Cancel"
 msgstr "Annulla"
 
-#: buttons.c:417
+#: buttons.c:419
 msgid "EXIT"
 msgstr "Esci"
 
-#: buttons.c:425
+#: buttons.c:427
 msgid "Extra"
 msgstr "Extra"
 
-#: buttons.c:433
+#: buttons.c:435
 msgid "Help"
 msgstr "Aiuto"
 
 #. Headline "Month"
-#: calendar.c:273
+#: calendar.c:298
 msgid "Month"
 msgstr "Mese"
 
 #. Headline "Year"
-#: calendar.c:293
+#: calendar.c:318
 msgid "Year"
 msgstr "Anno"
 
-#: dialog.c:741
+#: dialog.c:756
 msgid "Rename"
 msgstr "Rinomina"
 
-#: fselect.c:550
+#: fselect.c:571
 msgid "Directories"
 msgstr "Cartelle"
 
-#: fselect.c:551
+#: fselect.c:572
 msgid "Files"
 msgstr "File"
 
@@ -106,6 +107,6 @@ msgstr "N/A"
 msgid "Overall Progress"
 msgstr "Progresso complessivo"
 
-#: textbox.c:489
+#: textbox.c:468
 msgid "Search"
 msgstr "Ricerca"
diff --git a/po/ja.po b/po/ja.po
index 9ab538ca6df9..366ca2825d2a 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,61 +8,62 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dialog 1.1.20070704\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-27 18:05-0400\n"
+"POT-Creation-Date: 2011-01-16 17:57-0500\n"
 "PO-Revision-Date: 2008-07-24 00:12+0900\n"
 "Last-Translator: Takeshi Hamasaki <hmatrjp@users.sourceforge.jp>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: buttons.c:385
+#: buttons.c:387
 msgid "Yes"
 msgstr "�Ϥ�"
 
-#: buttons.c:393
+#: buttons.c:395
 msgid "No"
 msgstr "������"
 
-#: buttons.c:401
+#: buttons.c:403
 msgid "OK"
 msgstr "�"
 
-#: buttons.c:409
+#: buttons.c:411
 msgid "Cancel"
 msgstr "���"
 
-#: buttons.c:417
+#: buttons.c:419
 msgid "EXIT"
 msgstr "��λ"
 
-#: buttons.c:425
+#: buttons.c:427
 msgid "Extra"
 msgstr "��ĥ"
 
-#: buttons.c:433
+#: buttons.c:435
 msgid "Help"
 msgstr "�إ��"
 
 #. Headline "Month"
-#: calendar.c:273
+#: calendar.c:298
 msgid "Month"
 msgstr "��"
 
 #. Headline "Year"
-#: calendar.c:293
+#: calendar.c:318
 msgid "Year"
 msgstr "ǯ"
 
-#: dialog.c:744
+#: dialog.c:756
 msgid "Rename"
 msgstr "̾���ѹ�"
 
-#: fselect.c:550
+#: fselect.c:571
 msgid "Directories"
 msgstr "�ǥ��쥯�ȥ�"
 
-#: fselect.c:551
+#: fselect.c:572
 msgid "Files"
 msgstr "�ե�����"
 
@@ -106,6 +107,6 @@ msgstr "̵��"
 msgid "Overall Progress"
 msgstr "���ΤοʹԾ���"
 
-#: textbox.c:489
+#: textbox.c:468
 msgid "Search"
 msgstr "Ĵ��"
diff --git a/po/ku.po b/po/ku.po
index 3f78769e7099..e8352e1da3b1 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -7,63 +7,64 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dialog 1.1.20070704\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-18 18:26-0400\n"
+"POT-Creation-Date: 2011-01-16 17:57-0500\n"
 "PO-Revision-Date: 2008-04-25 16:51+0200\n"
 "Last-Translator: Erdal Ronahi <erdal.ronahi@gmail.com>\n"
 "Language-Team: Kurdish <translation-team-ku@ferheng.org>\n"
+"Language: ku\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KAider 0.1\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: buttons.c:385
+#: buttons.c:387
 msgid "Yes"
 msgstr "Erê"
 
-#: buttons.c:393
+#: buttons.c:395
 msgid "No"
 msgstr "Na"
 
-#: buttons.c:401
+#: buttons.c:403
 msgid "OK"
 msgstr "TEMAM"
 
-#: buttons.c:409
+#: buttons.c:411
 msgid "Cancel"
 msgstr "Betal"
 
-#: buttons.c:417
+#: buttons.c:419
 msgid "EXIT"
 msgstr "DERKETIN"
 
-#: buttons.c:425
+#: buttons.c:427
 msgid "Extra"
 msgstr "Ekstra"
 
-#: buttons.c:433
+#: buttons.c:435
 msgid "Help"
 msgstr "Alîkarî"
 
 #. Headline "Month"
-#: calendar.c:273
+#: calendar.c:298
 msgid "Month"
 msgstr "Meh"
 
 #. Headline "Year"
-#: calendar.c:293
+#: calendar.c:318
 msgid "Year"
 msgstr "Sal"
 
-#: dialog.c:741
+#: dialog.c:756
 msgid "Rename"
 msgstr "Nav guherandin"
 
-#: fselect.c:550
+#: fselect.c:571
 msgid "Directories"
 msgstr "Peldank"
 
-#: fselect.c:551
+#: fselect.c:572
 msgid "Files"
 msgstr "Pel"
 
@@ -107,6 +108,6 @@ msgstr "Tune"
 msgid "Overall Progress"
 msgstr "Pêşketina Giştî"
 
-#: textbox.c:489
+#: textbox.c:468
 msgid "Search"
 msgstr "Lêgerîn"
diff --git a/po/lt.po b/po/lt.po
index dd93625a27f4..c4e8168823ce 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,63 +6,64 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dialog-1.1.20070704\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-18 18:26-0400\n"
+"POT-Creation-Date: 2011-01-16 17:57-0500\n"
 "PO-Revision-Date: 2008-05-14 02:51+0300\n"
 "Last-Translator: Gintautas Miliauskas <gintas@akl.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
+"Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: buttons.c:385
+#: buttons.c:387
 msgid "Yes"
 msgstr "Taip"
 
-#: buttons.c:393
+#: buttons.c:395
 msgid "No"
 msgstr "Ne"
 
-#: buttons.c:401
+#: buttons.c:403
 msgid "OK"
 msgstr "OK"
 
-#: buttons.c:409
+#: buttons.c:411
 msgid "Cancel"
 msgstr "Atmesti"
 
-#: buttons.c:417
+#: buttons.c:419
 msgid "EXIT"
 msgstr "IŠEITI"
 
-#: buttons.c:425
+#: buttons.c:427
 msgid "Extra"
 msgstr "Papildoma"
 
-#: buttons.c:433
+#: buttons.c:435
 msgid "Help"
 msgstr "Žinynas"
 
 #. Headline "Month"
-#: calendar.c:273
+#: calendar.c:298
 msgid "Month"
 msgstr "Mėnuo"
 
 #. Headline "Year"
-#: calendar.c:293
+#: calendar.c:318
 msgid "Year"
 msgstr "Metai"
 
-#: dialog.c:741
+#: dialog.c:756
 msgid "Rename"
 msgstr "Pervadinti"
 
-#: fselect.c:550
+#: fselect.c:571
 msgid "Directories"
 msgstr "Aplankai"
 
-#: fselect.c:551
+#: fselect.c:572
 msgid "Files"
 msgstr "Failai"
 
@@ -106,6 +107,6 @@ msgstr "N/d"
 msgid "Overall Progress"
 msgstr "Bendras progresas"
 
-#: textbox.c:489
+#: textbox.c:468
 msgid "Search"
 msgstr "Ieškoti"
diff --git a/po/lv.po b/po/lv.po
index 042920fc57c9..289eefe80141 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -1,6 +1,6 @@
 # Dialog
 # Copyright 2003-2007,2008 # Thomas Dickey
-# 
+#
 # This file is distributed under the same license as the dialog package.
 #
 # Rihards Prieditis <RPrieditis@inbox.lv>, 2009.
@@ -8,63 +8,64 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dialog 1.1.20080819\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-18 18:26-0400\n"
+"POT-Creation-Date: 2011-01-16 17:57-0500\n"
 "PO-Revision-Date: 2009-04-11 20:50+0300\n"
 "Last-Translator: Rihards Prieditis <RPrieditis@inbox.lv>\n"
 "Language-Team: Latvian <translation-team-lv@lists.sourceforge.net>\n"
+"Language: lv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 0.3\n"
 "Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: buttons.c:385
+#: buttons.c:387
 msgid "Yes"
 msgstr "Jā"
 
-#: buttons.c:393
+#: buttons.c:395
 msgid "No"
 msgstr "Nē"
 
-#: buttons.c:401
+#: buttons.c:403
 msgid "OK"
 msgstr "Labi"
 
-#: buttons.c:409
+#: buttons.c:411
 msgid "Cancel"
 msgstr "Atcelt"
 
-#: buttons.c:417
+#: buttons.c:419
 msgid "EXIT"
 msgstr "IZIET"
 
-#: buttons.c:425
+#: buttons.c:427
 msgid "Extra"
 msgstr "Papildus"
 
-#: buttons.c:433
+#: buttons.c:435
 msgid "Help"
 msgstr "Palīdzība"
 
 #. Headline "Month"
-#: calendar.c:273
+#: calendar.c:298
 msgid "Month"
 msgstr "Mēnesis"
 
 #. Headline "Year"
-#: calendar.c:293
+#: calendar.c:318
 msgid "Year"
 msgstr "Gads"
 
-#: dialog.c:741
+#: dialog.c:756
 msgid "Rename"
 msgstr "Pārdēvēt"
 
-#: fselect.c:550
+#: fselect.c:571
 msgid "Directories"
 msgstr "Direktorijas"
 
-#: fselect.c:551
+#: fselect.c:572
 msgid "Files"
 msgstr "Faili"
 
@@ -108,6 +109,6 @@ msgstr "n/z"
 msgid "Overall Progress"
 msgstr "Vispārējais progress"
 
-#: textbox.c:489
+#: textbox.c:468
 msgid "Search"
 msgstr "Meklēt"
diff --git a/po/makefile.inn b/po/makefile.inn
index 615934f53077..c246198c7297 100644
--- a/po/makefile.inn
+++ b/po/makefile.inn
@@ -8,6 +8,7 @@
 
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
+NLS_TEXTDOMAIN = @NLS_TEXTDOMAIN@
 
 SHELL = /bin/sh
 @SET_MAKE@
@@ -26,7 +27,6 @@ subdir = po
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = @MKINSTALLDIRS@
 DESTDIR = @DESTDIR@
 
 CC = @CC@
@@ -84,7 +84,7 @@ all-yes: $(SOURCES) $(CATALOGS)
 all-no:
 
 $(srcdir)/$(PACKAGE).pot: $(POTFILES)
-	$(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
+	$(XGETTEXT) --default-domain=$(NLS_TEXTDOMAIN) --directory=$(top_srcdir) \
 	  --add-comments --keyword=_ --keyword=N_ \
 	  --files-from=$(srcdir)/POTFILES.in \
 	&& test ! -f $(PACKAGE).po \
@@ -111,12 +111,8 @@ install-exec:
 install-data: install-data-@USE_NLS@
 install-data-no: all
 install-data-yes: all
-	if test -r "$(MKINSTALLDIRS)"; then \
-	  $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
-	else \
-	  mkdir -p $(DESTDIR)$(datadir); \
-	fi
-	@catalogs='$(CATALOGS)'; \
+	@mkdir -p $(DESTDIR)$(datadir); \
+	catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  case "$$cat" in \
@@ -125,39 +121,31 @@ install-data-yes: all
 	  esac; \
 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
 	  dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
-	  if test -r "$(MKINSTALLDIRS)"; then \
-	    $(MKINSTALLDIRS) $$dir; \
-	  else \
-	    mkdir -p $$dir; \
-	  fi; \
+	  mkdir -p $$dir; \
 	  if test -r $$cat; then \
-	    $(INSTALL_DATA) $$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
-	    echo "installing $$cat as $$dir/$(PACKAGE)$(INSTOBJEXT)"; \
+	    $(INSTALL_DATA) $$cat $$dir/$(NLS_TEXTDOMAIN)$(INSTOBJEXT); \
+	    echo "installing $$cat as $$dir/$(NLS_TEXTDOMAIN)$(INSTOBJEXT)"; \
 	  else \
-	    $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
+	    $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(NLS_TEXTDOMAIN)$(INSTOBJEXT); \
 	    echo "installing $(srcdir)/$$cat as" \
-		 "$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
+		 "$$dir/$(NLS_TEXTDOMAIN)$(INSTOBJEXT)"; \
 	  fi; \
 	  if test -r $$cat.m; then \
-	    $(INSTALL_DATA) $$cat.m $$dir/$(PACKAGE)$(INSTOBJEXT).m; \
-	    echo "installing $$cat.m as $$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
+	    $(INSTALL_DATA) $$cat.m $$dir/$(NLS_TEXTDOMAIN)$(INSTOBJEXT).m; \
+	    echo "installing $$cat.m as $$dir/$(NLS_TEXTDOMAIN)$(INSTOBJEXT).m"; \
 	  else \
 	    if test -r $(srcdir)/$$cat.m ; then \
 	      $(INSTALL_DATA) $(srcdir)/$$cat.m \
-		$$dir/$(PACKAGE)$(INSTOBJEXT).m; \
+		$$dir/$(NLS_TEXTDOMAIN)$(INSTOBJEXT).m; \
 	      echo "installing $(srcdir)/$$cat as" \
-		   "$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
+		   "$$dir/$(NLS_TEXTDOMAIN)$(INSTOBJEXT).m"; \
 	    else \
 	      true; \
 	    fi; \
 	  fi; \
 	done
-	if test "$(PACKAGE)" = "gettext"; then \
-	  if test -r "$(MKINSTALLDIRS)"; then \
-	    $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
-	  else \
-	    mkdir -p $(DESTDIR)$(gettextsrcdir); \
-	  fi; \
+	if test "$(NLS_TEXTDOMAIN)" = "gettext"; then \
+	  mkdir -p $(DESTDIR)$(gettextsrcdir); \
 	  $(INSTALL_DATA) $(srcdir)/makefile.inn \
 			  $(DESTDIR)$(gettextsrcdir)/makefile.inn; \
 	else \
@@ -172,10 +160,10 @@ uninstall:
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
-	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
-	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
-	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
+	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(NLS_TEXTDOMAIN)$(INSTOBJEXT); \
+	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(NLS_TEXTDOMAIN)$(INSTOBJEXT).m; \
+	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(NLS_TEXTDOMAIN)$(INSTOBJEXT); \
+	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(NLS_TEXTDOMAIN)$(INSTOBJEXT).m; \
 	done
 	rm -f $(gettextsrcdir)/po-makefile.inn
 
diff --git a/po/ms.po b/po/ms.po
index e3167c8af46e..6f3ee01530b9 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -6,61 +6,62 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dialog 1.1.20070704\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-18 18:26-0400\n"
+"POT-Creation-Date: 2011-01-16 17:57-0500\n"
 "PO-Revision-Date: 2007-08-14 01:22+0800\n"
 "Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n"
 "Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
+"Language: ms\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: buttons.c:385
+#: buttons.c:387
 msgid "Yes"
 msgstr "Ya"
 
-#: buttons.c:393
+#: buttons.c:395
 msgid "No"
 msgstr "Tidak"
 
-#: buttons.c:401
+#: buttons.c:403
 msgid "OK"
 msgstr "OK"
 
-#: buttons.c:409
+#: buttons.c:411
 msgid "Cancel"
 msgstr "Batal"
 
-#: buttons.c:417
+#: buttons.c:419
 msgid "EXIT"
 msgstr "KELUAR"
 
-#: buttons.c:425
+#: buttons.c:427
 msgid "Extra"
 msgstr "Ekstra"
 
-#: buttons.c:433
+#: buttons.c:435
 msgid "Help"
 msgstr "Bantuan"
 
 #. Headline "Month"
-#: calendar.c:273
+#: calendar.c:298
 msgid "Month"
 msgstr "Bulan"
 
 #. Headline "Year"
-#: calendar.c:293
+#: calendar.c:318
 msgid "Year"
 msgstr "Tahun"
 
-#: dialog.c:741
+#: dialog.c:756
 msgid "Rename"
 msgstr "Tukar nama"
 
-#: fselect.c:550
+#: fselect.c:571
 msgid "Directories"
 msgstr "Direktori"
 
-#: fselect.c:551
+#: fselect.c:572
 msgid "Files"
 msgstr "Fail"
 
@@ -104,6 +105,6 @@ msgstr "Tiada"
 msgid "Overall Progress"
 msgstr "Kemajuan Keseluruhan"
 
-#: textbox.c:489
+#: textbox.c:468
 msgid "Search"
 msgstr "Cari"
diff --git a/po/nl.po b/po/nl.po
index d57099b9b667..b686d5c55fd3 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,62 +8,63 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dialog-1.1.20070704\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-18 18:26-0400\n"
+"POT-Creation-Date: 2011-01-16 17:57-0500\n"
 "PO-Revision-Date: 2007-10-08 12:42+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: buttons.c:385
+#: buttons.c:387
 msgid "Yes"
 msgstr "Ja"
 
-#: buttons.c:393
+#: buttons.c:395
 msgid "No"
 msgstr "Nee"
 
-#: buttons.c:401
+#: buttons.c:403
 msgid "OK"
 msgstr "OK"
 
-#: buttons.c:409
+#: buttons.c:411
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: buttons.c:417
+#: buttons.c:419
 msgid "EXIT"
 msgstr "Afsluiten"
 
-#: buttons.c:425
+#: buttons.c:427
 msgid "Extra"
 msgstr "Extra"
 
-#: buttons.c:433
+#: buttons.c:435
 msgid "Help"
 msgstr "Help"
 
 #. Headline "Month"
-#: calendar.c:273
+#: calendar.c:298
 msgid "Month"
 msgstr "Maand"
 
 #. Headline "Year"
-#: calendar.c:293
+#: calendar.c:318
 msgid "Year"
 msgstr "Jaar"
 
-#: dialog.c:741
+#: dialog.c:756
 msgid "Rename"
 msgstr "Hernoemen"
 
-#: fselect.c:550
+#: fselect.c:571
 msgid "Directories"
 msgstr "Mappen"
 
-#: fselect.c:551
+#: fselect.c:572
 msgid "Files"
 msgstr "Bestanden"
 
@@ -107,6 +108,6 @@ msgstr "Onbeschikbaar"
 msgid "Overall Progress"
 msgstr "Voortgang"
 
-#: textbox.c:489
+#: textbox.c:468
 msgid "Search"
 msgstr "Zoeken"
diff --git a/po/pl.po b/po/pl.po
index 107fd8ccd239..c4fdfc50fb3e 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,63 +7,64 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dialog 1.1.20080819\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-29 19:30-0400\n"
+"POT-Creation-Date: 2011-01-16 17:57-0500\n"
 "PO-Revision-Date: 2009-03-11 10:32+0100\n"
 "Last-Translator: Michał Trzebiatowski <hippie_1968@hotmail.com>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Polish\n"
 "X-Poedit-Country: POLAND\n"
 
-#: buttons.c:385
+#: buttons.c:387
 msgid "Yes"
 msgstr "Tak"
 
-#: buttons.c:393
+#: buttons.c:395
 msgid "No"
 msgstr "Nie"
 
-#: buttons.c:401
+#: buttons.c:403
 msgid "OK"
 msgstr "OK"
 
-#: buttons.c:409
+#: buttons.c:411
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: buttons.c:417
+#: buttons.c:419
 msgid "EXIT"
 msgstr "WYJDŹ"
 
-#: buttons.c:425
+#: buttons.c:427
 msgid "Extra"
 msgstr "Ekstra"
 
-#: buttons.c:433
+#: buttons.c:435
 msgid "Help"
 msgstr "Pomoc"
 
 #. Headline "Month"
-#: calendar.c:273
+#: calendar.c:298
 msgid "Month"
 msgstr "Miesiąc"
 
 #. Headline "Year"
-#: calendar.c:293
+#: calendar.c:318
 msgid "Year"
 msgstr "Rok"
 
-#: dialog.c:744
+#: dialog.c:756
 msgid "Rename"
 msgstr "Zmień nazwę"
 
-#: fselect.c:550
+#: fselect.c:571
 msgid "Directories"
 msgstr "Katalogi"
 
-#: fselect.c:551
+#: fselect.c:572
 msgid "Files"
 msgstr "Pliki"
 
@@ -107,6 +108,6 @@ msgstr "Brak"
 msgid "Overall Progress"
 msgstr "Ogólny postęp"
 
-#: textbox.c:489
+#: textbox.c:468
 msgid "Search"
 msgstr "Szukaj"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index af80a8fd1561..bff648d21610 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -9,61 +9,62 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dialog 1.1.20080819\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-29 19:30-0400\n"
+"POT-Creation-Date: 2011-01-16 17:57-0500\n"
 "PO-Revision-Date: 2009-01-06 23:48-0200\n"
 "Last-Translator: Flamarion Jorge <flamarilinux@yahoo.com.br>\n"
 "Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: buttons.c:385
+#: buttons.c:387
 msgid "Yes"
 msgstr "Sim"
 
-#: buttons.c:393
+#: buttons.c:395
 msgid "No"
 msgstr "Não"
 
-#: buttons.c:401
+#: buttons.c:403
 msgid "OK"
 msgstr "Aceitar"
 
-#: buttons.c:409
+#: buttons.c:411
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: buttons.c:417
+#: buttons.c:419
 msgid "EXIT"
 msgstr "Sair"
 
-#: buttons.c:425
+#: buttons.c:427
 msgid "Extra"
 msgstr "Extra"
 
-#: buttons.c:433
+#: buttons.c:435
 msgid "Help"
 msgstr "Ajuda"
 
 #. Headline "Month"
-#: calendar.c:273
+#: calendar.c:298
 msgid "Month"
 msgstr "Mês"
 
 #. Headline "Year"
-#: calendar.c:293
+#: calendar.c:318
 msgid "Year"
 msgstr "Ano"
 
-#: dialog.c:744
+#: dialog.c:756
 msgid "Rename"
 msgstr "Renomear"
 
-#: fselect.c:550
+#: fselect.c:571
 msgid "Directories"
 msgstr "Diretórios"
 
-#: fselect.c:551
+#: fselect.c:572
 msgid "Files"
 msgstr "Arquivos"
 
@@ -107,6 +108,6 @@ msgstr "N/A"
 msgid "Overall Progress"
 msgstr "Progresso Global"
 
-#: textbox.c:489
+#: textbox.c:468
 msgid "Search"
 msgstr "Pesquisa"
diff --git a/po/ru.po b/po/ru.po
index f92328f24538..d78c6807dc27 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,63 +9,64 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dialog 1.1.20070704\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-22 07:05-0500\n"
+"POT-Creation-Date: 2011-01-16 17:57-0500\n"
 "PO-Revision-Date: 2009-01-24 23:09+0300\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: buttons.c:385
+#: buttons.c:387
 msgid "Yes"
 msgstr "Да"
 
-#: buttons.c:393
+#: buttons.c:395
 msgid "No"
 msgstr "Нет"
 
-#: buttons.c:401
+#: buttons.c:403
 msgid "OK"
 msgstr "OK"
 
-#: buttons.c:409
+#: buttons.c:411
 msgid "Cancel"
 msgstr "Отмена"
 
-#: buttons.c:417
+#: buttons.c:419
 msgid "EXIT"
 msgstr "Выход"
 
-#: buttons.c:425
+#: buttons.c:427
 msgid "Extra"
 msgstr "Дополнительно"
 
-#: buttons.c:433
+#: buttons.c:435
 msgid "Help"
 msgstr "Справка"
 
 #. Headline "Month"
-#: calendar.c:273
+#: calendar.c:298
 msgid "Month"
 msgstr "Месяц"
 
 #. Headline "Year"
-#: calendar.c:293
+#: calendar.c:318
 msgid "Year"
 msgstr "Год"
 
-#: dialog.c:744
+#: dialog.c:756
 msgid "Rename"
 msgstr "Переименовать"
 
-#: fselect.c:550
+#: fselect.c:571
 msgid "Directories"
 msgstr "Каталоги"
 
-#: fselect.c:551
+#: fselect.c:572
 msgid "Files"
 msgstr "Файлы"
 
@@ -109,6 +110,6 @@ msgstr "Н/Д"
 msgid "Overall Progress"
 msgstr "Всего выполнено"
 
-#: textbox.c:489
+#: textbox.c:468
 msgid "Search"
 msgstr "Поиск"
diff --git a/po/sl.po b/po/sl.po
new file mode 100644
index 000000000000..c20e42f75c12
--- /dev/null
+++ b/po/sl.po
@@ -0,0 +1,112 @@
+# Slovenian translation for dialog.
+# Copyright (C) 2003-2007, 2008 Thomas Dickey
+# This file is distributed under the same license as the dialog package.
+# Klemen Košir <klemen.kosir@gmx.com>, 2011.
+msgid ""
+msgstr ""
+"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: 2011-02-12 20:17+0100\n"
+"Last-Translator: Klemen Košir <klemen.kosir@gmx.com>\n"
+"Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
+"Language: sl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Slovenian\n"
+"X-Poedit-Country: SLOVENIA\n"
+
+#: buttons.c:385
+msgid "Yes"
+msgstr "Da"
+
+#: buttons.c:393
+msgid "No"
+msgstr "Ne"
+
+#: buttons.c:401
+msgid "OK"
+msgstr "V redu"
+
+#: buttons.c:409
+msgid "Cancel"
+msgstr "Prekliči"
+
+#: buttons.c:417
+msgid "EXIT"
+msgstr "IZHOD"
+
+#: buttons.c:425
+msgid "Extra"
+msgstr "Dodatno"
+
+#: buttons.c:433
+msgid "Help"
+msgstr "Pomoč"
+
+#. Headline "Month"
+#: calendar.c:273
+msgid "Month"
+msgstr "Mesec"
+
+#. Headline "Year"
+#: calendar.c:293
+msgid "Year"
+msgstr "Leto"
+
+#: dialog.c:741
+msgid "Rename"
+msgstr "Preimenuj"
+
+#: fselect.c:550
+msgid "Directories"
+msgstr "Imeniki"
+
+#: fselect.c:551
+msgid "Files"
+msgstr "Datoteke"
+
+#: mixedgauge.c:58
+msgid "Succeeded"
+msgstr "Uspelo"
+
+#: mixedgauge.c:61
+msgid "Failed"
+msgstr "Spodletelo"
+
+#: mixedgauge.c:64
+msgid "Passed"
+msgstr "Prestalo"
+
+#: mixedgauge.c:67
+msgid "Completed"
+msgstr "Končano"
+
+#: mixedgauge.c:70
+msgid "Checked"
+msgstr "Preverjeno"
+
+#: mixedgauge.c:73
+msgid "Done"
+msgstr "Opravljeno"
+
+#: mixedgauge.c:76
+msgid "Skipped"
+msgstr "Preskočeno"
+
+#: mixedgauge.c:79
+msgid "In Progress"
+msgstr "V teku"
+
+#: mixedgauge.c:85
+msgid "N/A"
+msgstr "N/A"
+
+#: mixedgauge.c:193
+msgid "Overall Progress"
+msgstr "Skupni napredek"
+
+#: textbox.c:489
+msgid "Search"
+msgstr "Iskanje"
diff --git a/po/sq.po b/po/sq.po
index b804bbbc5b77..592d4a11ffa4 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -7,61 +7,62 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Dialog 1.0-20050116\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-18 18:26-0400\n"
+"POT-Creation-Date: 2011-01-16 17:57-0500\n"
 "PO-Revision-Date: 2004-11-18 02:28+0100\n"
 "Last-Translator: Elian Myftiu <elian@lycos.com>\n"
 "Language-Team: Albanian <gnome-albanian-perkthyesit@lists.sourceforge.net>\n"
+"Language: sq\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: buttons.c:385
+#: buttons.c:387
 msgid "Yes"
 msgstr "Po"
 
-#: buttons.c:393
+#: buttons.c:395
 msgid "No"
 msgstr "Jo"
 
-#: buttons.c:401
+#: buttons.c:403
 msgid "OK"
 msgstr "mirë"
 
-#: buttons.c:409
+#: buttons.c:411
 msgid "Cancel"
 msgstr "Anullo"
 
-#: buttons.c:417
+#: buttons.c:419
 msgid "EXIT"
 msgstr "Dal"
 
-#: buttons.c:425
+#: buttons.c:427
 msgid "Extra"
 msgstr ""
 
-#: buttons.c:433
+#: buttons.c:435
 msgid "Help"
 msgstr ""
 
 #. Headline "Month"
-#: calendar.c:273
+#: calendar.c:298
 msgid "Month"
 msgstr ""
 
 #. Headline "Year"
-#: calendar.c:293
+#: calendar.c:318
 msgid "Year"
 msgstr ""
 
-#: dialog.c:741
+#: dialog.c:756
 msgid "Rename"
 msgstr ""
 
-#: fselect.c:550
+#: fselect.c:571
 msgid "Directories"
 msgstr ""
 
-#: fselect.c:551
+#: fselect.c:572
 msgid "Files"
 msgstr ""
 
@@ -105,6 +106,6 @@ msgstr ""
 msgid "Overall Progress"
 msgstr ""
 
-#: textbox.c:489
+#: textbox.c:468
 msgid "Search"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index ef71d76b4f22..5c392b8a8a2f 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,61 +6,62 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dialog 1.1.20070704\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-18 18:26-0400\n"
+"POT-Creation-Date: 2011-01-16 17:57-0500\n"
 "PO-Revision-Date: 2007-07-23 00:02+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: buttons.c:385
+#: buttons.c:387
 msgid "Yes"
 msgstr "Ja"
 
-#: buttons.c:393
+#: buttons.c:395
 msgid "No"
 msgstr "Nej"
 
-#: buttons.c:401
+#: buttons.c:403
 msgid "OK"
 msgstr "OK"
 
-#: buttons.c:409
+#: buttons.c:411
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: buttons.c:417
+#: buttons.c:419
 msgid "EXIT"
 msgstr "AVSLUTA"
 
-#: buttons.c:425
+#: buttons.c:427
 msgid "Extra"
 msgstr "Extra"
 
-#: buttons.c:433
+#: buttons.c:435
 msgid "Help"
 msgstr "Hjälp"
 
 #. Headline "Month"
-#: calendar.c:273
+#: calendar.c:298
 msgid "Month"
 msgstr "Månad"
 
 #. Headline "Year"
-#: calendar.c:293
+#: calendar.c:318
 msgid "Year"
 msgstr "År"
 
-#: dialog.c:741
+#: dialog.c:756
 msgid "Rename"
 msgstr "Byt namn"
 
-#: fselect.c:550
+#: fselect.c:571
 msgid "Directories"
 msgstr "Kataloger"
 
-#: fselect.c:551
+#: fselect.c:572
 msgid "Files"
 msgstr "Filer"
 
@@ -104,6 +105,6 @@ msgstr "Inte tillgänglig"
 msgid "Overall Progress"
 msgstr "Totalt förlopp"
 
-#: textbox.c:489
+#: textbox.c:468
 msgid "Search"
 msgstr "Sök"
diff --git a/po/sw.po b/po/sw.po
index eb3ef8d5334c..a8419fecd511 100644
--- a/po/sw.po
+++ b/po/sw.po
@@ -7,61 +7,62 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dialog 1.1.20080819\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-18 18:26-0400\n"
+"POT-Creation-Date: 2011-01-16 17:57-0500\n"
 "PO-Revision-Date: 2009-05-01 03:07+0300\n"
 "Last-Translator: Emanuel Feruzi <emanuel.feruzi@trilabs.co.tz>\n"
 "Language-Team: Swahili <translation-team-sw@lists.sourceforge.net>\n"
+"Language: sw\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: buttons.c:385
+#: buttons.c:387
 msgid "Yes"
 msgstr "Ndio"
 
-#: buttons.c:393
+#: buttons.c:395
 msgid "No"
 msgstr "Hapana"
 
-#: buttons.c:401
+#: buttons.c:403
 msgid "OK"
 msgstr "Sawa"
 
-#: buttons.c:409
+#: buttons.c:411
 msgid "Cancel"
 msgstr "Ghahiri"
 
-#: buttons.c:417
+#: buttons.c:419
 msgid "EXIT"
 msgstr "Funga"
 
-#: buttons.c:425
+#: buttons.c:427
 msgid "Extra"
 msgstr "Nyongeza"
 
-#: buttons.c:433
+#: buttons.c:435
 msgid "Help"
 msgstr "Msaada"
 
 #. Headline "Month"
-#: calendar.c:273
+#: calendar.c:298
 msgid "Month"
 msgstr "Mwezi"
 
 #. Headline "Year"
-#: calendar.c:293
+#: calendar.c:318
 msgid "Year"
 msgstr "Mwaka"
 
-#: dialog.c:741
+#: dialog.c:756
 msgid "Rename"
 msgstr "Badili jina"
 
-#: fselect.c:550
+#: fselect.c:571
 msgid "Directories"
 msgstr "Masaraka"
 
-#: fselect.c:551
+#: fselect.c:572
 msgid "Files"
 msgstr "Mafaili"
 
@@ -105,6 +106,6 @@ msgstr "Haitumiki"
 msgid "Overall Progress"
 msgstr "Maendeleo kwa ujumla"
 
-#: textbox.c:489
+#: textbox.c:468
 msgid "Search"
 msgstr "Tafuta"
diff --git a/po/th.po b/po/th.po
index d3dcbf65a6f7..bdc54dc1e032 100644
--- a/po/th.po
+++ b/po/th.po
@@ -6,63 +6,64 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dialog 1.1.20070704\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-18 18:26-0400\n"
+"POT-Creation-Date: 2011-01-16 17:57-0500\n"
 "PO-Revision-Date: 2007-11-22 19:23+0700\n"
 "Last-Translator: Seksan Poltree <seksan.poltree@gmail.com>\n"
 "Language-Team: Thai <seksan.poltree@gmail.com>\n"
+"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Thai\n"
 "X-Poedit-Country: THAILAND\n"
 
-#: buttons.c:385
+#: buttons.c:387
 msgid "Yes"
 msgstr "ใช่"
 
-#: buttons.c:393
+#: buttons.c:395
 msgid "No"
 msgstr "ไม่"
 
-#: buttons.c:401
+#: buttons.c:403
 msgid "OK"
 msgstr "ตกลง"
 
-#: buttons.c:409
+#: buttons.c:411
 msgid "Cancel"
 msgstr "ยกเลิก"
 
-#: buttons.c:417
+#: buttons.c:419
 msgid "EXIT"
 msgstr "ออก"
 
-#: buttons.c:425
+#: buttons.c:427
 msgid "Extra"
 msgstr "เพิ่มเติม"
 
-#: buttons.c:433
+#: buttons.c:435
 msgid "Help"
 msgstr "ช่วยเหลือ"
 
 #. Headline "Month"
-#: calendar.c:273
+#: calendar.c:298
 msgid "Month"
 msgstr "เดือน"
 
 #. Headline "Year"
-#: calendar.c:293
+#: calendar.c:318
 msgid "Year"
 msgstr "ปี"
 
-#: dialog.c:741
+#: dialog.c:756
 msgid "Rename"
 msgstr "เปลี่ยนชื่อ"
 
-#: fselect.c:550
+#: fselect.c:571
 msgid "Directories"
 msgstr "ไดเร็กทอรี่"
 
-#: fselect.c:551
+#: fselect.c:572
 msgid "Files"
 msgstr "ไฟล์"
 
@@ -106,6 +107,6 @@ msgstr "ไม่มีอยู่"
 msgid "Overall Progress"
 msgstr "ความก้าวหน้าทั้งสิ้น"
 
-#: textbox.c:489
+#: textbox.c:468
 msgid "Search"
 msgstr "ค้นหา"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 367c6bc943cc..4b597804bb4f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,61 +8,62 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dialog 1.1.20070704\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-25 16:06-0500\n"
+"POT-Creation-Date: 2011-01-16 17:57-0500\n"
 "PO-Revision-Date: 2007-08-20 07:25+0800\n"
 "Last-Translator: Meng Jie <zuxy.meng@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: buttons.c:379
+#: buttons.c:387
 msgid "Yes"
 msgstr "是"
 
-#: buttons.c:387
+#: buttons.c:395
 msgid "No"
 msgstr "否"
 
-#: buttons.c:395
+#: buttons.c:403
 msgid "OK"
 msgstr "确认"
 
-#: buttons.c:403
+#: buttons.c:411
 msgid "Cancel"
 msgstr "取消"
 
-#: buttons.c:411
+#: buttons.c:419
 msgid "EXIT"
 msgstr "退出"
 
-#: buttons.c:419
+#: buttons.c:427
 msgid "Extra"
 msgstr "附加"
 
-#: buttons.c:427
+#: buttons.c:435
 msgid "Help"
 msgstr "帮助"
 
 #. Headline "Month"
-#: calendar.c:273
+#: calendar.c:298
 msgid "Month"
 msgstr "月"
 
 #. Headline "Year"
-#: calendar.c:293
+#: calendar.c:318
 msgid "Year"
 msgstr "年"
 
-#: dialog.c:727
+#: dialog.c:756
 msgid "Rename"
 msgstr "重命名"
 
-#: fselect.c:548
+#: fselect.c:571
 msgid "Directories"
 msgstr "目录"
 
-#: fselect.c:549
+#: fselect.c:572
 msgid "Files"
 msgstr "文件"
 
@@ -106,6 +107,6 @@ msgstr "N/A"
 msgid "Overall Progress"
 msgstr "整体进度"
 
-#: textbox.c:489
+#: textbox.c:468
 msgid "Search"
 msgstr "搜索"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index ebfa74df60ff..eadee70358c6 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,62 +7,63 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dialog 1.1.20070704\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-18 18:26-0400\n"
+"POT-Creation-Date: 2011-01-16 17:57-0500\n"
 "PO-Revision-Date: 2007-12-19 23:39+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: buttons.c:385
+#: buttons.c:387
 msgid "Yes"
 msgstr "是"
 
-#: buttons.c:393
+#: buttons.c:395
 msgid "No"
 msgstr "否"
 
-#: buttons.c:401
+#: buttons.c:403
 msgid "OK"
 msgstr "確定"
 
-#: buttons.c:409
+#: buttons.c:411
 msgid "Cancel"
 msgstr "取消"
 
-#: buttons.c:417
+#: buttons.c:419
 msgid "EXIT"
 msgstr "離開"
 
-#: buttons.c:425
+#: buttons.c:427
 msgid "Extra"
 msgstr "其他"
 
-#: buttons.c:433
+#: buttons.c:435
 msgid "Help"
 msgstr "求助"
 
 #. Headline "Month"
-#: calendar.c:273
+#: calendar.c:298
 msgid "Month"
 msgstr "月"
 
 #. Headline "Year"
-#: calendar.c:293
+#: calendar.c:318
 msgid "Year"
 msgstr "年"
 
-#: dialog.c:741
+#: dialog.c:756
 msgid "Rename"
 msgstr "更名"
 
-#: fselect.c:550
+#: fselect.c:571
 msgid "Directories"
 msgstr "目錄"
 
-#: fselect.c:551
+#: fselect.c:572
 msgid "Files"
 msgstr "檔案"
 
@@ -106,6 +107,6 @@ msgstr "不明"
 msgid "Overall Progress"
 msgstr "整體進度"
 
-#: textbox.c:489
+#: textbox.c:468
 msgid "Search"
 msgstr "搜尋"
diff --git a/prgbox.c b/prgbox.c
new file mode 100644
index 000000000000..fea23936db9a
--- /dev/null
+++ b/prgbox.c
@@ -0,0 +1,111 @@
+/*
+ *  $Id: prgbox.c,v 1.6 2011/03/02 09:59:26 tom Exp $
+ *
+ *  prgbox.c -- implements the prg box
+ *
+ *  Copyright 2011	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 as
+ *  published by the Free Software Foundation; either version 2.1 of the
+ *  License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful, but
+ *  WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this program; if not, write to
+ *	Free Software Foundation, Inc.
+ *	51 Franklin St., Fifth Floor
+ *	Boston, MA 02110, USA.
+ */
+
+#include <dialog.h>
+
+/*
+ * Open a pipe which ties stderr and stdout together.
+ */
+static FILE *
+dlg_popen(const char *command, const char *type)
+{
+    FILE *result = 0;
+    int fd[2];
+    int pid;
+    char *blob;
+    char **argv;
+
+    if ((*type == 'r' || *type != 'w') && pipe(fd) == 0) {
+	switch (pid = fork()) {
+	case -1:		/* Error. */
+	    (void) close(fd[0]);
+	    (void) close(fd[1]);
+	    break;
+	case 0:		/* child. */
+	    if (*type == 'r') {
+		if (fd[1] != STDOUT_FILENO) {
+		    (void) dup2(fd[1], STDOUT_FILENO);
+		    (void) close(fd[1]);
+		}
+		(void) dup2(STDOUT_FILENO, STDERR_FILENO);
+		(void) close(fd[0]);
+	    } else {
+		if (fd[0] != STDIN_FILENO) {
+		    (void) dup2(fd[0], STDIN_FILENO);
+		    (void) close(fd[0]);
+		}
+		(void) close(fd[1]);
+		(void) close(STDERR_FILENO);
+	    }
+	    /*
+	     * Bourne shell needs "-c" option to force it to use only the
+	     * given command.  Also, it needs the command to be parsed into
+	     * tokens.
+	     */
+	    if ((blob = malloc(4 + strlen(command))) != 0) {
+		sprintf(blob, "-c %s", command);
+		argv = dlg_string_to_argv(blob);
+		execvp("sh", argv);
+	    }
+	    _exit(127);
+	    /* NOTREACHED */
+	default:		/* parent */
+	    if (*type == 'r') {
+		result = fdopen(fd[0], type);
+		(void) close(fd[1]);
+	    } else {
+		result = fdopen(fd[1], type);
+		(void) close(fd[0]);
+	    }
+	    break;
+	}
+    }
+
+    return result;
+}
+
+/*
+ * Display text from a pipe in a scrolling window.
+ */
+int
+dialog_prgbox(const char *title,
+	      const char *cprompt,
+	      const char *command,
+	      int height,
+	      int width,
+	      int pauseopt)
+{
+    int code;
+    FILE *fp;
+
+    fp = dlg_popen(command, "r");
+    if (fp == NULL)
+	dlg_exiterr("pipe open failed: %s", command);
+
+    code = dlg_progressbox(title, cprompt, height, width, pauseopt, fp);
+
+    pclose(fp);
+
+    return code;
+}
diff --git a/progressbox.c b/progressbox.c
index b470dc11d306..5670d1cc48c7 100644
--- a/progressbox.c
+++ b/progressbox.c
@@ -1,9 +1,10 @@
 /*
- *  $Id: progressbox.c,v 1.8 2010/01/12 10:46:24 tom Exp $
+ *  $Id: progressbox.c,v 1.11 2011/03/02 01:10:08 tom Exp $
  *
  *  progressbox.c -- implements the progress box
  *
  *  Copyright 2005	Valery Reznic
+ *  Copyright 2006-2011	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 as
@@ -103,18 +104,77 @@ print_line(MY_OBJ * obj, WINDOW *win, int row, int width)
 	(void) waddch(win, ' ');
 }
 
-/*
- * Display text from a stdin in a scrolling window.
- */
+static int
+pause_for_ok(WINDOW *dialog, int height, int width)
+{
+    /* *INDENT-OFF* */
+    static DLG_KEYS_BINDING binding[] = {
+	ENTERKEY_BINDINGS,
+	DLG_KEYS_DATA( DLGK_ENTER,	' ' ),
+	END_KEYS_BINDING
+    };
+    /* *INDENT-ON* */
+
+    int button = 0;
+    int key = 0, fkey;
+    int result = DLG_EXIT_UNKNOWN;
+    const char **buttons = dlg_ok_label();
+    int check;
+
+    dlg_register_window(dialog, "progressbox", binding);
+    dlg_register_buttons(dialog, "progressbox", buttons);
+
+    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);
+
+    while (result == DLG_EXIT_UNKNOWN) {
+	key = dlg_mouse_wgetch(dialog, &fkey);
+	if (dlg_result_key(key, fkey, &result))
+	    break;
+
+	if (!fkey && (check = dlg_char_to_button(key, buttons)) >= 0) {
+	    result = check ? DLG_EXIT_HELP : DLG_EXIT_OK;
+	    break;
+	}
+
+	if (fkey) {
+	    switch (key) {
+	    case DLGK_ENTER:
+		result = button ? DLG_EXIT_HELP : DLG_EXIT_OK;
+		break;
+	    case DLGK_MOUSE(0):
+		result = DLG_EXIT_OK;
+		break;
+	    case DLGK_MOUSE(1):
+		result = DLG_EXIT_HELP;
+		break;
+	    default:
+		beep();
+		break;
+	    }
+	} else {
+	    beep();
+	}
+    }
+    dlg_unregister_window(dialog);
+    return result;
+}
+
 int
-dialog_progressbox(const char *title, const char *cprompt, int height, int width)
+dlg_progressbox(const char *title,
+		const char *cprompt,
+		int height,
+		int width,
+		int pauseopt,
+		FILE *fp)
 {
     int i;
     int x, y, thigh;
     WINDOW *dialog, *text;
     MY_OBJ *obj;
-    FILE *fd = dialog_state.pipe_input;
     char *prompt = dlg_strclone(cprompt);
+    int result;
 
     dlg_tab_correct_str(prompt);
     dlg_auto_size(title, prompt, &height, &width, MIN_HIGH, MIN_WIDE);
@@ -157,9 +217,9 @@ dialog_progressbox(const char *title, const char *cprompt, int height, int width
     (void) wnoutrefresh(dialog);
 
     obj = dlg_calloc(MY_OBJ, 1);
-    assert_ptr(obj, "dialog_progressbox");
+    assert_ptr(obj, "dlg_progressbox");
 
-    obj->obj.input = fd;
+    obj->obj.input = fp;
     obj->obj.win = dialog;
     obj->text = text;
 
@@ -173,15 +233,41 @@ dialog_progressbox(const char *title, const char *cprompt, int height, int width
 	    scrollok(text, FALSE);
 	    print_line(obj, text, thigh - 1, width - (2 * MARGIN));
 	}
-	(void) wnoutrefresh(text);
 	(void) wrefresh(text);
 	if (obj->is_eof)
 	    break;
     }
-    dlg_unregister_window(text);
+
+    if (pauseopt) {
+	scrollok(text, TRUE);
+	wscrl(text, 1 + MARGIN);
+	(void) wrefresh(text);
+	result = pause_for_ok(dialog, height, width);
+    } else {
+	wrefresh(dialog);
+	result = DLG_EXIT_OK;
+    }
+
     dlg_del_window(dialog);
     free(prompt);
     free(obj);
 
     return DLG_EXIT_OK;
 }
+
+/*
+ * Display text from a stdin in a scrolling window.
+ */
+int
+dialog_progressbox(const char *title, const char *cprompt, int height, int width)
+{
+    int result;
+    result = dlg_progressbox(title,
+			     cprompt,
+			     height,
+			     width,
+			     FALSE,
+			     dialog_state.pipe_input);
+    dialog_state.pipe_input = 0;
+    return result;
+}
diff --git a/rename.sh b/rename.sh
new file mode 100755
index 000000000000..4ddd97000133
--- /dev/null
+++ b/rename.sh
@@ -0,0 +1,59 @@
+#! /bin/sh
+# $Id: rename.sh,v 1.3 2011/01/06 10:51:02 tom Exp $
+##############################################################################
+# Copyright (c) 2011 Thomas E. Dickey                                        #
+#                                                                            #
+# Permission is hereby granted, free of charge, to any person obtaining a    #
+# copy of this software and associated documentation files (the "Software"), #
+# to deal in the Software without restriction, including without limitation  #
+# the rights to use, copy, modify, merge, publish, distribute, distribute    #
+# with modifications, sublicense, and/or sell copies of the Software, and to #
+# permit persons to whom the Software is furnished to do so, subject to the  #
+# following conditions:                                                      #
+#                                                                            #
+# The above copyright notice and this permission notice shall be included in #
+# all copies or substantial portions of the Software.                        #
+#                                                                            #
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR #
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,   #
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL    #
+# THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER      #
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING    #
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER        #
+# DEALINGS IN THE SOFTWARE.                                                  #
+#                                                                            #
+# Except as contained in this notice, the name(s) of the above copyright     #
+# holders shall not be used in advertising or otherwise to promote the sale, #
+# use or other dealings in this Software without prior written               #
+# authorization.                                                             #
+##############################################################################
+# install-helper for dialog's manpages, e.g., as "cdialog".
+#
+# $1 = input file
+# $2 = output file
+# $3 = actual program name that dialog is installed as
+# $4 = actual name that header/library are installed as
+# $5+ = install program and possible options
+
+LANG=C;     export LANG
+LC_ALL=C;   export LC_ALL
+LC_CTYPE=C; export LC_CTYPE
+LANGUAGE=C; export LANGUAGE
+
+SOURCE=$1; shift
+TARGET=$1; shift
+BINARY=$1; shift
+PACKAGE=$1; shift
+
+CHR_LEAD=`echo "$BINARY" | sed -e 's/^\(.\).*/\1/'`
+CHR_TAIL=`echo "$BINARY" | sed -e 's/^.//'`
+ONE_CAPS=`echo $CHR_LEAD | tr '[a-z]' '[A-Z]'`$CHR_TAIL
+ALL_CAPS=`echo "$BINARY" | tr '[a-z]' '[A-Z]'`
+
+sed	-e "s,^\.ds p dialog\>,.ds p $BINARY," \
+	-e "s,^\.ds l dialog\>,.ds l $PACKAGE," \
+	-e "s,^\.ds L Dialog\>,.ds L $ONE_CAPS," \
+	-e "s,^\.ds D DIALOG\>,.ds D $ALL_CAPS," \
+	<$SOURCE >source.tmp
+"$@" source.tmp $TARGET
+rm -f source.tmp
diff --git a/samples/debian.rc b/samples/debian.rc
index f624dba846e2..3b42eb8433bb 100644
--- a/samples/debian.rc
+++ b/samples/debian.rc
@@ -1,6 +1,14 @@
-# $Id: debian.rc,v 1.4 2005/12/01 01:18:57 tom Exp $
+# $Id: debian.rc,v 1.5 2011/01/17 00:14:53 tom Exp $
+# vile:confmode
 # Run-time configuration file for dialog, matches Debian color scheme.
 # (these are the default values for dialog)
+#
+# Types of values:
+#
+# Number     -  <number>
+# String     -  "string"
+# Boolean    -  <ON|OFF>
+# Attribute  -  (foreground,background,highlight?)
 
 # Set aspect-ration.
 aspect = 0
@@ -115,3 +123,9 @@ form_active_text_color = (WHITE,BLUE,ON)
 
 # Form text color
 form_text_color = (WHITE,CYAN,ON)
+
+# Readonly form item color
+form_item_readonly_color = (CYAN,WHITE,ON)
+
+# Dialog box gauge color
+gauge_color = (BLUE,WHITE,ON)
diff --git a/samples/infobox5 b/samples/infobox5
index 7f4599e66718..58512c90e572 100755
--- a/samples/infobox5
+++ b/samples/infobox5
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $Id: infobox5,v 1.6 2010/01/13 10:20:03 tom Exp $
+# $Id: infobox5,v 1.7 2011/01/18 09:19:09 tom Exp $
 # get rid of all flickering by constructing a script unroll the loop, leaving
 # us in curses-mode until we're done counting.
 
@@ -21,7 +21,7 @@ do
 cat >>$tempfile <<EOF
 	--sleep 1 \
 	--begin 0 5 \
-	--title "INFO BOX" "$@" \
+	--title "INFO BOX" $* \
         --infobox "Hi, this is an information box. It is
 different from a message box: it will
 not pause waiting for input after displaying
diff --git a/samples/infobox6 b/samples/infobox6
index 2e4505cbe89d..a3a06cef2829 100755
--- a/samples/infobox6
+++ b/samples/infobox6
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $Id: infobox6,v 1.6 2010/01/13 10:20:03 tom Exp $
+# $Id: infobox6,v 1.7 2011/01/18 09:20:59 tom Exp $
 # get rid of all flickering by constructing a script unroll the loop, leaving
 # us in curses-mode until we're done counting.
 #
@@ -23,7 +23,7 @@ do
 cat >>$tempfile <<EOF
 	--sleep 1 \
 	--begin $left `expr $left + 5` \
-	--title "INFO BOX" $last "$@" \
+	--title "INFO BOX" $* $last
         --infobox "Hi, this is an information box. It is
 different from a message box: it will
 not pause waiting for input after displaying
diff --git a/samples/msgbox-utf8 b/samples/msgbox-utf8
new file mode 100755
index 000000000000..e7331502ad9b
--- /dev/null
+++ b/samples/msgbox-utf8
@@ -0,0 +1,14 @@
+#!/bin/sh
+# $Id: msgbox-utf8,v 1.1 2011/01/18 00:25:30 tom Exp $
+# from Debian #570634
+
+. ./setup-vars
+
+. ./setup-utf8
+
+${DIALOG-dialog} "$@" \
+	--title "ทดสอบวรรณยุกต์" \
+	--msgbox "วรรณยุกต์อยู่ท้ายบรรทัดได้หรือไม่" 8 23
+retval=$?
+
+. ./report-button
diff --git a/samples/pause-both b/samples/pause-both
new file mode 100755
index 000000000000..aa729361497a
--- /dev/null
+++ b/samples/pause-both
@@ -0,0 +1,14 @@
+#!/bin/sh
+# $Id: pause-both,v 1.1 2011/01/18 09:49:24 tom Exp $
+
+. ./setup-vars
+
+$DIALOG --title "PAUSE" \
+	--help-button \
+	--extra-button "$@" \
+	--pause "Hi, this is a pause widget" 20 70 10
+
+retval=$?
+echo return $retval
+
+. ./report-button
diff --git a/samples/pause-extra b/samples/pause-extra
new file mode 100755
index 000000000000..846e10880799
--- /dev/null
+++ b/samples/pause-extra
@@ -0,0 +1,13 @@
+#!/bin/sh
+# $Id: pause-extra,v 1.1 2011/01/18 09:49:07 tom Exp $
+
+. ./setup-vars
+
+$DIALOG --title "PAUSE" \
+	--extra-button "$@" \
+	--pause "Hi, this is a pause widget" 20 70 10
+
+retval=$?
+echo return $retval
+
+. ./report-button
diff --git a/samples/prgbox b/samples/prgbox
new file mode 100755
index 000000000000..9170a367d70a
--- /dev/null
+++ b/samples/prgbox
@@ -0,0 +1,6 @@
+#!/bin/sh
+# $Id: prgbox,v 1.1 2011/03/02 00:10:54 tom Exp $
+
+. ./setup-vars
+
+$DIALOG --title "PRGBOX" "$@" --prgbox "./shortlist" 20 70
diff --git a/samples/prgbox2 b/samples/prgbox2
new file mode 100755
index 000000000000..53f3daa907ac
--- /dev/null
+++ b/samples/prgbox2
@@ -0,0 +1,6 @@
+#!/bin/sh
+# $Id: prgbox2,v 1.1 2011/03/02 01:25:54 tom Exp $
+
+. ./setup-vars
+
+$DIALOG --title "PRGBOX" "$@" --prgbox "./shortlist 3" 20 70
diff --git a/samples/programbox b/samples/programbox
new file mode 100755
index 000000000000..9fa0abc82000
--- /dev/null
+++ b/samples/programbox
@@ -0,0 +1,19 @@
+#!/bin/sh
+# $Id: programbox,v 1.1 2011/03/02 01:17:28 tom Exp $
+
+. ./setup-vars
+
+. ./setup-tempfile
+
+ls -1 >$tempfile
+(
+while true
+do
+read text
+test -z "$text" && break
+ls -ld "$text"
+sleep 0.1
+done <$tempfile
+) |
+
+$DIALOG --title "PROGRAMBOX" "$@" --programbox 20 70
diff --git a/samples/programbox2 b/samples/programbox2
new file mode 100755
index 000000000000..63f87df276b2
--- /dev/null
+++ b/samples/programbox2
@@ -0,0 +1,19 @@
+#!/bin/sh
+# $Id: programbox2,v 1.1 2011/03/02 01:25:31 tom Exp $
+
+. ./setup-vars
+
+. ./setup-tempfile
+
+ls -1 >$tempfile
+(
+while true
+do
+read text
+test -z "$text" && break
+ls -ld "$text"
+sleep 0.1
+done <$tempfile
+) |
+
+$DIALOG --title "PROGRAMBOX" "$@" --programbox "ProgramBox" 20 70
diff --git a/samples/setup-vars b/samples/setup-vars
index cf79353c553a..ae5e725e292e 100644
--- a/samples/setup-vars
+++ b/samples/setup-vars
@@ -1,6 +1,10 @@
-# $Id: setup-vars,v 1.1 2010/01/13 00:16:38 tom Exp $
+# $Id: setup-vars,v 1.2 2011/01/04 00:21:43 tom Exp $
 # vile:shmode
 
+# These symbols are defined to use in the sample shell scripts to make them
+# more readable.  But they are (intentionally) not exported.  If they were
+# exported, they would also be visible in the dialog program (a subprocess).
+
 : ${DIALOG=dialog}
 
 : ${DIALOG_OK=0}
diff --git a/samples/shortlist b/samples/shortlist
new file mode 100755
index 000000000000..bda8b4e89f21
--- /dev/null
+++ b/samples/shortlist
@@ -0,0 +1,19 @@
+#!/bin/sh
+# $Id: shortlist,v 1.2 2011/03/02 00:11:50 tom Exp $
+# make a short listing, which writes to both stdout and stderr.
+
+if test $# != 0
+then
+	count=$1
+else
+	count=10
+fi
+
+while test $count != 0
+do
+	echo "** $count -- `date`"
+	w >&2
+	sleep 1
+	count=`expr $count - 1 2>/dev/null`
+	test -z "$count" && count=0
+done
diff --git a/samples/slackware.rc b/samples/slackware.rc
index 9942db6e1cfd..967147e9ea06 100644
--- a/samples/slackware.rc
+++ b/samples/slackware.rc
@@ -1,4 +1,5 @@
-# $Id: slackware.rc,v 1.6 2005/12/01 01:20:16 tom Exp $
+# $Id: slackware.rc,v 1.7 2011/01/17 00:14:41 tom Exp $
+# vile:confmode
 # Run-time configuration file for dialog, matches Slackware color scheme.
 #
 # Types of values:
@@ -122,3 +123,9 @@ form_active_text_color = (BLUE,WHITE,OFF)
 
 # Form text color
 form_text_color = (CYAN,BLUE,ON)
+
+# Readonly form item color
+form_item_readonly_color = (CYAN,WHITE,ON)
+
+# Dialog box gauge color
+gauge_color = (BLUE,WHITE,ON)
diff --git a/samples/sourcemage.rc b/samples/sourcemage.rc
index bf187ea5e6c2..1ba826fa54c1 100644
--- a/samples/sourcemage.rc
+++ b/samples/sourcemage.rc
@@ -1,4 +1,5 @@
-# $Id: sourcemage.rc,v 1.3 2005/12/01 01:20:45 tom Exp $
+# $Id: sourcemage.rc,v 1.4 2011/01/17 00:14:25 tom Exp $
+# vile:confmode
 # Run-time configuration file for dialog, matches SourceMage color scheme.
 #
 # Types of values:
@@ -121,3 +122,9 @@ form_active_text_color = (BLACK,WHITE,OFF)
 
 # Form text color
 form_text_color = (RED,BLACK,ON)
+
+# Readonly form item color
+form_item_readonly_color = (CYAN,WHITE,ON)
+
+# Dialog box gauge color
+gauge_color = (BLUE,WHITE,ON)
diff --git a/samples/suse.rc b/samples/suse.rc
index 233157d94ada..f2417b253071 100644
--- a/samples/suse.rc
+++ b/samples/suse.rc
@@ -1,4 +1,5 @@
-# $Id: suse.rc,v 1.2 2007/02/25 17:49:12 tom Exp $
+# $Id: suse.rc,v 1.3 2011/01/17 00:15:27 tom Exp $
+# vile:confmode
 # Run-time configuration file for dialog, matches SuSE color scheme.
 #
 # Types of values:
@@ -124,3 +125,6 @@ form_text_color = (WHITE,CYAN,ON)
 
 # Readonly form item color
 form_item_readonly_color = (CYAN,WHITE,ON)
+
+# Dialog box gauge color
+gauge_color = (BLUE,WHITE,ON)
diff --git a/samples/textbox-both b/samples/textbox-both
new file mode 100755
index 000000000000..787515312037
--- /dev/null
+++ b/samples/textbox-both
@@ -0,0 +1,21 @@
+#!/bin/sh
+# $Id: textbox-both,v 1.1 2011/01/18 09:59:47 tom Exp $
+
+. ./setup-vars
+
+. ./setup-tempfile
+
+TEXT=/usr/share/common-licenses/GPL
+test -f $TEXT || TEXT=../COPYING
+
+cat textbox.txt | expand > $tempfile
+cat $TEXT | expand >> $tempfile
+
+$DIALOG --clear --title "TEXT BOX" \
+	--help-button \
+	--extra-button "$@" \
+	--textbox "$tempfile" 22 77
+
+retval=$?
+
+. ./report-button
diff --git a/samples/textbox-help b/samples/textbox-help
new file mode 100755
index 000000000000..cb30253111b8
--- /dev/null
+++ b/samples/textbox-help
@@ -0,0 +1,20 @@
+#!/bin/sh
+# $Id: textbox-help,v 1.1 2011/01/18 09:59:20 tom Exp $
+
+. ./setup-vars
+
+. ./setup-tempfile
+
+TEXT=/usr/share/common-licenses/GPL
+test -f $TEXT || TEXT=../COPYING
+
+cat textbox.txt | expand > $tempfile
+cat $TEXT | expand >> $tempfile
+
+$DIALOG --clear --title "TEXT BOX" \
+	--help-button "$@" \
+	--textbox "$tempfile" 22 77
+
+retval=$?
+
+. ./report-button
diff --git a/samples/whiptail.rc b/samples/whiptail.rc
index 47d5032a733d..85150127f48e 100644
--- a/samples/whiptail.rc
+++ b/samples/whiptail.rc
@@ -1,5 +1,13 @@
-# $Id: whiptail.rc,v 1.2 2005/12/01 01:21:31 tom Exp $
+# $Id: whiptail.rc,v 1.3 2011/01/17 00:15:54 tom Exp $
+# vile:confmode
 # Run-time configuration file for dialog, matches whiptail's color scheme.
+#
+# Types of values:
+#
+# Number     -  <number>
+# String     -  "string"
+# Boolean    -  <ON|OFF>
+# Attribute  -  (foreground,background,highlight?)
 
 # Set aspect-ration.
 aspect = 0
@@ -114,3 +122,9 @@ form_active_text_color = (WHITE,BLUE,ON)
 
 # Form text color
 form_text_color = (WHITE,CYAN,ON)
+
+# Readonly form item color
+form_item_readonly_color = (CYAN,WHITE,ON)
+
+# Dialog box gauge color
+gauge_color = (BLUE,WHITE,ON)
diff --git a/tailbox.c b/tailbox.c
index 51db836f471d..3499b4bc0eac 100644
--- a/tailbox.c
+++ b/tailbox.c
@@ -1,9 +1,9 @@
 /*
- *  $Id: tailbox.c,v 1.56 2010/04/28 20:52:20 tom Exp $
+ *  $Id: tailbox.c,v 1.61 2011/01/16 21:48:16 tom Exp $
  *
- * tailbox.c -- implements the tail box
+ *  tailbox.c -- implements the tail box
  *
- * Copyright 2000-2009,2010 Thomas E. Dickey
+ *  Copyright 2000-2010,2011	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
@@ -26,6 +26,7 @@
 
 #include <dialog.h>
 #include <dlg_keys.h>
+#include <sys/stat.h>
 
 typedef struct {
     DIALOG_CALLBACK obj;
@@ -34,6 +35,7 @@ typedef struct {
     int hscroll;
     int old_hscroll;
     char line[MAX_LEN + 1];
+    off_t last_pos;
 } MY_OBJ;
 
 /*
@@ -106,14 +108,15 @@ static void
 last_lines(MY_OBJ * obj, int target)
 {
     FILE *fp = obj->obj.input;
-    long inx;
+    size_t inx;
     int count = 0;
     char buf[BUFSIZ + 1];
-    long size_to_read;
+    size_t size_to_read;
+    size_t size_as_read;
     long offset = 0;
     long fpos = 0;
 
-    if (fseek(fp, 0, SEEK_END) == -1
+    if (fseek(fp, 0L, SEEK_END) == -1
 	|| (fpos = ftell(fp)) < 0)
 	dlg_exiterr("Error moving file pointer in last_lines().");
 
@@ -123,21 +126,27 @@ last_lines(MY_OBJ * obj, int target)
 	    if (fpos >= BUFSIZ) {
 		size_to_read = BUFSIZ;
 	    } else {
-		size_to_read = fpos;
+		size_to_read = (size_t) fpos;
 	    }
-	    fpos = fpos - size_to_read;
+	    fpos = fpos - (long) size_to_read;
 	    if (fseek(fp, fpos, SEEK_SET) == -1)
 		dlg_exiterr("Error moving file pointer in last_lines().");
-	    (void) fread(buf, (size_t) size_to_read, 1, fp);
+	    size_as_read = fread(buf, sizeof(char), size_to_read, fp);
 	    if (ferror(fp))
 		dlg_exiterr("Error reading file in last_lines().");
 
-	    offset += size_to_read;
-	    for (inx = size_to_read - 1; inx >= 0; --inx) {
+	    if (size_as_read == 0) {
+		fpos = 0;
+		offset = 0;
+		break;
+	    }
+
+	    offset += (long) size_as_read;
+	    for (inx = size_as_read - 1; inx != 0; --inx) {
 		if (buf[inx] == '\n') {
 		    if (++count > target)
 			break;
-		    offset = inx + 1;
+		    offset = (long) (inx + 1);
 		}
 	    }
 
@@ -181,16 +190,35 @@ print_last_page(MY_OBJ * obj)
 static void
 repaint_text(MY_OBJ * obj)
 {
+    FILE *fp = obj->obj.input;
     int cur_y, cur_x;
 
     getyx(obj->obj.win, cur_y, cur_x);
     obj->old_hscroll = obj->hscroll;
+
     print_last_page(obj);
+    obj->last_pos = ftell(fp);
+
     (void) wmove(obj->obj.win, cur_y, cur_x);	/* Restore cursor position */
     wrefresh(obj->obj.win);
 }
 
 static bool
+handle_input(DIALOG_CALLBACK * cb)
+{
+    MY_OBJ *obj = (MY_OBJ *) cb;
+    FILE *fp = obj->obj.input;
+    struct stat sb;
+
+    if (fstat(fileno(fp), &sb) == 0
+	&& sb.st_size != obj->last_pos) {
+	repaint_text(obj);
+    }
+
+    return TRUE;
+}
+
+static bool
 handle_my_getc(DIALOG_CALLBACK * cb, int ch, int fkey, int *result)
 {
     MY_OBJ *obj = (MY_OBJ *) cb;
@@ -231,8 +259,8 @@ handle_my_getc(DIALOG_CALLBACK * cb, int ch, int fkey, int *result)
 	    clearerr(cb->input);
 	    ch = getc(cb->input);
 	    (void) ungetc(ch, cb->input);
-	    if ((ch != EOF) || (obj->hscroll != obj->old_hscroll)) {
-		repaint_text(obj);
+	    if (ch != EOF) {
+		handle_input(cb);
 	    }
 	    break;
 	case ESC:
@@ -327,6 +355,7 @@ dialog_tailbox(const char *title, const char *file, int height, int width, int b
     obj->obj.input = fd;
     obj->obj.win = dialog;
     obj->obj.handle_getc = handle_my_getc;
+    obj->obj.handle_input = bg_task ? handle_input : 0;
     obj->obj.keep_bg = bg_task && dialog_vars.cant_kill;
     obj->obj.bg_task = bg_task;
     obj->text = text;
diff --git a/textbox.c b/textbox.c
index 5b8c5aade80e..f9a19ebf74d2 100644
--- a/textbox.c
+++ b/textbox.c
@@ -1,9 +1,9 @@
 /*
- *  $Id: textbox.c,v 1.97 2010/04/28 21:03:44 tom Exp $
+ *  $Id: textbox.c,v 1.99 2011/01/16 22:20:34 tom Exp $
  *
- * textbox.c -- implements the text box
+ *  textbox.c -- implements the text box
  *
- * Copyright 2000-2009,2010 Thomas E.  Dickey
+ *  Copyright 2000-2010,2011	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
@@ -72,7 +72,7 @@ lseek_obj(MY_OBJ * obj, long offset, int mode)
 static long
 ftell_obj(MY_OBJ * obj)
 {
-    return lseek_obj(obj, 0, SEEK_CUR);
+    return lseek_obj(obj, 0L, SEEK_CUR);
 }
 
 static char *
@@ -309,7 +309,7 @@ back_lines(MY_OBJ * obj, long n)
 		/* Really possible to move backward BUF_SIZE/2 bytes? */
 		if (fpos < BUF_SIZE / 2 + obj->fd_bytes_read) {
 		    /* No, move less than */
-		    lseek_obj(obj, 0, SEEK_SET);
+		    lseek_obj(obj, 0L, SEEK_SET);
 		    val_to_tabize = fpos - obj->fd_bytes_read;
 		} else {	/* Move backward BUF_SIZE/2 bytes */
 		    lseek_obj(obj, -(BUF_SIZE / 2 + obj->fd_bytes_read), SEEK_CUR);
@@ -340,7 +340,7 @@ back_lines(MY_OBJ * obj, long n)
 		    /* Really possible to move backward BUF_SIZE/2 bytes? */
 		    if (fpos < BUF_SIZE / 2 + obj->fd_bytes_read) {
 			/* No, move less than */
-			lseek_obj(obj, 0, SEEK_SET);
+			lseek_obj(obj, 0L, SEEK_SET);
 			val_to_tabize = fpos - obj->fd_bytes_read;
 		    } else {	/* Move backward BUF_SIZE/2 bytes */
 			lseek_obj(obj, -(BUF_SIZE / 2 + obj->fd_bytes_read), SEEK_CUR);
@@ -465,7 +465,7 @@ get_search_term(WINDOW *dialog, char *input, int height, int width)
     int fkey = 0;
     bool first = TRUE;
     int result = DLG_EXIT_UNKNOWN;
-    char *caption = _("Search");
+    const char *caption = _("Search");
     int len_caption = dlg_count_columns(caption);
     const int *indx;
     int limit;
@@ -590,7 +590,7 @@ perform_search(MY_OBJ * obj, int height, int width, int key, char *search_term)
 	    while ((found = match_string(obj, search_term)) == FALSE) {
 		if (obj->begin_reached)
 		    break;
-		back_lines(obj, 2);
+		back_lines(obj, 2L);
 	    }
 	}
 	if (found == FALSE) {	/* not found */
@@ -609,7 +609,7 @@ perform_search(MY_OBJ * obj, int height, int width, int key, char *search_term)
 	     */
 	    back_lines(obj, obj->page_length);
 	} else {		/* Search term found */
-	    back_lines(obj, 1);
+	    back_lines(obj, 1L);
 	}
 	/* Reprint page */
 	wattrset(obj->text, dialog_attr);
@@ -691,10 +691,10 @@ dialog_textbox(const char *title, const char *file, int height, int width)
 
     /* Get file size. Actually, 'file_size' is the real file size - 1,
        since it's only the last byte offset from the beginning */
-    obj.file_size = lseek_obj(&obj, 0, SEEK_END);
+    obj.file_size = lseek_obj(&obj, 0L, SEEK_END);
 
     /* Restore file pointer to beginning of file after getting file size */
-    lseek_obj(&obj, 0, SEEK_SET);
+    lseek_obj(&obj, 0L, SEEK_SET);
 
     read_high(&obj, BUF_SIZE);
 
@@ -829,7 +829,7 @@ dialog_textbox(const char *title, const char *file, int height, int width)
 
 		    if (fpos > obj.fd_bytes_read) {
 			/* Yes, we have to read it in */
-			lseek_obj(&obj, 0, SEEK_SET);
+			lseek_obj(&obj, 0L, SEEK_SET);
 
 			read_high(&obj, BUF_SIZE);
 		    }
@@ -849,7 +849,7 @@ dialog_textbox(const char *title, const char *file, int height, int width)
 		    read_high(&obj, BUF_SIZE);
 		}
 		obj.in_buf = obj.bytes_read;
-		back_lines(&obj, PAGE_LENGTH);
+		back_lines(&obj, (long) PAGE_LENGTH);
 		moved = TRUE;
 		break;
 	    case DLGK_GRID_UP:	/* Previous line */
diff --git a/timebox.c b/timebox.c
index acea1c2f48d7..63bffd8daca7 100644
--- a/timebox.c
+++ b/timebox.c
@@ -1,9 +1,9 @@
 /*
- * $Id: timebox.c,v 1.41 2010/01/18 10:33:42 tom Exp $
+ * $Id: timebox.c,v 1.43 2011/01/18 01:07:45 Garrett.Cooper Exp $
  *
  *  timebox.c -- implements the timebox dialog
  *
- *  Copyright 2001-2009,2010   Thomas E. Dickey
+ *  Copyright 2001-2010,2011   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
@@ -97,6 +97,8 @@ init_object(BOX * data,
 	    int period, int value,
 	    int code)
 {
+    (void) code;
+
     data->parent = parent;
     data->x = x;
     data->y = y;
@@ -210,6 +212,11 @@ dialog_timebox(const char *title,
     dialog = dlg_new_window(height, width,
 			    dlg_box_y_ordinate(height),
 			    dlg_box_x_ordinate(width));
+
+    if (hour >= 24 || minute >= 60 || second >= 60) {
+	return CleanupResult(DLG_EXIT_ERROR, dialog, prompt, &save_vars);
+    }
+
     dlg_register_window(dialog, "timebox", binding);
     dlg_register_buttons(dialog, "timebox", buttons);
 
diff --git a/trace.c b/trace.c
index 6148ee8bc67d..b7ca87d55785 100644
--- a/trace.c
+++ b/trace.c
@@ -1,9 +1,9 @@
 /*
- *  $Id: trace.c,v 1.11 2010/01/17 15:36:26 tom Exp $
+ *  $Id: trace.c,v 1.12 2011/01/13 01:36:34 tom Exp $
  *
  *  trace.c -- implements screen-dump and keystroke-logging
  *
- *  Copyright 2007-2008,2010	Thomas E. Dickey
+ *  Copyright 2007-2010,2011	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,13 @@
 
 #define myFP dialog_state.trace_output
 
+static void
+dlg_trace_time(const char *tag)
+{
+    time_t now = time((time_t *) 0);
+    fprintf(myFP, "%s %s", tag, ctime(&now));
+}
+
 void
 dlg_trace_msg(const char *fmt,...)
 {
@@ -115,6 +122,8 @@ dlg_trace_chr(int ch, int fkey)
 		    CASE(DLGK_TRACE);
 		}
 	    }
+	} else if (ch == ERR) {
+	    fkey_name = "ERR";
 	} else {
 	    fkey_name = unctrl((chtype) ch);
 	    if (fkey_name == 0)
@@ -134,13 +143,11 @@ dlg_trace(const char *fname)
 	if (myFP == 0) {
 	    myFP = fopen(fname, "a");
 	    if (myFP != 0) {
-		time_t now = time((time_t *) 0);
-		fprintf(myFP, "** opened at %s", ctime(&now));
+		dlg_trace_time("** opened at");
 	    }
 	}
     } else if (myFP != 0) {
-	time_t now = time((time_t *) 0);
-	fprintf(myFP, "** closed at %s", ctime(&now));
+	dlg_trace_time("** closed at");
 	fclose(myFP);
 	myFP = 0;
     }
diff --git a/ui_getc.c b/ui_getc.c
index bce890c630b5..4298d8a212da 100644
--- a/ui_getc.c
+++ b/ui_getc.c
@@ -1,9 +1,9 @@
 /*
- *  $Id: ui_getc.c,v 1.48 2010/01/18 10:24:06 tom Exp $
+ *  $Id: ui_getc.c,v 1.59 2011/02/28 10:56:15 tom Exp $
  *
- * ui_getc.c - user interface glue for getc()
+ *  ui_getc.c - user interface glue for getc()
  *
- * Copyright 2001-2009,2010 Thomas E. Dickey
+ *  Copyright 2001-2010,2011	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
@@ -119,24 +119,105 @@ dlg_remove_callback(DIALOG_CALLBACK * p)
 }
 
 /*
- * FIXME: this could be replaced by a select/poll on several file descriptors
+ * A select() might find more than one input ready for service.  Handle them
+ * all.
+ */
+static bool
+handle_inputs(WINDOW *win)
+{
+    bool result = FALSE;
+    DIALOG_CALLBACK *p;
+    DIALOG_CALLBACK *q;
+    int cur_y, cur_x;
+    int state = ERR;
+
+    getyx(win, cur_y, cur_x);
+    for (p = dialog_state.getc_callbacks, q = 0; p != 0; p = q) {
+	q = p->next;
+	if ((p->handle_input != 0) && p->input_ready) {
+	    p->input_ready = FALSE;
+	    if (state == ERR) {
+		state = curs_set(0);
+	    }
+	    if (p->handle_input(p)) {
+		result = TRUE;
+	    }
+	}
+    }
+    if (result) {
+	(void) wmove(win, cur_y, cur_x);	/* Restore cursor position */
+	wrefresh(win);
+	curs_set(state);
+    }
+    return result;
+}
+
+static bool
+may_handle_inputs(void)
+{
+    bool result = FALSE;
+
+    DIALOG_CALLBACK *p;
+
+    for (p = dialog_state.getc_callbacks; p != 0; p = p->next) {
+	if (p->input != 0) {
+	    result = TRUE;
+	    break;
+	}
+    }
+
+    return result;
+}
+
+/*
+ * Check any any inputs registered via callbacks, to see if there is any input
+ * available.  If there is, return a file-descriptor which should be read. 
+ * Otherwise, return -1.
  */
 static int
-dlg_getc_ready(DIALOG_CALLBACK * p)
+check_inputs(void)
 {
+    DIALOG_CALLBACK *p;
     fd_set read_fds;
-    int fd = fileno(p->input);
     struct timeval test;
+    int last_fd = -1;
+    int fd;
+    int found;
+    int result = -1;
+
+    if ((p = dialog_state.getc_callbacks) != 0) {
+	FD_ZERO(&read_fds);
+
+	while (p != 0) {
+	    p->input_ready = FALSE;
+	    if (p->input != 0 && (fd = fileno(p->input)) >= 0) {
+		FD_SET(fd, &read_fds);
+		if (last_fd < fd)
+		    last_fd = fd;
+	    }
+	    p = p->next;
+	}
 
-    FD_ZERO(&read_fds);
-    FD_SET(fd, &read_fds);
+	test.tv_sec = 0;
+	test.tv_usec = WTIMEOUT_VAL * 1000;
+	found = select(last_fd + 1, &read_fds,
+		       (fd_set *) 0,
+		       (fd_set *) 0,
+		       &test);
+
+	if (found > 0) {
+	    for (p = dialog_state.getc_callbacks; p != 0; p = p->next) {
+		if (p->input != 0
+		    && (fd = fileno(p->input)) >= 0
+		    && FD_ISSET(fd, &read_fds)) {
+		    p->input_ready = TRUE;
+		    result = fd;
+		}
+	    }
+	}
+    }
 
-    test.tv_sec = 0;		/* Seconds.  */
-    test.tv_usec = (isatty(fd)	/* Microseconds.  */
-		    ? (WTIMEOUT_VAL * 1000)
-		    : 1);
-    return (select(fd + 1, &read_fds, (fd_set *) 0, (fd_set *) 0, &test) == 1)
-	&& (FD_ISSET(fd, &read_fds));
+    return result;
 }
 
 int
@@ -146,14 +227,16 @@ dlg_getc_callbacks(int ch, int fkey, int *result)
     DIALOG_CALLBACK *p, *q;
 
     if ((p = dialog_state.getc_callbacks) != 0) {
-	do {
-	    q = p->next;
-	    if (dlg_getc_ready(p)) {
-		if (!(p->handle_getc(p, ch, fkey, result))) {
-		    dlg_remove_callback(p);
+	if (check_inputs() >= 0) {
+	    do {
+		q = p->next;
+		if (p->input_ready) {
+		    if (!(p->handle_getc(p, ch, fkey, result))) {
+			dlg_remove_callback(p);
+		    }
 		}
-	    }
-	} while ((p = q) != 0);
+	    } while ((p = q) != 0);
+	}
 	code = (dialog_state.getc_callbacks != 0);
     }
     return code;
@@ -219,6 +302,89 @@ valid_file(FILE *fp)
     return code;
 }
 
+static int
+really_getch(WINDOW *win, int *fkey)
+{
+    int ch;
+#ifdef USE_WIDE_CURSES
+    int code;
+    mbstate_t state;
+    wchar_t my_wchar;
+    wint_t my_wint;
+
+    /*
+     * We get a wide character, translate it to multibyte form to avoid
+     * having to change the rest of the code to use wide-characters.
+     */
+    if (used_last_getc >= have_last_getc) {
+	used_last_getc = 0;
+	have_last_getc = 0;
+	ch = ERR;
+	*fkey = 0;
+	code = wget_wch(win, &my_wint);
+	my_wchar = (wchar_t) my_wint;
+	switch (code) {
+	case KEY_CODE_YES:
+	    ch = *fkey = my_wchar;
+	    last_getc = my_wchar;
+	    break;
+	case OK:
+	    memset(&state, 0, sizeof(state));
+	    have_last_getc = (int) wcrtomb(last_getc_bytes, my_wchar, &state);
+	    if (have_last_getc < 0) {
+		have_last_getc = used_last_getc = 0;
+		last_getc_bytes[0] = (char) my_wchar;
+	    }
+	    ch = (int) CharOf(last_getc_bytes[used_last_getc++]);
+	    last_getc = my_wchar;
+	    break;
+	case ERR:
+	    ch = ERR;
+	    last_getc = ERR;
+	    break;
+	default:
+	    break;
+	}
+    } else {
+	ch = (int) CharOf(last_getc_bytes[used_last_getc++]);
+    }
+#else
+    ch = wgetch(win);
+    last_getc = ch;
+    *fkey = (ch > KEY_MIN && ch < KEY_MAX);
+#endif
+    return ch;
+}
+
+static DIALOG_CALLBACK *
+next_callback(DIALOG_CALLBACK * p)
+{
+    if ((p = dialog_state.getc_redirect) != 0) {
+	p = p->next;
+    } else {
+	p = dialog_state.getc_callbacks;
+    }
+    return p;
+}
+
+static DIALOG_CALLBACK *
+prev_callback(DIALOG_CALLBACK * p)
+{
+    DIALOG_CALLBACK *q;
+
+    if ((p = dialog_state.getc_redirect) != 0) {
+	if (p == dialog_state.getc_callbacks) {
+	    for (p = dialog_state.getc_callbacks; p->next != 0; p = p->next) ;
+	} else {
+	    for (q = dialog_state.getc_callbacks; q->next != p; q = q->next) ;
+	    p = q;
+	}
+    } else {
+	p = dialog_state.getc_callbacks;
+    }
+    return p;
+}
+
 /*
  * Read a character from the given window.  Handle repainting here (to simplify
  * things in the calling application).  Also, if input-callback(s) are set up,
@@ -234,64 +400,21 @@ dlg_getc(WINDOW *win, int *fkey)
     int result;
     bool done = FALSE;
     bool literal = FALSE;
-    DIALOG_CALLBACK *p;
-    int interval = dialog_vars.timeout_secs;
+    DIALOG_CALLBACK *p = 0;
+    int interval = (dialog_vars.timeout_secs * 1000);
     time_t expired = time((time_t *) 0) + dialog_vars.timeout_secs;
     time_t current;
 
-    if (dialog_state.getc_callbacks != 0)
+    if (may_handle_inputs())
 	wtimeout(win, WTIMEOUT_VAL);
     else if (interval > 0)
 	wtimeout(win, interval);
 
     while (!done) {
-#ifdef USE_WIDE_CURSES
-	int code;
-	mbstate_t state;
-	wchar_t my_wchar;
-	wint_t my_wint;
-
 	/*
-	 * We get a wide character, translate it to multibyte form to avoid
-	 * having to change the rest of the code to use wide-characters.
+	 * If there was no pending file-input, check the keyboard.
 	 */
-	if (used_last_getc >= have_last_getc) {
-	    used_last_getc = 0;
-	    have_last_getc = 0;
-	    ch = ERR;
-	    *fkey = 0;
-	    code = wget_wch(win, &my_wint);
-	    my_wchar = (wchar_t) my_wint;
-	    switch (code) {
-	    case KEY_CODE_YES:
-		ch = *fkey = my_wchar;
-		last_getc = my_wchar;
-		break;
-	    case OK:
-		memset(&state, 0, sizeof(state));
-		have_last_getc = (int) wcrtomb(last_getc_bytes, my_wchar, &state);
-		if (have_last_getc < 0) {
-		    have_last_getc = used_last_getc = 0;
-		    last_getc_bytes[0] = (char) my_wchar;
-		}
-		ch = (int) CharOf(last_getc_bytes[used_last_getc++]);
-		last_getc = my_wchar;
-		break;
-	    case ERR:
-		ch = ERR;
-		last_getc = ERR;
-		break;
-	    default:
-		break;
-	    }
-	} else {
-	    ch = (int) CharOf(last_getc_bytes[used_last_getc++]);
-	}
-#else
-	ch = wgetch(win);
-	last_getc = ch;
-	*fkey = (ch > KEY_MIN && ch < KEY_MAX);
-#endif
+	ch = really_getch(win, fkey);
 	if (literal) {
 	    done = TRUE;
 	    continue;
@@ -320,32 +443,38 @@ dlg_getc(WINDOW *win, int *fkey)
 		&& current >= expired) {
 		dlg_exiterr("timeout");
 	    }
-	    if (dlg_getc_callbacks(ch, *fkey, &result)) {
-		dlg_raise_window(win);
-	    } else {
-		done = (interval <= 0);
-	    }
 	    if (!valid_file(stdin)
 		|| !valid_file(dialog_state.screen_output)) {
 		ch = ESC;
 		done = TRUE;
+	    } else if (check_inputs()) {
+		if (handle_inputs(win))
+		    dlg_raise_window(win);
+		else
+		    done = TRUE;
+	    } else {
+		done = (interval <= 0);
 	    }
 	    break;
+	case DLGK_FIELD_PREV:
+	    /* FALLTHRU */
+	case KEY_BTAB:
+	    /* FALLTHRU */
 	case DLGK_FIELD_NEXT:
 	    /* FALLTHRU */
 	case TAB:
-	    /* Handle tab as a special case for traversing between the nominal
-	     * "current" window, and other windows having callbacks.  If the
-	     * nominal (control) window closes, we'll close the windows with
-	     * callbacks.
+	    /* Handle tab/backtab as a special case for traversing between the
+	     * nominal "current" window, and other windows having callbacks. 
+	     * If the nominal (control) window closes, we'll close the windows
+	     * with callbacks.
 	     */
 	    if (dialog_state.getc_callbacks != 0 &&
-		before_lookup == TAB) {
-		if ((p = dialog_state.getc_redirect) != 0) {
-		    p = p->next;
-		} else {
-		    p = dialog_state.getc_callbacks;
-		}
+		(before_lookup == TAB ||
+		 before_lookup == KEY_BTAB)) {
+		if (before_lookup == TAB)
+		    p = next_callback(p);
+		else
+		    p = prev_callback(p);
 		if ((dialog_state.getc_redirect = p) != 0) {
 		    win = p->win;
 		} else {
diff --git a/util.c b/util.c
index 5559052faf93..8496330a3db3 100644
--- a/util.c
+++ b/util.c
@@ -1,9 +1,9 @@
 /*
- *  $Id: util.c,v 1.201 2010/04/28 21:12:42 tom Exp $
+ *  $Id: util.c,v 1.211 2011/01/19 00:31:43 tom Exp $
  *
  *  util.c -- miscellaneous utilities for dialog
  *
- *  Copyright 2000-2008,2010	Thomas E. Dickey
+ *  Copyright 2000-2010,2011	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
@@ -99,7 +99,8 @@ DIALOG_COLORS dlg_color_table[] =
     DATA(A_NORMAL,	ITEMHELP,		itemhelp, "Item help-text"),
     DATA(A_BOLD,	FORM_ACTIVE_TEXT,	form_active_text, "Active form text"),
     DATA(A_REVERSE,	FORM_TEXT,		form_text, "Form text"),
-    DATA(A_NORMAL,	FORM_ITEM_READONLY,	form_item_readonly, "Readonly form item") 
+    DATA(A_NORMAL,	FORM_ITEM_READONLY,	form_item_readonly, "Readonly form item"),
+    DATA(A_REVERSE,	GAUGE,			gauge, "Dialog box gauge")
 };
 /* *INDENT-ON* */
 
@@ -327,7 +328,11 @@ init_dialog(FILE *input, FILE *output)
     (void) keypad(stdscr, TRUE);
     (void) cbreak();
     (void) noecho();
-    mouse_open();
+
+    if (!dialog_state.no_mouse) {
+	mouse_open();
+    }
+
     dialog_state.screen_initialized = TRUE;
 
 #ifdef HAVE_COLOR
@@ -399,6 +404,24 @@ dlg_color_count(void)
 }
 
 /*
+ * Wrapper for getattrs(), or the more cumbersome X/Open wattr_get().
+ */
+chtype
+dlg_get_attrs(WINDOW *win)
+{
+    chtype result;
+#ifdef HAVE_GETATTRS
+    result = getattrs(win);
+#else
+    attr_t my_result;
+    short my_pair;
+    wattr_get(win, &my_result, &my_pair, NULL);
+    result = my_result;
+#endif
+    return result;
+}
+
+/*
  * Reuse color pairs (they are limited), returning a COLOR_PAIR() value if we
  * have (or can) define a pair with the given color as foreground on the
  * window's defined background.
@@ -436,7 +459,7 @@ dlg_color_pair(int foreground, int background)
 static chtype
 define_color(WINDOW *win, int foreground)
 {
-    chtype attrs = getattrs(win);
+    chtype attrs = dlg_get_attrs(win);
     int pair;
     short fg, bg, background;
 
@@ -487,6 +510,34 @@ centered(int width, const char *string)
     return left;
 }
 
+#ifdef USE_WIDE_CURSES
+static bool
+is_combining(const char *txt, int *combined)
+{
+    bool result = FALSE;
+
+    if (*combined == 0) {
+	if (UCH(*txt) >= 128) {
+	    wchar_t wch;
+	    mbstate_t state;
+	    size_t given = strlen(txt);
+	    size_t len;
+
+	    memset(&state, 0, sizeof(state));
+	    len = mbrtowc(&wch, txt, given, &state);
+	    if ((int) len > 0 && wcwidth(wch) == 0) {
+		*combined = (int) len - 1;
+		result = TRUE;
+	    }
+	}
+    } else {
+	result = TRUE;
+	*combined -= 1;
+    }
+    return result;
+}
+#endif
+
 /*
  * Print up to 'cols' columns from 'text', optionally rendering our escape
  * sequence for attributes and color.
@@ -501,6 +552,9 @@ dlg_print_text(WINDOW *win, const char *txt, int cols, chtype *attr)
     bool thisTab;
     bool ended = FALSE;
     chtype useattr;
+#ifdef USE_WIDE_CURSES
+    int combined = 0;
+#endif
 
     getyx(win, y_origin, x_origin);
     while (cols > 0 && (*txt != '\0')) {
@@ -582,7 +636,12 @@ dlg_print_text(WINDOW *win, const char *txt, int cols, chtype *attr)
 	getyx(win, y_after, x_after);
 	if (thisTab && (y_after == y_origin))
 	    tabbed += (x_after - x_before);
-	if (y_after != y_origin || x_after >= cols + tabbed + x_origin) {
+	if ((y_after != y_origin) ||
+	    (x_after >= (cols + tabbed + x_origin)
+#ifdef USE_WIDE_CURSES
+	     && !is_combining(txt, &combined)
+#endif
+	    )) {
 	    ended = TRUE;
 	}
     }
@@ -656,6 +715,14 @@ dlg_print_line(WINDOW *win,
 	wrap_inx = test_inx;
     }
     wrap_ptr = prompt + indx[wrap_inx];
+#ifdef USE_WIDE_CURSES
+    if (UCH(*wrap_ptr) >= 128) {
+	int combined = 0;
+	while (is_combining(wrap_ptr, &combined)) {
+	    ++wrap_ptr;
+	}
+    }
+#endif
 
     /*
      * Print the line if we have a window pointer.  Otherwise this routine
@@ -774,6 +841,8 @@ dlg_print_scrolled(WINDOW *win,
     int oldy, oldx;
     int last = 0;
 
+    (void) pauseopt;		/* used only for ncurses */
+
     getyx(win, oldy, oldx);
 #ifdef NCURSES_VERSION
     if (pauseopt) {
@@ -1105,12 +1174,12 @@ dlg_auto_sizefile(const char *title,
 		offset++;
 
 	if (offset > len)
-	    len = offset;
+	    len = (int) offset;
 
 	count++;
     }
 
-    /* now 'count' has the number of lines of fd and 'len' the max lenght */
+    /* now 'count' has the number of lines of fd and 'len' the max length */
 
     *height = MIN(SLINES, count + numlines + boxlines);
     *width = MIN(SCOLS, MAX((len + nc), mincols));
@@ -1142,7 +1211,7 @@ dlg_draw_box(WINDOW *win, int y, int x, int height, int width,
 	     chtype boxchar, chtype borderchar)
 {
     int i, j;
-    chtype save = getattrs(win);
+    chtype save = dlg_get_attrs(win);
 
     wattrset(win, 0);
     for (i = 0; i < height; i++) {
@@ -1179,7 +1248,7 @@ static void
 draw_childs_shadow(WINDOW *parent, WINDOW *child)
 {
     if (has_colors()) {		/* Whether terminal supports color? */
-	chtype save = getattrs(parent);
+	chtype save = dlg_get_attrs(parent);
 
 	dlg_draw_shadow(parent,
 			getbegy(child) - getbegy(parent),
@@ -1254,7 +1323,7 @@ dlg_exit(int code)
 	    if ((name = getenv(table[n].name)) != 0) {
 		value = strtol(name, &temp, 0);
 		if (temp != 0 && temp != name && *temp == '\0') {
-		    code = value;
+		    code = (int) value;
 		    overridden = TRUE;
 		}
 	    }
@@ -1509,7 +1578,7 @@ dlg_draw_title(WINDOW *win, const char *title)
 {
     if (title != NULL) {
 	chtype attr = A_NORMAL;
-	chtype save = getattrs(win);
+	chtype save = dlg_get_attrs(win);
 	int x = centered(getmaxx(win), title);
 
 	wattrset(win, title_attr);
@@ -1920,7 +1989,7 @@ dlg_clr_result(void)
 char *
 dlg_set_result(const char *string)
 {
-    unsigned need = string ? strlen(string) + 1 : 0;
+    unsigned need = string ? (unsigned) strlen(string) + 1 : 0;
 
     /* inputstr.c needs a fixed buffer */
     if (need < MAX_LEN)
@@ -1953,9 +2022,9 @@ void
 dlg_add_result(const char *string)
 {
     unsigned have = (dialog_vars.input_result
-		     ? strlen(dialog_vars.input_result)
+		     ? (unsigned) strlen(dialog_vars.input_result)
 		     : 0);
-    unsigned want = strlen(string) + 1 + have;
+    unsigned want = (unsigned) strlen(string) + 1 + have;
 
     if ((want >= MAX_LEN)
 	|| (dialog_vars.input_length != 0)
@@ -1964,14 +2033,14 @@ dlg_add_result(const char *string)
 	if (dialog_vars.input_length == 0
 	    || dialog_vars.input_result == 0) {
 
-	    char *save = dialog_vars.input_result;
+	    char *save_result = dialog_vars.input_result;
 
 	    dialog_vars.input_length = want * 2;
 	    dialog_vars.input_result = dlg_malloc(char, dialog_vars.input_length);
 	    assert_ptr(dialog_vars.input_result, "dlg_add_result malloc");
-	    dialog_vars.input_result[0] = 0;
-	    if (save != 0)
-		strcpy(dialog_vars.input_result, save);
+	    dialog_vars.input_result[0] = '\0';
+	    if (save_result != 0)
+		strcpy(dialog_vars.input_result, save_result);
 	} else if (want >= dialog_vars.input_length) {
 	    dialog_vars.input_length = want * 2;
 	    dialog_vars.input_result = dlg_realloc(char,
@@ -2008,7 +2077,7 @@ must_quote(char *string)
     bool code = FALSE;
 
     if (*string != '\0') {
-	unsigned len = strlen(string);
+	size_t len = strlen(string);
 	if (strcspn(string, quote_delimiter()) != len)
 	    code = TRUE;
 	else if (strcspn(string, "\n\t ") != len)
@@ -2096,10 +2165,20 @@ dlg_save_vars(DIALOG_VARS * vars)
     *vars = dialog_vars;
 }
 
+/*
+ * Most of the data in DIALOG_VARS is normally set by command-line options.
+ * The input_result member is an exception; it is normally set by the dialog
+ * library to return result values.
+ */
 void
 dlg_restore_vars(DIALOG_VARS * vars)
 {
+    char *save_result = dialog_vars.input_result;
+    unsigned save_length = dialog_vars.input_length;
+
     dialog_vars = *vars;
+    dialog_vars.input_result = save_result;
+    dialog_vars.input_length = save_length;
 }
 
 /*