dialog 1.1-20100119

git-svn-id: svn://tug.org/texlive/trunk@16796 c570f23f-e606-0410-a88d-b1316a301751

324 files changed, 10641 insertions, 4710 deletions

diff --git a/Build/source/utils/README b/Build/source/utils/README
index 9439d2efcff..b72a334a539 100644
--- a/Build/source/utils/README
+++ b/Build/source/utils/README
@@ -10,7 +10,7 @@ asymptote 1.88 - checked 2oct09
   see http://tug.org/texlive/build.html#asymptote
   and tlpkg/bin/tl-update/asy
 
-dialog 1.1-20080819 - checked 20mar09
+dialog 1.1-20100119 - checked 21jan10
   ftp://invisible-island.net/dialog/dialog.tar.gz
 
 pdfopen 0.5 - checked 26nov06
diff --git a/Build/source/utils/dialog/configure b/Build/source/utils/dialog/configure
index 9e3a7f1bad3..5d45f6f67fe 100755
--- a/Build/source/utils/dialog/configure
+++ b/Build/source/utils/dialog/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for dialog for TeX Live 1.1-20080819.
+# Generated by GNU Autoconf 2.65 for dialog for TeX Live 1.1-20100119.
 #
 # Report bugs to <peb@mppmu.mpg.de>.
 #
@@ -551,12 +551,12 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='dialog for TeX Live'
 PACKAGE_TARNAME='dialog-for-tex-live'
-PACKAGE_VERSION='1.1-20080819'
-PACKAGE_STRING='dialog for TeX Live 1.1-20080819'
+PACKAGE_VERSION='1.1-20100119'
+PACKAGE_STRING='dialog for TeX Live 1.1-20100119'
 PACKAGE_BUGREPORT='peb@mppmu.mpg.de'
 PACKAGE_URL=''
 
-ac_unique_file="dialog-1.1-20080819/dialog.c"
+ac_unique_file="dialog-1.1-20100119/dialog.c"
 enable_option_checking=no
 ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
@@ -1199,7 +1199,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures dialog for TeX Live 1.1-20080819 to adapt to many kinds of systems.
+\`configure' configures dialog for TeX Live 1.1-20100119 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1266,7 +1266,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of dialog for TeX Live 1.1-20080819:";;
+     short | recursive ) echo "Configuration of dialog for TeX Live 1.1-20100119:";;
    esac
   cat <<\_ACEOF
 
@@ -1354,7 +1354,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-dialog for TeX Live configure 1.1-20080819
+dialog for TeX Live configure 1.1-20100119
 generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -1409,7 +1409,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by dialog for TeX Live $as_me 1.1-20080819, which was
+It was created by dialog for TeX Live $as_me 1.1-20100119, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
@@ -2220,7 +2220,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='dialog-for-tex-live'
- VERSION='1.1-20080819'
+ VERSION='1.1-20100119'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3298,7 +3298,7 @@ fi
 
 
 
-DIALOG_TREE=dialog-1.1-20080819
+DIALOG_TREE=dialog-1.1-20100119
 
 
 # Initialize the subdir machinery
@@ -3878,7 +3878,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by dialog for TeX Live $as_me 1.1-20080819, which was
+This file was extended by dialog for TeX Live $as_me 1.1-20100119, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -3935,7 +3935,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-dialog for TeX Live config.status 1.1-20080819
+dialog for TeX Live config.status 1.1-20100119
 configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/utils/dialog/configure.ac b/Build/source/utils/dialog/configure.ac
index 6605873ae83..a1e950ef8fe 100644
--- a/Build/source/utils/dialog/configure.ac
+++ b/Build/source/utils/dialog/configure.ac
@@ -6,7 +6,7 @@ dnl   This file is free software; the copyright holder
 dnl   gives unlimited permission to copy and/or distribute it,
 dnl   with or without modifications, as long as this notice is preserved.
 dnl
-m4_define([dialog_version], [1.1-20080819])[]dnl using unmodified dialog source tree
+m4_define([dialog_version], [1.1-20100119])[]dnl using unmodified dialog source tree
 AC_PREREQ([2.65])
 AC_INIT([dialog for TeX Live], dialog_version, [peb@mppmu.mpg.de])
 AC_CONFIG_SRCDIR([dialog-]dialog_version[/dialog.c])
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/VERSION b/Build/source/utils/dialog/dialog-1.1-20080819/VERSION
deleted file mode 100644
index c4117690435..00000000000
--- a/Build/source/utils/dialog/dialog-1.1-20080819/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-6:5:0	1.1	20080819
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/arrows.c b/Build/source/utils/dialog/dialog-1.1-20080819/arrows.c
deleted file mode 100644
index 910e2c07155..00000000000
--- a/Build/source/utils/dialog/dialog-1.1-20080819/arrows.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- *  $Id: arrows.c,v 1.19 2007/02/19 01:22:19 tom Exp $
- *
- *  arrows.c -- draw arrows to indicate end-of-range for lists
- *
- * Copyright 2000-2006,2007   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>
-
-#ifdef USE_WIDE_CURSES
-#define add_acs(win, code) wadd_wch(win, W ## code)
-#else
-#define add_acs(win, code) waddch(win, dlg_boxchar(code))
-#endif
-
-#ifdef HAVE_COLOR
-static chtype
-merge_colors(chtype foreground, chtype background)
-{
-    chtype result = foreground;
-    if ((foreground & A_COLOR) != (background & A_COLOR)) {
-	short fg_f, bg_f;
-	short fg_b, bg_b;
-	if (pair_content(PAIR_NUMBER(foreground), &fg_f, &bg_f) != ERR
-	    && pair_content(PAIR_NUMBER(background), &fg_b, &bg_b) != ERR) {
-	    result &= ~A_COLOR;
-	    result |= dlg_color_pair(fg_f, bg_b);
-	}
-    }
-    return result;
-}
-#else
-#define merge_colors(f,b) (f)
-#endif
-
-void
-dlg_draw_arrows2(WINDOW *dialog,
-		 int top_arrow,
-		 int bottom_arrow,
-		 int x,
-		 int top,
-		 int bottom,
-		 chtype attr,
-		 chtype borderattr)
-{
-    chtype save = getattrs(dialog);
-    int cur_x, cur_y;
-
-    getyx(dialog, cur_y, cur_x);
-
-    (void) wmove(dialog, top, x);
-    if (top_arrow) {
-	wattrset(dialog, merge_colors(uarrow_attr, attr));
-	(void) add_acs(dialog, ACS_UARROW);
-	(void) waddstr(dialog, "(-)");
-    } else {
-	wattrset(dialog, attr);
-	(void) whline(dialog, dlg_boxchar(ACS_HLINE), 4);
-    }
-    mouse_mkbutton(top, x - 1, 6, KEY_PPAGE);
-
-    (void) wmove(dialog, bottom, x);
-    if (bottom_arrow) {
-	wattrset(dialog, merge_colors(darrow_attr, attr));
-	(void) add_acs(dialog, ACS_DARROW);
-	(void) waddstr(dialog, "(+)");
-    } else {
-	wattrset(dialog, borderattr);
-	(void) whline(dialog, dlg_boxchar(ACS_HLINE), 4);
-    }
-    mouse_mkbutton(bottom, x - 1, 6, KEY_NPAGE);
-
-    (void) wmove(dialog, cur_y, cur_x);
-    wrefresh(dialog);
-
-    wattrset(dialog, save);
-}
-
-void
-dlg_draw_arrows(WINDOW *dialog,
-		int top_arrow,
-		int bottom_arrow,
-		int x,
-		int top,
-		int bottom)
-{
-    dlg_draw_arrows2(dialog,
-		     top_arrow,
-		     bottom_arrow,
-		     x,
-		     top,
-		     bottom,
-		     menubox_attr,
-		     menubox_border_attr);
-}
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/guage.c b/Build/source/utils/dialog/dialog-1.1-20080819/guage.c
deleted file mode 100644
index 6dbc84e7bd8..00000000000
--- a/Build/source/utils/dialog/dialog-1.1-20080819/guage.c
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
- *  $Id: guage.c,v 1.40 2007/02/24 00:06:25 tom Exp $
- *
- * guage.c -- implements the gauge dialog
- *
- * Copyright 2000-2006,2007 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
- *	Marc Ewing, Red Hat Software
- */
-
-#include <dialog.h>
-#include <errno.h>
-
-#define MY_LEN (MAX_LEN)/2
-
-#define MIN_HIGH (4)
-#define MIN_WIDE (10 + 2 * (2 + MARGIN))
-
-#define isMarker(buf) !strncmp(buf, "XXX", 3)
-
-#define if_FINISH(status,statement) if ((status) == 0) statement
-
-#ifdef KEY_RESIZE
-#define if_RESIZE(status,statement) if ((status) < 0) statement
-#else
-#define if_RESIZE(status,statement)	/* nothing */
-#endif
-
-static int
-read_data(char *buffer, FILE *fp)
-{
-    int result;
-
-    if (feof(fp)) {
-	result = 0;
-    } else if (fgets(buffer, MY_LEN, fp) != 0) {
-	dlg_trim_string(buffer);
-	result = 1;
-    } else {
-	result = -1;
-#ifdef KEY_RESIZE
-	/*
-	 * Since we weren't doing getch's before, we won't necessarily
-	 * have a KEY_RESIZE returned.  Call getch() anyway to force it
-	 * to call resizeterm as-needed.
-	 */
-	if (errno == EINTR) {
-	    (void) getch();	/* allow it to call resizeterm() */
-	    refresh();
-	    dlg_clear();
-	    (void) getch();
-	} else {
-	    result = 0;
-	}
-#endif
-    }
-    return result;
-}
-
-static int
-decode_percent(char *buffer)
-{
-    char *tmp = 0;
-    long value = strtol(buffer, &tmp, 10);
-
-    if (tmp != 0 && (*tmp == 0 || isspace(UCH(*tmp))) && value >= 0) {
-	return TRUE;
-    }
-    return FALSE;
-}
-
-/*
- * Display a gauge, or progress meter.  Starts at percent% and reads stdin.  If
- * stdin is not XXX, then it is interpreted as a percentage, and the display is
- * updated accordingly.  Otherwise the next line is the percentage, and
- * subsequent lines up to another XXX are used for the new prompt.  Note that
- * the size of the window never changes, so the prompt can not get any larger
- * than the height and width specified.
- */
-int
-dialog_gauge(const char *title,
-	     const char *cprompt,
-	     int height,
-	     int width,
-	     int percent)
-{
-#ifdef KEY_RESIZE
-    int old_height = height;
-    int old_width = width;
-#endif
-    int i, x, y;
-    int status;
-    char buf[MY_LEN];
-    char prompt_buf[MY_LEN];
-    char *prompt = dlg_strclone(cprompt);
-    WINDOW *dialog;
-
-    curs_set(0);
-
-    dlg_tab_correct_str(prompt);
-
-#ifdef KEY_RESIZE
-    nodelay(stdscr, TRUE);
-    goto first_try;
-  retry:
-    dlg_del_window(dialog);
-    height = old_height;
-    width = old_width;
-  first_try:
-#endif
-
-    dlg_auto_size(title, prompt, &height, &width, MIN_HIGH, MIN_WIDE);
-    dlg_print_size(height, width);
-    dlg_ctl_size(height, width);
-
-    /* center dialog box on screen */
-    x = dlg_box_x_ordinate(width);
-    y = dlg_box_y_ordinate(height);
-
-    dialog = dlg_new_window(height, width, y, x);
-
-    do {
-	(void) werase(dialog);
-	dlg_draw_box(dialog, 0, 0, height, width, dialog_attr, border_attr);
-
-	dlg_draw_title(dialog, title);
-
-	wattrset(dialog, dialog_attr);
-	dlg_print_autowrap(dialog, prompt, height, width);
-
-	dlg_draw_box(dialog,
-		     height - 4, 2 + MARGIN,
-		     2 + MARGIN, 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, height - 3, 4);
-	wattrset(dialog, title_attr);
-
-	for (i = 0; i < (width - 2 * (3 + MARGIN)); i++)
-	    (void) waddch(dialog, ' ');
-
-	(void) wmove(dialog, height - 3, (width / 2) - 2);
-	(void) wprintw(dialog, "%3d%%", 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 = (percent * (width - 2 * (3 + MARGIN))) / 100;
-	if ((title_attr & A_REVERSE) != 0) {
-	    wattroff(dialog, A_REVERSE);
-	} else {
-	    wattrset(dialog, A_REVERSE);
-	}
-	(void) wmove(dialog, height - 3, 4);
-	for (i = 0; i < x; i++) {
-	    chtype ch = winch(dialog);
-	    if (title_attr & A_REVERSE) {
-		ch &= ~A_REVERSE;
-	    }
-	    (void) waddch(dialog, ch);
-	}
-
-	(void) wrefresh(dialog);
-
-	status = read_data(buf, dialog_state.pipe_input);
-	if_FINISH(status, break);
-	if_RESIZE(status, goto retry);
-
-	if (isMarker(buf)) {
-	    /*
-	     * Historically, next line should be percentage, but one of the
-	     * worse-written clones of 'dialog' assumes the number is missing.
-	     * (Gresham's Law applied to software).
-	     */
-	    status = read_data(buf, dialog_state.pipe_input);
-	    if_FINISH(status, break);
-	    if_RESIZE(status, goto retry);
-
-	    prompt_buf[0] = '\0';
-	    if (decode_percent(buf))
-		percent = atoi(buf);
-	    else
-		strcpy(prompt_buf, buf);
-
-	    /* Rest is message text */
-	    while ((status = read_data(buf, dialog_state.pipe_input)) > 0
-		   && !isMarker(buf)) {
-		if (strlen(prompt_buf) + strlen(buf) < sizeof(prompt_buf) - 1) {
-		    strcat(prompt_buf, buf);
-		}
-	    }
-	    if_FINISH(status, break);
-	    if_RESIZE(status, goto retry);
-
-	    if (prompt != prompt_buf)
-		free(prompt);
-	    prompt = prompt_buf;
-	} else if (decode_percent(buf)) {
-	    percent = atoi(buf);
-	}
-    } while (1);
-
-#ifdef KEY_RESIZE
-    nodelay(stdscr, FALSE);
-#endif
-
-    fclose(dialog_state.pipe_input);
-    dialog_state.pipe_input = 0;
-
-    curs_set(1);
-    dlg_del_window(dialog);
-    if (prompt != prompt_buf)
-	free(prompt);
-    return (DLG_EXIT_OK);
-}
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/calendar b/Build/source/utils/dialog/dialog-1.1-20080819/samples/calendar
deleted file mode 100755
index 5ba8b2d2679..00000000000
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/calendar
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-# $Id: calendar,v 1.4 2003/10/09 22:45:06 tom Exp $
-: ${DIALOG=dialog}
-
-exec 3>&1
-USERDATE=`$DIALOG --title "CALENDAR" --calendar "Please choose a date..." 0 0 7 7 1981 2>&1 1>&3`
-code=$?
-exec 3>&-
-
-case $code in
-  0)
-    echo "Date entered: $USERDATE.";;
-  1)
-    echo "Cancel pressed.";;
-  255)
-    echo "Box closed.";;
-esac
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/calendar-stdout b/Build/source/utils/dialog/dialog-1.1-20080819/samples/calendar-stdout
deleted file mode 100755
index 4562def6e59..00000000000
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/calendar-stdout
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-# $Id: calendar-stdout,v 1.1 2003/08/15 19:40:37 tom Exp $
-: ${DIALOG=dialog}
-
-USERDATE=`$DIALOG --stdout --title "CALENDAR" --calendar "Please choose a date..." 0 0 7 7 1981`
-
-case $? in
-  0)
-    echo "Date entered: $USERDATE.";;
-  1)
-    echo "Cancel pressed.";;
-  255)
-    echo "Box closed.";;
-esac
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/calendar2 b/Build/source/utils/dialog/dialog-1.1-20080819/samples/calendar2
deleted file mode 100755
index 0cbc323c723..00000000000
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/calendar2
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-# $Id: calendar2,v 1.3 2003/10/09 22:45:06 tom Exp $
-: ${DIALOG=dialog}
-
-exec 3>&1
-USERDATE=`$DIALOG --title "CALENDAR" --calendar "Please choose a date..." 0 0 2>&1 1>&3`
-code=$?
-exec 3>&-
-
-case $code in
-  0)
-    echo "Date entered: $USERDATE.";;
-  1)
-    echo "Cancel pressed.";;
-  255)
-    echo "Box closed.";;
-esac
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/calendar2-stdout b/Build/source/utils/dialog/dialog-1.1-20080819/samples/calendar2-stdout
deleted file mode 100755
index ab623e96159..00000000000
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/calendar2-stdout
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-# $Id: calendar2-stdout,v 1.1 2003/08/15 19:40:37 tom Exp $
-: ${DIALOG=dialog}
-
-USERDATE=`$DIALOG --stdout --title "CALENDAR" --calendar "Please choose a date..." 0 0`
-
-case $? in
-  0)
-    echo "Date entered: $USERDATE.";;
-  1)
-    echo "Cancel pressed.";;
-  255)
-    echo "Box closed.";;
-esac
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/calendar3 b/Build/source/utils/dialog/dialog-1.1-20080819/samples/calendar3
deleted file mode 100755
index 325cd6f5749..00000000000
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/calendar3
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-# $Id: calendar3,v 1.4 2003/10/09 22:45:06 tom Exp $
-: ${DIALOG=dialog}
-
-exec 3>&1
-USERDATE=`$DIALOG --extra-button --extra-label "Hold" --help-button --title "CALENDAR" --calendar "Please choose a date..." 0 0 7 7 1981 2>&1 1>&3`
-code=$?
-exec 3>&-
-
-case $code in
-  0)
-    echo "Date entered: $USERDATE.";;
-  1)
-    echo "Cancel pressed.";;
-  2)
-    echo "Help pressed.";;
-  3)
-    echo "Hold pressed.";;
-  255)
-    echo "Box closed.";;
-esac
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/calendar3-stdout b/Build/source/utils/dialog/dialog-1.1-20080819/samples/calendar3-stdout
deleted file mode 100755
index 1c44e9e63b1..00000000000
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/calendar3-stdout
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-# $Id: calendar3-stdout,v 1.1 2003/08/15 19:40:37 tom Exp $
-: ${DIALOG=dialog}
-
-USERDATE=`$DIALOG --extra-button --extra-label "Hold" --help-button --stdout --title "CALENDAR" --calendar "Please choose a date..." 0 0 7 7 1981`
-
-case $? in
-  0)
-    echo "Date entered: $USERDATE.";;
-  1)
-    echo "Cancel pressed.";;
-  2)
-    echo "Help pressed.";;
-  3)
-    echo "Hold pressed.";;
-  255)
-    echo "Box closed.";;
-esac
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/checklist9 b/Build/source/utils/dialog/dialog-1.1-20080819/samples/checklist9
deleted file mode 100755
index f6700dcfd2b..00000000000
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/checklist9
+++ /dev/null
@@ -1,23 +0,0 @@
-#! /bin/sh
-# $Id: checklist9,v 1.1 2004/03/13 19:25:43 tom Exp $
-# "checklist8" using --file
-: ${DIALOG=dialog}
-
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
-
-$DIALOG --file checklist9.txt 2>$tempfile
-
-retval=$?
-
-choice=`cat $tempfile`
-case $retval in
-  0|2)
-    echo "'$choice' chosen.";;
-  1)
-    echo "Cancel pressed.";;
-  255)
-    echo "ESC pressed.";;
-  *)
-    echo "Unexpected code $retval";;
-esac
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/dselect b/Build/source/utils/dialog/dialog-1.1-20080819/samples/dselect
deleted file mode 100755
index e85dbf8298e..00000000000
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/dselect
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-# $Id: dselect,v 1.1 2006/12/27 01:11:08 tom Exp $
-: ${DIALOG=dialog}
-
-exec 3>&1
-FILE=`$DIALOG --title "Please choose a directory" --dselect $HOME/ 14 48 2>&1 1>&3`
-code=$?
-exec 3>&-
-
-case $code in
-  0)
-    echo "\"$FILE\" chosen";;
-  1)
-    echo "Button 1 (Cancel) pressed";;
-  2)
-    echo "Button 2 (Help) pressed";;
-  3)
-    echo "Button 3 (Extra) pressed";;
-  255)
-    echo "Box closed.";;
-esac
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/editbox-utf8 b/Build/source/utils/dialog/dialog-1.1-20080819/samples/editbox-utf8
deleted file mode 100755
index 6a005327f17..00000000000
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/editbox-utf8
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/sh
-# $Id: editbox-utf8,v 1.1 2007/01/12 00:09:21 tom Exp $
-: ${DIALOG=dialog}
-
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
-
-case none"$LANG$LC_ALL$LC_CTYPE" in
-*UTF-8*)
-	;;
-*)
-	echo "This script must be run in a UTF-8 locale"
-	exit 1
-	;;
-esac
-
-input=`tempfile 2>/dev/null` || input=/tmp/input$$
-output=`tempfile 2>/dev/null` || output=/tmp/test$$
-trap "rm -f $input $output" 0 1 2 5 15
-
-cat << EOF > $input
-Hi, this is a edit box. You can use this to 
-allow the user to enter or modify free-form text.
-
-Try it now!
-
-        -----------     --------------------------------
-	Choose		Description of the OS you like
-	-----------	--------------------------------
-	Ｌｉｎｕｘ	The Great Unix Clone for 386/486 
-	ＮｅｔＢＳＤ	Another free Unix Clone for 386/486 
-	ＯＳ/２		IBM OS/2 
-	ＷＩＮ ＮＴ	Microsoft Windows NT 
-	ＰＣＤＯＳ	IBM PC DOS 
-	ＭＳＤＯＳ	Microsoft DOS
-	-----------	--------------------------------
-        -----------     --------------------------------
-EOF
-
-$DIALOG --title "EDIT BOX" \
-	--fixed-font --editbox $input 0 0 2>$output
-
-case $? in
-  0)
-    diff -c $input $output
-    echo "OK"
-    ;;
-  1)
-    echo "Button 1 (Cancel) pressed";;
-  2)
-    echo "Button 2 (Help) pressed";;
-  3)
-    echo "Button 3 (Extra) pressed";;
-  255)
-    echo "ESC pressed.";;
-esac
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/editbox3 b/Build/source/utils/dialog/dialog-1.1-20080819/samples/editbox3
deleted file mode 100755
index 5522430514f..00000000000
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/editbox3
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-# $Id: editbox3,v 1.1 2007/09/24 00:12:24 tom Exp $
-# example with extra- and help-buttons
-: ${DIALOG=dialog}
-
-input=`tempfile 2>/dev/null` || input=/tmp/input$$
-output=`tempfile 2>/dev/null` || output=/tmp/test$$
-trap "rm -f $input $output" 0 1 2 5 15
-
-cat << EOF > $input
-EOF
-
-$DIALOG --title "EDIT BOX" \
-	--extra-button \
-	--help-button \
-	--fixed-font --editbox $input 0 0 2>$output
-
-case $? in
-  0)
-    diff -c $input $output
-    echo "OK"
-    ;;
-  1)
-    echo "Button 1 (Cancel) pressed";;
-  2)
-    echo "Button 2 (Help) pressed";;
-  3)
-    echo "Button 3 (Extra) pressed";;
-  255)
-    echo "ESC pressed.";;
-esac
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/fselect b/Build/source/utils/dialog/dialog-1.1-20080819/samples/fselect
deleted file mode 100755
index 5aea3ec53d8..00000000000
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/fselect
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-# $Id: fselect,v 1.6 2005/12/07 01:55:53 tom Exp $
-: ${DIALOG=dialog}
-
-exec 3>&1
-FILE=`$DIALOG --title "Please choose a file" --fselect $HOME/ 14 48 2>&1 1>&3`
-code=$?
-exec 3>&-
-
-case $code in
-  0)
-    echo "\"$FILE\" chosen";;
-  1)
-    echo "Button 1 (Cancel) pressed";;
-  2)
-    echo "Button 2 (Help) pressed";;
-  3)
-    echo "Button 3 (Extra) pressed";;
-  255)
-    echo "Box closed.";;
-esac
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/fselect-stdout b/Build/source/utils/dialog/dialog-1.1-20080819/samples/fselect-stdout
deleted file mode 100755
index a4fe2449210..00000000000
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/fselect-stdout
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-# $Id: fselect-stdout,v 1.1 2003/08/15 19:40:37 tom Exp $
-: ${DIALOG=dialog}
-
-FILE=`$DIALOG --stdout --title "Please choose a file" --fselect $HOME/ 14 48`
-
-case $? in
-	0)
-		echo "\"$FILE\" chosen";;
-	1)
-		echo "Cancel pressed.";;
-	255)
-		echo "Box closed.";;
-esac
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/fselect1 b/Build/source/utils/dialog/dialog-1.1-20080819/samples/fselect1
deleted file mode 100755
index 50ced70ba0d..00000000000
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/fselect1
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-# $Id: fselect1,v 1.4 2003/10/09 22:45:06 tom Exp $
-: ${DIALOG=dialog}
-
-FILE=$HOME
-for n in .cshrc .profile .bashrc
-do
-	if test -f $HOME/$n ; then
-		FILE=$HOME/$n
-		break
-	fi
-done
-
-exec 3>&1
-FILE=`$DIALOG --title "Please choose a file" --fselect $FILE 14 48 2>&1 1>&3`
-code=$?
-exec 3>&-
-
-case $code in
-	0)
-		echo "\"$FILE\" chosen";;
-	1)
-		echo "Cancel pressed.";;
-	255)
-		echo "Box closed.";;
-esac
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/fselect1-stdout b/Build/source/utils/dialog/dialog-1.1-20080819/samples/fselect1-stdout
deleted file mode 100755
index c8e3018d5dc..00000000000
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/fselect1-stdout
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# $Id: fselect1-stdout,v 1.1 2003/08/15 19:40:37 tom Exp $
-: ${DIALOG=dialog}
-
-FILE=$HOME
-for n in .cshrc .profile .bashrc
-do
-	if test -f $HOME/$n ; then
-		FILE=$HOME/$n
-		break
-	fi
-done
-
-FILE=`$DIALOG --stdout --title "Please choose a file" --fselect $FILE 14 48`
-
-case $? in
-	0)
-		echo "\"$FILE\" chosen";;
-	1)
-		echo "Cancel pressed.";;
-	255)
-		echo "Box closed.";;
-esac
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/fselect2 b/Build/source/utils/dialog/dialog-1.1-20080819/samples/fselect2
deleted file mode 100755
index 066eaf5e260..00000000000
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/fselect2
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-# $Id: fselect2,v 1.3 2003/10/09 22:45:06 tom Exp $
-: ${DIALOG=dialog}
-
-exec 3>&1
-FILE=`$DIALOG --title "Please choose a file" --fselect $HOME/ 0 0 2>&1 1>&3`
-code=$?
-exec 3>&-
-
-case $code in
-	0)
-		echo "\"$FILE\" chosen";;
-	1)
-		echo "Cancel pressed.";;
-	255)
-		echo "Box closed.";;
-esac
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/fselect2-stdout b/Build/source/utils/dialog/dialog-1.1-20080819/samples/fselect2-stdout
deleted file mode 100755
index 3673519d113..00000000000
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/fselect2-stdout
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-# $Id: fselect2-stdout,v 1.1 2003/08/15 19:40:37 tom Exp $
-: ${DIALOG=dialog}
-
-FILE=`$DIALOG --stdout --title "Please choose a file" --fselect $HOME/ 0 0`
-
-case $? in
-	0)
-		echo "\"$FILE\" chosen";;
-	1)
-		echo "Cancel pressed.";;
-	255)
-		echo "Box closed.";;
-esac
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/inputbox-both b/Build/source/utils/dialog/dialog-1.1-20080819/samples/inputbox-both
deleted file mode 100755
index c5294e7bcc7..00000000000
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/inputbox-both
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-# $Id: inputbox-both,v 1.1 2005/12/05 23:13:59 tom Exp $
-: ${DIALOG=dialog}
-
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
-
-$DIALOG --title "INPUT BOX" --clear \
-	--extra-button \
-	--help-button \
-        --inputbox "Hi, this is an input dialog box. You can use \n
-this to ask questions that require the user \n
-to input a string as the answer. You can \n
-input strings of length longer than the \n
-width of the input box, in that case, the \n
-input field will be automatically scrolled. \n
-You can use BACKSPACE to correct errors. \n\n
-Try entering your name below:" 16 51 2> $tempfile
-
-retval=$?
-
-case $retval in
-  0)
-    echo "Input string is `cat $tempfile`";;
-  1)
-    echo "Button 1 (Cancel) pressed.";;
-  2)
-    echo "Button 2 (Help) pressed.";;
-  3)
-    echo "Button 3 (Extra) pressed.";;
-  255)
-    if test -s $tempfile ; then
-      cat $tempfile
-    else
-      echo "ESC pressed."
-    fi
-    ;;
-esac
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/inputbox-extra b/Build/source/utils/dialog/dialog-1.1-20080819/samples/inputbox-extra
deleted file mode 100755
index 72b796a80c4..00000000000
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/inputbox-extra
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-# $Id: inputbox-extra,v 1.1 2005/12/05 23:16:24 tom Exp $
-: ${DIALOG=dialog}
-
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
-
-$DIALOG --title "INPUT BOX" --clear \
-	--extra-button \
-        --inputbox "Hi, this is an input dialog box. You can use \n
-this to ask questions that require the user \n
-to input a string as the answer. You can \n
-input strings of length longer than the \n
-width of the input box, in that case, the \n
-input field will be automatically scrolled. \n
-You can use BACKSPACE to correct errors. \n\n
-Try entering your name below:" 16 51 2> $tempfile
-
-retval=$?
-
-case $retval in
-  0)
-    echo "Input string is `cat $tempfile`";;
-  1)
-    echo "Button 1 (Cancel) pressed.";;
-  2)
-    echo "Button 2 (Help) pressed.";;
-  3)
-    echo "Button 3 (Extra) pressed.";;
-  255)
-    if test -s $tempfile ; then
-      cat $tempfile
-    else
-      echo "ESC pressed."
-    fi
-    ;;
-esac
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/inputbox-help b/Build/source/utils/dialog/dialog-1.1-20080819/samples/inputbox-help
deleted file mode 100755
index a0fe032a99b..00000000000
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/inputbox-help
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-# $Id: inputbox-help,v 1.1 2005/12/05 23:15:16 tom Exp $
-: ${DIALOG=dialog}
-
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
-
-$DIALOG --title "INPUT BOX" --clear \
-	--help-button \
-        --inputbox "Hi, this is an input dialog box. You can use \n
-this to ask questions that require the user \n
-to input a string as the answer. You can \n
-input strings of length longer than the \n
-width of the input box, in that case, the \n
-input field will be automatically scrolled. \n
-You can use BACKSPACE to correct errors. \n\n
-Try entering your name below:" 16 51 2> $tempfile
-
-retval=$?
-
-case $retval in
-  0)
-    echo "Input string is `cat $tempfile`";;
-  1)
-    echo "Button 1 (Cancel) pressed.";;
-  2)
-    echo "Button 2 (Help) pressed.";;
-  3)
-    echo "Button 3 (Extra) pressed.";;
-  255)
-    if test -s $tempfile ; then
-      cat $tempfile
-    else
-      echo "ESC pressed."
-    fi
-    ;;
-esac
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/inputbox6-8bit b/Build/source/utils/dialog/dialog-1.1-20080819/samples/inputbox6-8bit
deleted file mode 100755
index 901f799feae..00000000000
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/inputbox6-8bit
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-# $Id: inputbox6-8bit,v 1.1 2004/12/19 16:19:34 tom Exp $
-: ${DIALOG=dialog}
-
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
-
-. ./testdata-8bit
-
-$DIALOG \
---title    `printf "$SAMPLE"` \
---inputbox `printf "$SAMPLE"` \
-10 40 `printf "$SAMPLE"` 2>$tempfile
-
-retval=$?
-
-case $retval in
-  0)
-    echo "Input string is \"`cat $tempfile`\"";;
-  1)
-    echo "Cancel pressed.";;
-  255)
-    if test -s $tempfile ; then
-      cat $tempfile
-    else
-      echo "ESC pressed."
-    fi
-    ;;
-esac
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/inputbox6-utf8 b/Build/source/utils/dialog/dialog-1.1-20080819/samples/inputbox6-utf8
deleted file mode 100755
index 2a8d6c33e81..00000000000
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/inputbox6-utf8
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-# $Id: inputbox6-utf8,v 1.2 2008/03/16 13:58:54 tom Exp $
-: ${DIALOG=dialog}
-
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
-
-case none"$LANG$LC_ALL$LC_CTYPE" in
-*UTF-8*)
-	;;
-*)
-	echo "This script must be run in a UTF-8 locale"
-	exit 1
-	;;
-esac
-
-$DIALOG \
---title    `printf "\xe3\x81\x82\xe3\x81\x84\xe3\x81\x86\xe3\x81\x88\xe3\x81\x8a"` \
---inputbox `printf "\xe3\x81\x82\xe3\x81\x84\xe3\x81\x86\xe3\x81\x88\xe3\x81\x8a"` \
-10 20 "Ｄ.Ｏ.Ｇ"	 2>$tempfile
-
-retval=$?
-
-case $retval in
-  0)
-    echo "Input string is \"`cat $tempfile`\"";;
-  1)
-    echo "Cancel pressed.";;
-  255)
-    if test -s $tempfile ; then
-      cat $tempfile
-    else
-      echo "ESC pressed."
-    fi
-    ;;
-esac
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/menubox10 b/Build/source/utils/dialog/dialog-1.1-20080819/samples/menubox10
deleted file mode 100755
index 039a3bf0bc1..00000000000
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/menubox10
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-# $Id: menubox10,v 1.1 2004/07/31 11:04:04 tom Exp $
-# zero-width column
-: ${DIALOG=dialog}
-
-exec 3>&1
-value=`$DIALOG --backtitle "Debian Configuration" \
-	--title "Configuring debconf" \
-	--default-item Dialog \
-	--menu "Packages that use debconf for co" 19 50 6 \
-	Dialog		"" \
-	Readline	"" \
-	Gnome		"" \
-	Kde		"" \
-	Editor		"" \
-	Noninteractive	"" \
-2>&1 1>&3`
-retval=$?
-exec 3>&-
-
-case $retval in
-  0)
-    echo "$value chosen.";;
-  1)
-    echo "Cancel pressed.";;
-  2)
-    echo "Help pressed ($value)";;
-  255)
-    if test -n "$value" ; then
-      echo "$value"
-    else
-      echo "ESC pressed."
-    fi
-    ;;
-esac
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/msgbox-help b/Build/source/utils/dialog/dialog-1.1-20080819/samples/msgbox-help
deleted file mode 100755
index ed5ec3f4165..00000000000
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/msgbox-help
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-# $Id: msgbox-help,v 1.1 2005/12/05 23:59:24 tom Exp $
-: ${DIALOG=dialog}
-
-$DIALOG --title "MESSAGE BOX" --clear \
-	--help-button \
-        --msgbox "Hi, this is a simple message box. You can use this to \
-                  display any message you like. The box will remain until \
-                  you press the ENTER key." 10 41
-
-case $? in
-  0)
-    echo "OK";;
-  1)
-    echo "Button 1 (Cancel) pressed.";;
-  2)
-    echo "Button 2 (Help) pressed.";;
-  3)
-    echo "Button 3 (Extra) pressed.";;
-  255)
-    echo "ESC pressed.";;
-esac
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/password1 b/Build/source/utils/dialog/dialog-1.1-20080819/samples/password1
deleted file mode 100755
index 7144f2e6c99..00000000000
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/password1
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-# $Id: password1,v 1.1 2003/11/26 22:25:03 tom Exp $
-: ${DIALOG=dialog}
-
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
-
-$DIALOG --title "INPUT BOX" --clear \
-	--insecure \
-        --passwordbox "Hi, this is an password dialog box. You can use \n
-this to ask questions that require the user \n
-to input a string as the answer. You can \n
-input strings of length longer than the \n
-width of the input box, in that case, the \n
-input field will be automatically scrolled. \n
-You can use BACKSPACE to correct errors. \n\n
-Try entering your name below:" 16 51 2> $tempfile
-
-retval=$?
-
-case $retval in
-  0)
-    echo "Input string is `cat $tempfile`";;
-  1)
-    echo "Cancel pressed.";;
-  255)
-    if test -s $tempfile ; then
-      cat $tempfile
-    else
-      echo "ESC pressed."
-    fi
-    ;;
-esac
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/pause b/Build/source/utils/dialog/dialog-1.1-20080819/samples/pause
deleted file mode 100755
index 6e4fc2af78c..00000000000
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/pause
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-# $Id: pause,v 1.1 2004/12/20 00:41:12 tom Exp $
-: ${DIALOG=dialog}
-
-$DIALOG --title "PAUSE" --pause "Hi, this is a pause widget" 20 70 10
-
-retval=$?
-
-case $retval in
-  0)
-    echo "Timeout expired.";;
-  1)
-    echo "Cancel pressed.";;
-  *)
-    echo "Unexpected return code: $retval";;
-esac
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/pause-help b/Build/source/utils/dialog/dialog-1.1-20080819/samples/pause-help
deleted file mode 100755
index 631394e8cf7..00000000000
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/pause-help
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-# $Id: pause-help,v 1.1 2005/12/06 00:02:52 tom Exp $
-: ${DIALOG=dialog}
-
-$DIALOG --title "PAUSE" \
-	--help-button \
-	--pause "Hi, this is a pause widget" 20 70 10
-
-retval=$?
-
-case $retval in
-  0)
-    echo "Timeout expired.";;
-  1)
-    echo "Button 1 (Cancel) pressed.";;
-  2)
-    echo "Button 2 (Help) pressed.";;
-  3)
-    echo "Button 3 (Extra) pressed.";;
-  255)
-    echo "ESC pressed.";;
-  *)
-    echo "Unexpected return code: $retval";;
-esac
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/progress b/Build/source/utils/dialog/dialog-1.1-20080819/samples/progress
deleted file mode 100755
index 82a72bb9b3e..00000000000
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/progress
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-# $Id: progress,v 1.1 2006/01/18 23:32:18 tom Exp $
-: ${DIALOG=dialog}
-
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
-
-ls -1 >$tempfile
-(
-while true
-do
-read text
-test -z "$text" && break
-ls -ld "$text"
-sleep 1
-done <$tempfile
-) |
-
-$DIALOG --title "PROGRESS" --progressbox 20 70
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/progress2 b/Build/source/utils/dialog/dialog-1.1-20080819/samples/progress2
deleted file mode 100755
index 0865738fedf..00000000000
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/progress2
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-# $Id: progress2,v 1.1 2006/01/18 23:35:05 tom Exp $
-: ${DIALOG=dialog}
-
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
-
-ls -1 >$tempfile
-(
-while true
-do
-read text
-test -z "$text" && break
-ls -ld "$text"
-sleep 1
-done <$tempfile
-) |
-
-$DIALOG --title "PROGRESS" --progressbox "This is a detailed description\nof the progress-box." 20 70
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/tailbox b/Build/source/utils/dialog/dialog-1.1-20080819/samples/tailbox
deleted file mode 100755
index e6b91c4be4f..00000000000
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/tailbox
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-# $Id: tailbox,v 1.3 2003/08/15 19:40:37 tom Exp $
-: ${DIALOG=dialog}
-
-./killall listing
-./listing >listing.out &
-
-$DIALOG --title "TAIL BOX" \
-        --tailbox listing.out 24 70
-
-case $? in
-  0)
-    echo "OK";;
-  255)
-    echo "ESC pressed.";;
-esac
-
-./killall listing
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/textbox3 b/Build/source/utils/dialog/dialog-1.1-20080819/samples/textbox3
deleted file mode 100755
index bf4803dd3ab..00000000000
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/textbox3
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-# $Id: textbox3,v 1.1 2005/12/05 22:07:56 tom Exp $
-: ${DIALOG=dialog}
-
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
-
-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" \
-	--extra-button \
-	--textbox "$tempfile" 22 77
-
-case $? in
-  0)
-    echo "Button 0 (OK) pressed.";;
-  1)
-    echo "Button 1 (Cancel) pressed.";;
-  2)
-    echo "Button 2 (Help) pressed.";;
-  3)
-    echo "Button 3 (Extra) pressed.";;
-  255)
-    echo "ESC pressed.";;
-esac
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/timebox b/Build/source/utils/dialog/dialog-1.1-20080819/samples/timebox
deleted file mode 100755
index 7ebfb79ac03..00000000000
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/timebox
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-# $Id: timebox,v 1.4 2003/10/09 22:45:06 tom Exp $
-: ${DIALOG=dialog}
-
-exec 3>&1
-USERTIME=`$DIALOG --title "TIMEBOX" --timebox "Please set the time..." 0 0 12 34 56 2>&1 1>&3`
-code=$?
-exec 3>&-
-
-case $code in
-  0)
-    echo "Time entered: $USERTIME.";;
-  1)
-    echo "Cancel pressed.";;
-  255)
-    echo "Box closed.";;
-esac
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/timebox-stdout b/Build/source/utils/dialog/dialog-1.1-20080819/samples/timebox-stdout
deleted file mode 100755
index 82ba27671ca..00000000000
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/timebox-stdout
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-# $Id: timebox-stdout,v 1.1 2003/08/15 19:40:37 tom Exp $
-: ${DIALOG=dialog}
-
-USERTIME=`$DIALOG --stdout --title "TIMEBOX" --timebox "Please set the time..." 0 0 12 34 56`
-
-case $? in
-  0)
-    echo "Time entered: $USERTIME.";;
-  1)
-    echo "Cancel pressed.";;
-  255)
-    echo "Box closed.";;
-esac
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/timebox2 b/Build/source/utils/dialog/dialog-1.1-20080819/samples/timebox2
deleted file mode 100755
index 50f8d21153a..00000000000
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/timebox2
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-# $Id: timebox2,v 1.3 2003/10/09 22:45:06 tom Exp $
-: ${DIALOG=dialog}
-
-exec 3>&1
-USERTIME=`$DIALOG --title "TIMEBOX" --timebox "Please set the time..." 0 0 2>&1 1>&3`
-code=$?
-exec 3>&-
-
-case $code in
-  0)
-    echo "Time entered: $USERTIME.";;
-  1)
-    echo "Cancel pressed.";;
-  255)
-    echo "Box closed.";;
-esac
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/timebox2-stdout b/Build/source/utils/dialog/dialog-1.1-20080819/samples/timebox2-stdout
deleted file mode 100755
index 52205289711..00000000000
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/timebox2-stdout
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-# $Id: timebox2-stdout,v 1.1 2003/08/15 19:40:37 tom Exp $
-: ${DIALOG=dialog}
-
-USERTIME=`$DIALOG --stdout --title "TIMEBOX" --timebox "Please set the time..." 0 0`
-
-case $? in
-  0)
-    echo "Time entered: $USERTIME.";;
-  1)
-    echo "Cancel pressed.";;
-  255)
-    echo "Box closed.";;
-esac
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/CHANGES b/Build/source/utils/dialog/dialog-1.1-20100119/CHANGES
index ac850ba7667..a5b518880b6 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/CHANGES
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/CHANGES
@@ -1,9 +1,68 @@
--- $Id: CHANGES,v 1.264 2008/08/19 23:36:46 tom Exp $
+-- $Id: CHANGES,v 1.291 2010/01/19 00:33:27 tom Exp $
 -- Thomas E. Dickey <dickey@invisible-island.net>
 
 This version of dialog was originally from a Debian snapshot.  I've done this
 to it:
 
+2010/01/19
+	+ split up binding tables in inputbox and similar widgets to avoid
+	  conflict between cursor-key use for input-string versus navigation
+	  (report by slakmagik).
+	+ if strftime() is available, support --time-format option for timebox
+	  widget.
+	+ if strftime() is available, support --date-format option for calendar
+	  widget (request by Walter Harms).
+	+ build-fixes for linking to intl library in /usr/local
+	+ add --scrollbar option, use in most widgets to show a scrollbar on
+	  the right margin of the data.  That is cosmetic, does not respond to
+	  the mouse.
+	+ reuse functions from msgbox to allow prompt for yesno box to be
+	  scrolled in a too-small window.
+	+ correct mapping of button-codes with --nook option (report by Lebedev
+	  Vadim).
+	+ cleanup sample scripts using new utility scripts setup-* and report-*,
+	  and allow command-line parameters to be added, for ad hoc testing.
+	+ correct change to tailbox widget from 2009/02/22 using
+	  dlg_button_layout(), which broke that widget.
+	+ document some of the portability caveats.
+	+ modify gauge widget to service callbacks (prompted by patch and
+	  comments by Frank Sorenson).
+	+ modify editbox to allow its input buffer to be larger than MAX_LEN
+	  unless bounded by the --max-input option, and add limit-checks for
+	  the buffer (report by slakmagik).
+	+ improve manpage description of --checklist (report by Isaac Good).
+	+ several improvements to configure script macros:  CF_ADD_CFLAGS
+	  CF_CURSES_FUNCS CF_DISABLE_ECHO CF_GCC_ATTRIBUTES CF_MATH_LIB
+	  CF_POSIX_C_SOURCE CF_REMOVE_DEFINE CF_WITH_LIBTOOL CF_XOPEN_SOURCE
+	+ add is.po, lv.po, sw.po from
+		http://translationproject.org/latest/dialog/
+	+ update de.po, id.po, pl.po, pt_BR.po, vi.po from
+		http://translationproject.org/latest/dialog/
+
+2009/02/22
+	+ do not display top-arrows for scrolling if they would overwrite the
+	  title (report by slakmagik)
+	+ consistently use dlg_button_layout() when autosizing widgets (report
+	  by slakmagik).
+	+ add "-" and "+" bindings to timebox widget.
+	+ add "-" and "+" bindings to calendar widget (OpenSolaris #6739031).
+	+ review/fix other widgets to ensure that they exit on error, e.g.,
+	  editbox.c
+	+ modify check in dlg_getc() to treat closure of either stdin or stdout
+	  as an error, rather than both.  This is more stringent than the check
+	  added in 2007/07/04.
+	+ modify dlg_result_key() to map curses ERR to dialog's error exit
+	  (adapted from patch by Domagoj Pensa).
+	+ updated several configure script macros:
+	  + consistently append, rather then prepend, to $CFLAGS
+	  + add cases for AIX 6, mint, and dragonfly to CF_XOPEN_SOURCE
+	  + use $PATH_SEPARATOR rather than $PATHSEP
+	  + improve CF_FIND_LINKAGE, use in checks for more libraries, e.g.,
+	    libutf8 and libiconv.
+	+ update da.po, ru.po from
+		http://translationproject.org/latest/dialog/
+	+ updated config.guess, config.sub
+
 2008/08/19
 	+ amend changes to quoting; by default, the checklist widget quotes its
 	  output except when --separate-output is used (Debian #495600).
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/COPYING b/Build/source/utils/dialog/dialog-1.1-20100119/COPYING
index 8add30ad590..8add30ad590 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/COPYING
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/COPYING
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/README b/Build/source/utils/dialog/dialog-1.1-20100119/README
index b2c9b8595db..b2c9b8595db 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/README
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/README
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/VERSION b/Build/source/utils/dialog/dialog-1.1-20100119/VERSION
new file mode 100644
index 00000000000..8a14058d0c4
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/VERSION
@@ -0,0 +1 @@
+7:0:0	1.1	20100119
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/aclocal.m4 b/Build/source/utils/dialog/dialog-1.1-20100119/aclocal.m4
new file mode 100644
index 00000000000..dd7309f85cb
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/aclocal.m4
@@ -0,0 +1,3660 @@
+dnl macros used for DIALOG configure script
+dnl Copyright 1999-2009,2010 -- Thomas E. Dickey
+dnl
+dnl see
+dnl http://invisible-island.net/autoconf/ 
+dnl
+dnl $Id: aclocal.m4,v 1.72 2010/01/18 01:38:22 tom Exp $
+dnl ---------------------------------------------------------------------------
+dnl ---------------------------------------------------------------------------
+dnl AM_GNU_GETTEXT version: 11 updated: 2004/01/26 20:58:40
+dnl --------------
+dnl Usage: Just like AM_WITH_NLS, which see.
+AC_DEFUN([AM_GNU_GETTEXT],
+  [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+   AC_REQUIRE([AC_PROG_CC])dnl
+   AC_REQUIRE([AC_CANONICAL_HOST])dnl
+   AC_REQUIRE([AC_PROG_RANLIB])dnl
+   AC_REQUIRE([AC_ISC_POSIX])dnl
+   AC_REQUIRE([AC_HEADER_STDC])dnl
+   AC_REQUIRE([AC_C_CONST])dnl
+   AC_REQUIRE([AC_C_INLINE])dnl
+   AC_REQUIRE([AC_TYPE_OFF_T])dnl
+   AC_REQUIRE([AC_TYPE_SIZE_T])dnl
+   AC_REQUIRE([AC_FUNC_ALLOCA])dnl
+   AC_REQUIRE([AC_FUNC_MMAP])dnl
+   AC_REQUIRE([jm_GLIBC21])dnl
+
+   AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
+stdlib.h string.h unistd.h sys/param.h])
+   AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getcwd getegid geteuid \
+getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \
+strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
+
+   AM_ICONV
+   AM_LANGINFO_CODESET
+   AM_LC_MESSAGES
+   AM_WITH_NLS([$1],[$2],[$3],[$4])
+
+   if test "x$CATOBJEXT" != "x"; then
+     if test "x$ALL_LINGUAS" = "x"; then
+       LINGUAS=
+     else
+       AC_MSG_CHECKING(for catalogs to be installed)
+       NEW_LINGUAS=
+       for presentlang in $ALL_LINGUAS; do
+         useit=no
+         for desiredlang in ${LINGUAS-$ALL_LINGUAS}; do
+           # Use the presentlang catalog if desiredlang is
+           #   a. equal to presentlang, or
+           #   b. a variant of presentlang (because in this case,
+           #      presentlang can be used as a fallback for messages
+           #      which are not translated in the desiredlang catalog).
+           case "$desiredlang" in
+             "$presentlang"*) useit=yes;;
+           esac
+         done
+         if test $useit = yes; then
+           NEW_LINGUAS="$NEW_LINGUAS $presentlang"
+         fi
+       done
+       LINGUAS=$NEW_LINGUAS
+       AC_MSG_RESULT($LINGUAS)
+     fi
+
+     dnl Construct list of names of catalog files to be constructed.
+     if test -n "$LINGUAS"; then
+       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
+     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)
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl AM_ICONV version: 12 updated: 2007/07/30 19:12:03
+dnl --------
+dnl Inserted as requested by gettext 0.10.40
+dnl File from /usr/share/aclocal
+dnl iconv.m4
+dnl ====================
+dnl serial AM2
+dnl
+dnl From Bruno Haible.
+dnl
+dnl ====================
+dnl Modified to use CF_FIND_LINKAGE and CF_ADD_SEARCHPATH, to broaden the
+dnl range of locations searched.  Retain the same cache-variable naming to
+dnl allow reuse with the other gettext macros -Thomas E Dickey
+AC_DEFUN([AM_ICONV],
+[
+  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
+  dnl those with the standalone portable GNU libiconv installed).
+
+  AC_ARG_WITH([libiconv-prefix],
+[  --with-libiconv-prefix=DIR
+                          search for libiconv in DIR/include and DIR/lib], [
+    CF_ADD_OPTIONAL_PATH($withval, libiconv)
+   ])
+
+  AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
+    CF_FIND_LINKAGE(CF__ICONV_HEAD,
+      CF__ICONV_BODY,
+      iconv,
+      am_cv_func_iconv=yes,
+      am_cv_func_iconv=["no, consider installing GNU libiconv"])])
+
+  if test "$am_cv_func_iconv" = yes; then
+    AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
+
+    AC_CACHE_CHECK([if the declaration of iconv() needs const.],
+		   am_cv_proto_iconv_const,[
+      AC_TRY_COMPILE(CF__ICONV_HEAD [
+extern
+#ifdef __cplusplus
+"C"
+#endif
+#if defined(__STDC__) || defined(__cplusplus)
+size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
+#else
+size_t iconv();
+#endif
+],[], am_cv_proto_iconv_const=no,
+      am_cv_proto_iconv_const=yes)])
+
+    if test "$am_cv_proto_iconv_const" = yes ; then
+      am_cv_proto_iconv_arg1="const"
+    else
+      am_cv_proto_iconv_arg1=""
+    fi
+
+    AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
+      [Define as const if the declaration of iconv() needs const.])
+  fi
+
+  LIBICONV=
+  if test "$cf_cv_find_linkage_iconv" = yes; then
+    CF_ADD_INCDIR($cf_cv_header_path_iconv)
+    if test -n "$cf_cv_library_file_iconv" ; then
+      LIBICONV="-liconv"
+      CF_ADD_LIBDIR($cf_cv_library_path_iconv)
+    fi
+  fi
+
+  AC_SUBST(LIBICONV)
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl AM_LANGINFO_CODESET version: 3 updated: 2002/10/27 23:21:42
+dnl -------------------
+dnl Inserted as requested by gettext 0.10.40
+dnl File from /usr/share/aclocal
+dnl codeset.m4
+dnl ====================
+dnl serial AM1
+dnl
+dnl From Bruno Haible.
+AC_DEFUN([AM_LANGINFO_CODESET],
+[
+  AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
+    [AC_TRY_LINK([#include <langinfo.h>],
+      [char* cs = nl_langinfo(CODESET);],
+      am_cv_langinfo_codeset=yes,
+      am_cv_langinfo_codeset=no)
+    ])
+  if test $am_cv_langinfo_codeset = yes; then
+    AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
+      [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
+  fi
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl AM_LC_MESSAGES version: 4 updated: 2002/10/27 23:21:42
+dnl --------------
+dnl Inserted as requested by gettext 0.10.40
+dnl File from /usr/share/aclocal
+dnl lcmessage.m4
+dnl ====================
+dnl Check whether LC_MESSAGES is available in <locale.h>.
+dnl Ulrich Drepper <drepper@cygnus.com>, 1995.
+dnl
+dnl This file can be copied and used freely without restrictions.  It can
+dnl be used in projects which are not available under the GNU General Public
+dnl License or the GNU Library General Public License but which still want
+dnl to provide support for the GNU gettext functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+dnl
+dnl serial 2
+dnl
+AC_DEFUN([AM_LC_MESSAGES],
+  [if test $ac_cv_header_locale_h = yes; then
+    AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
+      [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
+       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
+    if test $am_cv_val_LC_MESSAGES = yes; then
+      AC_DEFINE(HAVE_LC_MESSAGES, 1,
+        [Define if your <locale.h> file defines LC_MESSAGES.])
+    fi
+  fi])dnl
+dnl ---------------------------------------------------------------------------
+dnl AM_PATH_PROG_WITH_TEST version: 8 updated: 2009/01/11 20:31:12
+dnl ----------------------
+dnl Inserted as requested by gettext 0.10.40
+dnl File from /usr/share/aclocal
+dnl progtest.m4
+dnl ====================
+dnl Search path for a program which passes the given test.
+dnl Ulrich Drepper <drepper@cygnus.com>, 1996.
+dnl
+dnl This file can be copied and used freely without restrictions.  It can
+dnl be used in projects which are not available under the GNU General Public
+dnl License or the GNU Library General Public License but which still want
+dnl to provide support for the GNU gettext functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+dnl
+dnl serial 2
+dnl
+dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
+dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
+AC_DEFUN([AM_PATH_PROG_WITH_TEST],
+[# Extract the first word of "$2", so it can be a program name with args.
+AC_REQUIRE([CF_PATHSEP])
+set dummy $2; ac_word=[$]2
+AC_MSG_CHECKING([for $ac_word])
+AC_CACHE_VAL(ac_cv_path_$1,
+[case "[$]$1" in
+  [[\\/]*|?:[\\/]]*)
+  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
+  for ac_dir in ifelse([$5], , $PATH, [$5]); do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word$ac_exeext; then
+      if [$3]; then
+	ac_cv_path_$1="$ac_dir/$ac_word$ac_exeext"
+	break
+      fi
+    fi
+  done
+  IFS="$ac_save_ifs"
+dnl If no 4th arg is given, leave the cache variable unset,
+dnl so AC_PATH_PROGS will keep looking.
+ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
+])dnl
+  ;;
+esac])dnl
+$1="$ac_cv_path_$1"
+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
+  AC_MSG_RESULT([$]$1)
+else
+  AC_MSG_RESULT(no)
+fi
+AC_SUBST($1)dnl
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl AM_WITH_NLS version: 23 updated: 2009/01/11 19:52:42
+dnl -----------
+dnl Inserted as requested by gettext 0.10.40
+dnl File from /usr/share/aclocal
+dnl gettext.m4
+dnl ====================
+dnl Macro to add for using GNU gettext.
+dnl Ulrich Drepper <drepper@cygnus.com>, 1995.
+dnl ====================
+dnl Modified to use CF_FIND_LINKAGE and CF_ADD_SEARCHPATH, to broaden the
+dnl range of locations searched.  Retain the same cache-variable naming to
+dnl allow reuse with the other gettext macros -Thomas E Dickey
+dnl ====================
+dnl
+dnl This file can be copied and used freely without restrictions.  It can
+dnl be used in projects which are not available under the GNU General Public
+dnl License or the GNU Library General Public License but which still want
+dnl to provide support for the GNU gettext functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+dnl
+dnl serial 10
+dnl
+dnl Usage: AM_WITH_NLS([TOOLSYMBOL], [NEEDSYMBOL], [LIBDIR], [ENABLED]).
+dnl If TOOLSYMBOL is specified and is 'use-libtool', then a libtool library
+dnl    $(top_builddir)/intl/libintl.la will be created (shared and/or static,
+dnl    depending on --{enable,disable}-{shared,static} and on the presence of
+dnl    AM-DISABLE-SHARED). Otherwise, a static library
+dnl    $(top_builddir)/intl/libintl.a will be created.
+dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
+dnl    implementations (in libc or libintl) without the ngettext() function
+dnl    will be ignored.
+dnl LIBDIR is used to find the intl libraries.  If empty,
+dnl    the value `$(top_builddir)/intl/' is used.
+dnl ENABLED is used to control the default for the related --enable-nls, since
+dnl    not all application developers want this feature by default, e.g., lynx.
+dnl
+dnl The result of the configuration is one of three cases:
+dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
+dnl    and used.
+dnl    Catalog format: GNU --> install in $(datadir)
+dnl    Catalog extension: .mo after installation, .gmo in source tree
+dnl 2) GNU gettext has been found in the system's C library.
+dnl    Catalog format: GNU --> install in $(datadir)
+dnl    Catalog extension: .mo after installation, .gmo in source tree
+dnl 3) No internationalization, always use English msgid.
+dnl    Catalog format: none
+dnl    Catalog extension: none
+dnl The use of .gmo is historical (it was needed to avoid overwriting the
+dnl GNU format catalogs when building on a platform with an X/Open gettext),
+dnl but we keep it in order not to force irrelevant filename changes on the
+dnl maintainers.
+dnl
+AC_DEFUN([AM_WITH_NLS],
+[AC_MSG_CHECKING([whether NLS is requested])
+  dnl Default is enabled NLS
+  ifelse([$4],,[
+  AC_ARG_ENABLE(nls,
+    [  --disable-nls           do not use Native Language Support],
+    USE_NLS=$enableval, USE_NLS=yes)],[
+  AC_ARG_ENABLE(nls,
+    [  --enable-nls            use Native Language Support],
+    USE_NLS=$enableval, USE_NLS=no)])
+  AC_MSG_RESULT($USE_NLS)
+  AC_SUBST(USE_NLS)
+
+  BUILD_INCLUDED_LIBINTL=no
+  USE_INCLUDED_LIBINTL=no
+  INTLLIBS=
+
+  dnl If we use NLS figure out what method
+  if test "$USE_NLS" = "yes"; then
+    AC_DEFINE(ENABLE_NLS, 1,
+      [Define to 1 if translation of program messages to the user's native language
+ is requested.])
+    AC_MSG_CHECKING([whether included gettext is requested])
+    AC_ARG_WITH(included-gettext,
+      [  --with-included-gettext use the GNU gettext library included here],
+      nls_cv_force_use_gnu_gettext=$withval,
+      nls_cv_force_use_gnu_gettext=no)
+    AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
+
+    nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
+    if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
+      dnl User does not insist on using GNU NLS library.  Figure out what
+      dnl to use.  If GNU gettext is available we use this.  Else we have
+      dnl to fall back to GNU NLS library.
+      CATOBJEXT=NONE
+
+      cf_save_LIBS_1="$LIBS"
+      LIBS="$LIBICONV $LIBS"
+      AC_CACHE_CHECK([for libintl.h and gettext()], cf_cv_func_gettext,[
+        CF_FIND_LINKAGE(CF__INTL_HEAD,
+        CF__INTL_BODY,
+        intl,
+        cf_cv_func_gettext=yes,
+        cf_cv_func_gettext=no)
+      ])
+      LIBS="$cf_save_LIBS_1"
+
+      if test "$cf_cv_func_gettext" = yes ; then
+        AC_DEFINE(HAVE_LIBINTL_H)
+
+        dnl If an already present or preinstalled GNU gettext() is found,
+        dnl use it.  But if this macro is used in GNU gettext, and GNU
+        dnl gettext is already preinstalled in libintl, we update this
+        dnl libintl.  (Cf. the install rule in intl/Makefile.in.)
+        if test "$PACKAGE" != gettext; then
+          AC_DEFINE(HAVE_GETTEXT, 1,
+              [Define if the GNU gettext() function is already present or preinstalled.])
+
+          CF_ADD_INCDIR($cf_cv_header_path_intl)
+
+          if test -n "$cf_cv_library_file_intl" ; then
+            dnl If iconv() is in a separate libiconv library, then anyone
+            dnl linking with libintl{.a,.so} also needs to link with
+            dnl libiconv.
+            INTLLIBS="$cf_cv_library_file_intl $LIBICONV"
+            CF_ADD_LIBDIR($cf_cv_library_path_intl,INTLLIBS)
+          fi
+
+          gt_save_LIBS="$LIBS"
+          LIBS="$LIBS $INTLLIBS"
+          AC_CHECK_FUNCS(dcgettext)
+          LIBS="$gt_save_LIBS"
+
+          dnl Search for GNU msgfmt in the PATH.
+          AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+              [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1], :)
+          AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+
+          dnl Search for GNU xgettext in the PATH.
+          AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+              [$ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1], :)
+
+          CATOBJEXT=.gmo
+        fi
+      fi
+
+      if test "$CATOBJEXT" = "NONE"; then
+        dnl GNU gettext is not found in the C library.
+        dnl Fall back on GNU gettext library.
+        nls_cv_use_gnu_gettext=yes
+      fi
+    fi
+
+    if test "$nls_cv_use_gnu_gettext" = "yes"; then
+      if test ! -d $srcdir/intl ; then
+        AC_MSG_ERROR(no NLS library is packaged with this application)
+      fi
+      dnl Mark actions used to generate GNU NLS library.
+      INTLOBJS="\$(GETTOBJS)"
+      AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+          [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1], :)
+      AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+      AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+          [$ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1], :)
+      AC_SUBST(MSGFMT)
+      BUILD_INCLUDED_LIBINTL=yes
+      USE_INCLUDED_LIBINTL=yes
+      CATOBJEXT=.gmo
+      INTLLIBS="ifelse([$3],[],\$(top_builddir)/intl,[$3])/libintl.ifelse([$1], use-libtool, [l], [])a $LIBICONV"
+      LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
+    fi
+
+    dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
+    dnl Test whether we really found GNU msgfmt.
+    if test "$GMSGFMT" != ":"; then
+      dnl If it is no GNU msgfmt we define it as : so that the
+      dnl Makefiles still can work.
+      if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then
+        : ;
+      else
+        AC_MSG_RESULT(
+          [found msgfmt program is not GNU msgfmt; ignore it])
+        GMSGFMT=":"
+      fi
+    fi
+
+    dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
+    dnl Test whether we really found GNU xgettext.
+    if test "$XGETTEXT" != ":"; then
+        dnl If it is no GNU xgettext we define it as : so that the
+        dnl Makefiles still can work.
+      if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then
+        : ;
+      else
+        AC_MSG_RESULT(
+          [found xgettext program is not GNU xgettext; ignore it])
+        XGETTEXT=":"
+      fi
+    fi
+
+    dnl We need to process the po/ directory.
+    POSUB=po
+  fi
+
+  AC_OUTPUT_COMMANDS(
+   [for ac_file in $CONFIG_FILES; do
+
+      # Support "outfile[:infile[:infile...]]"
+      case "$ac_file" in
+        *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+      esac
+
+      # PO directories have a Makefile.in generated from Makefile.inn.
+      case "$ac_file" in */[Mm]akefile.in)
+        # Adjust a relative srcdir.
+        ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+        ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+        ac_base=`basename $ac_file .in`
+        # In autoconf-2.13 it is called $ac_given_srcdir.
+        # In autoconf-2.50 it is called $srcdir.
+        test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
+
+        case "$ac_given_srcdir" in
+          .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+          /*) top_srcdir="$ac_given_srcdir" ;;
+          *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
+        esac
+
+        if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
+          rm -f "$ac_dir/POTFILES"
+          test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
+          sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," -e "\$s/\(.*\) \\\\/\1/" < "$ac_given_srcdir/$ac_dir/POTFILES.in" > "$ac_dir/POTFILES"
+          test -n "$as_me" && echo "$as_me: creating $ac_dir/$ac_base" || echo "creating $ac_dir/$ac_base"
+          sed -e "/POTFILES =/r $ac_dir/POTFILES" "$ac_dir/$ac_base.in" > "$ac_dir/$ac_base"
+        fi
+        ;;
+      esac
+    done])
+
+  dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
+  dnl to 'yes' because some of the testsuite requires it.
+  if test "$PACKAGE" = gettext; then
+    BUILD_INCLUDED_LIBINTL=yes
+  fi
+
+  dnl intl/plural.c is generated from intl/plural.y. It requires bison,
+  dnl because plural.y uses bison specific features. It requires at least
+  dnl bison-1.26 because earlier versions generate a plural.c that doesn't
+  dnl compile.
+  dnl bison is only needed for the maintainer (who touches plural.y). But in
+  dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
+  dnl the rule in general Makefile. Now, some people carelessly touch the
+  dnl files or have a broken "make" program, hence the plural.c rule will
+  dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
+  dnl present or too old.
+  if test "$nls_cv_use_gnu_gettext" = "yes"; then
+    AC_CHECK_PROGS([INTLBISON], [bison])
+    if test -z "$INTLBISON"; then
+      ac_verc_fail=yes
+    else
+      dnl Found it, now check the version.
+      AC_MSG_CHECKING([version of bison])
+changequote(<<,>>)dnl
+      ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
+      case $ac_prog_version in
+        '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
+        1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
+changequote([,])dnl
+           ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
+        *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
+      esac
+    AC_MSG_RESULT([$ac_prog_version])
+    fi
+    if test $ac_verc_fail = yes; then
+      INTLBISON=:
+    fi
+  fi
+
+  dnl These rules are solely for the distribution goal.  While doing this
+  dnl we only have to keep exactly one list of the available catalogs
+  dnl in configure.in.
+  for lang in $ALL_LINGUAS; do
+    GMOFILES="$GMOFILES $lang.gmo"
+    POFILES="$POFILES $lang.po"
+  done
+
+  dnl Make all variables we use known to autoconf.
+  AC_SUBST(BUILD_INCLUDED_LIBINTL)
+  AC_SUBST(USE_INCLUDED_LIBINTL)
+  AC_SUBST(CATALOGS)
+  AC_SUBST(CATOBJEXT)
+  AC_SUBST(GMOFILES)
+  AC_SUBST(INTLLIBS)
+  AC_SUBST(INTLOBJS)
+  AC_SUBST(POFILES)
+  AC_SUBST(POSUB)
+
+  dnl For backward compatibility. Some configure.ins may be using this.
+  nls_cv_header_intl=
+  nls_cv_header_libgt=
+
+  dnl For backward compatibility. Some Makefiles may be using this.
+  DATADIRNAME=share
+  AC_SUBST(DATADIRNAME)
+
+  dnl For backward compatibility. Some Makefiles may be using this.
+  INSTOBJEXT=.mo
+  AC_SUBST(INSTOBJEXT)
+
+  dnl For backward compatibility. Some Makefiles may be using this.
+  GENCAT=gencat
+  AC_SUBST(GENCAT)
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_AC_PREREQ version: 2 updated: 1997/09/06 13:24:56
+dnl ------------
+dnl Conditionally generate script according to whether we're using the release
+dnl version of autoconf, or a patched version (using the ternary component as
+dnl the patch-version).
+define(CF_AC_PREREQ,
+[CF_PREREQ_COMPARE(
+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 -------------
+dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS
+dnl The second parameter if given makes this macro verbose.
+dnl
+dnl Put any preprocessor definitions that use quoted strings in $EXTRA_CPPFLAGS,
+dnl to simplify use of $CPPFLAGS in compiler checks, etc., that are easily
+dnl confused by the quotes (which require backslashes to keep them usable).
+AC_DEFUN([CF_ADD_CFLAGS],
+[
+cf_fix_cppflags=no
+cf_new_cflags=
+cf_new_cppflags=
+cf_new_extra_cppflags=
+
+for cf_add_cflags in $1
+do
+case $cf_fix_cppflags in
+no)
+	case $cf_add_cflags in #(vi
+	-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
+		case $cf_add_cflags in
+		-D*)
+			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[[^=]]*='\''\"[[^"]]*//'`
+
+			test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+				&& test -z "${cf_tst_cflags}" \
+				&& cf_fix_cppflags=yes
+
+			if test $cf_fix_cppflags = yes ; then
+				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+				continue
+			elif test "${cf_tst_cflags}" = "\"'" ; then
+				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+				continue
+			fi
+			;;
+		esac
+		case "$CPPFLAGS" in
+		*$cf_add_cflags) #(vi
+			;;
+		*) #(vi
+			case $cf_add_cflags in #(vi
+			-D*)
+				cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
+				CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,$cf_tst_cppflags)
+				;;
+			esac
+			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+			;;
+		esac
+		;;
+	*)
+		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+		;;
+	esac
+	;;
+yes)
+	cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[[^"]]*"'\''//'`
+
+	test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+		&& test -z "${cf_tst_cflags}" \
+		&& cf_fix_cppflags=no
+	;;
+esac
+done
+
+if test -n "$cf_new_cflags" ; then
+	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)])
+	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)])
+	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+fi
+
+AC_SUBST(EXTRA_CPPFLAGS)
+
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_ADD_INCDIR version: 12 updated: 2009/01/18 10:00:47
+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,
+dnl but old versions (and some misinstalled ones) need that.  To make things
+dnl worse, gcc 3.x may give error messages if -I/usr/local/include is added to
+dnl the include-path).
+AC_DEFUN([CF_ADD_INCDIR],
+[
+if test -n "$1" ; then
+  for cf_add_incdir in $1
+  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"
+			  AC_TRY_COMPILE([#include <stdio.h>],
+				  [printf("Hello")],
+				  [],
+				  [cf_have_incdir=yes])
+			  CPPFLAGS=$cf_save_CPPFLAGS
+			fi
+		  fi
+		fi
+
+		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"
+
+		  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
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_ADD_LIBDIR version: 8 updated: 2009/01/18 10:01:08
+dnl -------------
+dnl	Adds to the library-path
+dnl
+dnl	Some machines have trouble with multiple -L options.
+dnl
+dnl $1 is the (list of) directory(s) to add
+dnl $2 is the optional name of the variable to update (default LDFLAGS)
+dnl
+AC_DEFUN([CF_ADD_LIBDIR],
+[
+if test -n "$1" ; then
+  for cf_add_libdir in $1
+  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
+        CF_VERBOSE(adding $cf_add_libdir to library-path)
+        ifelse($2,,LDFLAGS,$2)="-L$cf_add_libdir $ifelse($2,,LDFLAGS,$2)"
+      fi
+    fi
+  done
+fi
+])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.
+dnl See CF_WITH_PATH
+dnl
+dnl $1 = shell variable containing the result of --with-XXX=[DIR]
+dnl $2 = module to look for.
+AC_DEFUN([CF_ADD_OPTIONAL_PATH],[
+  case "$1" in #(vi
+  no) #(vi
+      ;;
+  yes) #(vi
+      ;;
+  *)
+      CF_ADD_SEARCHPATH([$1], [AC_MSG_ERROR(cannot find $2 under $1)])
+      ;;
+  esac
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_ADD_SEARCHPATH version: 5 updated: 2009/01/11 20:40:21
+dnl -----------------
+dnl Set $CPPFLAGS and $LDFLAGS with the directories given via the parameter.
+dnl They can be either the common root of include- and lib-directories, or the
+dnl lib-directory (to allow for things like lib64 directories).
+dnl See also CF_FIND_LINKAGE.
+dnl
+dnl $1 is the list of colon-separated directory names to search.
+dnl $2 is the action to take if a parameter does not yield a directory.
+AC_DEFUN([CF_ADD_SEARCHPATH],
+[
+AC_REQUIRE([CF_PATHSEP])
+for cf_searchpath in `echo "$1" | tr $PATH_SEPARATOR ' '`; do
+	if test -d $cf_searchpath/include; then
+		CF_ADD_INCDIR($cf_searchpath/include)
+	elif test -d $cf_searchpath/../include ; then
+		CF_ADD_INCDIR($cf_searchpath/../include)
+	ifelse([$2],,,[else
+$2])
+	fi
+	if test -d $cf_searchpath/lib; then
+		CF_ADD_LIBDIR($cf_searchpath/lib)
+	elif test -d $cf_searchpath ; then
+		CF_ADD_LIBDIR($cf_searchpath)
+	ifelse([$2],,,[else
+$2])
+	fi
+done
+])
+dnl ---------------------------------------------------------------------------
+dnl CF_ADD_SUBDIR_PATH version: 2 updated: 2007/07/29 10:12:59
+dnl ------------------
+dnl Append to a search-list for a nonstandard header/lib-file
+dnl	$1 = the variable to return as result
+dnl	$2 = the package name
+dnl	$3 = the subdirectory, e.g., bin, include or lib
+dnl $4 = the directory under which we will test for subdirectories
+dnl $5 = a directory that we do not want $4 to match
+AC_DEFUN([CF_ADD_SUBDIR_PATH],
+[
+test "$4" != "$5" && \
+test -d "$4" && \
+ifelse([$5],NONE,,[(test $5 = NONE || test -d $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"
+	test -d $4/$3/$2/$3 &&    $1="[$]$1 $4/$3/$2/$3"
+	test -d $4/$2/$3 &&       $1="[$]$1 $4/$2/$3"
+	test -d $4/$2/$3/$2 &&    $1="[$]$1 $4/$2/$3/$2"
+}
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_ARG_DISABLE version: 3 updated: 1999/03/30 17:24:31
+dnl --------------
+dnl Allow user to disable a normally-on option.
+AC_DEFUN([CF_ARG_DISABLE],
+[CF_ARG_OPTION($1,[$2],[$3],[$4],yes)])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_ARG_ENABLE version: 3 updated: 1999/03/30 17:24:31
+dnl -------------
+dnl Allow user to enable a normally-off option.
+AC_DEFUN([CF_ARG_ENABLE],
+[CF_ARG_OPTION($1,[$2],[$3],[$4],no)])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_ARG_MSG_ENABLE version: 2 updated: 2000/07/29 19:32:03
+dnl -----------------
+dnl Verbose form of AC_ARG_ENABLE:
+dnl
+dnl Parameters:
+dnl $1 = message
+dnl $2 = option name
+dnl $3 = help-string
+dnl $4 = action to perform if option is enabled
+dnl $5 = action if perform if option is disabled
+dnl $6 = default option value (either 'yes' or 'no')
+AC_DEFUN([CF_ARG_MSG_ENABLE],[
+AC_MSG_CHECKING($1)
+AC_ARG_ENABLE($2,[$3],,enableval=ifelse($6,,no,$6))
+AC_MSG_RESULT($enableval)
+if test "$enableval" != no ; then
+ifelse($4,,[	:],$4)
+else
+ifelse($5,,[	:],$5)
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_ARG_OPTION version: 3 updated: 1997/10/18 14:42:41
+dnl -------------
+dnl Restricted form of AC_ARG_ENABLE that ensures user doesn't give bogus
+dnl values.
+dnl
+dnl Parameters:
+dnl $1 = option name
+dnl $2 = help-string
+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)
+  if test "$enableval" != "$5" ; then
+ifelse($3,,[    :]dnl
+,[    $3]) ifelse($4,,,[
+  else
+    $4])
+  fi],[enableval=$5 ifelse($4,,,[
+  $4
+])dnl
+  ])])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_BUNDLED_INTL version: 14 updated: 2010/01/17 20:37:27
+dnl ---------------
+dnl Top-level macro for configuring an application with a bundled copy of
+dnl the intl and po directories for gettext.
+dnl
+dnl $1 specifies either Makefile or makefile, defaulting to the former.
+dnl $2 if nonempty sets the option to --enable-nls rather than to --disable-nls
+dnl
+dnl Sets variables which can be used to substitute in makefiles:
+dnl	GT_YES       - "#" comment unless building intl library, otherwise empty
+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	HAVE_LIBGETTEXT_H if we're using ./intl
+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	VERSION may be set, otherwise extract from "VERSION" file.
+dnl
+AC_DEFUN([CF_BUNDLED_INTL],[
+cf_makefile=ifelse($1,,Makefile,$1)
+
+dnl Set of available languages (based on source distribution).  Note that
+dnl setting $LINGUAS overrides $ALL_LINGUAS.  Some environments set $LINGUAS
+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}
+AC_SUBST(CONFIG_H)
+
+if test -z "$VERSION" ; then
+if test -f $srcdir/VERSION ; then
+	VERSION=`sed -e '2,$d' $srcdir/VERSION|cut -f1`
+else
+	VERSION=unknown
+fi
+fi
+AC_SUBST(VERSION)
+
+AM_GNU_GETTEXT(,,,[$2])
+
+INTLDIR_MAKE=
+MSG_DIR_MAKE=
+SUB_MAKEFILE=
+
+dnl this updates SUB_MAKEFILE and MSG_DIR_MAKE:
+CF_OUR_MESSAGES($1)
+
+if test "$USE_INCLUDED_LIBINTL" = yes ; then
+        if test "$nls_cv_force_use_gnu_gettext" = yes ; then
+		:
+	elif test "$nls_cv_use_gnu_gettext" = yes ; then
+		:
+	else
+		INTLDIR_MAKE="#"
+	fi
+	if test -z "$INTLDIR_MAKE"; then
+		AC_DEFINE(HAVE_LIBGETTEXT_H)
+		for cf_makefile in \
+			$srcdir/intl/Makefile.in \
+			$srcdir/intl/makefile.in
+		do
+			if test -f "$cf_makefile" ; then
+				SUB_MAKEFILE="$SUB_MAKEFILE `echo \"${cf_makefile}\"|sed -e 's,^'$srcdir/',,' -e 's/\.in$//'`:${cf_makefile}"
+				break
+			fi
+		done
+	fi
+else
+	INTLDIR_MAKE="#"
+	if test "$USE_NLS" = yes ; then
+		AC_CHECK_HEADERS(libintl.h)
+	fi
+fi
+
+if test -z "$INTLDIR_MAKE" ; then
+	CPPFLAGS="$CPPFLAGS -I../intl"
+fi
+
+dnl FIXME:  we use this in lynx (the alternative is a spurious dependency upon
+dnl GNU make)
+if test "$BUILD_INCLUDED_LIBINTL" = yes ; then
+	GT_YES="#"
+	GT_NO=
+else
+	GT_YES=
+	GT_NO="#"
+fi
+
+AC_SUBST(INTLDIR_MAKE)
+AC_SUBST(MSG_DIR_MAKE)
+AC_SUBST(GT_YES)
+AC_SUBST(GT_NO)
+
+dnl FIXME:  the underlying AM_GNU_GETTEXT macro either needs some fixes or a
+dnl little documentation.  It doesn't define anything so that we can ifdef our
+dnl own code, except ENABLE_NLS, which is too vague to be of any use.
+
+if test "$USE_INCLUDED_LIBINTL" = yes ; then
+	if test "$nls_cv_force_use_gnu_gettext" = yes ; then
+		AC_DEFINE(HAVE_GETTEXT)
+	elif test "$nls_cv_use_gnu_gettext" = yes ; then
+		AC_DEFINE(HAVE_GETTEXT)
+	fi
+	if test -n "$nls_cv_header_intl" ; then
+		AC_DEFINE(HAVE_LIBINTL_H)
+	fi
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_CHECK_CACHE version: 11 updated: 2008/03/23 14:45:59
+dnl --------------
+dnl Check if we're accidentally using a cache from a different machine.
+dnl Derive the system name, as a check for reusing the autoconf cache.
+dnl
+dnl If we've packaged config.guess and config.sub, run that (since it does a
+dnl better job than uname).  Normally we'll use AC_CANONICAL_HOST, but allow
+dnl an extra parameter that we may override, e.g., for AC_CANONICAL_SYSTEM
+dnl which is useful in cross-compiles.
+dnl
+dnl Note: we would use $ac_config_sub, but that is one of the places where
+dnl autoconf 2.5x broke compatibility with autoconf 2.13
+AC_DEFUN([CF_CHECK_CACHE],
+[
+if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then
+	ifelse([$1],,[AC_CANONICAL_HOST],[$1])
+	system_name="$host_os"
+else
+	system_name="`(uname -s -r) 2>/dev/null`"
+	if test -z "$system_name" ; then
+		system_name="`(hostname) 2>/dev/null`"
+	fi
+fi
+test -n "$system_name" && AC_DEFINE_UNQUOTED(SYSTEM_NAME,"$system_name")
+AC_CACHE_VAL(cf_cv_system_name,[cf_cv_system_name="$system_name"])
+
+test -z "$system_name" && system_name="$cf_cv_system_name"
+test -n "$cf_cv_system_name" && AC_MSG_RESULT(Configuring for $cf_cv_system_name)
+
+if test ".$system_name" != ".$cf_cv_system_name" ; then
+	AC_MSG_RESULT(Cached system name ($system_name) does not agree with actual ($cf_cv_system_name))
+	AC_MSG_ERROR("Please remove config.cache and try again.")
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_CURSES_CHTYPE version: 6 updated: 2003/11/06 19:59:57
+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}>],
+		[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}>],
+			[chtype foo; long x = foo],
+			[cf_cv_chtype_type=scalar],
+			[cf_cv_chtype_type=struct])])
+	if test $cf_cv_chtype_type = scalar ; then
+		AC_DEFINE(TYPE_CHTYPE_IS_SCALAR)
+	fi
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_CURSES_CONFIG version: 2 updated: 2006/10/29 11:06:27
+dnl ----------------
+dnl Tie together the configure-script macros for curses.  It may be ncurses,
+dnl but unless asked, we do not make a special search for ncurses.  However,
+dnl still check for the ncurses version number, for use in other macros.
+AC_DEFUN([CF_CURSES_CONFIG],
+[
+CF_CURSES_CPPFLAGS
+CF_NCURSES_VERSION
+CF_CURSES_LIBS
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_CURSES_CPPFLAGS version: 10 updated: 2009/01/06 19:34:11
+dnl ------------------
+dnl Look for the curses headers.
+AC_DEFUN([CF_CURSES_CPPFLAGS],[
+
+AC_CACHE_CHECK(for extra include directories,cf_cv_curses_incdir,[
+cf_cv_curses_incdir=no
+case $host_os in #(vi
+hpux10.*) #(vi
+	test -d /usr/include/curses_colr && \
+	cf_cv_curses_incdir="-I/usr/include/curses_colr"
+	;;
+sunos3*|sunos4*)
+	test -d /usr/5lib && \
+	test -d /usr/5include && \
+	cf_cv_curses_incdir="-I/usr/5include"
+	;;
+esac
+])
+test "$cf_cv_curses_incdir" != no && CPPFLAGS="$CPPFLAGS $cf_cv_curses_incdir"
+
+CF_CURSES_HEADER
+CF_TERM_HEADER
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_CURSES_FUNCS version: 14 updated: 2009/07/16 19:34:55
+dnl ---------------
+dnl Curses-functions are a little complicated, since a lot of them are macros.
+AC_DEFUN([CF_CURSES_FUNCS],
+[
+AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl
+AC_REQUIRE([CF_XOPEN_CURSES])
+AC_REQUIRE([CF_CURSES_TERM_H])
+for cf_func in $1
+do
+	CF_UPPER(cf_tr_func,$cf_func)
+	AC_MSG_CHECKING(for ${cf_func})
+	CF_MSG_LOG(${cf_func})
+	AC_CACHE_VAL(cf_cv_func_$cf_func,[
+		eval cf_result='$ac_cv_func_'$cf_func
+		if test ".$cf_result" != ".no"; then
+			AC_TRY_LINK(CF__CURSES_HEAD,
+			[
+#ifndef ${cf_func}
+long foo = (long)(&${cf_func});
+${cf_cv_main_return-return}(foo == 0);
+#endif
+			],
+			[cf_result=yes],
+			[cf_result=no])
+		fi
+		eval 'cf_cv_func_'$cf_func'=$cf_result'
+	])
+	# use the computed/retrieved cache-value:
+	eval 'cf_result=$cf_cv_func_'$cf_func
+	AC_MSG_RESULT($cf_result)
+	if test $cf_result != no; then
+		AC_DEFINE_UNQUOTED(HAVE_${cf_tr_func})
+	fi
+done
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_CURSES_HEADER version: 1 updated: 2005/12/31 13:28:25
+dnl ----------------
+dnl Find a "curses" header file, e.g,. "curses.h", or one of the more common
+dnl variations of ncurses' installs.
+dnl
+dnl See also CF_NCURSES_HEADER, which sets the same cache variable.
+AC_DEFUN([CF_CURSES_HEADER],[
+AC_CACHE_CHECK(if we have identified curses headers,cf_cv_ncurses_header,[
+cf_cv_ncurses_header=none
+for cf_header in \
+	curses.h \
+	ncurses.h \
+	ncurses/curses.h \
+	ncurses/ncurses.h
+do
+AC_TRY_COMPILE([#include <${cf_header}>],
+	[initscr(); tgoto("?", 0,0)],
+	[cf_cv_ncurses_header=$cf_header; break],[])
+done
+])
+
+if test "$cf_cv_ncurses_header" = none ; then
+	AC_MSG_ERROR(No curses header-files found)
+fi
+
+# cheat, to get the right #define's for HAVE_NCURSES_H, etc.
+AC_CHECK_HEADERS($cf_cv_ncurses_header)
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_CURSES_LIBS version: 29 updated: 2009/01/06 19:34:57
+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.
+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}>],
+    [initscr(); tgoto("?", 0,0)],
+    cf_result=yes,
+    cf_result=no)
+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"])
+    ;;
+hpux10.*) #(vi
+    AC_CHECK_LIB(cur_colr,initscr,[
+        LIBS="-lcur_colr $LIBS"
+        ac_cv_func_initscr=yes
+        ],[
+    AC_CHECK_LIB(Hcurses,initscr,[
+        # HP's header uses __HP_CURSES, but user claims _HP_CURSES.
+        LIBS="-lHcurses $LIBS"
+        CPPFLAGS="$CPPFLAGS -D__HP_CURSES -D_HP_CURSES"
+        ac_cv_func_initscr=yes
+        ])])
+    ;;
+linux*) # Suse Linux does not follow /usr/lib convention
+    CF_ADD_LIBDIR(/lib)
+    ;;
+sunos3*|sunos4*)
+    if test -d /usr/5lib ; then
+      CF_ADD_LIBDIR(/usr/5lib)
+      LIBS="$LIBS -lcurses -ltermcap"
+    fi
+    ac_cv_func_initscr=yes
+    ;;
+esac
+
+if test ".$ac_cv_func_initscr" != .yes ; then
+    cf_save_LIBS="$LIBS"
+    cf_term_lib=""
+    cf_curs_lib=""
+
+    if test ".${cf_cv_ncurses_version-no}" != .no
+    then
+        cf_check_list="ncurses curses cursesX"
+    else
+        cf_check_list="cursesX curses ncurses"
+    fi
+
+    # Check for library containing tgoto.  Do this before curses library
+    # because it may be needed to link the test-case for initscr.
+    AC_CHECK_FUNC(tgoto,[cf_term_lib=predefined],[
+        for cf_term_lib in $cf_check_list termcap termlib unknown
+        do
+            AC_CHECK_LIB($cf_term_lib,tgoto,[break])
+        done
+    ])
+
+    # Check for library containing initscr
+    test "$cf_term_lib" != predefined && test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS"
+ 	for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown
+    do
+        AC_CHECK_LIB($cf_curs_lib,initscr,[break])
+    done
+    test $cf_curs_lib = unknown && AC_MSG_ERROR(no curses library found)
+
+    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}>],
+            [initscr()],
+            [cf_result=yes],
+            [cf_result=no])
+        AC_MSG_RESULT($cf_result)
+        test $cf_result = no && AC_MSG_ERROR(Cannot link curses library)
+    elif test "$cf_curs_lib" = "$cf_term_lib" ; 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}>],
+            [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}>],
+                [initscr()],
+                [cf_result=yes],
+                [cf_result=error])
+            ])
+        AC_MSG_RESULT($cf_result)
+    fi
+fi
+fi
+
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_CURSES_TERM_H version: 6 updated: 2003/11/06 19:59:57
+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,
+dnl as well as in misconfigured systems (e.g., gcc configured for Solaris 2.4
+dnl running with Solaris 2.5.1).
+AC_DEFUN([CF_CURSES_TERM_H],
+[
+AC_CACHE_CHECK(for term.h, cf_cv_term_header,[
+
+AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl
+# If we found <ncurses/curses.h>, look for <ncurses/term.h>, but always look
+# for <term.h> if we do not find the variant.
+for cf_header in \
+	`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_header}>],
+	[WINDOW *x],
+	[cf_cv_term_header=$cf_header
+	 break],
+	[cf_cv_term_header=no])
+done
+])
+
+case $cf_cv_term_header in #(vi
+term.h) #(vi
+	AC_DEFINE(HAVE_TERM_H)
+	;;
+ncurses/term.h)
+	AC_DEFINE(HAVE_NCURSES_TERM_H)
+	;;
+ncursesw/term.h)
+	AC_DEFINE(HAVE_NCURSESW_TERM_H)
+	;;
+esac
+])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.
+AC_DEFUN([CF_DIRNAME],[$1=`echo $2 | sed -e 's%/[[^/]]*$%%'`])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_DISABLE_ECHO version: 11 updated: 2009/12/13 13:16:57
+dnl ---------------
+dnl You can always use "make -n" to see the actual options, but it's hard to
+dnl pick out/analyze warning messages when the compile-line is long.
+dnl
+dnl Sets:
+dnl	ECHO_LT - symbol to control if libtool is verbose
+dnl	ECHO_LD - symbol to prefix "cc -o" lines
+dnl	RULE_CC - symbol to put before implicit "cc -c" lines (e.g., .c.o)
+dnl	SHOW_CC - symbol to put before explicit "cc -c" lines
+dnl	ECHO_CC - symbol to put before any "cc" line
+dnl
+AC_DEFUN([CF_DISABLE_ECHO],[
+AC_MSG_CHECKING(if you want to see long compiling messages)
+CF_ARG_DISABLE(echo,
+	[  --disable-echo          display "compiling" commands],
+	[
+    ECHO_LT='--silent'
+    ECHO_LD='@echo linking [$]@;'
+    RULE_CC='@echo compiling [$]<'
+    SHOW_CC='@echo compiling [$]@'
+    ECHO_CC='@'
+],[
+    ECHO_LT=''
+    ECHO_LD=''
+    RULE_CC=''
+    SHOW_CC=''
+    ECHO_CC=''
+])
+AC_MSG_RESULT($enableval)
+AC_SUBST(ECHO_LT)
+AC_SUBST(ECHO_LD)
+AC_SUBST(RULE_CC)
+AC_SUBST(SHOW_CC)
+AC_SUBST(ECHO_CC)
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_FIND_HEADER version: 2 updated: 2007/07/29 11:32:00
+dnl --------------
+dnl Find a header file, searching for it if it is not already in the include
+dnl path.
+dnl
+dnl	$1 = the header filename
+dnl	$2 = the package name
+dnl	$3 = action to perform if successful
+dnl	$4 = action to perform if not successful
+AC_DEFUN([CF_FIND_HEADER],[
+AC_CHECK_HEADER([$1],
+	cf_find_header=yes,[
+	cf_find_header=no
+CF_HEADER_PATH(cf_search,$2)
+for cf_incdir in $cf_search
+do
+	if test -f $cf_incdir/$1 ; then
+		CF_ADD_INCDIR($cf_incdir)
+		CF_VERBOSE(... found in $cf_incdir)
+		cf_find_header=yes
+		break
+	fi
+	CF_VERBOSE(... tested $cf_incdir)
+done
+])
+if test "$cf_find_header" = yes ; then
+ifelse([$3],,:,[$3])
+ifelse([$4],,,[else
+$4])
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_FIND_LIBRARY version: 9 updated: 2008/03/23 14:48:54
+dnl ---------------
+dnl Look for a non-standard library, given parameters for AC_TRY_LINK.  We
+dnl prefer a standard location, and use -L options only if we do not find the
+dnl library in the standard library location(s).
+dnl	$1 = library name
+dnl	$2 = library class, usually the same as library name
+dnl	$3 = includes
+dnl	$4 = code fragment to compile/link
+dnl	$5 = corresponding function-name
+dnl	$6 = flag, nonnull if failure should not cause an error-exit
+dnl
+dnl Sets the variable "$cf_libdir" as a side-effect, so we can see if we had
+dnl to use a -L option.
+AC_DEFUN([CF_FIND_LIBRARY],
+[
+	eval 'cf_cv_have_lib_'$1'=no'
+	cf_libdir=""
+	AC_CHECK_FUNC($5,
+		eval 'cf_cv_have_lib_'$1'=yes',[
+		cf_save_LIBS="$LIBS"
+		AC_MSG_CHECKING(for $5 in -l$1)
+		LIBS="-l$1 $LIBS"
+		AC_TRY_LINK([$3],[$4],
+			[AC_MSG_RESULT(yes)
+			 eval 'cf_cv_have_lib_'$1'=yes'
+			],
+			[AC_MSG_RESULT(no)
+			CF_LIBRARY_PATH(cf_search,$2)
+			for cf_libdir in $cf_search
+			do
+				AC_MSG_CHECKING(for -l$1 in $cf_libdir)
+				LIBS="-L$cf_libdir -l$1 $cf_save_LIBS"
+				AC_TRY_LINK([$3],[$4],
+					[AC_MSG_RESULT(yes)
+			 		 eval 'cf_cv_have_lib_'$1'=yes'
+					 break],
+					[AC_MSG_RESULT(no)
+					 LIBS="$cf_save_LIBS"])
+			done
+			])
+		])
+eval 'cf_found_library=[$]cf_cv_have_lib_'$1
+ifelse($6,,[
+if test $cf_found_library = no ; then
+	AC_MSG_ERROR(Cannot link $1 library)
+fi
+])
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_FIND_LINKAGE version: 13 updated: 2008/12/24 07:59:55
+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.
+dnl See also CF_ADD_SEARCHPATH.
+dnl
+dnl Parameters (4-on are optional):
+dnl     $1 = headers for library entrypoint
+dnl     $2 = code fragment for library entrypoint
+dnl     $3 = the library name without the "-l" option or ".so" suffix.
+dnl     $4 = action to perform if successful (default: update CPPFLAGS, etc)
+dnl     $5 = action to perform if not successful
+dnl     $6 = module name, if not the same as the library name
+dnl     $7 = extra libraries
+dnl
+dnl Sets these variables:
+dnl     $cf_cv_find_linkage_$3 - yes/no according to whether linkage is found
+dnl     $cf_cv_header_path_$3 - include-directory if needed
+dnl     $cf_cv_library_path_$3 - library-directory if needed
+dnl     $cf_cv_library_file_$3 - library-file if needed, e.g., -l$3
+AC_DEFUN([CF_FIND_LINKAGE],[
+
+# If the linkage is not already in the $CPPFLAGS/$LDFLAGS configuration, these
+# will be set on completion of the AC_TRY_LINK below.
+cf_cv_header_path_$3=
+cf_cv_library_path_$3=
+
+CF_MSG_LOG([Starting [FIND_LINKAGE]($3,$6)])
+
+AC_TRY_LINK([$1],[$2],
+    cf_cv_find_linkage_$3=yes,[
+    cf_cv_find_linkage_$3=no
+
+    CF_VERBOSE(find linkage for $3 library)
+    CF_MSG_LOG([Searching for headers in [FIND_LINKAGE]($3,$6)])
+
+    cf_save_CPPFLAGS="$CPPFLAGS"
+    cf_test_CPPFLAGS="$CPPFLAGS"
+
+    CF_HEADER_PATH(cf_search,ifelse([$6],,[$3],[$6]))
+    for cf_cv_header_path_$3 in $cf_search
+    do
+      if test -d $cf_cv_header_path_$3 ; then
+        CF_VERBOSE(... testing $cf_cv_header_path_$3)
+        CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_$3"
+        AC_TRY_COMPILE([$1],[$2],[
+            CF_VERBOSE(... found $3 headers in $cf_cv_header_path_$3)
+            cf_cv_find_linkage_$3=maybe
+            cf_test_CPPFLAGS="$CPPFLAGS"
+            break],[
+            CPPFLAGS="$cf_save_CPPFLAGS"
+            ])
+      fi
+    done
+
+    if test "$cf_cv_find_linkage_$3" = maybe ; then
+
+      CF_MSG_LOG([Searching for $3 library in [FIND_LINKAGE]($3,$6)])
+
+      cf_save_LIBS="$LIBS"
+      cf_save_LDFLAGS="$LDFLAGS"
+
+      ifelse([$6],,,[
+        CPPFLAGS="$cf_test_CPPFLAGS"
+        LIBS="-l$3 $7 $cf_save_LIBS"
+        AC_TRY_LINK([$1],[$2],[
+            CF_VERBOSE(... found $3 library in system)
+            cf_cv_find_linkage_$3=yes])
+            CPPFLAGS="$cf_save_CPPFLAGS"
+            LIBS="$cf_save_LIBS"
+            ])
+
+      if test "$cf_cv_find_linkage_$3" != yes ; then
+        CF_LIBRARY_PATH(cf_search,$3)
+        for cf_cv_library_path_$3 in $cf_search
+        do
+          if test -d $cf_cv_library_path_$3 ; then
+            CF_VERBOSE(... testing $cf_cv_library_path_$3)
+            CPPFLAGS="$cf_test_CPPFLAGS"
+            LIBS="-l$3 $7 $cf_save_LIBS"
+            LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_$3"
+            AC_TRY_LINK([$1],[$2],[
+                CF_VERBOSE(... found $3 library in $cf_cv_library_path_$3)
+                cf_cv_find_linkage_$3=yes
+                cf_cv_library_file_$3="-l$3"
+                break],[
+                CPPFLAGS="$cf_save_CPPFLAGS"
+                LIBS="$cf_save_LIBS"
+                LDFLAGS="$cf_save_LDFLAGS"
+                ])
+          fi
+        done
+        LIBS="$cf_save_LIBS"
+        CPPFLAGS="$cf_save_CPPFLAGS"
+        LDFLAGS="$cf_save_LDFLAGS"
+      fi
+
+    else
+      cf_cv_find_linkage_$3=no
+    fi
+    ],$7)
+
+if test "$cf_cv_find_linkage_$3" = yes ; then
+ifelse([$4],,[
+  CF_ADD_INCDIR($cf_cv_header_path_$3)
+  CF_ADD_LIBDIR($cf_cv_library_path_$3)
+  LIBS="-l$3 $LIBS"
+],[$4])
+else
+ifelse([$5],,AC_MSG_WARN(Cannot find $3 library),[$5])
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_FUNC_WAIT version: 2 updated: 1997/10/21 19:45:33
+dnl ------------
+dnl Test for the presence of <sys/wait.h>, 'union wait', arg-type of 'wait()'
+dnl and/or 'waitpid()'.
+dnl
+dnl Note that we cannot simply grep for 'union wait' in the wait.h file,
+dnl because some Posix systems turn this on only when a BSD variable is
+dnl defined.
+dnl
+dnl I don't use AC_HEADER_SYS_WAIT, because it defines HAVE_SYS_WAIT_H, which
+dnl would conflict with an attempt to test that header directly.
+dnl
+AC_DEFUN([CF_FUNC_WAIT],
+[
+AC_REQUIRE([CF_UNION_WAIT])
+if test $cf_cv_type_unionwait = yes; then
+
+	AC_MSG_CHECKING(if union wait can be used as wait-arg)
+	AC_CACHE_VAL(cf_cv_arg_union_wait,[
+		AC_TRY_COMPILE($cf_wait_headers,
+ 			[union wait x; wait(&x)],
+			[cf_cv_arg_union_wait=yes],
+			[cf_cv_arg_union_wait=no])
+		])
+	AC_MSG_RESULT($cf_cv_arg_union_wait)
+	test $cf_cv_arg_union_wait = yes && AC_DEFINE(WAIT_USES_UNION)
+
+	AC_MSG_CHECKING(if union wait can be used as waitpid-arg)
+	AC_CACHE_VAL(cf_cv_arg_union_waitpid,[
+		AC_TRY_COMPILE($cf_wait_headers,
+ 			[union wait x; waitpid(0, &x, 0)],
+			[cf_cv_arg_union_waitpid=yes],
+			[cf_cv_arg_union_waitpid=no])
+		])
+	AC_MSG_RESULT($cf_cv_arg_union_waitpid)
+	test $cf_cv_arg_union_waitpid = yes && AC_DEFINE(WAITPID_USES_UNION)
+
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_GCC_ATTRIBUTES version: 13 updated: 2009/08/11 20:19:56
+dnl -----------------
+dnl Test for availability of useful gcc __attribute__ directives to quiet
+dnl compiler warnings.  Though useful, not all are supported -- and contrary
+dnl to documentation, unrecognized directives cause older compilers to barf.
+AC_DEFUN([CF_GCC_ATTRIBUTES],
+[
+if test "$GCC" = yes
+then
+cat > conftest.i <<EOF
+#ifndef GCC_PRINTF
+#define GCC_PRINTF 0
+#endif
+#ifndef GCC_SCANF
+#define GCC_SCANF 0
+#endif
+#ifndef GCC_NORETURN
+#define GCC_NORETURN /* nothing */
+#endif
+#ifndef GCC_UNUSED
+#define GCC_UNUSED /* nothing */
+#endif
+EOF
+if test "$GCC" = yes
+then
+	AC_CHECKING([for $CC __attribute__ directives])
+cat > conftest.$ac_ext <<EOF
+#line __oline__ "${as_me-configure}"
+#include "confdefs.h"
+#include "conftest.h"
+#include "conftest.i"
+#if	GCC_PRINTF
+#define GCC_PRINTFLIKE(fmt,var) __attribute__((format(printf,fmt,var)))
+#else
+#define GCC_PRINTFLIKE(fmt,var) /*nothing*/
+#endif
+#if	GCC_SCANF
+#define GCC_SCANFLIKE(fmt,var)  __attribute__((format(scanf,fmt,var)))
+#else
+#define GCC_SCANFLIKE(fmt,var)  /*nothing*/
+#endif
+extern void wow(char *,...) GCC_SCANFLIKE(1,2);
+extern void oops(char *,...) GCC_PRINTFLIKE(1,2) GCC_NORETURN;
+extern void foo(void) GCC_NORETURN;
+int main(int argc GCC_UNUSED, char *argv[[]] GCC_UNUSED) { return 0; }
+EOF
+	cf_printf_attribute=no
+	cf_scanf_attribute=no
+	for cf_attribute in scanf printf unused noreturn
+	do
+		CF_UPPER(cf_ATTRIBUTE,$cf_attribute)
+		cf_directive="__attribute__(($cf_attribute))"
+		echo "checking for $CC $cf_directive" 1>&AC_FD_CC
+
+		case $cf_attribute in #(vi
+		printf) #(vi
+			cf_printf_attribute=yes
+			cat >conftest.h <<EOF
+#define GCC_$cf_ATTRIBUTE 1
+EOF
+			;;
+		scanf) #(vi
+			cf_scanf_attribute=yes
+			cat >conftest.h <<EOF
+#define GCC_$cf_ATTRIBUTE 1
+EOF
+			;;
+		*) #(vi
+			cat >conftest.h <<EOF
+#define GCC_$cf_ATTRIBUTE $cf_directive
+EOF
+			;;
+		esac
+
+		if AC_TRY_EVAL(ac_compile); then
+			test -n "$verbose" && AC_MSG_RESULT(... $cf_attribute)
+			cat conftest.h >>confdefs.h
+			case $cf_attribute in #(vi
+			printf) #(vi
+				if test "$cf_printf_attribute" = no ; then
+					cat >>confdefs.h <<EOF
+#define GCC_PRINTFLIKE(fmt,var) /* nothing */
+EOF
+				else
+					cat >>confdefs.h <<EOF
+#define GCC_PRINTFLIKE(fmt,var) __attribute__((format(printf,fmt,var)))
+EOF
+				fi
+				;;
+			scanf) #(vi
+				if test "$cf_scanf_attribute" = no ; then
+					cat >>confdefs.h <<EOF
+#define GCC_SCANFLIKE(fmt,var) /* nothing */
+EOF
+				else
+					cat >>confdefs.h <<EOF
+#define GCC_SCANFLIKE(fmt,var)  __attribute__((format(scanf,fmt,var)))
+EOF
+				fi
+				;;
+			esac
+		fi
+	done
+else
+	fgrep define conftest.i >>confdefs.h
+fi
+rm -rf conftest*
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_GCC_VERSION version: 4 updated: 2005/08/27 09:53:42
+dnl --------------
+dnl Find version of gcc
+AC_DEFUN([CF_GCC_VERSION],[
+AC_REQUIRE([AC_PROG_CC])
+GCC_VERSION=none
+if test "$GCC" = yes ; then
+	AC_MSG_CHECKING(version of $CC)
+	GCC_VERSION="`${CC} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`"
+	test -z "$GCC_VERSION" && GCC_VERSION=unknown
+	AC_MSG_RESULT($GCC_VERSION)
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_GCC_WARNINGS version: 24 updated: 2009/02/01 15:21:00
+dnl ---------------
+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:
+dnl
+dnl	-Wconversion (useful in older versions of gcc, but not in gcc 2.7.x)
+dnl	-Wredundant-decls (system headers make this too noisy)
+dnl	-Wtraditional (combines too many unrelated messages, only a few useful)
+dnl	-Wwrite-strings (too noisy, but should review occasionally).  This
+dnl		is enabled for ncurses using "--enable-const".
+dnl	-pedantic
+dnl
+dnl Parameter:
+dnl	$1 is an optional list of gcc warning flags that a particular
+dnl		application might want to use, e.g., "no-unused" for
+dnl		-Wno-unused
+dnl Special:
+dnl	If $with_ext_const is "yes", add a check for -Wwrite-strings
+dnl
+AC_DEFUN([CF_GCC_WARNINGS],
+[
+AC_REQUIRE([CF_GCC_VERSION])
+CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS)
+
+cat > conftest.$ac_ext <<EOF
+#line __oline__ "${as_me-configure}"
+int main(int argc, char *argv[[]]) { return (argv[[argc-1]] == 0) ; }
+EOF
+
+if test "$INTEL_COMPILER" = yes
+then
+# The "-wdXXX" options suppress warnings:
+# remark #1419: external declaration in primary source file
+# remark #1683: explicit conversion of a 64-bit integral type to a smaller integral type (potential portability problem)
+# remark #1684: conversion from pointer to same-sized integral type (potential portability problem)
+# remark #193: zero used for undefined preprocessing identifier
+# remark #593: variable "curs_sb_left_arrow" was set but never used
+# remark #810: conversion from "int" to "Dimension={unsigned short}" may lose significant bits
+# remark #869: parameter "tw" was never referenced
+# remark #981: operands are evaluated in unspecified order
+# warning #279: controlling expression is constant
+
+	AC_CHECKING([for $CC warning options])
+	cf_save_CFLAGS="$CFLAGS"
+	EXTRA_CFLAGS="-Wall"
+	for cf_opt in \
+		wd1419 \
+		wd1683 \
+		wd1684 \
+		wd193 \
+		wd593 \
+		wd279 \
+		wd810 \
+		wd869 \
+		wd981
+	do
+		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+		if AC_TRY_EVAL(ac_compile); then
+			test -n "$verbose" && AC_MSG_RESULT(... -$cf_opt)
+			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+		fi
+	done
+	CFLAGS="$cf_save_CFLAGS"
+
+elif test "$GCC" = yes
+then
+	AC_CHECKING([for $CC warning options])
+	cf_save_CFLAGS="$CFLAGS"
+	EXTRA_CFLAGS="-W -Wall"
+	cf_warn_CONST=""
+	test "$with_ext_const" = yes && cf_warn_CONST="Wwrite-strings"
+	for cf_opt in \
+		Wbad-function-cast \
+		Wcast-align \
+		Wcast-qual \
+		Winline \
+		Wmissing-declarations \
+		Wmissing-prototypes \
+		Wnested-externs \
+		Wpointer-arith \
+		Wshadow \
+		Wstrict-prototypes \
+		Wundef $cf_warn_CONST $1
+	do
+		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
+		if AC_TRY_EVAL(ac_compile); then
+			test -n "$verbose" && AC_MSG_RESULT(... -$cf_opt)
+			case $cf_opt in #(vi
+			Wcast-qual) #(vi
+				CPPFLAGS="$CPPFLAGS -DXTSTRINGDEFINES"
+				;;
+			Winline) #(vi
+				case $GCC_VERSION in
+				[[34]].*)
+					CF_VERBOSE(feature is broken in gcc $GCC_VERSION)
+					continue;;
+				esac
+				;;
+			esac
+			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
+		fi
+	done
+	CFLAGS="$cf_save_CFLAGS"
+fi
+rm -f conftest*
+
+AC_SUBST(EXTRA_CFLAGS)
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_GNU_SOURCE version: 6 updated: 2005/07/09 13:23:07
+dnl -------------
+dnl Check if we must define _GNU_SOURCE to get a reasonable value for
+dnl _XOPEN_SOURCE, upon which many POSIX definitions depend.  This is a defect
+dnl (or misfeature) of glibc2, which breaks portability of many applications,
+dnl since it is interwoven with GNU extensions.
+dnl
+dnl Well, yes we could work around it...
+AC_DEFUN([CF_GNU_SOURCE],
+[
+AC_CACHE_CHECK(if we must define _GNU_SOURCE,cf_cv_gnu_source,[
+AC_TRY_COMPILE([#include <sys/types.h>],[
+#ifndef _XOPEN_SOURCE
+make an error
+#endif],
+	[cf_cv_gnu_source=no],
+	[cf_save="$CPPFLAGS"
+	 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
+	 AC_TRY_COMPILE([#include <sys/types.h>],[
+#ifdef _XOPEN_SOURCE
+make an error
+#endif],
+	[cf_cv_gnu_source=no],
+	[cf_cv_gnu_source=yes])
+	CPPFLAGS="$cf_save"
+	])
+])
+test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_HEADERS_SH version: 1 updated: 2007/07/04 15:37:05
+dnl -------------
+dnl Setup variables needed to construct headers-sh
+AC_DEFUN([CF_HEADERS_SH],[
+PACKAGE_PREFIX=$1
+PACKAGE_CONFIG=$2
+AC_SUBST(PACKAGE_PREFIX)
+AC_SUBST(PACKAGE_CONFIG)
+EXTRA_OUTPUT="$EXTRA_OUTPUT headers-sh:$srcdir/headers-sh.in"
+])
+dnl ---------------------------------------------------------------------------
+dnl CF_HEADER_PATH version: 10 updated: 2010/01/17 20:36:17
+dnl --------------
+dnl Construct a search-list of directories for a nonstandard header-file
+dnl
+dnl Parameters
+dnl	$1 = the variable to return as result
+dnl	$2 = the package name
+AC_DEFUN([CF_HEADER_PATH],
+[
+$1=
+cf_header_path_list=""
+if test -n "${CFLAGS}${CPPFLAGS}" ; then
+	for cf_header_path in $CPPFLAGS $CFLAGS
+	do
+		case $cf_header_path in #(vi
+		-I*)
+			cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
+			CF_ADD_SUBDIR_PATH($1,$2,include,$cf_header_path,NONE)
+			cf_header_path_list="$cf_header_path_list [$]$1"
+			;;
+		esac
+	done
+fi
+
+CF_SUBDIR_PATH($1,$2,include)
+
+test "$includedir" != NONE && \
+test "$includedir" != "/usr/include" && \
+test -d "$includedir" && {
+	test -d $includedir &&    $1="[$]$1 $includedir"
+	test -d $includedir/$2 && $1="[$]$1 $includedir/$2"
+}
+
+test "$oldincludedir" != NONE && \
+test "$oldincludedir" != "/usr/include" && \
+test -d "$oldincludedir" && {
+	test -d $oldincludedir    && $1="[$]$1 $oldincludedir"
+	test -d $oldincludedir/$2 && $1="[$]$1 $oldincludedir/$2"
+}
+
+$1="$cf_header_path_list [$]$1"
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_HELP_MESSAGE version: 3 updated: 1998/01/14 10:56:23
+dnl ---------------
+dnl Insert text into the help-message, for readability, from AC_ARG_WITH.
+AC_DEFUN([CF_HELP_MESSAGE],
+[AC_DIVERT_HELP([$1])dnl
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_INCLUDE_DIRS version: 6 updated: 2009/01/06 19:37:40
+dnl ---------------
+dnl Construct the list of include-options according to whether we're building
+dnl in the source directory or using '--srcdir=DIR' option.  If we're building
+dnl with gcc, don't append the includedir if it happens to be /usr/include,
+dnl since that usually breaks gcc's shadow-includes.
+AC_DEFUN([CF_INCLUDE_DIRS],
+[
+CPPFLAGS="$CPPFLAGS -I. -I../include"
+if test "$srcdir" != "."; then
+	CPPFLAGS="$CPPFLAGS -I\${srcdir}/../include"
+fi
+if test "$GCC" != yes; then
+	CPPFLAGS="$CPPFLAGS -I\${includedir}"
+elif test "$includedir" != "/usr/include"; then
+	if test "$includedir" = '${prefix}/include' ; then
+		if test $prefix != /usr ; then
+			CPPFLAGS="$CPPFLAGS -I\${includedir}"
+		fi
+	else
+		CPPFLAGS="$CPPFLAGS -I\${includedir}"
+	fi
+fi
+AC_SUBST(CPPFLAGS)
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_INCLUDE_PATH version: 5 updated: 2010/01/17 20:36:17
+dnl ---------------
+dnl	Adds to the include-path
+dnl
+dnl	Autoconf 1.11 should have provided a way to add include path options to
+dnl	the cpp-tests.
+dnl
+AC_DEFUN([CF_INCLUDE_PATH],
+[
+$1=
+for cf_path in $1
+do
+	cf_result="no"
+	AC_MSG_CHECKING(for directory $cf_path)
+	if test -d $cf_path
+	then
+		INCLUDES="$INCLUDES -I$cf_path"
+		ac_cpp="${ac_cpp} -I$cf_path"
+		CFLAGS="$CFLAGS -I$cf_path"
+		cf_result="yes"
+		case $cf_path in
+		/usr/include|/usr/include/*)
+			;;
+		*)
+			CF_DIRNAME(cf_temp,$cf_path)
+			case $cf_temp in
+			*/include)
+				INCLUDES="$INCLUDES -I$cf_temp"
+				ac_cpp="${ac_cpp} -I$cf_temp"
+				CFLAGS="$CFLAGS -I$cf_temp"
+				;;
+			esac
+		esac
+	fi
+	AC_MSG_RESULT($cf_result)
+done
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_INTEL_COMPILER version: 3 updated: 2005/08/06 18:37:29
+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
+dnl between prototypes, e.g., as exercised by CF_MISSING_CHECK.
+dnl
+dnl This macro should be run "soon" after AC_PROG_CC or AC_PROG_CPLUSPLUS, to
+dnl ensure that it is not mistaken for gcc/g++.  It is normally invoked from
+dnl the wrappers for gcc and g++ warnings.
+dnl
+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
+
+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_TRY_COMPILE([],[
+#ifdef __INTEL_COMPILER
+#else
+make an error
+#endif
+],[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]))
+		;;
+	esac
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_LARGEFILE version: 7 updated: 2007/06/02 11:58:50
+dnl ------------
+dnl Add checks for large file support.
+AC_DEFUN([CF_LARGEFILE],[
+ifdef([AC_FUNC_FSEEKO],[
+    AC_SYS_LARGEFILE
+    if test "$enable_largefile" != no ; then
+	AC_FUNC_FSEEKO
+
+	# Normally we would collect these definitions in the config.h,
+	# but (like _XOPEN_SOURCE), some environments rely on having these
+	# defined before any of the system headers are included.  Another
+	# case comes up with C++, e.g., on AIX the compiler compiles the
+	# header files by themselves before looking at the body files it is
+	# told to compile.  For ncurses, those header files do not include
+	# the config.h
+	test "$ac_cv_sys_large_files"      != no && CPPFLAGS="$CPPFLAGS -D_LARGE_FILES "
+	test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE "
+	test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits "
+
+	AC_CACHE_CHECK(whether to use struct dirent64, cf_cv_struct_dirent64,[
+		AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <dirent.h>
+		],[
+		/* if transitional largefile support is setup, this is true */
+		extern struct dirent64 * readdir(DIR *);
+		struct dirent64 *x = readdir((DIR *)0);
+		struct dirent *y = readdir((DIR *)0);
+		int z = x - y;
+		],
+		[cf_cv_struct_dirent64=yes],
+		[cf_cv_struct_dirent64=no])
+	])
+	test "$cf_cv_struct_dirent64" = yes && AC_DEFINE(HAVE_STRUCT_DIRENT64)
+    fi
+])
+])
+dnl ---------------------------------------------------------------------------
+dnl CF_LIBRARY_PATH version: 8 updated: 2008/12/07 19:38:31
+dnl ---------------
+dnl Construct a search-list of directories for a nonstandard library-file
+dnl
+dnl Parameters
+dnl	$1 = the variable to return as result
+dnl	$2 = the package name
+AC_DEFUN([CF_LIBRARY_PATH],
+[
+cf_library_path_list=""
+if test -n "${LDFLAGS}${LIBS}" ; then
+	for cf_library_path in $LDFLAGS $LIBS
+	do
+		case $cf_library_path in #(vi
+		-L*)
+			cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
+			CF_ADD_SUBDIR_PATH($1,$2,lib,$cf_library_path,NONE)
+			cf_library_path_list="$cf_library_path_list [$]$1"
+			;;
+		esac
+	done
+fi
+
+CF_SUBDIR_PATH($1,$2,lib)
+
+$1="$cf_library_path_list [$]$1"
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_LIB_PREFIX version: 8 updated: 2008/09/13 11:34:16
+dnl -------------
+dnl Compute the library-prefix for the given host system
+dnl $1 = variable to set
+AC_DEFUN([CF_LIB_PREFIX],
+[
+	case $cf_cv_system_name in #(vi
+	OS/2*|os2*) #(vi
+        LIB_PREFIX=''
+        ;;
+	*)	LIB_PREFIX='lib'
+        ;;
+	esac
+ifelse($1,,,[$1=$LIB_PREFIX])
+	AC_SUBST(LIB_PREFIX)
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_MAKEFLAGS version: 12 updated: 2006/10/21 08:27:03
+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.
+dnl (GNU 'make' does both, something POSIX 'make', which happens to make the
+dnl ${MAKEFLAGS} variable incompatible because it adds the assignments :-)
+AC_DEFUN([CF_MAKEFLAGS],
+[
+AC_CACHE_CHECK(for makeflags variable, cf_cv_makeflags,[
+	cf_cv_makeflags=''
+	for cf_option in '-${MAKEFLAGS}' '${MFLAGS}'
+	do
+		cat >cf_makeflags.tmp <<CF_EOF
+SHELL = /bin/sh
+all :
+	@ echo '.$cf_option'
+CF_EOF
+		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`
+			case "$cf_result" in
+			.*CC=*)	cf_cv_makeflags=
+				;;
+			*)	cf_cv_makeflags=$cf_option
+				;;
+			esac
+			break
+			;;
+		.-)	;;
+		*)	echo "given option \"$cf_option\", no match \"$cf_result\""
+			;;
+		esac
+	done
+	rm -f cf_makeflags.tmp
+])
+
+AC_SUBST(cf_cv_makeflags)
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_MAKE_TAGS version: 2 updated: 2000/10/04 09:18:40
+dnl ------------
+dnl Generate tags/TAGS targets for makefiles.  Do not generate TAGS if we have
+dnl a monocase filesystem.
+AC_DEFUN([CF_MAKE_TAGS],[
+AC_REQUIRE([CF_MIXEDCASE_FILENAMES])
+AC_CHECK_PROG(MAKE_LOWER_TAGS, ctags, yes, no)
+
+if test "$cf_cv_mixedcase" = yes ; then
+	AC_CHECK_PROG(MAKE_UPPER_TAGS, etags, yes, no)
+else
+	MAKE_UPPER_TAGS=no
+fi
+
+if test "$MAKE_UPPER_TAGS" = yes ; then
+	MAKE_UPPER_TAGS=
+else
+	MAKE_UPPER_TAGS="#"
+fi
+AC_SUBST(MAKE_UPPER_TAGS)
+
+if test "$MAKE_LOWER_TAGS" = yes ; then
+	MAKE_LOWER_TAGS=
+else
+	MAKE_LOWER_TAGS="#"
+fi
+AC_SUBST(MAKE_LOWER_TAGS)
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_MATH_LIB version: 6 updated: 2009/12/19 13:46:49
+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
+dnl AC_CHECK_LIB(m,sin), because that fails for C++.
+AC_DEFUN([CF_MATH_LIB],
+[
+AC_CACHE_CHECK(if -lm needed for math functions,
+	cf_cv_need_libm,[
+	AC_TRY_LINK([
+	#include <stdio.h>
+	#include <math.h>
+	],
+	[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"
+],[$1=-lm])
+fi
+])
+dnl ---------------------------------------------------------------------------
+dnl CF_MBSTATE_T version: 3 updated: 2007/03/25 15:55:36
+dnl ------------
+dnl Check if mbstate_t is declared, and if so, which header file.
+dnl This (including wchar.h) is needed on Tru64 5.0 to declare mbstate_t,
+dnl as well as include stdio.h to work around a misuse of varargs in wchar.h
+AC_DEFUN([CF_MBSTATE_T],
+[
+AC_CACHE_CHECK(if we must include wchar.h to declare mbstate_t,cf_cv_mbstate_t,[
+AC_TRY_COMPILE([
+#include <stdlib.h>
+#include <stdio.h>
+#ifdef HAVE_LIBUTF8_H
+#include <libutf8.h>
+#endif],
+	[mbstate_t state],
+	[cf_cv_mbstate_t=no],
+	[AC_TRY_COMPILE([
+#include <stdlib.h>
+#include <stdio.h>
+#include <wchar.h>
+#ifdef HAVE_LIBUTF8_H
+#include <libutf8.h>
+#endif],
+	[mbstate_t value],
+	[cf_cv_mbstate_t=yes],
+	[cf_cv_mbstate_t=unknown])])])
+
+if test "$cf_cv_mbstate_t" = yes ; then
+	AC_DEFINE(NEED_WCHAR_H)
+fi
+
+if test "$cf_cv_mbstate_t" != unknown ; then
+	AC_DEFINE(HAVE_MBSTATE_T)
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_MIXEDCASE_FILENAMES version: 3 updated: 2003/09/20 17:07:55
+dnl ----------------------
+dnl Check if the file-system supports mixed-case filenames.  If we're able to
+dnl create a lowercase name and see it as uppercase, it doesn't support that.
+AC_DEFUN([CF_MIXEDCASE_FILENAMES],
+[
+AC_CACHE_CHECK(if filesystem supports mixed-case filenames,cf_cv_mixedcase,[
+if test "$cross_compiling" = yes ; then
+	case $target_alias in #(vi
+	*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-mingw32*|*-uwin*) #(vi
+		cf_cv_mixedcase=no
+		;;
+	*)
+		cf_cv_mixedcase=yes
+		;;
+	esac
+else
+	rm -f conftest CONFTEST
+	echo test >conftest
+	if test -f CONFTEST ; then
+		cf_cv_mixedcase=no
+	else
+		cf_cv_mixedcase=yes
+	fi
+	rm -f conftest CONFTEST
+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 ----------
+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
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_NCURSES_CC_CHECK version: 4 updated: 2007/07/29 10:39:05
+dnl -------------------
+dnl Check if we can compile with ncurses' header file
+dnl $1 is the cache variable to set
+dnl $2 is the header-file to include
+dnl $3 is the root name (ncurses or ncursesw)
+AC_DEFUN([CF_NCURSES_CC_CHECK],[
+	AC_TRY_COMPILE([
+]ifelse($3,ncursesw,[
+#define _XOPEN_SOURCE_EXTENDED
+#undef  HAVE_LIBUTF8_H	/* in case we used CF_UTF8_LIB */
+#define HAVE_LIBUTF8_H	/* to force ncurses' header file to use cchar_t */
+])[
+#include <$2>],[
+#ifdef NCURSES_VERSION
+]ifelse($3,ncursesw,[
+#ifndef WACS_BSSB
+	make an error
+#endif
+])[
+printf("%s\n", NCURSES_VERSION);
+#else
+#ifdef __NCURSES_H
+printf("old\n");
+#else
+	make an error
+#endif
+#endif
+	]
+	,[$1=$2]
+	,[$1=no])
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_NCURSES_CONFIG version: 5 updated: 2009/01/11 15:31:22
+dnl -----------------
+dnl Tie together the configure-script macros for ncurses.
+dnl Prefer the "-config" script from ncurses 5.6, 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")
+AC_DEFUN([CF_NCURSES_CONFIG],
+[
+cf_ncuconfig_root=ifelse($1,,ncurses,$1)
+
+echo "Looking for ${cf_ncuconfig_root}-config"
+AC_PATH_PROGS(NCURSES_CONFIG,${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config,none)
+
+if test "$NCURSES_CONFIG" != none ; then
+
+cf_cv_ncurses_header=curses.h
+
+CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`"
+LIBS="`$NCURSES_CONFIG --libs` $LIBS"
+
+dnl like CF_NCURSES_CPPFLAGS
+AC_DEFINE(NCURSES)
+
+dnl like CF_NCURSES_LIBS
+CF_UPPER(cf_nculib_ROOT,HAVE_LIB$cf_ncuconfig_root)
+AC_DEFINE_UNQUOTED($cf_nculib_ROOT)
+
+dnl like CF_NCURSES_VERSION
+cf_cv_ncurses_version=`$NCURSES_CONFIG --version`
+
+else
+
+CF_NCURSES_CPPFLAGS(ifelse($1,,ncurses,$1))
+CF_NCURSES_LIBS(ifelse($1,,ncurses,$1))
+
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_NCURSES_CPPFLAGS version: 19 updated: 2007/07/29 13:35:20
+dnl -------------------
+dnl Look for the SVr4 curses clone 'ncurses' in the standard places, adjusting
+dnl the CPPFLAGS variable so we can include its header.
+dnl
+dnl The header files may be installed as either curses.h, or ncurses.h (would
+dnl be obsolete, except that some packagers prefer this name to distinguish it
+dnl from a "native" curses implementation).  If not installed for overwrite,
+dnl the curses.h file would be in an ncurses subdirectory (e.g.,
+dnl /usr/include/ncurses), but someone may have installed overwriting the
+dnl vendor's curses.  Only very old versions (pre-1.9.2d, the first autoconf'd
+dnl version) of ncurses don't define either __NCURSES_H or NCURSES_VERSION in
+dnl the header.
+dnl
+dnl If the installer has set $CFLAGS or $CPPFLAGS so that the ncurses header
+dnl is already in the include-path, don't even bother with this, since we cannot
+dnl easily determine which file it is.  In this case, it has to be <curses.h>.
+dnl
+dnl The optional parameter gives the root name of the library, in case it is
+dnl not installed as the default curses library.  That is how the
+dnl wide-character version of ncurses is installed.
+AC_DEFUN([CF_NCURSES_CPPFLAGS],
+[AC_REQUIRE([CF_WITH_CURSES_DIR])
+
+AC_PROVIDE([CF_CURSES_CPPFLAGS])dnl
+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)
+}
+
+AC_CACHE_CHECK(for $cf_ncuhdr_root header in include-path, cf_cv_ncurses_h,[
+	cf_header_list="$cf_ncuhdr_root/curses.h $cf_ncuhdr_root/ncurses.h"
+	( test "$cf_ncuhdr_root" = ncurses || test "$cf_ncuhdr_root" = ncursesw ) && cf_header_list="$cf_header_list curses.h ncurses.h"
+	for cf_header in $cf_header_list
+	do
+		CF_NCURSES_CC_CHECK(cf_cv_ncurses_h,$cf_header,$1)
+		test "$cf_cv_ncurses_h" != no && break
+	done
+])
+
+CF_NCURSES_HEADER
+CF_TERM_HEADER
+
+# some applications need this, but should check for NCURSES_VERSION
+AC_DEFINE(NCURSES)
+
+CF_NCURSES_VERSION
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_NCURSES_HEADER version: 2 updated: 2008/03/23 14:48:54
+dnl -----------------
+dnl Find a "curses" header file, e.g,. "curses.h", or one of the more common
+dnl variations of ncurses' installs.
+dnl
+dnl See also CF_CURSES_HEADER, which sets the same cache variable.
+AC_DEFUN([CF_NCURSES_HEADER],[
+
+if test "$cf_cv_ncurses_h" != no ; then
+	cf_cv_ncurses_header=$cf_cv_ncurses_h
+else
+
+AC_CACHE_CHECK(for $cf_ncuhdr_root include-path, cf_cv_ncurses_h2,[
+	test -n "$verbose" && echo
+	CF_HEADER_PATH(cf_search,$cf_ncuhdr_root)
+	test -n "$verbose" && echo search path $cf_search
+	cf_save2_CPPFLAGS="$CPPFLAGS"
+	for cf_incdir in $cf_search
+	do
+		CF_ADD_INCDIR($cf_incdir)
+		for cf_header in \
+			ncurses.h \
+			curses.h
+		do
+			CF_NCURSES_CC_CHECK(cf_cv_ncurses_h2,$cf_header,$1)
+			if test "$cf_cv_ncurses_h2" != no ; then
+				cf_cv_ncurses_h2=$cf_incdir/$cf_header
+				test -n "$verbose" && echo $ac_n "	... found $ac_c" 1>&AC_FD_MSG
+				break
+			fi
+			test -n "$verbose" && echo "	... tested $cf_incdir/$cf_header" 1>&AC_FD_MSG
+		done
+		CPPFLAGS="$cf_save2_CPPFLAGS"
+		test "$cf_cv_ncurses_h2" != no && break
+	done
+	test "$cf_cv_ncurses_h2" = no && AC_MSG_ERROR(not found)
+	])
+
+	CF_DIRNAME(cf_1st_incdir,$cf_cv_ncurses_h2)
+	cf_cv_ncurses_header=`basename $cf_cv_ncurses_h2`
+	if test `basename $cf_1st_incdir` = $cf_ncuhdr_root ; then
+		cf_cv_ncurses_header=$cf_ncuhdr_root/$cf_cv_ncurses_header
+	fi
+	CF_ADD_INCDIR($cf_1st_incdir)
+
+fi
+
+# Set definitions to allow ifdef'ing for ncurses.h
+
+case $cf_cv_ncurses_header in # (vi
+*ncurses.h)
+	AC_DEFINE(HAVE_NCURSES_H)
+	;;
+esac
+
+case $cf_cv_ncurses_header in # (vi
+ncurses/curses.h|ncurses/ncurses.h)
+	AC_DEFINE(HAVE_NCURSES_NCURSES_H)
+	;;
+ncursesw/curses.h|ncursesw/ncurses.h)
+	AC_DEFINE(HAVE_NCURSESW_NCURSES_H)
+	;;
+esac
+
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_NCURSES_LIBS version: 13 updated: 2007/07/29 10:29:20
+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.
+dnl Some distributions have gpm linked with (bsd) curses, which makes it
+dnl unusable with ncurses.  However, we don't want to link with gpm unless
+dnl ncurses has a dependency, since gpm is normally set up as a shared library,
+dnl and the linker will record a dependency.
+dnl
+dnl The optional parameter gives the root name of the library, in case it is
+dnl not installed as the default curses library.  That is how the
+dnl wide-character version of ncurses is installed.
+AC_DEFUN([CF_NCURSES_LIBS],
+[AC_REQUIRE([CF_NCURSES_CPPFLAGS])
+
+cf_nculib_root=ifelse($1,,ncurses,$1)
+	# This works, except for the special case where we find gpm, but
+	# ncurses is in a nonstandard location via $LIBS, and we really want
+	# to link gpm.
+cf_ncurses_LIBS=""
+cf_ncurses_SAVE="$LIBS"
+AC_CHECK_LIB(gpm,Gpm_Open,
+	[AC_CHECK_LIB(gpm,initscr,
+		[LIBS="$cf_ncurses_SAVE"],
+		[cf_ncurses_LIBS="-lgpm"])])
+
+case $host_os in #(vi
+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
+		AC_CHECK_LIB(mytinfo,tgoto,[cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"])
+	fi
+	;;
+esac
+
+LIBS="$cf_ncurses_LIBS $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"
+else
+	CF_FIND_LIBRARY($cf_nculib_root,$cf_nculib_root,
+		[#include <${cf_cv_ncurses_header-curses.h}>],
+		[initscr()],
+		initscr)
+fi
+
+if test -n "$cf_ncurses_LIBS" ; then
+	AC_MSG_CHECKING(if we can link $cf_nculib_root without $cf_ncurses_LIBS)
+	cf_ncurses_SAVE="$LIBS"
+	for p in $cf_ncurses_LIBS ; do
+		q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"`
+		if test "$q" != "$LIBS" ; then
+			LIBS="$q"
+		fi
+	done
+	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)
+		 LIBS="$cf_ncurses_SAVE"])
+fi
+
+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 ------------------
+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
+dnl AC_REQUIRE since that does not work with the shell's if/then/else/fi.
+AC_DEFUN([CF_NCURSES_VERSION],
+[
+AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl
+AC_CACHE_CHECK(for ncurses version, cf_cv_ncurses_version,[
+	cf_cv_ncurses_version=no
+	cf_tempfile=out$$
+	rm -f $cf_tempfile
+	AC_TRY_RUN([
+#include <${cf_cv_ncurses_header-curses.h}>
+#include <stdio.h>
+int main()
+{
+	FILE *fp = fopen("$cf_tempfile", "w");
+#ifdef NCURSES_VERSION
+# ifdef NCURSES_VERSION_PATCH
+	fprintf(fp, "%s.%d\n", NCURSES_VERSION, NCURSES_VERSION_PATCH);
+# else
+	fprintf(fp, "%s\n", NCURSES_VERSION);
+# endif
+#else
+# ifdef __NCURSES_H
+	fprintf(fp, "old\n");
+# else
+	make an error
+# endif
+#endif
+	${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}>
+#undef Autoconf
+#ifdef NCURSES_VERSION
+Autoconf NCURSES_VERSION
+#else
+#ifdef __NCURSES_H
+Autoconf "old"
+#endif
+;
+#endif
+EOF
+	cf_try="$ac_cpp conftest.$ac_ext 2>&AC_FD_CC | grep '^Autoconf ' >conftest.out"
+	AC_TRY_EVAL(cf_try)
+	if test -f conftest.out ; then
+		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[[^"]]*"%%' -e 's%".*%%'`
+		test -n "$cf_out" && cf_cv_ncurses_version="$cf_out"
+		rm -f conftest.out
+	fi
+])
+	rm -f $cf_tempfile
+])
+test "$cf_cv_ncurses_version" = no || AC_DEFINE(NCURSES)
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_NO_LEAKS_OPTION version: 4 updated: 2006/12/16 14:24:05
+dnl ------------------
+dnl see CF_WITH_NO_LEAKS
+AC_DEFUN([CF_NO_LEAKS_OPTION],[
+AC_MSG_CHECKING(if you want to use $1 for testing)
+AC_ARG_WITH($1,
+	[$2],
+	[AC_DEFINE($3)ifelse([$4],,[
+	 $4
+])
+	: ${with_cflags:=-g}
+	: ${with_no_leaks:=yes}
+	 with_$1=yes],
+	[with_$1=])
+AC_MSG_RESULT(${with_$1:-no})
+
+case .$with_cflags in #(vi
+.*-g*)
+	case .$CFLAGS in #(vi
+	.*-g*) #(vi
+		;;
+	*)
+		CF_ADD_CFLAGS([-g])
+		;;
+	esac
+	;;
+esac
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_OUR_MESSAGES version: 7 updated: 2004/09/12 19:45:55
+dnl ---------------
+dnl Check if we use the messages included with this program
+dnl
+dnl $1 specifies either Makefile or makefile, defaulting to the former.
+dnl
+dnl Sets variables which can be used to substitute in makefiles:
+dnl	MSG_DIR_MAKE - to make ./po directory
+dnl	SUB_MAKEFILE - makefile in ./po directory (see CF_BUNDLED_INTL)
+dnl
+AC_DEFUN([CF_OUR_MESSAGES],
+[
+cf_makefile=ifelse($1,,Makefile,$1)
+
+use_our_messages=no
+if test "$USE_NLS" = yes ; then
+if test -d $srcdir/po ; then
+AC_MSG_CHECKING(if we should use included message-library)
+	AC_ARG_ENABLE(included-msgs,
+	[  --disable-included-msgs use included messages, for i18n support],
+	[use_our_messages=$enableval],
+	[use_our_messages=yes])
+fi
+AC_MSG_RESULT($use_our_messages)
+fi
+
+MSG_DIR_MAKE="#"
+if test "$use_our_messages" = yes
+then
+	SUB_MAKEFILE="$SUB_MAKEFILE po/$cf_makefile.in:$srcdir/po/$cf_makefile.inn"
+	MSG_DIR_MAKE=
+fi
+
+AC_SUBST(MSG_DIR_MAKE)
+AC_SUBST(SUB_MAKEFILE)
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_PATHSEP version: 4 updated: 2009/01/11 20:30:23
+dnl ----------
+dnl Provide a value for the $PATH and similar separator
+AC_DEFUN([CF_PATHSEP],
+[
+	case $cf_cv_system_name in
+	os2*)	PATH_SEPARATOR=';'  ;;
+	*)	PATH_SEPARATOR=':'  ;;
+	esac
+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 --------------
+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
+dnl result begins with 'NONE'.  This is necessary to work around autoconf's
+dnl delayed evaluation of those symbols.
+AC_DEFUN([CF_PATH_SYNTAX],[
+if test "x$prefix" != xNONE; then
+  cf_path_syntax="$prefix"
+else
+  cf_path_syntax="$ac_default_prefix"
+fi
+
+case ".[$]$1" in #(vi
+.\[$]\(*\)*|.\'*\'*) #(vi
+  ;;
+..|./*|.\\*) #(vi
+  ;;
+.[[a-zA-Z]]:[[\\/]]*) #(vi OS/2 EMX
+  ;;
+.\[$]{*prefix}*) #(vi
+  eval $1="[$]$1"
+  case ".[$]$1" in #(vi
+  .NONE/*)
+    $1=`echo [$]$1 | sed -e s%NONE%$cf_path_syntax%`
+    ;;
+  esac
+  ;; #(vi
+.no|.NONE/*)
+  $1=`echo [$]$1 | sed -e s%NONE%$cf_path_syntax%`
+  ;;
+*)
+  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 -----------------
+dnl Define _POSIX_C_SOURCE to the given level, and _POSIX_SOURCE if needed.
+dnl
+dnl	POSIX.1-1990				_POSIX_SOURCE
+dnl	POSIX.1-1990 and			_POSIX_SOURCE and
+dnl		POSIX.2-1992 C-Language			_POSIX_C_SOURCE=2
+dnl		Bindings Option
+dnl	POSIX.1b-1993				_POSIX_C_SOURCE=199309L
+dnl	POSIX.1c-1996				_POSIX_C_SOURCE=199506L
+dnl	X/Open 2000				_POSIX_C_SOURCE=200112L
+dnl
+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_save_CFLAGS="$CFLAGS"
+cf_save_CPPFLAGS="$CPPFLAGS"
+
+CF_REMOVE_DEFINE(cf_trim_CFLAGS,$cf_save_CFLAGS,_POSIX_C_SOURCE)
+CF_REMOVE_DEFINE(cf_trim_CPPFLAGS,$cf_save_CPPFLAGS,_POSIX_C_SOURCE)
+
+AC_CACHE_CHECK(if we should define _POSIX_C_SOURCE,cf_cv_posix_c_source,[
+	CF_MSG_LOG(if the symbol is already defined go no further)
+	AC_TRY_COMPILE([#include <sys/types.h>],[
+#ifndef _POSIX_C_SOURCE
+make an error
+#endif],
+	[cf_cv_posix_c_source=no],
+	[cf_want_posix_source=no
+	 case .$cf_POSIX_C_SOURCE in #(vi
+	 .[[12]]??*) #(vi
+		cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE"
+		;;
+	 .2) #(vi
+		cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE"
+		cf_want_posix_source=yes
+		;;
+	 .*)
+		cf_want_posix_source=yes
+		;;
+	 esac
+	 if test "$cf_want_posix_source" = yes ; then
+		AC_TRY_COMPILE([#include <sys/types.h>],[
+#ifdef _POSIX_SOURCE
+make an error
+#endif],[],
+		cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE")
+	 fi
+	 CF_MSG_LOG(ifdef from value $cf_POSIX_C_SOURCE)
+	 CFLAGS="$cf_trim_CFLAGS"
+	 CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
+	 CF_MSG_LOG(if the second compile does not leave our definition intact error)
+	 AC_TRY_COMPILE([#include <sys/types.h>],[
+#ifndef _POSIX_C_SOURCE
+make an error
+#endif],,
+	 [cf_cv_posix_c_source=no])
+	 CFLAGS="$cf_save_CFLAGS"
+	 CPPFLAGS="$cf_save_CPPFLAGS"
+	])
+])
+
+if test "$cf_cv_posix_c_source" != no ; then
+	CFLAGS="$cf_trim_CFLAGS"
+	CPPFLAGS="$cf_trim_CPPFLAGS"
+	CF_ADD_CFLAGS($cf_cv_posix_c_source)
+fi
+
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_PROG_CC_U_D version: 1 updated: 2005/07/14 16:59:30
+dnl --------------
+dnl Check if C (preprocessor) -U and -D options are processed in the order
+dnl given rather than by type of option.  Some compilers insist on apply all
+dnl of the -U options after all of the -D options.  Others allow mixing them,
+dnl and may predefine symbols that conflict with those we define.
+AC_DEFUN([CF_PROG_CC_U_D],
+[
+AC_CACHE_CHECK(if $CC -U and -D options work together,cf_cv_cc_u_d_options,[
+	cf_save_CPPFLAGS="$CPPFLAGS"
+	CPPFLAGS="-UU_D_OPTIONS -DU_D_OPTIONS -DD_U_OPTIONS -UD_U_OPTIONS"
+	AC_TRY_COMPILE([],[
+#ifndef U_D_OPTIONS
+make an undefined-error
+#endif
+#ifdef  D_U_OPTIONS
+make a defined-error
+#endif
+	],[
+	cf_cv_cc_u_d_options=yes],[
+	cf_cv_cc_u_d_options=no])
+	CPPFLAGS="$cf_save_CPPFLAGS"
+])
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_PROG_EXT version: 10 updated: 2004/01/03 19:28:18
+dnl -----------
+dnl Compute $PROG_EXT, used for non-Unix ports, such as OS/2 EMX.
+AC_DEFUN([CF_PROG_EXT],
+[
+AC_REQUIRE([CF_CHECK_CACHE])
+case $cf_cv_system_name in
+os2*)
+    CFLAGS="$CFLAGS -Zmt"
+    CPPFLAGS="$CPPFLAGS -D__ST_MT_ERRNO__"
+    CXXFLAGS="$CXXFLAGS -Zmt"
+    # autoconf's macro sets -Zexe and suffix both, which conflict:w
+    LDFLAGS="$LDFLAGS -Zmt -Zcrtdll"
+    ac_cv_exeext=.exe
+    ;;
+esac
+
+AC_EXEEXT
+AC_OBJEXT
+
+PROG_EXT="$EXEEXT"
+AC_SUBST(PROG_EXT)
+test -n "$PROG_EXT" && AC_DEFINE_UNQUOTED(PROG_EXT,"$PROG_EXT")
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_REMOVE_DEFINE version: 3 updated: 2010/01/09 11:05:50
+dnl ----------------
+dnl Remove all -U and -D options that refer to the given symbol from a list
+dnl of C compiler options.  This works around the problem that not all
+dnl compilers process -U and -D options from left-to-right, so a -U option
+dnl cannot be used to cancel the effect of a preceding -D option.
+dnl
+dnl $1 = target (which could be the same as the source variable)
+dnl $2 = source (including '$')
+dnl $3 = symbol to remove
+define([CF_REMOVE_DEFINE],
+[
+$1=`echo "$2" | \
+	sed	-e 's/-[[UD]]'"$3"'\(=[[^ 	]]*\)\?[[ 	]]/ /g' \
+		-e 's/-[[UD]]'"$3"'\(=[[^ 	]]*\)\?[$]//g'`
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_SUBDIR_PATH version: 5 updated: 2007/07/29 09:55:12
+dnl --------------
+dnl Construct a search-list for a nonstandard header/lib-file
+dnl	$1 = the variable to return as result
+dnl	$2 = the package name
+dnl	$3 = the subdirectory, e.g., bin, include or lib
+AC_DEFUN([CF_SUBDIR_PATH],
+[$1=""
+
+CF_ADD_SUBDIR_PATH($1,$2,$3,/usr,$prefix)
+CF_ADD_SUBDIR_PATH($1,$2,$3,$prefix,NONE)
+CF_ADD_SUBDIR_PATH($1,$2,$3,/usr/local,$prefix)
+CF_ADD_SUBDIR_PATH($1,$2,$3,/opt,$prefix)
+CF_ADD_SUBDIR_PATH($1,$2,$3,[$]HOME,$prefix)
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_SUBST version: 4 updated: 2006/06/17 12:33:03
+dnl --------
+dnl	Shorthand macro for substituting things that the user may override
+dnl	with an environment variable.
+dnl
+dnl	$1 = long/descriptive name
+dnl	$2 = environment variable
+dnl	$3 = default value
+AC_DEFUN([CF_SUBST],
+[AC_CACHE_VAL(cf_cv_subst_$2,[
+AC_MSG_CHECKING(for $1 (symbol $2))
+CF_SUBST_IF([-z "[$]$2"], [$2], [$3])
+cf_cv_subst_$2=[$]$2
+AC_MSG_RESULT([$]$2)
+])
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_SYSTYPE version: 3 updated: 2001/02/03 00:14:59
+dnl ----------
+dnl Derive the system-type (our main clue to the method of building shared
+dnl libraries).
+AC_DEFUN([CF_SYSTYPE],
+[
+AC_MSG_CHECKING(for system type)
+AC_CACHE_VAL(cf_cv_systype,[
+AC_ARG_WITH(system-type,
+[  --with-system-type=XXX  test: override derived host system-type],
+[cf_cv_systype=$withval],
+[
+cf_cv_systype="`(uname -s || hostname || echo unknown) 2>/dev/null |sed -e s'/[[:\/.-]]/_/'g  | sed 1q`"
+if test -z "$cf_cv_systype"; then cf_cv_systype=unknown;fi
+])])
+AC_MSG_RESULT($cf_cv_systype)
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_SYS_NAME version: 3 updated: 2008/03/23 14:48:54
+dnl -----------
+dnl Derive the system name, as a check for reusing the autoconf cache
+AC_DEFUN([CF_SYS_NAME],
+[
+SYS_NAME=`(uname -s -r || uname -a || hostname) 2>/dev/null | sed 1q`
+test -z "$SYS_NAME" && SYS_NAME=unknown
+AC_DEFINE_UNQUOTED(SYS_NAME,"$SYS_NAME")
+
+AC_CACHE_VAL(cf_cv_system_name,[cf_cv_system_name="$SYS_NAME"])
+
+if test ".$SYS_NAME" != ".$cf_cv_system_name" ; then
+	AC_MSG_RESULT("Cached system name does not agree with actual")
+	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 --------------
+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,
+dnl but some packagers change this, breaking various applications.
+AC_DEFUN([CF_TERM_HEADER],[
+AC_CACHE_CHECK(for terminfo header, cf_cv_term_header,[
+case ${cf_cv_ncurses_header} in #(vi
+*/ncurses.h|*/ncursesw.h) #(vi
+	cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[[^.]]*\.h$%term.h%'`
+	;;
+*)
+	cf_term_header=term.h
+	;;
+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_test>
+],[int x = auto_left_margin],[
+	cf_cv_term_header="$cf_test"],[
+	cf_cv_term_header=unknown
+	])
+	test "$cf_cv_term_header" != unknown && break
+done
+])
+
+# Set definitions to allow ifdef'ing to accommodate subdirectories
+
+case $cf_cv_term_header in # (vi
+*term.h)
+	AC_DEFINE(HAVE_TERM_H)
+	;;
+esac
+
+case $cf_cv_term_header in # (vi
+ncurses/term.h) #(vi
+	AC_DEFINE(HAVE_NCURSES_TERM_H)
+	;;
+ncursesw/term.h)
+	AC_DEFINE(HAVE_NCURSESW_TERM_H)
+	;;
+esac
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_UNION_WAIT version: 5 updated: 1997/11/23 14:49:44
+dnl -------------
+dnl Check to see if the BSD-style union wait is declared.  Some platforms may
+dnl use this, though it is deprecated in favor of the 'int' type in Posix.
+dnl Some vendors provide a bogus implementation that declares union wait, but
+dnl uses the 'int' type instead; we try to spot these by checking for the
+dnl associated macros.
+dnl
+dnl Ahem.  Some implementers cast the status value to an int*, as an attempt to
+dnl use the macros for either union wait or int.  So we do a check compile to
+dnl see if the macros are defined and apply to an int.
+dnl
+dnl Sets: $cf_cv_type_unionwait
+dnl Defines: HAVE_TYPE_UNIONWAIT
+AC_DEFUN([CF_UNION_WAIT],
+[
+AC_REQUIRE([CF_WAIT_HEADERS])
+AC_MSG_CHECKING([for union wait])
+AC_CACHE_VAL(cf_cv_type_unionwait,[
+	AC_TRY_LINK($cf_wait_headers,
+	[int x;
+	 int y = WEXITSTATUS(x);
+	 int z = WTERMSIG(x);
+	 wait(&x);
+	],
+	[cf_cv_type_unionwait=no
+	 echo compiles ok w/o union wait 1>&AC_FD_CC
+	],[
+	AC_TRY_LINK($cf_wait_headers,
+	[union wait x;
+#ifdef WEXITSTATUS
+	 int y = WEXITSTATUS(x);
+#endif
+#ifdef WTERMSIG
+	 int z = WTERMSIG(x);
+#endif
+	 wait(&x);
+	],
+	[cf_cv_type_unionwait=yes
+	 echo compiles ok with union wait and possibly macros too 1>&AC_FD_CC
+	],
+	[cf_cv_type_unionwait=no])])])
+AC_MSG_RESULT($cf_cv_type_unionwait)
+test $cf_cv_type_unionwait = yes && AC_DEFINE(HAVE_TYPE_UNIONWAIT)
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_UPPER version: 5 updated: 2001/01/29 23:40:59
+dnl --------
+dnl Make an uppercase version of a variable
+dnl $1=uppercase($2)
+AC_DEFUN([CF_UPPER],
+[
+$1=`echo "$2" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_UTF8_LIB version: 5 updated: 2008/10/17 19:37:52
+dnl -----------
+dnl Check for multibyte support, and if not found, utf8 compatibility library
+AC_DEFUN([CF_UTF8_LIB],
+[
+AC_CACHE_CHECK(for multibyte character support,cf_cv_utf8_lib,[
+	cf_save_LIBS="$LIBS"
+	AC_TRY_LINK([
+#include <stdlib.h>],[putwc(0,0);],
+	[cf_cv_utf8_lib=yes],
+	[CF_FIND_LINKAGE([
+#include <libutf8.h>],[putwc(0,0);],utf8,
+		[cf_cv_utf8_lib=add-on],
+		[cf_cv_utf8_lib=no])
+])])
+
+# HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between
+# ncurses/ncursesw:
+if test "$cf_cv_utf8_lib" = "add-on" ; then
+	AC_DEFINE(HAVE_LIBUTF8_H)
+	CF_ADD_INCDIR($cf_cv_header_path_utf8)
+	CF_ADD_LIBDIR($cf_cv_library_path_utf8)
+	LIBS="-lutf8 $LIBS"
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_VERBOSE version: 3 updated: 2007/07/29 09:55:12
+dnl ----------
+dnl Use AC_VERBOSE w/o the warnings
+AC_DEFUN([CF_VERBOSE],
+[test -n "$verbose" && echo "	$1" 1>&AC_FD_MSG
+CF_MSG_LOG([$1])
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_VERSION_INFO version: 3 updated: 2003/11/22 12:22:45
+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.
+dnl (automake is a textbook-example of why the latter is a bad idea, but there
+dnl are others).
+dnl
+dnl The file contents are:
+dnl	libtool-version	release-version	patch-version
+dnl or
+dnl	release-version
+dnl where
+dnl	libtool-version (see ?) consists of 3 integers separated by '.'
+dnl	release-version consists of a major version and minor version
+dnl		separated by '.', optionally followed by a patch-version
+dnl		separated by '-'.  The minor version need not be an
+dnl		integer (but it is preferred).
+dnl	patch-version is an integer in the form yyyymmdd, so ifdef's and
+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'.
+AC_DEFUN([CF_VERSION_INFO],
+[
+if test -f $srcdir/VERSION ; then
+	AC_MSG_CHECKING(for package version)
+
+	# 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" && AC_MSG_ERROR(missing major-version)
+
+	VERSION_MINOR=`echo "$cf_field2" | sed -e 's/^[[^.]]*\.//' -e 's/-.*//'`
+	test -z "$VERSION_MINOR" && AC_MSG_ERROR(missing minor-version)
+
+	AC_MSG_RESULT(${VERSION_MAJOR}.${VERSION_MINOR})
+
+	AC_MSG_CHECKING(for package patch date)
+	VERSION_PATCH=`echo "$cf_field3" | sed -e 's/^[[^-]]*-//'`
+	case .$VERSION_PATCH in
+	.)
+		AC_MSG_ERROR(missing patch-date $VERSION_PATCH)
+		;;
+	.[[0-9]][[0-9]][[0-9]][[0-9]][[0-9]][[0-9]][[0-9]][[0-9]])
+		;;
+	*)
+		AC_MSG_ERROR(illegal patch-date $VERSION_PATCH)
+		;;
+	esac
+	AC_MSG_RESULT($VERSION_PATCH)
+else
+	AC_MSG_ERROR(did not find $srcdir/VERSION)
+fi
+
+# show the actual data that we have for versions:
+CF_VERBOSE(VERSION $VERSION)
+CF_VERBOSE(VERSION_MAJOR $VERSION_MAJOR)
+CF_VERBOSE(VERSION_MINOR $VERSION_MINOR)
+CF_VERBOSE(VERSION_PATCH $VERSION_PATCH)
+
+AC_SUBST(VERSION)
+AC_SUBST(VERSION_MAJOR)
+AC_SUBST(VERSION_MINOR)
+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
+	AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
+	AC_SUBST(PACKAGE)
+	CF_UPPER(cf_PACKAGE,$PACKAGE)
+	AC_DEFINE_UNQUOTED(${cf_PACKAGE}_VERSION,"${VERSION_MAJOR}.${VERSION_MINOR}")
+	AC_DEFINE_UNQUOTED(${cf_PACKAGE}_PATCHDATE,${VERSION_PATCH})
+])
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_WAIT_HEADERS version: 2 updated: 1997/10/21 19:45:33
+dnl ---------------
+dnl Build up an expression $cf_wait_headers with the header files needed to
+dnl compile against the prototypes for 'wait()', 'waitpid()', etc.  Assume it's
+dnl Posix, which uses <sys/types.h> and <sys/wait.h>, but allow SVr4 variation
+dnl with <wait.h>.
+AC_DEFUN([CF_WAIT_HEADERS],
+[
+AC_HAVE_HEADERS(sys/wait.h)
+cf_wait_headers="#include <sys/types.h>
+"
+if test $ac_cv_header_sys_wait_h = yes; then
+cf_wait_headers="$cf_wait_headers
+#include <sys/wait.h>
+"
+else
+AC_HAVE_HEADERS(wait.h)
+AC_HAVE_HEADERS(waitstatus.h)
+if test $ac_cv_header_wait_h = yes; then
+cf_wait_headers="$cf_wait_headers
+#include <wait.h>
+"
+fi
+if test $ac_cv_header_waitstatus_h = yes; then
+cf_wait_headers="$cf_wait_headers
+#include <waitstatus.h>
+"
+fi
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_WITH_CURSES_DIR version: 2 updated: 2002/11/10 14:46:59
+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_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=no])
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_WITH_DBMALLOC version: 6 updated: 2006/12/16 14:24:05
+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.
+AC_DEFUN([CF_WITH_DBMALLOC],[
+CF_NO_LEAKS_OPTION(dbmalloc,
+	[  --with-dbmalloc         test: use Conor Cahill's dbmalloc library],
+	[USE_DBMALLOC])
+
+if test "$with_dbmalloc" = yes ; then
+	AC_CHECK_HEADER(dbmalloc.h,
+		[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 ---------------
+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.
+AC_DEFUN([CF_WITH_DMALLOC],[
+CF_NO_LEAKS_OPTION(dmalloc,
+	[  --with-dmalloc          test: use Gray Watson's dmalloc library],
+	[USE_DMALLOC])
+
+if test "$with_dmalloc" = yes ; then
+	AC_CHECK_HEADER(dmalloc.h,
+		[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 ---------------
+dnl Provide a configure option to incorporate libtool.  Define several useful
+dnl symbols for the makefile rules.
+dnl
+dnl The reference to AC_PROG_LIBTOOL does not normally work, since it uses
+dnl macros from libtool.m4 which is in the aclocal directory of automake.
+dnl Following is a simple script which turns on the AC_PROG_LIBTOOL macro.
+dnl But that still does not work properly since the macro is expanded outside
+dnl the CF_WITH_LIBTOOL macro:
+dnl
+dnl	#!/bin/sh
+dnl	ACLOCAL=`aclocal --print-ac-dir`
+dnl	if test -z "$ACLOCAL" ; then
+dnl		echo cannot find aclocal directory
+dnl		exit 1
+dnl	elif test ! -f $ACLOCAL/libtool.m4 ; then
+dnl		echo cannot find libtool.m4 file
+dnl		exit 1
+dnl	fi
+dnl
+dnl	LOCAL=aclocal.m4
+dnl	ORIG=aclocal.m4.orig
+dnl
+dnl	trap "mv $ORIG $LOCAL" 0 1 2 5 15
+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	cat $ORIG >>$LOCAL
+dnl
+dnl	autoconf-257 $*
+dnl
+AC_DEFUN([CF_WITH_LIBTOOL],
+[
+ifdef([AC_PROG_LIBTOOL],,[
+LIBTOOL=
+])
+# common library maintenance symbols that are convenient for libtool scripts:
+LIB_CREATE='${AR} -cr'
+LIB_OBJECT='${OBJECTS}'
+LIB_SUFFIX=.a
+LIB_PREP="$RANLIB"
+
+# symbols used to prop libtool up to enable it to determine what it should be
+# doing:
+LIB_CLEAN=
+LIB_COMPILE=
+LIB_LINK='${CC}'
+LIB_INSTALL=
+LIB_UNINSTALL=
+
+AC_MSG_CHECKING(if you want to build libraries with libtool)
+AC_ARG_WITH(libtool,
+	[  --with-libtool          generate libraries with libtool],
+	[with_libtool=$withval],
+	[with_libtool=no])
+AC_MSG_RESULT($with_libtool)
+if test "$with_libtool" != "no"; then
+ifdef([AC_PROG_LIBTOOL],[
+	# missing_content_AC_PROG_LIBTOOL{{
+	AC_PROG_LIBTOOL
+	# missing_content_AC_PROG_LIBTOOL}}
+],[
+	if test "$with_libtool" != "yes" ; then
+		CF_PATH_SYNTAX(with_libtool)
+		LIBTOOL=$with_libtool
+	else
+		AC_PATH_PROG(LIBTOOL,libtool)
+	fi
+	if test -z "$LIBTOOL" ; then
+		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_OBJECT='${OBJECTS:.o=.lo}'
+	LIB_SUFFIX=.la
+	LIB_CLEAN='${LIBTOOL} --mode=clean'
+	LIB_COMPILE='${LIBTOOL} --mode=compile'
+	LIB_LINK='${LIBTOOL} --mode=link ${CC} ${LIBTOOL_OPTS}'
+	LIB_INSTALL='${LIBTOOL} --mode=install'
+	LIB_UNINSTALL='${LIBTOOL} --mode=uninstall'
+	LIB_PREP=:
+
+	# Show the version of libtool
+	AC_MSG_CHECKING(version of libtool)
+
+	# 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.]].*//'`
+	AC_MSG_RESULT($cf_cv_libtool_version)
+	if test -z "$cf_cv_libtool_version" ; then
+		AC_MSG_ERROR(This is not GNU libtool)
+	fi
+
+	# special hack to add -no-undefined (which libtool should do for itself)
+	LT_UNDEF=
+	case "$cf_cv_system_name" in #(vi
+	cygwin*|mingw32*|uwin*|aix[[456]]) #(vi
+		LT_UNDEF=-no-undefined
+		;;
+	esac
+	AC_SUBST([LT_UNDEF])
+
+	# special hack to add --tag option for C++ compiler
+	case $cf_cv_libtool_version in #(vi
+	1.[[5-9]]*|[[2-9]].[[0-9.a-z]]*) #(vi
+		LIBTOOL_CXX="$LIBTOOL --tag=CXX"
+		LIBTOOL="$LIBTOOL --tag=CC"
+		;;
+	*)
+		LIBTOOL_CXX="$LIBTOOL"
+		;;
+	esac
+else
+	LIBTOOL=""
+	LIBTOOL_CXX=""
+fi
+
+test -z "$LIBTOOL" && ECHO_LT=
+
+AC_SUBST(LIBTOOL)
+AC_SUBST(LIBTOOL_CXX)
+AC_SUBST(LIBTOOL_OPTS)
+
+AC_SUBST(LIB_CREATE)
+AC_SUBST(LIB_OBJECT)
+AC_SUBST(LIB_SUFFIX)
+AC_SUBST(LIB_PREP)
+
+AC_SUBST(LIB_CLEAN)
+AC_SUBST(LIB_COMPILE)
+AC_SUBST(LIB_LINK)
+AC_SUBST(LIB_INSTALL)
+AC_SUBST(LIB_UNINSTALL)
+
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_WITH_LIBTOOL_OPTS version: 2 updated: 2007/04/08 18:14:54
+dnl --------------------
+dnl Allow user to pass additional libtool options into the library creation
+dnl and link steps.  The main use for this is to do something like
+dnl	./configure --with-libtool-opts=-static
+dnl to get the same behavior as automake-flavored
+dnl	./configure --enable-static
+AC_DEFUN([CF_WITH_LIBTOOL_OPTS],[
+AC_MSG_CHECKING(for additional libtool options)
+AC_ARG_WITH(libtool-opts,
+	[  --with-libtool-opts=XXX specify additional libtool options],
+	[with_libtool_opts=$withval],
+	[with_libtool_opts=no])
+AC_MSG_RESULT($with_libtool_opts)
+
+case .$with_libtool_opts in
+.yes|.no|.)
+	;;
+*)
+	LIBTOOL_OPTS=$with_libtool_opts
+	;;
+esac
+
+AC_SUBST(LIBTOOL_OPTS)
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_WITH_NO_LEAKS version: 1 updated: 2006/12/14 18:00:21
+dnl ----------------
+AC_DEFUN([CF_WITH_NO_LEAKS],[
+
+AC_REQUIRE([CF_WITH_DMALLOC])
+AC_REQUIRE([CF_WITH_DBMALLOC])
+AC_REQUIRE([CF_WITH_PURIFY])
+AC_REQUIRE([CF_WITH_VALGRIND])
+
+AC_MSG_CHECKING(if you want to perform memory-leak testing)
+AC_ARG_WITH(no-leaks,
+	[  --with-no-leaks         test: free permanent memory, analyze leaks],
+	[AC_DEFINE(NO_LEAKS)
+	 cf_doalloc=".${with_dmalloc}${with_dbmalloc}${with_purify}${with_valgrind}"
+	 case ${cf_doalloc} in #(vi
+	 *yes*) ;;
+	 *) AC_DEFINE(DOALLOC,10000) ;;
+	 esac
+	 with_no_leaks=yes],
+	[with_no_leaks=])
+AC_MSG_RESULT($with_no_leaks)
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_WITH_PURIFY version: 2 updated: 2006/12/14 18:43:43
+dnl --------------
+AC_DEFUN([CF_WITH_PURIFY],[
+CF_NO_LEAKS_OPTION(purify,
+	[  --with-purify           test: use Purify],
+	[USE_PURIFY],
+	[LINK_PREFIX="$LINK_PREFIX purify"])
+AC_SUBST(LINK_PREFIX)
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_WITH_VALGRIND version: 1 updated: 2006/12/14 18:00:21
+dnl ----------------
+AC_DEFUN([CF_WITH_VALGRIND],[
+CF_NO_LEAKS_OPTION(valgrind,
+	[  --with-valgrind         test: use valgrind],
+	[USE_VALGRIND])
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_WITH_WARNINGS version: 5 updated: 2004/07/23 14:40:34
+dnl ----------------
+dnl Combine the checks for gcc features into a configure-script option
+dnl
+dnl Parameters:
+dnl	$1 - see CF_GCC_WARNINGS
+AC_DEFUN([CF_WITH_WARNINGS],
+[
+if ( test "$GCC" = yes || test "$GXX" = yes )
+then
+AC_MSG_CHECKING(if you want to check for gcc warnings)
+AC_ARG_WITH(warnings,
+	[  --with-warnings         test: turn on gcc warnings],
+	[cf_opt_with_warnings=$withval],
+	[cf_opt_with_warnings=no])
+AC_MSG_RESULT($cf_opt_with_warnings)
+if test "$cf_opt_with_warnings" != no ; then
+	CF_GCC_ATTRIBUTES
+	CF_GCC_WARNINGS([$1])
+fi
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_XOPEN_CURSES version: 8 updated: 2003/11/07 19:47:46
+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.
+dnl
+dnl The getbegyx() check is needed for HPUX, which omits legacy macros such
+dnl as getbegy().  The latter is better design, but the former is standard.
+AC_DEFUN([CF_XOPEN_CURSES],
+[
+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}>],[
+	long x = winnstr(stdscr, "", 0);
+	int x1, y1;
+	getbegyx(stdscr, y1, x1)],
+	[cf_cv_need_xopen_extension=no],
+	[AC_TRY_LINK([
+#define _XOPEN_SOURCE_EXTENDED
+#include <stdlib.h>
+#include <${cf_cv_ncurses_header-curses.h}>],[
+	long x = winnstr(stdscr, "", 0);
+	int x1, y1;
+	getbegyx(stdscr, y1, x1)],
+	[cf_cv_need_xopen_extension=yes],
+	[cf_cv_need_xopen_extension=unknown])])])
+test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_XOPEN_SOURCE version: 32 updated: 2010/01/09 11:05:50
+dnl ---------------
+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,
+dnl without losing the common non-POSIX features.
+dnl
+dnl Parameters:
+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=
+
+case $host_os in #(vi
+aix[[456]]*) #(vi
+	cf_xopen_source="-D_ALL_SOURCE"
+	;;
+darwin[[0-8]].*) #(vi
+	cf_xopen_source="-D_APPLE_C_SOURCE"
+	;;
+darwin*) #(vi
+	cf_xopen_source="-D_DARWIN_C_SOURCE"
+	;;
+freebsd*|dragonfly*) #(vi
+	# 5.x headers associate
+	#	_XOPEN_SOURCE=600 with _POSIX_C_SOURCE=200112L
+	#	_XOPEN_SOURCE=500 with _POSIX_C_SOURCE=199506L
+	cf_POSIX_C_SOURCE=200112L
+	cf_XOPEN_SOURCE=600
+	cf_xopen_source="-D_BSD_TYPES -D__BSD_VISIBLE -D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+	;;
+hpux11*) #(vi
+	cf_xopen_source="-D_HPUX_SOURCE -D_XOPEN_SOURCE=500"
+	;;
+hpux*) #(vi
+	cf_xopen_source="-D_HPUX_SOURCE"
+	;;
+irix[[56]].*) #(vi
+	cf_xopen_source="-D_SGI_SOURCE"
+	;;
+linux*|gnu*|mint*|k*bsd*-gnu) #(vi
+	CF_GNU_SOURCE
+	;;
+mirbsd*) #(vi
+	# setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <arpa/inet.h>
+	;;
+netbsd*) #(vi
+	# setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw
+	;;
+openbsd*) #(vi
+	# setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
+	;;
+osf[[45]]*) #(vi
+	cf_xopen_source="-D_OSF_SOURCE"
+	;;
+nto-qnx*) #(vi
+	cf_xopen_source="-D_QNX_SOURCE"
+	;;
+sco*) #(vi
+	# setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer
+	;;
+solaris*) #(vi
+	cf_xopen_source="-D__EXTENSIONS__"
+	;;
+*)
+	AC_CACHE_CHECK(if we should define _XOPEN_SOURCE,cf_cv_xopen_source,[
+	AC_TRY_COMPILE([#include <sys/types.h>],[
+#ifndef _XOPEN_SOURCE
+make an error
+#endif],
+	[cf_cv_xopen_source=no],
+	[cf_save="$CPPFLAGS"
+	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+	 AC_TRY_COMPILE([#include <sys/types.h>],[
+#ifdef _XOPEN_SOURCE
+make an error
+#endif],
+	[cf_cv_xopen_source=no],
+	[cf_cv_xopen_source=$cf_XOPEN_SOURCE])
+	CPPFLAGS="$cf_save"
+	])
+])
+	if test "$cf_cv_xopen_source" != no ; then
+		CF_REMOVE_DEFINE(CFLAGS,$CFLAGS,_XOPEN_SOURCE)
+		CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,_XOPEN_SOURCE)
+		cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source"
+		CF_ADD_CFLAGS($cf_temp_xopen_source)
+	fi
+	CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE)
+	;;
+esac
+
+if test -n "$cf_xopen_source" ; then
+	CF_ADD_CFLAGS($cf_xopen_source)
+fi
+])
+dnl ---------------------------------------------------------------------------
+dnl CF__CURSES_HEAD version: 1 updated: 2009/07/16 19:32:31
+dnl ---------------
+dnl Define a reusable chunk which includes <curses.h> and <term.h> when they
+dnl are both available.
+define([CF__CURSES_HEAD],[
+#ifdef HAVE_XCURSES
+#include <xcurses.h>
+char * XCursesProgramName = "test";
+#else
+#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)
+#include <ncurses/term.h>
+#elif defined(HAVE_TERM_H)
+#include <term.h>
+#endif
+#endif
+])
+dnl ---------------------------------------------------------------------------
+dnl CF__ICONV_BODY version: 2 updated: 2007/07/26 17:35:47
+dnl --------------
+dnl Test-code needed for iconv compile-checks
+define([CF__ICONV_BODY],[
+	iconv_t cd = iconv_open("","");
+	iconv(cd,NULL,NULL,NULL,NULL);
+	iconv_close(cd);]
+)dnl
+dnl ---------------------------------------------------------------------------
+dnl CF__ICONV_HEAD version: 1 updated: 2007/07/26 15:57:03
+dnl --------------
+dnl Header-files needed for iconv compile-checks
+define([CF__ICONV_HEAD],[
+#include <stdlib.h>
+#include <iconv.h>]
+)dnl
+dnl ---------------------------------------------------------------------------
+dnl CF__INTL_BODY version: 1 updated: 2007/07/26 17:35:47
+dnl -------------
+dnl Test-code needed for libintl compile-checks
+dnl $1 = parameter 2 from AM_WITH_NLS
+define([CF__INTL_BODY],[
+    bindtextdomain ("", "");
+    return (int) gettext ("")
+            ifelse([$1], need-ngettext, [ + (int) ngettext ("", "", 0)], [])
+            [ + _nl_msg_cat_cntr]
+])
+dnl ---------------------------------------------------------------------------
+dnl CF__INTL_HEAD version: 1 updated: 2007/07/26 17:35:47
+dnl -------------
+dnl Header-files needed for libintl compile-checks
+define([CF__INTL_HEAD],[
+#include <libintl.h>
+extern int _nl_msg_cat_cntr;
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl jm_GLIBC21 version: 3 updated: 2002/10/27 23:21:42
+dnl ----------
+dnl Inserted as requested by gettext 0.10.40
+dnl File from /usr/share/aclocal
+dnl glibc21.m4
+dnl ====================
+dnl serial 2
+dnl
+dnl Test for the GNU C Library, version 2.1 or newer.
+dnl From Bruno Haible.
+AC_DEFUN([jm_GLIBC21],
+  [
+    AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
+      ac_cv_gnu_library_2_1,
+      [AC_EGREP_CPP([Lucky GNU user],
+	[
+#include <features.h>
+#ifdef __GNU_LIBRARY__
+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
+  Lucky GNU user
+ #endif
+#endif
+	],
+	ac_cv_gnu_library_2_1=yes,
+	ac_cv_gnu_library_2_1=no)
+      ]
+    )
+    AC_SUBST(GLIBC21)
+    GLIBC21="$ac_cv_gnu_library_2_1"
+  ]
+)
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/arrows.c b/Build/source/utils/dialog/dialog-1.1-20100119/arrows.c
new file mode 100644
index 00000000000..b507fe1b486
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/arrows.c
@@ -0,0 +1,215 @@
+/*
+ *  $Id: arrows.c,v 1.28 2010/01/19 10:07:36 tom Exp $
+ *
+ *  arrows.c -- draw arrows to indicate end-of-range for lists
+ *
+ * Copyright 2000-2009,2010   Thomas E. Dickey
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License, version 2.1
+ *  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>
+
+#ifdef USE_WIDE_CURSES
+#define add_acs(win, code) wadd_wch(win, W ## code)
+#else
+#define add_acs(win, code) waddch(win, dlg_boxchar(code))
+#endif
+
+#ifdef HAVE_COLOR
+static chtype
+merge_colors(chtype foreground, chtype background)
+{
+    chtype result = foreground;
+    if ((foreground & A_COLOR) != (background & A_COLOR)) {
+	short fg_f, bg_f;
+	short fg_b, bg_b;
+	short fg_pair = (short) PAIR_NUMBER(foreground);
+	short bg_pair = (short) PAIR_NUMBER(background);
+
+	if (pair_content(fg_pair, &fg_f, &bg_f) != ERR
+	    && pair_content(bg_pair, &fg_b, &bg_b) != ERR) {
+	    result &= ~A_COLOR;
+	    result |= dlg_color_pair(fg_f, bg_b);
+	}
+    }
+    return result;
+}
+#else
+#define merge_colors(f,b) (f)
+#endif
+
+void
+dlg_draw_arrows2(WINDOW *win,
+		 int top_arrow,
+		 int bottom_arrow,
+		 int x,
+		 int top,
+		 int bottom,
+		 chtype attr,
+		 chtype borderattr)
+{
+    chtype save = getattrs(win);
+    int cur_x, cur_y;
+    int limit_x = getmaxx(win);
+    bool draw_top = TRUE;
+
+    getyx(win, cur_y, cur_x);
+
+    /*
+     * If we're drawing a centered title, do not overwrite with the arrows.
+     */
+    if (dialog_vars.title) {
+	int have = (limit_x - dlg_count_columns(dialog_vars.title)) / 2;
+	int need = x + 5;
+	if (need > have)
+	    draw_top = FALSE;
+    }
+
+    if (draw_top) {
+	(void) wmove(win, top, x);
+	if (top_arrow) {
+	    wattrset(win, merge_colors(uarrow_attr, attr));
+	    (void) add_acs(win, ACS_UARROW);
+	    (void) waddstr(win, "(-)");
+	} else {
+	    wattrset(win, attr);
+	    (void) whline(win, dlg_boxchar(ACS_HLINE), 4);
+	}
+    }
+    mouse_mkbutton(top, x - 1, 6, KEY_PPAGE);
+
+    (void) wmove(win, bottom, x);
+    if (bottom_arrow) {
+	wattrset(win, merge_colors(darrow_attr, attr));
+	(void) add_acs(win, ACS_DARROW);
+	(void) waddstr(win, "(+)");
+    } else {
+	wattrset(win, borderattr);
+	(void) whline(win, dlg_boxchar(ACS_HLINE), 4);
+    }
+    mouse_mkbutton(bottom, x - 1, 6, KEY_NPAGE);
+
+    (void) wmove(win, cur_y, cur_x);
+    wrefresh(win);
+
+    wattrset(win, save);
+}
+
+void
+dlg_draw_scrollbar(WINDOW *win,
+		   long first_data,
+		   long this_data,
+		   long next_data,
+		   long total_data,
+		   int left,
+		   int right,
+		   int top,
+		   int bottom,
+		   chtype attr,
+		   chtype borderattr)
+{
+    char buffer[80];
+    int percent;
+    int len;
+    int oldy, oldx, maxy, maxx;
+
+    chtype save = getattrs(win);
+    int top_arrow = (first_data != 0);
+    int bottom_arrow = (next_data < total_data);
+
+    getyx(win, oldy, oldx);
+    getmaxyx(win, maxy, maxx);
+
+    percent = (!total_data
+	       ? 100
+	       : (int) ((next_data * 100)
+			/ total_data));
+
+    if (percent < 0)
+	percent = 0;
+    if (percent > 100)
+	percent = 100;
+
+    wattrset(win, position_indicator_attr);
+    (void) sprintf(buffer, "%d%%", percent);
+    (void) wmove(win, bottom, right - 7);
+    (void) waddstr(win, buffer);
+    if ((len = dlg_count_columns(buffer)) < 4) {
+	wattrset(win, border_attr);
+	whline(win, dlg_boxchar(ACS_HLINE), 4 - len);
+    }
+#define BARSIZE(num) ((all_high * (num)) + all_high - 1) / total_data
+
+    if (dialog_state.use_scrollbar) {
+	int all_high = (bottom - top - 1);
+
+	if (total_data > 0 && all_high > 0) {
+	    int bar_high;
+	    int bar_y;
+
+	    bar_high = BARSIZE(next_data - this_data);
+	    if (bar_high <= 0)
+		bar_high = 1;
+
+	    if (bar_high < all_high) {
+		wmove(win, top + 1, right);
+
+		wattrset(win, save);
+		wvline(win, ACS_VLINE | A_REVERSE, all_high);
+
+		bar_y = BARSIZE(this_data);
+		if (bar_y > all_high - bar_high)
+		    bar_y = all_high - bar_high;
+
+		wmove(win, top + 1 + bar_y, right);
+
+		wattrset(win, position_indicator_attr);
+		wattron(win, A_REVERSE);
+		wvline(win, ACS_BLOCK, bar_high);
+	    }
+	}
+    }
+    dlg_draw_arrows2(win,
+		     top_arrow,
+		     bottom_arrow,
+		     left + ARROWS_COL,
+		     top,
+		     bottom,
+		     attr,
+		     borderattr);
+
+    wattrset(win, save);
+    wmove(win, oldy, oldx);
+}
+
+void
+dlg_draw_arrows(WINDOW *win,
+		int top_arrow,
+		int bottom_arrow,
+		int x,
+		int top,
+		int bottom)
+{
+    dlg_draw_arrows2(win,
+		     top_arrow,
+		     bottom_arrow,
+		     x,
+		     top,
+		     bottom,
+		     menubox_attr,
+		     menubox_border_attr);
+}
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/buttons.c b/Build/source/utils/dialog/dialog-1.1-20100119/buttons.c
index 14a02e5d5b5..1ffa4f00446 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/buttons.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/buttons.c
@@ -1,9 +1,9 @@
 /*
- *  $Id: buttons.c,v 1.77 2007/09/30 00:18:57 tom Exp $
+ *  $Id: buttons.c,v 1.79 2010/01/14 02:01:36 tom Exp $
  *
  * buttons.c -- draw buttons, e.g., OK/Cancel
  *
- * Copyright 2000-2006,2007 Thomas E. Dickey
+ * Copyright 2000-2007,2010 Thomas E. Dickey
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License, version 2.1
@@ -58,19 +58,19 @@ string_to_char(const char **stringp)
     int result;
 #ifdef USE_WIDE_CURSES
     const char *string = *stringp;
-    int have = strlen(string);
-    int check;
-    int len;
+    size_t have = strlen(string);
+    size_t check;
+    size_t len;
     wchar_t cmp2[2];
     mbstate_t state;
 
     memset(&state, 0, sizeof(state));
     len = mbrlen(string, have, &state);
-    if (len > 0 && len <= have) {
+    if ((int) len > 0 && len <= have) {
 	memset(&state, 0, sizeof(state));
 	memset(cmp2, 0, sizeof(cmp2));
 	check = mbrtowc(cmp2, string, len, &state);
-	if (check <= 0)
+	if ((int) check <= 0)
 	    cmp2[0] = 0;
 	*stringp += len;
     } else {
@@ -230,13 +230,15 @@ dlg_button_layout(const char **labels, int *limit)
     int width = 1;
     int gap, margin, step;
 
-    while (!dlg_button_x_step(labels, width, &gap, &margin, &step))
-	++width;
-    width += (4 * MARGIN);
-    if (width > COLS)
-	width = COLS;
-    if (width > *limit)
-	*limit = width;
+    if (labels != 0) {
+	while (!dlg_button_x_step(labels, width, &gap, &margin, &step))
+	    ++width;
+	width += (4 * MARGIN);
+	if (width > COLS)
+	    width = COLS;
+	if (width > *limit)
+	    *limit = width;
+    }
 }
 
 /*
@@ -516,9 +518,9 @@ int
 dlg_ok_buttoncode(int button)
 {
     int result = DLG_EXIT_ERROR;
-    int n = 1;
+    int n = !dialog_vars.nook;
 
-    if (!dialog_vars.nook && button <= 0) {
+    if (!dialog_vars.nook && (button <= 0)) {
 	result = DLG_EXIT_OK;
     } else if (dialog_vars.extra_button && (button == n++)) {
 	result = DLG_EXIT_EXTRA;
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/calendar.c b/Build/source/utils/dialog/dialog-1.1-20100119/calendar.c
index 3e311dce98a..09eb92c564d 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/calendar.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/calendar.c
@@ -1,9 +1,9 @@
 /*
- * $Id: calendar.c,v 1.54 2008/06/21 12:36:41 tom Exp $
+ * $Id: calendar.c,v 1.59 2010/01/18 09:50:44 tom Exp $
  *
  *  calendar.c -- implements the calendar box
  *
- *  Copyright 2001-2007,2008	Thomas E. Dickey
+ *  Copyright 2001-2009,2010	Thomas E. Dickey
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License, version 2.1
@@ -58,6 +58,86 @@ typedef struct _box {
     BOX_DRAW box_draw;
 } BOX;
 
+static const char *
+nameOfDayOfWeek(int n)
+{
+    static const char *table[7]
+#ifndef ENABLE_NLS
+    =
+    {
+	"Sunday",
+	"Monday",
+	"Tuesday",
+	"Wednesday",
+	"Thursday",
+	"Friday",
+	"Saturday"
+    }
+#endif
+     ;
+    const char *result = 0;
+
+    if (n >= 0 && n < 7) {
+#ifdef ENABLE_NLS
+	if (table[n] == 0) {
+	    nl_item items[7] =
+	    {
+		ABDAY_1, ABDAY_2, ABDAY_3, ABDAY_4, ABDAY_5, ABDAY_6, ABDAY_7
+	    };
+	    table[n] = nl_langinfo(items[n]);
+	}
+#endif
+	result = table[n];
+    }
+    if (result == 0) {
+	result = "?";
+    }
+    return result;
+}
+
+static const char *
+nameOfMonth(int n)
+{
+    static const char *table[12]
+#ifndef ENABLE_NLS
+    =
+    {
+	"January",
+	"February",
+	"March",
+	"April",
+	"May",
+	"June",
+	"July",
+	"August",
+	"September",
+	"October",
+	"November",
+	"December"
+    }
+#endif
+     ;
+    const char *result = 0;
+
+    if (n >= 0 && n < 12) {
+#ifdef ENABLE_NLS
+	if (table[n] == 0) {
+	    nl_item items[12] =
+	    {
+		MON_1, MON_2, MON_3, MON_4, MON_5, MON_6,
+		MON_7, MON_8, MON_9, MON_10, MON_11, MON_12
+	    };
+	    table[n] = nl_langinfo(items[n]);
+	}
+#endif
+	result = table[n];
+    }
+    if (result == 0) {
+	result = "?";
+    }
+    return result;
+}
+
 static int
 days_in_month(struct tm *current, int offset /* -1, 0, 1 */ )
 {
@@ -135,29 +215,6 @@ next_or_previous(int key, int two_d)
 static int
 draw_day(BOX * data, struct tm *current)
 {
-#ifdef ENABLE_NLS
-    char *of_week[] =
-    {
-	nl_langinfo(ABDAY_1),
-	nl_langinfo(ABDAY_2),
-	nl_langinfo(ABDAY_3),
-	nl_langinfo(ABDAY_4),
-	nl_langinfo(ABDAY_5),
-	nl_langinfo(ABDAY_6),
-	nl_langinfo(ABDAY_7)
-    };
-#else
-    static const char *const of_week[] =
-    {
-	"Sunday",
-	"Monday",
-	"Tuesday",
-	"Wednesday",
-	"Thursday",
-	"Friday",
-	"Saturday"
-    };
-#endif
     int cell_wide = MON_WIDE;
     int y, x, this_x = 0;
     int save_y = 0, save_x = 0;
@@ -179,7 +236,7 @@ draw_day(BOX * data, struct tm *current)
 		  0, (x + 1) * cell_wide, "%*.*s ",
 		  cell_wide - 1,
 		  cell_wide - 1,
-		  of_week[x]);
+		  nameOfDayOfWeek(x));
     }
 
     mday = ((6 + current->tm_mday - current->tm_wday) % 7) - 7;
@@ -218,6 +275,7 @@ draw_day(BOX * data, struct tm *current)
 	}
 	wmove(data->window, save_y, save_x);
     }
+    /* just draw arrows - scrollbar is unsuitable here */
     dlg_draw_arrows(data->parent, TRUE, TRUE,
 		    data->x + ARROWS_COL,
 		    data->y - 1,
@@ -232,39 +290,6 @@ draw_day(BOX * data, struct tm *current)
 static int
 draw_month(BOX * data, struct tm *current)
 {
-#ifdef ENABLE_NLS
-    char *months[] =
-    {
-	nl_langinfo(MON_1),
-	nl_langinfo(MON_2),
-	nl_langinfo(MON_3),
-	nl_langinfo(MON_4),
-	nl_langinfo(MON_5),
-	nl_langinfo(MON_6),
-	nl_langinfo(MON_7),
-	nl_langinfo(MON_8),
-	nl_langinfo(MON_9),
-	nl_langinfo(MON_10),
-	nl_langinfo(MON_11),
-	nl_langinfo(MON_12)
-    };
-#else
-    static const char *const months[] =
-    {
-	"January",
-	"February",
-	"March",
-	"April",
-	"May",
-	"June",
-	"July",
-	"August",
-	"September",
-	"October",
-	"November",
-	"December"
-    };
-#endif
     int month;
 
     month = current->tm_mon + 1;
@@ -276,7 +301,7 @@ draw_month(BOX * data, struct tm *current)
 		 data->height + 2, data->width + 2,
 		 menubox_border_attr, menubox_attr);	/* borders of monthbox */
     wattrset(data->window, item_attr);	/* color the month selection */
-    mvwprintw(data->window, 0, 0, "%s", months[month - 1]);
+    mvwprintw(data->window, 0, 0, "%s", nameOfMonth(month - 1));
     wmove(data->window, 0, 0);
     return 0;
 }
@@ -368,13 +393,15 @@ dialog_calendar(const char *title,
 	DLG_KEYS_DATA( DLGK_FIELD_NEXT, TAB ),
 	DLG_KEYS_DATA( DLGK_FIELD_PREV, KEY_BTAB ),
 	DLG_KEYS_DATA( DLGK_GRID_DOWN,	'j' ),
+	DLG_KEYS_DATA( DLGK_GRID_DOWN,	DLGK_MOUSE(KEY_NPAGE) ),
 	DLG_KEYS_DATA( DLGK_GRID_DOWN,	KEY_DOWN ),
 	DLG_KEYS_DATA( DLGK_GRID_DOWN,	KEY_NPAGE ),
-	DLG_KEYS_DATA( DLGK_GRID_DOWN,	DLGK_MOUSE(KEY_NPAGE) ),
+	DLG_KEYS_DATA( DLGK_GRID_LEFT,	'-' ),
 	DLG_KEYS_DATA( DLGK_GRID_LEFT,  'h' ),
 	DLG_KEYS_DATA( DLGK_GRID_LEFT,  CHR_BACKSPACE ),
 	DLG_KEYS_DATA( DLGK_GRID_LEFT,  CHR_PREVIOUS ),
 	DLG_KEYS_DATA( DLGK_GRID_LEFT,  KEY_LEFT ),
+	DLG_KEYS_DATA( DLGK_GRID_RIGHT,	'+' ),
 	DLG_KEYS_DATA( DLGK_GRID_RIGHT, 'l' ),
 	DLG_KEYS_DATA( DLGK_GRID_RIGHT, CHR_NEXT ),
 	DLG_KEYS_DATA( DLGK_GRID_RIGHT, KEY_NEXT ),
@@ -405,8 +432,7 @@ dialog_calendar(const char *title,
     int state = dlg_defaultno_button();
     const char **buttons = dlg_ok_labels();
     char *prompt = dlg_strclone(subtitle);
-    int longest;
-    int mincols;
+    int mincols = MIN_WIDE;
     char buffer[MAX_LEN];
     DIALOG_VARS save_vars;
 
@@ -446,11 +472,7 @@ dialog_calendar(const char *title,
 	    current = *localtime(&now_time);
 	}
     }
-
-    dlg_button_sizes(buttons, FALSE, &longest, &mincols);
-    mincols += (0 * MARGIN) + (dlg_button_count(buttons) * 3) - 1;
-    if (mincols < MIN_WIDE)
-	mincols = MIN_WIDE;
+    dlg_button_layout(buttons, &mincols);
 
 #ifdef KEY_RESIZE
   retry:
@@ -458,8 +480,6 @@ dialog_calendar(const char *title,
 
     dlg_auto_size(title, prompt, &height, &width, 0, mincols);
     height += MIN_HIGH - 1;
-    if (width < MIN_WIDE)
-	width = MIN_WIDE;
     dlg_print_size(height, width);
     dlg_ctl_size(height, width);
 
@@ -636,8 +656,21 @@ dialog_calendar(const char *title,
 	}
     }
 
-    sprintf(buffer, "%02d/%02d/%0d",
-	    current.tm_mday, current.tm_mon + 1, current.tm_year + 1900);
+#define DefaultFormat(dst, src) \
+	sprintf(dst, "%02d/%02d/%0d", \
+		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);
+	if (used == 0 || *buffer == '\0')
+	    DefaultFormat(buffer, current);
+    } else
+#endif
+	DefaultFormat(buffer, current);
+
     dlg_add_result(buffer);
     dlg_add_separator();
 
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/checklist.c b/Build/source/utils/dialog/dialog-1.1-20100119/checklist.c
index 8189cd6fc55..0115288b45c 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/checklist.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/checklist.c
@@ -1,9 +1,9 @@
 /*
- *  $Id: checklist.c,v 1.119 2008/06/20 20:58:21 tom Exp $
+ *  $Id: checklist.c,v 1.121 2010/01/17 19:32:17 tom Exp $
  *
  *  checklist.c -- implements the checklist box
  *
- *  Copyright 2000-2007,2008	Thomas E. Dickey
+ *  Copyright 2000-2009,2010	Thomas E. Dickey
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License, version 2.1
@@ -49,13 +49,17 @@ print_arrows(WINDOW *win,
 	     int item_no,
 	     int list_height)
 {
-    dlg_draw_arrows2(win, scrollamt,
-		     scrollamt + choice < item_no,
-		     box_x + check_x + ARROWS_COL,
-		     box_y,
-		     box_y + list_height + 1,
-		     menubox_attr,
-		     menubox_border_attr);
+    dlg_draw_scrollbar(win,
+		       scrollamt,
+		       scrollamt,
+		       scrollamt + choice,
+		       item_no,
+		       box_x + check_x,
+		       box_x + list_width,
+		       box_y,
+		       box_y + list_height + 1,
+		       menubox_attr,
+		       menubox_border_attr);
 }
 
 /*
@@ -202,13 +206,14 @@ dlg_checklist(const char *title,
     } else {
 	dlg_auto_size(title, prompt, &height, &width, MIN_HIGH + use_height, 26);
     }
+    dlg_button_layout(buttons, &width);
     dlg_print_size(height, width);
     dlg_ctl_size(height, width);
 
     /* we need at least two states */
     if (states == 0 || strlen(states) < 2)
 	states = " *";
-    num_states = strlen(states);
+    num_states = (int) strlen(states);
 
     checkflag = flag;
 
@@ -547,6 +552,9 @@ dlg_checklist(const char *title,
 			       states,
 			       choice, TRUE);
 		    (void) wnoutrefresh(list);
+		    print_arrows(dialog,
+				 box_x, box_y,
+				 scrollamt, max_choice, item_no, use_height);
 		    (void) wmove(dialog, cur_y, cur_x);
 		    wrefresh(dialog);
 		}
@@ -624,7 +632,7 @@ dialog_checklist(const char *title,
     bool show_status = FALSE;
     int current = 0;
 
-    listitems = dlg_calloc(DIALOG_LISTITEM, item_no + 1);
+    listitems = dlg_calloc(DIALOG_LISTITEM, (size_t) item_no + 1);
     assert_ptr(listitems, "dialog_checklist");
 
     for (i = 0; i < item_no; ++i) {
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/columns.c b/Build/source/utils/dialog/dialog-1.1-20100119/columns.c
index 11ca65a1526..4abfe8d66d4 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/columns.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/columns.c
@@ -1,9 +1,9 @@
 /*
- *  $Id: columns.c,v 1.4 2008/06/21 12:27:35 tom Exp $
+ *  $Id: columns.c,v 1.5 2010/01/18 10:26:36 tom Exp $
  *
  *  columns.c -- implements column-alignment
  *
- *  Copyright 2008	Thomas E. Dickey
+ *  Copyright 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
@@ -65,15 +65,15 @@ next_col(char *source, unsigned offset)
 static unsigned
 split_row(char *source, unsigned *offsets, unsigned *widths)
 {
-    int mark = strlen(column_separator());
+    int mark = (int) strlen(column_separator());
     char *next = 0;
     unsigned result = 0;
     unsigned offset = 0;
 
     do {
 	if (result) {
-	    offset = mark + next - source;
-	    widths[result - 1] = offset - offsets[result - 1] - mark;
+	    offset = (unsigned) (mark + next - source);
+	    widths[result - 1] = offset - offsets[result - 1] - (unsigned) mark;
 	}
 	offsets[result] = offset;
 	++result;
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/config.guess b/Build/source/utils/dialog/dialog-1.1-20100119/config.guess
index c2246a4f7f4..c2246a4f7f4 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/config.guess
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/config.guess
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/config.hin b/Build/source/utils/dialog/dialog-1.1-20100119/config.hin
index e8fc0a919ee..e8fc0a919ee 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/config.hin
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/config.hin
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/config.sub b/Build/source/utils/dialog/dialog-1.1-20100119/config.sub
index 85186096a9e..85186096a9e 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/config.sub
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/config.sub
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/configure b/Build/source/utils/dialog/dialog-1.1-20100119/configure
index cb2232192bb..128be9d9324 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/configure
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by Autoconf 2.52.20061216.
+# Generated by Autoconf 2.52.20081225.
 #
 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -774,7 +774,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.20061216.  Invocation command line was
+generated by GNU Autoconf 2.52.20081225.  Invocation command line was
 
   $ $0 $@
 
@@ -1056,12 +1056,20 @@ fi
 # show the actual data that we have for versions:
 test -n "$verbose" && echo "	VERSION $VERSION" 1>&6
 
+echo "${as_me-configure}:1059: testing VERSION $VERSION ..." 1>&5
+
 test -n "$verbose" && echo "	VERSION_MAJOR $VERSION_MAJOR" 1>&6
 
+echo "${as_me-configure}:1063: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5
+
 test -n "$verbose" && echo "	VERSION_MINOR $VERSION_MINOR" 1>&6
 
+echo "${as_me-configure}:1067: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5
+
 test -n "$verbose" && echo "	VERSION_PATCH $VERSION_PATCH" 1>&6
 
+echo "${as_me-configure}:1071: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5
+
 	PACKAGE=dialog
 	cat >>confdefs.h <<EOF
 #define PACKAGE "$PACKAGE"
@@ -1101,7 +1109,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:1104: checking for $ac_word" >&5
+echo "$as_me:1112: 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
@@ -1116,7 +1124,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:1119: found $ac_dir/$ac_word" >&5
+echo "$as_me:1127: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1124,10 +1132,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1127: result: $CC" >&5
+  echo "$as_me:1135: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1130: result: no" >&5
+  echo "$as_me:1138: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1136,7 +1144,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:1139: checking for $ac_word" >&5
+echo "$as_me:1147: 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
@@ -1151,7 +1159,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:1154: found $ac_dir/$ac_word" >&5
+echo "$as_me:1162: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1159,10 +1167,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1162: result: $ac_ct_CC" >&5
+  echo "$as_me:1170: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1165: result: no" >&5
+  echo "$as_me:1173: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1175,7 +1183,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:1178: checking for $ac_word" >&5
+echo "$as_me:1186: 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
@@ -1190,7 +1198,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:1193: found $ac_dir/$ac_word" >&5
+echo "$as_me:1201: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1198,10 +1206,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1201: result: $CC" >&5
+  echo "$as_me:1209: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1204: result: no" >&5
+  echo "$as_me:1212: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1210,7 +1218,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:1213: checking for $ac_word" >&5
+echo "$as_me:1221: 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
@@ -1225,7 +1233,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:1228: found $ac_dir/$ac_word" >&5
+echo "$as_me:1236: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1233,10 +1241,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1236: result: $ac_ct_CC" >&5
+  echo "$as_me:1244: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1239: result: no" >&5
+  echo "$as_me:1247: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1249,7 +1257,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:1252: checking for $ac_word" >&5
+echo "$as_me:1260: 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
@@ -1269,7 +1277,7 @@ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
   continue
 fi
 ac_cv_prog_CC="cc"
-echo "$as_me:1272: found $ac_dir/$ac_word" >&5
+echo "$as_me:1280: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1291,10 +1299,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1294: result: $CC" >&5
+  echo "$as_me:1302: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1297: result: no" >&5
+  echo "$as_me:1305: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1305,7 +1313,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:1308: checking for $ac_word" >&5
+echo "$as_me:1316: 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
@@ -1320,7 +1328,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:1323: found $ac_dir/$ac_word" >&5
+echo "$as_me:1331: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1328,10 +1336,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1331: result: $CC" >&5
+  echo "$as_me:1339: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1334: result: no" >&5
+  echo "$as_me:1342: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1344,7 +1352,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:1347: checking for $ac_word" >&5
+echo "$as_me:1355: 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
@@ -1359,7 +1367,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:1362: found $ac_dir/$ac_word" >&5
+echo "$as_me:1370: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1367,10 +1375,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1370: result: $ac_ct_CC" >&5
+  echo "$as_me:1378: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1373: result: no" >&5
+  echo "$as_me:1381: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1382,32 +1390,32 @@ fi
 
 fi
 
-test -z "$CC" && { { echo "$as_me:1385: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:1393: 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:1390:" \
+echo "$as_me:1398:" \
      "checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:1393: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1401: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1396: \$? = $ac_status" >&5
+  echo "$as_me:1404: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:1398: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1406: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1401: \$? = $ac_status" >&5
+  echo "$as_me:1409: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:1403: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1411: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1406: \$? = $ac_status" >&5
+  echo "$as_me:1414: \$? = $ac_status" >&5
   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 1410 "configure"
+#line 1418 "configure"
 #include "confdefs.h"
 
 int
@@ -1423,13 +1431,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:1426: checking for C compiler default output" >&5
+echo "$as_me:1434: 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:1429: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:1437: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5
   ac_status=$?
-  echo "$as_me:1432: \$? = $ac_status" >&5
+  echo "$as_me:1440: \$? = $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
@@ -1438,7 +1446,7 @@ for ac_file in `ls a.exe conftest.exe 2>/dev/null;
                 ls a.out conftest 2>/dev/null;
                 ls a.* conftest.* 2>/dev/null`; do
   case $ac_file in
-    *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.dbg | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
     a.out ) # We found the default executable, but exeext='' is most
             # certainly right.
             break;;
@@ -1452,34 +1460,34 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:1455: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:1463: 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:1461: result: $ac_file" >&5
+echo "$as_me:1469: 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:1466: checking whether the C compiler works" >&5
+echo "$as_me:1474: 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:1472: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1480: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1475: \$? = $ac_status" >&5
+  echo "$as_me:1483: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:1482: error: cannot run C compiled programs.
+	{ { echo "$as_me:1490: 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;}
@@ -1487,24 +1495,24 @@ If you meant to cross compile, use \`--host'." >&2;}
     fi
   fi
 fi
-echo "$as_me:1490: result: yes" >&5
+echo "$as_me:1498: 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:1497: checking whether we are cross compiling" >&5
+echo "$as_me:1505: checking whether we are cross compiling" >&5
 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:1499: result: $cross_compiling" >&5
+echo "$as_me:1507: result: $cross_compiling" >&5
 echo "${ECHO_T}$cross_compiling" >&6
 
-echo "$as_me:1502: checking for executable suffix" >&5
+echo "$as_me:1510: checking for executable suffix" >&5
 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:1504: \"$ac_link\"") >&5
+if { (eval echo "$as_me:1512: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:1507: \$? = $ac_status" >&5
+  echo "$as_me:1515: \$? = $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
@@ -1512,7 +1520,7 @@ if { (eval echo "$as_me:1504: \"$ac_link\"") >&5
 # `rm'.
 for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
   case $ac_file in
-    *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.dbg | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
           export ac_cv_exeext
           break;;
@@ -1520,25 +1528,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
   esac
 done
 else
-  { { echo "$as_me:1523: error: cannot compute EXEEXT: cannot compile and link" >&5
+  { { echo "$as_me:1531: 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:1529: result: $ac_cv_exeext" >&5
+echo "$as_me:1537: 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:1535: checking for object suffix" >&5
+echo "$as_me:1543: 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 1541 "configure"
+#line 1549 "configure"
 #include "confdefs.h"
 
 int
@@ -1550,14 +1558,14 @@ main ()
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:1553: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1561: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1556: \$? = $ac_status" >&5
+  echo "$as_me:1564: \$? = $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
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.dbg | *.pdb | *.xSYM | *.map | *.inf ) ;;
     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
        break;;
   esac
@@ -1565,24 +1573,24 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:1568: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:1576: 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:1575: result: $ac_cv_objext" >&5
+echo "$as_me:1583: result: $ac_cv_objext" >&5
 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:1579: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:1587: 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 1585 "configure"
+#line 1593 "configure"
 #include "confdefs.h"
 
 int
@@ -1597,16 +1605,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1600: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1608: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1603: \$? = $ac_status" >&5
+  echo "$as_me:1611: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1606: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1614: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1609: \$? = $ac_status" >&5
+  echo "$as_me:1617: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_compiler_gnu=yes
 else
@@ -1618,19 +1626,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:1621: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:1629: 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:1627: checking whether $CC accepts -g" >&5
+echo "$as_me:1635: 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 1633 "configure"
+#line 1641 "configure"
 #include "confdefs.h"
 
 int
@@ -1642,16 +1650,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1645: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1653: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1648: \$? = $ac_status" >&5
+  echo "$as_me:1656: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1651: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1659: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1654: \$? = $ac_status" >&5
+  echo "$as_me:1662: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_cc_g=yes
 else
@@ -1661,7 +1669,7 @@ ac_cv_prog_cc_g=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:1664: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:1672: 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
@@ -1688,16 +1696,16 @@ cat >conftest.$ac_ext <<_ACEOF
 #endif
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1691: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1699: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1694: \$? = $ac_status" >&5
+  echo "$as_me:1702: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1697: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1705: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1700: \$? = $ac_status" >&5
+  echo "$as_me:1708: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   for ac_declaration in \
    ''\
@@ -1709,7 +1717,7 @@ if { (eval echo "$as_me:1691: \"$ac_compile\"") >&5
    'void exit (int);'
 do
   cat >conftest.$ac_ext <<_ACEOF
-#line 1712 "configure"
+#line 1720 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -1722,16 +1730,16 @@ exit (42);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1725: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1733: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1728: \$? = $ac_status" >&5
+  echo "$as_me:1736: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1731: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1739: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1734: \$? = $ac_status" >&5
+  echo "$as_me:1742: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -1741,7 +1749,7 @@ continue
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 1744 "configure"
+#line 1752 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -1753,16 +1761,16 @@ exit (42);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1756: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1764: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1759: \$? = $ac_status" >&5
+  echo "$as_me:1767: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1762: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1770: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1765: \$? = $ac_status" >&5
+  echo "$as_me:1773: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -1796,7 +1804,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:1799: checking how to run the C preprocessor" >&5
+echo "$as_me:1807: 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
@@ -1817,18 +1825,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 1820 "configure"
+#line 1828 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:1825: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:1833: \"$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:1831: \$? = $ac_status" >&5
+  echo "$as_me:1839: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -1851,17 +1859,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 1854 "configure"
+#line 1862 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:1858: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:1866: \"$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:1864: \$? = $ac_status" >&5
+  echo "$as_me:1872: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -1898,7 +1906,7 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:1901: result: $CPP" >&5
+echo "$as_me:1909: result: $CPP" >&5
 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -1908,18 +1916,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 1911 "configure"
+#line 1919 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:1916: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:1924: \"$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:1922: \$? = $ac_status" >&5
+  echo "$as_me:1930: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -1942,17 +1950,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 1945 "configure"
+#line 1953 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:1949: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:1957: \"$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:1955: \$? = $ac_status" >&5
+  echo "$as_me:1963: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -1980,7 +1988,7 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:1983: error: C preprocessor \"$CPP\" fails sanity check" >&5
+  { { echo "$as_me:1991: error: C preprocessor \"$CPP\" fails sanity check" >&5
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1993,14 +2001,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:1996: checking whether $CC needs -traditional" >&5
+    echo "$as_me:2004: 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 2003 "configure"
+#line 2011 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
 int Autoconf = TIOCGETP;
@@ -2015,7 +2023,7 @@ rm -f conftest*
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat >conftest.$ac_ext <<_ACEOF
-#line 2018 "configure"
+#line 2026 "configure"
 #include "confdefs.h"
 #include <termio.h>
 int Autoconf = TCGETA;
@@ -2028,14 +2036,14 @@ rm -f conftest*
 
   fi
 fi
-echo "$as_me:2031: result: $ac_cv_prog_gcc_traditional" >&5
+echo "$as_me:2039: 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:2038: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:2046: 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
@@ -2055,11 +2063,11 @@ fi
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:2058: result: yes" >&5
+  echo "$as_me:2066: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:2062: result: no" >&5
+  echo "$as_me:2070: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
@@ -2067,7 +2075,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:2070: checking for $ac_word" >&5
+echo "$as_me:2078: 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
@@ -2082,7 +2090,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:2085: found $ac_dir/$ac_word" >&5
+echo "$as_me:2093: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2090,10 +2098,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:2093: result: $RANLIB" >&5
+  echo "$as_me:2101: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:2096: result: no" >&5
+  echo "$as_me:2104: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2102,7 +2110,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:2105: checking for $ac_word" >&5
+echo "$as_me:2113: 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
@@ -2117,7 +2125,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:2120: found $ac_dir/$ac_word" >&5
+echo "$as_me:2128: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2126,10 +2134,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:2129: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:2137: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:2132: result: no" >&5
+  echo "$as_me:2140: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2155,7 +2163,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:2158: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+  { { echo "$as_me:2166: 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
@@ -2175,7 +2183,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:2178: checking for a BSD compatible install" >&5
+echo "$as_me:2186: 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
@@ -2224,7 +2232,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:2227: result: $INSTALL" >&5
+echo "$as_me:2235: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -2238,7 +2246,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:2241: checking for $ac_word" >&5
+echo "$as_me:2249: 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
@@ -2253,7 +2261,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:2256: found $ac_dir/$ac_word" >&5
+echo "$as_me:2264: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2261,10 +2269,10 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:2264: result: $AR" >&5
+  echo "$as_me:2272: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 else
-  echo "$as_me:2267: result: no" >&5
+  echo "$as_me:2275: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2273,7 +2281,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:2276: checking for $ac_word" >&5
+echo "$as_me:2284: 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
@@ -2288,7 +2296,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:2291: found $ac_dir/$ac_word" >&5
+echo "$as_me:2299: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2297,10 +2305,10 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:2300: result: $ac_ct_AR" >&5
+  echo "$as_me:2308: result: $ac_ct_AR" >&5
 echo "${ECHO_T}$ac_ct_AR" >&6
 else
-  echo "$as_me:2303: result: no" >&5
+  echo "$as_me:2311: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2309,12 +2317,12 @@ else
   AR="$ac_cv_prog_AR"
 fi
 
-echo "$as_me:2312: checking for POSIXized ISC" >&5
+echo "$as_me:2320: 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:2317: result: yes" >&5
+  echo "$as_me:2325: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   ISC=yes # If later tests want to check for ISC.
 
@@ -2328,12 +2336,12 @@ EOF
     CC="$CC -Xp"
   fi
 else
-  echo "$as_me:2331: result: no" >&5
+  echo "$as_me:2339: result: no" >&5
 echo "${ECHO_T}no" >&6
   ISC=
 fi
 
-echo "$as_me:2336: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:2344: 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
@@ -2341,7 +2349,7 @@ else
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >conftest.$ac_ext <<_ACEOF
-#line 2344 "configure"
+#line 2352 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -2390,16 +2398,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:2393: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2401: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2396: \$? = $ac_status" >&5
+  echo "$as_me:2404: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2399: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2407: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2402: \$? = $ac_status" >&5
+  echo "$as_me:2410: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_cc_stdc=$ac_arg
 break
@@ -2416,21 +2424,21 @@ fi
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)
-    echo "$as_me:2419: result: none needed" >&5
+    echo "$as_me:2427: result: none needed" >&5
 echo "${ECHO_T}none needed" >&6 ;;
   *)
-    echo "$as_me:2422: result: $ac_cv_prog_cc_stdc" >&5
+    echo "$as_me:2430: 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:2427: checking for an ANSI C-conforming const" >&5
+echo "$as_me:2435: 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 2433 "configure"
+#line 2441 "configure"
 #include "confdefs.h"
 
 int
@@ -2488,16 +2496,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2491: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2499: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2494: \$? = $ac_status" >&5
+  echo "$as_me:2502: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2497: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2505: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2500: \$? = $ac_status" >&5
+  echo "$as_me:2508: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_const=yes
 else
@@ -2507,7 +2515,7 @@ ac_cv_c_const=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:2510: result: $ac_cv_c_const" >&5
+echo "$as_me:2518: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -2517,7 +2525,7 @@ EOF
 
 fi
 
-echo "$as_me:2520: checking for makeflags variable" >&5
+echo "$as_me:2528: 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
@@ -2551,10 +2559,10 @@ CF_EOF
 	rm -f cf_makeflags.tmp
 
 fi
-echo "$as_me:2554: result: $cf_cv_makeflags" >&5
+echo "$as_me:2562: result: $cf_cv_makeflags" >&5
 echo "${ECHO_T}$cf_cv_makeflags" >&6
 
-echo "$as_me:2557: checking if filesystem supports mixed-case filenames" >&5
+echo "$as_me:2565: 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
@@ -2581,7 +2589,7 @@ else
 fi
 
 fi
-echo "$as_me:2584: result: $cf_cv_mixedcase" >&5
+echo "$as_me:2592: 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
@@ -2589,7 +2597,7 @@ EOF
 
 # Extract the first word of "ctags", so it can be a program name with args.
 set dummy ctags; ac_word=$2
-echo "$as_me:2592: checking for $ac_word" >&5
+echo "$as_me:2600: 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
@@ -2604,7 +2612,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:2607: found $ac_dir/$ac_word" >&5
+echo "$as_me:2615: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2613,17 +2621,17 @@ fi
 fi
 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
 if test -n "$MAKE_LOWER_TAGS"; then
-  echo "$as_me:2616: result: $MAKE_LOWER_TAGS" >&5
+  echo "$as_me:2624: result: $MAKE_LOWER_TAGS" >&5
 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
 else
-  echo "$as_me:2619: result: no" >&5
+  echo "$as_me:2627: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 if test "$cf_cv_mixedcase" = yes ; then
 	# Extract the first word of "etags", so it can be a program name with args.
 set dummy etags; ac_word=$2
-echo "$as_me:2626: checking for $ac_word" >&5
+echo "$as_me:2634: 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
@@ -2638,7 +2646,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:2641: found $ac_dir/$ac_word" >&5
+echo "$as_me:2649: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2647,10 +2655,10 @@ fi
 fi
 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
 if test -n "$MAKE_UPPER_TAGS"; then
-  echo "$as_me:2650: result: $MAKE_UPPER_TAGS" >&5
+  echo "$as_me:2658: result: $MAKE_UPPER_TAGS" >&5
 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
 else
-  echo "$as_me:2653: result: no" >&5
+  echo "$as_me:2661: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2670,7 +2678,7 @@ else
 	MAKE_LOWER_TAGS="#"
 fi
 
-echo "$as_me:2673: checking if you want to see long compiling messages" >&5
+echo "$as_me:2681: 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.
@@ -2681,16 +2689,16 @@ if test "${enable_echo+set}" = set; then
 
     ECHO_LT='--silent'
     ECHO_LD='@echo linking $@;'
-    RULE_CC='	@echo compiling $<'
-    SHOW_CC='	@echo compiling $@'
+    RULE_CC='@echo compiling $<'
+    SHOW_CC='@echo compiling $@'
     ECHO_CC='@'
 
   else
 
     ECHO_LT=''
     ECHO_LD=''
-    RULE_CC='# compiling'
-    SHOW_CC='# compiling'
+    RULE_CC=''
+    SHOW_CC=''
     ECHO_CC=''
 
   fi
@@ -2699,21 +2707,21 @@ else
 
     ECHO_LT=''
     ECHO_LD=''
-    RULE_CC='# compiling'
-    SHOW_CC='# compiling'
+    RULE_CC=''
+    SHOW_CC=''
     ECHO_CC=''
 
 fi;
-echo "$as_me:2707: result: $enableval" >&5
+echo "$as_me:2715: 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:2712: error: cannot run $ac_config_sub" >&5
+  { { echo "$as_me:2720: error: cannot run $ac_config_sub" >&5
 echo "$as_me: error: cannot run $ac_config_sub" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:2716: checking build system type" >&5
+echo "$as_me:2724: 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
@@ -2722,16 +2730,16 @@ else
 test -z "$ac_cv_build_alias" &&
   ac_cv_build_alias=`$ac_config_guess`
 test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:2725: error: cannot guess build type; you must specify one" >&5
+  { { echo "$as_me:2733: 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:2729: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+  { { echo "$as_me:2737: 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:2734: result: $ac_cv_build" >&5
+echo "$as_me:2742: 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/'`
@@ -2739,7 +2747,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:2742: checking host system type" >&5
+	echo "$as_me:2750: 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
@@ -2748,12 +2756,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:2751: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+  { { echo "$as_me:2759: 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:2756: result: $ac_cv_host" >&5
+echo "$as_me:2764: 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/'`
@@ -2778,13 +2786,13 @@ else
 fi
 
 test -z "$system_name" && system_name="$cf_cv_system_name"
-test -n "$cf_cv_system_name" && echo "$as_me:2781: result: Configuring for $cf_cv_system_name" >&5
+test -n "$cf_cv_system_name" && echo "$as_me:2789: 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:2785: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
+	echo "$as_me:2793: 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:2787: error: \"Please remove config.cache and try again.\"" >&5
+	{ { echo "$as_me:2795: 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
@@ -2807,96 +2815,59 @@ test -n "$PROG_EXT" && cat >>confdefs.h <<EOF
 EOF
 
 	case $cf_cv_system_name in
-	OS/2*)	LIB_PREFIX=''     ;;
-	os2*)	LIB_PREFIX=''     ;;
-	*)	LIB_PREFIX='lib'  ;;
+	os2*)	PATH_SEPARATOR=';'  ;;
+	*)	PATH_SEPARATOR=':'  ;;
 	esac
 
-echo "$as_me:2815: checking if $CC -U and -D options work together" >&5
-echo $ECHO_N "checking if $CC -U and -D options work together... $ECHO_C" >&6
-if test "${cf_cv_cc_u_d_options+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-	cf_save_CPPFLAGS="$CPPFLAGS"
-	CPPFLAGS="-UU_D_OPTIONS -DU_D_OPTIONS -DD_U_OPTIONS -UD_U_OPTIONS"
-	cat >conftest.$ac_ext <<_ACEOF
-#line 2824 "configure"
-#include "confdefs.h"
-
-int
-main ()
-{
-
-#ifndef U_D_OPTIONS
-make an undefined-error
-#endif
-#ifdef  D_U_OPTIONS
-make a defined-error
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2843: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:2846: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2849: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:2852: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-	cf_cv_cc_u_d_options=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-
-	cf_cv_cc_u_d_options=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-	CPPFLAGS="$cf_save_CPPFLAGS"
-
-fi
-echo "$as_me:2866: result: $cf_cv_cc_u_d_options" >&5
-echo "${ECHO_T}$cf_cv_cc_u_d_options" >&6
+	case $cf_cv_system_name in #(vi
+	OS/2*|os2*) #(vi
+        LIB_PREFIX=''
+        ;;
+	*)	LIB_PREFIX='lib'
+        ;;
+	esac
 
 cf_XOPEN_SOURCE=500
 cf_POSIX_C_SOURCE=199506L
+cf_xopen_source=
 
 case $host_os in #(vi
-aix[45]*) #(vi
-	CPPFLAGS="$CPPFLAGS -D_ALL_SOURCE"
+aix[456]*) #(vi
+	cf_xopen_source="-D_ALL_SOURCE"
 	;;
-freebsd*) #(vi
+darwin[0-8].*) #(vi
+	cf_xopen_source="-D_APPLE_C_SOURCE"
+	;;
+darwin*) #(vi
+	cf_xopen_source="-D_DARWIN_C_SOURCE"
+	;;
+freebsd*|dragonfly*) #(vi
 	# 5.x headers associate
 	#	_XOPEN_SOURCE=600 with _POSIX_C_SOURCE=200112L
 	#	_XOPEN_SOURCE=500 with _POSIX_C_SOURCE=199506L
 	cf_POSIX_C_SOURCE=200112L
 	cf_XOPEN_SOURCE=600
-	CPPFLAGS="$CPPFLAGS -D_BSD_TYPES -D__BSD_VISIBLE -D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+	cf_xopen_source="-D_BSD_TYPES -D__BSD_VISIBLE -D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+	;;
+hpux11*) #(vi
+	cf_xopen_source="-D_HPUX_SOURCE -D_XOPEN_SOURCE=500"
 	;;
 hpux*) #(vi
-	CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE"
+	cf_xopen_source="-D_HPUX_SOURCE"
 	;;
 irix[56].*) #(vi
-	CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE"
+	cf_xopen_source="-D_SGI_SOURCE"
 	;;
-linux*|gnu*|k*bsd*-gnu) #(vi
+linux*|gnu*|mint*|k*bsd*-gnu) #(vi
 
-echo "$as_me:2892: checking if we must define _GNU_SOURCE" >&5
+echo "$as_me:2863: 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 2899 "configure"
+#line 2870 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -2911,16 +2882,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2914: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2885: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2917: \$? = $ac_status" >&5
+  echo "$as_me:2888: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2920: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2891: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2923: \$? = $ac_status" >&5
+  echo "$as_me:2894: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_gnu_source=no
 else
@@ -2929,7 +2900,7 @@ cat conftest.$ac_ext >&5
 cf_save="$CPPFLAGS"
 	 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 2932 "configure"
+#line 2903 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -2944,16 +2915,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2947: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2918: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2950: \$? = $ac_status" >&5
+  echo "$as_me:2921: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2953: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2924: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2956: \$? = $ac_status" >&5
+  echo "$as_me:2927: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_gnu_source=no
 else
@@ -2968,7 +2939,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:2971: result: $cf_cv_gnu_source" >&5
+echo "$as_me:2942: 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"
 
@@ -2983,26 +2954,26 @@ openbsd*) #(vi
 	# setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
 	;;
 osf[45]*) #(vi
-	CPPFLAGS="$CPPFLAGS -D_OSF_SOURCE"
+	cf_xopen_source="-D_OSF_SOURCE"
 	;;
 nto-qnx*) #(vi
-	CPPFLAGS="$CPPFLAGS -D_QNX_SOURCE"
+	cf_xopen_source="-D_QNX_SOURCE"
 	;;
 sco*) #(vi
 	# setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer
 	;;
 solaris*) #(vi
-	CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__"
+	cf_xopen_source="-D__EXTENSIONS__"
 	;;
 *)
-	echo "$as_me:2998: 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 3005 "configure"
+#line 2976 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -3017,16 +2988,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3020: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2991: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3023: \$? = $ac_status" >&5
+  echo "$as_me:2994: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3026: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2997: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3029: \$? = $ac_status" >&5
+  echo "$as_me:3000: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
@@ -3035,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 3038 "configure"
+#line 3009 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -3050,16 +3021,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3053: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3024: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3056: \$? = $ac_status" >&5
+  echo "$as_me:3027: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3059: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3030: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3062: \$? = $ac_status" >&5
+  echo "$as_me:3033: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
@@ -3074,23 +3045,98 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:3077: 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
 
-# remove _XOPEN_SOURCE symbol from $CFLAGS
 CFLAGS=`echo "$CFLAGS" | \
-	sed	-e 's/-[UD]_XOPEN_SOURCE\(=[^ 	]*\)\?[ 	]/ /g' \
-		-e 's/-[UD]_XOPEN_SOURCE\(=[^ 	]*\)\?$//g'`
+	sed	-e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+		-e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-# remove _XOPEN_SOURCE symbol from $CPPFLAGS
 CPPFLAGS=`echo "$CPPFLAGS" | \
-	sed	-e 's/-[UD]_XOPEN_SOURCE\(=[^ 	]*\)\?[ 	]/ /g' \
-		-e 's/-[UD]_XOPEN_SOURCE\(=[^ 	]*\)\?$//g'`
+	sed	-e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+		-e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ 	]*\)\?$//g'`
+
+		cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source"
+
+cf_fix_cppflags=no
+cf_new_cflags=
+cf_new_cppflags=
+cf_new_extra_cppflags=
+
+for cf_add_cflags in $cf_temp_xopen_source
+do
+case $cf_fix_cppflags in
+no)
+	case $cf_add_cflags in #(vi
+	-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
+		case $cf_add_cflags in
+		-D*)
+			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+
+			test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+				&& test -z "${cf_tst_cflags}" \
+				&& cf_fix_cppflags=yes
+
+			if test $cf_fix_cppflags = yes ; then
+				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+				continue
+			elif test "${cf_tst_cflags}" = "\"'" ; then
+				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+				continue
+			fi
+			;;
+		esac
+		case "$CPPFLAGS" in
+		*$cf_add_cflags) #(vi
+			;;
+		*) #(vi
+			case $cf_add_cflags in #(vi
+			-D*)
+				cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
+
+CPPFLAGS=`echo "$CPPFLAGS" | \
+	sed	-e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ 	]*\)\?[ 	]/ /g' \
+		-e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ 	]*\)\?$//g'`
+
+				;;
+			esac
+			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+			;;
+		esac
+		;;
+	*)
+		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+		;;
+	esac
+	;;
+yes)
+	cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
+
+	test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+		&& test -z "${cf_tst_cflags}" \
+		&& cf_fix_cppflags=no
+	;;
+esac
+done
+
+if test -n "$cf_new_cflags" ; then
+
+	CFLAGS="$CFLAGS $cf_new_cflags"
+fi
+
+if test -n "$cf_new_cppflags" ; then
+
+	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+fi
+
+if test -n "$cf_new_extra_cppflags" ; then
+
+	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+fi
 
-		test "$cf_cv_cc_u_d_options" = yes && \
-			CPPFLAGS="$CPPFLAGS -U_XOPEN_SOURCE"
-		CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_cv_xopen_source"
 	fi
 
 cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE
@@ -3098,26 +3144,24 @@ cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE
 cf_save_CFLAGS="$CFLAGS"
 cf_save_CPPFLAGS="$CPPFLAGS"
 
-# remove _POSIX_C_SOURCE symbol from $cf_save_CFLAGS
 cf_trim_CFLAGS=`echo "$cf_save_CFLAGS" | \
-	sed	-e 's/-[UD]_POSIX_C_SOURCE\(=[^ 	]*\)\?[ 	]/ /g' \
-		-e 's/-[UD]_POSIX_C_SOURCE\(=[^ 	]*\)\?$//g'`
+	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-# remove _POSIX_C_SOURCE symbol from $cf_save_CPPFLAGS
 cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
-	sed	-e 's/-[UD]_POSIX_C_SOURCE\(=[^ 	]*\)\?[ 	]/ /g' \
-		-e 's/-[UD]_POSIX_C_SOURCE\(=[^ 	]*\)\?$//g'`
+	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
+		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:3111: 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 "(line 3117) 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 3120 "configure"
+#line 3164 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -3132,16 +3176,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3135: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3179: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3138: \$? = $ac_status" >&5
+  echo "$as_me:3182: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3141: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3185: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3144: \$? = $ac_status" >&5
+  echo "$as_me:3188: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -3162,7 +3206,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >conftest.$ac_ext <<_ACEOF
-#line 3165 "configure"
+#line 3209 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -3177,16 +3221,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3180: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3224: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3183: \$? = $ac_status" >&5
+  echo "$as_me:3227: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3186: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3230: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3189: \$? = $ac_status" >&5
+  echo "$as_me:3233: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -3197,15 +3241,15 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 	 fi
 
-echo "(line 3200) 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 "(line 3205) 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 3208 "configure"
+#line 3252 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -3220,16 +3264,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3223: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3267: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3226: \$? = $ac_status" >&5
+  echo "$as_me:3270: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3229: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3273: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3232: \$? = $ac_status" >&5
+  echo "$as_me:3276: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -3245,23 +3289,178 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:3248: 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
 	CFLAGS="$cf_trim_CFLAGS"
 	CPPFLAGS="$cf_trim_CPPFLAGS"
-	if test "$cf_cv_cc_u_d_options" = yes ; then
-		cf_temp_posix_c_source=`echo "$cf_cv_posix_c_source" | \
-				sed -e 's/-D/-U/g' -e 's/=[^ 	]*//g'`
-		CPPFLAGS="$CPPFLAGS $cf_temp_posix_c_source"
-	fi
-	CPPFLAGS="$CPPFLAGS $cf_cv_posix_c_source"
+
+cf_fix_cppflags=no
+cf_new_cflags=
+cf_new_cppflags=
+cf_new_extra_cppflags=
+
+for cf_add_cflags in $cf_cv_posix_c_source
+do
+case $cf_fix_cppflags in
+no)
+	case $cf_add_cflags in #(vi
+	-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
+		case $cf_add_cflags in
+		-D*)
+			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+
+			test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+				&& test -z "${cf_tst_cflags}" \
+				&& cf_fix_cppflags=yes
+
+			if test $cf_fix_cppflags = yes ; then
+				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+				continue
+			elif test "${cf_tst_cflags}" = "\"'" ; then
+				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+				continue
+			fi
+			;;
+		esac
+		case "$CPPFLAGS" in
+		*$cf_add_cflags) #(vi
+			;;
+		*) #(vi
+			case $cf_add_cflags in #(vi
+			-D*)
+				cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
+
+CPPFLAGS=`echo "$CPPFLAGS" | \
+	sed	-e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ 	]*\)\?[ 	]/ /g' \
+		-e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ 	]*\)\?$//g'`
+
+				;;
+			esac
+			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+			;;
+		esac
+		;;
+	*)
+		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+		;;
+	esac
+	;;
+yes)
+	cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
+
+	test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+		&& test -z "${cf_tst_cflags}" \
+		&& cf_fix_cppflags=no
+	;;
+esac
+done
+
+if test -n "$cf_new_cflags" ; then
+
+	CFLAGS="$CFLAGS $cf_new_cflags"
+fi
+
+if test -n "$cf_new_cppflags" ; then
+
+	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+fi
+
+if test -n "$cf_new_extra_cppflags" ; then
+
+	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+fi
+
 fi
 
 	;;
 esac
 
+if test -n "$cf_xopen_source" ; then
+
+cf_fix_cppflags=no
+cf_new_cflags=
+cf_new_cppflags=
+cf_new_extra_cppflags=
+
+for cf_add_cflags in $cf_xopen_source
+do
+case $cf_fix_cppflags in
+no)
+	case $cf_add_cflags in #(vi
+	-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
+		case $cf_add_cflags in
+		-D*)
+			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+
+			test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+				&& test -z "${cf_tst_cflags}" \
+				&& cf_fix_cppflags=yes
+
+			if test $cf_fix_cppflags = yes ; then
+				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+				continue
+			elif test "${cf_tst_cflags}" = "\"'" ; then
+				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+				continue
+			fi
+			;;
+		esac
+		case "$CPPFLAGS" in
+		*$cf_add_cflags) #(vi
+			;;
+		*) #(vi
+			case $cf_add_cflags in #(vi
+			-D*)
+				cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
+
+CPPFLAGS=`echo "$CPPFLAGS" | \
+	sed	-e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ 	]*\)\?[ 	]/ /g' \
+		-e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ 	]*\)\?$//g'`
+
+				;;
+			esac
+			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+			;;
+		esac
+		;;
+	*)
+		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+		;;
+	esac
+	;;
+yes)
+	cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
+
+	test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+		&& test -z "${cf_tst_cflags}" \
+		&& cf_fix_cppflags=no
+	;;
+esac
+done
+
+if test -n "$cf_new_cflags" ; then
+
+	CFLAGS="$CFLAGS $cf_new_cflags"
+fi
+
+if test -n "$cf_new_cppflags" ; then
+
+	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+fi
+
+if test -n "$cf_new_extra_cppflags" ; then
+
+	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+fi
+
+fi
+
 # Check whether --enable-largefile or --disable-largefile was given.
 if test "${enable_largefile+set}" = set; then
   enableval="$enable_largefile"
@@ -3269,7 +3468,7 @@ if test "${enable_largefile+set}" = set; then
 fi;
 if test "$enable_largefile" != no; then
 
-  echo "$as_me:3272: 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
@@ -3281,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 3284 "configure"
+#line 3483 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -3301,16 +3500,16 @@ main ()
 }
 _ACEOF
      	 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3304: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3503: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3307: \$? = $ac_status" >&5
+  echo "$as_me:3506: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3310: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3509: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3313: \$? = $ac_status" >&5
+  echo "$as_me:3512: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -3320,16 +3519,16 @@ fi
 rm -f conftest.$ac_objext
      	 CC="$CC -n32"
      	 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3323: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3522: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3326: \$? = $ac_status" >&5
+  echo "$as_me:3525: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3329: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3528: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3332: \$? = $ac_status" >&5
+  echo "$as_me:3531: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else
@@ -3343,13 +3542,13 @@ rm -f conftest.$ac_objext
        rm -f conftest.$ac_ext
     fi
 fi
-echo "$as_me:3346: 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:3352: 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
@@ -3357,7 +3556,7 @@ else
   while :; do
   ac_cv_sys_file_offset_bits=no
   cat >conftest.$ac_ext <<_ACEOF
-#line 3360 "configure"
+#line 3559 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -3377,16 +3576,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3380: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3579: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3383: \$? = $ac_status" >&5
+  echo "$as_me:3582: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3386: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3585: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3389: \$? = $ac_status" >&5
+  echo "$as_me:3588: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -3395,7 +3594,7 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 3398 "configure"
+#line 3597 "configure"
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -3416,16 +3615,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3419: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3618: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3422: \$? = $ac_status" >&5
+  echo "$as_me:3621: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3425: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3624: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3428: \$? = $ac_status" >&5
+  echo "$as_me:3627: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else
@@ -3436,7 +3635,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
   break
 done
 fi
-echo "$as_me:3439: 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
 
@@ -3446,7 +3645,7 @@ EOF
 
 fi
 rm -f conftest*
-  echo "$as_me:3449: checking for _LARGE_FILES value needed for large files" >&5
+  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
@@ -3454,7 +3653,7 @@ else
   while :; do
   ac_cv_sys_large_files=no
   cat >conftest.$ac_ext <<_ACEOF
-#line 3457 "configure"
+#line 3656 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -3474,16 +3673,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3477: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3676: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3480: \$? = $ac_status" >&5
+  echo "$as_me:3679: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3483: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3682: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3486: \$? = $ac_status" >&5
+  echo "$as_me:3685: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -3492,7 +3691,7 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 3495 "configure"
+#line 3694 "configure"
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
@@ -3513,16 +3712,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3516: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3715: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3519: \$? = $ac_status" >&5
+  echo "$as_me:3718: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3522: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3721: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3525: \$? = $ac_status" >&5
+  echo "$as_me:3724: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_large_files=1; break
 else
@@ -3533,7 +3732,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
   break
 done
 fi
-echo "$as_me:3536: 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
 
@@ -3546,7 +3745,7 @@ rm -f conftest*
 fi
 
     if test "$enable_largefile" != no ; then
-	echo "$as_me:3549: 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
@@ -3554,7 +3753,7 @@ else
   while :; do
   ac_cv_sys_largefile_source=no
   cat >conftest.$ac_ext <<_ACEOF
-#line 3557 "configure"
+#line 3756 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -3566,16 +3765,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3569: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3768: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3572: \$? = $ac_status" >&5
+  echo "$as_me:3771: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3575: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3774: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3578: \$? = $ac_status" >&5
+  echo "$as_me:3777: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -3584,7 +3783,7 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 3587 "configure"
+#line 3786 "configure"
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
@@ -3597,16 +3796,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3600: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3799: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3603: \$? = $ac_status" >&5
+  echo "$as_me:3802: \$? = $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:3805: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3609: \$? = $ac_status" >&5
+  echo "$as_me:3808: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_largefile_source=1; break
 else
@@ -3617,7 +3816,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
   break
 done
 fi
-echo "$as_me:3620: 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
 
@@ -3631,13 +3830,13 @@ rm -f conftest*
 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
 # in glibc 2.1.3, but that breaks too many other things.
 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-echo "$as_me:3634: 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 3640 "configure"
+#line 3839 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -3649,16 +3848,16 @@ return fseeko && fseeko (stdin, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3652: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3851: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3655: \$? = $ac_status" >&5
+  echo "$as_me:3854: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3658: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3857: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3661: \$? = $ac_status" >&5
+  echo "$as_me:3860: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_fseeko=yes
 else
@@ -3668,7 +3867,7 @@ ac_cv_func_fseeko=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:3671: 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
 
@@ -3689,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:3692: 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 3699 "configure"
+#line 3898 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -3717,16 +3916,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3720: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3919: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3723: \$? = $ac_status" >&5
+  echo "$as_me:3922: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3726: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3925: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3729: \$? = $ac_status" >&5
+  echo "$as_me:3928: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_struct_dirent64=yes
 else
@@ -3737,7 +3936,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:3740: 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
@@ -3747,17 +3946,17 @@ EOF
 
 GCC_VERSION=none
 if test "$GCC" = yes ; then
-	echo "$as_me:3750: 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| 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:3754: 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:3760: 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.
@@ -3767,7 +3966,7 @@ if test "${with_warnings+set}" = set; then
 else
   cf_opt_with_warnings=no
 fi;
-echo "$as_me:3770: 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
 
@@ -3789,10 +3988,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:3792: 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 3795 "configure"
+#line 3994 "${as_me-configure}"
 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"
@@ -3811,6 +4010,8 @@ extern void oops(char *,...) GCC_PRINTFLIKE(1,2) GCC_NORETURN;
 extern void foo(void) GCC_NORETURN;
 int main(int argc GCC_UNUSED, char *argv[] GCC_UNUSED) { return 0; }
 EOF
+	cf_printf_attribute=no
+	cf_scanf_attribute=no
 	for cf_attribute in scanf printf unused noreturn
 	do
 
@@ -3818,26 +4019,59 @@ cf_ATTRIBUTE=`echo "$cf_attribute" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFG
 
 		cf_directive="__attribute__(($cf_attribute))"
 		echo "checking for $CC $cf_directive" 1>&5
-		case $cf_attribute in
-		scanf|printf)
-		cat >conftest.h <<EOF
+
+		case $cf_attribute in #(vi
+		printf) #(vi
+			cf_printf_attribute=yes
+			cat >conftest.h <<EOF
+#define GCC_$cf_ATTRIBUTE 1
+EOF
+			;;
+		scanf) #(vi
+			cf_scanf_attribute=yes
+			cat >conftest.h <<EOF
 #define GCC_$cf_ATTRIBUTE 1
 EOF
 			;;
-		*)
-		cat >conftest.h <<EOF
+		*) #(vi
+			cat >conftest.h <<EOF
 #define GCC_$cf_ATTRIBUTE $cf_directive
 EOF
 			;;
 		esac
-		if { (eval echo "$as_me:3833: \"$ac_compile\"") >&5
+
+		if { (eval echo "$as_me:4043: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3836: \$? = $ac_status" >&5
+  echo "$as_me:4046: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-			test -n "$verbose" && echo "$as_me:3838: 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
+			printf) #(vi
+				if test "$cf_printf_attribute" = no ; then
+					cat >>confdefs.h <<EOF
+#define GCC_PRINTFLIKE(fmt,var) /* nothing */
+EOF
+				else
+					cat >>confdefs.h <<EOF
+#define GCC_PRINTFLIKE(fmt,var) __attribute__((format(printf,fmt,var)))
+EOF
+				fi
+				;;
+			scanf) #(vi
+				if test "$cf_scanf_attribute" = no ; then
+					cat >>confdefs.h <<EOF
+#define GCC_SCANFLIKE(fmt,var) /* nothing */
+EOF
+				else
+					cat >>confdefs.h <<EOF
+#define GCC_SCANFLIKE(fmt,var)  __attribute__((format(scanf,fmt,var)))
+EOF
+				fi
+				;;
+			esac
 		fi
 	done
 else
@@ -3851,12 +4085,12 @@ INTEL_COMPILER=no
 if test "$GCC" = yes ; then
 	case $host_os in
 	linux*|gnu*)
-		echo "$as_me:3854: 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 3859 "configure"
+#line 4093 "configure"
 #include "confdefs.h"
 
 int
@@ -3873,16 +4107,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3876: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4110: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3879: \$? = $ac_status" >&5
+  echo "$as_me:4113: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3882: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4116: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3885: \$? = $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"
@@ -3893,14 +4127,14 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 		CFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:3896: 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 3903 "configure"
+#line 4137 "${as_me-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 
@@ -3908,7 +4142,6 @@ if test "$INTEL_COMPILER" = yes
 then
 # The "-wdXXX" options suppress warnings:
 # remark #1419: external declaration in primary source file
-# remark #1682: implicit conversion of a 64-bit integral type to a smaller integral type (potential portability problem)
 # remark #1683: explicit conversion of a 64-bit integral type to a smaller integral type (potential portability problem)
 # remark #1684: conversion from pointer to same-sized integral type (potential portability problem)
 # remark #193: zero used for undefined preprocessing identifier
@@ -3916,31 +4149,30 @@ then
 # remark #810: conversion from "int" to "Dimension={unsigned short}" may lose significant bits
 # remark #869: parameter "tw" was never referenced
 # remark #981: operands are evaluated in unspecified order
-# warning #269: invalid format string conversion
+# warning #279: controlling expression is constant
 
-	{ echo "$as_me:3921: 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"
 	for cf_opt in \
 		wd1419 \
-		wd1682 \
 		wd1683 \
 		wd1684 \
 		wd193 \
-		wd279 \
 		wd593 \
+		wd279 \
 		wd810 \
 		wd869 \
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:3938: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:4170: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3941: \$? = $ac_status" >&5
+  echo "$as_me:4173: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-			test -n "$verbose" && echo "$as_me:3943: 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
@@ -3949,7 +4181,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 
 elif test "$GCC" = yes
 then
-	{ echo "$as_me:3952: 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="-W -Wall"
@@ -3969,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:3972: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:4204: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3975: \$? = $ac_status" >&5
+  echo "$as_me:4207: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-			test -n "$verbose" && echo "$as_me:3977: 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
@@ -3982,9 +4214,11 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				;;
 			Winline) #(vi
 				case $GCC_VERSION in
-				3.3*)
+				[34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
+echo "${as_me-configure}:4220: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+
 					continue;;
 				esac
 				;;
@@ -4000,13 +4234,13 @@ fi
 fi
 
 EXTRAOBJS=""
-echo "$as_me:4003: checking for ANSI C header files" >&5
+echo "$as_me:4237: 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 4009 "configure"
+#line 4243 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -4014,13 +4248,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:4017: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4251: \"$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:4023: \$? = $ac_status" >&5
+  echo "$as_me:4257: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4042,7 +4276,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 4045 "configure"
+#line 4279 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -4060,7 +4294,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 4063 "configure"
+#line 4297 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -4081,7 +4315,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4084 "configure"
+#line 4318 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -4107,15 +4341,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:4110: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4344: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4113: \$? = $ac_status" >&5
+  echo "$as_me:4347: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:4115: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4349: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4118: \$? = $ac_status" >&5
+  echo "$as_me:4352: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -4128,7 +4362,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:4131: result: $ac_cv_header_stdc" >&5
+echo "$as_me:4365: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -4138,7 +4372,7 @@ EOF
 
 fi
 
-echo "$as_me:4141: checking for inline" >&5
+echo "$as_me:4375: 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
@@ -4146,7 +4380,7 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >conftest.$ac_ext <<_ACEOF
-#line 4149 "configure"
+#line 4383 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo () {return 0; }
@@ -4155,16 +4389,16 @@ $ac_kw int foo () {return 0; }
 
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4158: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4392: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4161: \$? = $ac_status" >&5
+  echo "$as_me:4395: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4164: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4398: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4167: \$? = $ac_status" >&5
+  echo "$as_me:4401: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
@@ -4175,7 +4409,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:4178: result: $ac_cv_c_inline" >&5
+echo "$as_me:4412: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -4196,28 +4430,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:4199: checking for $ac_header" >&5
+echo "$as_me:4433: 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 4205 "configure"
+#line 4439 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4211: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4445: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4214: \$? = $ac_status" >&5
+  echo "$as_me:4448: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4217: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4451: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4220: \$? = $ac_status" >&5
+  echo "$as_me:4454: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -4227,7 +4461,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4230: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:4464: 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
@@ -4237,13 +4471,13 @@ EOF
 fi
 done
 
-echo "$as_me:4240: checking for off_t" >&5
+echo "$as_me:4474: 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 4246 "configure"
+#line 4480 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -4258,16 +4492,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4261: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4495: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4264: \$? = $ac_status" >&5
+  echo "$as_me:4498: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4267: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4501: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4270: \$? = $ac_status" >&5
+  echo "$as_me:4504: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -4277,7 +4511,7 @@ ac_cv_type_off_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4280: result: $ac_cv_type_off_t" >&5
+echo "$as_me:4514: 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
   :
@@ -4289,13 +4523,13 @@ EOF
 
 fi
 
-echo "$as_me:4292: checking for size_t" >&5
+echo "$as_me:4526: 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 4298 "configure"
+#line 4532 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -4310,16 +4544,16 @@ if (sizeof (size_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4313: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4547: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4316: \$? = $ac_status" >&5
+  echo "$as_me:4550: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4319: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4553: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4322: \$? = $ac_status" >&5
+  echo "$as_me:4556: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_size_t=yes
 else
@@ -4329,7 +4563,7 @@ ac_cv_type_size_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4332: result: $ac_cv_type_size_t" >&5
+echo "$as_me:4566: 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
   :
@@ -4343,13 +4577,13 @@ fi
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:4346: checking for working alloca.h" >&5
+echo "$as_me:4580: 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 4352 "configure"
+#line 4586 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int
@@ -4361,16 +4595,16 @@ char *p = (char *) alloca (2 * sizeof (int));
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4364: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4598: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4367: \$? = $ac_status" >&5
+  echo "$as_me:4601: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4370: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4604: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4373: \$? = $ac_status" >&5
+  echo "$as_me:4607: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_working_alloca_h=yes
 else
@@ -4380,7 +4614,7 @@ ac_cv_working_alloca_h=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4383: result: $ac_cv_working_alloca_h" >&5
+echo "$as_me:4617: 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
 
@@ -4390,13 +4624,13 @@ EOF
 
 fi
 
-echo "$as_me:4393: checking for alloca" >&5
+echo "$as_me:4627: 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 4399 "configure"
+#line 4633 "configure"
 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -4428,16 +4662,16 @@ char *p = (char *) alloca (1);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4431: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4665: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4434: \$? = $ac_status" >&5
+  echo "$as_me:4668: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4437: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4671: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4440: \$? = $ac_status" >&5
+  echo "$as_me:4674: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_alloca_works=yes
 else
@@ -4447,7 +4681,7 @@ ac_cv_func_alloca_works=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4450: result: $ac_cv_func_alloca_works" >&5
+echo "$as_me:4684: 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
@@ -4468,13 +4702,13 @@ cat >>confdefs.h <<\EOF
 #define C_ALLOCA 1
 EOF
 
-echo "$as_me:4471: checking whether \`alloca.c' needs Cray hooks" >&5
+echo "$as_me:4705: 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 4477 "configure"
+#line 4711 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -4492,18 +4726,18 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:4495: result: $ac_cv_os_cray" >&5
+echo "$as_me:4729: 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:4500: checking for $ac_func" >&5
+echo "$as_me:4734: 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 4506 "configure"
+#line 4740 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -4534,16 +4768,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4537: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4771: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4540: \$? = $ac_status" >&5
+  echo "$as_me:4774: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4543: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4777: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4546: \$? = $ac_status" >&5
+  echo "$as_me:4780: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -4553,7 +4787,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4556: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:4790: 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
 
@@ -4567,7 +4801,7 @@ fi
   done
 fi
 
-echo "$as_me:4570: checking stack direction for C alloca" >&5
+echo "$as_me:4804: 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
@@ -4576,7 +4810,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4579 "configure"
+#line 4813 "configure"
 #include "confdefs.h"
 int
 find_stack_direction ()
@@ -4599,15 +4833,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:4602: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4836: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4605: \$? = $ac_status" >&5
+  echo "$as_me:4839: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:4607: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4841: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4610: \$? = $ac_status" >&5
+  echo "$as_me:4844: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_stack_direction=1
 else
@@ -4619,7 +4853,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:4622: result: $ac_cv_c_stack_direction" >&5
+echo "$as_me:4856: result: $ac_cv_c_stack_direction" >&5
 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
 cat >>confdefs.h <<EOF
@@ -4631,23 +4865,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:4634: checking for $ac_header" >&5
+echo "$as_me:4868: 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 4640 "configure"
+#line 4874 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:4644: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4878: \"$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:4650: \$? = $ac_status" >&5
+  echo "$as_me:4884: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4666,7 +4900,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:4669: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:4903: 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
@@ -4679,13 +4913,13 @@ done
 for ac_func in getpagesize
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:4682: checking for $ac_func" >&5
+echo "$as_me:4916: 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 4688 "configure"
+#line 4922 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -4716,16 +4950,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4719: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4953: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4722: \$? = $ac_status" >&5
+  echo "$as_me:4956: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4725: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4959: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4728: \$? = $ac_status" >&5
+  echo "$as_me:4962: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -4735,7 +4969,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4738: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:4972: 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
@@ -4745,7 +4979,7 @@ EOF
 fi
 done
 
-echo "$as_me:4748: checking for working mmap" >&5
+echo "$as_me:4982: 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
@@ -4754,7 +4988,7 @@ else
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4757 "configure"
+#line 4991 "configure"
 #include "confdefs.h"
 $ac_includes_default
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -4881,15 +5115,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:4884: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5118: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4887: \$? = $ac_status" >&5
+  echo "$as_me:5121: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:4889: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5123: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4892: \$? = $ac_status" >&5
+  echo "$as_me:5126: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -4901,7 +5135,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:4904: result: $ac_cv_func_mmap_fixed_mapped" >&5
+echo "$as_me:5138: 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
 
@@ -4912,13 +5146,13 @@ EOF
 fi
 rm -f conftest.mmap
 
-    echo "$as_me:4915: checking whether we are using the GNU C Library 2.1 or newer" >&5
+    echo "$as_me:5149: 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 4921 "configure"
+#line 5155 "configure"
 #include "confdefs.h"
 
 #include <features.h>
@@ -4938,16 +5172,11 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:4941: result: $ac_cv_gnu_library_2_1" >&5
+echo "$as_me:5175: 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"
 
-	case $cf_cv_system_name in
-	os2*)	PATHSEP=';'  ;;
-	*)	PATHSEP=':'  ;;
-	esac
-
 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/*//'`
@@ -4967,23 +5196,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:4970: checking for $ac_header" >&5
+echo "$as_me:5199: 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 4976 "configure"
+#line 5205 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:4980: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5209: \"$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:4986: \$? = $ac_status" >&5
+  echo "$as_me:5215: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5002,7 +5231,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:5005: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:5234: 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
@@ -5017,13 +5246,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:5020: checking for $ac_func" >&5
+echo "$as_me:5249: 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 5026 "configure"
+#line 5255 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -5054,16 +5283,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5057: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5286: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5060: \$? = $ac_status" >&5
+  echo "$as_me:5289: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5063: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5292: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5066: \$? = $ac_status" >&5
+  echo "$as_me:5295: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -5073,7 +5302,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:5076: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:5305: 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
@@ -5087,115 +5316,659 @@ done
 if test "${with_libiconv_prefix+set}" = set; then
   withval="$with_libiconv_prefix"
 
-    for dir in `echo "$withval" | tr : ' '`; do
-      if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
-      if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
-    done
+  case "$withval" in #(vi
+  no) #(vi
+      ;;
+  yes) #(vi
+      ;;
+  *)
+
+for cf_searchpath in `echo "$withval" | tr $PATH_SEPARATOR ' '`; do
+	if test -d $cf_searchpath/include; then
+
+if test -n "$cf_searchpath/include" ; then
+  for cf_add_incdir in $cf_searchpath/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 5353 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+int
+main ()
+{
+printf("Hello")
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:5365: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:5368: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:5371: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:5374: \$? = $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}:5391: 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
+
+	elif test -d $cf_searchpath/../include ; then
+
+if test -n "$cf_searchpath/../include" ; then
+  for cf_add_incdir in $cf_searchpath/../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 5432 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+int
+main ()
+{
+printf("Hello")
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:5444: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:5447: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:5450: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:5453: \$? = $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}:5470: 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
+
+	else
+{ { echo "$as_me:5486: error: cannot find libiconv under $withval" >&5
+echo "$as_me: error: cannot find libiconv under $withval" >&2;}
+   { (exit 1); exit 1; }; }
+	fi
+	if test -d $cf_searchpath/lib; then
+
+if test -n "$cf_searchpath/lib" ; then
+  for cf_add_libdir in $cf_searchpath/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}:5511: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+      fi
+    fi
+  done
+fi
+
+	elif test -d $cf_searchpath ; then
+
+if test -n "$cf_searchpath" ; then
+  for cf_add_libdir in $cf_searchpath
+  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}:5540: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+      fi
+    fi
+  done
+fi
+
+	else
+{ { echo "$as_me:5549: error: cannot find libiconv under $withval" >&5
+echo "$as_me: error: cannot find libiconv under $withval" >&2;}
+   { (exit 1); exit 1; }; }
+	fi
+done
+
+      ;;
+  esac
 
 fi;
 
-  echo "$as_me:5097: checking for iconv" >&5
+  echo "$as_me:5560: 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
 else
 
-    am_cv_func_iconv="no, consider installing GNU libiconv"
-    am_cv_lib_iconv=no
-    cat >conftest.$ac_ext <<_ACEOF
-#line 5106 "configure"
+# If the linkage is not already in the $CPPFLAGS/$LDFLAGS configuration, these
+# will be set on completion of the AC_TRY_LINK below.
+cf_cv_header_path_iconv=
+cf_cv_library_path_iconv=
+
+echo "${as_me-configure}:5571: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
+
+cat >conftest.$ac_ext <<_ACEOF
+#line 5574 "configure"
 #include "confdefs.h"
+
 #include <stdlib.h>
 #include <iconv.h>
+
 int
 main ()
 {
-iconv_t cd = iconv_open("","");
-       iconv(cd,NULL,NULL,NULL,NULL);
-       iconv_close(cd);
+
+	iconv_t cd = iconv_open("","");
+	iconv(cd,NULL,NULL,NULL,NULL);
+	iconv_close(cd);
+
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5121: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5593: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5124: \$? = $ac_status" >&5
+  echo "$as_me:5596: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5127: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5599: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5130: \$? = $ac_status" >&5
+  echo "$as_me:5602: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  am_cv_func_iconv=yes
+  cf_cv_find_linkage_iconv=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
+
+    cf_cv_find_linkage_iconv=no
+
+    test -n "$verbose" && echo "	find linkage for iconv library" 1>&6
+
+echo "${as_me-configure}:5613: testing find linkage for iconv library ..." 1>&5
+
+echo "${as_me-configure}:5615: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
+
+    cf_save_CPPFLAGS="$CPPFLAGS"
+    cf_test_CPPFLAGS="$CPPFLAGS"
+
+cf_search=
+cf_header_path_list=""
+if test -n "${CFLAGS}${CPPFLAGS}" ; then
+	for cf_header_path in $CPPFLAGS $CFLAGS
+	do
+		case $cf_header_path in #(vi
+		-I*)
+			cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
+
+test "$cf_header_path" != "NONE" && \
+test -d "$cf_header_path" && \
+ {
+	test -n "$verbose" && echo "	... testing for include-directories under $cf_header_path"
+	test -d $cf_header_path/include &&          cf_search="$cf_search $cf_header_path/include"
+	test -d $cf_header_path/include/iconv &&       cf_search="$cf_search $cf_header_path/include/iconv"
+	test -d $cf_header_path/include/iconv/include &&    cf_search="$cf_search $cf_header_path/include/iconv/include"
+	test -d $cf_header_path/iconv/include &&       cf_search="$cf_search $cf_header_path/iconv/include"
+	test -d $cf_header_path/iconv/include/iconv &&    cf_search="$cf_search $cf_header_path/iconv/include/iconv"
+}
+
+			cf_header_path_list="$cf_header_path_list $cf_search"
+			;;
+		esac
+	done
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-    if test "$am_cv_func_iconv" != yes; then
-      am_save_LIBS="$LIBS"
-      LIBS="$LIBS -liconv"
-      cat >conftest.$ac_ext <<_ACEOF
-#line 5142 "configure"
+
+cf_search=""
+
+test "/usr" != "$prefix" && \
+test -d "/usr" && \
+(test $prefix = NONE || test -d $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"
+	test -d /usr/include/iconv/include &&    cf_search="$cf_search /usr/include/iconv/include"
+	test -d /usr/iconv/include &&       cf_search="$cf_search /usr/iconv/include"
+	test -d /usr/iconv/include/iconv &&    cf_search="$cf_search /usr/iconv/include/iconv"
+}
+
+test "$prefix" != "NONE" && \
+test -d "$prefix" && \
+ {
+	test -n "$verbose" && echo "	... testing for include-directories under $prefix"
+	test -d $prefix/include &&          cf_search="$cf_search $prefix/include"
+	test -d $prefix/include/iconv &&       cf_search="$cf_search $prefix/include/iconv"
+	test -d $prefix/include/iconv/include &&    cf_search="$cf_search $prefix/include/iconv/include"
+	test -d $prefix/iconv/include &&       cf_search="$cf_search $prefix/iconv/include"
+	test -d $prefix/iconv/include/iconv &&    cf_search="$cf_search $prefix/iconv/include/iconv"
+}
+
+test "/usr/local" != "$prefix" && \
+test -d "/usr/local" && \
+(test $prefix = NONE || test -d $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"
+	test -d /usr/local/include/iconv/include &&    cf_search="$cf_search /usr/local/include/iconv/include"
+	test -d /usr/local/iconv/include &&       cf_search="$cf_search /usr/local/iconv/include"
+	test -d /usr/local/iconv/include/iconv &&    cf_search="$cf_search /usr/local/iconv/include/iconv"
+}
+
+test "/opt" != "$prefix" && \
+test -d "/opt" && \
+(test $prefix = NONE || test -d $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"
+	test -d /opt/include/iconv/include &&    cf_search="$cf_search /opt/include/iconv/include"
+	test -d /opt/iconv/include &&       cf_search="$cf_search /opt/iconv/include"
+	test -d /opt/iconv/include/iconv &&    cf_search="$cf_search /opt/iconv/include/iconv"
+}
+
+test "$HOME" != "$prefix" && \
+test -d "$HOME" && \
+(test $prefix = NONE || test -d $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"
+	test -d $HOME/include/iconv/include &&    cf_search="$cf_search $HOME/include/iconv/include"
+	test -d $HOME/iconv/include &&       cf_search="$cf_search $HOME/iconv/include"
+	test -d $HOME/iconv/include/iconv &&    cf_search="$cf_search $HOME/iconv/include/iconv"
+}
+
+test "$includedir" != NONE && \
+test "$includedir" != "/usr/include" && \
+test -d "$includedir" && {
+	test -d $includedir &&    cf_search="$cf_search $includedir"
+	test -d $includedir/iconv && cf_search="$cf_search $includedir/iconv"
+}
+
+test "$oldincludedir" != NONE && \
+test "$oldincludedir" != "/usr/include" && \
+test -d "$oldincludedir" && {
+	test -d $oldincludedir    && cf_search="$cf_search $oldincludedir"
+	test -d $oldincludedir/iconv && cf_search="$cf_search $oldincludedir/iconv"
+}
+
+cf_search="$cf_header_path_list $cf_search"
+
+    for cf_cv_header_path_iconv in $cf_search
+    do
+      if test -d $cf_cv_header_path_iconv ; then
+        test -n "$verbose" && echo "	... testing $cf_cv_header_path_iconv" 1>&6
+
+echo "${as_me-configure}:5724: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
+
+        CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_iconv"
+        cat >conftest.$ac_ext <<_ACEOF
+#line 5728 "configure"
 #include "confdefs.h"
+
 #include <stdlib.h>
 #include <iconv.h>
+
 int
 main ()
 {
-iconv_t cd = iconv_open("","");
-         iconv(cd,NULL,NULL,NULL,NULL);
-         iconv_close(cd);
+
+	iconv_t cd = iconv_open("","");
+	iconv(cd,NULL,NULL,NULL,NULL);
+	iconv_close(cd);
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:5747: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:5750: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:5753: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:5756: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+            test -n "$verbose" && echo "	... found iconv headers in $cf_cv_header_path_iconv" 1>&6
+
+echo "${as_me-configure}:5761: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
+
+            cf_cv_find_linkage_iconv=maybe
+            cf_test_CPPFLAGS="$CPPFLAGS"
+            break
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+
+            CPPFLAGS="$cf_save_CPPFLAGS"
+
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+      fi
+    done
+
+    if test "$cf_cv_find_linkage_iconv" = maybe ; then
+
+echo "${as_me-configure}:5779: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
+
+      cf_save_LIBS="$LIBS"
+      cf_save_LDFLAGS="$LDFLAGS"
+
+      if test "$cf_cv_find_linkage_iconv" != yes ; then
+
+cf_library_path_list=""
+if test -n "${LDFLAGS}${LIBS}" ; then
+	for cf_library_path in $LDFLAGS $LIBS
+	do
+		case $cf_library_path in #(vi
+		-L*)
+			cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
+
+test "$cf_library_path" != "NONE" && \
+test -d "$cf_library_path" && \
+ {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_library_path"
+	test -d $cf_library_path/lib &&          cf_search="$cf_search $cf_library_path/lib"
+	test -d $cf_library_path/lib/iconv &&       cf_search="$cf_search $cf_library_path/lib/iconv"
+	test -d $cf_library_path/lib/iconv/lib &&    cf_search="$cf_search $cf_library_path/lib/iconv/lib"
+	test -d $cf_library_path/iconv/lib &&       cf_search="$cf_search $cf_library_path/iconv/lib"
+	test -d $cf_library_path/iconv/lib/iconv &&    cf_search="$cf_search $cf_library_path/iconv/lib/iconv"
+}
+
+			cf_library_path_list="$cf_library_path_list $cf_search"
+			;;
+		esac
+	done
+fi
+
+cf_search=""
+
+test "/usr" != "$prefix" && \
+test -d "/usr" && \
+(test $prefix = NONE || test -d $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"
+	test -d /usr/lib/iconv/lib &&    cf_search="$cf_search /usr/lib/iconv/lib"
+	test -d /usr/iconv/lib &&       cf_search="$cf_search /usr/iconv/lib"
+	test -d /usr/iconv/lib/iconv &&    cf_search="$cf_search /usr/iconv/lib/iconv"
+}
+
+test "$prefix" != "NONE" && \
+test -d "$prefix" && \
+ {
+	test -n "$verbose" && echo "	... testing for lib-directories under $prefix"
+	test -d $prefix/lib &&          cf_search="$cf_search $prefix/lib"
+	test -d $prefix/lib/iconv &&       cf_search="$cf_search $prefix/lib/iconv"
+	test -d $prefix/lib/iconv/lib &&    cf_search="$cf_search $prefix/lib/iconv/lib"
+	test -d $prefix/iconv/lib &&       cf_search="$cf_search $prefix/iconv/lib"
+	test -d $prefix/iconv/lib/iconv &&    cf_search="$cf_search $prefix/iconv/lib/iconv"
+}
+
+test "/usr/local" != "$prefix" && \
+test -d "/usr/local" && \
+(test $prefix = NONE || test -d $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"
+	test -d /usr/local/lib/iconv/lib &&    cf_search="$cf_search /usr/local/lib/iconv/lib"
+	test -d /usr/local/iconv/lib &&       cf_search="$cf_search /usr/local/iconv/lib"
+	test -d /usr/local/iconv/lib/iconv &&    cf_search="$cf_search /usr/local/iconv/lib/iconv"
+}
+
+test "/opt" != "$prefix" && \
+test -d "/opt" && \
+(test $prefix = NONE || test -d $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"
+	test -d /opt/lib/iconv/lib &&    cf_search="$cf_search /opt/lib/iconv/lib"
+	test -d /opt/iconv/lib &&       cf_search="$cf_search /opt/iconv/lib"
+	test -d /opt/iconv/lib/iconv &&    cf_search="$cf_search /opt/iconv/lib/iconv"
+}
+
+test "$HOME" != "$prefix" && \
+test -d "$HOME" && \
+(test $prefix = NONE || test -d $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"
+	test -d $HOME/lib/iconv/lib &&    cf_search="$cf_search $HOME/lib/iconv/lib"
+	test -d $HOME/iconv/lib &&       cf_search="$cf_search $HOME/iconv/lib"
+	test -d $HOME/iconv/lib/iconv &&    cf_search="$cf_search $HOME/iconv/lib/iconv"
+}
+
+cf_search="$cf_library_path_list $cf_search"
+
+        for cf_cv_library_path_iconv in $cf_search
+        do
+          if test -d $cf_cv_library_path_iconv ; then
+            test -n "$verbose" && echo "	... testing $cf_cv_library_path_iconv" 1>&6
+
+echo "${as_me-configure}:5875: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
+
+            CPPFLAGS="$cf_test_CPPFLAGS"
+            LIBS="-liconv  $cf_save_LIBS"
+            LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_iconv"
+            cat >conftest.$ac_ext <<_ACEOF
+#line 5881 "configure"
+#include "confdefs.h"
+
+#include <stdlib.h>
+#include <iconv.h>
+
+int
+main ()
+{
+
+	iconv_t cd = iconv_open("","");
+	iconv(cd,NULL,NULL,NULL,NULL);
+	iconv_close(cd);
+
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5157: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5900: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5160: \$? = $ac_status" >&5
+  echo "$as_me:5903: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5163: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5906: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5166: \$? = $ac_status" >&5
+  echo "$as_me:5909: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  am_cv_lib_iconv=yes
-        am_cv_func_iconv=yes
+
+                test -n "$verbose" && echo "	... found iconv library in $cf_cv_library_path_iconv" 1>&6
+
+echo "${as_me-configure}:5914: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
+
+                cf_cv_find_linkage_iconv=yes
+                cf_cv_library_file_iconv="-liconv"
+                break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
+
+                CPPFLAGS="$cf_save_CPPFLAGS"
+                LIBS="$cf_save_LIBS"
+                LDFLAGS="$cf_save_LDFLAGS"
+
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-      LIBS="$am_save_LIBS"
+          fi
+        done
+        LIBS="$cf_save_LIBS"
+        CPPFLAGS="$cf_save_CPPFLAGS"
+        LDFLAGS="$cf_save_LDFLAGS"
+      fi
+
+    else
+      cf_cv_find_linkage_iconv=no
     fi
 
 fi
-echo "$as_me:5179: result: $am_cv_func_iconv" >&5
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+
+if test "$cf_cv_find_linkage_iconv" = yes ; then
+am_cv_func_iconv=yes
+else
+am_cv_func_iconv="no, consider installing GNU libiconv"
+fi
+
+fi
+echo "$as_me:5950: result: $am_cv_func_iconv" >&5
 echo "${ECHO_T}$am_cv_func_iconv" >&6
+
   if test "$am_cv_func_iconv" = yes; then
 
 cat >>confdefs.h <<\EOF
 #define HAVE_ICONV 1
 EOF
 
-    echo "$as_me:5187: checking for iconv declaration" >&5
-echo $ECHO_N "checking for iconv declaration... $ECHO_C" >&6
-    if test "${am_cv_proto_iconv+set}" = set; then
+    echo "$as_me:5959: 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 5194 "configure"
+#line 5966 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
 #include <iconv.h>
+
 extern
 #ifdef __cplusplus
 "C"
@@ -5215,50 +5988,160 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5218: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5991: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5221: \$? = $ac_status" >&5
+  echo "$as_me:5994: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5224: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5997: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5227: \$? = $ac_status" >&5
+  echo "$as_me:6000: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  am_cv_proto_iconv_arg1=""
+  am_cv_proto_iconv_const=no
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-am_cv_proto_iconv_arg1="const"
+am_cv_proto_iconv_const=yes
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"
 fi
+echo "$as_me:6010: result: $am_cv_proto_iconv_const" >&5
+echo "${ECHO_T}$am_cv_proto_iconv_const" >&6
 
-    am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
-    echo "$as_me:5240: result: ${ac_t:-
-         }$am_cv_proto_iconv" >&5
-echo "${ECHO_T}${ac_t:-
-         }$am_cv_proto_iconv" >&6
+    if test "$am_cv_proto_iconv_const" = yes ; then
+      am_cv_proto_iconv_arg1="const"
+    else
+      am_cv_proto_iconv_arg1=""
+    fi
 
 cat >>confdefs.h <<EOF
 #define ICONV_CONST $am_cv_proto_iconv_arg1
 EOF
 
   fi
+
   LIBICONV=
-  if test "$am_cv_lib_iconv" = yes; then
-    LIBICONV="-liconv"
+  if test "$cf_cv_find_linkage_iconv" = yes; then
+
+if test -n "$cf_cv_header_path_iconv" ; then
+  for cf_add_incdir in $cf_cv_header_path_iconv
+  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 6052 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+int
+main ()
+{
+printf("Hello")
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:6064: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:6067: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:6070: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6073: \$? = $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}:6090: 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_library_file_iconv" ; then
+      LIBICONV="-liconv"
+
+if test -n "$cf_cv_library_path_iconv" ; then
+  for cf_add_libdir in $cf_cv_library_path_iconv
+  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}:6127: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+      fi
+    fi
+  done
+fi
+
+    fi
   fi
 
-  echo "$as_me:5255: checking for nl_langinfo and CODESET" >&5
+  echo "$as_me:6138: 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 5261 "configure"
+#line 6144 "configure"
 #include "confdefs.h"
 #include <langinfo.h>
 int
@@ -5270,16 +6153,16 @@ char* cs = nl_langinfo(CODESET);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5273: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6156: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5276: \$? = $ac_status" >&5
+  echo "$as_me:6159: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5279: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6162: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5282: \$? = $ac_status" >&5
+  echo "$as_me:6165: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_langinfo_codeset=yes
 else
@@ -5290,7 +6173,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:5293: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:6176: result: $am_cv_langinfo_codeset" >&5
 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
   if test $am_cv_langinfo_codeset = yes; then
 
@@ -5301,13 +6184,13 @@ EOF
   fi
 
    if test $ac_cv_header_locale_h = yes; then
-    echo "$as_me:5304: checking for LC_MESSAGES" >&5
+    echo "$as_me:6187: 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 5310 "configure"
+#line 6193 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int
@@ -5319,16 +6202,16 @@ return LC_MESSAGES
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5322: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6205: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5325: \$? = $ac_status" >&5
+  echo "$as_me:6208: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5328: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6211: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5331: \$? = $ac_status" >&5
+  echo "$as_me:6214: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_val_LC_MESSAGES=yes
 else
@@ -5338,7 +6221,7 @@ am_cv_val_LC_MESSAGES=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:5341: result: $am_cv_val_LC_MESSAGES" >&5
+echo "$as_me:6224: 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
 
@@ -5348,7 +6231,7 @@ EOF
 
     fi
   fi
-   echo "$as_me:5351: checking whether NLS is requested" >&5
+   echo "$as_me:6234: 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.
@@ -5358,20 +6241,20 @@ if test "${enable_nls+set}" = set; then
 else
   USE_NLS=no
 fi;
-    echo "$as_me:5361: result: $USE_NLS" >&5
+  echo "$as_me:6244: result: $USE_NLS" >&5
 echo "${ECHO_T}$USE_NLS" >&6
 
-    BUILD_INCLUDED_LIBINTL=no
-    USE_INCLUDED_LIBINTL=no
-    INTLLIBS=
+  BUILD_INCLUDED_LIBINTL=no
+  USE_INCLUDED_LIBINTL=no
+  INTLLIBS=
 
-        if test "$USE_NLS" = "yes"; then
+    if test "$USE_NLS" = "yes"; then
 
 cat >>confdefs.h <<\EOF
 #define ENABLE_NLS 1
 EOF
 
-      echo "$as_me:5374: checking whether included gettext is requested" >&5
+    echo "$as_me:6257: 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.
@@ -5381,432 +6264,545 @@ if test "${with_included_gettext+set}" = set; then
 else
   nls_cv_force_use_gnu_gettext=no
 fi;
-      echo "$as_me:5384: result: $nls_cv_force_use_gnu_gettext" >&5
+    echo "$as_me:6267: 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"
-      if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
-                        	CATOBJEXT=NONE
+    nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
+    if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
+                        CATOBJEXT=NONE
 
-echo "$as_me:5391: checking for libintl.h" >&5
-echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6
-if test "${ac_cv_header_libintl_h+set}" = set; then
+      cf_save_LIBS_1="$LIBS"
+      LIBS="$LIBICONV $LIBS"
+      echo "$as_me:6276: 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
 else
-  cat >conftest.$ac_ext <<_ACEOF
-#line 5397 "configure"
+
+# If the linkage is not already in the $CPPFLAGS/$LDFLAGS configuration, these
+# will be set on completion of the AC_TRY_LINK below.
+cf_cv_header_path_intl=
+cf_cv_library_path_intl=
+
+echo "${as_me-configure}:6287: testing Starting FIND_LINKAGE(intl,) ..." 1>&5
+
+cat >conftest.$ac_ext <<_ACEOF
+#line 6290 "configure"
 #include "confdefs.h"
+
 #include <libintl.h>
+extern int _nl_msg_cat_cntr;
+
+int
+main ()
+{
+
+    bindtextdomain ("", "");
+    return (int) gettext ("")
+
+             + _nl_msg_cat_cntr
+
+  ;
+  return 0;
+}
 _ACEOF
-if { (eval echo "$as_me:5401: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:6310: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:5407: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_cv_header_libintl_h=yes
+  echo "$as_me:6313: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:6316: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6319: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  cf_cv_find_linkage_intl=yes
 else
   echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_cv_header_libintl_h=no
-fi
-rm -f conftest.err conftest.$ac_ext
-fi
-echo "$as_me:5426: result: $ac_cv_header_libintl_h" >&5
-echo "${ECHO_T}$ac_cv_header_libintl_h" >&6
-if test $ac_cv_header_libintl_h = yes; then
-  cf_find_header=yes
-else
+cat conftest.$ac_ext >&5
 
-	cf_find_header=no
-cf_search=""
+    cf_cv_find_linkage_intl=no
 
-test -d "$HOME" && {
-	test -n "$verbose" && echo "	... testing include-directories under $HOME"
-	test -d "$HOME/include" &&          cf_search="$cf_search $HOME/include"
-	test -d "$HOME/include/gettext" &&       cf_search="$cf_search $HOME/include/gettext"
-	test -d "$HOME/include/gettext/include" &&    cf_search="$cf_search $HOME/include/gettext/include"
-}
+    test -n "$verbose" && echo "	find linkage for intl library" 1>&6
 
-# For other stuff under the home directory, it should be sufficient to put
-# a symbolic link for $HOME/gettext to the actual package location:
-test -d "$HOME/gettext" && {
-	test -n "$verbose" && echo "	... testing include-directories under $HOME/gettext"
-	test -d "$HOME/gettext/include" &&       cf_search="$cf_search $HOME/gettext/include"
-	test -d "$HOME/gettext/include/gettext" &&    cf_search="$cf_search $HOME/gettext/include/gettext"
-}
+echo "${as_me-configure}:6330: testing find linkage for intl library ..." 1>&5
 
-test "$prefix" != /usr/local && \
-test -d /usr/local && {
-	test -n "$verbose" && echo "	... testing include-directories under /usr/local"
-	test -d /usr/local/include &&       cf_search="$cf_search /usr/local/include"
-	test -d /usr/local/include/gettext &&    cf_search="$cf_search /usr/local/include/gettext"
-	test -d /usr/local/include/gettext/include && cf_search="$cf_search /usr/local/include/gettext/include"
-	test -d /usr/local/gettext/include &&    cf_search="$cf_search /usr/local/gettext/include"
-	test -d /usr/local/gettext/include/gettext && cf_search="$cf_search /usr/local/gettext/include/gettext"
-}
+echo "${as_me-configure}:6332: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5
 
-test "$prefix" != NONE && \
-test -d $prefix && {
-	test -n "$verbose" && echo "	... testing include-directories under $prefix"
-	test -d $prefix/include &&          cf_search="$cf_search $prefix/include"
-	test -d $prefix/include/gettext &&       cf_search="$cf_search $prefix/include/gettext"
-	test -d $prefix/include/gettext/include &&    cf_search="$cf_search $prefix/include/gettext/include"
-	test -d $prefix/gettext/include &&       cf_search="$cf_search $prefix/gettext/include"
-	test -d $prefix/gettext/include/gettext &&    cf_search="$cf_search $prefix/gettext/include/gettext"
-}
+    cf_save_CPPFLAGS="$CPPFLAGS"
+    cf_test_CPPFLAGS="$CPPFLAGS"
 
-test "$prefix" != /opt && \
-test -d /opt && {
-	test -n "$verbose" && echo "	... testing include-directories under /opt"
-	test -d /opt/include &&             cf_search="$cf_search /opt/include"
-	test -d /opt/include/gettext &&          cf_search="$cf_search /opt/include/gettext"
-	test -d /opt/include/gettext/include &&       cf_search="$cf_search /opt/include/gettext/include"
-	test -d /opt/gettext/include &&          cf_search="$cf_search /opt/gettext/include"
-	test -d /opt/gettext/include/gettext &&       cf_search="$cf_search /opt/gettext/include/gettext"
-}
+cf_search=
+cf_header_path_list=""
+if test -n "${CFLAGS}${CPPFLAGS}" ; then
+	for cf_header_path in $CPPFLAGS $CFLAGS
+	do
+		case $cf_header_path in #(vi
+		-I*)
+			cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
+
+test "$cf_header_path" != "NONE" && \
+test -d "$cf_header_path" && \
+ {
+	test -n "$verbose" && echo "	... testing for include-directories under $cf_header_path"
+	test -d $cf_header_path/include &&          cf_search="$cf_search $cf_header_path/include"
+	test -d $cf_header_path/include/intl &&       cf_search="$cf_search $cf_header_path/include/intl"
+	test -d $cf_header_path/include/intl/include &&    cf_search="$cf_search $cf_header_path/include/intl/include"
+	test -d $cf_header_path/intl/include &&       cf_search="$cf_search $cf_header_path/intl/include"
+	test -d $cf_header_path/intl/include/intl &&    cf_search="$cf_search $cf_header_path/intl/include/intl"
+}
+
+			cf_header_path_list="$cf_header_path_list $cf_search"
+			;;
+		esac
+	done
+fi
+
+cf_search=""
 
-test "$prefix" != /usr && \
-test -d /usr && {
-	test -n "$verbose" && echo "	... testing include-directories under /usr"
-	test -d /usr/include &&             cf_search="$cf_search /usr/include"
-	test -d /usr/include/gettext &&          cf_search="$cf_search /usr/include/gettext"
-	test -d /usr/include/gettext/include &&       cf_search="$cf_search /usr/include/gettext/include"
-	test -d /usr/gettext/include &&          cf_search="$cf_search /usr/gettext/include"
+test "/usr" != "$prefix" && \
+test -d "/usr" && \
+(test $prefix = NONE || test -d $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"
+	test -d /usr/include/intl/include &&    cf_search="$cf_search /usr/include/intl/include"
+	test -d /usr/intl/include &&       cf_search="$cf_search /usr/intl/include"
+	test -d /usr/intl/include/intl &&    cf_search="$cf_search /usr/intl/include/intl"
+}
+
+test "$prefix" != "NONE" && \
+test -d "$prefix" && \
+ {
+	test -n "$verbose" && echo "	... testing for include-directories under $prefix"
+	test -d $prefix/include &&          cf_search="$cf_search $prefix/include"
+	test -d $prefix/include/intl &&       cf_search="$cf_search $prefix/include/intl"
+	test -d $prefix/include/intl/include &&    cf_search="$cf_search $prefix/include/intl/include"
+	test -d $prefix/intl/include &&       cf_search="$cf_search $prefix/intl/include"
+	test -d $prefix/intl/include/intl &&    cf_search="$cf_search $prefix/intl/include/intl"
+}
+
+test "/usr/local" != "$prefix" && \
+test -d "/usr/local" && \
+(test $prefix = NONE || test -d $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"
+	test -d /usr/local/include/intl/include &&    cf_search="$cf_search /usr/local/include/intl/include"
+	test -d /usr/local/intl/include &&       cf_search="$cf_search /usr/local/intl/include"
+	test -d /usr/local/intl/include/intl &&    cf_search="$cf_search /usr/local/intl/include/intl"
+}
+
+test "/opt" != "$prefix" && \
+test -d "/opt" && \
+(test $prefix = NONE || test -d $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"
+	test -d /opt/include/intl/include &&    cf_search="$cf_search /opt/include/intl/include"
+	test -d /opt/intl/include &&       cf_search="$cf_search /opt/intl/include"
+	test -d /opt/intl/include/intl &&    cf_search="$cf_search /opt/intl/include/intl"
+}
+
+test "$HOME" != "$prefix" && \
+test -d "$HOME" && \
+(test $prefix = NONE || test -d $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"
+	test -d $HOME/include/intl/include &&    cf_search="$cf_search $HOME/include/intl/include"
+	test -d $HOME/intl/include &&       cf_search="$cf_search $HOME/intl/include"
+	test -d $HOME/intl/include/intl &&    cf_search="$cf_search $HOME/intl/include/intl"
 }
 
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
 test -d "$includedir" && {
 	test -d $includedir &&    cf_search="$cf_search $includedir"
-	test -d $includedir/gettext && cf_search="$cf_search $includedir/gettext"
+	test -d $includedir/intl && cf_search="$cf_search $includedir/intl"
 }
 
 test "$oldincludedir" != NONE && \
 test "$oldincludedir" != "/usr/include" && \
 test -d "$oldincludedir" && {
 	test -d $oldincludedir    && cf_search="$cf_search $oldincludedir"
-	test -d $oldincludedir/gettext && cf_search="$cf_search $oldincludedir/gettext"
+	test -d $oldincludedir/intl && cf_search="$cf_search $oldincludedir/intl"
 }
 
-for cf_incdir in $cf_search
-do
-	if test -f $cf_incdir/libintl.h ; then
-
-cf_fix_cppflags=no
-cf_new_cflags=
-cf_new_cppflags=
-cf_new_extra_cppflags=
-
-for cf_add_cflags in -I$cf_incdir
-do
-case $cf_fix_cppflags in
-no)
-	case $cf_add_cflags in #(vi
-	-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
-		case $cf_add_cflags in
-		-D*)
-			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
-
-			test "${cf_add_cflags}" != "${cf_tst_cflags}" \
-			&& test -z "${cf_tst_cflags}" \
-			&& cf_fix_cppflags=yes
+cf_search="$cf_header_path_list $cf_search"
 
-			if test $cf_fix_cppflags = yes ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
-				continue
-			elif test "${cf_tst_cflags}" = "\"'" ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
-				continue
-			fi
-			;;
-		esac
-		case "$CPPFLAGS" in
-		*$cf_add_cflags) #(vi
-			;;
-		*) #(vi
-			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
-			;;
-		esac
-		;;
-	*)
-		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
-		;;
-	esac
-	;;
-yes)
-	cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
-
-	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
-
-	test "${cf_add_cflags}" != "${cf_tst_cflags}" \
-	&& test -z "${cf_tst_cflags}" \
-	&& cf_fix_cppflags=no
-	;;
-esac
-done
-
-if test -n "$cf_new_cflags" ; then
-
-	CFLAGS="$CFLAGS $cf_new_cflags"
-fi
-
-if test -n "$cf_new_cppflags" ; then
-
-	CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
-fi
-
-if test -n "$cf_new_extra_cppflags" ; then
-
-	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
-fi
-
-		test -n "$verbose" && echo "	... found in $cf_incdir" 1>&6
-
-		cf_find_header=yes
-		break
-	fi
-	test -n "$verbose" && echo "	... tested $cf_incdir" 1>&6
-
-done
-
-fi
+    for cf_cv_header_path_intl in $cf_search
+    do
+      if test -d $cf_cv_header_path_intl ; then
+        test -n "$verbose" && echo "	... testing $cf_cv_header_path_intl" 1>&6
 
-if test "$cf_find_header" = yes ; then
-cat >>confdefs.h <<\EOF
-#define HAVE_LIBINTL_H 1
-EOF
+echo "${as_me-configure}:6441: testing ... testing $cf_cv_header_path_intl ..." 1>&5
 
-	   echo "$as_me:5591: checking for GNU gettext in libc" >&5
-echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6
-if test "${gt_cv_func_gnugettext1_libc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line 5597 "configure"
+        CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_intl"
+        cat >conftest.$ac_ext <<_ACEOF
+#line 6445 "configure"
 #include "confdefs.h"
+
 #include <libintl.h>
 extern int _nl_msg_cat_cntr;
+
 int
 main ()
 {
-bindtextdomain ("", "");
-return (int) gettext ("") + _nl_msg_cat_cntr
+
+    bindtextdomain ("", "");
+    return (int) gettext ("")
+
+             + _nl_msg_cat_cntr
+
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5611: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:6465: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5614: \$? = $ac_status" >&5
+  echo "$as_me:6468: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5617: \"$ac_try\"") >&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:6471: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5620: \$? = $ac_status" >&5
+  echo "$as_me:6474: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  gt_cv_func_gnugettext1_libc=yes
+
+            test -n "$verbose" && echo "	... found intl headers in $cf_cv_header_path_intl" 1>&6
+
+echo "${as_me-configure}:6479: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5
+
+            cf_cv_find_linkage_intl=maybe
+            cf_test_CPPFLAGS="$CPPFLAGS"
+            break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-gt_cv_func_gnugettext1_libc=no
+
+            CPPFLAGS="$cf_save_CPPFLAGS"
+
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
+      fi
+    done
+
+    if test "$cf_cv_find_linkage_intl" = maybe ; then
+
+echo "${as_me-configure}:6497: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5
+
+      cf_save_LIBS="$LIBS"
+      cf_save_LDFLAGS="$LDFLAGS"
+
+      if test "$cf_cv_find_linkage_intl" != yes ; then
+
+cf_library_path_list=""
+if test -n "${LDFLAGS}${LIBS}" ; then
+	for cf_library_path in $LDFLAGS $LIBS
+	do
+		case $cf_library_path in #(vi
+		-L*)
+			cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
+
+test "$cf_library_path" != "NONE" && \
+test -d "$cf_library_path" && \
+ {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_library_path"
+	test -d $cf_library_path/lib &&          cf_search="$cf_search $cf_library_path/lib"
+	test -d $cf_library_path/lib/intl &&       cf_search="$cf_search $cf_library_path/lib/intl"
+	test -d $cf_library_path/lib/intl/lib &&    cf_search="$cf_search $cf_library_path/lib/intl/lib"
+	test -d $cf_library_path/intl/lib &&       cf_search="$cf_search $cf_library_path/intl/lib"
+	test -d $cf_library_path/intl/lib/intl &&    cf_search="$cf_search $cf_library_path/intl/lib/intl"
+}
+
+			cf_library_path_list="$cf_library_path_list $cf_search"
+			;;
+		esac
+	done
 fi
-echo "$as_me:5630: result: $gt_cv_func_gnugettext1_libc" >&5
-echo "${ECHO_T}$gt_cv_func_gnugettext1_libc" >&6
 
-	   if test "$gt_cv_func_gnugettext1_libc" != "yes"; then
+cf_search=""
 
-cat >conftest.$ac_ext <<_ACEOF
-#line 5636 "configure"
+test "/usr" != "$prefix" && \
+test -d "/usr" && \
+(test $prefix = NONE || test -d $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"
+	test -d /usr/lib/intl/lib &&    cf_search="$cf_search /usr/lib/intl/lib"
+	test -d /usr/intl/lib &&       cf_search="$cf_search /usr/intl/lib"
+	test -d /usr/intl/lib/intl &&    cf_search="$cf_search /usr/intl/lib/intl"
+}
+
+test "$prefix" != "NONE" && \
+test -d "$prefix" && \
+ {
+	test -n "$verbose" && echo "	... testing for lib-directories under $prefix"
+	test -d $prefix/lib &&          cf_search="$cf_search $prefix/lib"
+	test -d $prefix/lib/intl &&       cf_search="$cf_search $prefix/lib/intl"
+	test -d $prefix/lib/intl/lib &&    cf_search="$cf_search $prefix/lib/intl/lib"
+	test -d $prefix/intl/lib &&       cf_search="$cf_search $prefix/intl/lib"
+	test -d $prefix/intl/lib/intl &&    cf_search="$cf_search $prefix/intl/lib/intl"
+}
+
+test "/usr/local" != "$prefix" && \
+test -d "/usr/local" && \
+(test $prefix = NONE || test -d $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"
+	test -d /usr/local/lib/intl/lib &&    cf_search="$cf_search /usr/local/lib/intl/lib"
+	test -d /usr/local/intl/lib &&       cf_search="$cf_search /usr/local/intl/lib"
+	test -d /usr/local/intl/lib/intl &&    cf_search="$cf_search /usr/local/intl/lib/intl"
+}
+
+test "/opt" != "$prefix" && \
+test -d "/opt" && \
+(test $prefix = NONE || test -d $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"
+	test -d /opt/lib/intl/lib &&    cf_search="$cf_search /opt/lib/intl/lib"
+	test -d /opt/intl/lib &&       cf_search="$cf_search /opt/intl/lib"
+	test -d /opt/intl/lib/intl &&    cf_search="$cf_search /opt/intl/lib/intl"
+}
+
+test "$HOME" != "$prefix" && \
+test -d "$HOME" && \
+(test $prefix = NONE || test -d $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"
+	test -d $HOME/lib/intl/lib &&    cf_search="$cf_search $HOME/lib/intl/lib"
+	test -d $HOME/intl/lib &&       cf_search="$cf_search $HOME/intl/lib"
+	test -d $HOME/intl/lib/intl &&    cf_search="$cf_search $HOME/intl/lib/intl"
+}
+
+cf_search="$cf_library_path_list $cf_search"
+
+        for cf_cv_library_path_intl in $cf_search
+        do
+          if test -d $cf_cv_library_path_intl ; then
+            test -n "$verbose" && echo "	... testing $cf_cv_library_path_intl" 1>&6
+
+echo "${as_me-configure}:6593: testing ... testing $cf_cv_library_path_intl ..." 1>&5
+
+            CPPFLAGS="$cf_test_CPPFLAGS"
+            LIBS="-lintl  $cf_save_LIBS"
+            LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_intl"
+            cat >conftest.$ac_ext <<_ACEOF
+#line 6599 "configure"
 #include "confdefs.h"
+
 #include <libintl.h>
 extern int _nl_msg_cat_cntr;
+
 int
 main ()
 {
-bindtextdomain ("", "");
-return (int) gettext ("") + _nl_msg_cat_cntr
+
+    bindtextdomain ("", "");
+    return (int) gettext ("")
+
+             + _nl_msg_cat_cntr
+
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5650: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6619: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5653: \$? = $ac_status" >&5
+  echo "$as_me:6622: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5656: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6625: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5659: \$? = $ac_status" >&5
+  echo "$as_me:6628: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  cf_find_linkage=yes
+
+                test -n "$verbose" && echo "	... found intl library in $cf_cv_library_path_intl" 1>&6
+
+echo "${as_me-configure}:6633: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5
+
+                cf_cv_find_linkage_intl=yes
+                cf_cv_library_file_intl="-lintl"
+                break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-	cf_find_linkage=no
-cf_search=""
+                CPPFLAGS="$cf_save_CPPFLAGS"
+                LIBS="$cf_save_LIBS"
+                LDFLAGS="$cf_save_LDFLAGS"
 
-test -d "$HOME" && {
-	test -n "$verbose" && echo "	... testing 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"
-	test -d "$HOME/lib/intl/lib" &&    cf_search="$cf_search $HOME/lib/intl/lib"
-}
+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
 
-# For other stuff under the home directory, it should be sufficient to put
-# a symbolic link for $HOME/intl to the actual package location:
-test -d "$HOME/intl" && {
-	test -n "$verbose" && echo "	... testing lib-directories under $HOME/intl"
-	test -d "$HOME/intl/lib" &&       cf_search="$cf_search $HOME/intl/lib"
-	test -d "$HOME/intl/lib/intl" &&    cf_search="$cf_search $HOME/intl/lib/intl"
-}
+    else
+      cf_cv_find_linkage_intl=no
+    fi
 
-test "$prefix" != /usr/local && \
-test -d /usr/local && {
-	test -n "$verbose" && echo "	... testing 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"
-	test -d /usr/local/lib/intl/lib && cf_search="$cf_search /usr/local/lib/intl/lib"
-	test -d /usr/local/intl/lib &&    cf_search="$cf_search /usr/local/intl/lib"
-	test -d /usr/local/intl/lib/intl && cf_search="$cf_search /usr/local/intl/lib/intl"
-}
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
-test "$prefix" != NONE && \
-test -d $prefix && {
-	test -n "$verbose" && echo "	... testing lib-directories under $prefix"
-	test -d $prefix/lib &&          cf_search="$cf_search $prefix/lib"
-	test -d $prefix/lib/intl &&       cf_search="$cf_search $prefix/lib/intl"
-	test -d $prefix/lib/intl/lib &&    cf_search="$cf_search $prefix/lib/intl/lib"
-	test -d $prefix/intl/lib &&       cf_search="$cf_search $prefix/intl/lib"
-	test -d $prefix/intl/lib/intl &&    cf_search="$cf_search $prefix/intl/lib/intl"
-}
+if test "$cf_cv_find_linkage_intl" = yes ; then
+cf_cv_func_gettext=yes
+else
+cf_cv_func_gettext=no
+fi
 
-test "$prefix" != /opt && \
-test -d /opt && {
-	test -n "$verbose" && echo "	... testing 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"
-	test -d /opt/lib/intl/lib &&       cf_search="$cf_search /opt/lib/intl/lib"
-	test -d /opt/intl/lib &&          cf_search="$cf_search /opt/intl/lib"
-	test -d /opt/intl/lib/intl &&       cf_search="$cf_search /opt/intl/lib/intl"
-}
+fi
+echo "$as_me:6669: result: $cf_cv_func_gettext" >&5
+echo "${ECHO_T}$cf_cv_func_gettext" >&6
+      LIBS="$cf_save_LIBS_1"
 
-test "$prefix" != /usr && \
-test -d /usr && {
-	test -n "$verbose" && echo "	... testing 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"
-	test -d /usr/lib/intl/lib &&       cf_search="$cf_search /usr/lib/intl/lib"
-	test -d /usr/intl/lib &&          cf_search="$cf_search /usr/intl/lib"
-}
+      if test "$cf_cv_func_gettext" = yes ; then
+        cat >>confdefs.h <<\EOF
+#define HAVE_LIBINTL_H 1
+EOF
 
-cf_save_LIBS="$LIBS"
-cf_save_LDFLAGS="$LDFLAGS"
-for cf_libdir in $cf_search
-do
-	if test -d $cf_libdir ; then
-		LIBS="-lintl $cf_save_LIBS"
-		LDFLAGS="$cf_save_LDFLAGS -L$cf_libdir"
-		cat >conftest.$ac_ext <<_ACEOF
-#line 5731 "configure"
+                                        if test "$PACKAGE" != gettext; then
+
+cat >>confdefs.h <<\EOF
+#define HAVE_GETTEXT 1
+EOF
+
+if test -n "$cf_cv_header_path_intl" ; then
+  for cf_add_incdir in $cf_cv_header_path_intl
+  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 6708 "configure"
 #include "confdefs.h"
-#include <libintl.h>
-extern int _nl_msg_cat_cntr;
+#include <stdio.h>
 int
 main ()
 {
-bindtextdomain ("", "");
-return (int) gettext ("") + _nl_msg_cat_cntr
+printf("Hello")
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5745: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:6720: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5748: \$? = $ac_status" >&5
+  echo "$as_me:6723: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5751: \"$ac_try\"") >&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:6726: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5754: \$? = $ac_status" >&5
+  echo "$as_me:6729: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-
-			test -n "$verbose" && echo "	... found in $cf_libdir" 1>&6
-
-			cf_find_linkage=yes
-			break
+  :
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-
-			LIBS="$cf_save_LIBS"
-			LDFLAGS="$cf_save_LDFLAGS"
+cf_have_incdir=yes
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-	fi
-	test -n "$verbose" && echo "	... tested $cf_libdir" 1>&6
+rm -f conftest.$ac_objext conftest.$ac_ext
+			  CPPFLAGS=$cf_save_CPPFLAGS
+			fi
+		  fi
+		fi
 
-done
+		if test "$cf_have_incdir" = no ; then
+		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+echo "${as_me-configure}:6746: testing adding $cf_add_incdir to include-path ..." 1>&5
 
-if test "$cf_find_linkage" = yes ; then
-gt_cv_func_gnugettext1_libintl=yes
-else
-gt_cv_func_gnugettext1_libintl=no
+		  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
 
-	   fi
+          if test -n "$cf_cv_library_file_intl" ; then
+                                                INTLLIBS="$cf_cv_library_file_intl $LIBICONV"
 
-	   	   	   	   	   if test "$gt_cv_func_gnugettext1_libc" = "yes" \
-	      || { test "$gt_cv_func_gnugettext1_libintl" = "yes" \
-		   && test "$PACKAGE" != gettext; }; then
+if test -n "$cf_cv_library_path_intl" ; then
+  for cf_add_libdir in $cf_cv_library_path_intl
+  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
 
-cat >>confdefs.h <<\EOF
-#define HAVE_GETTEXT 1
-EOF
+echo "${as_me-configure}:6783: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+        INTLLIBS="-L$cf_add_libdir $INTLLIBS"
+      fi
+    fi
+  done
+fi
 
-	     if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
-	       	       	       	       INTLLIBS="-lintl $LIBICONV"
-	     fi
+          fi
 
-	     gt_save_LIBS="$LIBS"
-	     LIBS="$LIBS $INTLLIBS"
+          gt_save_LIBS="$LIBS"
+          LIBS="$LIBS $INTLLIBS"
 
 for ac_func in dcgettext
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:5803: checking for $ac_func" >&5
+echo "$as_me:6799: 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 5809 "configure"
+#line 6805 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -5837,16 +6833,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5840: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6836: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5843: \$? = $ac_status" >&5
+  echo "$as_me:6839: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5846: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6842: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5849: \$? = $ac_status" >&5
+  echo "$as_me:6845: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -5856,7 +6852,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:5859: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:6855: 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
@@ -5866,12 +6862,12 @@ EOF
 fi
 done
 
-	     LIBS="$gt_save_LIBS"
+          LIBS="$gt_save_LIBS"
 
-	     	     # Extract the first word of "msgfmt", so it can be a program name with args.
+                    # Extract the first word of "msgfmt", so it can be a program name with args.
 
 set dummy msgfmt; ac_word=$2
-echo "$as_me:5874: checking for $ac_word" >&5
+echo "$as_me:6870: 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
@@ -5881,8 +6877,7 @@ else
   ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
   ;;
   *)
-  if test -n "$PATH_SEPARATOR"; then PATHSEP="$PATH_SEPARATOR"; fi
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATHSEP}"
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word$ac_exeext; then
@@ -5899,16 +6894,16 @@ esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != ":"; then
-  echo "$as_me:5902: result: $MSGFMT" >&5
+  echo "$as_me:6897: result: $MSGFMT" >&5
 echo "${ECHO_T}$MSGFMT" >&6
 else
-  echo "$as_me:5905: result: no" >&5
+  echo "$as_me:6900: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-	     # Extract the first word of "gmsgfmt", so it can be a program name with args.
+          # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
-echo "$as_me:5911: checking for $ac_word" >&5
+echo "$as_me:6906: 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
@@ -5925,7 +6920,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:5928: found $ac_dir/$ac_word" >&5
+   echo "$as_me:6923: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -5937,17 +6932,17 @@ fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 
 if test -n "$GMSGFMT"; then
-  echo "$as_me:5940: result: $GMSGFMT" >&5
+  echo "$as_me:6935: result: $GMSGFMT" >&5
 echo "${ECHO_T}$GMSGFMT" >&6
 else
-  echo "$as_me:5943: result: no" >&5
+  echo "$as_me:6938: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-	     	     # Extract the first word of "xgettext", so it can be a program name with args.
+                    # Extract the first word of "xgettext", so it can be a program name with args.
 
 set dummy xgettext; ac_word=$2
-echo "$as_me:5950: checking for $ac_word" >&5
+echo "$as_me:6945: 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
@@ -5957,8 +6952,7 @@ else
   ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
   ;;
   *)
-  if test -n "$PATH_SEPARATOR"; then PATHSEP="$PATH_SEPARATOR"; fi
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATHSEP}"
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word$ac_exeext; then
@@ -5975,34 +6969,33 @@ esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
-  echo "$as_me:5978: result: $XGETTEXT" >&5
+  echo "$as_me:6972: result: $XGETTEXT" >&5
 echo "${ECHO_T}$XGETTEXT" >&6
 else
-  echo "$as_me:5981: result: no" >&5
+  echo "$as_me:6975: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-	     CATOBJEXT=.gmo
-	   fi
-
-fi
-
-        if test "$CATOBJEXT" = "NONE"; then
-	  	  	  nls_cv_use_gnu_gettext=yes
+          CATOBJEXT=.gmo
         fi
       fi
 
-      if test "$nls_cv_use_gnu_gettext" = "yes"; then
-        if test ! -d $srcdir/intl ; then
-	  { { echo "$as_me:5997: error: no NLS library is packaged with this application" >&5
+      if test "$CATOBJEXT" = "NONE"; then
+                        nls_cv_use_gnu_gettext=yes
+      fi
+    fi
+
+    if test "$nls_cv_use_gnu_gettext" = "yes"; then
+      if test ! -d $srcdir/intl ; then
+        { { echo "$as_me:6990: error: no NLS library is packaged with this application" >&5
 echo "$as_me: error: no NLS library is packaged with this application" >&2;}
    { (exit 1); exit 1; }; }
-	fi
-                INTLOBJS="\$(GETTOBJS)"
-        # Extract the first word of "msgfmt", so it can be a program name with args.
+      fi
+            INTLOBJS="\$(GETTOBJS)"
+      # Extract the first word of "msgfmt", so it can be a program name with args.
 
 set dummy msgfmt; ac_word=$2
-echo "$as_me:6005: checking for $ac_word" >&5
+echo "$as_me:6998: 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
@@ -6012,8 +7005,7 @@ else
   ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
   ;;
   *)
-  if test -n "$PATH_SEPARATOR"; then PATHSEP="$PATH_SEPARATOR"; fi
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATHSEP}"
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word$ac_exeext; then
@@ -6030,16 +7022,16 @@ esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != ":"; then
-  echo "$as_me:6033: result: $MSGFMT" >&5
+  echo "$as_me:7025: result: $MSGFMT" >&5
 echo "${ECHO_T}$MSGFMT" >&6
 else
-  echo "$as_me:6036: result: no" >&5
+  echo "$as_me:7028: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-        # Extract the first word of "gmsgfmt", so it can be a program name with args.
+      # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
-echo "$as_me:6042: checking for $ac_word" >&5
+echo "$as_me:7034: 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
@@ -6056,7 +7048,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:6059: found $ac_dir/$ac_word" >&5
+   echo "$as_me:7051: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -6068,17 +7060,17 @@ fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 
 if test -n "$GMSGFMT"; then
-  echo "$as_me:6071: result: $GMSGFMT" >&5
+  echo "$as_me:7063: result: $GMSGFMT" >&5
 echo "${ECHO_T}$GMSGFMT" >&6
 else
-  echo "$as_me:6074: result: no" >&5
+  echo "$as_me:7066: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-        # Extract the first word of "xgettext", so it can be a program name with args.
+      # Extract the first word of "xgettext", so it can be a program name with args.
 
 set dummy xgettext; ac_word=$2
-echo "$as_me:6081: checking for $ac_word" >&5
+echo "$as_me:7073: 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
@@ -6088,8 +7080,7 @@ else
   ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
   ;;
   *)
-  if test -n "$PATH_SEPARATOR"; then PATHSEP="$PATH_SEPARATOR"; fi
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATHSEP}"
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word$ac_exeext; then
@@ -6106,55 +7097,55 @@ esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
-  echo "$as_me:6109: result: $XGETTEXT" >&5
+  echo "$as_me:7100: result: $XGETTEXT" >&5
 echo "${ECHO_T}$XGETTEXT" >&6
 else
-  echo "$as_me:6112: result: no" >&5
+  echo "$as_me:7103: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-	BUILD_INCLUDED_LIBINTL=yes
-	USE_INCLUDED_LIBINTL=yes
-        CATOBJEXT=.gmo
-	INTLLIBS="\$(top_builddir)/intl/libintl.a $LIBICONV"
-	LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
-      fi
+      BUILD_INCLUDED_LIBINTL=yes
+      USE_INCLUDED_LIBINTL=yes
+      CATOBJEXT=.gmo
+      INTLLIBS="\$(top_builddir)/intl/libintl.a $LIBICONV"
+      LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
+    fi
 
-                  if test "$GMSGFMT" != ":"; then
-			if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then
-	  : ;
-	else
-	  echo "$as_me:6127: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
+            if test "$GMSGFMT" != ":"; then
+                  if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then
+        : ;
+      else
+        echo "$as_me:7118: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
 echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6
-	  GMSGFMT=":"
-	fi
+        GMSGFMT=":"
       fi
+    fi
 
-                  if test "$XGETTEXT" != ":"; then
-			if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then
-	  : ;
-	else
-	  echo "$as_me:6137: result: found xgettext program is not GNU xgettext; ignore it" >&5
+            if test "$XGETTEXT" != ":"; then
+                      if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then
+        : ;
+      else
+        echo "$as_me:7128: result: found xgettext program is not GNU xgettext; ignore it" >&5
 echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6
-	  XGETTEXT=":"
-	fi
+        XGETTEXT=":"
       fi
-
-            POSUB=po
     fi
 
-    ac_config_commands="$ac_config_commands default-1"
+        POSUB=po
+  fi
 
-            if test "$PACKAGE" = gettext; then
-      BUILD_INCLUDED_LIBINTL=yes
-    fi
+  ac_config_commands="$ac_config_commands default-1"
 
-                                            if test "$nls_cv_use_gnu_gettext" = "yes"; then
+      if test "$PACKAGE" = gettext; then
+    BUILD_INCLUDED_LIBINTL=yes
+  fi
+
+                      if test "$nls_cv_use_gnu_gettext" = "yes"; then
     for ac_prog in bison
 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:6157: checking for $ac_word" >&5
+echo "$as_me:7148: 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
@@ -6169,7 +7160,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:6172: found $ac_dir/$ac_word" >&5
+echo "$as_me:7163: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -6177,10 +7168,10 @@ fi
 fi
 INTLBISON=$ac_cv_prog_INTLBISON
 if test -n "$INTLBISON"; then
-  echo "$as_me:6180: result: $INTLBISON" >&5
+  echo "$as_me:7171: result: $INTLBISON" >&5
 echo "${ECHO_T}$INTLBISON" >&6
 else
-  echo "$as_me:6183: result: no" >&5
+  echo "$as_me:7174: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -6190,7 +7181,7 @@ done
     if test -z "$INTLBISON"; then
       ac_verc_fail=yes
     else
-            echo "$as_me:6193: checking version of bison" >&5
+            echo "$as_me:7184: 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
@@ -6199,33 +7190,33 @@ 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:6202: result: $ac_prog_version" >&5
+    echo "$as_me:7193: result: $ac_prog_version" >&5
 echo "${ECHO_T}$ac_prog_version" >&6
     fi
     if test $ac_verc_fail = yes; then
       INTLBISON=:
     fi
-    fi
+  fi
 
-                for lang in $ALL_LINGUAS; do
-      GMOFILES="$GMOFILES $lang.gmo"
-      POFILES="$POFILES $lang.po"
-    done
+        for lang in $ALL_LINGUAS; do
+    GMOFILES="$GMOFILES $lang.gmo"
+    POFILES="$POFILES $lang.po"
+  done
 
-        nls_cv_header_intl=
-    nls_cv_header_libgt=
+    nls_cv_header_intl=
+  nls_cv_header_libgt=
 
-        DATADIRNAME=share
+    DATADIRNAME=share
 
-        INSTOBJEXT=.mo
+    INSTOBJEXT=.mo
 
-        GENCAT=gencat
+    GENCAT=gencat
 
    if test "x$CATOBJEXT" != "x"; then
      if test "x$ALL_LINGUAS" = "x"; then
        LINGUAS=
      else
-       echo "$as_me:6228: checking for catalogs to be installed" >&5
+       echo "$as_me:7219: 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
@@ -6245,7 +7236,7 @@ echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
          fi
        done
        LINGUAS=$NEW_LINGUAS
-       echo "$as_me:6248: result: $LINGUAS" >&5
+       echo "$as_me:7239: result: $LINGUAS" >&5
 echo "${ECHO_T}$LINGUAS" >&6
      fi
 
@@ -6278,7 +7269,7 @@ cf_makefile=makefile
 use_our_messages=no
 if test "$USE_NLS" = yes ; then
 if test -d $srcdir/po ; then
-echo "$as_me:6281: checking if we should use included message-library" >&5
+echo "$as_me:7272: 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.
@@ -6289,7 +7280,7 @@ else
   use_our_messages=yes
 fi;
 fi
-echo "$as_me:6292: result: $use_our_messages" >&5
+echo "$as_me:7283: result: $use_our_messages" >&5
 echo "${ECHO_T}$use_our_messages" >&6
 fi
 
@@ -6330,23 +7321,23 @@ else
 for ac_header in libintl.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6333: checking for $ac_header" >&5
+echo "$as_me:7324: 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 6339 "configure"
+#line 7330 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:6343: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7334: \"$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:6349: \$? = $ac_status" >&5
+  echo "$as_me:7340: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6365,7 +7356,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:6368: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:7359: 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
@@ -6379,7 +7370,7 @@ done
 fi
 
 if test -z "$INTLDIR_MAKE" ; then
-	CPPFLAGS="-I../intl $CPPFLAGS"
+	CPPFLAGS="$CPPFLAGS -I../intl"
 fi
 
 if test "$BUILD_INCLUDED_LIBINTL" = yes ; then
@@ -6410,14 +7401,14 @@ EOF
 	fi
 fi
 
-echo "$as_me:6413: checking if -lm needed for math functions" >&5
+echo "$as_me:7404: 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 6420 "configure"
+#line 7411 "configure"
 #include "confdefs.h"
 
 	#include <stdio.h>
@@ -6432,16 +7423,16 @@ double x = rand(); printf("result = %g\n", sqrt(x))
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6435: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7426: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6438: \$? = $ac_status" >&5
+  echo "$as_me:7429: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6441: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7432: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6444: \$? = $ac_status" >&5
+  echo "$as_me:7435: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_libm=no
 else
@@ -6451,16 +7442,16 @@ cf_cv_need_libm=yes
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6454: result: $cf_cv_need_libm" >&5
+echo "$as_me:7445: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 if test "$cf_cv_need_libm" = yes
 then
 
-	LIBS="$LIBS -lm"
+	LIBS="-lm $LIBS"
 
 fi
 
-echo "$as_me:6463: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:7454: 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.
@@ -6476,7 +7467,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:6479: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:7470: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case .$with_cflags in #(vi
@@ -6502,8 +7493,8 @@ no)
 			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
 
 			test "${cf_add_cflags}" != "${cf_tst_cflags}" \
-			&& test -z "${cf_tst_cflags}" \
-			&& cf_fix_cppflags=yes
+				&& test -z "${cf_tst_cflags}" \
+				&& cf_fix_cppflags=yes
 
 			if test $cf_fix_cppflags = yes ; then
 				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
@@ -6518,6 +7509,16 @@ no)
 		*$cf_add_cflags) #(vi
 			;;
 		*) #(vi
+			case $cf_add_cflags in #(vi
+			-D*)
+				cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
+
+CPPFLAGS=`echo "$CPPFLAGS" | \
+	sed	-e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ 	]*\)\?[ 	]/ /g' \
+		-e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ 	]*\)\?$//g'`
+
+				;;
+			esac
 			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
 			;;
 		esac
@@ -6533,8 +7534,8 @@ yes)
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
 	test "${cf_add_cflags}" != "${cf_tst_cflags}" \
-	&& test -z "${cf_tst_cflags}" \
-	&& cf_fix_cppflags=no
+		&& test -z "${cf_tst_cflags}" \
+		&& cf_fix_cppflags=no
 	;;
 esac
 done
@@ -6546,7 +7547,7 @@ fi
 
 if test -n "$cf_new_cppflags" ; then
 
-	CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
+	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
@@ -6560,23 +7561,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:6563: checking for dmalloc.h" >&5
+	echo "$as_me:7564: 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 6569 "configure"
+#line 7570 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:6573: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7574: \"$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:6579: \$? = $ac_status" >&5
+  echo "$as_me:7580: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6595,11 +7596,11 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:6598: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:7599: 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:6602: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:7603: 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
@@ -6607,7 +7608,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6610 "configure"
+#line 7611 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6626,16 +7627,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6629: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7630: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6632: \$? = $ac_status" >&5
+  echo "$as_me:7633: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6635: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7636: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6638: \$? = $ac_status" >&5
+  echo "$as_me:7639: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -6646,7 +7647,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6649: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:7650: 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
@@ -6661,7 +7662,7 @@ fi
 
 fi
 
-echo "$as_me:6664: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:7665: 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.
@@ -6677,7 +7678,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:6680: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:7681: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case .$with_cflags in #(vi
@@ -6703,8 +7704,8 @@ no)
 			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
 
 			test "${cf_add_cflags}" != "${cf_tst_cflags}" \
-			&& test -z "${cf_tst_cflags}" \
-			&& cf_fix_cppflags=yes
+				&& test -z "${cf_tst_cflags}" \
+				&& cf_fix_cppflags=yes
 
 			if test $cf_fix_cppflags = yes ; then
 				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
@@ -6719,6 +7720,16 @@ no)
 		*$cf_add_cflags) #(vi
 			;;
 		*) #(vi
+			case $cf_add_cflags in #(vi
+			-D*)
+				cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
+
+CPPFLAGS=`echo "$CPPFLAGS" | \
+	sed	-e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ 	]*\)\?[ 	]/ /g' \
+		-e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ 	]*\)\?$//g'`
+
+				;;
+			esac
 			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
 			;;
 		esac
@@ -6734,8 +7745,8 @@ yes)
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
 	test "${cf_add_cflags}" != "${cf_tst_cflags}" \
-	&& test -z "${cf_tst_cflags}" \
-	&& cf_fix_cppflags=no
+		&& test -z "${cf_tst_cflags}" \
+		&& cf_fix_cppflags=no
 	;;
 esac
 done
@@ -6747,7 +7758,7 @@ fi
 
 if test -n "$cf_new_cppflags" ; then
 
-	CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
+	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
@@ -6761,23 +7772,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:6764: checking for dbmalloc.h" >&5
+	echo "$as_me:7775: 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 6770 "configure"
+#line 7781 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:6774: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7785: \"$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:6780: \$? = $ac_status" >&5
+  echo "$as_me:7791: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6796,11 +7807,11 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:6799: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:7810: 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:6803: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:7814: 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
@@ -6808,7 +7819,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6811 "configure"
+#line 7822 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6827,16 +7838,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6830: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7841: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6833: \$? = $ac_status" >&5
+  echo "$as_me:7844: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6836: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7847: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6839: \$? = $ac_status" >&5
+  echo "$as_me:7850: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -6847,7 +7858,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6850: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:7861: 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
@@ -6862,7 +7873,7 @@ fi
 
 fi
 
-echo "$as_me:6865: checking if you want to use purify for testing" >&5
+echo "$as_me:7876: 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.
@@ -6878,7 +7889,7 @@ EOF
 else
   with_purify=
 fi;
-echo "$as_me:6881: result: ${with_purify:-no}" >&5
+echo "$as_me:7892: result: ${with_purify:-no}" >&5
 echo "${ECHO_T}${with_purify:-no}" >&6
 
 case .$with_cflags in #(vi
@@ -6904,8 +7915,8 @@ no)
 			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
 
 			test "${cf_add_cflags}" != "${cf_tst_cflags}" \
-			&& test -z "${cf_tst_cflags}" \
-			&& cf_fix_cppflags=yes
+				&& test -z "${cf_tst_cflags}" \
+				&& cf_fix_cppflags=yes
 
 			if test $cf_fix_cppflags = yes ; then
 				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
@@ -6920,6 +7931,16 @@ no)
 		*$cf_add_cflags) #(vi
 			;;
 		*) #(vi
+			case $cf_add_cflags in #(vi
+			-D*)
+				cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
+
+CPPFLAGS=`echo "$CPPFLAGS" | \
+	sed	-e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ 	]*\)\?[ 	]/ /g' \
+		-e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ 	]*\)\?$//g'`
+
+				;;
+			esac
 			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
 			;;
 		esac
@@ -6935,8 +7956,8 @@ yes)
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
 	test "${cf_add_cflags}" != "${cf_tst_cflags}" \
-	&& test -z "${cf_tst_cflags}" \
-	&& cf_fix_cppflags=no
+		&& test -z "${cf_tst_cflags}" \
+		&& cf_fix_cppflags=no
 	;;
 esac
 done
@@ -6948,7 +7969,7 @@ fi
 
 if test -n "$cf_new_cppflags" ; then
 
-	CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
+	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
@@ -6961,7 +7982,7 @@ fi
 	;;
 esac
 
-echo "$as_me:6964: checking if you want to use valgrind for testing" >&5
+echo "$as_me:7985: 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.
@@ -6977,7 +7998,7 @@ EOF
 else
   with_valgrind=
 fi;
-echo "$as_me:6980: result: ${with_valgrind:-no}" >&5
+echo "$as_me:8001: result: ${with_valgrind:-no}" >&5
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case .$with_cflags in #(vi
@@ -7003,8 +8024,8 @@ no)
 			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
 
 			test "${cf_add_cflags}" != "${cf_tst_cflags}" \
-			&& test -z "${cf_tst_cflags}" \
-			&& cf_fix_cppflags=yes
+				&& test -z "${cf_tst_cflags}" \
+				&& cf_fix_cppflags=yes
 
 			if test $cf_fix_cppflags = yes ; then
 				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
@@ -7019,6 +8040,16 @@ no)
 		*$cf_add_cflags) #(vi
 			;;
 		*) #(vi
+			case $cf_add_cflags in #(vi
+			-D*)
+				cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
+
+CPPFLAGS=`echo "$CPPFLAGS" | \
+	sed	-e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ 	]*\)\?[ 	]/ /g' \
+		-e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ 	]*\)\?$//g'`
+
+				;;
+			esac
 			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
 			;;
 		esac
@@ -7034,8 +8065,8 @@ yes)
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
 	test "${cf_add_cflags}" != "${cf_tst_cflags}" \
-	&& test -z "${cf_tst_cflags}" \
-	&& cf_fix_cppflags=no
+		&& test -z "${cf_tst_cflags}" \
+		&& cf_fix_cppflags=no
 	;;
 esac
 done
@@ -7047,7 +8078,7 @@ fi
 
 if test -n "$cf_new_cppflags" ; then
 
-	CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
+	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
@@ -7060,7 +8091,7 @@ fi
 	;;
 esac
 
-echo "$as_me:7063: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:8094: 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.
@@ -7082,10 +8113,10 @@ EOF
 else
   with_no_leaks=
 fi;
-echo "$as_me:7085: result: $with_no_leaks" >&5
+echo "$as_me:8116: result: $with_no_leaks" >&5
 echo "${ECHO_T}$with_no_leaks" >&6
 
-echo "$as_me:7088: checking if you want --trace option" >&5
+echo "$as_me:8119: 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.
@@ -7095,7 +8126,7 @@ if test "${enable_trace+set}" = set; then
 else
   enableval=yes
 fi;
-echo "$as_me:7098: result: $enableval" >&5
+echo "$as_me:8129: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 if test "$enableval" != no ; then
 EXTRAOBJS="$EXTRAOBJS trace\$o"
@@ -7125,7 +8156,7 @@ LIB_LINK='${CC}'
 LIB_INSTALL=
 LIB_UNINSTALL=
 
-echo "$as_me:7128: checking if you want to build libraries with libtool" >&5
+echo "$as_me:8159: 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.
@@ -7135,11 +8166,11 @@ if test "${with_libtool+set}" = set; then
 else
   with_libtool=no
 fi;
-echo "$as_me:7138: result: $with_libtool" >&5
+echo "$as_me:8169: result: $with_libtool" >&5
 echo "${ECHO_T}$with_libtool" >&6
 if test "$with_libtool" != "no"; then
 
- 	if test "$with_libtool" != "yes" ; then
+	if test "$with_libtool" != "yes" ; then
 
 if test "x$prefix" != xNONE; then
   cf_path_syntax="$prefix"
@@ -7166,7 +8197,7 @@ case ".$with_libtool" in #(vi
   with_libtool=`echo $with_libtool | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:7169: error: expected a pathname, not \"$with_libtool\"" >&5
+  { { echo "$as_me:8200: error: expected a pathname, not \"$with_libtool\"" >&5
 echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -7174,9 +8205,9 @@ esac
 
 		LIBTOOL=$with_libtool
 	else
- 		# Extract the first word of "libtool", so it can be a program name with args.
+		# Extract the first word of "libtool", so it can be a program name with args.
 set dummy libtool; ac_word=$2
-echo "$as_me:7179: checking for $ac_word" >&5
+echo "$as_me:8210: 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
@@ -7193,7 +8224,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:7196: found $ac_dir/$ac_word" >&5
+   echo "$as_me:8227: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -7204,20 +8235,20 @@ fi
 LIBTOOL=$ac_cv_path_LIBTOOL
 
 if test -n "$LIBTOOL"; then
-  echo "$as_me:7207: result: $LIBTOOL" >&5
+  echo "$as_me:8238: result: $LIBTOOL" >&5
 echo "${ECHO_T}$LIBTOOL" >&6
 else
-  echo "$as_me:7210: result: no" >&5
+  echo "$as_me:8241: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
- 	fi
- 	if test -z "$LIBTOOL" ; then
- 		{ { echo "$as_me:7216: error: Cannot find libtool" >&5
+	fi
+	if test -z "$LIBTOOL" ; then
+		{ { echo "$as_me:8247: 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} -o'
+	fi
+	LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} -o'
 	LIB_OBJECT='${OBJECTS:.o=.lo}'
 	LIB_SUFFIX=.la
 	LIB_CLEAN='${LIBTOOL} --mode=clean'
@@ -7228,25 +8259,34 @@ echo "$as_me: error: Cannot find libtool" >&2;}
 	LIB_PREP=:
 
 	# Show the version of libtool
-	echo "$as_me:7231: checking version of libtool" >&5
+	echo "$as_me:8262: 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.
+	# 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:7238: result: $cf_cv_libtool_version" >&5
+	echo "$as_me:8269: 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:7241: error: This is not GNU libtool" >&5
+		{ { echo "$as_me:8272: error: This is not GNU libtool" >&5
 echo "$as_me: error: This is not GNU libtool" >&2;}
    { (exit 1); exit 1; }; }
 	fi
 
+	# special hack to add -no-undefined (which libtool should do for itself)
+	LT_UNDEF=
+	case "$cf_cv_system_name" in #(vi
+	cygwin*|mingw32*|uwin*|aix[456]) #(vi
+		LT_UNDEF=-no-undefined
+		;;
+	esac
+
 	# special hack to add --tag option for C++ compiler
-	case $cf_cv_libtool_version in
-	1.[5-9]*|[2-9]*)
+	case $cf_cv_libtool_version in #(vi
+	1.[5-9]*|[2-9].[0-9.a-z]*) #(vi
 		LIBTOOL_CXX="$LIBTOOL --tag=CXX"
+		LIBTOOL="$LIBTOOL --tag=CC"
 		;;
 	*)
 		LIBTOOL_CXX="$LIBTOOL"
@@ -7263,7 +8303,7 @@ if test "$with_libtool" = "yes" ; then
 	OBJEXT="lo"
 	LIBTOOL_MAKE=
 
-echo "$as_me:7266: checking for additional libtool options" >&5
+echo "$as_me:8306: 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.
@@ -7273,7 +8313,7 @@ if test "${with_libtool_opts+set}" = set; then
 else
   with_libtool_opts=no
 fi;
-echo "$as_me:7276: result: $with_libtool_opts" >&5
+echo "$as_me:8316: result: $with_libtool_opts" >&5
 echo "${ECHO_T}$with_libtool_opts" >&6
 
 case .$with_libtool_opts in
@@ -7303,7 +8343,7 @@ if test $use_ncurses != no ; then
 	cf_wide_curses=yes
 	if test $use_ncurses = ncursesw ; then
 
-echo "$as_me:7306: checking for multibyte character support" >&5
+echo "$as_me:8346: 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
@@ -7311,7 +8351,7 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 7314 "configure"
+#line 8354 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -7324,24 +8364,31 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7327: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8367: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7330: \$? = $ac_status" >&5
+  echo "$as_me:8370: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7333: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8373: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7336: \$? = $ac_status" >&5
+  echo "$as_me:8376: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_utf8_lib=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-LIBS="-lutf8 $LIBS"
-	 cat >conftest.$ac_ext <<_ACEOF
-#line 7344 "configure"
+
+# If the linkage is not already in the $CPPFLAGS/$LDFLAGS configuration, these
+# will be set on completion of the AC_TRY_LINK below.
+cf_cv_header_path_utf8=
+cf_cv_library_path_utf8=
+
+echo "${as_me-configure}:8388: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+
+cat >conftest.$ac_ext <<_ACEOF
+#line 8391 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -7354,30 +8401,354 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7357: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8404: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7360: \$? = $ac_status" >&5
+  echo "$as_me:8407: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7363: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8410: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7366: \$? = $ac_status" >&5
+  echo "$as_me:8413: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  cf_cv_utf8_lib=add-on
+  cf_cv_find_linkage_utf8=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-cf_cv_utf8_lib=no
+
+    cf_cv_find_linkage_utf8=no
+
+    test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
+
+echo "${as_me-configure}:8424: testing find linkage for utf8 library ..." 1>&5
+
+echo "${as_me-configure}:8426: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+
+    cf_save_CPPFLAGS="$CPPFLAGS"
+    cf_test_CPPFLAGS="$CPPFLAGS"
+
+cf_search=
+cf_header_path_list=""
+if test -n "${CFLAGS}${CPPFLAGS}" ; then
+	for cf_header_path in $CPPFLAGS $CFLAGS
+	do
+		case $cf_header_path in #(vi
+		-I*)
+			cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
+
+test "$cf_header_path" != "NONE" && \
+test -d "$cf_header_path" && \
+ {
+	test -n "$verbose" && echo "	... testing for include-directories under $cf_header_path"
+	test -d $cf_header_path/include &&          cf_search="$cf_search $cf_header_path/include"
+	test -d $cf_header_path/include/utf8 &&       cf_search="$cf_search $cf_header_path/include/utf8"
+	test -d $cf_header_path/include/utf8/include &&    cf_search="$cf_search $cf_header_path/include/utf8/include"
+	test -d $cf_header_path/utf8/include &&       cf_search="$cf_search $cf_header_path/utf8/include"
+	test -d $cf_header_path/utf8/include/utf8 &&    cf_search="$cf_search $cf_header_path/utf8/include/utf8"
+}
+
+			cf_header_path_list="$cf_header_path_list $cf_search"
+			;;
+		esac
+	done
+fi
+
+cf_search=""
+
+test "/usr" != "$prefix" && \
+test -d "/usr" && \
+(test $prefix = NONE || test -d $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"
+	test -d /usr/include/utf8/include &&    cf_search="$cf_search /usr/include/utf8/include"
+	test -d /usr/utf8/include &&       cf_search="$cf_search /usr/utf8/include"
+	test -d /usr/utf8/include/utf8 &&    cf_search="$cf_search /usr/utf8/include/utf8"
+}
+
+test "$prefix" != "NONE" && \
+test -d "$prefix" && \
+ {
+	test -n "$verbose" && echo "	... testing for include-directories under $prefix"
+	test -d $prefix/include &&          cf_search="$cf_search $prefix/include"
+	test -d $prefix/include/utf8 &&       cf_search="$cf_search $prefix/include/utf8"
+	test -d $prefix/include/utf8/include &&    cf_search="$cf_search $prefix/include/utf8/include"
+	test -d $prefix/utf8/include &&       cf_search="$cf_search $prefix/utf8/include"
+	test -d $prefix/utf8/include/utf8 &&    cf_search="$cf_search $prefix/utf8/include/utf8"
+}
+
+test "/usr/local" != "$prefix" && \
+test -d "/usr/local" && \
+(test $prefix = NONE || test -d $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"
+	test -d /usr/local/include/utf8/include &&    cf_search="$cf_search /usr/local/include/utf8/include"
+	test -d /usr/local/utf8/include &&       cf_search="$cf_search /usr/local/utf8/include"
+	test -d /usr/local/utf8/include/utf8 &&    cf_search="$cf_search /usr/local/utf8/include/utf8"
+}
+
+test "/opt" != "$prefix" && \
+test -d "/opt" && \
+(test $prefix = NONE || test -d $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"
+	test -d /opt/include/utf8/include &&    cf_search="$cf_search /opt/include/utf8/include"
+	test -d /opt/utf8/include &&       cf_search="$cf_search /opt/utf8/include"
+	test -d /opt/utf8/include/utf8 &&    cf_search="$cf_search /opt/utf8/include/utf8"
+}
+
+test "$HOME" != "$prefix" && \
+test -d "$HOME" && \
+(test $prefix = NONE || test -d $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"
+	test -d $HOME/include/utf8/include &&    cf_search="$cf_search $HOME/include/utf8/include"
+	test -d $HOME/utf8/include &&       cf_search="$cf_search $HOME/utf8/include"
+	test -d $HOME/utf8/include/utf8 &&    cf_search="$cf_search $HOME/utf8/include/utf8"
+}
+
+test "$includedir" != NONE && \
+test "$includedir" != "/usr/include" && \
+test -d "$includedir" && {
+	test -d $includedir &&    cf_search="$cf_search $includedir"
+	test -d $includedir/utf8 && cf_search="$cf_search $includedir/utf8"
+}
+
+test "$oldincludedir" != NONE && \
+test "$oldincludedir" != "/usr/include" && \
+test -d "$oldincludedir" && {
+	test -d $oldincludedir    && cf_search="$cf_search $oldincludedir"
+	test -d $oldincludedir/utf8 && cf_search="$cf_search $oldincludedir/utf8"
+}
+
+cf_search="$cf_header_path_list $cf_search"
+
+    for cf_cv_header_path_utf8 in $cf_search
+    do
+      if test -d $cf_cv_header_path_utf8 ; then
+        test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
+
+echo "${as_me-configure}:8535: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+
+        CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8"
+        cat >conftest.$ac_ext <<_ACEOF
+#line 8539 "configure"
+#include "confdefs.h"
+
+#include <libutf8.h>
+int
+main ()
+{
+putwc(0,0);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:8552: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:8555: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:8558: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:8561: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+            test -n "$verbose" && echo "	... found utf8 headers in $cf_cv_header_path_utf8" 1>&6
+
+echo "${as_me-configure}:8566: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+
+            cf_cv_find_linkage_utf8=maybe
+            cf_test_CPPFLAGS="$CPPFLAGS"
+            break
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+
+            CPPFLAGS="$cf_save_CPPFLAGS"
+
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+      fi
+    done
+
+    if test "$cf_cv_find_linkage_utf8" = maybe ; then
+
+echo "${as_me-configure}:8584: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+
+      cf_save_LIBS="$LIBS"
+      cf_save_LDFLAGS="$LDFLAGS"
+
+      if test "$cf_cv_find_linkage_utf8" != yes ; then
+
+cf_library_path_list=""
+if test -n "${LDFLAGS}${LIBS}" ; then
+	for cf_library_path in $LDFLAGS $LIBS
+	do
+		case $cf_library_path in #(vi
+		-L*)
+			cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
+
+test "$cf_library_path" != "NONE" && \
+test -d "$cf_library_path" && \
+ {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_library_path"
+	test -d $cf_library_path/lib &&          cf_search="$cf_search $cf_library_path/lib"
+	test -d $cf_library_path/lib/utf8 &&       cf_search="$cf_search $cf_library_path/lib/utf8"
+	test -d $cf_library_path/lib/utf8/lib &&    cf_search="$cf_search $cf_library_path/lib/utf8/lib"
+	test -d $cf_library_path/utf8/lib &&       cf_search="$cf_search $cf_library_path/utf8/lib"
+	test -d $cf_library_path/utf8/lib/utf8 &&    cf_search="$cf_search $cf_library_path/utf8/lib/utf8"
+}
+
+			cf_library_path_list="$cf_library_path_list $cf_search"
+			;;
+		esac
+	done
+fi
+
+cf_search=""
+
+test "/usr" != "$prefix" && \
+test -d "/usr" && \
+(test $prefix = NONE || test -d $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"
+	test -d /usr/lib/utf8/lib &&    cf_search="$cf_search /usr/lib/utf8/lib"
+	test -d /usr/utf8/lib &&       cf_search="$cf_search /usr/utf8/lib"
+	test -d /usr/utf8/lib/utf8 &&    cf_search="$cf_search /usr/utf8/lib/utf8"
+}
+
+test "$prefix" != "NONE" && \
+test -d "$prefix" && \
+ {
+	test -n "$verbose" && echo "	... testing for lib-directories under $prefix"
+	test -d $prefix/lib &&          cf_search="$cf_search $prefix/lib"
+	test -d $prefix/lib/utf8 &&       cf_search="$cf_search $prefix/lib/utf8"
+	test -d $prefix/lib/utf8/lib &&    cf_search="$cf_search $prefix/lib/utf8/lib"
+	test -d $prefix/utf8/lib &&       cf_search="$cf_search $prefix/utf8/lib"
+	test -d $prefix/utf8/lib/utf8 &&    cf_search="$cf_search $prefix/utf8/lib/utf8"
+}
+
+test "/usr/local" != "$prefix" && \
+test -d "/usr/local" && \
+(test $prefix = NONE || test -d $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"
+	test -d /usr/local/lib/utf8/lib &&    cf_search="$cf_search /usr/local/lib/utf8/lib"
+	test -d /usr/local/utf8/lib &&       cf_search="$cf_search /usr/local/utf8/lib"
+	test -d /usr/local/utf8/lib/utf8 &&    cf_search="$cf_search /usr/local/utf8/lib/utf8"
+}
+
+test "/opt" != "$prefix" && \
+test -d "/opt" && \
+(test $prefix = NONE || test -d $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"
+	test -d /opt/lib/utf8/lib &&    cf_search="$cf_search /opt/lib/utf8/lib"
+	test -d /opt/utf8/lib &&       cf_search="$cf_search /opt/utf8/lib"
+	test -d /opt/utf8/lib/utf8 &&    cf_search="$cf_search /opt/utf8/lib/utf8"
+}
+
+test "$HOME" != "$prefix" && \
+test -d "$HOME" && \
+(test $prefix = NONE || test -d $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"
+	test -d $HOME/lib/utf8/lib &&    cf_search="$cf_search $HOME/lib/utf8/lib"
+	test -d $HOME/utf8/lib &&       cf_search="$cf_search $HOME/utf8/lib"
+	test -d $HOME/utf8/lib/utf8 &&    cf_search="$cf_search $HOME/utf8/lib/utf8"
+}
+
+cf_search="$cf_library_path_list $cf_search"
+
+        for cf_cv_library_path_utf8 in $cf_search
+        do
+          if test -d $cf_cv_library_path_utf8 ; then
+            test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
+
+echo "${as_me-configure}:8680: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+
+            CPPFLAGS="$cf_test_CPPFLAGS"
+            LIBS="-lutf8  $cf_save_LIBS"
+            LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8"
+            cat >conftest.$ac_ext <<_ACEOF
+#line 8686 "configure"
+#include "confdefs.h"
+
+#include <libutf8.h>
+int
+main ()
+{
+putwc(0,0);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:8699: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:8702: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:8705: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:8708: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+                test -n "$verbose" && echo "	... found utf8 library in $cf_cv_library_path_utf8" 1>&6
+
+echo "${as_me-configure}:8713: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+
+                cf_cv_find_linkage_utf8=yes
+                cf_cv_library_file_utf8="-lutf8"
+                break
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+
+                CPPFLAGS="$cf_save_CPPFLAGS"
+                LIBS="$cf_save_LIBS"
+                LDFLAGS="$cf_save_LDFLAGS"
+
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-	LIBS="$cf_save_LIBS"
+          fi
+        done
+        LIBS="$cf_save_LIBS"
+        CPPFLAGS="$cf_save_CPPFLAGS"
+        LDFLAGS="$cf_save_LDFLAGS"
+      fi
+
+    else
+      cf_cv_find_linkage_utf8=no
+    fi
+
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+
+if test "$cf_cv_find_linkage_utf8" = yes ; then
+cf_cv_utf8_lib=add-on
+else
+cf_cv_utf8_lib=no
+fi
 
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7380: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:8751: 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
@@ -7387,6 +8758,110 @@ if test "$cf_cv_utf8_lib" = "add-on" ; then
 #define HAVE_LIBUTF8_H 1
 EOF
 
+if test -n "$cf_cv_header_path_utf8" ; then
+  for cf_add_incdir in $cf_cv_header_path_utf8
+  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 8785 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+int
+main ()
+{
+printf("Hello")
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:8797: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:8800: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:8803: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:8806: \$? = $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}:8823: 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_library_path_utf8" ; then
+  for cf_add_libdir in $cf_cv_library_path_utf8
+  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}:8857: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+      fi
+    fi
+  done
+fi
+
 	LIBS="-lutf8 $LIBS"
 fi
 
@@ -7421,7 +8896,7 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:7424: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:8899: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -7439,7 +8914,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:7442: checking for $ac_word" >&5
+echo "$as_me:8917: 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
@@ -7456,7 +8931,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:7459: found $ac_dir/$ac_word" >&5
+   echo "$as_me:8934: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -7467,10 +8942,10 @@ fi
 NCURSES_CONFIG=$ac_cv_path_NCURSES_CONFIG
 
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:7470: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:8945: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:7473: result: no" >&5
+  echo "$as_me:8948: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -7482,7 +8957,7 @@ if test "$NCURSES_CONFIG" != none ; then
 
 cf_cv_ncurses_header=curses.h
 
-CPPFLAGS="`$NCURSES_CONFIG --cflags` $CPPFLAGS"
+CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`"
 LIBS="`$NCURSES_CONFIG --libs` $LIBS"
 
 cat >>confdefs.h <<\EOF
@@ -7502,10 +8977,88 @@ else
 cf_ncuhdr_root=$use_ncurses
 
 test -n "$cf_cv_curses_dir" && \
-test "$cf_cv_curses_dir" != "no" && \
-CPPFLAGS="-I$cf_cv_curses_dir/include -I$cf_cv_curses_dir/include/$cf_ncuhdr_root $CPPFLAGS"
+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
+  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 9006 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+int
+main ()
+{
+printf("Hello")
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:9018: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:9021: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:9024: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:9027: \$? = $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:7508: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "${as_me-configure}:9044: 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
+
+}
+
+echo "$as_me:9061: 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
@@ -7517,7 +9070,7 @@ else
 	do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 7520 "configure"
+#line 9073 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -7541,16 +9094,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7544: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9097: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7547: \$? = $ac_status" >&5
+  echo "$as_me:9100: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7550: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9103: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7553: \$? = $ac_status" >&5
+  echo "$as_me:9106: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -7565,50 +9118,64 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 	done
 
 fi
-echo "$as_me:7568: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:9121: 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:7575: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:9128: 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
 else
 
 	test -n "$verbose" && echo
-	cf_search=""
 
-test -d "$HOME" && {
-	test -n "$verbose" && echo "	... testing 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"
-	test -d "$HOME/include/$cf_ncuhdr_root/include" &&    cf_search="$cf_search $HOME/include/$cf_ncuhdr_root/include"
-}
-
-# For other stuff under the home directory, it should be sufficient to put
-# a symbolic link for $HOME/$cf_ncuhdr_root to the actual package location:
-test -d "$HOME/$cf_ncuhdr_root" && {
-	test -n "$verbose" && echo "	... testing include-directories under $HOME/$cf_ncuhdr_root"
-	test -d "$HOME/$cf_ncuhdr_root/include" &&       cf_search="$cf_search $HOME/$cf_ncuhdr_root/include"
-	test -d "$HOME/$cf_ncuhdr_root/include/$cf_ncuhdr_root" &&    cf_search="$cf_search $HOME/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
-}
+cf_search=
+cf_header_path_list=""
+if test -n "${CFLAGS}${CPPFLAGS}" ; then
+	for cf_header_path in $CPPFLAGS $CFLAGS
+	do
+		case $cf_header_path in #(vi
+		-I*)
+			cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
+
+test "$cf_header_path" != "NONE" && \
+test -d "$cf_header_path" && \
+ {
+	test -n "$verbose" && echo "	... testing for include-directories under $cf_header_path"
+	test -d $cf_header_path/include &&          cf_search="$cf_search $cf_header_path/include"
+	test -d $cf_header_path/include/$cf_ncuhdr_root &&       cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root"
+	test -d $cf_header_path/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root/include"
+	test -d $cf_header_path/$cf_ncuhdr_root/include &&       cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include"
+	test -d $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
+}
+
+			cf_header_path_list="$cf_header_path_list $cf_search"
+			;;
+		esac
+	done
+fi
 
-test "$prefix" != /usr/local && \
-test -d /usr/local && {
-	test -n "$verbose" && echo "	... testing 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"
-	test -d /usr/local/include/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root/include"
-	test -d /usr/local/$cf_ncuhdr_root/include &&    cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include"
-	test -d /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
-}
+cf_search=""
 
-test "$prefix" != NONE && \
-test -d $prefix && {
-	test -n "$verbose" && echo "	... testing include-directories under $prefix"
+test "/usr" != "$prefix" && \
+test -d "/usr" && \
+(test $prefix = NONE || test -d $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"
+	test -d /usr/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search /usr/include/$cf_ncuhdr_root/include"
+	test -d /usr/$cf_ncuhdr_root/include &&       cf_search="$cf_search /usr/$cf_ncuhdr_root/include"
+	test -d /usr/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search /usr/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
+}
+
+test "$prefix" != "NONE" && \
+test -d "$prefix" && \
+ {
+	test -n "$verbose" && echo "	... testing for include-directories under $prefix"
 	test -d $prefix/include &&          cf_search="$cf_search $prefix/include"
 	test -d $prefix/include/$cf_ncuhdr_root &&       cf_search="$cf_search $prefix/include/$cf_ncuhdr_root"
 	test -d $prefix/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search $prefix/include/$cf_ncuhdr_root/include"
@@ -7616,23 +9183,37 @@ test -d $prefix && {
 	test -d $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
 }
 
-test "$prefix" != /opt && \
-test -d /opt && {
-	test -n "$verbose" && echo "	... testing 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"
-	test -d /opt/include/$cf_ncuhdr_root/include &&       cf_search="$cf_search /opt/include/$cf_ncuhdr_root/include"
-	test -d /opt/$cf_ncuhdr_root/include &&          cf_search="$cf_search /opt/$cf_ncuhdr_root/include"
-	test -d /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&       cf_search="$cf_search /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
+test "/usr/local" != "$prefix" && \
+test -d "/usr/local" && \
+(test $prefix = NONE || test -d $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"
+	test -d /usr/local/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root/include"
+	test -d /usr/local/$cf_ncuhdr_root/include &&       cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include"
+	test -d /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
 }
 
-test "$prefix" != /usr && \
-test -d /usr && {
-	test -n "$verbose" && echo "	... testing 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"
-	test -d /usr/include/$cf_ncuhdr_root/include &&       cf_search="$cf_search /usr/include/$cf_ncuhdr_root/include"
-	test -d /usr/$cf_ncuhdr_root/include &&          cf_search="$cf_search /usr/$cf_ncuhdr_root/include"
+test "/opt" != "$prefix" && \
+test -d "/opt" && \
+(test $prefix = NONE || test -d $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"
+	test -d /opt/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search /opt/include/$cf_ncuhdr_root/include"
+	test -d /opt/$cf_ncuhdr_root/include &&       cf_search="$cf_search /opt/$cf_ncuhdr_root/include"
+	test -d /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
+}
+
+test "$HOME" != "$prefix" && \
+test -d "$HOME" && \
+(test $prefix = NONE || test -d $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"
+	test -d $HOME/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search $HOME/include/$cf_ncuhdr_root/include"
+	test -d $HOME/$cf_ncuhdr_root/include &&       cf_search="$cf_search $HOME/$cf_ncuhdr_root/include"
+	test -d $HOME/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search $HOME/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
 }
 
 test "$includedir" != NONE && \
@@ -7649,25 +9230,38 @@ test -d "$oldincludedir" && {
 	test -d $oldincludedir/$cf_ncuhdr_root && cf_search="$cf_search $oldincludedir/$cf_ncuhdr_root"
 }
 
+cf_search="$cf_header_path_list $cf_search"
+
 	test -n "$verbose" && echo search path $cf_search
 	cf_save2_CPPFLAGS="$CPPFLAGS"
 	for cf_incdir in $cf_search
 	do
 
-for cf_add_incdir in $cf_incdir
-do
-	while true
+if test -n "$cf_incdir" ; then
+  for cf_add_incdir in $cf_incdir
+  do
+	while test $cf_add_incdir != /usr/include
 	do
-		case $cf_add_incdir in
-		/usr/include) # (vi
-			;;
-		/usr/local/include) # (vi
+	  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 7670 "configure"
+			  cf_save_CPPFLAGS=$CPPFLAGS
+			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+			  cat >conftest.$ac_ext <<_ACEOF
+#line 9264 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7679,35 +9273,46 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7682: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9276: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7685: \$? = $ac_status" >&5
+  echo "$as_me:9279: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7688: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9282: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7691: \$? = $ac_status" >&5
+  echo "$as_me:9285: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-CPPFLAGS="$cf_save_CPPFLAGS"
+cf_have_incdir=yes
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
+			  CPPFLAGS=$cf_save_CPPFLAGS
 			fi
-			;;
-		*) # (vi
-			CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
-			;;
-		esac
-		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"
+		  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}:9302: 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
+  done
+fi
 
 		for cf_header in \
 			ncurses.h \
@@ -7715,7 +9320,7 @@ done
 		do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 7718 "configure"
+#line 9323 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -7739,16 +9344,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7742: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9347: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7745: \$? = $ac_status" >&5
+  echo "$as_me:9350: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7748: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9353: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7751: \$? = $ac_status" >&5
+  echo "$as_me:9356: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -7769,12 +9374,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:7772: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9377: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:7777: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:9382: 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%/[^/]*$%%'`
@@ -7783,20 +9388,31 @@ echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
 		cf_cv_ncurses_header=$cf_ncuhdr_root/$cf_cv_ncurses_header
 	fi
 
-for cf_add_incdir in $cf_1st_incdir
-do
-	while true
+if test -n "$cf_1st_incdir" ; then
+  for cf_add_incdir in $cf_1st_incdir
+  do
+	while test $cf_add_incdir != /usr/include
 	do
-		case $cf_add_incdir in
-		/usr/include) # (vi
-			;;
-		/usr/local/include) # (vi
+	  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 7799 "configure"
+			  cf_save_CPPFLAGS=$CPPFLAGS
+			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+			  cat >conftest.$ac_ext <<_ACEOF
+#line 9415 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7808,35 +9424,46 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7811: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9427: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7814: \$? = $ac_status" >&5
+  echo "$as_me:9430: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7817: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9433: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7820: \$? = $ac_status" >&5
+  echo "$as_me:9436: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-CPPFLAGS="$cf_save_CPPFLAGS"
+cf_have_incdir=yes
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
+			  CPPFLAGS=$cf_save_CPPFLAGS
 			fi
-			;;
-		*) # (vi
-			CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
-			;;
-		esac
-		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"
+		  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}:9453: 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
+  done
+fi
 
 fi
 
@@ -7866,7 +9493,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:7869: checking for terminfo header" >&5
+echo "$as_me:9496: 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
@@ -7884,7 +9511,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 7887 "configure"
+#line 9514 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -7899,16 +9526,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7902: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9529: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7905: \$? = $ac_status" >&5
+  echo "$as_me:9532: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7908: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9535: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7911: \$? = $ac_status" >&5
+  echo "$as_me:9538: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -7924,7 +9551,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:7927: result: $cf_cv_term_header" >&5
+echo "$as_me:9554: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -7958,7 +9585,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:7961: checking for ncurses version" >&5
+echo "$as_me:9588: 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
@@ -7984,10 +9611,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:7987: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:9614: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:7990: \$? = $ac_status" >&5
+  echo "$as_me:9617: \$? = $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%".*%%'`
@@ -7997,7 +9624,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8000 "configure"
+#line 9627 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -8022,15 +9649,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:8025: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9652: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8028: \$? = $ac_status" >&5
+  echo "$as_me:9655: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:8030: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9657: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8033: \$? = $ac_status" >&5
+  echo "$as_me:9660: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -8044,7 +9671,7 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:8047: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:9674: 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
@@ -8056,7 +9683,7 @@ cf_nculib_root=$use_ncurses
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:8059: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:9686: 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
@@ -8064,7 +9691,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8067 "configure"
+#line 9694 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8083,16 +9710,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8086: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9713: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8089: \$? = $ac_status" >&5
+  echo "$as_me:9716: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8092: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9719: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8095: \$? = $ac_status" >&5
+  echo "$as_me:9722: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -8103,10 +9730,10 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8106: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:9733: 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:8109: checking for initscr in -lgpm" >&5
+  echo "$as_me:9736: 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
@@ -8114,7 +9741,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8117 "configure"
+#line 9744 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8133,16 +9760,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8136: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9763: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8139: \$? = $ac_status" >&5
+  echo "$as_me:9766: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8142: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9769: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8145: \$? = $ac_status" >&5
+  echo "$as_me:9772: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -8153,7 +9780,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8156: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:9783: 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"
@@ -8168,7 +9795,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:8171: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:9798: 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
@@ -8176,7 +9803,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8179 "configure"
+#line 9806 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8195,16 +9822,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8198: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9825: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8201: \$? = $ac_status" >&5
+  echo "$as_me:9828: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8204: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9831: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8207: \$? = $ac_status" >&5
+  echo "$as_me:9834: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -8215,7 +9842,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8218: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:9845: 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"
@@ -8229,18 +9856,46 @@ LIBS="$cf_ncurses_LIBS $LIBS"
 
 if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
 then
-	LIBS="-L$cf_cv_curses_dir/lib -l$cf_nculib_root $LIBS"
+
+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}:9879: 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:8237: checking for initscr" >&5
+	echo "$as_me:9892: 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 8243 "configure"
+#line 9898 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */
@@ -8271,16 +9926,16 @@ f = initscr;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8274: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9929: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8277: \$? = $ac_status" >&5
+  echo "$as_me:9932: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8280: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9935: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8283: \$? = $ac_status" >&5
+  echo "$as_me:9938: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -8290,18 +9945,18 @@ ac_cv_func_initscr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8293: result: $ac_cv_func_initscr" >&5
+echo "$as_me:9948: 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:8300: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:9955: 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 8304 "configure"
+#line 9959 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -8313,56 +9968,69 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8316: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9971: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8319: \$? = $ac_status" >&5
+  echo "$as_me:9974: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8322: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9977: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8325: \$? = $ac_status" >&5
+  echo "$as_me:9980: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:8327: result: yes" >&5
+  echo "$as_me:9982: 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:8334: result: no" >&5
+echo "$as_me:9989: result: no" >&5
 echo "${ECHO_T}no" >&6
-			cf_search=""
-
-test -d "$HOME" && {
-	test -n "$verbose" && echo "	... testing 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"
-	test -d "$HOME/lib/$cf_nculib_root/lib" &&    cf_search="$cf_search $HOME/lib/$cf_nculib_root/lib"
-}
 
-# For other stuff under the home directory, it should be sufficient to put
-# a symbolic link for $HOME/$cf_nculib_root to the actual package location:
-test -d "$HOME/$cf_nculib_root" && {
-	test -n "$verbose" && echo "	... testing lib-directories under $HOME/$cf_nculib_root"
-	test -d "$HOME/$cf_nculib_root/lib" &&       cf_search="$cf_search $HOME/$cf_nculib_root/lib"
-	test -d "$HOME/$cf_nculib_root/lib/$cf_nculib_root" &&    cf_search="$cf_search $HOME/$cf_nculib_root/lib/$cf_nculib_root"
-}
+cf_library_path_list=""
+if test -n "${LDFLAGS}${LIBS}" ; then
+	for cf_library_path in $LDFLAGS $LIBS
+	do
+		case $cf_library_path in #(vi
+		-L*)
+			cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
+
+test "$cf_library_path" != "NONE" && \
+test -d "$cf_library_path" && \
+ {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_library_path"
+	test -d $cf_library_path/lib &&          cf_search="$cf_search $cf_library_path/lib"
+	test -d $cf_library_path/lib/$cf_nculib_root &&       cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root"
+	test -d $cf_library_path/lib/$cf_nculib_root/lib &&    cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root/lib"
+	test -d $cf_library_path/$cf_nculib_root/lib &&       cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib"
+	test -d $cf_library_path/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib/$cf_nculib_root"
+}
+
+			cf_library_path_list="$cf_library_path_list $cf_search"
+			;;
+		esac
+	done
+fi
 
-test "$prefix" != /usr/local && \
-test -d /usr/local && {
-	test -n "$verbose" && echo "	... testing 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"
-	test -d /usr/local/lib/$cf_nculib_root/lib && cf_search="$cf_search /usr/local/lib/$cf_nculib_root/lib"
-	test -d /usr/local/$cf_nculib_root/lib &&    cf_search="$cf_search /usr/local/$cf_nculib_root/lib"
-	test -d /usr/local/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search /usr/local/$cf_nculib_root/lib/$cf_nculib_root"
-}
+cf_search=""
 
-test "$prefix" != NONE && \
-test -d $prefix && {
-	test -n "$verbose" && echo "	... testing lib-directories under $prefix"
+test "/usr" != "$prefix" && \
+test -d "/usr" && \
+(test $prefix = NONE || test -d $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"
+	test -d /usr/lib/$cf_nculib_root/lib &&    cf_search="$cf_search /usr/lib/$cf_nculib_root/lib"
+	test -d /usr/$cf_nculib_root/lib &&       cf_search="$cf_search /usr/$cf_nculib_root/lib"
+	test -d /usr/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search /usr/$cf_nculib_root/lib/$cf_nculib_root"
+}
+
+test "$prefix" != "NONE" && \
+test -d "$prefix" && \
+ {
+	test -n "$verbose" && echo "	... testing for lib-directories under $prefix"
 	test -d $prefix/lib &&          cf_search="$cf_search $prefix/lib"
 	test -d $prefix/lib/$cf_nculib_root &&       cf_search="$cf_search $prefix/lib/$cf_nculib_root"
 	test -d $prefix/lib/$cf_nculib_root/lib &&    cf_search="$cf_search $prefix/lib/$cf_nculib_root/lib"
@@ -8370,32 +10038,48 @@ test -d $prefix && {
 	test -d $prefix/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search $prefix/$cf_nculib_root/lib/$cf_nculib_root"
 }
 
-test "$prefix" != /opt && \
-test -d /opt && {
-	test -n "$verbose" && echo "	... testing 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"
-	test -d /opt/lib/$cf_nculib_root/lib &&       cf_search="$cf_search /opt/lib/$cf_nculib_root/lib"
-	test -d /opt/$cf_nculib_root/lib &&          cf_search="$cf_search /opt/$cf_nculib_root/lib"
-	test -d /opt/$cf_nculib_root/lib/$cf_nculib_root &&       cf_search="$cf_search /opt/$cf_nculib_root/lib/$cf_nculib_root"
+test "/usr/local" != "$prefix" && \
+test -d "/usr/local" && \
+(test $prefix = NONE || test -d $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"
+	test -d /usr/local/lib/$cf_nculib_root/lib &&    cf_search="$cf_search /usr/local/lib/$cf_nculib_root/lib"
+	test -d /usr/local/$cf_nculib_root/lib &&       cf_search="$cf_search /usr/local/$cf_nculib_root/lib"
+	test -d /usr/local/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search /usr/local/$cf_nculib_root/lib/$cf_nculib_root"
+}
+
+test "/opt" != "$prefix" && \
+test -d "/opt" && \
+(test $prefix = NONE || test -d $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"
+	test -d /opt/lib/$cf_nculib_root/lib &&    cf_search="$cf_search /opt/lib/$cf_nculib_root/lib"
+	test -d /opt/$cf_nculib_root/lib &&       cf_search="$cf_search /opt/$cf_nculib_root/lib"
+	test -d /opt/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search /opt/$cf_nculib_root/lib/$cf_nculib_root"
 }
 
-test "$prefix" != /usr && \
-test -d /usr && {
-	test -n "$verbose" && echo "	... testing 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"
-	test -d /usr/lib/$cf_nculib_root/lib &&       cf_search="$cf_search /usr/lib/$cf_nculib_root/lib"
-	test -d /usr/$cf_nculib_root/lib &&          cf_search="$cf_search /usr/$cf_nculib_root/lib"
+test "$HOME" != "$prefix" && \
+test -d "$HOME" && \
+(test $prefix = NONE || test -d $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"
+	test -d $HOME/lib/$cf_nculib_root/lib &&    cf_search="$cf_search $HOME/lib/$cf_nculib_root/lib"
+	test -d $HOME/$cf_nculib_root/lib &&       cf_search="$cf_search $HOME/$cf_nculib_root/lib"
+	test -d $HOME/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search $HOME/$cf_nculib_root/lib/$cf_nculib_root"
 }
 
+cf_search="$cf_library_path_list $cf_search"
+
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:8394: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:10078: 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 8398 "configure"
+#line 10082 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -8407,25 +10091,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8410: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10094: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8413: \$? = $ac_status" >&5
+  echo "$as_me:10097: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8416: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10100: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8419: \$? = $ac_status" >&5
+  echo "$as_me:10103: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:8421: result: yes" >&5
+  echo "$as_me:10105: 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:8428: result: no" >&5
+echo "$as_me:10112: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -8440,7 +10124,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:8443: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:10127: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -8448,7 +10132,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:8451: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:10135: 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
@@ -8458,7 +10142,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >conftest.$ac_ext <<_ACEOF
-#line 8461 "configure"
+#line 10145 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -8470,23 +10154,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8473: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10157: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8476: \$? = $ac_status" >&5
+  echo "$as_me:10160: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8479: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10163: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8482: \$? = $ac_status" >&5
+  echo "$as_me:10166: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:8484: result: yes" >&5
+  echo "$as_me:10168: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:8489: result: no" >&5
+echo "$as_me:10173: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -8504,7 +10188,7 @@ fi
 else
 	cf_wide_curses=no
 
-echo "$as_me:8507: checking for extra include directories" >&5
+echo "$as_me:10191: 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
@@ -8524,11 +10208,11 @@ sunos3*|sunos4*)
 esac
 
 fi
-echo "$as_me:8527: result: $cf_cv_curses_incdir" >&5
+echo "$as_me:10211: result: $cf_cv_curses_incdir" >&5
 echo "${ECHO_T}$cf_cv_curses_incdir" >&6
-test "$cf_cv_curses_incdir" != no && CPPFLAGS="$cf_cv_curses_incdir $CPPFLAGS"
+test "$cf_cv_curses_incdir" != no && CPPFLAGS="$CPPFLAGS $cf_cv_curses_incdir"
 
-echo "$as_me:8531: checking if we have identified curses headers" >&5
+echo "$as_me:10215: 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
@@ -8542,7 +10226,7 @@ for cf_header in \
 	ncurses/ncurses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 8545 "configure"
+#line 10229 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -8554,16 +10238,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8557: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10241: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8560: \$? = $ac_status" >&5
+  echo "$as_me:10244: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8563: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10247: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8566: \$? = $ac_status" >&5
+  echo "$as_me:10250: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -8574,11 +10258,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:8577: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:10261: 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:8581: error: No curses header-files found" >&5
+	{ { echo "$as_me:10265: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -8588,23 +10272,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:8591: checking for $ac_header" >&5
+echo "$as_me:10275: 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 8597 "configure"
+#line 10281 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8601: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:10285: \"$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:8607: \$? = $ac_status" >&5
+  echo "$as_me:10291: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8623,7 +10307,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:8626: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:10310: 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
@@ -8633,7 +10317,7 @@ EOF
 fi
 done
 
-echo "$as_me:8636: checking for terminfo header" >&5
+echo "$as_me:10320: 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
@@ -8651,7 +10335,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 8654 "configure"
+#line 10338 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -8666,16 +10350,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8669: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10353: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8672: \$? = $ac_status" >&5
+  echo "$as_me:10356: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8675: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10359: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8678: \$? = $ac_status" >&5
+  echo "$as_me:10362: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -8691,7 +10375,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:8694: result: $cf_cv_term_header" >&5
+echo "$as_me:10378: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -8720,7 +10404,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:8723: checking for ncurses version" >&5
+echo "$as_me:10407: 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
@@ -8746,10 +10430,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:8749: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:10433: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:8752: \$? = $ac_status" >&5
+  echo "$as_me:10436: \$? = $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%".*%%'`
@@ -8759,7 +10443,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8762 "configure"
+#line 10446 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -8784,15 +10468,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:8787: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10471: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8790: \$? = $ac_status" >&5
+  echo "$as_me:10474: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:8792: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10476: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8795: \$? = $ac_status" >&5
+  echo "$as_me:10479: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -8806,16 +10490,16 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:8809: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:10493: 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:8815: checking if we have identified curses libraries" >&5
+echo "$as_me:10499: 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 8818 "configure"
+#line 10502 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -8827,16 +10511,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8830: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10514: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8833: \$? = $ac_status" >&5
+  echo "$as_me:10517: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8836: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10520: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8839: \$? = $ac_status" >&5
+  echo "$as_me:10523: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -8845,13 +10529,13 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:8848: result: $cf_result" >&5
+echo "$as_me:10532: 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:8854: checking for tgoto in -lmytinfo" >&5
+    echo "$as_me:10538: 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
@@ -8859,7 +10543,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8862 "configure"
+#line 10546 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8878,16 +10562,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8881: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10565: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8884: \$? = $ac_status" >&5
+  echo "$as_me:10568: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8887: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10571: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8890: \$? = $ac_status" >&5
+  echo "$as_me:10574: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -8898,15 +10582,15 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8901: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:10585: 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"
 fi
 
-	;;
+    ;;
 hpux10.*) #(vi
-	echo "$as_me:8909: checking for initscr in -lcur_colr" >&5
+    echo "$as_me:10593: 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
@@ -8914,7 +10598,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcur_colr  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8917 "configure"
+#line 10601 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8933,16 +10617,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8936: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10620: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8939: \$? = $ac_status" >&5
+  echo "$as_me:10623: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8942: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10626: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8945: \$? = $ac_status" >&5
+  echo "$as_me:10629: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_cur_colr_initscr=yes
 else
@@ -8953,16 +10637,16 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8956: result: $ac_cv_lib_cur_colr_initscr" >&5
+echo "$as_me:10640: result: $ac_cv_lib_cur_colr_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_cur_colr_initscr" >&6
 if test $ac_cv_lib_cur_colr_initscr = yes; then
 
-		LIBS="-lcur_colr $LIBS"
-		ac_cv_func_initscr=yes
+        LIBS="-lcur_colr $LIBS"
+        ac_cv_func_initscr=yes
 
 else
 
-	echo "$as_me:8965: checking for initscr in -lHcurses" >&5
+    echo "$as_me:10649: 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
@@ -8970,7 +10654,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lHcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8973 "configure"
+#line 10657 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8989,16 +10673,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8992: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10676: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8995: \$? = $ac_status" >&5
+  echo "$as_me:10679: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8998: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10682: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9001: \$? = $ac_status" >&5
+  echo "$as_me:10685: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Hcurses_initscr=yes
 else
@@ -9009,51 +10693,107 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9012: result: $ac_cv_lib_Hcurses_initscr" >&5
+echo "$as_me:10696: result: $ac_cv_lib_Hcurses_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_Hcurses_initscr" >&6
 if test $ac_cv_lib_Hcurses_initscr = yes; then
 
-		# HP's header uses __HP_CURSES, but user claims _HP_CURSES.
-		LIBS="-lHcurses $LIBS"
-		CPPFLAGS="-D__HP_CURSES -D_HP_CURSES $CPPFLAGS"
-		ac_cv_func_initscr=yes
+        # HP's header uses __HP_CURSES, but user claims _HP_CURSES.
+        LIBS="-lHcurses $LIBS"
+        CPPFLAGS="$CPPFLAGS -D__HP_CURSES -D_HP_CURSES"
+        ac_cv_func_initscr=yes
 
 fi
 
 fi
 
-	;;
+    ;;
 linux*) # Suse Linux does not follow /usr/lib convention
-	LIBS="$LIBS -L/lib"
-	;;
+
+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}:10731: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+      fi
+    fi
+  done
+fi
+
+    ;;
 sunos3*|sunos4*)
-	test -d /usr/5lib && \
-	LIBS="$LIBS -L/usr/5lib -lcurses -ltermcap"
-	ac_cv_func_initscr=yes
-	;;
+    if test -d /usr/5lib ; then
+
+if test -n "/usr/5lib" ; then
+  for cf_add_libdir in /usr/5lib
+  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}:10762: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+      fi
+    fi
+  done
+fi
+
+      LIBS="$LIBS -lcurses -ltermcap"
+    fi
+    ac_cv_func_initscr=yes
+    ;;
 esac
 
 if test ".$ac_cv_func_initscr" != .yes ; then
-	cf_save_LIBS="$LIBS"
-	cf_term_lib=""
-	cf_curs_lib=""
+    cf_save_LIBS="$LIBS"
+    cf_term_lib=""
+    cf_curs_lib=""
 
-	if test ".${cf_cv_ncurses_version-no}" != .no
-	then
-		cf_check_list="ncurses curses cursesX"
-	else
-		cf_check_list="cursesX curses ncurses"
-	fi
+    if test ".${cf_cv_ncurses_version-no}" != .no
+    then
+        cf_check_list="ncurses curses cursesX"
+    else
+        cf_check_list="cursesX curses ncurses"
+    fi
 
-	# 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:9050: checking for tgoto" >&5
+    # Check for library containing tgoto.  Do this before curses library
+    # because it may be needed to link the test-case for initscr.
+    echo "$as_me:10790: checking for tgoto" >&5
 echo $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 9056 "configure"
+#line 10796 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char tgoto (); below.  */
@@ -9084,16 +10824,16 @@ f = tgoto;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9087: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10827: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9090: \$? = $ac_status" >&5
+  echo "$as_me:10830: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9093: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10833: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9096: \$? = $ac_status" >&5
+  echo "$as_me:10836: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_tgoto=yes
 else
@@ -9103,16 +10843,16 @@ ac_cv_func_tgoto=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9106: result: $ac_cv_func_tgoto" >&5
+echo "$as_me:10846: 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
 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:9115: checking for tgoto in -l$cf_term_lib" >&5
+        for cf_term_lib in $cf_check_list termcap termlib unknown
+        do
+            as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh`
+echo "$as_me:10855: checking for tgoto in -l$cf_term_lib" >&5
 echo $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
@@ -9120,7 +10860,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_term_lib  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9123 "configure"
+#line 10863 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9139,16 +10879,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9142: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10882: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9145: \$? = $ac_status" >&5
+  echo "$as_me:10885: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9148: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10888: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9151: \$? = $ac_status" >&5
+  echo "$as_me:10891: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -9159,22 +10899,22 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9162: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:10902: 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
+        done
 
 fi
 
-	# Check for library containing initscr
-	test "$cf_term_lib" != predefined && test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS"
-	for cf_curs_lib in $cf_check_list xcurses jcurses unknown
-	do
-		as_ac_Lib=`echo "ac_cv_lib_$cf_curs_lib''_initscr" | $as_tr_sh`
-echo "$as_me:9177: checking for initscr in -l$cf_curs_lib" >&5
+    # Check for library containing initscr
+    test "$cf_term_lib" != predefined && test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS"
+ 	for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown
+    do
+        as_ac_Lib=`echo "ac_cv_lib_$cf_curs_lib''_initscr" | $as_tr_sh`
+echo "$as_me:10917: checking for initscr in -l$cf_curs_lib" >&5
 echo $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
@@ -9182,7 +10922,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_curs_lib  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9185 "configure"
+#line 10925 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9201,16 +10941,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9204: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10944: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9207: \$? = $ac_status" >&5
+  echo "$as_me:10947: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9210: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10950: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9213: \$? = $ac_status" >&5
+  echo "$as_me:10953: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -9221,23 +10961,23 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9224: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:10964: 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:9231: error: no curses library found" >&5
+    done
+    test $cf_curs_lib = unknown && { { echo "$as_me:10971: 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:9237: checking if we can link with $cf_curs_lib library" >&5
+    LIBS="-l$cf_curs_lib $cf_save_LIBS"
+    if test "$cf_term_lib" = unknown ; then
+        echo "$as_me:10977: checking if we can link with $cf_curs_lib library" >&5
 echo $ECHO_N "checking if we can link with $cf_curs_lib library... $ECHO_C" >&6
-		cat >conftest.$ac_ext <<_ACEOF
-#line 9240 "configure"
+        cat >conftest.$ac_ext <<_ACEOF
+#line 10980 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -9249,16 +10989,16 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9252: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10992: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9255: \$? = $ac_status" >&5
+  echo "$as_me:10995: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9258: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10998: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9261: \$? = $ac_status" >&5
+  echo "$as_me:11001: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -9267,18 +11007,18 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-		echo "$as_me:9270: result: $cf_result" >&5
+        echo "$as_me:11010: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
-		test $cf_result = no && { { echo "$as_me:9272: error: Cannot link curses library" >&5
+        test $cf_result = no && { { echo "$as_me:11012: 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:9278: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+    elif test "$cf_curs_lib" = "$cf_term_lib" ; then
+        :
+    elif test "$cf_term_lib" != predefined ; then
+        echo "$as_me:11018: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
 echo $ECHO_N "checking if we need both $cf_curs_lib and $cf_term_lib libraries... $ECHO_C" >&6
-		cat >conftest.$ac_ext <<_ACEOF
-#line 9281 "configure"
+        cat >conftest.$ac_ext <<_ACEOF
+#line 11021 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -9290,25 +11030,25 @@ initscr(); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9293: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11033: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9296: \$? = $ac_status" >&5
+  echo "$as_me:11036: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9299: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11039: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9302: \$? = $ac_status" >&5
+  echo "$as_me:11042: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=no
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-			LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
-			cat >conftest.$ac_ext <<_ACEOF
-#line 9311 "configure"
+            LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
+            cat >conftest.$ac_ext <<_ACEOF
+#line 11051 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -9320,16 +11060,16 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9323: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11063: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9326: \$? = $ac_status" >&5
+  echo "$as_me:11066: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9329: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11069: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9332: \$? = $ac_status" >&5
+  echo "$as_me:11072: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -9341,9 +11081,9 @@ 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:9344: result: $cf_result" >&5
+        echo "$as_me:11084: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
-	fi
+    fi
 fi
 fi
 
@@ -9351,7 +11091,7 @@ fi
 
 cf_all_widgets=yes
 
-echo "$as_me:9354: checking if you want extra dialogs" >&5
+echo "$as_me:11094: 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.
@@ -9361,7 +11101,7 @@ if test "${enable_extras+set}" = set; then
 else
   enableval=yes
 fi;
-echo "$as_me:9364: result: $enableval" >&5
+echo "$as_me:11104: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 if test "$enableval" != no ; then
 cf_all_widgets=yes
@@ -9369,7 +11109,7 @@ else
 cf_all_widgets=no
 fi
 
-echo "$as_me:9372: checking if you want config-file support" >&5
+echo "$as_me:11112: 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.
@@ -9379,7 +11119,7 @@ if test "${enable_rc_file+set}" = set; then
 else
   enableval=$cf_all_widgets
 fi;
-echo "$as_me:9382: result: $enableval" >&5
+echo "$as_me:11122: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 if test "$enableval" != no ; then
 EXTRAOBJS="$EXTRAOBJS rc\$o"
@@ -9391,7 +11131,7 @@ else
 	:
 fi
 
-echo "$as_me:9394: checking if you want Xdialog-style dialogs" >&5
+echo "$as_me:11134: 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.
@@ -9401,7 +11141,7 @@ if test "${enable_Xdialog+set}" = set; then
 else
   enableval=$cf_all_widgets
 fi;
-echo "$as_me:9404: result: $enableval" >&5
+echo "$as_me:11144: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 if test "$enableval" != no ; then
 EXTRAOBJS="$EXTRAOBJS calendar\$o fselect\$o timebox\$o"
@@ -9413,7 +11153,7 @@ else
 	:
 fi
 
-echo "$as_me:9416: checking if you want the form dialog" >&5
+echo "$as_me:11156: 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.
@@ -9423,7 +11163,7 @@ if test "${enable_form+set}" = set; then
 else
   enableval=$cf_all_widgets
 fi;
-echo "$as_me:9426: result: $enableval" >&5
+echo "$as_me:11166: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 if test "$enableval" != no ; then
 EXTRAOBJS="$EXTRAOBJS formbox\$o"
@@ -9435,7 +11175,7 @@ else
 	:
 fi
 
-echo "$as_me:9438: checking if you want the gauge dialog" >&5
+echo "$as_me:11178: 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.
@@ -9445,7 +11185,7 @@ if test "${enable_gauge+set}" = set; then
 else
   enableval=$cf_all_widgets
 fi;
-echo "$as_me:9448: result: $enableval" >&5
+echo "$as_me:11188: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 if test "$enableval" != no ; then
 EXTRAOBJS="$EXTRAOBJS guage\$o pause\$o progressbox\$o"
@@ -9457,7 +11197,7 @@ else
 	:
 fi
 
-echo "$as_me:9460: checking if you want the tailbox dialog" >&5
+echo "$as_me:11200: 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.
@@ -9467,7 +11207,7 @@ if test "${enable_tailbox+set}" = set; then
 else
   enableval=$cf_all_widgets
 fi;
-echo "$as_me:9470: result: $enableval" >&5
+echo "$as_me:11210: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 if test "$enableval" != no ; then
 EXTRAOBJS="$EXTRAOBJS tailbox\$o"
@@ -9479,7 +11219,7 @@ else
 	:
 fi
 
-echo "$as_me:9482: checking if you want the mixedform dialog" >&5
+echo "$as_me:11222: 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.
@@ -9489,7 +11229,7 @@ if test "${enable_mixedform+set}" = set; then
 else
   enableval=$cf_all_widgets
 fi;
-echo "$as_me:9492: result: $enableval" >&5
+echo "$as_me:11232: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 if test "$enableval" != no ; then
 EXTRAOBJS="$EXTRAOBJS mixedform\$o"
@@ -9501,7 +11241,7 @@ else
 	:
 fi
 
-echo "$as_me:9504: checking if you want the mixedgauge dialog" >&5
+echo "$as_me:11244: 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.
@@ -9511,7 +11251,7 @@ if test "${enable_mixedgauge+set}" = set; then
 else
   enableval=$cf_all_widgets
 fi;
-echo "$as_me:9514: result: $enableval" >&5
+echo "$as_me:11254: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 if test "$enableval" != no ; then
 EXTRAOBJS="$EXTRAOBJS mixedgauge\$o"
@@ -9523,7 +11263,7 @@ else
 	:
 fi
 
-echo "$as_me:9526: checking if you want the wide-curses features" >&5
+echo "$as_me:11266: 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.
@@ -9533,7 +11273,7 @@ if test "${enable_widec+set}" = set; then
 else
   enableval=$cf_wide_curses
 fi;
-echo "$as_me:9536: result: $enableval" >&5
+echo "$as_me:11276: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 if test "$enableval" != no ; then
 cat >>confdefs.h <<\EOF
@@ -9544,13 +11284,13 @@ else
 	:
 fi
 
-echo "$as_me:9547: checking for ANSI C header files" >&5
+echo "$as_me:11287: 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 9553 "configure"
+#line 11293 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -9558,13 +11298,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:9561: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:11301: \"$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:9567: \$? = $ac_status" >&5
+  echo "$as_me:11307: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9586,7 +11326,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 9589 "configure"
+#line 11329 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -9604,7 +11344,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 9607 "configure"
+#line 11347 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -9625,7 +11365,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9628 "configure"
+#line 11368 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -9651,15 +11391,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:9654: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11394: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9657: \$? = $ac_status" >&5
+  echo "$as_me:11397: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:9659: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11399: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9662: \$? = $ac_status" >&5
+  echo "$as_me:11402: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9672,7 +11412,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:9675: result: $ac_cv_header_stdc" >&5
+echo "$as_me:11415: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -9682,13 +11422,13 @@ EOF
 
 fi
 
-echo "$as_me:9685: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:11425: 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 9691 "configure"
+#line 11431 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -9704,16 +11444,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9707: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11447: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9710: \$? = $ac_status" >&5
+  echo "$as_me:11450: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9713: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11453: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9716: \$? = $ac_status" >&5
+  echo "$as_me:11456: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_header_time=yes
 else
@@ -9723,7 +11463,7 @@ ac_cv_header_time=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:9726: result: $ac_cv_header_time" >&5
+echo "$as_me:11466: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -9736,13 +11476,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:9739: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:11479: 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 9745 "configure"
+#line 11485 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -9757,16 +11497,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9760: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11500: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9763: \$? = $ac_status" >&5
+  echo "$as_me:11503: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9766: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11506: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9769: \$? = $ac_status" >&5
+  echo "$as_me:11509: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -9776,7 +11516,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:9779: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:11519: 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
@@ -9789,7 +11529,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:9792: checking for opendir in -ldir" >&5
+  echo "$as_me:11532: 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
@@ -9797,7 +11537,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9800 "configure"
+#line 11540 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9816,16 +11556,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9819: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11559: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9822: \$? = $ac_status" >&5
+  echo "$as_me:11562: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9825: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11565: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9828: \$? = $ac_status" >&5
+  echo "$as_me:11568: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -9836,14 +11576,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9839: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:11579: 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:9846: checking for opendir in -lx" >&5
+  echo "$as_me:11586: 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
@@ -9851,7 +11591,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9854 "configure"
+#line 11594 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9870,16 +11610,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9873: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11613: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9876: \$? = $ac_status" >&5
+  echo "$as_me:11616: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9879: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11619: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9882: \$? = $ac_status" >&5
+  echo "$as_me:11622: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -9890,7 +11630,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9893: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:11633: 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"
@@ -9898,26 +11638,26 @@ fi
 
 fi
 
-for ac_header in search.h unistd.h
+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:9904: checking for $ac_header" >&5
+echo "$as_me:11644: 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 9910 "configure"
+#line 11650 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:9914: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:11654: \"$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:9920: \$? = $ac_status" >&5
+  echo "$as_me:11660: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9936,7 +11676,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:9939: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:11679: 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
@@ -9946,7 +11686,7 @@ EOF
 fi
 done
 
-echo "$as_me:9949: checking for term.h" >&5
+echo "$as_me:11689: 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
@@ -9959,7 +11699,7 @@ for cf_header in \
 	term.h
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 9962 "configure"
+#line 11702 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -9973,16 +11713,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9976: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11716: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9979: \$? = $ac_status" >&5
+  echo "$as_me:11719: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9982: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11722: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9985: \$? = $ac_status" >&5
+  echo "$as_me:11725: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_term_header=$cf_header
 	 break
@@ -9995,7 +11735,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:9998: result: $cf_cv_term_header" >&5
+echo "$as_me:11738: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 case $cf_cv_term_header in #(vi
@@ -10019,13 +11759,13 @@ EOF
 	;;
 esac
 
-echo "$as_me:10022: checking return type of signal handlers" >&5
+echo "$as_me:11762: 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 10028 "configure"
+#line 11768 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -10047,16 +11787,16 @@ int i;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10050: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11790: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10053: \$? = $ac_status" >&5
+  echo "$as_me:11793: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10056: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11796: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10059: \$? = $ac_status" >&5
+  echo "$as_me:11799: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_signal=void
 else
@@ -10066,7 +11806,7 @@ ac_cv_type_signal=int
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:10069: result: $ac_cv_type_signal" >&5
+echo "$as_me:11809: result: $ac_cv_type_signal" >&5
 echo "${ECHO_T}$ac_cv_type_signal" >&6
 
 cat >>confdefs.h <<EOF
@@ -10076,18 +11816,19 @@ EOF
 for ac_func in \
 _nc_free_and_exit \
 strcasecmp \
+strftime \
 tsearch \
 waitpid \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10084: checking for $ac_func" >&5
+echo "$as_me:11825: 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 10090 "configure"
+#line 11831 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -10118,16 +11859,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10121: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11862: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10124: \$? = $ac_status" >&5
+  echo "$as_me:11865: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10127: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11868: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10130: \$? = $ac_status" >&5
+  echo "$as_me:11871: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10137,7 +11878,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10140: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:11881: 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
@@ -10147,14 +11888,14 @@ EOF
 fi
 done
 
-echo "$as_me:10150: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+echo "$as_me:11891: 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 10157 "configure"
+#line 11898 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -10171,23 +11912,23 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10174: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11915: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10177: \$? = $ac_status" >&5
+  echo "$as_me:11918: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10180: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11921: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10183: \$? = $ac_status" >&5
+  echo "$as_me:11924: \$? = $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 10190 "configure"
+#line 11931 "configure"
 #include "confdefs.h"
 
 #define _XOPEN_SOURCE_EXTENDED
@@ -10205,16 +11946,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10208: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11949: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10211: \$? = $ac_status" >&5
+  echo "$as_me:11952: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10214: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11955: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10217: \$? = $ac_status" >&5
+  echo "$as_me:11958: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_xopen_extension=yes
 else
@@ -10226,7 +11967,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10229: result: $cf_cv_need_xopen_extension" >&5
+echo "$as_me:11970: 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"
 
@@ -10250,10 +11991,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:10253: checking for ${cf_func}" >&5
+	echo "$as_me:11994: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "(line 10256) testing ${cf_func} ..." 1>&5
+echo "${as_me-configure}:11997: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10262,7 +12003,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >conftest.$ac_ext <<_ACEOF
-#line 10265 "configure"
+#line 12006 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -10272,16 +12013,13 @@ char * XCursesProgramName = "test";
 #include <${cf_cv_ncurses_header-curses.h}>
 #if defined(NCURSES_VERSION) && defined(HAVE_NCURSESW_TERM_H)
 #include <ncursesw/term.h>
-#else
-#if defined(NCURSES_VERSION) && defined(HAVE_NCURSES_TERM_H)
+#elif defined(NCURSES_VERSION) && defined(HAVE_NCURSES_TERM_H)
 #include <ncurses/term.h>
-#else
-#ifdef HAVE_TERM_H
+#elif defined(HAVE_TERM_H)
 #include <term.h>
 #endif
 #endif
-#endif
-#endif
+
 int
 main ()
 {
@@ -10296,16 +12034,16 @@ ${cf_cv_main_return-return}(foo == 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10299: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12037: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10302: \$? = $ac_status" >&5
+  echo "$as_me:12040: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10305: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12043: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10308: \$? = $ac_status" >&5
+  echo "$as_me:12046: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -10321,7 +12059,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:10324: result: $cf_result" >&5
+	echo "$as_me:12062: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test $cf_result != no; then
 		cat >>confdefs.h <<EOF
@@ -10331,13 +12069,13 @@ EOF
 	fi
 done
 
-echo "$as_me:10334: checking for start_color" >&5
+echo "$as_me:12072: 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 10340 "configure"
+#line 12078 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char start_color (); below.  */
@@ -10368,16 +12106,16 @@ f = start_color;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10371: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12109: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10374: \$? = $ac_status" >&5
+  echo "$as_me:12112: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10377: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12115: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10380: \$? = $ac_status" >&5
+  echo "$as_me:12118: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_start_color=yes
 else
@@ -10387,7 +12125,7 @@ ac_cv_func_start_color=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10390: result: $ac_cv_func_start_color" >&5
+echo "$as_me:12128: 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
@@ -10396,14 +12134,14 @@ EOF
 
 fi
 
-echo "$as_me:10399: checking for chtype typedef" >&5
+echo "$as_me:12137: 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 10406 "configure"
+#line 12144 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -10415,16 +12153,16 @@ chtype foo
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10418: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12156: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10421: \$? = $ac_status" >&5
+  echo "$as_me:12159: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10424: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12162: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10427: \$? = $ac_status" >&5
+  echo "$as_me:12165: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_chtype_decl=yes
 else
@@ -10434,21 +12172,21 @@ cf_cv_chtype_decl=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:10437: result: $cf_cv_chtype_decl" >&5
+echo "$as_me:12175: 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:10444: checking if chtype is scalar or struct" >&5
+	echo "$as_me:12182: 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 10451 "configure"
+#line 12189 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -10460,16 +12198,16 @@ chtype foo; long x = foo
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10463: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12201: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10466: \$? = $ac_status" >&5
+  echo "$as_me:12204: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10469: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12207: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10472: \$? = $ac_status" >&5
+  echo "$as_me:12210: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_chtype_type=scalar
 else
@@ -10479,7 +12217,7 @@ cf_cv_chtype_type=struct
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:10482: result: $cf_cv_chtype_type" >&5
+echo "$as_me:12220: 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
@@ -10492,23 +12230,23 @@ fi
 for ac_header in sys/wait.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:10495: checking for $ac_header" >&5
+echo "$as_me:12233: 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 10501 "configure"
+#line 12239 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:10505: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:12243: \"$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:10511: \$? = $ac_status" >&5
+  echo "$as_me:12249: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -10527,7 +12265,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:10530: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:12268: 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
@@ -10548,23 +12286,23 @@ else
 for ac_header in wait.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:10551: checking for $ac_header" >&5
+echo "$as_me:12289: 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 10557 "configure"
+#line 12295 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:10561: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:12299: \"$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:10567: \$? = $ac_status" >&5
+  echo "$as_me:12305: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -10583,7 +12321,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:10586: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:12324: 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
@@ -10596,23 +12334,23 @@ done
 for ac_header in waitstatus.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:10599: checking for $ac_header" >&5
+echo "$as_me:12337: 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 10605 "configure"
+#line 12343 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:10609: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:12347: \"$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:10615: \$? = $ac_status" >&5
+  echo "$as_me:12353: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -10631,7 +12369,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:10634: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:12372: 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
@@ -10653,14 +12391,14 @@ cf_wait_headers="$cf_wait_headers
 fi
 fi
 
-echo "$as_me:10656: checking for union wait" >&5
+echo "$as_me:12394: 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 10663 "configure"
+#line 12401 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -10676,16 +12414,16 @@ int x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10679: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12417: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10682: \$? = $ac_status" >&5
+  echo "$as_me:12420: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10685: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12423: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10688: \$? = $ac_status" >&5
+  echo "$as_me:12426: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_unionwait=no
 	 echo compiles ok w/o union wait 1>&5
@@ -10695,7 +12433,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 10698 "configure"
+#line 12436 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -10715,16 +12453,16 @@ union wait x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10718: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12456: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10721: \$? = $ac_status" >&5
+  echo "$as_me:12459: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10724: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12462: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10727: \$? = $ac_status" >&5
+  echo "$as_me:12465: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_unionwait=yes
 	 echo compiles ok with union wait and possibly macros too 1>&5
@@ -10739,7 +12477,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:10742: result: $cf_cv_type_unionwait" >&5
+echo "$as_me:12480: 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
@@ -10747,14 +12485,14 @@ EOF
 
 if test $cf_cv_type_unionwait = yes; then
 
-	echo "$as_me:10750: checking if union wait can be used as wait-arg" >&5
+	echo "$as_me:12488: 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 10757 "configure"
+#line 12495 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -10766,16 +12504,16 @@ union wait x; wait(&x)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10769: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12507: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10772: \$? = $ac_status" >&5
+  echo "$as_me:12510: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10775: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12513: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10778: \$? = $ac_status" >&5
+  echo "$as_me:12516: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_arg_union_wait=yes
 else
@@ -10787,20 +12525,20 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-	echo "$as_me:10790: result: $cf_cv_arg_union_wait" >&5
+	echo "$as_me:12528: 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:10796: checking if union wait can be used as waitpid-arg" >&5
+	echo "$as_me:12534: 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 10803 "configure"
+#line 12541 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -10812,16 +12550,16 @@ union wait x; waitpid(0, &x, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10815: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12553: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10818: \$? = $ac_status" >&5
+  echo "$as_me:12556: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10821: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12559: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10824: \$? = $ac_status" >&5
+  echo "$as_me:12562: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_arg_union_waitpid=yes
 else
@@ -10833,7 +12571,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-	echo "$as_me:10836: result: $cf_cv_arg_union_waitpid" >&5
+	echo "$as_me:12574: 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
@@ -10841,14 +12579,14 @@ EOF
 
 fi
 
-echo "$as_me:10844: checking if we must include wchar.h to declare mbstate_t" >&5
+echo "$as_me:12582: 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 10851 "configure"
+#line 12589 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -10865,23 +12603,23 @@ mbstate_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10868: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12606: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10871: \$? = $ac_status" >&5
+  echo "$as_me:12609: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10874: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12612: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10877: \$? = $ac_status" >&5
+  echo "$as_me:12615: \$? = $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 10884 "configure"
+#line 12622 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -10899,16 +12637,16 @@ mbstate_t value
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10902: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12640: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10905: \$? = $ac_status" >&5
+  echo "$as_me:12643: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10908: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12646: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10911: \$? = $ac_status" >&5
+  echo "$as_me:12649: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_mbstate_t=yes
 else
@@ -10920,7 +12658,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:10923: result: $cf_cv_mbstate_t" >&5
+echo "$as_me:12661: result: $cf_cv_mbstate_t" >&5
 echo "${ECHO_T}$cf_cv_mbstate_t" >&6
 
 if test "$cf_cv_mbstate_t" = yes ; then
@@ -10943,7 +12681,7 @@ PACKAGE_CONFIG=dlg_config.h
 EXTRA_OUTPUT="$EXTRA_OUTPUT headers-sh:$srcdir/headers-sh.in"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 10946 "configure"
+#line 12684 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int
@@ -10955,16 +12693,16 @@ setlocale(LC_ALL, "")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10958: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12696: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10961: \$? = $ac_status" >&5
+  echo "$as_me:12699: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10964: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12702: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10967: \$? = $ac_status" >&5
+  echo "$as_me:12705: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >>confdefs.h <<\EOF
 #define HAVE_SETLOCALE 1
@@ -11057,7 +12795,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:11060: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:12798: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -11189,7 +12927,7 @@ EOF
 cat >>$CONFIG_STATUS <<EOF
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.52.20061216,
+configured by $0, generated by GNU Autoconf 2.52.20081225,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
@@ -11233,7 +12971,7 @@ cat >>$CONFIG_STATUS <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:11236: error: ambiguous option: $1
+    { { echo "$as_me:12974: 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;}
@@ -11252,7 +12990,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:11255: error: unrecognized option: $1
+  -*) { { echo "$as_me:12993: 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;}
@@ -11271,7 +13009,7 @@ cat >&5 << _ACEOF
 ## Running config.status.  ##
 ## ----------------------- ##
 
-This file was extended by $as_me 2.52.20061216, executed with
+This file was extended by $as_me 2.52.20081225, executed with
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
   CONFIG_LINKS    = $CONFIG_LINKS
@@ -11302,7 +13040,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:11305: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:13043: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -11424,14 +13162,13 @@ s,@host_vendor@,$host_vendor,;t t
 s,@host_os@,$host_os,;t t
 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,@CONFIG_H@,$CONFIG_H,;t t
 s,@ALLOCA@,$ALLOCA,;t t
 s,@GLIBC21@,$GLIBC21,;t t
 s,@LIBICONV@,$LIBICONV,;t t
 s,@USE_NLS@,$USE_NLS,;t t
-s,@EXTRA_CPPFLAGS@,$EXTRA_CPPFLAGS,;t t
-s,@PATHSEP@,$PATHSEP,;t t
 s,@MSGFMT@,$MSGFMT,;t t
 s,@GMSGFMT@,$GMSGFMT,;t t
 s,@XGETTEXT@,$XGETTEXT,;t t
@@ -11457,6 +13194,7 @@ s,@GT_YES@,$GT_YES,;t t
 s,@GT_NO@,$GT_NO,;t t
 s,@LINK_PREFIX@,$LINK_PREFIX,;t t
 s,@LIBTOOL@,$LIBTOOL,;t t
+s,@LT_UNDEF@,$LT_UNDEF,;t t
 s,@LIBTOOL_CXX@,$LIBTOOL_CXX,;t t
 s,@LIBTOOL_OPTS@,$LIBTOOL_OPTS,;t t
 s,@LIB_CREATE@,$LIB_CREATE,;t t
@@ -11587,7 +13325,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:11590: creating $ac_file" >&5
+    { echo "$as_me:13328: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -11605,7 +13343,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:11608: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:13346: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -11618,7 +13356,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:11621: error: cannot find input file: $f" >&5
+           { { echo "$as_me:13359: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -11684,7 +13422,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:11687: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:13425: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -11695,7 +13433,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:11698: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:13436: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -11708,7 +13446,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:11711: error: cannot find input file: $f" >&5
+           { { echo "$as_me:13449: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -11766,7 +13504,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:11769: $ac_file is unchanged" >&5
+      { echo "$as_me:13507: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -11818,35 +13556,39 @@ for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
 
   case $ac_dest in
     default-1 ) for ac_file in $CONFIG_FILES; do
-        # Support "outfile[:infile[:infile...]]"
-        case "$ac_file" in
-          *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-        esac
-        # PO directories have a Makefile.in generated from Makefile.inn.
-        case "$ac_file" in */[Mm]akefile.in)
-          # Adjust a relative srcdir.
-          ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-          ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
-          ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
-	  ac_base=`basename $ac_file .in`
-          # In autoconf-2.13 it is called $ac_given_srcdir.
-          # In autoconf-2.50 it is called $srcdir.
-          test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
-          case "$ac_given_srcdir" in
-            .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
-            /*) top_srcdir="$ac_given_srcdir" ;;
-            *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
-          esac
-          if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
-            rm -f "$ac_dir/POTFILES"
-            test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-            sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," -e "\$s/\(.*\) \\\\/\1/" < "$ac_given_srcdir/$ac_dir/POTFILES.in" > "$ac_dir/POTFILES"
-            test -n "$as_me" && echo "$as_me: creating $ac_dir/$ac_base" || echo "creating $ac_dir/$ac_base"
-            sed -e "/POTFILES =/r $ac_dir/POTFILES" "$ac_dir/$ac_base.in" > "$ac_dir/$ac_base"
-          fi
-          ;;
+
+      # Support "outfile[:infile[:infile...]]"
+      case "$ac_file" in
+        *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+      esac
+
+      # PO directories have a Makefile.in generated from Makefile.inn.
+      case "$ac_file" in */[Mm]akefile.in)
+        # Adjust a relative srcdir.
+        ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+        ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+        ac_base=`basename $ac_file .in`
+        # In autoconf-2.13 it is called $ac_given_srcdir.
+        # In autoconf-2.50 it is called $srcdir.
+        test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
+
+        case "$ac_given_srcdir" in
+          .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+          /*) top_srcdir="$ac_given_srcdir" ;;
+          *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
         esac
-      done ;;
+
+        if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
+          rm -f "$ac_dir/POTFILES"
+          test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
+          sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," -e "\$s/\(.*\) \\\\/\1/" < "$ac_given_srcdir/$ac_dir/POTFILES.in" > "$ac_dir/POTFILES"
+          test -n "$as_me" && echo "$as_me: creating $ac_dir/$ac_base" || echo "creating $ac_dir/$ac_base"
+          sed -e "/POTFILES =/r $ac_dir/POTFILES" "$ac_dir/$ac_base.in" > "$ac_dir/$ac_base"
+        fi
+        ;;
+      esac
+    done ;;
   esac
 done
 EOF
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/configure.in b/Build/source/utils/dialog/dialog-1.1-20100119/configure.in
index ca25541d5c9..a36e5c33b11 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/configure.in
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.53 2008/03/16 18:46:34 tom Exp $
+dnl $Id: configure.in,v 1.56 2010/01/19 10:36:21 tom Exp $
 dnl Process this file with autoconf to produce a configure script.
 dnl
 AC_PREREQ(2.13.20020210)
@@ -31,6 +31,7 @@ CF_MAKEFLAGS
 CF_MAKE_TAGS
 CF_DISABLE_ECHO
 CF_PROG_EXT
+CF_PATHSEP
 CF_LIB_PREFIX
 CF_XOPEN_SOURCE
 CF_LARGEFILE
@@ -140,7 +141,7 @@ dnl
 AC_HEADER_STDC
 AC_HEADER_TIME
 AC_HEADER_DIRENT
-AC_CHECK_HEADERS(search.h unistd.h)
+AC_CHECK_HEADERS(search.h unctrl.h unistd.h)
 CF_CURSES_TERM_H
 
 dnl
@@ -150,6 +151,7 @@ AC_TYPE_SIGNAL
 AC_CHECK_FUNCS(\
 _nc_free_and_exit \
 strcasecmp \
+strftime \
 tsearch \
 waitpid \
 )
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/dialog-config.in b/Build/source/utils/dialog/dialog-1.1-20100119/dialog-config.in
index 39541c6fc24..39541c6fc24 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/dialog-config.in
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/dialog-config.in
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/dialog.1 b/Build/source/utils/dialog/dialog-1.1-20100119/dialog.1
index c99e4fbd8ce..5168fb3dd62 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/dialog.1
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/dialog.1
@@ -1,6 +1,6 @@
 '\" t
-.\" $Id: dialog.1,v 1.115 2008/07/27 22:49:40 tom Exp $
-.\" Copyright 2005-2007,2008  Thomas E. Dickey
+.\" $Id: dialog.1,v 1.120 2010/01/18 10:19:07 tom Exp $
+.\" Copyright 2005-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
@@ -29,7 +29,7 @@
 .RE
 ..
 .
-.TH DIALOG 1 "" "$Date: 2008/07/27 22:49:40 $"
+.TH DIALOG 1 "" "$Date: 2010/01/18 10:19:07 $"
 .SH NAME
 dialog \- display dialog boxes from shell scripts
 .SH SYNOPSIS
@@ -240,6 +240,12 @@ this can be used to dump a sample configuration file to the file specified
 by
 .IR file "."
 .
+.IP "\fB--date-format \fIformat"
+If the host provides \fBstrftime\fP,
+this option allows you to specify the format of the date printed for
+the \fB--calendar\fP widget.
+The time of day (hour, minute, second) are the current local time.
+.
 .IP "\fB--defaultno"
 Make the default value of the
 \fByes/no\fP
@@ -399,6 +405,11 @@ Prints the size of each dialog box to \fBdialog\fP's output.
 Prints \fBdialog\fR's version to \fBdialog\fP's output.
 This may be used alone, without other options.
 .
+.IP "\fB--scrollbar \fIstring"
+For widgets holding a scrollable set of data,
+draw a scrollbar on its right-margin.
+This does not respond to the mouse.
+.
 .IP "\fB--separate-output"
 For checklist widgets, output result one line at a time, with no quoting.
 This facilitates parsing by another program.
@@ -453,6 +464,12 @@ Specify the number of spaces that a tab character occupies if the
 The default is 8.
 This option is only effective for the \fBtextbox\fP widget.
 .
+.IP "\fB--time-format \fIformat"
+If the host provides \fBstrftime\fP,
+this option allows you to specify the format of the time printed for
+the \fB--timebox\fP widget.
+The day, month, year values in this case are for the current local time.
+.
 .IP "\fB--timeout \fIsecs"
 Timeout (exit with error code)
 if no user response within the given number of seconds.
@@ -519,6 +536,7 @@ Use tab or backtab to move between windows.
 If the year is given as zero, the current date is used as an initial value.
 .IP
 On exit, the date is printed in the form day/month/year.
+The format can be overridden using the \fB--date-format\fP option.
 .
 .
 .IP "\fB--checklist \fItext height width list-height \fR[ \fItag item status \fR] \fI..."
@@ -528,6 +546,9 @@ box is similar to a
 \fBmenu\fP
 box; there are
 multiple entries presented in the form of a menu.
+Another difference is
+that you can indicate which entry is currently selected, by setting its
+.IR status " to " on "."
 Instead of choosing
 one entry among the entries, each entry can be turned on or off by the user.
 The initial on/off state of each entry is specified by
@@ -921,6 +942,7 @@ left-, up-, right- and down-arrows.
 Use tab or backtab to move between windows.
 .IP
 On exit, the result is printed in the form hour:minute:second.
+The format can be overridden using the \fB--time-format\fP option.
 .
 .
 .IP "\fB--yesno \fItext height width"
@@ -1104,12 +1126,32 @@ button is pressed.
 if the
 .BR Extra
 button is pressed.
+4
+if the
+.BR Item Help
+button is pressed.
 .TP 5
 -1
 if errors occur inside \fBdialog\fP
 or \fBdialog\fP is exited by pressing the \fIESC\fP key.
 .
 .\" ************************************************************************
+.SH PORTABILITY
+\fBdialog\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,
+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.
+.RE
+.\" ************************************************************************
 .SH COMPATIBILITY
 You may want to write scripts which run with other \fBdialog\fP "clones".
 .SS ORIGINAL DIALOG
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/dialog.3 b/Build/source/utils/dialog/dialog-1.1-20100119/dialog.3
index 8c32322b959..3ed08a90d2c 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/dialog.3
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/dialog.3
@@ -1,5 +1,5 @@
-.\" $Id: dialog.3,v 1.42 2008/07/28 00:01:05 tom Exp $
-.\" Copyright 2005-2007,2008  Thomas E. Dickey
+.\" $Id: dialog.3,v 1.48 2010/01/18 10:22:47 tom Exp $
+.\" Copyright 2005-2009,2010  Thomas E. Dickey
 .\"
 .\" This program is free software; you can redistribute it and/or modify
 .\" it under the terms of the GNU Lesser General Public License, version 2.1
@@ -15,7 +15,7 @@
 .\"	Free Software Foundation, Inc.
 .\"	51 Franklin St., Fifth Floor
 .\"	Boston, MA 02110, USA.
-.TH DIALOG 3 "" "$Date: 2008/07/28 00:01:05 $"
+.TH DIALOG 3 "" "$Date: 2010/01/18 10:22:47 $"
 .SH NAME
 dialog \- widgets and utilities for the dialog program
 .SH SYNOPSIS
@@ -167,6 +167,11 @@ The default is 8.
 .IP \fIDIALOG_STATE.use_colors
 This is set in \fIinit_dialog\fP if the curses implementation supports color.
 .\" ---------------------------------------------------------------------------
+.IP \fIDIALOG_STATE.use_scrollbar
+This corresponds to the command-line option "\fB--scrollbar\fP".
+If true,
+draw a scrollbar to make windows holding scrolled data more readable.
+.\" ---------------------------------------------------------------------------
 .IP \fIDIALOG_STATE.use_shadow
 This corresponds to the command-line option "\fB--no-shadow\fP".
 This is set in \fIinit_dialog\fP if the curses implementation supports color.
@@ -258,6 +263,11 @@ 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.
 .\" ---------------------------------------------------------------------------
+.IP \fIDIALOG_VARS.date_format
+This corresponds to the command-line option "\fB--date-format\fP \fIstring\fP".
+If the host provides \fBstrftime\fP, and the value is nonnull,
+the calendar widget uses this to format its output.
+.\" ---------------------------------------------------------------------------
 .IP \fIDIALOG_VARS.default_item
 This corresponds to the command-line option "\fB--default-item\fP \fIstring\fP".
 The given string is used as
@@ -434,6 +444,11 @@ This corresponds to the command-line option "\fB--tab-correct\fP".
 If true, convert each tab character of the text to one or more spaces.
 Otherwise, tabs are rendered according to the curses library's interpretation.
 .\" ---------------------------------------------------------------------------
+.IP \fIDIALOG_VARS.time_format
+This corresponds to the command-line option "\fB--time-format\fP \fIstring\fP".
+If the host provides \fBstrftime\fP, and the value is nonnull,
+the timebox widget uses this to format its output.
+.\" ---------------------------------------------------------------------------
 .IP \fIDIALOG_VARS.timeout_secs
 This corresponds to the command-line option "\fB--timeout\fP \fIsecs\fP".
 If nonzero, timeout input requests (exit with error code)
@@ -935,6 +950,22 @@ contains the callback information.
 .RE
 .\" ---------------------------------------------------------------------------
 .TP 5
+.B dlg_add_callback_ref
+Like \fBdlg_add_callback\fP, but passes a reference to the \fBDIALOG_CALLBACK\fP
+as well as a pointer to a cleanup function which will be called when the
+associated input ends.
+.RS
+.TP 5
+.B DIALOG_CALLBACK **\fIp\fP
+points to the callback information.
+This is a reference to the pointer so that the caller's pointer can be
+zeroed when input ends.
+.TP 5
+.B DIALOG_FREEBACK \fIfunc\fP
+function to call when input ends, e.g., to free caller's additional data.
+.RE
+.\" ---------------------------------------------------------------------------
+.TP 5
 .B dlg_add_quoted
 Add a quoted string to the result buffer (see \fBdlg_add_result\fP).
 .RS
@@ -1141,7 +1172,7 @@ is a list of (pointers to) button labels terminated by a null pointer.
 .TP 5
 .B int * \fIlimit
 the function sets the referenced \fIlimit\fP to the width required for
-the widest label (limited by the screen size)
+the buttons (limited by the screen size)
 if that is wider than the passed-in limit.
 .RE
 .\" ---------------------------------------------------------------------------
@@ -1318,6 +1349,56 @@ item (cursor) when it returns.
 .RE
 .\" ---------------------------------------------------------------------------
 .TP 5
+.B dlg_check_scrolled
+given a function key (or other key that was mapped to a function key),
+check if it is one of the up/down scrolling functions:
+.sp
+.RS
+	DLGK_PAGE_FIRST,
+.br
+	DLGK_PAGE_LAST,
+.br
+	DLGK_GRID_UP,
+.br
+	DLGK_GRID_DOWN,
+.br
+	DLGK_PAGE_PREV or
+.br
+	DLGK_PAGE_NEXT.
+.RE
+.fi
+.IP
+Some widgets use these key bindings for scrolling the prompt-text up and
+down, to allow for display in very small windows.
+.IP
+The function returns 0 (zero) if it finds one of these keys,
+and -1 if not.
+.RS
+.TP 5
+.B int \fIkey
+is the function-key to check
+.TP 5
+.B int \fIlast
+is the number of lines
+which would be used to display the scrolled prompt in
+an arbitrarily tall window.
+It is used here to check limits for the \fIoffset\fP value.
+.TP 5
+.B int \fIpage
+this is the available height for writing scrolled text,
+which is smaller than the window if it contains buttons.
+.TP 5
+.B bool * \fIshow
+on return, holds TRUE if \fBdlg_print_scrolled\fP should be used to redisplay
+the prompt text.
+.TP 5
+.B int * \fIoffset
+on entry, holds the starting line number (counting from zero)
+last used for \fBdlg_print_scrolled\fP.
+On return, holds the updated starting line number.
+.RE
+.\" ---------------------------------------------------------------------------
+.TP 5
 .B dlg_clear
 Set window to the default dialog screen attribute.
 This is set in the rc-file with \fBscreen_color\fP.
@@ -1422,7 +1503,7 @@ is the window to remove.
 .TP 5
 .B dlg_does_output
 This is called each time a widget is invoked which may do output.
-It increments dialog_state.output_count,
+It increments \fBdialog_state.output_count\fP,
 so the output function in \fBdialog\fP can test this and add a separator.
 .\" ---------------------------------------------------------------------------
 .TP 5
@@ -1554,6 +1635,57 @@ is the number of columns (or rows if \fIvertical\fP) allowed for the display.
 .RE
 .\" ---------------------------------------------------------------------------
 .TP 5
+.B dlg_draw_scrollbar
+If \fBdialog_state.use_scrollbar\fP is set,
+draw a scrollbar on the right margin of windows holding scrollable data.
+Also (whether or not the scrollbar is drawn),
+annotate the bottom margin of the window with the percentage of data
+by the bottom of that window,
+and call \fBdlg_draw_arrows2\fP to put markers on the window showing
+when more data is available.
+.RS
+.TP 5
+.B WINDOW * \fIwin
+is the window in which the data is scrolled.
+Because \fIleft\fP, \fIright\fP, \fItop\fP, \fIbottom\fP
+are passed as parameters, this window can contain additional data.
+.TP 5
+.B long \fIfirst_data
+is the zero-based index to the first row of data in the current window.
+.TP 5
+.B long \fIthis_data
+is the zero-based index to the current row of data.
+.TP 5
+.B long \fInext_data
+is the zero-based index to the next data after the current row.
+.TP 5
+.B long \fItotal_data
+is the total number of rows of data.
+.TP 5
+.B int \fIleft
+is the zero-based left margin/column of the window.
+The up/down arrows are draw inset by 5 columns from this point.
+.TP 5
+.B int \fIright
+is the zero-based right margin/column of the window.
+The scrollbar is drawn flush against this column.
+.TP 5
+.B int \fItop
+is the zero-based row within the window on which to draw up-arrows
+as well as a horizontal line to show the window's top.
+.TP 5
+.B int \fIbottom
+is the zero-based row within the window on which to draw down-arrows
+as well as a horizontal line to show the window's bottom.
+.TP 5
+.B chtype \fIattr
+is the window's background attribute.
+.TP 5
+.B chtype \fIborderattr
+is the window's border attribute.
+.RE
+.\" ---------------------------------------------------------------------------
+.TP 5
 .B dlg_draw_shadow
 Draw shadows along the right and bottom edge of a window to give it
 a 3-dimensional look.
@@ -1863,7 +1995,7 @@ is the string to analyze
 Draw the string for the \fBdialog_vars.item_help\fP feature.
 .RS
 .TP 5
-.B char * \fItxt
+.B const char * \fItxt
 is the help-message
 .RE
 .\" ---------------------------------------------------------------------------
@@ -2146,7 +2278,7 @@ If neither, return false.
 .TP 5
 .B dlg_new_modal_window
 Create a modal window, optionally with a shadow.
-The shadow is created if dialog_state.use_shadow is true.
+The shadow is created if \fBdialog_state.use_shadow\fP is true.
 .RS
 .TP 5
 .B WINDOW * \fIparent
@@ -2168,7 +2300,7 @@ is the window's left-column
 .TP 5
 .B dlg_new_window
 Create a window, optionally with a shadow.
-The shadow is created if dialog_state.use_shadow is true.
+The shadow is created if \fBdialog_state.use_shadow\fP is true.
 .RS
 .TP 5
 .B int \fIheight
@@ -2262,6 +2394,38 @@ is the current button index
 .RE
 .\" ---------------------------------------------------------------------------
 .TP 5
+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
+See \fBdlg_check_scrolled\fP for a function which updates the \fIoffset\fP
+variable used as a parameter here.
+It complements this function; you need both.
+If \fIpauseopt\fP is set, this function returns an updated \fIlast\fP
+parameter, needed for \fBdlg_check_scrolled\fP calls.
+.RS
+.TP 5
+.B WINDOW * \fIwin
+is the window to update.
+.TP 5
+.B const char * \fIprompt
+is the string to print
+.TP 5
+.B int \fIoffset
+is the starting line-number to write wrapped text.
+.TP 5
+.B int \fIheight
+is the available height for writing the wrapped text
+.TP 5
+.B int \fIwidth
+is the width that the wrapping should occur in
+.TP 5
+.B int \fIpauseopt
+is true if the extra functionality for scrolling should be enabled.
+If false, this calls \fBdlg_print_autowrap\fP without doing any scrolling.
+.RE
+.\" ---------------------------------------------------------------------------
+.TP 5
 .B dlg_print_line
 Print one line of the prompt in the window within the limits of the
 specified right margin.
@@ -2307,6 +2471,7 @@ if negative provides a way to enumerate extra active areas on the widget.
 Print a string of text in a window, automatically wrap around to the next
 line if the string is too long to fit on one line.
 Note that the string may contain embedded newlines.
+The text is written starting at the top of the window.
 .RS
 .TP 5
 .B WINDOW * \fIwin
@@ -2326,7 +2491,7 @@ is the width that the wrapping should occur in
 .B dlg_print_size
 If \fBdialog_vars.print_siz\fP is true,
 print the given height/width (from a widget)
-to dialog_state.output, e.g.,
+to \fBdialog_state.output\fP, e.g.,
 \fBSize: height, width\fP.
 .RS
 .TP 5
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/dialog.c b/Build/source/utils/dialog/dialog-1.1-20100119/dialog.c
index cb6197b6333..3f718b485eb 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/dialog.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/dialog.c
@@ -1,9 +1,9 @@
 /*
- * $Id: dialog.c,v 1.174 2008/08/19 23:21:36 tom Exp $
+ * $Id: dialog.c,v 1.177 2010/01/18 09:21:14 tom Exp $
  *
  *  cdialog - Display simple dialog boxes from shell scripts
  *
- *  Copyright 2000-2007,2008	Thomas E. Dickey
+ *  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
@@ -56,6 +56,7 @@ typedef enum {
     ,o_column_separator
     ,o_cr_wrap
     ,o_create_rc
+    ,o_date_format
     ,o_default_item
     ,o_defaultno
     ,o_dselect
@@ -111,6 +112,7 @@ typedef enum {
     ,o_quoted
     ,o_radiolist
     ,o_screen_center
+    ,o_scrollbar
     ,o_separate_output
     ,o_separate_widget
     ,o_separator
@@ -126,6 +128,7 @@ typedef enum {
     ,o_tailbox
     ,o_tailboxbg
     ,o_textbox
+    ,o_time_format
     ,o_timebox
     ,o_timeout
     ,o_title
@@ -190,6 +193,7 @@ static const Options options[] = {
     { "column-separator",o_column_separator,	1, "<str>" },
     { "cr-wrap",	o_cr_wrap,		1, "" },
     { "create-rc",	o_create_rc,		1, NULL },
+    { "date-format",	o_date_format,		1, "<str>" },
     { "default-item",	o_default_item,		1, "<str>" },
     { "defaultno",	o_defaultno,		1, "" },
     { "dselect",	o_dselect,		2, "<directory> <height> <width>" },
@@ -249,6 +253,7 @@ static const Options options[] = {
     { "quoted",		o_quoted,		1, "" },
     { "radiolist",	o_radiolist,		2, "<text> <height> <width> <list height> <tag1> <item1> <status1>..." },
     { "screen-center",	o_screen_center,	1, NULL },
+    { "scrollbar",	o_scrollbar,		1, "" },
     { "separate-output",o_separate_output,	1, "" },
     { "separate-widget",o_separate_widget,	1, "<str>" },
     { "separator",	o_separator,		1, NULL },
@@ -264,6 +269,7 @@ static const Options options[] = {
     { "tailbox",	o_tailbox,		2, "<file> <height> <width>" },
     { "tailboxbg",	o_tailboxbg,		2, "<file> <height> <width>" },
     { "textbox",	o_textbox,		2, "<file> <height> <width>" },
+    { "time-format",	o_time_format,		1, "<str>" },
     { "timebox",	o_timebox,		2, "<text> <height> <width> <hour> <minute> <second>" },
     { "timeout",	o_timeout,		1, "<secs>" },
     { "title",		o_title,		1, "<title>" },
@@ -288,16 +294,16 @@ static const Options options[] = {
 static char **
 string_to_argv(char *blob)
 {
-    int n;
+    size_t n;
     int pass;
-    int length = strlen(blob);
+    size_t length = strlen(blob);
     char **result = 0;
 
     for (pass = 0; pass < 2; ++pass) {
 	bool inparm = FALSE;
 	bool quoted = FALSE;
 	char *param = blob;
-	int count = 0;
+	size_t count = 0;
 
 	for (n = 0; n < length; ++n) {
 	    if (quoted && blob[n] == '"') {
@@ -406,7 +412,7 @@ unescape_argv(int *argcp, char ***argvp)
     bool doalloc = FALSE;
     char *filename;
 
-    dialog_opts = dlg_calloc(bool, *argcp + 1);
+    dialog_opts = dlg_calloc(bool, (size_t) *argcp + 1);
     assert_ptr(dialog_opts, "unescape_argv");
 
     for (j = 1; j < *argcp; j++) {
@@ -429,8 +435,8 @@ unescape_argv(int *argcp, char ***argvp)
 		char **list;
 		char *blob;
 		int added;
-		int bytes_read;
-		int length;
+		size_t bytes_read;
+		size_t length;
 		int n;
 
 		if (*filename == '&') {
@@ -460,7 +466,7 @@ unescape_argv(int *argcp, char ***argvp)
 		    list = string_to_argv(blob);
 		    if ((added = count_argv(list)) != 0) {
 			if (added > 2) {
-			    size_t need = (*argcp + added + 1);
+			    size_t need = (size_t) (*argcp + added + 1);
 			    if (doalloc) {
 				*argvp = dlg_realloc(char *, need, *argvp);
 				assert_ptr(*argvp, "unescape_argv");
@@ -473,7 +479,7 @@ unescape_argv(int *argcp, char ***argvp)
 				*argvp = newp;
 				doalloc = TRUE;
 			    }
-			    dialog_opts = dlg_realloc(bool, *argcp + added, dialog_opts);
+			    dialog_opts = dlg_realloc(bool, need, dialog_opts);
 			    assert_ptr(dialog_opts, "unescape_argv");
 			}
 			for (n = *argcp; n >= j + 2; --n) {
@@ -557,7 +563,7 @@ lookupOption(const char *name, int pass)
 }
 
 static void
-Usage(char *msg)
+Usage(const char *msg)
 {
     dlg_exiterr("Error: %s.\nUse --help to list options.\n\n", msg);
 }
@@ -885,7 +891,7 @@ call_form(CALLARGS)
 static int
 call_password_form(CALLARGS)
 {
-    int save = dialog_vars.formitem_type;
+    unsigned save = dialog_vars.formitem_type;
     int result;
 
     dialog_vars.formitem_type = 1;
@@ -1247,6 +1253,9 @@ process_common_options(int argc, char **argv, int offset, bool output)
 	case o_beep_after:
 	    dialog_vars.beep_after_signal = TRUE;
 	    break;
+	case o_scrollbar:
+	    dialog_state.use_scrollbar = TRUE;
+	    break;
 	case o_shadow:
 	    dialog_state.use_shadow = TRUE;
 	    break;
@@ -1363,6 +1372,12 @@ process_common_options(int argc, char **argv, int offset, bool output)
 	case o_help_label:
 	    dialog_vars.help_label = optionString(argv, &offset);
 	    break;
+	case o_date_format:
+	    dialog_vars.date_format = optionString(argv, &offset);
+	    break;
+	case o_time_format:
+	    dialog_vars.time_format = optionString(argv, &offset);
+	    break;
 	case o_keep_tite:
 	    dialog_vars.keep_tite = TRUE;
 	    break;
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/dialog.h b/Build/source/utils/dialog/dialog-1.1-20100119/dialog.h
index a9ca4c38ca8..1c36c398fb3 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/dialog.h
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/dialog.h
@@ -1,9 +1,9 @@
 /*
- *  $Id: dialog.h,v 1.202 2008/07/27 22:20:22 tom Exp $
+ *  $Id: dialog.h,v 1.213 2010/01/19 10:47:42 tom Exp $
  *
  * dialog.h -- common declarations for all dialog modules
  *
- * Copyright 2000-2007,2008 Thomas E. Dickey
+ * 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
@@ -29,6 +29,10 @@
 
 #include <dlg_config.h>
 
+#ifdef __hpux
+#define __HP_CURSES_COMPAT	/* workaround for getattrs, etc. */
+#endif
+
 #include <sys/types.h>
 #include <fcntl.h>
 #include <unistd.h>
@@ -47,12 +51,15 @@
 #include <ncurses/curses.h>
 #elif defined(HAVE_NCURSES_H)
 #include <ncurses.h>
-#elif defined(ultrix)
-#include <cursesX.h>
 #else
 #include <curses.h>
 #endif
 
+/* most curses.h headers include this, some do not */
+#if defined(HAVE_UNCTRL_H)
+#include <unctrl.h>
+#endif
+
 /* possible conflicts with <term.h> which may be included in <curses.h> */
 #ifdef color_names
 #undef color_names
@@ -89,6 +96,7 @@
 #ifdef __hpux
 #undef ACS_UARROW
 #undef ACS_DARROW
+#undef ACS_BLOCK
 #endif
 
 /*
@@ -185,6 +193,9 @@
 #ifndef ACS_DARROW
 #define ACS_DARROW 'v'
 #endif
+#ifndef ACS_BLOCK
+#define ACS_BLOCK '#'
+#endif
 
 /* these definitions may work for antique versions of curses */
 #ifndef HAVE_GETBEGYX
@@ -331,6 +342,10 @@ extern int dlg_getpary(WINDOW * /*win*/);
 /*
  * Callbacks are used to implement the "background" tailbox.
  */
+struct _dlg_callback;
+
+typedef void (*DIALOG_FREEBACK) (struct _dlg_callback * /* p */);
+
 typedef struct _dlg_callback {
     struct _dlg_callback *next;
     FILE *input;
@@ -338,6 +353,10 @@ typedef struct _dlg_callback {
     bool keep_bg;	/* keep in background, on exit */
     bool bg_task;	/* true if this is background task */
     bool (*handle_getc)(struct _dlg_callback *p, int ch, int fkey, int *result);
+    bool keep_win;	/* true to not erase window on exit */
+    /* data for dlg_add_callback_ref */
+    struct _dlg_callback **caller;
+    DIALOG_FREEBACK freeback;
 } DIALOG_CALLBACK;
 
 typedef struct _dlg_windows {
@@ -358,7 +377,7 @@ typedef struct {
     FILE *screen_output;	/* newterm(), etc. */
     bool screen_initialized;
     bool use_colors;		/* use colors by default? */
-    bool use_scrollbar;		/* RESERVED */
+    bool use_scrollbar;		/* option "--scrollbar" */
     bool use_shadow;		/* shadow dialog boxes by default? */
     bool visit_items;		/* option "--visit-items" */
     char *separate_str;		/* option "--separate-widget string" */
@@ -427,11 +446,14 @@ typedef struct {
     bool no_lines;		/* option "--no-lines" */
     /* 1.1-20070930 */
     bool nook;			/* option "--no-ok" */
-    /* 1.2-20080727 */
+    /* 1.1-20080727 */
     bool quoted;		/* option "--quoted" */
     char *column_header;	/* RESERVED "--column-header" */
     char *column_separator;	/* option "--column-separator" */
     char *output_separator;	/* option "--output-separator" */
+    /* 1.1-20100118 */
+    char *date_format;		/* option "--date-format" */
+    char *time_format;		/* option "--time-format" */
 } DIALOG_VARS;
 
 #define USE_ITEM_HELP(s)        (dialog_vars.item_help && (s) != 0)
@@ -466,8 +488,8 @@ typedef struct {
     int hilite;
 #endif
 #ifdef HAVE_RC_FILE
-    char *name;
-    char *comment;
+    const char *name;
+    const char *comment;
 #endif
 } DIALOG_COLORS;
 
@@ -476,7 +498,7 @@ extern DIALOG_COLORS dlg_color_table[];
 /*
  * Function prototypes
  */
-extern char *dialog_version(void);
+extern const char *dialog_version(void);
 
 /* widgets, each in separate files */
 extern int dialog_calendar(const char * /*title*/, const char * /*subtitle*/, int /*height*/, int /*width*/, int /*day*/, int /*month*/, int /*year*/);
@@ -533,6 +555,7 @@ extern int dlg_menu(const char * /*title*/, const char * /*cprompt*/, int /*heig
 /* arrows.c */
 extern void dlg_draw_arrows(WINDOW * /*dialog*/, int /*top_arrow*/, int /*bottom_arrow*/, int /*x*/, int /*top*/, int /*bottom*/);
 extern void dlg_draw_arrows2(WINDOW * /*dialog*/, int /*top_arrow*/, int /*bottom_arrow*/, int /*x*/, int /*top*/, int /*bottom*/, chtype /*attr*/, chtype /*borderattr*/);
+extern void dlg_draw_scrollbar(WINDOW * /*dialog*/, long /* first_data */, long /* this_data */, long /* next_data */, long /* total_data */, int /* left */, int /* right */, int /*top*/, int /*bottom*/, chtype /*attr*/, chtype /*borderattr*/);
 
 /* buttons.c */
 extern const char ** dlg_exit_label(void);
@@ -589,6 +612,7 @@ extern int dlg_getc(WINDOW * /*win*/, int * /*fkey*/);
 extern int dlg_getc_callbacks(int /*ch*/, int /*fkey*/, int * /*result*/);
 extern int dlg_last_getc(void);
 extern void dlg_add_callback(DIALOG_CALLBACK * /*p*/);
+extern void dlg_add_callback_ref(DIALOG_CALLBACK ** /*p*/, DIALOG_FREEBACK /* cleanup */);
 extern void dlg_flush_getc(void);
 extern void dlg_remove_callback(DIALOG_CALLBACK * /*p*/);
 extern void dlg_killall_bg(int *retval);
@@ -608,10 +632,12 @@ extern int dlg_box_x_ordinate(int /*width*/);
 extern int dlg_box_y_ordinate(int /*height*/);
 extern int dlg_calc_list_width(int /*item_no*/, DIALOG_LISTITEM * /*items*/);
 extern int dlg_calc_listw(int /*item_no*/, char ** /*items*/, int /*group*/);
+extern int dlg_check_scrolled(int /* key */, int /* last */, int /* page */, bool */* show */, int */* offset */);
 extern int dlg_default_item(char ** /*items*/, int /*llen*/);
 extern int dlg_default_listitem(DIALOG_LISTITEM * /*items*/);
 extern int dlg_defaultno_button(void);
 extern int dlg_max_input(int /*max_len*/);
+extern int dlg_print_scrolled(WINDOW * /* win */, const char * /* prompt */, int /* offset */, int /* height */, int /* width */, int /* pauseopt */);
 extern void dlg_add_quoted(char * /*string*/);
 extern void dlg_add_result(const char * /*string*/);
 extern void dlg_add_separator(void);
@@ -630,7 +656,7 @@ extern void dlg_draw_bottom_box(WINDOW * /*win*/);
 extern void dlg_draw_box(WINDOW * /*win*/, int /*y*/, int /*x*/, int /*height*/, int /*width*/, chtype /*boxchar*/, chtype /*borderchar*/);
 extern void dlg_draw_title(WINDOW *win, const char *title);
 extern void dlg_exit(int /*code*/) GCC_NORETURN;
-extern void dlg_item_help(char * /*txt*/);
+extern void dlg_item_help(const char * /*txt*/);
 extern void dlg_print_autowrap(WINDOW * /*win*/, const char * /*prompt*/, int /*height*/, int /*width*/);
 extern void dlg_print_size(int /*height*/, int /*width*/);
 extern void dlg_print_text(WINDOW * /*win*/, const char * /*txt*/, int /*len*/, chtype * /*attr*/);
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/dialog.lsm b/Build/source/utils/dialog/dialog-1.1-20100119/dialog.lsm
index be527abbdf9..be527abbdf9 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/dialog.lsm
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/dialog.lsm
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/dialog.pl b/Build/source/utils/dialog/dialog-1.1-20100119/dialog.pl
index 8fbb68fd8eb..8fbb68fd8eb 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/dialog.pl
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/dialog.pl
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/dlg_colors.h b/Build/source/utils/dialog/dialog-1.1-20100119/dlg_colors.h
index f8d8b119106..f8d8b119106 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/dlg_colors.h
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/dlg_colors.h
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/dlg_keys.c b/Build/source/utils/dialog/dialog-1.1-20100119/dlg_keys.c
index 2a141dbd518..97ca8654d06 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/dlg_keys.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/dlg_keys.c
@@ -1,9 +1,9 @@
 /*
- *  $Id: dlg_keys.c,v 1.24 2007/09/30 21:15:42 tom Exp $
+ *  $Id: dlg_keys.c,v 1.26 2009/02/22 16:19:51 tom Exp $
  *
  * dlg_keys.c -- runtime binding support for dialog
  *
- * Copyright 2006,2007 Thomas E. Dickey
+ * Copyright 2006-2007,2009 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
@@ -281,7 +281,11 @@ dlg_result_key(int dialog_key, int fkey GCC_UNUSED, int *resultp)
     if (dialog_key == ESC) {
 	*resultp = DLG_EXIT_ESC;
 	done = TRUE;
+    } else if (dialog_key == ERR) {
+	*resultp = DLG_EXIT_ERROR;
+	done = TRUE;
     }
+
     return done;
 }
 
@@ -542,7 +546,7 @@ make_binding(char *widget, int curses_key, int is_function, int dialog_key)
  *
  * The curses key "should" be one of the names (ignoring case) from
  * curses_names[], but may also be a single control character (prefix "^" or
- * "~" depending on whether it is C0 or C1), or an escaped single character. 
+ * "~" depending on whether it is C0 or C1), or an escaped single character.
  * Binding a printable character with dialog is possible but not useful.
  *
  * The dialog key must be one of the names from dialog_names[].
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/dlg_keys.h b/Build/source/utils/dialog/dialog-1.1-20100119/dlg_keys.h
index 145dd4248cb..6a96c0fec8e 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/dlg_keys.h
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/dlg_keys.h
@@ -1,9 +1,9 @@
 /*
- *  $Id: dlg_keys.h,v 1.22 2007/07/04 11:17:55 tom Exp $
+ *  $Id: dlg_keys.h,v 1.24 2010/01/19 00:57:36 tom Exp $
  *
  * dlg_keys.h -- runtime binding support for dialog
  *
- * Copyright 2005,2007 Thomas E.  Dickey
+ * Copyright 2005-2007,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
@@ -28,8 +28,8 @@
 
 #ifdef USE_WIDE_CURSES
 #include <wctype.h>
-#define dlg_toupper(ch) towupper(ch)
-#define dlg_isupper(ch) iswupper(ch)
+#define dlg_toupper(ch) towupper((wint_t)ch)
+#define dlg_isupper(ch) iswupper((wint_t)ch)
 #else
 #define dlg_toupper(ch) toupper(ch)
 #define dlg_isupper(ch) (isalpha(ch) && isupper(ch))
@@ -112,6 +112,24 @@ typedef enum {
 	DLG_KEYS_DATA( DLGK_GRID_LEFT,	   KEY_LEFT ), \
 	DLG_KEYS_DATA( DLGK_GRID_RIGHT,	   KEY_RIGHT )
 
+#define SCROLLKEY_BINDINGS \
+	DLG_KEYS_DATA( DLGK_GRID_DOWN,	'J' ), \
+	DLG_KEYS_DATA( DLGK_GRID_DOWN,	'j' ), \
+	DLG_KEYS_DATA( DLGK_GRID_DOWN,	KEY_DOWN ), \
+	DLG_KEYS_DATA( DLGK_GRID_UP,	'K' ), \
+	DLG_KEYS_DATA( DLGK_GRID_UP,	'k' ), \
+	DLG_KEYS_DATA( DLGK_GRID_UP,	KEY_UP ), \
+	DLG_KEYS_DATA( DLGK_PAGE_FIRST,	'g' ), \
+	DLG_KEYS_DATA( DLGK_PAGE_FIRST,	KEY_HOME ), \
+	DLG_KEYS_DATA( DLGK_PAGE_LAST,	'G' ), \
+	DLG_KEYS_DATA( DLGK_PAGE_LAST,	KEY_END ), \
+	DLG_KEYS_DATA( DLGK_PAGE_NEXT,	'F' ), \
+	DLG_KEYS_DATA( DLGK_PAGE_NEXT,	'f' ), \
+	DLG_KEYS_DATA( DLGK_PAGE_NEXT,	KEY_NPAGE ), \
+	DLG_KEYS_DATA( DLGK_PAGE_PREV,	'B' ), \
+	DLG_KEYS_DATA( DLGK_PAGE_PREV,	'b' ), \
+	DLG_KEYS_DATA( DLGK_PAGE_PREV,	KEY_PPAGE )
+
 extern int dlg_lookup_key(WINDOW * /*win*/, int /*curses_key*/, int * /*dialog_key*/);
 extern int dlg_result_key(int /*dialog_key*/, int /*fkey*/, int * /*resultp*/);
 extern void dlg_register_buttons(WINDOW * /*win*/, const char * /*name*/, const char ** /*buttons*/);
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/editbox.c b/Build/source/utils/dialog/dialog-1.1-20100119/editbox.c
index f90e44d1820..f5384932201 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/editbox.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/editbox.c
@@ -1,9 +1,9 @@
 /*
- *  $Id: editbox.c,v 1.46 2008/06/21 12:07:54 tom Exp $
+ *  $Id: editbox.c,v 1.53 2010/01/19 00:59:50 tom Exp $
  *
  *  editbox.c -- implements the edit box
  *
- *  Copyright 2007,2008 Thomas E. Dickey
+ *  Copyright 2007-2009,2010 Thomas E. Dickey
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License, version 2.1
@@ -58,7 +58,7 @@ load_list(const char *file, char ***list, int *rows)
     struct stat sb;
     unsigned n, pass;
     unsigned need;
-    unsigned size;
+    size_t size;
 
     *list = 0;
     *rows = 0;
@@ -67,7 +67,7 @@ load_list(const char *file, char ***list, int *rows)
 	(sb.st_mode & S_IFMT) != S_IFREG)
 	dlg_exiterr("Not a file: %s", file);
 
-    size = sb.st_size;
+    size = (size_t) sb.st_size;
     if ((blob = dlg_malloc(char, size + 1)) == 0)
 	  fail_list();
     blob[size] = '\0';
@@ -247,7 +247,7 @@ col_to_chr_offset(const char *text, int col)
     bool found = FALSE;
     int result = 0;
     unsigned n;
-    unsigned len = dlg_count_wchars(text);
+    unsigned len = (unsigned) dlg_count_wchars(text);
 
     for (n = 0; n < len; ++n) {
 	if (cols[n] <= col && cols[n + 1] > col) {
@@ -270,6 +270,36 @@ col_to_chr_offset(const char *text, int col)
 
 #define UPDATE_COL(input) col_offset = dlg_edit_offset(input, chr_offset, box_width)
 
+static int
+widest_line(char **list)
+{
+    int result = MAX_LEN;
+    char *value;
+
+    if (list != 0) {
+	while ((value = *list++) != 0) {
+	    int check = (int) strlen(value);
+	    if (check > result)
+		result = check;
+	}
+    }
+    return result;
+}
+
+#define NAVIGATE_BINDINGS \
+	DLG_KEYS_DATA( DLGK_GRID_DOWN,	KEY_DOWN ), \
+	DLG_KEYS_DATA( DLGK_GRID_RIGHT,	KEY_RIGHT ), \
+	DLG_KEYS_DATA( DLGK_GRID_LEFT,	KEY_LEFT ), \
+	DLG_KEYS_DATA( DLGK_GRID_UP,	KEY_UP ), \
+	DLG_KEYS_DATA( DLGK_FIELD_NEXT,	TAB ), \
+	DLG_KEYS_DATA( DLGK_FIELD_PREV,	KEY_BTAB ), \
+	DLG_KEYS_DATA( DLGK_PAGE_FIRST,	KEY_HOME ), \
+	DLG_KEYS_DATA( DLGK_PAGE_LAST,	KEY_END ), \
+	DLG_KEYS_DATA( DLGK_PAGE_LAST,	KEY_LL ), \
+	DLG_KEYS_DATA( DLGK_PAGE_NEXT,	KEY_NPAGE ), \
+	DLG_KEYS_DATA( DLGK_PAGE_NEXT,	DLGK_MOUSE(KEY_NPAGE) ), \
+	DLG_KEYS_DATA( DLGK_PAGE_PREV,	KEY_PPAGE ), \
+	DLG_KEYS_DATA( DLGK_PAGE_PREV,	DLGK_MOUSE(KEY_PPAGE) )
 /*
  * Display a dialog box for editing a copy of a file
  */
@@ -282,21 +312,14 @@ dlg_editbox(const char *title,
 {
     /* *INDENT-OFF* */
     static DLG_KEYS_BINDING binding[] = {
+	ENTERKEY_BINDINGS,
+	NAVIGATE_BINDINGS,
+	END_KEYS_BINDING
+    };
+    static DLG_KEYS_BINDING binding2[] = {
 	INPUTSTR_BINDINGS,
 	ENTERKEY_BINDINGS,
-	DLG_KEYS_DATA( DLGK_GRID_DOWN,	KEY_DOWN ),
-	DLG_KEYS_DATA( DLGK_GRID_RIGHT,	KEY_RIGHT ),
-	DLG_KEYS_DATA( DLGK_GRID_LEFT,	KEY_LEFT ),
-	DLG_KEYS_DATA( DLGK_GRID_UP,	KEY_UP ),
-	DLG_KEYS_DATA( DLGK_FIELD_NEXT,	TAB ),
-	DLG_KEYS_DATA( DLGK_FIELD_PREV,	KEY_BTAB ),
-	DLG_KEYS_DATA( DLGK_PAGE_FIRST,	KEY_HOME ),
-	DLG_KEYS_DATA( DLGK_PAGE_LAST,	KEY_END ),
-	DLG_KEYS_DATA( DLGK_PAGE_LAST,	KEY_LL ),
-	DLG_KEYS_DATA( DLGK_PAGE_NEXT,	KEY_NPAGE ),
-	DLG_KEYS_DATA( DLGK_PAGE_NEXT,	DLGK_MOUSE(KEY_NPAGE) ),
-	DLG_KEYS_DATA( DLGK_PAGE_PREV,	KEY_PPAGE ),
-	DLG_KEYS_DATA( DLGK_PAGE_PREV,	DLGK_MOUSE(KEY_PPAGE) ),
+	NAVIGATE_BINDINGS,
 	END_KEYS_BINDING
     };
     /* *INDENT-ON* */
@@ -316,20 +339,21 @@ dlg_editbox(const char *title,
     int listsize = size_list(*list);
     int result = DLG_EXIT_UNKNOWN;
     int state;
-    int max_len = dlg_max_input(MAX_LEN);
+    size_t max_len = (size_t) dlg_max_input(widest_line(*list));
     char *input, *buffer;
     bool show_all, show_one, was_mouse;
     WINDOW *dialog;
     WINDOW *editing;
     DIALOG_VARS save_vars;
     const char **buttons = dlg_ok_labels();
+    int mincols = (3 * COLS / 4);
 
     dlg_save_vars(&save_vars);
     dialog_vars.separate_output = TRUE;
 
     dlg_does_output();
 
-    buffer = dlg_malloc(char, max_len);
+    buffer = dlg_malloc(char, max_len + 1);
     assert_ptr(buffer, "dlg_editbox");
 
     thisrow = base_row = lastrow = 0;
@@ -341,7 +365,8 @@ dlg_editbox(const char *title,
     state = dialog_vars.defaultno ? dlg_defaultno_button() : sTEXT;
     key = fkey = 0;
 
-    dlg_auto_size(title, "", &height, &width, 3 * LINES / 4, 3 * COLS / 4);
+    dlg_button_layout(buttons, &mincols);
+    dlg_auto_size(title, "", &height, &width, 3 * LINES / 4, mincols);
     dlg_print_size(height, width);
     dlg_ctl_size(height, width);
 
@@ -382,7 +407,7 @@ dlg_editbox(const char *title,
 			     box_width - (2 * MARGIN),
 			     getbegy(dialog) + box_y + 1,
 			     getbegx(dialog) + box_x + 1);
-    dlg_register_window(editing, "editbox", binding);
+    dlg_register_window(editing, "editbox", binding2);
 
     show_all = TRUE;
     show_one = FALSE;
@@ -408,14 +433,17 @@ dlg_editbox(const char *title,
 	    display_one(editing, THIS_ROW,
 			thisrow, thisrow, base_row, chr_offset);
 	    getyx(editing, y, x);
-	    dlg_draw_arrows2(dialog,
-			     base_row != 0,
-			     base_row + pagesize < listsize,
-			     box_x + ARROWS_COL,
-			     box_y + 0,
-			     box_y + getmaxy(editing) + 1,
-			     dialog_attr,
-			     border_attr);
+	    dlg_draw_scrollbar(dialog,
+			       base_row,
+			       base_row,
+			       base_row + pagesize,
+			       listsize,
+			       box_x,
+			       box_x + getmaxx(editing),
+			       box_y + 0,
+			       box_y + getmaxy(editing) + 1,
+			       dialog_attr,
+			       border_attr);
 	    wmove(editing, y, x);
 	    show_one = FALSE;
 	}
@@ -447,6 +475,13 @@ dlg_editbox(const char *title,
 	}
 
 	key = dlg_mouse_wgetch((state == sTEXT) ? editing : dialog, &fkey);
+	if (key == ERR) {
+	    result = DLG_EXIT_ERROR;
+	    break;
+	} else if (key == ESC) {
+	    result = DLG_EXIT_ESC;
+	    break;
+	}
 	if (state != sTEXT) {
 	    if (dlg_result_key(key, fkey, &result))
 		break;
@@ -520,7 +555,8 @@ dlg_editbox(const char *title,
 			if (thisrow == 0) {
 			    beep();
 			} else {
-			    int len = strlen(THIS_ROW) + strlen(PREV_ROW) + 1;
+			    size_t len = (strlen(THIS_ROW) +
+					  strlen(PREV_ROW) + 1);
 			    char *tmp = dlg_malloc(char, len);
 
 			    assert_ptr(tmp, "dlg_editbox");
@@ -564,7 +600,7 @@ dlg_editbox(const char *title,
 		    continue;
 		}
 	    }
-	    strcpy(buffer, input);
+	    strncpy(buffer, input, max_len - 1)[max_len - 1] = '\0';
 	    edit = dlg_edit_string(buffer, &chr_offset, key, fkey, FALSE);
 
 	    if (edit) {
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/formbox.c b/Build/source/utils/dialog/dialog-1.1-20100119/formbox.c
index e3fa3a97da4..751888c8da3 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/formbox.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/formbox.c
@@ -1,9 +1,9 @@
 /*
- *  $Id: formbox.c,v 1.66 2008/06/21 12:12:05 tom Exp $
+ *  $Id: formbox.c,v 1.70 2010/01/19 01:16:30 tom Exp $
  *
  *  formbox.c -- implements the form (i.e, some pairs label/editbox)
  *
- *  Copyright 2003-2007,2008	Thomas E. Dickey
+ *  Copyright 2003-2009,2010	Thomas E. Dickey
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License, version 2.1
@@ -351,7 +351,7 @@ make_FORM_ELTs(DIALOG_FORMITEM * item,
 	    int max_len = dlg_max_input(MAX(item[i].text_ilen + 1, MAX_LEN));
 	    char *old_text = item[i].text;
 
-	    item[i].text = dlg_malloc(char, max_len + 1);
+	    item[i].text = dlg_malloc(char, (size_t) max_len + 1);
 	    assert_ptr(item[i].text, "make_FORM_ELTs");
 
 	    sprintf(item[i].text, "%.*s", item[i].text_ilen, old_text);
@@ -407,6 +407,17 @@ prev_valid_buttonindex(int state, int extra, bool non_editable)
     return state;
 }
 
+#define NAVIGATE_BINDINGS \
+	DLG_KEYS_DATA( DLGK_FIELD_NEXT, TAB ), \
+	DLG_KEYS_DATA( DLGK_FIELD_PREV, KEY_BTAB ), \
+	DLG_KEYS_DATA( DLGK_ITEM_NEXT,  CHR_NEXT ), \
+	DLG_KEYS_DATA( DLGK_ITEM_NEXT,  KEY_DOWN ), \
+	DLG_KEYS_DATA( DLGK_ITEM_NEXT,  KEY_NEXT ), \
+	DLG_KEYS_DATA( DLGK_ITEM_PREV,  CHR_PREVIOUS ), \
+	DLG_KEYS_DATA( DLGK_ITEM_PREV,  KEY_PREVIOUS ), \
+	DLG_KEYS_DATA( DLGK_ITEM_PREV,  KEY_UP ), \
+	DLG_KEYS_DATA( DLGK_PAGE_NEXT,  KEY_NPAGE ), \
+	DLG_KEYS_DATA( DLGK_PAGE_PREV,  KEY_PPAGE )
 /*
  * Display a form for fulfill a number of fields
  */
@@ -422,18 +433,14 @@ dlg_form(const char *title,
 {
     /* *INDENT-OFF* */
     static DLG_KEYS_BINDING binding[] = {
+	ENTERKEY_BINDINGS,
+	NAVIGATE_BINDINGS,
+	END_KEYS_BINDING
+    };
+    static DLG_KEYS_BINDING binding2[] = {
 	INPUTSTR_BINDINGS,
 	ENTERKEY_BINDINGS,
-	DLG_KEYS_DATA( DLGK_FIELD_NEXT, TAB ),
-	DLG_KEYS_DATA( DLGK_FIELD_PREV, KEY_BTAB ),
-	DLG_KEYS_DATA( DLGK_ITEM_NEXT,  CHR_NEXT ),
-	DLG_KEYS_DATA( DLGK_ITEM_NEXT,  KEY_DOWN ),
-	DLG_KEYS_DATA( DLGK_ITEM_NEXT,  KEY_NEXT ),
-	DLG_KEYS_DATA( DLGK_ITEM_PREV,  CHR_PREVIOUS ),
-	DLG_KEYS_DATA( DLGK_ITEM_PREV,  KEY_PREVIOUS ),
-	DLG_KEYS_DATA( DLGK_ITEM_PREV,  KEY_UP ),
-	DLG_KEYS_DATA( DLGK_PAGE_NEXT,  KEY_NPAGE ),
-	DLG_KEYS_DATA( DLGK_PAGE_PREV,  KEY_PPAGE ),
+	NAVIGATE_BINDINGS,
 	END_KEYS_BINDING
     };
     /* *INDENT-ON* */
@@ -467,6 +474,7 @@ dlg_form(const char *title,
     DIALOG_FORMITEM *current;
 
     make_FORM_ELTs(items, item_no, &min_height, &min_width);
+    dlg_button_layout(buttons, &min_width);
     dlg_does_output();
     dlg_tab_correct_str(prompt);
 
@@ -500,6 +508,7 @@ dlg_form(const char *title,
 
     dialog = dlg_new_window(height, width, y, x);
     dlg_register_window(dialog, "formbox", binding);
+    dlg_register_window(dialog, "formfield", binding2);
     dlg_register_buttons(dialog, "formbox", buttons);
 
     dlg_mouse_setbase(x, y);
@@ -544,11 +553,17 @@ dlg_form(const char *title,
 
 	if (scroll_changed) {
 	    print_form(form, items, item_no, scrollamt, choice);
-	    dlg_draw_arrows(dialog, scrollamt,
-			    scrollamt + form_height < item_no,
-			    box_x + 1,
-			    box_y,
-			    box_y + form_height + 1);
+	    dlg_draw_scrollbar(dialog,
+			       scrollamt,
+			       scrollamt,
+			       scrollamt + form_height + 1,
+			       item_no,
+			       box_x + 1,
+			       box_x + form_width,
+			       box_y,
+			       box_y + form_height + 1,
+			       menubox_attr,
+			       menubox_border_attr);
 	    scroll_changed = FALSE;
 	}
 
@@ -824,23 +839,24 @@ dialog_form(const char *title,
     dlg_save_vars(&save_vars);
     dialog_vars.separate_output = TRUE;
 
-    listitems = dlg_calloc(DIALOG_FORMITEM, item_no + 1);
+    listitems = dlg_calloc(DIALOG_FORMITEM, (size_t) item_no + 1);
     assert_ptr(listitems, "dialog_form");
 
     for (i = 0; i < item_no; ++i) {
 	listitems[i].type = dialog_vars.formitem_type;
 	listitems[i].name = ItemName(i);
-	listitems[i].name_len = strlen(ItemName(i));
+	listitems[i].name_len = (int) strlen(ItemName(i));
 	listitems[i].name_y = dlg_ordinate(ItemNameY(i));
 	listitems[i].name_x = dlg_ordinate(ItemNameX(i));
 	listitems[i].text = ItemText(i);
-	listitems[i].text_len = strlen(ItemText(i));
+	listitems[i].text_len = (int) strlen(ItemText(i));
 	listitems[i].text_y = dlg_ordinate(ItemTextY(i));
 	listitems[i].text_x = dlg_ordinate(ItemTextX(i));
 	listitems[i].text_flen = atoi(ItemTextFLen(i));
 	listitems[i].text_ilen = atoi(ItemTextILen(i));
-	listitems[i].help = (dialog_vars.item_help) ? ItemHelp(i) :
-	    dlg_strempty();
+	listitems[i].help = ((dialog_vars.item_help)
+			     ? ItemHelp(i)
+			     : dlg_strempty());
     }
 
     result = dlg_form(title,
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/fselect.c b/Build/source/utils/dialog/dialog-1.1-20100119/fselect.c
index bfc6dcf2385..d4fcf39c85e 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/fselect.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/fselect.c
@@ -1,9 +1,9 @@
 /*
- * $Id: fselect.c,v 1.70 2008/03/16 13:04:57 tom Exp $
+ * $Id: fselect.c,v 1.73 2010/01/19 01:11:31 tom Exp $
  *
  * fselect.c -- implements the file-selector box
  *
- * Copyright 2000-2007,2008 Thomas E. Dickey
+ * Copyright 2000-2009,2010 Thomas E. Dickey
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License, version 2.1
@@ -240,11 +240,17 @@ display_list(LIST * list)
 
 	top = y - 1;
 	bottom = y + getmaxy(list->win);
-	dlg_draw_arrows(list->par, list->offset,
-			list->length - list->offset > getmaxy(list->win),
-			x + 1,
-			top,
-			bottom);
+	dlg_draw_scrollbar(list->par,
+			   list->offset,
+			   list->offset,
+			   list->offset + getmaxy(list->win),
+			   list->length,
+			   x + 1,
+			   x + getmaxx(list->win),
+			   top,
+			   bottom,
+			   menubox_attr,
+			   menubox_border_attr);
 
 	(void) wmove(list->win, list->choice - list->offset, 0);
 	(void) wnoutrefresh(list->win);
@@ -498,6 +504,18 @@ usable_state(int state, LIST * dirs, LIST * files)
 			: ((state == sDIRS) \
 			  ? &d_list \
 			  : 0))
+#define NAVIGATE_BINDINGS \
+	DLG_KEYS_DATA( DLGK_FIELD_NEXT, KEY_RIGHT ), \
+	DLG_KEYS_DATA( DLGK_FIELD_NEXT, TAB ), \
+	DLG_KEYS_DATA( DLGK_FIELD_PREV, KEY_BTAB ), \
+	DLG_KEYS_DATA( DLGK_ITEM_NEXT,  KEY_DOWN ), \
+	DLG_KEYS_DATA( DLGK_ITEM_NEXT,  CHR_NEXT ), \
+	DLG_KEYS_DATA( DLGK_ITEM_NEXT,  KEY_NEXT ), \
+	DLG_KEYS_DATA( DLGK_ITEM_PREV,  CHR_PREVIOUS ), \
+	DLG_KEYS_DATA( DLGK_ITEM_PREV,  KEY_UP ), \
+	DLG_KEYS_DATA( DLGK_PAGE_NEXT,  KEY_NPAGE ), \
+	DLG_KEYS_DATA( DLGK_PAGE_PREV,  KEY_PPAGE )
+
 /*
  * Display a dialog box for entering a filename
  */
@@ -506,19 +524,14 @@ dlg_fselect(const char *title, const char *path, int height, int width, bool dse
 {
     /* *INDENT-OFF* */
     static DLG_KEYS_BINDING binding[] = {
-	DLG_KEYS_DATA( DLGK_FIELD_PREV, KEY_LEFT ),	/* override inputstr */
+	ENTERKEY_BINDINGS,
+	NAVIGATE_BINDINGS,
+	END_KEYS_BINDING
+    };
+    static DLG_KEYS_BINDING binding2[] = {
 	INPUTSTR_BINDINGS,
 	ENTERKEY_BINDINGS,
-	DLG_KEYS_DATA( DLGK_FIELD_NEXT, KEY_RIGHT ),
-	DLG_KEYS_DATA( DLGK_FIELD_NEXT, TAB ),
-	DLG_KEYS_DATA( DLGK_FIELD_PREV, KEY_BTAB ),
-	DLG_KEYS_DATA( DLGK_ITEM_NEXT,  KEY_DOWN),
-	DLG_KEYS_DATA( DLGK_ITEM_NEXT,  CHR_NEXT ),
-	DLG_KEYS_DATA( DLGK_ITEM_NEXT,  KEY_NEXT ),
-	DLG_KEYS_DATA( DLGK_ITEM_PREV,  CHR_PREVIOUS ),
-	DLG_KEYS_DATA( DLGK_ITEM_PREV,  KEY_UP ),
-	DLG_KEYS_DATA( DLGK_PAGE_NEXT,  KEY_NPAGE ),
-	DLG_KEYS_DATA( DLGK_PAGE_PREV,  KEY_PPAGE ),
+	NAVIGATE_BINDINGS,
 	END_KEYS_BINDING
     };
     /* *INDENT-ON* */
@@ -561,6 +574,8 @@ dlg_fselect(const char *title, const char *path, int height, int width, bool dse
     offset = strlen(input);
     *current = 0;
 
+    dlg_button_layout(buttons, &min_wide);
+
 #ifdef KEY_RESIZE
   retry:
 #endif
@@ -605,6 +620,8 @@ dlg_fselect(const char *title, const char *path, int height, int width, bool dse
 			  tbox_width + (MARGIN + EXT_WIDE),
 			  MOUSE_T, 1, 1, 3 /* doesn't matter */ );
 
+    dlg_register_window(w_text, "fselect", binding2);
+
     /* Draw the directory listing box */
     if (dselect)
 	dbox_width = (width - (6 * MARGIN));
@@ -688,7 +705,7 @@ dlg_fselect(const char *title, const char *path, int height, int width, bool dse
 	} else {
 	    fix_arrows(&d_list);
 	    fix_arrows(&f_list);
-	    key = dlg_mouse_wgetch(dialog, &fkey);
+	    key = dlg_mouse_wgetch((state == sTEXT) ? w_text : dialog, &fkey);
 	    if (dlg_result_key(key, fkey, &result))
 		break;
 	}
@@ -830,6 +847,7 @@ dlg_fselect(const char *title, const char *path, int height, int width, bool dse
 	}
     }
 
+    dlg_unregister_window(w_text);
     dlg_del_window(dialog);
     dlg_mouse_free_regions();
     free_list(&d_list, FALSE);
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/guage.c b/Build/source/utils/dialog/dialog-1.1-20100119/guage.c
new file mode 100644
index 00000000000..a3d5cc0f8a7
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/guage.c
@@ -0,0 +1,300 @@
+/*
+ *  $Id: guage.c,v 1.45 2010/01/19 09:15:20 tom Exp $
+ *
+ * guage.c -- implements the gauge dialog
+ *
+ * Copyright 2000-2007,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
+ *	Marc Ewing, Red Hat Software
+ */
+
+#include <dialog.h>
+
+#include <errno.h>
+
+#define MY_LEN (MAX_LEN)/2
+
+#define MIN_HIGH (4)
+#define MIN_WIDE (10 + 2 * (2 + MARGIN))
+
+#define isMarker(buf) !strncmp(buf, "XXX", 3)
+
+typedef struct {
+    DIALOG_CALLBACK obj;
+    WINDOW *text;
+    bool done;
+    const char *title;
+    char *prompt;
+    char prompt_buf[MY_LEN];
+    int percent;
+    int height;
+    int width;
+    char line[MAX_LEN + 1];
+} MY_OBJ;
+
+static int
+read_data(char *buffer, FILE *fp)
+{
+    int result;
+
+    if (feof(fp)) {
+	result = 0;
+    } else if (fgets(buffer, MY_LEN, fp) != 0) {
+	dlg_trim_string(buffer);
+	result = 1;
+    } else {
+	result = -1;
+    }
+    return result;
+}
+
+static int
+decode_percent(char *buffer)
+{
+    char *tmp = 0;
+    long value = strtol(buffer, &tmp, 10);
+
+    if (tmp != 0 && (*tmp == 0 || isspace(UCH(*tmp))) && value >= 0) {
+	return TRUE;
+    }
+    return FALSE;
+}
+
+static void
+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;
+	}
+	(void) waddch(dialog, ch2);
+    }
+
+    (void) wrefresh(dialog);
+}
+
+static int
+handle_input(MY_OBJ * obj)
+{
+    int status;
+    char buf[MY_LEN];
+
+    if ((status = read_data(buf, dialog_state.pipe_input)) > 0) {
+
+	if (isMarker(buf)) {
+	    /*
+	     * Historically, next line should be percentage, but one of the
+	     * worse-written clones of 'dialog' assumes the number is missing.
+	     * (Gresham's Law applied to software).
+	     */
+	    if ((status = read_data(buf, dialog_state.pipe_input)) > 0) {
+
+		obj->prompt_buf[0] = '\0';
+		if (decode_percent(buf))
+		    obj->percent = atoi(buf);
+		else
+		    strcpy(obj->prompt_buf, buf);
+
+		/* Rest is message text */
+		while ((status = read_data(buf, dialog_state.pipe_input)) > 0
+		       && !isMarker(buf)) {
+		    if (strlen(obj->prompt_buf) + strlen(buf) <
+			sizeof(obj->prompt_buf) - 1) {
+			strcat(obj->prompt_buf, buf);
+		    }
+		}
+
+		if (obj->prompt != obj->prompt_buf)
+		    free(obj->prompt);
+		obj->prompt = obj->prompt_buf;
+	    }
+	} else if (decode_percent(buf)) {
+	    obj->percent = atoi(buf);
+	}
+    } else {
+	obj->done = TRUE;
+    }
+
+    return status;
+}
+
+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 (!fkey && (ch == ERR)) {
+	    if (handle_input(obj) > 0)
+		repaint_text(obj);
+	    else
+		status = FALSE;
+	}
+    } else {
+	status = FALSE;
+    }
+    return status;
+}
+
+static void
+my_cleanup(DIALOG_CALLBACK * cb)
+{
+    MY_OBJ *obj = (MY_OBJ *) cb;
+
+    if (obj != 0) {
+	if (obj->prompt != obj->prompt_buf)
+	    free(obj->prompt);
+    }
+}
+
+/*
+ * Display a gauge, or progress meter.  Starts at percent% and reads stdin.  If
+ * stdin is not XXX, then it is interpreted as a percentage, and the display is
+ * updated accordingly.  Otherwise the next line is the percentage, and
+ * subsequent lines up to another XXX are used for the new prompt.  Note that
+ * the size of the window never changes, so the prompt can not get any larger
+ * than the height and width specified.
+ */
+int
+dialog_gauge(const char *title,
+	     const char *cprompt,
+	     int height,
+	     int width,
+	     int percent)
+{
+#ifdef KEY_RESIZE
+    int old_height = height;
+    int old_width = width;
+#endif
+    int fkey;
+    int ch, result;
+    int x, y;
+    char *prompt = dlg_strclone(cprompt);
+    WINDOW *dialog;
+    MY_OBJ *obj = 0;
+
+    curs_set(0);
+
+    dlg_tab_correct_str(prompt);
+
+#ifdef KEY_RESIZE
+  retry:
+#endif
+
+    dlg_auto_size(title, prompt, &height, &width, MIN_HIGH, MIN_WIDE);
+    dlg_print_size(height, width);
+    dlg_ctl_size(height, width);
+
+    /* center dialog box on screen */
+    x = dlg_box_x_ordinate(width);
+    y = dlg_box_y_ordinate(height);
+
+    dialog = dlg_new_window(height, width, y, x);
+
+    if (obj == 0) {
+	MY_OBJ **objref;
+
+	obj = dlg_calloc(MY_OBJ, 1);
+	assert_ptr(obj, "dialog_gauge");
+
+	objref = &obj;
+	obj->obj.input = dialog_state.pipe_input;
+	obj->obj.win = dialog;
+	obj->obj.keep_win = TRUE;
+	obj->obj.bg_task = TRUE;
+	obj->obj.handle_getc = handle_my_getc;
+	obj->title = title;
+	obj->prompt = prompt;
+	obj->percent = percent;
+	obj->height = height;
+	obj->width = width;
+	dlg_add_callback_ref((DIALOG_CALLBACK **) objref, my_cleanup);
+    }
+
+    repaint_text(obj);
+
+    do {
+	ch = dlg_getc(dialog, &fkey);
+#ifdef KEY_RESIZE
+	if (fkey && ch == KEY_RESIZE) {
+	    /* reset data */
+	    height = old_height;
+	    width = old_width;
+	    /* repaint */
+	    dlg_clear();
+	    dlg_del_window(dialog);
+	    refresh();
+	    dlg_mouse_free_regions();
+	    goto retry;
+	}
+#endif
+    }
+    while (handle_my_getc(&(obj->obj), ch, fkey, &result));
+
+    curs_set(1);
+    dlg_del_window(dialog);
+
+    return (DLG_EXIT_OK);
+}
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/headers-sh.in b/Build/source/utils/dialog/dialog-1.1-20100119/headers-sh.in
index 930f420a8de..930f420a8de 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/headers-sh.in
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/headers-sh.in
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/inputbox.c b/Build/source/utils/dialog/dialog-1.1-20100119/inputbox.c
index 5a8b71f6596..6e83cbc93c3 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/inputbox.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/inputbox.c
@@ -1,9 +1,9 @@
 /*
- *  $Id: inputbox.c,v 1.60 2008/03/16 13:49:48 Yura.Kalinichenko Exp $
+ *  $Id: inputbox.c,v 1.64 2010/01/19 01:03:39 tom Exp $
  *
  * inputbox.c -- implements the input box
  *
- * Copyright 2000-2005,2006 Thomas E. Dickey
+ * Copyright 2000-2009,2010 Thomas E. Dickey
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License, version 2.1
@@ -29,6 +29,14 @@
 
 #define sTEXT -1
 
+#define NAVIGATE_BINDINGS \
+	DLG_KEYS_DATA( DLGK_FIELD_NEXT,	KEY_DOWN ), \
+	DLG_KEYS_DATA( DLGK_FIELD_NEXT,	KEY_RIGHT ), \
+	DLG_KEYS_DATA( DLGK_FIELD_NEXT,	TAB ), \
+	DLG_KEYS_DATA( DLGK_FIELD_PREV,	KEY_BTAB ), \
+	DLG_KEYS_DATA( DLGK_FIELD_PREV,	KEY_LEFT ), \
+	DLG_KEYS_DATA( DLGK_FIELD_PREV,	KEY_UP )
+
 /*
  * Display a dialog box for entering a string
  */
@@ -38,14 +46,14 @@ dialog_inputbox(const char *title, const char *cprompt, int height, int width,
 {
     /* *INDENT-OFF* */
     static DLG_KEYS_BINDING binding[] = {
+	ENTERKEY_BINDINGS,
+	NAVIGATE_BINDINGS,
+	END_KEYS_BINDING
+    };
+    static DLG_KEYS_BINDING binding2[] = {
 	INPUTSTR_BINDINGS,
 	ENTERKEY_BINDINGS,
-	DLG_KEYS_DATA( DLGK_FIELD_NEXT,	KEY_DOWN ),
-	DLG_KEYS_DATA( DLGK_FIELD_NEXT,	KEY_RIGHT ),
-	DLG_KEYS_DATA( DLGK_FIELD_NEXT,	TAB ),
-	DLG_KEYS_DATA( DLGK_FIELD_PREV,	KEY_BTAB ),
-	DLG_KEYS_DATA( DLGK_FIELD_PREV,	KEY_LEFT ),
-	DLG_KEYS_DATA( DLGK_FIELD_PREV,	KEY_UP ),
+	NAVIGATE_BINDINGS,
 	END_KEYS_BINDING
     };
     /* *INDENT-ON* */
@@ -54,6 +62,7 @@ dialog_inputbox(const char *title, const char *cprompt, int height, int width,
     int old_height = height;
     int old_width = width;
 #endif
+    int xorg, yorg;
     int x, y, box_y, box_x, box_width;
     int show_buttons;
     int col_offset = 0;
@@ -64,6 +73,7 @@ dialog_inputbox(const char *title, const char *cprompt, int height, int width,
     int first;
     char *input;
     WINDOW *dialog;
+    WINDOW *editor;
     char *prompt = dlg_strclone(cprompt);
     const char **buttons = dlg_ok_labels();
 
@@ -87,21 +97,22 @@ dialog_inputbox(const char *title, const char *cprompt, int height, int width,
 		      MIN(MAX(dlg_count_columns(init) + 7, 26),
 			  SCOLS - (dialog_vars.begin_set ?
 				   dialog_vars.begin_x : 0)));
-	chr_offset = strlen(init);
+	chr_offset = (int) strlen(init);
     } else {
 	dlg_auto_size(title, prompt, &height, &width, 5, 26);
     }
+    dlg_button_layout(buttons, &width);
     dlg_print_size(height, width);
     dlg_ctl_size(height, width);
 
-    x = dlg_box_x_ordinate(width);
-    y = dlg_box_y_ordinate(height);
+    xorg = dlg_box_x_ordinate(width);
+    yorg = dlg_box_y_ordinate(height);
 
-    dialog = dlg_new_window(height, width, y, x);
+    dialog = dlg_new_window(height, width, yorg, xorg);
     dlg_register_window(dialog, "inputbox", binding);
     dlg_register_buttons(dialog, "inputbox", buttons);
 
-    dlg_mouse_setbase(x, y);
+    dlg_mouse_setbase(xorg, yorg);
 
     dlg_draw_box(dialog, 0, 0, height, width, dialog_attr, border_attr);
     dlg_draw_bottom_box(dialog);
@@ -119,6 +130,10 @@ dialog_inputbox(const char *title, const char *cprompt, int height, int width,
     dlg_draw_box(dialog, y + 1, box_x - 1, 3, box_width + 2,
 		 border_attr, dialog_attr);
 
+    /* Make a window for the input-field, to associate bindings */
+    editor = dlg_sub_window(dialog, 1, box_width, yorg + box_y, xorg + box_x);
+    dlg_register_window(editor, "inputbox", binding2);
+
     while (result == DLG_EXIT_UNKNOWN) {
 	int edit = 0;
 
@@ -133,7 +148,7 @@ dialog_inputbox(const char *title, const char *cprompt, int height, int width,
 	}
 
 	if (!first) {
-	    key = dlg_mouse_wgetch(dialog, &fkey);
+	    key = dlg_mouse_wgetch((state == sTEXT) ? editor : dialog, &fkey);
 	    if (dlg_result_key(key, fkey, &result))
 		break;
 	}
@@ -210,6 +225,7 @@ dialog_inputbox(const char *title, const char *cprompt, int height, int width,
 	}
     }
 
+    dlg_unregister_window(editor);
     dlg_del_window(dialog);
     dlg_mouse_free_regions();
     free(prompt);
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/inputstr.c b/Build/source/utils/dialog/dialog-1.1-20100119/inputstr.c
index ca061b94cf9..4d95e684dc8 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/inputstr.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/inputstr.c
@@ -1,9 +1,9 @@
 /*
- * $Id: inputstr.c,v 1.64 2008/03/16 20:19:43 tom Exp $
+ * $Id: inputstr.c,v 1.66 2010/01/15 23:13:36 tom Exp $
  *
  * inputstr.c -- functions for input/display of a string
  *
- * Copyright 2000-2007,2008 Thomas E. Dickey
+ * Copyright 2000-2009,2010 Thomas E. Dickey
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License, version 2.1
@@ -262,16 +262,16 @@ dlg_count_wcbytes(const char *string, size_t len)
 	if (!same_cache1(&cache, string, len)) {
 	    while (len != 0) {
 		int part = 0;
-		int code = 0;
+		size_t code = 0;
 		const char *src = cache.string;
 		mbstate_t state;
-		int save = cache.string[len];
+		char save = cache.string[len];
 
 		cache.string[len] = '\0';
 		memset(&state, 0, sizeof(state));
 		code = mbsrtowcs((wchar_t *) 0, &src, len, &state);
 		cache.string[len] = save;
-		if (code >= 0) {
+		if ((int) code >= 0) {
 		    break;
 		}
 		++part;
@@ -280,9 +280,9 @@ dlg_count_wcbytes(const char *string, size_t len)
 	    cache.i_len = len;
 	    save_cache(&cache, string);
 	}
-	result = cache.i_len;
+	result = (int) cache.i_len;
     } else {
-	result = len;
+	result = (int) len;
     }
     return result;
 }
@@ -306,23 +306,23 @@ dlg_count_wchars(const char *string)
 	    const char *src = cache.string;
 	    mbstate_t state;
 	    int part = dlg_count_wcbytes(cache.string, len);
-	    int save = cache.string[part];
-	    int code;
+	    char save = cache.string[part];
+	    size_t code;
 	    wchar_t *temp = dlg_calloc(wchar_t, len + 1);
 
 	    cache.string[part] = '\0';
 	    memset(&state, 0, sizeof(state));
-	    code = mbsrtowcs(temp, &src, part, &state);
-	    cache.i_len = (code >= 0) ? wcslen(temp) : 0;
+	    code = mbsrtowcs(temp, &src, (size_t) part, &state);
+	    cache.i_len = ((int) code >= 0) ? wcslen(temp) : 0;
 	    cache.string[part] = save;
 	    free(temp);
 	    save_cache(&cache, string);
 	}
-	result = cache.i_len;
+	result = (int) cache.i_len;
     } else
 #endif /* USE_WIDE_CURSES */
     {
-	result = strlen(string);
+	result = (int) strlen(string);
     }
     return result;
 }
@@ -335,7 +335,7 @@ const int *
 dlg_index_wchars(const char *string)
 {
     static CACHE cache;
-    unsigned len = dlg_count_wchars(string);
+    unsigned len = (unsigned) dlg_count_wchars(string);
     unsigned inx;
 
     load_cache(&cache, string);
@@ -349,7 +349,7 @@ dlg_index_wchars(const char *string)
 		mbstate_t state;
 		int width;
 		memset(&state, 0, sizeof(state));
-		width = mbrlen(current, strlen(current), &state);
+		width = (int) mbrlen(current, strlen(current), &state);
 		if (width <= 0)
 		    width = 1;	/* FIXME: what if we have a control-char? */
 		current += width;
@@ -358,7 +358,7 @@ dlg_index_wchars(const char *string)
 #endif /* USE_WIDE_CURSES */
 	    {
 		(void) current;
-		cache.list[inx] = inx;
+		cache.list[inx] = (int) inx;
 	    }
 	}
 	save_cache(&cache, string);
@@ -390,7 +390,7 @@ const int *
 dlg_index_columns(const char *string)
 {
     static CACHE cache;
-    unsigned len = dlg_count_wchars(string);
+    unsigned len = (unsigned) dlg_count_wchars(string);
     unsigned inx;
 
     load_cache(&cache, string);
@@ -404,7 +404,7 @@ dlg_index_columns(const char *string)
 
 	    for (inx = 0; inx < len; ++inx) {
 		wchar_t temp[2];
-		int check;
+		size_t check;
 		int result;
 
 		if (string[inx_wchars[inx]] == TAB) {
@@ -414,8 +414,9 @@ dlg_index_columns(const char *string)
 		    memset(temp, 0, sizeof(temp));
 		    check = mbrtowc(temp,
 				    string + inx_wchars[inx],
-				    num_bytes - inx_wchars[inx], &state);
-		    if (check <= 0) {
+				    num_bytes - (size_t) inx_wchars[inx],
+				    &state);
+		    if ((int) check <= 0) {
 			result = 1;
 		    } else {
 			result = wcwidth(temp[0]);
@@ -425,7 +426,7 @@ dlg_index_columns(const char *string)
 			cchar_t temp2;
 			setcchar(&temp2, temp, 0, 0, 0);
 			printable = wunctrl(&temp2);
-			result = printable ? wcslen(printable) : 1;
+			result = printable ? (int) wcslen(printable) : 1;
 		    }
 		}
 		cache.list[inx + 1] = result;
@@ -436,7 +437,7 @@ dlg_index_columns(const char *string)
 #endif /* USE_WIDE_CURSES */
 	{
 	    for (inx = 0; inx < len; ++inx) {
-		int ch = UCH(string[inx]);
+		chtype ch = UCH(string[inx]);
 
 		if (ch == TAB)
 		    cache.list[inx + 1] =
@@ -446,7 +447,9 @@ dlg_index_columns(const char *string)
 		else {
 		    const char *printable;
 		    printable = unctrl(ch);
-		    cache.list[inx + 1] = printable ? strlen(printable) : 1;
+		    cache.list[inx + 1] = (printable
+					   ? (int) strlen(printable)
+					   : 1);
 		}
 		if (inx != 0)
 		    cache.list[inx + 1] += cache.list[inx];
@@ -470,7 +473,7 @@ dlg_count_columns(const char *string)
 	const int *cols = dlg_index_columns(string);
 	result = cols[limit];
     } else {
-	result = strlen(string);
+	result = (int) strlen(string);
     }
     return result;
 }
@@ -499,7 +502,7 @@ bool
 dlg_edit_string(char *string, int *chr_offset, int key, int fkey, bool force)
 {
     int i;
-    int len = strlen(string);
+    int len = (int) strlen(string);
     int limit = dlg_count_wchars(string);
     const int *indx = dlg_index_wchars(string);
     int offset = dlg_find_index(indx, limit, *chr_offset);
@@ -595,18 +598,21 @@ dlg_edit_string(char *string, int *chr_offset, int key, int fkey, bool force)
 	case DLGK_FIELD_PREV:
 	    edit = 0;
 	    break;
+	case ERR:
+	    edit = 0;
+	    break;
 	default:
 	    beep();
 	    break;
 	}
     } else {
-	if (key == ESC) {
+	if (key == ESC || key == ERR) {
 	    edit = 0;
 	} else {
 	    if (len < max_len) {
 		for (i = ++len; i > *chr_offset; i--)
 		    string[i] = string[i - 1];
-		string[*chr_offset] = key;
+		string[*chr_offset] = (char) key;
 		*chr_offset += 1;
 	    } else {
 		(void) beep();
@@ -700,7 +706,7 @@ dlg_show_string(WINDOW *win,
 	    int check = cols[i + 1] - cols[scrollamt];
 	    if (check <= x_last) {
 		for (j = indx[i]; j < indx[i + 1]; ++j) {
-		    int ch = UCH(string[j]);
+		    chtype ch = UCH(string[j]);
 		    if (hidden && dialog_vars.insecure) {
 			waddch(win, '*');
 		    } else if (ch == TAB) {
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/install-sh b/Build/source/utils/dialog/dialog-1.1-20100119/install-sh
index 6781b987bdb..6781b987bdb 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/install-sh
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/install-sh
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/makefile.in b/Build/source/utils/dialog/dialog-1.1-20100119/makefile.in
index cd646027d86..926f5a213d5 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/makefile.in
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/makefile.in
@@ -1,4 +1,4 @@
-# $Id: makefile.in,v 1.62 2008/07/20 18:30:36 tom Exp $
+# $Id: makefile.in,v 1.64 2010/01/18 01:27:42 tom Exp $
 # template makefile for DIALOG
 #
 SHELL		= /bin/sh
@@ -40,7 +40,7 @@ CC		= @CC@
 CPP		= @CPP@
 AR		= @AR@
 LDFLAGS		= @LDFLAGS@
-LIBS		= @LIBS@ @INTLDIR_MAKE@ @INTLLIBS@
+LIBS		= @LIBS@ @INTLLIBS@
 RANLIB		= @LIB_PREP@
 
 RM		= rm -f
@@ -68,10 +68,10 @@ PACKAGE		= `echo @PACKAGE@ |sed @program_transform_name@`
 #
 .SUFFIXES: .c .i $o
 .c.i :
-@RULE_CC@
+	@RULE_CC@
 	@ECHO_CC@$(CPP) $(CPPFLAGS) -c $< >$@
 .c$o :
-@RULE_CC@
+	@RULE_CC@
 	@ECHO_CC@$(LIBTOOL_COMPILE) $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CPPFLAGS) -c $<
 
 EXTRAOBJS = @EXTRAOBJS@
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/menubox.c b/Build/source/utils/dialog/dialog-1.1-20100119/menubox.c
index 8a844f84662..4c32bd71667 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/menubox.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/menubox.c
@@ -1,9 +1,9 @@
 /*
- *  $Id: menubox.c,v 1.115 2008/06/20 00:54:16 tom Exp $
+ *  $Id: menubox.c,v 1.118 2010/01/17 22:24:11 tom Exp $
  *
  *  menubox.c -- implements the menu box
  *
- *  Copyright 2000-2007,2008	Thomas E. Dickey
+ *  Copyright 2000-2009,2010	Thomas E. Dickey
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public Licens, version 2.1e
@@ -57,11 +57,17 @@ print_arrows(WINDOW *win,
 	     int item_no,
 	     int menu_height)
 {
-    dlg_draw_arrows(win, scrollamt,
-		    scrollamt + max_choice < item_no,
-		    box_x + tag_x + 1,
-		    box_y,
-		    box_y + menu_height + 1);
+    dlg_draw_scrollbar(win,
+		       scrollamt,
+		       scrollamt,
+		       scrollamt + max_choice,
+		       item_no,
+		       box_x,
+		       box_x + menu_width,
+		       box_y,
+		       box_y + menu_height + 1,
+		       menubox_attr,
+		       menubox_border_attr);
 }
 
 /*
@@ -80,12 +86,12 @@ print_tag(WINDOW *win,
     const int *cols;
     const int *indx;
     int limit;
-    unsigned prefix;
+    int prefix;
 
     cols = dlg_index_columns(item->name);
     indx = dlg_index_wchars(item->name);
     limit = dlg_count_wchars(item->name);
-    prefix = indx[1] - indx[0];
+    prefix = (indx[1] - indx[0]);
 
     /* highlight first char of the tag to be special */
     (void) wmove(win, my_y, tag_x);
@@ -94,7 +100,7 @@ print_tag(WINDOW *win,
 	(void) waddnstr(win, item->name, prefix);
     /* print rest of the string */
     wattrset(win, selected ? tag_selected_attr : tag_attr);
-    if (strlen(item->name) > prefix) {
+    if ((int) strlen(item->name) > prefix) {
 	limit = dlg_limit_columns(item->name, tag_width, 1);
 	if (limit > 0)
 	    (void) waddnstr(win, item->name + indx[1], indx[limit] - indx[1]);
@@ -191,9 +197,9 @@ input_menu_edit(WINDOW *win,
     bool is_inputmenu = TRUE;
     int y = ItemToRow(choice);
     int code = TRUE;
-    int max_len = dlg_max_input(MAX(strlen(items->text) + 1, MAX_LEN));
+    int max_len = dlg_max_input(MAX((int) strlen(items->text) + 1, MAX_LEN));
 
-    result = dlg_malloc(char, max_len);
+    result = dlg_malloc(char, (size_t) max_len);
     assert_ptr(result, "input_menu_edit");
 
     /* original item is used to initialize the input string. */
@@ -345,6 +351,7 @@ dlg_menu(const char *title,
     } else {
 	dlg_auto_size(title, prompt, &height, &width, MIN_HIGH + use_height, 26);
     }
+    dlg_button_layout(buttons, &width);
     dlg_print_size(height, width);
     dlg_ctl_size(height, width);
 
@@ -655,6 +662,9 @@ dlg_menu(const char *title,
 			       Selected,
 			       is_inputmenu);
 		    (void) wnoutrefresh(menu);
+		    print_arrows(dialog,
+				 box_x, box_y,
+				 scrollamt, max_choice, item_no, use_height);
 		    (void) wmove(dialog, cur_y, cur_x);
 		    wrefresh(dialog);
 		}
@@ -780,7 +790,7 @@ dialog_menu(const char *title,
     int i;
     DIALOG_LISTITEM *listitems;
 
-    listitems = dlg_calloc(DIALOG_LISTITEM, item_no + 1);
+    listitems = dlg_calloc(DIALOG_LISTITEM, (size_t) item_no + 1);
     assert_ptr(listitems, "dialog_menu");
 
     for (i = 0; i < item_no; ++i) {
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/mixedform.c b/Build/source/utils/dialog/dialog-1.1-20100119/mixedform.c
index aa2851056d1..aa2851056d1 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/mixedform.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/mixedform.c
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/mixedgauge.c b/Build/source/utils/dialog/dialog-1.1-20100119/mixedgauge.c
index 4ff87907300..d8b355694ab 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/mixedgauge.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/mixedgauge.c
@@ -1,9 +1,9 @@
 /*
- *  $Id: mixedgauge.c,v 1.17 2007/09/30 21:14:38 tom Exp $
+ *  $Id: mixedgauge.c,v 1.18 2010/01/15 23:43:53 tom Exp $
  *
  *  mixedgauge.c -- implements the mixedgauge dialog
  *
- *  Copyright 2007	Thomas E. Dickey
+ *  Copyright 2007,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
@@ -46,12 +46,12 @@ typedef struct {
     DIALOG_LISTITEM *list;
 } DIALOG_MIXEDGAUGE;
 
-static char *
-status_string(char *given, bool * freeMe)
+static const char *
+status_string(char *given, char **freeMe)
 {
-    char *result;
+    const char *result;
 
-    *freeMe = FALSE;
+    *freeMe = 0;
     if (isdigit(UCH(*given))) {
 	switch (*given) {
 	case '0':
@@ -91,7 +91,7 @@ status_string(char *given, bool * freeMe)
     } else if (*given == '-') {
 	unsigned need = strlen(++given);
 	char *temp = dlg_malloc(char, need);
-	*freeMe = TRUE;
+	*freeMe = temp;
 	sprintf(temp, "%3s%%", given);
 	result = temp;
     } else if (!isspace(UCH(*given))) {
@@ -119,8 +119,8 @@ myprint_status(DIALOG_MIXEDGAUGE * dlg)
     int last_y = 0, last_x = 0;
     int j, xxx;
     float percent;
-    char *status = "";
-    bool freeMe;
+    const char *status = "";
+    char *freeMe = 0;
 
     if (win) {
 	rm -= (2 * MARGIN);
@@ -144,14 +144,14 @@ myprint_status(DIALOG_MIXEDGAUGE * dlg)
 
 	(void) wmove(win, y, lm);
 	(void) waddch(win, '[');
-	(void) wmove(win, y, lm + (cells - strlen(status)) / 2);
+	(void) wmove(win, y, lm + (cells - (int) strlen(status)) / 2);
 	if (freeMe) {
 	    (void) wmove(win, y, lm + 1);
 	    wattrset(win, title_attr);
 	    for (j = 0; j < cells; j++)
 		(void) waddch(win, ' ');
 
-	    (void) wmove(win, y, lm + (cells - strlen(status)) / 2);
+	    (void) wmove(win, y, lm + (cells - (int) strlen(status)) / 2);
 	    (void) waddstr(win, status);
 
 	    if ((title_attr & A_REVERSE) != 0) {
@@ -171,10 +171,10 @@ myprint_status(DIALOG_MIXEDGAUGE * dlg)
 		}
 		(void) waddch(win, ch1);
 	    }
-	    free(status);
+	    free(freeMe);
 
 	} else {
-	    (void) wmove(win, y, lm + (cells - strlen(status)) / 2);
+	    (void) wmove(win, y, lm + (cells - (int) strlen(status)) / 2);
 	    (void) waddstr(win, status);
 	}
 	(void) wmove(win, y, limit_x - 3);
@@ -278,14 +278,14 @@ dlg_begin_mixedgauge(DIALOG_MIXEDGAUGE * dlg,
 	dlg->width = dlg->old_width = aWidth;
 	dlg->item_no = aItemNo;
 
-	dlg->list = dlg_calloc(DIALOG_LISTITEM, aItemNo);
+	dlg->list = dlg_calloc(DIALOG_LISTITEM, (size_t) aItemNo);
 	assert_ptr(dlg->list, "dialog_mixedgauge");
 
 	dlg->len_name = 0;
 	dlg->len_text = 15;
 
 	for (n = 0; n < aItemNo; ++n) {
-	    int thisWidth = strlen(ItemName(n));
+	    int thisWidth = (int) strlen(ItemName(n));
 	    if (dlg->len_name < thisWidth)
 		dlg->len_name = thisWidth;
 	    dlg->list[n].name = ItemName(n);
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/mkdirs.sh b/Build/source/utils/dialog/dialog-1.1-20100119/mkdirs.sh
index 59fc39c21ae..59fc39c21ae 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/mkdirs.sh
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/mkdirs.sh
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/mouse.c b/Build/source/utils/dialog/dialog-1.1-20100119/mouse.c
index 1dfcb435ff1..1dfcb435ff1 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/mouse.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/mouse.c
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/mousewget.c b/Build/source/utils/dialog/dialog-1.1-20100119/mousewget.c
index 13a021bfc02..13a021bfc02 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/mousewget.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/mousewget.c
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/msgbox.c b/Build/source/utils/dialog/dialog-1.1-20100119/msgbox.c
index 88e74401a69..91606af024f 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/msgbox.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/msgbox.c
@@ -1,9 +1,9 @@
 /*
- *  $Id: msgbox.c,v 1.58 2007/03/25 20:08:23 Brian.Rolfe Exp $
+ *  $Id: msgbox.c,v 1.64 2010/01/15 10:50:17 tom Exp $
  *
  *  msgbox.c -- implements the message box and info box
  *
- *  Copyright 2000-2006,2007	Thomas E. Dickey
+ *  Copyright 2000-2009,2010	Thomas E. Dickey
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License, version 2.1
@@ -28,86 +28,6 @@
 #include <dlg_keys.h>
 
 /*
- * Display the message in a scrollable window.  Actually the way it works is
- * that we create a "tall" window of the proper width, let the text wrap within
- * that, and copy a slice of the result to the dialog.
- *
- * It works for ncurses.  Other curses implementations show only blanks (Tru64)
- * or garbage (NetBSD).
- */
-static int
-show_message(WINDOW *dialog,
-	     const char *prompt,
-	     int offset,
-	     int page,
-	     int width,
-	     int pauseopt)
-{
-#ifdef NCURSES_VERSION
-    if (pauseopt) {
-	int wide = width - (2 * MARGIN);
-	int high = LINES;
-	int y, x;
-	int len;
-	int percent;
-	WINDOW *dummy;
-	char buffer[5];
-
-#if defined(NCURSES_VERSION_PATCH) && NCURSES_VERSION_PATCH >= 20040417
-	/*
-	 * If we're not limited by the screensize, allow text to possibly be
-	 * one character per line.
-	 */
-	if ((len = dlg_count_columns(prompt)) > high)
-	    high = len;
-#endif
-	dummy = newwin(high, width, 0, 0);
-	wbkgdset(dummy, dialog_attr | ' ');
-	wattrset(dummy, dialog_attr);
-	werase(dummy);
-	dlg_print_autowrap(dummy, prompt, high, width);
-	getyx(dummy, y, x);
-
-	copywin(dummy,		/* srcwin */
-		dialog,		/* dstwin */
-		offset + MARGIN,	/* sminrow */
-		MARGIN,		/* smincol */
-		MARGIN,		/* dminrow */
-		MARGIN,		/* dmincol */
-		page,		/* dmaxrow */
-		wide,		/* dmaxcol */
-		FALSE);
-
-	delwin(dummy);
-
-	/* if the text is incomplete, or we have scrolled, show the percentage */
-	if (y > 0 && wide > 4) {
-	    percent = (int) ((page + offset) * 100.0 / y);
-	    if (percent < 0)
-		percent = 0;
-	    if (percent > 100)
-		percent = 100;
-	    if (offset != 0 || percent != 100) {
-		(void) wattrset(dialog, position_indicator_attr);
-		(void) wmove(dialog, MARGIN + page, wide - 4);
-		(void) sprintf(buffer, "%d%%", percent);
-		(void) waddstr(dialog, buffer);
-		if ((len = strlen(buffer)) < 4) {
-		    wattrset(dialog, border_attr);
-		    whline(dialog, dlg_boxchar(ACS_HLINE), 4 - len);
-		}
-	    }
-	}
-	return (y - page);
-    }
-#endif
-    (void) offset;
-    wattrset(dialog, dialog_attr);
-    dlg_print_autowrap(dialog, prompt, page + 1 + (3 * MARGIN), width);
-    return 0;
-}
-
-/*
  * Display a message box. Program will pause and display an "OK" button
  * if the parameter 'pauseopt' is non-zero.
  */
@@ -119,22 +39,7 @@ dialog_msgbox(const char *title, const char *cprompt, int height, int width,
     static DLG_KEYS_BINDING binding[] = {
 	ENTERKEY_BINDINGS,
 	DLG_KEYS_DATA( DLGK_ENTER,	' ' ),
-	DLG_KEYS_DATA( DLGK_GRID_DOWN,	'J' ),
-	DLG_KEYS_DATA( DLGK_GRID_DOWN,	'j' ),
-	DLG_KEYS_DATA( DLGK_GRID_DOWN,	KEY_DOWN ),
-	DLG_KEYS_DATA( DLGK_GRID_UP,	'K' ),
-	DLG_KEYS_DATA( DLGK_GRID_UP,	'k' ),
-	DLG_KEYS_DATA( DLGK_GRID_UP,	KEY_UP ),
-	DLG_KEYS_DATA( DLGK_PAGE_FIRST,	'g' ),
-	DLG_KEYS_DATA( DLGK_PAGE_FIRST,	KEY_HOME ),
-	DLG_KEYS_DATA( DLGK_PAGE_LAST,	'G' ),
-	DLG_KEYS_DATA( DLGK_PAGE_LAST,	KEY_END ),
-	DLG_KEYS_DATA( DLGK_PAGE_NEXT,	'F' ),
-	DLG_KEYS_DATA( DLGK_PAGE_NEXT,	'f' ),
-	DLG_KEYS_DATA( DLGK_PAGE_NEXT,	KEY_NPAGE ),
-	DLG_KEYS_DATA( DLGK_PAGE_PREV,	'B' ),
-	DLG_KEYS_DATA( DLGK_PAGE_PREV,	'b' ),
-	DLG_KEYS_DATA( DLGK_PAGE_PREV,	KEY_PPAGE ),
+	SCROLLKEY_BINDINGS,
 	DLG_KEYS_DATA( DLGK_FIELD_NEXT,	KEY_DOWN ),
 	DLG_KEYS_DATA( DLGK_FIELD_NEXT, KEY_RIGHT ),
 	DLG_KEYS_DATA( DLGK_FIELD_NEXT, TAB ),
@@ -155,6 +60,7 @@ dialog_msgbox(const char *title, const char *cprompt, int height, int width,
     int offset = 0;
     int check;
     bool show = TRUE;
+    int min_width = (pauseopt == 1 ? 12 : 0);
 
 #ifdef KEY_RESIZE
     int req_high = height;
@@ -162,10 +68,12 @@ dialog_msgbox(const char *title, const char *cprompt, int height, int width,
   restart:
 #endif
 
+    dlg_button_layout(buttons, &min_width);
+
     dlg_tab_correct_str(prompt);
     dlg_auto_size(title, prompt, &height, &width,
 		  (pauseopt == 1 ? 2 : 0),
-		  (pauseopt == 1 ? 12 : 0));
+		  min_width);
     dlg_print_size(height, width);
     dlg_ctl_size(height, width);
 
@@ -198,10 +106,8 @@ dialog_msgbox(const char *title, const char *cprompt, int height, int width,
 
 	while (result == DLG_EXIT_UNKNOWN) {
 	    if (show) {
-		getyx(dialog, y, x);
-		last = show_message(dialog, prompt, offset, page, width, pauseopt);
-		wmove(dialog, y, x);
-		wrefresh(dialog);
+		last = dlg_print_scrolled(dialog, prompt, offset,
+					  page, width, pauseopt);
 		show = FALSE;
 	    }
 	    key = dlg_mouse_wgetch(dialog, &fkey);
@@ -244,46 +150,6 @@ dialog_msgbox(const char *title, const char *cprompt, int height, int width,
 		case DLGK_ENTER:
 		    result = button ? DLG_EXIT_HELP : DLG_EXIT_OK;
 		    break;
-		case DLGK_PAGE_FIRST:
-		    if (offset > 0) {
-			offset = 0;
-			show = TRUE;
-		    }
-		    break;
-		case DLGK_PAGE_LAST:
-		    if (offset < last) {
-			offset = last;
-			show = TRUE;
-		    }
-		    break;
-		case DLGK_GRID_UP:
-		    if (offset > 0) {
-			--offset;
-			show = TRUE;
-		    }
-		    break;
-		case DLGK_GRID_DOWN:
-		    if (offset < last) {
-			++offset;
-			show = TRUE;
-		    }
-		    break;
-		case DLGK_PAGE_PREV:
-		    if (offset > 0) {
-			offset -= page;
-			if (offset < 0)
-			    offset = 0;
-			show = TRUE;
-		    }
-		    break;
-		case DLGK_PAGE_NEXT:
-		    if (offset < last) {
-			offset += page;
-			if (offset > last)
-			    offset = last;
-			show = TRUE;
-		    }
-		    break;
 		case DLGK_MOUSE(0):
 		    result = DLG_EXIT_OK;
 		    break;
@@ -291,6 +157,12 @@ dialog_msgbox(const char *title, const char *cprompt, int height, int width,
 		    result = DLG_EXIT_HELP;
 		    break;
 		default:
+		    if (dlg_check_scrolled(key,
+					   last,
+					   page,
+					   &show,
+					   &offset) == 0)
+			break;
 		    beep();
 		    break;
 		}
@@ -299,7 +171,7 @@ dialog_msgbox(const char *title, const char *cprompt, int height, int width,
 	    }
 	}
     } else {
-	show_message(dialog, prompt, offset, page, width, pauseopt);
+	dlg_print_scrolled(dialog, prompt, offset, page, width, pauseopt);
 	wrefresh(dialog);
 	result = DLG_EXIT_OK;
     }
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/pause.c b/Build/source/utils/dialog/dialog-1.1-20100119/pause.c
index db363b00cc6..4ac13e1e32d 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/pause.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/pause.c
@@ -1,9 +1,9 @@
 /*
- *  $Id: pause.c,v 1.19 2008/03/16 14:19:47 Yura.Kalinichenko Exp $
+ *  $Id: pause.c,v 1.21 2009/02/22 19:12:47 tom Exp $
  *
  *  pause.c -- implements the pause dialog
  *
- *  Copyright 2004-2006,2008	Thomas E. Dickey
+ *  Copyright 2004-2008,2009	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
@@ -88,6 +88,7 @@ dialog_pause(const char *title,
 #endif
 
     dlg_auto_size(title, prompt, &height, &width, 0, 0);
+    dlg_button_layout(buttons, &width);
     dlg_print_size(height, width);
     dlg_ctl_size(height, width);
 
@@ -162,8 +163,12 @@ dialog_pause(const char *title,
 
 	    napms(MY_TIMEOUT);
 	    key = dlg_mouse_wgetch_nowait(dialog, &fkey);
-	    if (dlg_result_key(key, fkey, &result))
-		break;
+	    if (key == ERR) {
+		;		/* ignore errors in nodelay mode */
+	    } else {
+		if (dlg_result_key(key, fkey, &result))
+		    break;
+	    }
 
 	    switch (key) {
 #ifdef KEY_RESIZE
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/po/POTFILES.in b/Build/source/utils/dialog/dialog-1.1-20100119/po/POTFILES.in
index 48ea956a00b..48ea956a00b 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/po/POTFILES.in
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/po/POTFILES.in
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/po/ar.po b/Build/source/utils/dialog/dialog-1.1-20100119/po/ar.po
index 7dbd72c3e52..7dbd72c3e52 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/po/ar.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/po/ar.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/po/be@latin.po b/Build/source/utils/dialog/dialog-1.1-20100119/po/be@latin.po
index 6a45d8d8533..6a45d8d8533 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/po/be@latin.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/po/be@latin.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/po/bg.po b/Build/source/utils/dialog/dialog-1.1-20100119/po/bg.po
index 255776a0cb1..255776a0cb1 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/po/bg.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/po/bg.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/po/ca.po b/Build/source/utils/dialog/dialog-1.1-20100119/po/ca.po
index 985d2e609d8..985d2e609d8 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/po/ca.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/po/ca.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/po/cs.po b/Build/source/utils/dialog/dialog-1.1-20100119/po/cs.po
index b4a40e97dec..b4a40e97dec 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/po/cs.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/po/cs.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/po/cy.po b/Build/source/utils/dialog/dialog-1.1-20100119/po/cy.po
index 39423edf952..39423edf952 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/po/cy.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/po/cy.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/po/da.po b/Build/source/utils/dialog/dialog-1.1-20100119/po/da.po
index bbb73ab9952..b5983695614 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/po/da.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/po/da.po
@@ -1,14 +1,17 @@
-# Dialog
-# Copyright 2001, # Thomas Dickey
-# Morten Brix Pedersen <morten@wtf.dk>, 2001-2005.
+# Danish translation of Dialog.
+# Copyright (C) 2001-2007 Thomas Dickey.
+# This file is distributed under the same license as the Dialog package.
+# Morten Brix Pedersen <morten@wtf.dk>, 2001-2004.
+# Joe Hansen <joedalton2@yahoo.dk>, 2008.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: Dialog\n"
+"Project-Id-Version: dialog-1.1.20070704\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-18 18:26-0400\n"
-"PO-Revision-Date: 2005-01-07 21:02+0200\n"
-"Last-Translator: Morten Brix Pedersen <morten@wtf.dk>\n"
-"Language-Team: Danish <dansk@klid.dk>\n"
+"POT-Creation-Date: 2009-02-22 07:05-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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
@@ -51,13 +54,13 @@ msgstr "Måned"
 msgid "Year"
 msgstr "År"
 
-#: dialog.c:741
+#: dialog.c:744
 msgid "Rename"
 msgstr "Omdøb"
 
 #: fselect.c:550
 msgid "Directories"
-msgstr "Mapper"
+msgstr "Kataloger"
 
 #: fselect.c:551
 msgid "Files"
@@ -65,44 +68,43 @@ msgstr "Filer"
 
 #: mixedgauge.c:58
 msgid "Succeeded"
-msgstr ""
+msgstr "Lykkedes"
 
 #: mixedgauge.c:61
-#, fuzzy
 msgid "Failed"
-msgstr "Filer"
+msgstr "Mislykkedes"
 
 #: mixedgauge.c:64
 msgid "Passed"
-msgstr ""
+msgstr "Bestod"
 
 #: mixedgauge.c:67
 msgid "Completed"
-msgstr ""
+msgstr "Færdig"
 
 #: mixedgauge.c:70
 msgid "Checked"
-msgstr ""
+msgstr "Kontrolleret"
 
 #: mixedgauge.c:73
 msgid "Done"
-msgstr ""
+msgstr "Færdig"
 
 #: mixedgauge.c:76
 msgid "Skipped"
-msgstr ""
+msgstr "Sprunget over"
 
 #: mixedgauge.c:79
 msgid "In Progress"
-msgstr ""
+msgstr "I gang"
 
 #: mixedgauge.c:85
 msgid "N/A"
-msgstr ""
+msgstr "N/A"
 
 #: mixedgauge.c:193
 msgid "Overall Progress"
-msgstr ""
+msgstr "Samlet status"
 
 #: textbox.c:489
 msgid "Search"
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/po/de.po b/Build/source/utils/dialog/dialog-1.1-20100119/po/de.po
index 871e2e79004..413685e3060 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/po/de.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/po/de.po
@@ -1,18 +1,20 @@
 # Dialog
 # Copyright 2001, # Thomas Dickey
+# This file is distributed under the same license as the dialog package.
 #
 # Michael Piefel <piefel@informatik.hu-berlin.de>, 2002.
+# Roland Illig <roland.illig@gmx.de>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: Dialog\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: 2002-05-09 17:56+0200\n"
-"Last-Translator: Michael Piefel <piefel@informatik.hu-berlin.de>\n"
-"Language-Team: German <de@li.org>\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: buttons.c:385
 msgid "Yes"
@@ -36,7 +38,7 @@ msgstr "VERLASSEN"
 
 #: buttons.c:425
 msgid "Extra"
-msgstr ""
+msgstr "Extra"
 
 #: buttons.c:433
 msgid "Help"
@@ -66,46 +68,44 @@ msgstr "Dateien"
 
 #: mixedgauge.c:58
 msgid "Succeeded"
-msgstr ""
+msgstr "Erfolgreich"
 
 #: mixedgauge.c:61
-#, fuzzy
 msgid "Failed"
-msgstr "Dateien"
+msgstr "Fehlgeschlagen"
 
 #: mixedgauge.c:64
 msgid "Passed"
-msgstr ""
+msgstr "Bestanden"
 
 #: mixedgauge.c:67
 msgid "Completed"
-msgstr ""
+msgstr "Abgeschlossen"
 
 #: mixedgauge.c:70
 msgid "Checked"
-msgstr ""
+msgstr "Geprüft"
 
 #: mixedgauge.c:73
 msgid "Done"
-msgstr ""
+msgstr "Erledigt"
 
 #: mixedgauge.c:76
 msgid "Skipped"
-msgstr ""
+msgstr "Übersprungen"
 
 #: mixedgauge.c:79
 msgid "In Progress"
-msgstr ""
+msgstr "In Bearbeitung"
 
 #: mixedgauge.c:85
 msgid "N/A"
-msgstr ""
+msgstr "N/A"
 
 #: mixedgauge.c:193
 msgid "Overall Progress"
-msgstr ""
+msgstr "Gesamtfortschritt"
 
 #: textbox.c:489
-#, fuzzy
 msgid "Search"
 msgstr "Suche"
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/po/dialog.pot b/Build/source/utils/dialog/dialog-1.1-20100119/po/dialog.pot
index 0631e83aee5..0631e83aee5 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/po/dialog.pot
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/po/dialog.pot
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/po/el.po b/Build/source/utils/dialog/dialog-1.1-20100119/po/el.po
index 3b87e8e6034..3b87e8e6034 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/po/el.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/po/el.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/po/eo.po b/Build/source/utils/dialog/dialog-1.1-20100119/po/eo.po
index fa3dbf31a99..fa3dbf31a99 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/po/eo.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/po/eo.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/po/es.po b/Build/source/utils/dialog/dialog-1.1-20100119/po/es.po
index d8884a3ef6f..d8884a3ef6f 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/po/es.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/po/es.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/po/et.po b/Build/source/utils/dialog/dialog-1.1-20100119/po/et.po
index d8757d9f3d1..d8757d9f3d1 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/po/et.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/po/et.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/po/eu.po b/Build/source/utils/dialog/dialog-1.1-20100119/po/eu.po
index 21944143af0..21944143af0 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/po/eu.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/po/eu.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/po/fi.po b/Build/source/utils/dialog/dialog-1.1-20100119/po/fi.po
index ab1f8bd6ada..ab1f8bd6ada 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/po/fi.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/po/fi.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/po/fr.po b/Build/source/utils/dialog/dialog-1.1-20100119/po/fr.po
index a121c21602f..a121c21602f 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/po/fr.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/po/fr.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/po/ga.po b/Build/source/utils/dialog/dialog-1.1-20100119/po/ga.po
index 092a37f7453..092a37f7453 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/po/ga.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/po/ga.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/po/gl.po b/Build/source/utils/dialog/dialog-1.1-20100119/po/gl.po
index 68552c7fa80..68552c7fa80 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/po/gl.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/po/gl.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/po/hi.po b/Build/source/utils/dialog/dialog-1.1-20100119/po/hi.po
index 57459fe9cd3..57459fe9cd3 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/po/hi.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/po/hi.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/po/hr.po b/Build/source/utils/dialog/dialog-1.1-20100119/po/hr.po
index 65248795e70..65248795e70 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/po/hr.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/po/hr.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/po/hu.po b/Build/source/utils/dialog/dialog-1.1-20100119/po/hu.po
index 6975b92be3d..6975b92be3d 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/po/hu.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/po/hu.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/po/id.po b/Build/source/utils/dialog/dialog-1.1-20100119/po/id.po
index b9f2fce9c2d..b4e07c585d9 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/po/id.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/po/id.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: dialog 1.1.20070704\n"
+"Project-Id-Version: dialog 1.1.20080819\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-25 16:06-0500\n"
+"POT-Creation-Date: 2009-03-29 19:30-0400\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"
@@ -15,31 +15,31 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: buttons.c:379
+#: buttons.c:385
 msgid "Yes"
 msgstr "Ya"
 
-#: buttons.c:387
+#: buttons.c:393
 msgid "No"
 msgstr "Tidak"
 
-#: buttons.c:395
+#: buttons.c:401
 msgid "OK"
 msgstr "OK"
 
-#: buttons.c:403
+#: buttons.c:409
 msgid "Cancel"
 msgstr "Batal"
 
-#: buttons.c:411
+#: buttons.c:417
 msgid "EXIT"
 msgstr "KELUAR"
 
-#: buttons.c:419
+#: buttons.c:425
 msgid "Extra"
 msgstr "Ekstra"
 
-#: buttons.c:427
+#: buttons.c:433
 msgid "Help"
 msgstr "Bantuan"
 
@@ -53,15 +53,15 @@ msgstr "Bulan"
 msgid "Year"
 msgstr "Tahun"
 
-#: dialog.c:727
+#: dialog.c:744
 msgid "Rename"
 msgstr "Ganti Nama"
 
-#: fselect.c:548
+#: fselect.c:550
 msgid "Directories"
 msgstr "Kamus"
 
-#: fselect.c:549
+#: fselect.c:551
 msgid "Files"
 msgstr "Berkas"
 
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/is.po b/Build/source/utils/dialog/dialog-1.1-20100119/po/is.po
new file mode 100644
index 00000000000..e9b1e86f5df
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/po/is.po
@@ -0,0 +1,111 @@
+# translation of dialog-1.1.20080819.po to Icelandic
+# This file is distributed under the same license as the dialog package.
+# Copyright 2003-2007,2008 Thomas Dickey
+#
+# Sveinn í Felli <sveinki@nett.is>, 2009.
+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: 2009-09-03 17:02+0000\n"
+"Last-Translator: Sveinn í Felli <sveinki@nett.is>\n"
+"Language-Team: Icelandic <(nothing)>\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
+msgid "Yes"
+msgstr "Já"
+
+#: buttons.c:393
+msgid "No"
+msgstr "Nei"
+
+#: buttons.c:401
+msgid "OK"
+msgstr "Í lagi"
+
+#: buttons.c:409
+msgid "Cancel"
+msgstr "Hætta við"
+
+#: buttons.c:417
+msgid "EXIT"
+msgstr "LOKA"
+
+#: buttons.c:425
+msgid "Extra"
+msgstr "Auka"
+
+#: buttons.c:433
+msgid "Help"
+msgstr "Hjálp"
+
+#. Headline "Month"
+#: calendar.c:273
+msgid "Month"
+msgstr "Mánuður"
+
+#. Headline "Year"
+#: calendar.c:293
+msgid "Year"
+msgstr "Ár"
+
+#: dialog.c:741
+msgid "Rename"
+msgstr "Endurnefna"
+
+#: fselect.c:550
+msgid "Directories"
+msgstr "Möppur"
+
+#: fselect.c:551
+msgid "Files"
+msgstr "Skrár"
+
+#: mixedgauge.c:58
+msgid "Succeeded"
+msgstr "Tókst"
+
+#: mixedgauge.c:61
+msgid "Failed"
+msgstr "Mistókst"
+
+#: mixedgauge.c:64
+msgid "Passed"
+msgstr "Stóðst prófun"
+
+#: mixedgauge.c:67
+msgid "Completed"
+msgstr "Fullgert"
+
+#: mixedgauge.c:70
+msgid "Checked"
+msgstr "Athugað"
+
+#: mixedgauge.c:73
+msgid "Done"
+msgstr "Lokið"
+
+#: mixedgauge.c:76
+msgid "Skipped"
+msgstr "Sleppt"
+
+#: mixedgauge.c:79
+msgid "In Progress"
+msgstr "Í vinnslu"
+
+#: mixedgauge.c:85
+msgid "N/A"
+msgstr "Ekki tiltækt"
+
+#: mixedgauge.c:193
+msgid "Overall Progress"
+msgstr "Heildarframvinda"
+
+#: textbox.c:489
+msgid "Search"
+msgstr "Leita"
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/po/it.po b/Build/source/utils/dialog/dialog-1.1-20100119/po/it.po
index 6aad5d40023..6aad5d40023 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/po/it.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/po/it.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/po/ja.po b/Build/source/utils/dialog/dialog-1.1-20100119/po/ja.po
index 9ab538ca6df..9ab538ca6df 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/po/ja.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/po/ja.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/po/ku.po b/Build/source/utils/dialog/dialog-1.1-20100119/po/ku.po
index 3f78769e709..3f78769e709 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/po/ku.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/po/ku.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/po/lt.po b/Build/source/utils/dialog/dialog-1.1-20100119/po/lt.po
index dd93625a27f..dd93625a27f 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/po/lt.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/po/lt.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/lv.po b/Build/source/utils/dialog/dialog-1.1-20100119/po/lv.po
new file mode 100644
index 00000000000..042920fc57c
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/po/lv.po
@@ -0,0 +1,113 @@
+# 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.
+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: 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"
+"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
+msgid "Yes"
+msgstr "Jā"
+
+#: buttons.c:393
+msgid "No"
+msgstr "Nē"
+
+#: buttons.c:401
+msgid "OK"
+msgstr "Labi"
+
+#: buttons.c:409
+msgid "Cancel"
+msgstr "Atcelt"
+
+#: buttons.c:417
+msgid "EXIT"
+msgstr "IZIET"
+
+#: buttons.c:425
+msgid "Extra"
+msgstr "Papildus"
+
+#: buttons.c:433
+msgid "Help"
+msgstr "Palīdzība"
+
+#. Headline "Month"
+#: calendar.c:273
+msgid "Month"
+msgstr "Mēnesis"
+
+#. Headline "Year"
+#: calendar.c:293
+msgid "Year"
+msgstr "Gads"
+
+#: dialog.c:741
+msgid "Rename"
+msgstr "Pārdēvēt"
+
+#: fselect.c:550
+msgid "Directories"
+msgstr "Direktorijas"
+
+#: fselect.c:551
+msgid "Files"
+msgstr "Faili"
+
+#: mixedgauge.c:58
+msgid "Succeeded"
+msgstr "Izdevies"
+
+#: mixedgauge.c:61
+msgid "Failed"
+msgstr "Neizdevies"
+
+#: mixedgauge.c:64
+msgid "Passed"
+msgstr "Iziets"
+
+#: mixedgauge.c:67
+msgid "Completed"
+msgstr "Pabeigts"
+
+#: mixedgauge.c:70
+msgid "Checked"
+msgstr "Pārbaudīts"
+
+#: mixedgauge.c:73
+msgid "Done"
+msgstr "Pabeigts"
+
+#: mixedgauge.c:76
+msgid "Skipped"
+msgstr "Izlaists"
+
+#: mixedgauge.c:79
+msgid "In Progress"
+msgstr "Tiek apstrādāts"
+
+#: mixedgauge.c:85
+msgid "N/A"
+msgstr "n/z"
+
+#: mixedgauge.c:193
+msgid "Overall Progress"
+msgstr "Vispārējais progress"
+
+#: textbox.c:489
+msgid "Search"
+msgstr "Meklēt"
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/po/makefile.inn b/Build/source/utils/dialog/dialog-1.1-20100119/po/makefile.inn
index dab2964ba97..dab2964ba97 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/po/makefile.inn
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/po/makefile.inn
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/po/mg.po b/Build/source/utils/dialog/dialog-1.1-20100119/po/mg.po
index 558754a4421..558754a4421 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/po/mg.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/po/mg.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/po/mk.po b/Build/source/utils/dialog/dialog-1.1-20100119/po/mk.po
index 898e76e282d..898e76e282d 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/po/mk.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/po/mk.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/po/ms.po b/Build/source/utils/dialog/dialog-1.1-20100119/po/ms.po
index e3167c8af46..e3167c8af46 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/po/ms.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/po/ms.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/po/nb.po b/Build/source/utils/dialog/dialog-1.1-20100119/po/nb.po
index 2781d9992f0..2781d9992f0 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/po/nb.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/po/nb.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/po/nl.po b/Build/source/utils/dialog/dialog-1.1-20100119/po/nl.po
index d57099b9b66..d57099b9b66 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/po/nl.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/po/nl.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/po/pl.po b/Build/source/utils/dialog/dialog-1.1-20100119/po/pl.po
index 3301322c47d..107fd8ccd23 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/po/pl.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/po/pl.po
@@ -1,18 +1,21 @@
 # translation of dialog.po to Polish
+# This file is distributed under the same license as the dialog package.
 # Jaroslaw Swierczynski <swiergot@intersec.pl>, 2003
+# Michał Trzebiatowski <hippie_1968@hotmail.com>, 2009
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: dialog\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: 2003-06-21 17:07+0200\n"
-"Last-Translator: Jaroslaw Swierczynski <swiergot@intersec.pl>\n"
-"Language-Team: Polish <po@lists.intersec.pl>\n"
+"POT-Creation-Date: 2009-03-29 19:30-0400\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.0.1\n"
+"X-Poedit-Language: Polish\n"
+"X-Poedit-Country: POLAND\n"
 
 #: buttons.c:385
 msgid "Yes"
@@ -52,7 +55,7 @@ msgstr "Miesiąc"
 msgid "Year"
 msgstr "Rok"
 
-#: dialog.c:741
+#: dialog.c:744
 msgid "Rename"
 msgstr "Zmień nazwę"
 
@@ -66,46 +69,44 @@ msgstr "Pliki"
 
 #: mixedgauge.c:58
 msgid "Succeeded"
-msgstr ""
+msgstr "Udane"
 
 #: mixedgauge.c:61
-#, fuzzy
 msgid "Failed"
-msgstr "Pliki"
+msgstr "Niepowodzone"
 
 #: mixedgauge.c:64
 msgid "Passed"
-msgstr ""
+msgstr "Przeszłe"
 
 #: mixedgauge.c:67
 msgid "Completed"
-msgstr ""
+msgstr "Zakończone"
 
 #: mixedgauge.c:70
 msgid "Checked"
-msgstr ""
+msgstr "Sprawdzone"
 
 #: mixedgauge.c:73
 msgid "Done"
-msgstr ""
+msgstr "Gotowe"
 
 #: mixedgauge.c:76
 msgid "Skipped"
-msgstr ""
+msgstr "Pominięte"
 
 #: mixedgauge.c:79
 msgid "In Progress"
-msgstr ""
+msgstr "W toku"
 
 #: mixedgauge.c:85
 msgid "N/A"
-msgstr ""
+msgstr "Brak"
 
 #: mixedgauge.c:193
 msgid "Overall Progress"
-msgstr ""
+msgstr "Ogólny postęp"
 
 #: textbox.c:489
-#, fuzzy
 msgid "Search"
-msgstr "Search"
+msgstr "Szukaj"
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/po/pt.po b/Build/source/utils/dialog/dialog-1.1-20100119/po/pt.po
index 4a06e012eda..4a06e012eda 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/po/pt.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/po/pt.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/po/pt_BR.po b/Build/source/utils/dialog/dialog-1.1-20100119/po/pt_BR.po
index 43ae541ada3..af80a8fd156 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/po/pt_BR.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/po/pt_BR.po
@@ -1,18 +1,21 @@
 # Brazilian Portuguese translation of Dialog.
 # Copyright (C) 2001 Thomas Dickey.
-# Frédéric L. W. Meunier <0 @ pervalidus.net>, 2001.
+# This file is distributed under the same license as the dialog package.
+# Frédéric L. W. Meunier <0@pervalidus.net>, 2001.
+# Flamarion Jorge <flamarilinux@yahoo.com.br>, 2009.
+#
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Dialog 0.9a-20020814\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: 2002-09-04 19:12-0300\n"
-"Last-Translator: Frédéric L. W. Meunier <0 @ pervalidus.net>\n"
-"Language-Team: Brazilian Portuguese <ldp-br @ bazar.conectiva.com.br>\n"
+"POT-Creation-Date: 2009-03-29 19:30-0400\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: buttons.c:385
 msgid "Yes"
@@ -36,7 +39,7 @@ msgstr "Sair"
 
 #: buttons.c:425
 msgid "Extra"
-msgstr ""
+msgstr "Extra"
 
 #: buttons.c:433
 msgid "Help"
@@ -52,9 +55,9 @@ msgstr "Mês"
 msgid "Year"
 msgstr "Ano"
 
-#: dialog.c:741
+#: dialog.c:744
 msgid "Rename"
-msgstr ""
+msgstr "Renomear"
 
 #: fselect.c:550
 msgid "Directories"
@@ -66,46 +69,44 @@ msgstr "Arquivos"
 
 #: mixedgauge.c:58
 msgid "Succeeded"
-msgstr ""
+msgstr "Sucesso"
 
 #: mixedgauge.c:61
-#, fuzzy
 msgid "Failed"
-msgstr "Arquivos"
+msgstr "Falhou"
 
 #: mixedgauge.c:64
 msgid "Passed"
-msgstr ""
+msgstr "Passou"
 
 #: mixedgauge.c:67
 msgid "Completed"
-msgstr ""
+msgstr "Completo"
 
 #: mixedgauge.c:70
 msgid "Checked"
-msgstr ""
+msgstr "Checado"
 
 #: mixedgauge.c:73
 msgid "Done"
-msgstr ""
+msgstr "Feito"
 
 #: mixedgauge.c:76
 msgid "Skipped"
-msgstr ""
+msgstr "Pulado"
 
 #: mixedgauge.c:79
 msgid "In Progress"
-msgstr ""
+msgstr "Em Progresso"
 
 #: mixedgauge.c:85
 msgid "N/A"
-msgstr ""
+msgstr "N/A"
 
 #: mixedgauge.c:193
 msgid "Overall Progress"
-msgstr ""
+msgstr "Progresso Global"
 
 #: textbox.c:489
-#, fuzzy
 msgid "Search"
-msgstr "Busca"
+msgstr "Pesquisa"
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/po/rm.po b/Build/source/utils/dialog/dialog-1.1-20100119/po/rm.po
index d4d81977e47..d4d81977e47 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/po/rm.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/po/rm.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/po/ro.po b/Build/source/utils/dialog/dialog-1.1-20100119/po/ro.po
index f680d05a30b..f680d05a30b 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/po/ro.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/po/ro.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/po/ru.po b/Build/source/utils/dialog/dialog-1.1-20100119/po/ru.po
index dd5051ae400..f92328f2453 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/po/ru.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/po/ru.po
@@ -1,20 +1,22 @@
-# translation of ru.po to Russian
+# translation of dialog-1.1.20070704.ru.po to Russian
 # Dialog
 # Copyright 2003, # Thomas Dickey
-# Leonid Kanter <leon@asplinux.ru>, 2004.
+# This file is distributed under the same license as the dialog package.
 #
+# Leonid Kanter <leon@asplinux.ru>, 2004.
+# Yuri Kozlov <yuray@komyakino.ru>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: ru\n"
+"Project-Id-Version: dialog 1.1.20070704\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-18 18:26-0400\n"
-"PO-Revision-Date: 2004-03-26 11:39+0200\n"
-"Last-Translator: Leonid Kanter <leon@asplinux.ru>\n"
-"Language-Team: Russian <ru@li.org>\n"
+"POT-Creation-Date: 2009-02-22 07:05-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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.3.1\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
@@ -55,7 +57,7 @@ msgstr "Месяц"
 msgid "Year"
 msgstr "Год"
 
-#: dialog.c:741
+#: dialog.c:744
 msgid "Rename"
 msgstr "Переименовать"
 
@@ -69,46 +71,44 @@ msgstr "Файлы"
 
 #: mixedgauge.c:58
 msgid "Succeeded"
-msgstr ""
+msgstr "Успешно"
 
 #: mixedgauge.c:61
-#, fuzzy
 msgid "Failed"
-msgstr "Файлы"
+msgstr "Неудачно"
 
 #: mixedgauge.c:64
 msgid "Passed"
-msgstr ""
+msgstr "Пройдено"
 
 #: mixedgauge.c:67
 msgid "Completed"
-msgstr ""
+msgstr "Завершено"
 
 #: mixedgauge.c:70
 msgid "Checked"
-msgstr ""
+msgstr "Проверено"
 
 #: mixedgauge.c:73
 msgid "Done"
-msgstr ""
+msgstr "Выполнено"
 
 #: mixedgauge.c:76
 msgid "Skipped"
-msgstr ""
+msgstr "Пропущено"
 
 #: mixedgauge.c:79
 msgid "In Progress"
-msgstr ""
+msgstr "Выполняется"
 
 #: mixedgauge.c:85
 msgid "N/A"
-msgstr ""
+msgstr "Н/Д"
 
 #: mixedgauge.c:193
 msgid "Overall Progress"
-msgstr ""
+msgstr "Всего выполнено"
 
 #: textbox.c:489
-#, fuzzy
 msgid "Search"
 msgstr "Поиск"
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/po/rw.po b/Build/source/utils/dialog/dialog-1.1-20100119/po/rw.po
index 0aad78f1bea..0aad78f1bea 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/po/rw.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/po/rw.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/po/sq.po b/Build/source/utils/dialog/dialog-1.1-20100119/po/sq.po
index b804bbbc5b7..b804bbbc5b7 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/po/sq.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/po/sq.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/po/sr.po b/Build/source/utils/dialog/dialog-1.1-20100119/po/sr.po
index 9414692d6b5..9414692d6b5 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/po/sr.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/po/sr.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/po/sv.po b/Build/source/utils/dialog/dialog-1.1-20100119/po/sv.po
index ef71d76b4f2..ef71d76b4f2 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/po/sv.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/po/sv.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/po/sw.po b/Build/source/utils/dialog/dialog-1.1-20100119/po/sw.po
new file mode 100644
index 00000000000..eb3ef8d5334
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/po/sw.po
@@ -0,0 +1,110 @@
+# Dialog
+# Copyright 2003-2007,2008 # Thomas Dickey
+# This file is distributed under the same license as the dialog package.
+# Emanuel Feruzi <emanuel.feruzi@trilabs.co.tz>, 2009
+#
+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: 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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: buttons.c:385
+msgid "Yes"
+msgstr "Ndio"
+
+#: buttons.c:393
+msgid "No"
+msgstr "Hapana"
+
+#: buttons.c:401
+msgid "OK"
+msgstr "Sawa"
+
+#: buttons.c:409
+msgid "Cancel"
+msgstr "Ghahiri"
+
+#: buttons.c:417
+msgid "EXIT"
+msgstr "Funga"
+
+#: buttons.c:425
+msgid "Extra"
+msgstr "Nyongeza"
+
+#: buttons.c:433
+msgid "Help"
+msgstr "Msaada"
+
+#. Headline "Month"
+#: calendar.c:273
+msgid "Month"
+msgstr "Mwezi"
+
+#. Headline "Year"
+#: calendar.c:293
+msgid "Year"
+msgstr "Mwaka"
+
+#: dialog.c:741
+msgid "Rename"
+msgstr "Badili jina"
+
+#: fselect.c:550
+msgid "Directories"
+msgstr "Masaraka"
+
+#: fselect.c:551
+msgid "Files"
+msgstr "Mafaili"
+
+#: mixedgauge.c:58
+msgid "Succeeded"
+msgstr "Inefanikiwa"
+
+#: mixedgauge.c:61
+msgid "Failed"
+msgstr "Imeshindwa"
+
+#: mixedgauge.c:64
+msgid "Passed"
+msgstr "Imepita"
+
+#: mixedgauge.c:67
+msgid "Completed"
+msgstr "Imekamilika"
+
+#: mixedgauge.c:70
+msgid "Checked"
+msgstr "Imetikiwa"
+
+#: mixedgauge.c:73
+msgid "Done"
+msgstr "Imemaliza"
+
+#: mixedgauge.c:76
+msgid "Skipped"
+msgstr "Imerukwa"
+
+#: mixedgauge.c:79
+msgid "In Progress"
+msgstr "Inaendelea"
+
+#: mixedgauge.c:85
+msgid "N/A"
+msgstr "Haitumiki"
+
+#: mixedgauge.c:193
+msgid "Overall Progress"
+msgstr "Maendeleo kwa ujumla"
+
+#: textbox.c:489
+msgid "Search"
+msgstr "Tafuta"
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/po/th.po b/Build/source/utils/dialog/dialog-1.1-20100119/po/th.po
index d3dcbf65a6f..d3dcbf65a6f 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/po/th.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/po/th.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/po/tr.po b/Build/source/utils/dialog/dialog-1.1-20100119/po/tr.po
index e6c052f302d..e6c052f302d 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/po/tr.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/po/tr.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/po/uk.po b/Build/source/utils/dialog/dialog-1.1-20100119/po/uk.po
index 47269fe8030..47269fe8030 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/po/uk.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/po/uk.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/po/vi.po b/Build/source/utils/dialog/dialog-1.1-20100119/po/vi.po
index c88fa151f32..5af66005efb 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/po/vi.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/po/vi.po
@@ -1,22 +1,22 @@
 # Vietnamese Translation for Dialog.
 # Copyright 2003,2004,2005 Thomas Dickey (msgid)
-# Copyright © 2007 Free Software Foundation, Inc.
-# This file is distributed under the same license as the dialog-1.0-rel20041222 package.
-# Clytie Siddall <clytie@riverland.net.au>, 2005-2007.
+# Copyright © 2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the dialog package.
+# Clytie Siddall <clytie@riverland.net.au>, 2005-2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: dialog 1.1.20070704\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: 2007-07-26 18:31+0930\n"
+"PO-Revision-Date: 2009-09-24 22:36+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
-"Language-Team: Vietnamese <vi-VN@googlegroups.com> \n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LocFactoryEditor 1.7b1\n"
+"X-Generator: LocFactoryEditor 1.8\n"
 
 #: buttons.c:385
 msgid "Yes"
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/po/wa.po b/Build/source/utils/dialog/dialog-1.1-20100119/po/wa.po
index ac2a6f52564..ac2a6f52564 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/po/wa.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/po/wa.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/po/zh_CN.po b/Build/source/utils/dialog/dialog-1.1-20100119/po/zh_CN.po
index a9707c0b247..367c6bc943c 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/po/zh_CN.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/po/zh_CN.po
@@ -8,39 +8,39 @@ 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: 2007-02-25 16:06-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) <translation-team-zh-cn@lists.sourceforge.net>\n"
+"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: buttons.c:385
+#: buttons.c:379
 msgid "Yes"
 msgstr "是"
 
-#: buttons.c:393
+#: buttons.c:387
 msgid "No"
 msgstr "否"
 
-#: buttons.c:401
+#: buttons.c:395
 msgid "OK"
 msgstr "确认"
 
-#: buttons.c:409
+#: buttons.c:403
 msgid "Cancel"
 msgstr "取消"
 
-#: buttons.c:417
+#: buttons.c:411
 msgid "EXIT"
 msgstr "退出"
 
-#: buttons.c:425
+#: buttons.c:419
 msgid "Extra"
 msgstr "附加"
 
-#: buttons.c:433
+#: buttons.c:427
 msgid "Help"
 msgstr "帮助"
 
@@ -54,15 +54,15 @@ msgstr "月"
 msgid "Year"
 msgstr "年"
 
-#: dialog.c:741
+#: dialog.c:727
 msgid "Rename"
 msgstr "重命名"
 
-#: fselect.c:550
+#: fselect.c:548
 msgid "Directories"
 msgstr "目录"
 
-#: fselect.c:551
+#: fselect.c:549
 msgid "Files"
 msgstr "文件"
 
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/po/zh_TW.po b/Build/source/utils/dialog/dialog-1.1-20100119/po/zh_TW.po
index ebfa74df60f..ebfa74df60f 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/po/zh_TW.po
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/po/zh_TW.po
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/progressbox.c b/Build/source/utils/dialog/dialog-1.1-20100119/progressbox.c
index 5d4b6e4edf8..b470dc11d30 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/progressbox.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/progressbox.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: progressbox.c,v 1.7 2007/04/08 16:33:06 tom Exp $
+ *  $Id: progressbox.c,v 1.8 2010/01/12 10:46:24 tom Exp $
  *
  *  progressbox.c -- implements the progress box
  *
@@ -67,7 +67,7 @@ get_line(MY_OBJ * obj)
 		++col;
 	    }
 	} else {
-	    obj->line[col] = ch;
+	    obj->line[col] = (char) ch;
 	    ++col;
 	}
 	if (col >= MAX_LEN)
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/rc.c b/Build/source/utils/dialog/dialog-1.1-20100119/rc.c
index e8d0dee5bfc..77dd586dfce 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/rc.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/rc.c
@@ -1,9 +1,9 @@
 /*
- *  $Id: rc.c,v 1.43 2008/03/16 18:50:26 tom Exp $
+ *  $Id: rc.c,v 1.45 2010/01/18 10:28:16 tom Exp $
  *
  *  rc.c -- routines for processing the configuration file
  *
- *  Copyright 2000-2007,2008	Thomas E. Dickey
+ *  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
@@ -151,7 +151,7 @@ find_vars(char *name)
 
     for (i = 0; i < VAR_COUNT; i++) {
 	if (dlg_strcmp(vars[i].name, name) == 0) {
-	    result = i;
+	    result = (int) i;
 	    break;
 	}
     }
@@ -268,7 +268,7 @@ str_to_attr(char *str, int *fg, int *bg, int *hl)
     part = tempstr + i;		/* set 'part' to start of highlight string */
 
     /* trim trailing white space from highlight string */
-    i = strlen(part) - 1;
+    i = (int) strlen(part) - 1;
     while (whitespace(part[i]) && i > 0)
 	i--;
     part[i + 1] = '\0';
@@ -366,7 +366,7 @@ parse_line(char *line, char **var, char **value)
 	*value = line + i;	/* set 'value' to value string */
 
     /* trim trailing white space from 'value' */
-    i = strlen(*value) - 1;
+    i = (int) strlen(*value) - 1;
     while (whitespace((*value)[i]) && i > 0)
 	i--;
     (*value)[i + 1] = '\0';
@@ -499,6 +499,7 @@ dlg_parse_rc(void)
 
     /* Scan each line and set variables */
     while ((result == 0) && (fgets(str, MAX_LEN, rc_file) != NULL)) {
+	dlg_trace_msg("rc:%s\n", str);
 	if (*str == '\0' || lastch(str) != '\n') {
 	    /* ignore rest of file if line too long */
 	    fprintf(stderr, "\nParse error: line %d of configuration"
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/README b/Build/source/utils/dialog/dialog-1.1-20100119/samples/README
index 91f668f014e..91f668f014e 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/README
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/README
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/calendar b/Build/source/utils/dialog/dialog-1.1-20100119/samples/calendar
new file mode 100755
index 00000000000..e984bcea186
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/calendar
@@ -0,0 +1,11 @@
+#!/bin/sh
+# $Id: calendar,v 1.9 2010/01/13 10:20:33 tom Exp $
+
+. ./setup-vars
+
+exec 3>&1
+RESULT=`$DIALOG --title "CALENDAR" "$@" --calendar "Please choose a date..." 0 0 7 7 1981 2>&1 1>&3`
+retval=$?
+exec 3>&-
+
+. ./report-string
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/calendar-stdout b/Build/source/utils/dialog/dialog-1.1-20100119/samples/calendar-stdout
new file mode 100755
index 00000000000..5dbbbce9d05
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/calendar-stdout
@@ -0,0 +1,9 @@
+#!/bin/sh
+# $Id: calendar-stdout,v 1.6 2010/01/13 10:20:03 tom Exp $
+
+. ./setup-vars
+
+RESULT=`$DIALOG --stdout --title "CALENDAR" "$@" --calendar "Please choose a date..." 0 0 7 7 1981`
+retval=$?
+
+. ./report-string
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/calendar2 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/calendar2
new file mode 100755
index 00000000000..f6214ce662c
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/calendar2
@@ -0,0 +1,11 @@
+#!/bin/sh
+# $Id: calendar2,v 1.8 2010/01/13 10:20:03 tom Exp $
+
+. ./setup-vars
+
+exec 3>&1
+RESULT=`$DIALOG --title "CALENDAR" "$@" --calendar "Please choose a date..." 0 0 2>&1 1>&3`
+retval=$?
+exec 3>&-
+
+. ./report-string
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/calendar2-stdout b/Build/source/utils/dialog/dialog-1.1-20100119/samples/calendar2-stdout
new file mode 100755
index 00000000000..af731d9d226
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/calendar2-stdout
@@ -0,0 +1,9 @@
+#!/bin/sh
+# $Id: calendar2-stdout,v 1.6 2010/01/13 10:20:03 tom Exp $
+
+. ./setup-vars
+
+RESULT=`$DIALOG --stdout --title "CALENDAR" "$@" --calendar "Please choose a date..." 0 0`
+retval=$?
+
+. ./report-string
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/calendar3 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/calendar3
new file mode 100755
index 00000000000..aece69ceb4f
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/calendar3
@@ -0,0 +1,11 @@
+#!/bin/sh
+# $Id: calendar3,v 1.9 2010/01/13 10:20:03 tom Exp $
+
+. ./setup-vars
+
+exec 3>&1
+RESULT=`$DIALOG --extra-button --extra-label "Hold" --help-button --title "CALENDAR" "$@" --calendar "Please choose a date..." 0 0 7 7 1981 2>&1 1>&3`
+retval=$?
+exec 3>&-
+
+. ./report-string
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/calendar3-stdout b/Build/source/utils/dialog/dialog-1.1-20100119/samples/calendar3-stdout
new file mode 100755
index 00000000000..4b7ecdbeafb
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/calendar3-stdout
@@ -0,0 +1,9 @@
+#!/bin/sh
+# $Id: calendar3-stdout,v 1.6 2010/01/13 10:20:03 tom Exp $
+
+. ./setup-vars
+
+RESULT=`$DIALOG --extra-button --extra-label "Hold" --help-button --stdout --title "CALENDAR" "$@" --calendar "Please choose a date..." 0 0 7 7 1981`
+retval=$?
+
+. ./report-string
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/checklist b/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist
index 729bef76a25..be3c8c69304 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/checklist
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist
@@ -1,16 +1,12 @@
 #! /bin/sh
-# $Id: checklist,v 1.8 2004/12/20 00:14:24 tom Exp $
-: ${DIALOG=dialog}
+# $Id: checklist,v 1.14 2010/01/13 10:20:03 tom Exp $
 
-: ${DIALOG_OK=0}
-: ${DIALOG_CANCEL=1}
-: ${DIALOG_ESC=255}
+. ./setup-vars
 
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
+. ./setup-tempfile
 
 $DIALOG --backtitle "No Such Organization" \
-	--title "CHECKLIST BOX" \
+	--title "CHECKLIST BOX" "$@" \
         --checklist "Hi, this is a checklist box. You can use this to \n\
 present a list of choices which can be turned on or \n\
 off. If there are more items than can fit on the \n\
@@ -29,14 +25,4 @@ Press SPACE to toggle an option on/off. \n\n\
 
 retval=$?
 
-choice=`cat $tempfile`
-case $retval in
-  $DIALOG_OK)
-    echo "'$choice' chosen.";;
-  $DIALOG_CANCEL)
-    echo "Cancel pressed.";;
-  $DIALOG_ESC)
-    echo "ESC pressed.";;
-  *)
-    echo "Unexpected return code: $retval (ok would be $DIALOG_OK)";;
-esac
+. ./report-tempfile
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/checklist-8bit b/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist-8bit
index 755511e1d4c..20b23f13c27 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/checklist-8bit
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist-8bit
@@ -1,18 +1,14 @@
 #! /bin/sh
-# $Id: checklist-8bit,v 1.1 2004/12/19 16:47:52 tom Exp $
-: ${DIALOG=dialog}
+# $Id: checklist-8bit,v 1.8 2010/01/13 10:20:03 tom Exp $
 
-: ${DIALOG_OK=0}
-: ${DIALOG_CANCEL=1}
-: ${DIALOG_ESC=255}
+. ./setup-vars
 
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
+. ./setup-tempfile
 
 . ./testdata-8bit
 
 $DIALOG --backtitle "No Such Organization" \
-	--title "CHECKLIST BOX" \
+	--title "CHECKLIST BOX" "$@" \
         --checklist "Hi, this is a checklist box. You can use this to \n\
 present a list of choices which can be turned on or \n\
 off. If there are more items than can fit on the \n\
@@ -31,14 +27,4 @@ Press SPACE to toggle an option on/off. \n\n\
 
 retval=$?
 
-choice=`cat $tempfile`
-case $retval in
-  $DIALOG_OK)
-    echo "'$choice' chosen.";;
-  $DIALOG_CANCEL)
-    echo "Cancel pressed.";;
-  $DIALOG_ESC)
-    echo "ESC pressed.";;
-  *)
-    echo "Unexpected return code: $retval (ok would be $DIALOG_OK)";;
-esac
+. ./report-tempfile
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/checklist-utf8 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist-utf8
index f91f20c2bab..12ed7239502 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/checklist-utf8
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist-utf8
@@ -1,25 +1,14 @@
 #! /bin/sh
-# $Id: checklist-utf8,v 1.4 2007/10/21 21:46:57 tom Exp $
-: ${DIALOG=dialog}
+# $Id: checklist-utf8,v 1.12 2010/01/13 10:20:03 tom Exp $
 
-: ${DIALOG_OK=0}
-: ${DIALOG_CANCEL=1}
-: ${DIALOG_ESC=255}
+. ./setup-vars
 
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
+. ./setup-tempfile
 
-case none"$LANG$LC_ALL$LC_CTYPE" in
-*UTF-8*)
-	;;
-*)
-	echo "This script must be run in a UTF-8 locale"
-	exit 1
-	;;
-esac
+. ./setup-utf8
 
 $DIALOG --backtitle "No Such Organization" \
-	--title "CHECKLIST BOX" \
+	--title "CHECKLIST BOX" "$@" \
         --checklist "Hi, this is a checklist box. You can use this to \n\
 present a list of choices which can be turned on or \n\
 off. If there are more items than can fit on the \n\
@@ -38,14 +27,4 @@ Press SPACE to toggle an option on/off. \n\n\
 
 retval=$?
 
-choice=`cat $tempfile`
-case $retval in
-  $DIALOG_OK)
-    echo "'$choice' chosen.";;
-  $DIALOG_CANCEL)
-    echo "Cancel pressed.";;
-  $DIALOG_ESC)
-    echo "ESC pressed.";;
-  *)
-    echo "Unexpected return code: $retval (ok would be $DIALOG_OK)";;
-esac
+. ./report-tempfile
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/checklist1 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist1
index 4db17063963..a0e19b6c81d 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/checklist1
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist1
@@ -1,16 +1,12 @@
 #! /bin/sh
-# $Id: checklist1,v 1.3 2004/12/20 00:14:24 tom Exp $
-: ${DIALOG=dialog}
+# $Id: checklist1,v 1.10 2010/01/13 10:20:03 tom Exp $
 
-: ${DIALOG_OK=0}
-: ${DIALOG_CANCEL=1}
-: ${DIALOG_ESC=255}
+. ./setup-vars
 
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
+. ./setup-tempfile
 
 $DIALOG --backtitle "No Such Organization" \
-	--title "CHECKLIST BOX" \
+	--title "CHECKLIST BOX" "$@" \
         --checklist "Hi, this is a checklist box. You can use this to \n\
 present a list of choices which can be turned on or \n\
 off. If there are more items than can fit on the \n\
@@ -29,14 +25,4 @@ Press SPACE to toggle an option on/off. \n\n\
 
 retval=$?
 
-choice=`cat $tempfile`
-case $retval in
-  $DIALOG_OK)
-    echo "'$choice' chosen.";;
-  $DIALOG_CANCEL)
-    echo "Cancel pressed.";;
-  $DIALOG_ESC)
-    echo "ESC pressed.";;
-  *)
-    echo "Unexpected return code: $retval (ok would be $DIALOG_OK)";;
-esac
+. ./report-tempfile
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/checklist10 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist10
index fe30f2ea6a5..2ebd5575a8c 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/checklist10
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist10
@@ -1,14 +1,14 @@
 #! /bin/sh
-# $Id: checklist10,v 1.2 2004/07/31 11:12:00 tom Exp $
+# $Id: checklist10,v 1.9 2010/01/13 10:20:03 tom Exp $
 # zero-width column
-: ${DIALOG=dialog}
 
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
+. ./setup-vars
+
+. ./setup-tempfile
 
 $DIALOG \
 	--backtitle "No such organization" \
-	--title "CHECKLIST BOX" \
+	--title "CHECKLIST BOX" "$@" \
         --checklist "Hi, this is a checklist box. You can use this to \n\
 present a list of choices which can be turned on or \n\
 off. If there are more items than can fit on the \n\
@@ -27,14 +27,4 @@ Press SPACE to toggle an option on/off. \n\n\
 
 retval=$?
 
-choice=`cat $tempfile`
-case $retval in
-  0)
-    echo "'$choice' chosen.";;
-  1)
-    echo "Cancel pressed.";;
-  255)
-    echo "ESC pressed.";;
-  *)
-    echo "Unexpected code $retval";;
-esac
+. ./report-tempfile
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist11 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist11
new file mode 100755
index 00000000000..85e234991f8
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist11
@@ -0,0 +1,33 @@
+#! /bin/sh
+# $Id: checklist11,v 1.1 2010/01/17 23:04:01 tom Exp $
+
+. ./setup-vars
+
+. ./setup-tempfile
+
+$DIALOG --backtitle "No Such Organization" \
+	--title "CHECKLIST BOX" "$@" \
+        --checklist "Hi, this is a checklist box. You can use this to \n\
+present a list of choices which can be turned on or \n\
+off. If there are more items than can fit on the \n\
+screen, the list will be scrolled. You can use the \n\
+UP/DOWN arrow keys, the first letter of the choice as a \n\
+hot key, or the number keys 1-9 to choose an option. \n\
+Press SPACE to toggle an option on/off. \n\n\
+  Which of the following are fruits?" 20 61 5 \
+        "" "It's an apple." off \
+        "Dog"    "No1, that's not my dog." ON \
+        "Dog2"   "No2, that's not my dog." OFF \
+        "Dog3"   "No3, that's not my dog." OFF \
+        "Dog4"   "No4, that's not my dog." OFF \
+        "Dog5"   "No5, that's not my dog." OFF \
+        "Dog6"   "No6, that's not my dog." OFF \
+        "Orange" "Yeah, that's juicy." off \
+        "Chicken"    "" off \
+        "Cat"    "No, never put a dog and a cat together!" oN \
+        "Fish"   "Cats like fish." On \
+        "Lemon"  "You know how it tastes." on 2> $tempfile
+
+retval=$?
+
+. ./report-tempfile
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/checklist2 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist2
index b2314a7039c..c672a682e1b 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/checklist2
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist2
@@ -1,12 +1,12 @@
 #! /bin/sh
-# $Id: checklist2,v 1.4 2004/12/20 00:14:24 tom Exp $
-: ${DIALOG=dialog}
+# $Id: checklist2,v 1.11 2010/01/13 10:20:03 tom Exp $
 
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
+. ./setup-vars
+
+. ./setup-tempfile
 
 $DIALOG --item-help --backtitle "No Such Organization" \
-	--title "CHECKLIST BOX" \
+	--title "CHECKLIST BOX" "$@" \
         --checklist "Hi, this is a checklist box. You can use this to \n\
 present a list of choices which can be turned on or \n\
 off. If there are more items than can fit on the \n\
@@ -25,16 +25,4 @@ Press SPACE to toggle an option on/off. \n\n\
 
 retval=$?
 
-choice=`cat $tempfile`
-case $retval in
-  0)
-    echo "OK '$choice' chosen.";;
-  1)
-    echo "Cancel pressed.";;
-  2)
-    echo "HELP '$choice' chosen.";;
-  255)
-    echo "ESC pressed.";;
-  *)
-    echo "Unexpected code $retval";;
-esac
+. ./report-tempfile
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/checklist3 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist3
index d7574a68bd6..ce713d4546b 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/checklist3
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist3
@@ -1,12 +1,12 @@
 #! /bin/sh
-# $Id: checklist3,v 1.4 2004/12/20 00:14:24 tom Exp $
-: ${DIALOG=dialog}
+# $Id: checklist3,v 1.11 2010/01/13 10:20:03 tom Exp $
 
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
+. ./setup-vars
+
+. ./setup-tempfile
 
 $DIALOG --item-help --backtitle "No Such Organization" \
-	--title "CHECKLIST BOX" \
+	--title "CHECKLIST BOX" "$@" \
         --checklist "Hi, this is a checklist box. You can use this to \n\
 present a list of choices which can be turned on or \n\
 off. If there are more items than can fit on the \n\
@@ -25,16 +25,4 @@ Press SPACE to toggle an option on/off. \n\n\
 
 retval=$?
 
-choice=`cat $tempfile`
-case $retval in
-  0)
-    echo "OK '$choice' chosen.";;
-  1)
-    echo "Cancel pressed.";;
-  2)
-    echo "HELP '$choice' chosen.";;
-  255)
-    echo "ESC pressed.";;
-  *)
-    echo "Unexpected code $retval";;
-esac
+. ./report-tempfile
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/checklist4 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist4
index 434bdda5570..53adeedf95a 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/checklist4
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist4
@@ -1,12 +1,12 @@
 #! /bin/sh
-# $Id: checklist4,v 1.5 2004/12/20 00:14:24 tom Exp $
-: ${DIALOG=dialog}
+# $Id: checklist4,v 1.12 2010/01/13 10:20:03 tom Exp $
 
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
+. ./setup-vars
+
+. ./setup-tempfile
 
 $DIALOG --help-button --item-help --backtitle "No Such Organization" \
-	--title "CHECKLIST BOX" \
+	--title "CHECKLIST BOX" "$@" \
         --checklist "Hi, this is a checklist box. You can use this to \n\
 present a list of choices which can be turned on or \n\
 off. If there are more items than can fit on the \n\
@@ -25,16 +25,4 @@ Press SPACE to toggle an option on/off. \n\n\
 
 retval=$?
 
-choice=`cat $tempfile`
-case $retval in
-  0)
-    echo "OK '$choice' chosen.";;
-  1)
-    echo "Cancel pressed.";;
-  2)
-    echo "HELP '$choice' chosen.";;
-  255)
-    echo "ESC pressed.";;
-  *)
-    echo "Unexpected code $retval";;
-esac
+. ./report-tempfile
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/checklist5 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist5
index 9f967290912..3890c85e09d 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/checklist5
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist5
@@ -1,12 +1,12 @@
 #! /bin/sh
-# $Id: checklist5,v 1.4 2004/12/20 00:14:24 tom Exp $
-: ${DIALOG=dialog}
+# $Id: checklist5,v 1.11 2010/01/13 10:20:03 tom Exp $
 
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
+. ./setup-vars
+
+. ./setup-tempfile
 
 $DIALOG --help-button --item-help --backtitle "No Such Organization" \
-	--title "CHECKLIST BOX" \
+	--title "CHECKLIST BOX" "$@" \
         --checklist "Hi, this is a checklist box. You can use this to \n\
 present a list of choices which can be turned on or \n\
 off. If there are more items than can fit on the \n\
@@ -26,16 +26,4 @@ Press SPACE to toggle an option on/off. \n\n\
 
 retval=$?
 
-choice=`cat $tempfile`
-case $retval in
-  0)
-    echo "OK '$choice' chosen.";;
-  1)
-    echo "Cancel pressed.";;
-  2)
-    echo "HELP '$choice' chosen.";;
-  255)
-    echo "ESC pressed.";;
-  *)
-    echo "Unexpected code $retval";;
-esac
+. ./report-tempfile
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/checklist6 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist6
index 9a9a2ecbdb9..1a05d06e3d8 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/checklist6
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist6
@@ -1,13 +1,13 @@
 #! /bin/sh
-# $Id: checklist6,v 1.4 2005/10/05 23:43:22 tom Exp $
+# $Id: checklist6,v 1.11 2010/01/13 10:20:03 tom Exp $
 # example showing the --colors option
-: ${DIALOG=dialog}
 
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
+. ./setup-vars
+
+. ./setup-tempfile
 
 $DIALOG --help-button --item-help --colors --backtitle "\Z1No Such\Zn Organization" \
-	--title "CHECKLIST BOX" \
+	--title "CHECKLIST BOX" "$@" \
         --checklist "Hi, this is a checklist box. You can use this to \n\
 present a list of choices which can be turned on or \n\
 off. If there are more items than can fit on the \n\
@@ -27,16 +27,4 @@ Press \Zb\ZrSPACE\Zn to toggle an option on/off. \n\n\
 
 retval=$?
 
-choice=`cat $tempfile`
-case $retval in
-  0)
-    echo "OK '$choice' chosen.";;
-  1)
-    echo "Cancel pressed.";;
-  2)
-    echo "HELP '$choice' chosen.";;
-  255)
-    echo "ESC pressed.";;
-  *)
-    echo "Unexpected code $retval";;
-esac
+. ./report-tempfile
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/checklist7 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist7
index 24e54dd1232..1080b7eee86 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/checklist7
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist7
@@ -1,17 +1,17 @@
 #! /bin/sh
-# $Id: checklist7,v 1.4 2005/10/05 23:43:22 tom Exp $
+# $Id: checklist7,v 1.11 2010/01/13 10:20:03 tom Exp $
 # "checklist6" with --separate-output
-: ${DIALOG=dialog}
 
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
+. ./setup-vars
+
+. ./setup-tempfile
 
 $DIALOG --help-button \
 	--item-help \
 	--colors \
 	--backtitle "\Z1No Such\Zn Organization" \
 	--separate-output \
-	--title "CHECKLIST BOX" \
+	--title "CHECKLIST BOX" "$@" \
         --checklist "Hi, this is a checklist box. You can use this to \n\
 present a list of choices which can be turned on or \n\
 off. If there are more items than can fit on the \n\
@@ -31,16 +31,4 @@ Press \Zb\ZrSPACE\Zn to toggle an option on/off. \n\n\
 
 retval=$?
 
-choice=`cat $tempfile`
-case $retval in
-  0)
-    echo "OK '$choice' chosen.";;
-  1)
-    echo "Cancel pressed.";;
-  2)
-    echo "HELP '$choice' chosen.";;
-  255)
-    echo "ESC pressed.";;
-  *)
-    echo "Unexpected code $retval";;
-esac
+. ./report-tempfile
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/checklist8 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist8
index 3f79aadc571..2ec1bbde620 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/checklist8
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist8
@@ -1,16 +1,16 @@
 #! /bin/sh
-# $Id: checklist8,v 1.3 2005/10/05 23:43:22 tom Exp $
+# $Id: checklist8,v 1.10 2010/01/13 10:20:03 tom Exp $
 # "checklist7" without --item-help
-: ${DIALOG=dialog}
 
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
+. ./setup-vars
+
+. ./setup-tempfile
 
 $DIALOG --help-button \
 	--colors \
 	--backtitle "\Z1No Such\Zn Organization" \
 	--separate-output \
-	--title "CHECKLIST BOX" \
+	--title "CHECKLIST BOX" "$@" \
         --checklist "Hi, this is a checklist box. You can use this to \n\
 present a list of choices which can be turned on or \n\
 off. If there are more items than can fit on the \n\
@@ -30,16 +30,4 @@ Press \Zb\ZrSPACE\Zn to toggle an option on/off. \n\n\
 
 retval=$?
 
-choice=`cat $tempfile`
-case $retval in
-  0)
-    echo "OK '$choice' chosen.";;
-  1)
-    echo "Cancel pressed.";;
-  2)
-    echo "HELP '$choice' chosen.";;
-  255)
-    echo "ESC pressed.";;
-  *)
-    echo "Unexpected code $retval";;
-esac
+. ./report-tempfile
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist9 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist9
new file mode 100755
index 00000000000..e8d913fdada
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist9
@@ -0,0 +1,13 @@
+#! /bin/sh
+# $Id: checklist9,v 1.8 2010/01/13 10:20:03 tom Exp $
+# "checklist8" using --file
+
+. ./setup-vars
+
+. ./setup-tempfile
+
+$DIALOG "$@" --file checklist9.txt 2>$tempfile
+
+retval=$?
+
+. ./report-tempfile
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/checklist9.txt b/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist9.txt
index cdb26522170..cdb26522170 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/checklist9.txt
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/checklist9.txt
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/copifuncs/admin.funcs b/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/admin.funcs
index 27800dc876f..27800dc876f 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/copifuncs/admin.funcs
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/admin.funcs
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/copifuncs/common.funcs b/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/common.funcs
index 04eca9a8400..04eca9a8400 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/copifuncs/common.funcs
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/common.funcs
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/copifuncs/copi.funcs b/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.funcs
index 7be4bdb4151..7be4bdb4151 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/copifuncs/copi.funcs
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.funcs
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/copifuncs/copi.ifman1 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.ifman1
index 3e271a532e2..3e271a532e2 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/copifuncs/copi.ifman1
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.ifman1
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/copifuncs/copi.ifman2 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.ifman2
index 0b6dbb77ded..0b6dbb77ded 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/copifuncs/copi.ifman2
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.ifman2
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/copifuncs/copi.ifmcfg2 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.ifmcfg2
index c8a8c03d664..c8a8c03d664 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/copifuncs/copi.ifmcfg2
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.ifmcfg2
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/copifuncs/copi.ifmcfg4 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.ifmcfg4
index 4cb7a75b1fc..4cb7a75b1fc 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/copifuncs/copi.ifmcfg4
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.ifmcfg4
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/copifuncs/copi.ifmcfg5 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.ifmcfg5
index 8221c1cf160..8221c1cf160 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/copifuncs/copi.ifmcfg5
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.ifmcfg5
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/copifuncs/copi.ifpoll1 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.ifpoll1
index 812c8e9cd0d..812c8e9cd0d 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/copifuncs/copi.ifpoll1
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.ifpoll1
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/copifuncs/copi.ifpoll2 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.ifpoll2
index 216bff08583..216bff08583 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/copifuncs/copi.ifpoll2
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.ifpoll2
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/copifuncs/copi.ifreq1 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.ifreq1
index 637293954bd..637293954bd 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/copifuncs/copi.ifreq1
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.ifreq1
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/copifuncs/copi.ifreq2 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.ifreq2
index 9ee78ff73fe..9ee78ff73fe 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/copifuncs/copi.ifreq2
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.ifreq2
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/copifuncs/copi.rcnews b/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.rcnews
index 957a272ee49..957a272ee49 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/copifuncs/copi.rcnews
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.rcnews
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/copifuncs/copi.sendifm1 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.sendifm1
index 564b9c60533..564b9c60533 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/copifuncs/copi.sendifm1
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.sendifm1
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/copifuncs/copi.sendifm2 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.sendifm2
index 1a34a1fabbc..1a34a1fabbc 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/copifuncs/copi.sendifm2
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.sendifm2
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/copifuncs/copi.trnrc b/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.trnrc
index 7be596f74db..7be596f74db 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/copifuncs/copi.trnrc
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.trnrc
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/copifuncs/copi.wheel b/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.wheel
index 567e559a5ab..567e559a5ab 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/copifuncs/copi.wheel
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/copi.wheel
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/copifuncs/ifpatch b/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/ifpatch
index 1e7c7ee510e..1e7c7ee510e 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/copifuncs/ifpatch
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/copifuncs/ifpatch
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/copismall b/Build/source/utils/dialog/dialog-1.1-20100119/samples/copismall
index 8158b8e9b4a..3dfb485a4c9 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/copismall
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/copismall
@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Id: copismall,v 1.5 2003/08/15 19:34:18 tom Exp $
+# $Id: copismall,v 1.8 2010/01/13 10:26:52 tom Exp $
 #
 #  ComeOn Point Installer! v0.9a.small (small version for cdialog v0.9a)
 #  - installa il point in modo visuale e auto-detecting. Versione light.
@@ -27,7 +27,7 @@
 # demo of cdialog. ComeOn Linux! follows the GNU philosophy.
 # Send peacefully a mail to demarco_p@abramo.it for more info.
 
-: ${DIALOG=dialog}
+. ./setup-vars
 
 #COMEONDIR=/usr/lib/ComeOn
 #POINTDIR=$COMEONDIR/point
@@ -60,7 +60,7 @@ $DIALOG --backtitle "$TITLE" --title "Are you sure?" --cr-wrap --msgbox "Questo
 auto-detect all'installazione del point.
 Premi <Enter> per iniziare o <Esc> per uscire. " 0 0
 
-if [ $? = 1 -o $? = 255 ]; then
+if [ $? = $DIALOG_CANCEL -o $? = $DIALOG_ESC ]; then
  exit
 fi
 
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/debian.rc b/Build/source/utils/dialog/dialog-1.1-20100119/samples/debian.rc
index f624dba846e..f624dba846e 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/debian.rc
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/debian.rc
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/dialog.py b/Build/source/utils/dialog/dialog-1.1-20100119/samples/dialog.py
index db66fd7f2f4..db66fd7f2f4 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/dialog.py
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/dialog.py
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/dselect b/Build/source/utils/dialog/dialog-1.1-20100119/samples/dselect
new file mode 100755
index 00000000000..22995b4e9fd
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/dselect
@@ -0,0 +1,11 @@
+#!/bin/sh
+# $Id: dselect,v 1.6 2010/01/13 10:20:03 tom Exp $
+
+. ./setup-vars
+
+exec 3>&1
+RESULT=`$DIALOG --title "Please choose a directory" "$@" --dselect $HOME/ 14 48 2>&1 1>&3`
+retval=$?
+exec 3>&-
+
+. ./report-string
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/editbox b/Build/source/utils/dialog/dialog-1.1-20100119/samples/editbox
index 425d0bd9313..8ae4c63721d 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/editbox
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/editbox
@@ -1,10 +1,12 @@
 #!/bin/sh
-# $Id: editbox,v 1.6 2007/01/10 23:24:44 tom Exp $
-: ${DIALOG=dialog}
+# $Id: editbox,v 1.13 2010/01/13 10:20:03 tom Exp $
 
-input=`tempfile 2>/dev/null` || input=/tmp/input$$
-output=`tempfile 2>/dev/null` || output=/tmp/test$$
-trap "rm -f $input $output" 0 1 2 5 15
+. ./setup-vars
+
+DIALOG_ERROR=254
+export DIALOG_ERROR
+
+. ./setup-edit
 
 cat << EOF > $input
 Hi, this is an edit box. It can be used to edit text from a file.
@@ -37,19 +39,7 @@ Try to input some text below:
 EOF
 
 $DIALOG --title "EDIT BOX" \
-	--fixed-font --editbox $input 0 0 2>$output
-
-case $? in
-  0)
-    diff -c $input $output
-    echo "OK"
-    ;;
-  1)
-    echo "Button 1 (Cancel) pressed";;
-  2)
-    echo "Button 2 (Help) pressed";;
-  3)
-    echo "Button 3 (Extra) pressed";;
-  255)
-    echo "ESC pressed.";;
-esac
+	--fixed-font "$@" --editbox $input 0 0 2>$output
+retval=$?
+
+. ./report-edit
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/editbox-utf8 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/editbox-utf8
new file mode 100755
index 00000000000..94f2fab69d2
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/editbox-utf8
@@ -0,0 +1,35 @@
+#!/bin/sh
+# $Id: editbox-utf8,v 1.9 2010/01/13 10:20:03 tom Exp $
+
+. ./setup-vars
+
+. ./setup-tempfile
+
+. ./setup-utf8
+
+. ./setup-edit
+
+cat << EOF > $input
+Hi, this is a edit box. You can use this to 
+allow the user to enter or modify free-form text.
+
+Try it now!
+
+        -----------     --------------------------------
+	Choose		Description of the OS you like
+	-----------	--------------------------------
+	Ｌｉｎｕｘ	The Great Unix Clone for 386/486 
+	ＮｅｔＢＳＤ	Another free Unix Clone for 386/486 
+	ＯＳ/２		IBM OS/2 
+	ＷＩＮ ＮＴ	Microsoft Windows NT 
+	ＰＣＤＯＳ	IBM PC DOS 
+	ＭＳＤＯＳ	Microsoft DOS
+	-----------	--------------------------------
+        -----------     --------------------------------
+EOF
+
+$DIALOG --title "EDIT BOX" \
+	--fixed-font "$@" --editbox $input 0 0 2>$output
+retval=$?
+
+. ./report-edit
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/editbox2 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/editbox2
index 891f6d6eed1..66623948751 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/editbox2
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/editbox2
@@ -1,11 +1,10 @@
 #!/bin/sh
-# $Id: editbox2,v 1.1 2007/01/12 00:26:37 tom Exp $
+# $Id: editbox2,v 1.7 2010/01/13 10:20:03 tom Exp $
 # example with extra- and help-buttons
-: ${DIALOG=dialog}
 
-input=`tempfile 2>/dev/null` || input=/tmp/input$$
-output=`tempfile 2>/dev/null` || output=/tmp/test$$
-trap "rm -f $input $output" 0 1 2 5 15
+. ./setup-vars
+
+. ./setup-edit
 
 cat << EOF > $input
 Hi, this is an edit box. It can be used to edit text from a file.
@@ -40,19 +39,7 @@ EOF
 $DIALOG --title "EDIT BOX" \
 	--extra-button \
 	--help-button \
-	--fixed-font --editbox $input 0 0 2>$output
-
-case $? in
-  0)
-    diff -c $input $output
-    echo "OK"
-    ;;
-  1)
-    echo "Button 1 (Cancel) pressed";;
-  2)
-    echo "Button 2 (Help) pressed";;
-  3)
-    echo "Button 3 (Extra) pressed";;
-  255)
-    echo "ESC pressed.";;
-esac
+	--fixed-font "$@" --editbox $input 0 0 2>$output
+retval=$?
+
+. ./report-edit
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/editbox3 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/editbox3
new file mode 100755
index 00000000000..aba30bd6f71
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/editbox3
@@ -0,0 +1,18 @@
+#!/bin/sh
+# $Id: editbox3,v 1.7 2010/01/13 10:20:03 tom Exp $
+# example with extra- and help-buttons
+
+. ./setup-vars
+
+. ./setup-edit
+
+cat << EOF > $input
+EOF
+
+$DIALOG --title "EDIT BOX" \
+	--extra-button \
+	--help-button \
+	--fixed-font "$@" --editbox $input 0 0 2>$output
+retval=$?
+
+. ./report-edit
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/editbox4 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/editbox4
new file mode 100755
index 00000000000..8153facf1e8
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/editbox4
@@ -0,0 +1,45 @@
+#!/bin/sh
+# $Id: editbox4,v 1.1 2010/01/17 22:29:50 tom Exp $
+
+. ./setup-vars
+
+DIALOG_ERROR=254
+export DIALOG_ERROR
+
+. ./setup-edit
+
+cat << EOF > $input
+Hi, this is an edit box. It can be used to edit text from a file.
+
+It's like a simple text editor, with these keys implemented:
+
+PGDN	- Move down one page
+PGUP	- Move up one page
+DOWN	- Move down one line
+UP	- Move up one line
+DELETE	- Delete the current character
+BACKSPC	- Delete the previous character
+
+Unlike Xdialog, it does not do these:
+
+CTRL C	- Copy text
+CTRL V	- Paste text
+
+Because dialog normally uses TAB for moving between fields,
+this editbox uses CTRL/V as a literal-next character.  You
+can enter TAB characters by first pressing CTRL/V.  This
+example contains a few tab characters.
+
+It supports the mouse - but only for positioning in the editbox,
+or for clicking on buttons.  Your terminal (emulator) may support
+cut/paste.
+
+Try to input some text below:
+
+EOF
+
+$DIALOG --title "EDIT BOX" \
+	--fixed-font "$@" --editbox $input 20 40 2>$output
+retval=$?
+
+. ./report-edit
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/form1 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/form1
index daa8a9d20ae..cfa8a4a5d8f 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/form1
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/form1
@@ -1,6 +1,10 @@
 #! /bin/sh
-# $Id: form1,v 1.8 2005/12/05 23:27:23 tom Exp $
-: ${DIALOG=dialog}
+# $Id: form1,v 1.14 2010/01/13 10:53:11 tom Exp $
+
+. ./setup-vars
+
+DIALOG_ERROR=254
+export DIALOG_ERROR
 
 backtitle="An Example for the use of --form:"
 
@@ -16,7 +20,7 @@ while test $returncode != 1 && test $returncode != 250
 do
 exec 3>&1
 value=`$DIALOG --ok-label "Submit" \
-	  --backtitle "$backtitle" \
+	  --backtitle "$backtitle" "$@" \
 	  --form "Here is a possible piece of a configuration program." \
 20 50 0 \
 	"Username:" 1 1	"$user" 1 10 10 0 \
@@ -30,35 +34,43 @@ exec 3>&-
 show=`echo "$value" |sed -e 's/^/	/'`
 
 	case $returncode in
-	1)
+	$DIALOG_CANCEL)
 		"$DIALOG" \
 		--clear \
 		--backtitle "$backtitle" \
 		--yesno "Really quit?" 10 30
 		case $? in
-		0)
+		$DIALOG_OK)
 			break
 			;;
-		1)
+		$DIALOG_CANCEL)
 			returncode=99
 			;;
 		esac
 		;;
-	0)
+	$DIALOG_OK)
 		"$DIALOG" \
 		--clear \
 		--backtitle "$backtitle" --no-collapse --cr-wrap \
 		--msgbox "Resulting data:\n\
 $show" 10 40
 		;;
-	2)
+	$DIALOG_HELP)
 		echo "Button 2 (Help) pressed."
 		exit
 		;;
-	3)
+	$DIALOG_EXTRA)
 		echo "Button 3 (Extra) pressed."
 		exit
 		;;
+	$DIALOG_ERR)
+		echo "ERROR!"
+		exit
+		;;
+	$DIALOG_ESC)
+		echo "ESC pressed."
+		exit
+		;;
 	*)
 		echo "Return code was $returncode"
 		exit
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/form1-both b/Build/source/utils/dialog/dialog-1.1-20100119/samples/form1-both
index 555d5ff5fbb..f571830fc45 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/form1-both
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/form1-both
@@ -1,6 +1,7 @@
 #! /bin/sh
-# $Id: form1-both,v 1.1 2005/12/05 23:27:50 tom Exp $
-: ${DIALOG=dialog}
+# $Id: form1-both,v 1.5 2010/01/13 10:47:35 tom Exp $
+
+. ./setup-vars
 
 backtitle="An Example for the use of --form:"
 
@@ -17,7 +18,7 @@ do
 exec 3>&1
 value=`$DIALOG --ok-label "Submit" \
 	  --extra-button --help-button \
-	  --backtitle "$backtitle" \
+	  --backtitle "$backtitle" "$@" \
 	  --form "Here is a possible piece of a configuration program." \
 20 50 0 \
 	"Username:" 1 1	"$user" 1 10 10 0 \
@@ -31,32 +32,32 @@ exec 3>&-
 show=`echo "$value" |sed -e 's/^/	/'`
 
 	case $returncode in
-	1)
+	$DIALOG_CANCEL)
 		"$DIALOG" \
 		--clear \
 		--backtitle "$backtitle" \
 		--yesno "Really quit?" 10 30
 		case $? in
-		0)
+		$DIALOG_OK)
 			break
 			;;
-		1)
+		$DIALOG_CANCEL)
 			returncode=99
 			;;
 		esac
 		;;
-	0)
+	$DIALOG_OK)
 		"$DIALOG" \
 		--clear \
 		--backtitle "$backtitle" --no-collapse --cr-wrap \
 		--msgbox "Resulting data:\n\
 $show" 10 40
 		;;
-	2)
+	$DIALOG_HELP)
 		echo "Button 2 (Help) pressed."
 		exit
 		;;
-	3)
+	$DIALOG_EXTRA)
 		echo "Button 3 (Extra) pressed."
 		exit
 		;;
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/form1-extra b/Build/source/utils/dialog/dialog-1.1-20100119/samples/form1-extra
index 94315cbd90a..ca180a96ec1 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/form1-extra
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/form1-extra
@@ -1,6 +1,7 @@
 #! /bin/sh
-# $Id: form1-extra,v 1.1 2005/12/05 23:27:50 tom Exp $
-: ${DIALOG=dialog}
+# $Id: form1-extra,v 1.5 2010/01/13 10:47:35 tom Exp $
+
+. ./setup-vars
 
 backtitle="An Example for the use of --form:"
 
@@ -17,7 +18,7 @@ do
 exec 3>&1
 value=`$DIALOG --ok-label "Submit" \
 	  --extra-button \
-	  --backtitle "$backtitle" \
+	  --backtitle "$backtitle" "$@" \
 	  --form "Here is a possible piece of a configuration program." \
 20 50 0 \
 	"Username:" 1 1	"$user" 1 10 10 0 \
@@ -31,32 +32,32 @@ exec 3>&-
 show=`echo "$value" |sed -e 's/^/	/'`
 
 	case $returncode in
-	1)
+	$DIALOG_CANCEL)
 		"$DIALOG" \
 		--clear \
 		--backtitle "$backtitle" \
 		--yesno "Really quit?" 10 30
 		case $? in
-		0)
+		$DIALOG_OK)
 			break
 			;;
-		1)
+		$DIALOG_CANCEL)
 			returncode=99
 			;;
 		esac
 		;;
-	0)
+	$DIALOG_OK)
 		"$DIALOG" \
 		--clear \
 		--backtitle "$backtitle" --no-collapse --cr-wrap \
 		--msgbox "Resulting data:\n\
 $show" 10 40
 		;;
-	2)
+	$DIALOG_HELP)
 		echo "Button 2 (Help) pressed."
 		exit
 		;;
-	3)
+	$DIALOG_EXTRA)
 		echo "Button 3 (Extra) pressed."
 		exit
 		;;
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/form1-help b/Build/source/utils/dialog/dialog-1.1-20100119/samples/form1-help
index 733c6de8c4c..44c5543f60e 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/form1-help
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/form1-help
@@ -1,6 +1,7 @@
 #! /bin/sh
-# $Id: form1-help,v 1.1 2005/12/05 23:27:50 tom Exp $
-: ${DIALOG=dialog}
+# $Id: form1-help,v 1.5 2010/01/13 10:47:35 tom Exp $
+
+. ./setup-vars
 
 backtitle="An Example for the use of --form:"
 
@@ -17,7 +18,7 @@ do
 exec 3>&1
 value=`$DIALOG --ok-label "Submit" \
 	  --help-button \
-	  --backtitle "$backtitle" \
+	  --backtitle "$backtitle" "$@" \
 	  --form "Here is a possible piece of a configuration program." \
 20 50 0 \
 	"Username:" 1 1	"$user" 1 10 10 0 \
@@ -31,32 +32,32 @@ exec 3>&-
 show=`echo "$value" |sed -e 's/^/	/'`
 
 	case $returncode in
-	1)
+	$DIALOG_CANCEL)
 		"$DIALOG" \
 		--clear \
 		--backtitle "$backtitle" \
 		--yesno "Really quit?" 10 30
 		case $? in
-		0)
+		$DIALOG_OK)
 			break
 			;;
-		1)
+		$DIALOG_CANCEL)
 			returncode=99
 			;;
 		esac
 		;;
-	0)
+	$DIALOG_OK)
 		"$DIALOG" \
 		--clear \
 		--backtitle "$backtitle" --no-collapse --cr-wrap \
 		--msgbox "Resulting data:\n\
 $show" 10 40
 		;;
-	2)
+	$DIALOG_HELP)
 		echo "Button 2 (Help) pressed."
 		exit
 		;;
-	3)
+	$DIALOG_EXTRA)
 		echo "Button 3 (Extra) pressed."
 		exit
 		;;
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/form1-utf8 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/form1-utf8
index 2ffe04251dd..a2be4a6cf15 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/form1-utf8
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/form1-utf8
@@ -1,15 +1,9 @@
 #! /bin/sh
-# $Id: form1-utf8,v 1.2 2008/08/20 00:32:49 tom Exp $
-: ${DIALOG=dialog}
+# $Id: form1-utf8,v 1.7 2010/01/13 10:47:35 tom Exp $
 
-case none"$LANG$LC_ALL$LC_CTYPE" in
-*UTF-8*)
-	;;
-*)
-	echo "This script must be run in a UTF-8 locale"
-	exit 1
-	;;
-esac
+. ./setup-vars
+
+. ./setup-utf8
 
 backtitle="An Example for the use of --form:"
 
@@ -26,7 +20,7 @@ do
 exec 3>&1
 value=`$DIALOG --ok-label "Submit" \
 	  --backtitle "$backtitle" \
-	  --insecure \
+	  --insecure "$@" \
 	  --form "Here is a possible piece of a configuration program." \
 20 50 0 \
 	"Username:" 1 1	"$user" 1 10 10 0 \
@@ -40,32 +34,32 @@ exec 3>&-
 show=`echo "$value" |sed -e 's/^/	/'`
 
 	case $returncode in
-	1)
+	$DIALOG_CANCEL)
 		"$DIALOG" \
 		--clear \
 		--backtitle "$backtitle" \
 		--yesno "Really quit?" 10 30
 		case $? in
-		0)
+		$DIALOG_OK)
 			break
 			;;
-		1)
+		$DIALOG_CANCEL)
 			returncode=99
 			;;
 		esac
 		;;
-	0)
+	$DIALOG_OK)
 		"$DIALOG" \
 		--clear \
 		--backtitle "$backtitle" --no-collapse --cr-wrap \
 		--msgbox "Resulting data:\n\
 $show" 10 40
 		;;
-	2)
+	$DIALOG_HELP)
 		echo "Button 2 (Help) pressed."
 		exit
 		;;
-	3)
+	$DIALOG_EXTRA)
 		echo "Button 3 (Extra) pressed."
 		exit
 		;;
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/form2 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/form2
index 48d8e287121..a005be3c2bf 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/form2
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/form2
@@ -1,6 +1,7 @@
 #! /bin/sh
-# $Id: form2,v 1.5 2004/09/12 22:37:31 tom Exp $
-: ${DIALOG=dialog}
+# $Id: form2,v 1.9 2010/01/13 10:53:11 tom Exp $
+
+. ./setup-vars
 
 backtitle="An Example for the use of --form:"
 
@@ -16,7 +17,7 @@ while test $returncode != 1 && test $returncode != 250
 do
 exec 3>&1
 value=`$DIALOG --ok-label "Submit" \
-	  --backtitle "$backtitle" \
+	  --backtitle "$backtitle" "$@" \
 	  --form "Here is a possible piece of a configuration program." \
 0 0 10 \
 	"1 Username:"  1 1	"$user" 1  12 10 10 \
@@ -54,21 +55,21 @@ exec 3>&-
 show=`echo "$value" |sed -e 's/^/	/'`
 
 	case $returncode in
-	1)
+	$DIALOG_CANCEL)
 		"$DIALOG" \
 		--clear \
 		--backtitle "$backtitle" \
 		--yesno "Really quit?" 10 30
 		case $? in
-		0)
+		$DIALOG_OK)
 			break
 			;;
-		1)
+		$DIALOG_CANCEL)
 			returncode=99
 			;;
 		esac
 		;;
-	0)
+	$DIALOG_OK)
 		"$DIALOG" \
 		--clear \
 		--backtitle "$backtitle" --no-collapse --cr-wrap \
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/form3 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/form3
index 8992dead946..c3ac6d5306e 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/form3
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/form3
@@ -1,7 +1,8 @@
 #! /bin/sh
-# $Id: form3,v 1.2 2004/09/12 22:37:40 tom Exp $
+# $Id: form3,v 1.6 2010/01/13 10:49:52 tom Exp $
 # form1 with --help-button
-: ${DIALOG=dialog}
+
+. ./setup-vars
 
 backtitle="An Example for the use of --form:"
 
@@ -18,7 +19,7 @@ do
 exec 3>&1
 value=`$DIALOG --ok-label "Submit" \
 	  --help-button \
-	  --backtitle "$backtitle" \
+	  --backtitle "$backtitle" "$@" \
 	  --form "Here is a possible piece of a configuration program." \
 20 50 0 \
 	"Username:" 1 1	"$user" 1 10 10 0 \
@@ -32,28 +33,28 @@ exec 3>&-
 show=`echo "$value" |sed -e 's/^/	/'`
 
 	case $returncode in
-	1)
+	$DIALOG_CANCEL)
 		"$DIALOG" \
 		--clear \
 		--backtitle "$backtitle" \
 		--yesno "Really quit?" 10 30
 		case $? in
-		0)
+		$DIALOG_OK)
 			break
 			;;
-		1)
+		$DIALOG_CANCEL)
 			returncode=99
 			;;
 		esac
 		;;
-	0)
+	$DIALOG_OK)
 		"$DIALOG" \
 		--clear \
 		--backtitle "$backtitle" --no-collapse --cr-wrap \
 		--msgbox "Resulting data:\n\
 $show" 10 40
 		;;
-	2)
+	$DIALOG_HELP)
 		"$DIALOG" \
 		--clear \
 		--backtitle "$backtitle" --no-collapse --cr-wrap \
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/form4 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/form4
index 40b1f40b421..a733865015c 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/form4
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/form4
@@ -1,7 +1,8 @@
 #! /bin/sh
-# $Id: form4,v 1.2 2004/09/12 22:37:50 tom Exp $
+# $Id: form4,v 1.6 2010/01/13 10:49:52 tom Exp $
 # form3 with --item-help
-: ${DIALOG=dialog}
+
+. ./setup-vars
 
 backtitle="An Example for the use of --form:"
 
@@ -19,7 +20,7 @@ exec 3>&1
 value=`$DIALOG --ok-label "Submit" \
 	  --help-button \
 	  --item-help \
-	  --backtitle "$backtitle" \
+	  --backtitle "$backtitle" "$@" \
 	  --form "Here is a possible piece of a configuration program." \
 20 50 0 \
 	"Username:" 1 1	"$user" 1 10 10 0 "Login name" \
@@ -33,28 +34,28 @@ exec 3>&-
 show=`echo "$value" |sed -e 's/^/	/'`
 
 	case $returncode in
-	1)
+	$DIALOG_CANCEL)
 		"$DIALOG" \
 		--clear \
 		--backtitle "$backtitle" \
 		--yesno "Really quit?" 10 30
 		case $? in
-		0)
+		$DIALOG_OK)
 			break
 			;;
-		1)
+		$DIALOG_CANCEL)
 			returncode=99
 			;;
 		esac
 		;;
-	0)
+	$DIALOG_OK)
 		"$DIALOG" \
 		--clear \
 		--backtitle "$backtitle" --no-collapse --cr-wrap \
 		--msgbox "Resulting data:\n\
 $show" 10 40
 		;;
-	2)
+	$DIALOG_HELP)
 		"$DIALOG" \
 		--clear \
 		--backtitle "$backtitle" --no-collapse --cr-wrap \
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/form5 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/form5
index c8716214cc9..649c3872d12 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/form5
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/form5
@@ -1,7 +1,8 @@
 #! /bin/sh
-# $Id: form5,v 1.2 2004/09/12 22:37:57 tom Exp $
+# $Id: form5,v 1.6 2010/01/13 10:49:52 tom Exp $
 # form4 with --help-status
-: ${DIALOG=dialog}
+
+. ./setup-vars
 
 backtitle="An Example for the use of --form:"
 
@@ -20,7 +21,7 @@ value=`$DIALOG --ok-label "Submit" \
 	  --help-status \
 	  --help-button \
 	  --item-help \
-	  --backtitle "$backtitle" \
+	  --backtitle "$backtitle" "$@" \
 	  --form "Here is a possible piece of a configuration program." \
 20 50 0 \
 	"Username:" 1 1	"$user" 1 10 10 0 "Login name" \
@@ -34,28 +35,28 @@ exec 3>&-
 show=`echo "$value" |sed -e 's/^/	/'`
 
 	case $returncode in
-	1)
+	$DIALOG_CANCEL)
 		"$DIALOG" \
 		--clear \
 		--backtitle "$backtitle" \
 		--yesno "Really quit?" 10 30
 		case $? in
-		0)
+		$DIALOG_OK)
 			break
 			;;
-		1)
+		$DIALOG_CANCEL)
 			returncode=99
 			;;
 		esac
 		;;
-	0)
+	$DIALOG_OK)
 		"$DIALOG" \
 		--clear \
 		--backtitle "$backtitle" --no-collapse --cr-wrap \
 		--msgbox "Resulting data:\n\
 $show" 10 40
 		;;
-	2)
+	$DIALOG_HELP)
 		"$DIALOG" \
 		--clear \
 		--backtitle "$backtitle" --no-collapse --cr-wrap \
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/form6 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/form6
index f68dece5769..8b5483f4f4c 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/form6
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/form6
@@ -1,7 +1,8 @@
 #! /bin/sh
-# $Id: form6,v 1.1 2005/02/07 00:14:52 tom Exp $
+# $Id: form6,v 1.5 2010/01/13 10:49:52 tom Exp $
 # form4 with --help-status
-: ${DIALOG=dialog}
+
+. ./setup-vars
 
 backtitle="An Example for the use of --form:"
 
@@ -20,7 +21,7 @@ value=`$DIALOG --ok-label "Submit" \
 	  --help-status \
 	  --help-button \
 	  --item-help \
-	  --backtitle "$backtitle" \
+	  --backtitle "$backtitle" "$@" \
 	  --form "Here is a possible piece of a configuration program." \
 20 50 0 \
 	"Username:" 1 1	"$user" 1 10 -9 9 "Login name" \
@@ -34,28 +35,28 @@ exec 3>&-
 show=`echo "$value" |sed -e 's/^/	/'`
 
 	case $returncode in
-	1)
+	$DIALOG_CANCEL)
 		"$DIALOG" \
 		--clear \
 		--backtitle "$backtitle" \
 		--yesno "Really quit?" 10 30
 		case $? in
-		0)
+		$DIALOG_OK)
 			break
 			;;
-		1)
+		$DIALOG_CANCEL)
 			returncode=99
 			;;
 		esac
 		;;
-	0)
+	$DIALOG_OK)
 		"$DIALOG" \
 		--clear \
 		--backtitle "$backtitle" --no-collapse --cr-wrap \
 		--msgbox "Resulting data:\n\
 $show" 10 40
 		;;
-	2)
+	$DIALOG_HELP)
 		"$DIALOG" \
 		--clear \
 		--backtitle "$backtitle" --no-collapse --cr-wrap \
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/fselect b/Build/source/utils/dialog/dialog-1.1-20100119/samples/fselect
new file mode 100755
index 00000000000..20b8304331a
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/fselect
@@ -0,0 +1,11 @@
+#!/bin/sh
+# $Id: fselect,v 1.11 2010/01/13 10:20:03 tom Exp $
+
+. ./setup-vars
+
+exec 3>&1
+RESULT=`$DIALOG --title "Please choose a file" "$@" --fselect $HOME/ 14 48 2>&1 1>&3`
+retval=$?
+exec 3>&-
+
+. ./report-string
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/fselect-stdout b/Build/source/utils/dialog/dialog-1.1-20100119/samples/fselect-stdout
new file mode 100755
index 00000000000..02eefdb7b34
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/fselect-stdout
@@ -0,0 +1,9 @@
+#!/bin/sh
+# $Id: fselect-stdout,v 1.6 2010/01/13 10:20:03 tom Exp $
+
+. ./setup-vars
+
+RESULT=`$DIALOG --stdout --title "Please choose a file" "$@" --fselect $HOME/ 14 48`
+retval=$?
+
+. ./report-string
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/fselect1 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/fselect1
new file mode 100755
index 00000000000..59137941717
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/fselect1
@@ -0,0 +1,20 @@
+#!/bin/sh
+# $Id: fselect1,v 1.9 2010/01/13 10:20:03 tom Exp $
+
+. ./setup-vars
+
+FILE=$HOME
+for n in .cshrc .profile .bashrc
+do
+	if test -f $HOME/$n ; then
+		FILE=$HOME/$n
+		break
+	fi
+done
+
+exec 3>&1
+RESULT=`$DIALOG --title "Please choose a file" "$@" --fselect $FILE 14 48 2>&1 1>&3`
+retval=$?
+exec 3>&-
+
+. ./report-string
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/fselect1-stdout b/Build/source/utils/dialog/dialog-1.1-20100119/samples/fselect1-stdout
new file mode 100755
index 00000000000..01d1135622f
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/fselect1-stdout
@@ -0,0 +1,18 @@
+#!/bin/sh
+# $Id: fselect1-stdout,v 1.6 2010/01/13 10:20:03 tom Exp $
+
+. ./setup-vars
+
+FILE=$HOME
+for n in .cshrc .profile .bashrc
+do
+	if test -f $HOME/$n ; then
+		FILE=$HOME/$n
+		break
+	fi
+done
+
+RESULT=`$DIALOG --stdout --title "Please choose a file" "$@" --fselect $FILE 14 48`
+retval=$?
+
+. ./report-string
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/fselect2 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/fselect2
new file mode 100755
index 00000000000..6480c753bb1
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/fselect2
@@ -0,0 +1,11 @@
+#!/bin/sh
+# $Id: fselect2,v 1.8 2010/01/13 10:20:03 tom Exp $
+
+. ./setup-vars
+
+exec 3>&1
+RESULT=`$DIALOG --title "Please choose a file" "$@" --fselect $HOME/ 0 0 2>&1 1>&3`
+retval=$?
+exec 3>&-
+
+. ./report-string
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/fselect2-stdout b/Build/source/utils/dialog/dialog-1.1-20100119/samples/fselect2-stdout
new file mode 100755
index 00000000000..644fb2a5bf7
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/fselect2-stdout
@@ -0,0 +1,9 @@
+#!/bin/sh
+# $Id: fselect2-stdout,v 1.6 2010/01/13 10:20:03 tom Exp $
+
+. ./setup-vars
+
+RESULT=`$DIALOG --stdout --title "Please choose a file" "$@" --fselect $HOME/ 0 0`
+retval=$?
+
+. ./report-string
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/gauge b/Build/source/utils/dialog/dialog-1.1-20100119/samples/gauge
index 8261678103a..80dc188dc1c 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/gauge
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/gauge
@@ -1,6 +1,7 @@
 #!/bin/sh
-# $Id: gauge,v 1.4 2008/07/22 23:47:46 tom Exp $
-: ${DIALOG=dialog}
+# $Id: gauge,v 1.7 2010/01/13 10:20:03 tom Exp $
+
+. ./setup-vars
 
 PCT=10
 (
@@ -18,4 +19,4 @@ sleep 1
 done
 ) |
 
-$DIALOG --title "GAUGE" --gauge "Hi, this is a gauge widget" 20 70 0
+$DIALOG --title "GAUGE" "$@" --gauge "Hi, this is a gauge widget" 20 70 0
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/gauge0 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/gauge0
index c540fac5ba8..97e654cef71 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/gauge0
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/gauge0
@@ -1,6 +1,7 @@
 #!/bin/sh
-# $Id: gauge0,v 1.4 2008/07/22 23:48:30 tom Exp $
-: ${DIALOG=dialog}
+# $Id: gauge0,v 1.7 2010/01/13 10:20:03 tom Exp $
+
+. ./setup-vars
 
 PCT=10
 (
@@ -19,4 +20,4 @@ sleep 1
 done
 ) |
 
-$DIALOG --title "GAUGE" --gauge "Hi, this is a gauge widget" 0 0 0
+$DIALOG --title "GAUGE" "$@" --gauge "Hi, this is a gauge widget" 0 0 0
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/gauge0-input-fd b/Build/source/utils/dialog/dialog-1.1-20100119/samples/gauge0-input-fd
index dde176fdc04..0b96fe4a756 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/gauge0-input-fd
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/gauge0-input-fd
@@ -1,7 +1,8 @@
 #!/bin/sh
-# $Id: gauge0-input-fd,v 1.2 2008/07/22 23:49:26 tom Exp $
+# $Id: gauge0-input-fd,v 1.5 2010/01/13 10:20:03 tom Exp $
 # modified "gauge0" script to use "--input-fd" option.
-: ${DIALOG=dialog}
+
+. ./setup-vars
 
 exec 3<&0
 PCT=10
@@ -21,6 +22,6 @@ sleep 1
 done
 ) |
 
-$DIALOG --title "GAUGE" --input-fd 3 --gauge "Hi, this is a gauge widget" 0 0 0
+$DIALOG --title "GAUGE" --input-fd 3 "$@" --gauge "Hi, this is a gauge widget" 0 0 0
 
 exec 3<&-
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/gauge2 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/gauge2
index a7ab51c766c..10455d144c6 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/gauge2
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/gauge2
@@ -1,8 +1,9 @@
 #!/bin/sh
-# $Id: gauge2,v 1.4 2008/07/22 23:46:04 tom Exp $
+# $Id: gauge2,v 1.8 2010/01/13 10:26:52 tom Exp $
 # The original dialog program assumed the first line after the first "XXX"
 # was a percentage value (compare with "gauge" script).
-: ${DIALOG=dialog}
+
+. ./setup-vars
 
 (echo "10" ; sleep 2 ; 
 
@@ -19,9 +20,9 @@ sleep 2;
 echo "75" ; sleep 1
 echo "100") | \
 
-$DIALOG --title "GAUGE" --gauge "Hi, this is a gauge widget" 10 40 0
+$DIALOG --title "GAUGE" "$@" --gauge "Hi, this is a gauge widget" 10 40 0
 
-if [ "$?" = 255 ] ; then
+if [ "$?" = $DIALOG_ESC ] ; then
 	echo ""
 	echo "Box closed !"
 fi
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/gauge3 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/gauge3
index 93b0041fcef..1792e8321d7 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/gauge3
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/gauge3
@@ -1,6 +1,7 @@
 #!/bin/sh
-# $Id: gauge3,v 1.3 2008/07/22 23:48:56 tom Exp $
-: ${DIALOG=dialog}
+# $Id: gauge3,v 1.6 2010/01/13 10:20:03 tom Exp $
+
+. ./setup-vars
 
 (
 sleep 1
@@ -18,4 +19,4 @@ sleep 1
 done
 ) |
 
-$DIALOG --title "GAUGE" --gauge "Hi, this is a gauge widget" 10 70 0
+$DIALOG --title "GAUGE" "$@" --gauge "Hi, this is a gauge widget" 10 70 0
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/infobox b/Build/source/utils/dialog/dialog-1.1-20100119/samples/infobox
index bf6993fe89d..91dd5dd9e05 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/infobox
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/infobox
@@ -1,6 +1,7 @@
 #! /bin/sh
-# $Id: infobox,v 1.5 2003/08/15 19:40:37 tom Exp $
-: ${DIALOG=dialog}
+# $Id: infobox,v 1.8 2010/01/13 10:20:03 tom Exp $
+
+. ./setup-vars
 
 left=10
 unit="seconds"
@@ -8,7 +9,7 @@ while test $left != 0
 do
 
 $DIALOG --sleep 1 \
-	--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/Build/source/utils/dialog/dialog-1.1-20080819/samples/infobox1 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/infobox1
index 61e4cb8edf9..4ee6c9ff799 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/infobox1
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/infobox1
@@ -1,6 +1,7 @@
 #! /bin/sh
-# $Id: infobox1,v 1.1 2004/09/19 20:26:42 tom Exp $
-: ${DIALOG=dialog}
+# $Id: infobox1,v 1.4 2010/01/13 10:20:03 tom Exp $
+
+. ./setup-vars
 
 left=10
 unit="seconds"
@@ -8,7 +9,7 @@ while test $left != 0
 do
 
 sleep 1
-$DIALOG --title "INFO BOX" \
+$DIALOG --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/Build/source/utils/dialog/dialog-1.1-20080819/samples/infobox2 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/infobox2
index cfc3b05ca8e..fdf64caa85f 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/infobox2
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/infobox2
@@ -1,6 +1,7 @@
 #! /bin/sh
-# $Id: infobox2,v 1.2 2003/08/15 19:40:37 tom Exp $
-: ${DIALOG=dialog}
+# $Id: infobox2,v 1.5 2010/01/13 10:20:03 tom Exp $
+
+. ./setup-vars
 
 left=10
 unit="seconds"
@@ -8,7 +9,7 @@ while test $left != 0
 do
 
 $DIALOG --sleep 1 \
-	--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/Build/source/utils/dialog/dialog-1.1-20080819/samples/infobox3 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/infobox3
index 145b6403dbc..edba1dfd98f 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/infobox3
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/infobox3
@@ -1,6 +1,7 @@
 #! /bin/sh
-# $Id: infobox3,v 1.2 2003/08/15 19:40:37 tom Exp $
-: ${DIALOG=dialog}
+# $Id: infobox3,v 1.5 2010/01/13 10:20:03 tom Exp $
+
+. ./setup-vars
 
 left=10
 unit="seconds"
@@ -9,7 +10,7 @@ do
 
 $DIALOG --sleep 1 \
 	--begin 5 0 \
-	--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/Build/source/utils/dialog/dialog-1.1-20080819/samples/infobox4 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/infobox4
index e364070bc3a..7c96d6b4e46 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/infobox4
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/infobox4
@@ -1,6 +1,7 @@
 #! /bin/sh
-# $Id: infobox4,v 1.2 2003/08/15 19:40:37 tom Exp $
-: ${DIALOG=dialog}
+# $Id: infobox4,v 1.5 2010/01/13 10:20:03 tom Exp $
+
+. ./setup-vars
 
 left=10
 unit="seconds"
@@ -9,7 +10,7 @@ do
 
 $DIALOG --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/Build/source/utils/dialog/dialog-1.1-20080819/samples/infobox5 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/infobox5
index ffdff6aba05..7f4599e6671 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/infobox5
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/infobox5
@@ -1,10 +1,11 @@
 #! /bin/sh
-# $Id: infobox5,v 1.2 2003/08/15 19:40:37 tom Exp $
+# $Id: infobox5,v 1.6 2010/01/13 10:20:03 tom Exp $
 # get rid of all flickering by constructing a script unroll the loop, leaving
 # us in curses-mode until we're done counting.
-: ${DIALOG=dialog}
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
+
+. ./setup-vars
+
+. ./setup-tempfile
 
 left=10
 unit="seconds"
@@ -20,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/Build/source/utils/dialog/dialog-1.1-20080819/samples/infobox6 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/infobox6
index e1d6f53ea75..2e4505cbe89 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/infobox6
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/infobox6
@@ -1,12 +1,13 @@
 #! /bin/sh
-# $Id: infobox6,v 1.2 2003/08/15 19:40:37 tom Exp $
+# $Id: infobox6,v 1.6 2010/01/13 10:20:03 tom Exp $
 # get rid of all flickering by constructing a script unroll the loop, leaving
 # us in curses-mode until we're done counting.
 #
 # a little fancier than infobox5, this moves the widget at each step.
-: ${DIALOG=dialog}
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
+
+. ./setup-vars
+
+. ./setup-tempfile
 
 left=10
 unit="seconds"
@@ -22,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/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputbox b/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputbox
new file mode 100755
index 00000000000..9975d441d75
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputbox
@@ -0,0 +1,20 @@
+#!/bin/sh
+# $Id: inputbox,v 1.11 2010/01/13 10:06:01 tom Exp $
+
+. ./setup-vars
+
+. ./setup-tempfile
+
+$DIALOG --title "INPUT BOX" --clear "$@" \
+        --inputbox "Hi, this is an input dialog box. You can use \n
+this to ask questions that require the user \n
+to input a string as the answer. You can \n
+input strings of length longer than the \n
+width of the input box, in that case, the \n
+input field will be automatically scrolled. \n
+You can use BACKSPACE to correct errors. \n\n
+Try entering your name below:" 16 51 2> $tempfile
+
+retval=$?
+
+. ./report-tempfile
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/inputbox b/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputbox-both
index b74125e84db..4103ccf811c 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/inputbox
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputbox-both
@@ -1,11 +1,13 @@
 #!/bin/sh
-# $Id: inputbox,v 1.6 2003/08/15 19:40:37 tom Exp $
-: ${DIALOG=dialog}
+# $Id: inputbox-both,v 1.6 2010/01/13 10:20:03 tom Exp $
 
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
+. ./setup-vars
+
+. ./setup-tempfile
 
 $DIALOG --title "INPUT BOX" --clear \
+	--extra-button \
+	--help-button "$@" \
         --inputbox "Hi, this is an input dialog box. You can use \n
 this to ask questions that require the user \n
 to input a string as the answer. You can \n
@@ -17,16 +19,4 @@ Try entering your name below:" 16 51 2> $tempfile
 
 retval=$?
 
-case $retval in
-  0)
-    echo "Input string is `cat $tempfile`";;
-  1)
-    echo "Cancel pressed.";;
-  255)
-    if test -s $tempfile ; then
-      cat $tempfile
-    else
-      echo "ESC pressed."
-    fi
-    ;;
-esac
+. ./report-tempfile
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/inputbox2 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputbox-extra
index 41be14e6e41..9f2277c940a 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/inputbox2
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputbox-extra
@@ -1,11 +1,12 @@
 #!/bin/sh
-# $Id: inputbox2,v 1.4 2003/08/15 19:40:37 tom Exp $
-: ${DIALOG=dialog}
+# $Id: inputbox-extra,v 1.6 2010/01/13 10:20:03 tom Exp $
 
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
+. ./setup-vars
+
+. ./setup-tempfile
 
 $DIALOG --title "INPUT BOX" --clear \
+	--extra-button "$@" \
         --inputbox "Hi, this is an input dialog box. You can use \n
 this to ask questions that require the user \n
 to input a string as the answer. You can \n
@@ -17,16 +18,4 @@ Try entering your name below:" 16 51 2> $tempfile
 
 retval=$?
 
-case $retval in
-  0)
-    echo "Input string is `cat $tempfile`";;
-  1)
-    echo "Cancel pressed.";;
-  255)
-    if test -s $tempfile ; then
-      cat $tempfile
-    else
-      echo "ESC pressed."
-    fi
-    ;;
-esac
+. ./report-tempfile
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputbox-help b/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputbox-help
new file mode 100755
index 00000000000..0dfe7c81462
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputbox-help
@@ -0,0 +1,21 @@
+#!/bin/sh
+# $Id: inputbox-help,v 1.6 2010/01/13 10:20:03 tom Exp $
+
+. ./setup-vars
+
+. ./setup-tempfile
+
+$DIALOG --title "INPUT BOX" --clear \
+	--help-button "$@" \
+        --inputbox "Hi, this is an input dialog box. You can use \n
+this to ask questions that require the user \n
+to input a string as the answer. You can \n
+input strings of length longer than the \n
+width of the input box, in that case, the \n
+input field will be automatically scrolled. \n
+You can use BACKSPACE to correct errors. \n\n
+Try entering your name below:" 16 51 2> $tempfile
+
+retval=$?
+
+. ./report-tempfile
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/inputbox1 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputbox1
index 22c43ef44f9..487aa8c5edf 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/inputbox1
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputbox1
@@ -1,12 +1,13 @@
 #!/bin/sh
-: ${DIALOG=dialog}
+# $Id: inputbox1,v 1.13 2010/01/13 10:20:03 tom Exp $
 
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
+. ./setup-vars
+
+. ./setup-tempfile
 
 $DIALOG --cr-wrap \
 	--title "INPUT BOX" --clear \
-        --inputbox \
+        --inputbox "$@" \
 "Hi, this is an input dialog box. You can use
 this to ask questions that require the user
 to input a string as the answer. You can 
@@ -19,16 +20,4 @@ Try entering your name below:" 0 0 2> $tempfile
 
 retval=$?
 
-case $retval in
-  0)
-    echo "Input string is `cat $tempfile`";;
-  1)
-    echo "Cancel pressed.";;
-  255)
-    if test -s $tempfile ; then
-      cat $tempfile
-    else
-      echo "ESC pressed."
-    fi
-    ;;
-esac
+. ./report-tempfile
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputbox2 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputbox2
new file mode 100755
index 00000000000..f7b4b5f7df6
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputbox2
@@ -0,0 +1,20 @@
+#!/bin/sh
+# $Id: inputbox2,v 1.9 2010/01/13 10:20:03 tom Exp $
+
+. ./setup-vars
+
+. ./setup-tempfile
+
+$DIALOG --title "INPUT BOX" --clear "$@" \
+        --inputbox "Hi, this is an input dialog box. You can use \n
+this to ask questions that require the user \n
+to input a string as the answer. You can \n
+input strings of length longer than the \n
+width of the input box, in that case, the \n
+input field will be automatically scrolled. \n
+You can use BACKSPACE to correct errors. \n\n
+Try entering your name below:" 16 51 2> $tempfile
+
+retval=$?
+
+. ./report-tempfile
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/inputbox3 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputbox3
index 4b37af6faa1..d343e0a64cc 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/inputbox3
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputbox3
@@ -1,12 +1,12 @@
 #!/bin/sh
-# $Id: inputbox3,v 1.2 2003/08/15 19:40:37 tom Exp $
-: ${DIALOG=dialog}
+# $Id: inputbox3,v 1.7 2010/01/13 10:20:03 tom Exp $
 
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
+. ./setup-vars
+
+. ./setup-tempfile
 
 $DIALOG --nocancel \
-	--title "INPUT BOX" --clear \
+	--title "INPUT BOX" --clear "$@" \
         --inputbox "Hi, this is an input dialog box. You can use \n\
 this to ask questions that require the user \n\
 to input a string as the answer. You can \n\
@@ -18,16 +18,4 @@ Try entering your name below:" 16 51 2> $tempfile
 
 retval=$?
 
-case $retval in
-  0)
-    echo "Input string is `cat $tempfile`";;
-  1)
-    echo "Cancel pressed.";;
-  255)
-    if test -s $tempfile ; then
-      cat $tempfile
-    else
-      echo "ESC pressed."
-    fi
-    ;;
-esac
+. ./report-tempfile
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/inputbox4 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputbox4
index d0a5231d7d2..416bf86a860 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/inputbox4
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputbox4
@@ -1,10 +1,11 @@
 #!/bin/sh
-# $Id: inputbox4,v 1.3 2004/09/12 22:38:08 tom Exp $
+# $Id: inputbox4,v 1.7 2010/01/13 10:28:12 tom Exp $
 # An example which does not use temporary files, as suggested by Cary Evans:
-: ${DIALOG=dialog}
+
+. ./setup-vars
 
 exec 3>&1
-RESULT=`$DIALOG --title "INPUT BOX" --clear \
+RESULT=`$DIALOG --title "INPUT BOX" --clear "$@" \
         --inputbox "Hi, this is an input dialog box. You can use \n
 this to ask questions that require the user \n
 to input a string as the answer. You can \n
@@ -16,16 +17,4 @@ Try entering your name below:" 16 51 2>&1 1>&3`
 retval=$?
 exec 3>&-
 
-case $retval in
-  0)
-    echo "Input string is $RESULT";;
-  1)
-    echo "Cancel pressed.";;
-  255)
-    if test -n "$RESULT" ; then
-      echo "$RESULT"
-    else
-      echo "ESC pressed."
-    fi
-    ;;
-esac
+. ./report-string
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/inputbox5 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputbox5
index 41ab24088b1..ad726234169 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/inputbox5
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputbox5
@@ -1,12 +1,12 @@
 #!/bin/sh
-# $Id: inputbox5,v 1.2 2003/08/15 19:40:37 tom Exp $
+# $Id: inputbox5,v 1.7 2010/01/13 10:20:03 tom Exp $
 # use --output-fd to write to a different output than stderr
-: ${DIALOG=dialog}
 
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
+. ./setup-vars
 
-$DIALOG --title "INPUT BOX" --clear --output-fd 4 \
+. ./setup-tempfile
+
+$DIALOG --title "INPUT BOX" --clear --output-fd 4 "$@" \
         --inputbox "Hi, this is an input dialog box. You can use \n
 this to ask questions that require the user \n
 to input a string as the answer. You can \n
@@ -18,16 +18,4 @@ Try entering your name below:" 16 51 4> $tempfile
 
 retval=$?
 
-case $retval in
-  0)
-    echo "Input string is `cat $tempfile`";;
-  1)
-    echo "Cancel pressed.";;
-  255)
-    if test -s $tempfile ; then
-      cat $tempfile
-    else
-      echo "ESC pressed."
-    fi
-    ;;
-esac
+. ./report-tempfile
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputbox6-8bit b/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputbox6-8bit
new file mode 100755
index 00000000000..b7692e8826a
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputbox6-8bit
@@ -0,0 +1,17 @@
+#!/bin/sh
+# $Id: inputbox6-8bit,v 1.6 2010/01/13 10:20:03 tom Exp $
+
+. ./setup-vars
+
+. ./setup-tempfile
+
+. ./testdata-8bit
+
+$DIALOG \
+--title    `printf "$SAMPLE"` "$@" \
+--inputbox `printf "$SAMPLE"` \
+10 40 `printf "$SAMPLE"` 2>$tempfile
+
+retval=$?
+
+. ./report-tempfile
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputbox6-utf8 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputbox6-utf8
new file mode 100755
index 00000000000..605382f20a0
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputbox6-utf8
@@ -0,0 +1,17 @@
+#!/bin/sh
+# $Id: inputbox6-utf8,v 1.8 2010/01/13 10:20:03 tom Exp $
+
+. ./setup-vars
+
+. ./setup-tempfile
+
+. ./setup-utf8
+
+$DIALOG \
+--title    `printf "\xe3\x81\x82\xe3\x81\x84\xe3\x81\x86\xe3\x81\x88\xe3\x81\x8a"` "$@" \
+--inputbox `printf "\xe3\x81\x82\xe3\x81\x84\xe3\x81\x86\xe3\x81\x88\xe3\x81\x8a"` \
+10 20 "Ｄ.Ｏ.Ｇ"	 2>$tempfile
+
+retval=$?
+
+. ./report-tempfile
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/inputbox7 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputbox7
index 220cfce344d..e79d9cc584b 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/inputbox7
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputbox7
@@ -1,7 +1,8 @@
 #!/bin/sh
-# $Id: inputbox7,v 1.3 2004/09/12 22:38:38 tom Exp $
+# $Id: inputbox7,v 1.7 2010/01/13 10:20:03 tom Exp $
 # An example which produces two widget outputs.
-: ${DIALOG=dialog}
+
+. ./setup-vars
 
 MSG='Hi, this is an input dialog box. You can use \n
 this to ask questions that require the user \n
@@ -17,7 +18,7 @@ SEP='
 '
 
 exec 3>&1
-RESULT=`$DIALOG --title "INPUT BOX" --clear --separate-widget "$SEP" \
+RESULT=`$DIALOG --title "INPUT BOX" --clear --separate-widget "$SEP" "$@" \
         --inputbox "$MSG" 16 51 \
 	--title "ANOTHER INPUT BOX" \
         --inputbox "$MSG" 16 51 \
@@ -25,16 +26,4 @@ RESULT=`$DIALOG --title "INPUT BOX" --clear --separate-widget "$SEP" \
 retval=$?
 exec 3>&-
 
-case $retval in
-  0)
-    echo "Input string is $RESULT";;
-  1)
-    echo "Cancel pressed.";;
-  255)
-    if test -n "$RESULT" ; then
-      echo "$RESULT"
-    else
-      echo "ESC pressed."
-    fi
-    ;;
-esac
+. ./report-string
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/inputmenu b/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputmenu
index 8dc9a88e1b2..5053cda6a45 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/inputmenu
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputmenu
@@ -1,7 +1,8 @@
 #! /bin/bash
-# $Id: inputmenu,v 1.6 2004/09/19 17:59:14 tom Exp $
+# $Id: inputmenu,v 1.10 2010/01/13 10:29:22 tom Exp $
 # 2002 - written by Tobias Rittweiler <tobrit@freebits.de>
-: ${DIALOG=dialog}
+
+. ./setup-vars
 
 user="$USER"    ; uid="$UID"   ;
 gid="$GROUPS"  ; home="$HOME"  ;
@@ -9,7 +10,7 @@ gid="$GROUPS"  ; home="$HOME"  ;
 while [ ${returncode:-99} -ne 1 -a ${returncode:-99} -ne 250 ]; do
        exec 3>&1
        value=$("$DIALOG" --clear --ok-label "Create" \
-                          --backtitle "An Example for the use of --inputmenu:" \
+                          --backtitle "An Example for the use of --inputmenu:" "$@" \
                           --inputmenu "Originally I designed --inputmenu for a \
 configuration purpose. Here is a possible piece of a configuration program. \
 " 20 50 10 \
@@ -21,15 +22,15 @@ configuration purpose. Here is a possible piece of a configuration program. \
        returncode=$?
        exec 3>&-
        case $returncode in
-       1)
+       $DIALOG_CANCEL)
                "$DIALOG"  --clear --backtitle "An Example for the use of --inputmenu:" \
                                --yesno "Really quit?" 10 30
                case $? in
-                       0) break;;
-                       1) returncode=99;;
+                       $DIALOG_OK) break;;
+                       $DIALOG_CANCEL) returncode=99;;
                esac
                ;;
-       0)
+       $DIALOG_OK)
                "$DIALOG" --clear --backtitle "An Example for the use of --inputmenu:"  \
 			--msgbox "useradd \n\
 				-d $home \n\
@@ -37,7 +38,7 @@ configuration purpose. Here is a possible piece of a configuration program. \
 				-g $gid \n\
 				$user" 10 40
                ;;
-       3)
+       $DIALOG_EXTRA)
                value="${value:8:${#value}}"
                tag="${value%:*}"
                item="${value#*: }"
@@ -50,7 +51,7 @@ configuration purpose. Here is a possible piece of a configuration program. \
                esac
                ;;
 
-       255)
+       $DIALOG_ESC)
                 echo "ESC pressed."
                 break
                 ;;
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/inputmenu-stdout b/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputmenu-stdout
index 2d5993deaa5..22fce044204 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/inputmenu-stdout
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputmenu-stdout
@@ -1,28 +1,29 @@
 #! /bin/bash
-# $Id: inputmenu-stdout,v 1.4 2005/02/06 22:51:23 tom Exp $
+# $Id: inputmenu-stdout,v 1.8 2010/01/13 10:30:14 tom Exp $
 # 2002 - written by Tobias Rittweiler <tobrit@freebits.de>
-: ${DIALOG=dialog}
+
+. ./setup-vars
 
 user="$USER"    ; uid="$UID"   ;
 gid="$GROUPS"  ; home="$HOME"  ;
 
 while [ ${returncode:-99} -ne 1 -a ${returncode:-99} -ne 250 ]; do
        value="$("$DIALOG" --stdout --clear --ok-label "Create" \
-                          --backtitle "An Example for the use of --inputmenu:" \
+                          --backtitle "An Example for the use of --inputmenu:" "$@" \
                           --inputmenu "Originally I designed --inputmenu for a \
 configuration purpose. Here is a possible piece of a configuration program.
 " 20 50 10 "Username:" "$user" "UID:" "$uid" "GID:" "$gid" "HOME:" "$home")"
        returncode=$?
        case $returncode in
-           1)
+           $DIALOG_CANCEL)
                "$DIALOG"  --clear --backtitle "An Example for the use of --inputmenu:" \
                                --yesno "Really quit?" 10 30
                case $? in
-                       0) break;;
-                       1) returncode=99;;
+                       $DIALOG_OK) break;;
+                       $DIALOG_CANCEL) returncode=99;;
                esac
                ;;
-           0)
+           $DIALOG_OK)
                "$DIALOG" --clear --backtitle "An Example for the use of --inputmenu:"  \
 			--msgbox "useradd \n\
 				-d $home \n\
@@ -30,7 +31,7 @@ configuration purpose. Here is a possible piece of a configuration program.
 				-g $gid \n\
 				$user" 10 40
                ;;
-           3)
+           $DIALOG_EXTRA)
                value="${value:8:${#value}}"
                tag="${value%:*}"
                item="${value#*: }"
@@ -43,7 +44,7 @@ configuration purpose. Here is a possible piece of a configuration program.
                esac
 	       ;;
 
-       255)
+       $DIALOG_ESC)
                 echo "ESC pressed."
                 break
                 ;;
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/inputmenu1 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputmenu1
index 48f9a820cc6..4e9bae26e56 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/inputmenu1
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputmenu1
@@ -1,8 +1,9 @@
 #! /bin/sh
-# $Id: inputmenu1,v 1.4 2004/09/19 17:59:14 tom Exp $
+# $Id: inputmenu1,v 1.8 2010/01/13 10:31:02 tom Exp $
 #
 # "inputmenu" rewritten into Bourne shell.
-: ${DIALOG=dialog}
+
+. ./setup-vars
 
 backtitle="An Example for the use of --inputmenu:"
 
@@ -18,7 +19,7 @@ while test $returncode != 1 && test $returncode != 250
 do
 exec 3>&1
 value=`$DIALOG --clear --ok-label "Create" \
-	  --backtitle "$backtitle" \
+	  --backtitle "$backtitle" "$@" \
 	  --inputmenu "Originally I designed --inputmenu for a \
 configuration purpose. Here is a possible piece of a configuration program." \
 20 50 10 \
@@ -31,21 +32,21 @@ returncode=$?
 exec 3>&-
 
 	case $returncode in
-	1)
+	$DIALOG_CANCEL)
 		"$DIALOG" \
 		--clear \
 		--backtitle "$backtitle" \
 		--yesno "Really quit?" 10 30
 		case $? in
-		0)
+		$DIALOG_OK)
 			break
 			;;
-		1)
+		$DIALOG_CANCEL)
 			returncode=99
 			;;
 		esac
 		;;
-	0)
+	$DIALOG_OK)
 		"$DIALOG" \
 		--clear \
 		--backtitle "$backtitle" \
@@ -55,7 +56,7 @@ exec 3>&-
 			-g $gid \n\
 			$user" 10 40
 		;;
-	3)
+	$DIALOG_EXTRA)
 		tag=`echo "$value" |sed -e 's/^RENAMED //' -e 's/:.*//'`
 		item=`echo "$value" |sed -e 's/^.*:[ ]*//' -e 's/[ ]*$//'`
 
@@ -75,7 +76,7 @@ exec 3>&-
 		esac
 		;;
 
-       255)
+	$DIALOG_ESC)
                 echo "ESC pressed."
                 break
                 ;;
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/inputmenu2 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputmenu2
index 7a37dce42c7..f560aba3d21 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/inputmenu2
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputmenu2
@@ -1,8 +1,9 @@
 #! /bin/sh
-# $Id: inputmenu2,v 1.4 2004/09/19 17:59:14 tom Exp $
+# $Id: inputmenu2,v 1.8 2010/01/13 10:32:04 tom Exp $
 #
 # "inputmenu1" with defaultitem, help-button.
-: ${DIALOG=dialog}
+
+. ./setup-vars
 
 backtitle="An Example for the use of --inputmenu:"
 
@@ -22,7 +23,7 @@ value=`$DIALOG --clear --ok-label "Create" \
 	  --backtitle "$backtitle" \
 	  --help-button \
 	  --help-label "Script" \
-	  --default-item "$defaultitem" \
+	  --default-item "$defaultitem" "$@" \
 	  --inputmenu "Originally I designed --inputmenu for a \
 configuration purpose. Here is a possible piece of a configuration program." \
 20 60 10 \
@@ -35,25 +36,25 @@ returncode=$?
 exec 3>&-
 
 	case $returncode in
-	2)
+	$DIALOG_HELP)
 		"$DIALOG" \
 		--textbox "$0" 0 0
 		;;
-	1)
+	$DIALOG_CANCEL)
 		"$DIALOG" \
 		--clear \
 		--backtitle "$backtitle" \
 		--yesno "Really quit?" 10 30
 		case $? in
-		0)
+		$DIALOG_OK)
 			break
 			;;
-		1)
+		$DIALOG_CANCEL)
 			returncode=99
 			;;
 		esac
 		;;
-	0)
+	$DIALOG_OK)
 		"$DIALOG" \
 		--clear \
 		--backtitle "$backtitle" \
@@ -63,7 +64,7 @@ exec 3>&-
 			-g $gid \n\
 			$user" 10 40
 		;;
-	3)
+	$DIALOG_EXTRA)
 		tag=`echo "$value" |sed -e 's/^RENAMED //' -e 's/:.*/:/'`
 		item=`echo "$value" |sed -e 's/^.*:[ ]*//' -e 's/[ ]*$//'`
 
@@ -87,7 +88,7 @@ exec 3>&-
 		test -n "$tag" && defaultitem="$tag"
 		;;
 
-       255)
+	$DIALOG_ESC)
                 echo "ESC pressed."
                 break
                 ;;
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/inputmenu3 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputmenu3
index dd6d25ceec4..e3250d8a761 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/inputmenu3
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputmenu3
@@ -1,8 +1,9 @@
 #! /bin/sh
-# $Id: inputmenu3,v 1.6 2004/12/19 23:18:53 tom Exp $
+# $Id: inputmenu3,v 1.10 2010/01/13 10:32:51 tom Exp $
 #
 # "inputmenu1" with defaultitem, help-button and item-help.
-: ${DIALOG=dialog}
+
+. ./setup-vars
 
 backtitle="An Example for the use of --inputmenu:"
 
@@ -23,7 +24,7 @@ value=`$DIALOG --clear --ok-label "Create" \
 	  --help-button \
 	  --help-label "Script" \
 	  --default-item "$defaultitem" \
-	  --item-help \
+	  --item-help "$@" \
 	  --inputmenu "Originally I designed --inputmenu for a \
 configuration purpose. Here is a possible piece of a configuration program." \
 20 60 10 \
@@ -36,21 +37,21 @@ returncode=$?
 exec 3>&-
 
 	case $returncode in
-	1)
+	$DIALOG_CANCEL)
 		"$DIALOG" \
 		--clear \
 		--backtitle "$backtitle" \
 		--yesno "Really quit?" 10 30
 		case $? in
-		0)
+		$DIALOG_OK)
 			break
 			;;
-		1)
+		$DIALOG_CANCEL)
 			returncode=99
 			;;
 		esac
 		;;
-	0)
+	$DIALOG_OK)
 		case $value in
 		HELP*)
 			"$DIALOG" \
@@ -68,11 +69,11 @@ exec 3>&-
 			;;
 		esac
 		;;
-	2)
+	$DIALOG_HELP)
 		"$DIALOG" \
 		--textbox "$0" 0 0
 		;;
-	3)
+	$DIALOG_EXTRA)
 		tag=`echo "$value" |sed -e 's/^RENAMED //' -e 's/:.*/:/'`
 		item=`echo "$value" |sed -e 's/^.*:[ ]*//' -e 's/[ ]*$//'`
 
@@ -96,7 +97,7 @@ exec 3>&-
 		test -n "$tag" && defaultitem="$tag"
 		;;
 
-        255)
+	$DIALOG_ESC)
                 echo "ESC pressed."
                 break
                 ;;
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/inputmenu4 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputmenu4
index f2a12eb1fcd..a872527c915 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/inputmenu4
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/inputmenu4
@@ -1,8 +1,9 @@
 #! /bin/sh
-# $Id: inputmenu4,v 1.4 2004/09/19 17:59:14 tom Exp $
+# $Id: inputmenu4,v 1.8 2010/01/13 10:33:35 tom Exp $
 #
 # "inputmenu1" with a different label for the extra-button
-: ${DIALOG=dialog}
+
+. ./setup-vars
 
 backtitle="An Example for the use of --inputmenu:"
 
@@ -19,7 +20,7 @@ do
 exec 3>&1
 value=`$DIALOG --clear --ok-label "Create" \
 	--extra-label "Edit" \
-	  --backtitle "$backtitle" \
+	  --backtitle "$backtitle" "$@" \
 	  --inputmenu "Originally I designed --inputmenu for a \
 configuration purpose. Here is a possible piece of a configuration program." \
 20 50 10 \
@@ -32,21 +33,21 @@ returncode=$?
 exec 3>&-
 
 	case $returncode in
-	1)
+	$DIALOG_CANCEL)
 		"$DIALOG" \
 		--clear \
 		--backtitle "$backtitle" \
 		--yesno "Really quit?" 10 30
 		case $? in
-		0)
+		$DIALOG_OK)
 			break
 			;;
-		1)
+		$DIALOG_CANCEL)
 			returncode=99
 			;;
 		esac
 		;;
-	0)
+	$DIALOG_OK)
 		"$DIALOG" \
 		--clear \
 		--backtitle "$backtitle" \
@@ -56,7 +57,7 @@ exec 3>&-
 			-g $gid \n\
 			$user" 10 40
 		;;
-	3)
+	$DIALOG_EXTRA)
 		tag=`echo "$value" |sed -e 's/^RENAMED //' -e 's/:.*//'`
 		item=`echo "$value" |sed -e 's/^.*:[ ]*//' -e 's/[ ]*$//'`
 
@@ -76,10 +77,10 @@ exec 3>&-
 		esac
 		;;
 
-        255)
-                echo "ESC pressed."
-                break
-                ;;
+	$DIALOG_ESC)
+		echo "ESC pressed."
+		break
+		;;
 
 	esac
 done
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/install/FDISK.TEST b/Build/source/utils/dialog/dialog-1.1-20100119/samples/install/FDISK.TEST
index 2ad568a62d7..2ad568a62d7 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/install/FDISK.TEST
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/install/FDISK.TEST
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/install/makefile.in b/Build/source/utils/dialog/dialog-1.1-20100119/samples/install/makefile.in
index 3dcdc09ba2c..3dcdc09ba2c 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/install/makefile.in
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/install/makefile.in
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/install/setup.c b/Build/source/utils/dialog/dialog-1.1-20100119/samples/install/setup.c
index ae569813e86..ae569813e86 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/install/setup.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/install/setup.c
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/install/setup.help b/Build/source/utils/dialog/dialog-1.1-20100119/samples/install/setup.help
index 7ac8369d4e6..7ac8369d4e6 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/install/setup.help
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/install/setup.help
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/killall b/Build/source/utils/dialog/dialog-1.1-20100119/samples/killall
index 9d233f0a92d..9d233f0a92d 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/killall
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/killall
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/listing b/Build/source/utils/dialog/dialog-1.1-20100119/samples/listing
index 71d85aa6df9..71d85aa6df9 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/listing
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/listing
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/menubox b/Build/source/utils/dialog/dialog-1.1-20100119/samples/menubox
index 2b12970a35e..0cea3bb0000 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/menubox
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/menubox
@@ -1,11 +1,11 @@
 #!/bin/sh
-# $Id: menubox,v 1.4 2003/08/15 19:40:37 tom Exp $
-: ${DIALOG=dialog}
+# $Id: menubox,v 1.11 2010/01/13 10:20:03 tom Exp $
 
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
+. ./setup-vars
 
-$DIALOG --clear --title "MENU BOX" \
+. ./setup-tempfile
+
+$DIALOG --clear --title "MENU BOX" "$@" \
         --menu "Hi, this is a menu box. You can use this to \n\
 present a list of choices for the user to \n\
 choose. If there are more items than can fit \n\
@@ -24,13 +24,4 @@ Try it now!\n\n\
 
 retval=$?
 
-choice=`cat $tempfile`
-
-case $retval in
-  0)
-    echo "'$choice' chosen.";;
-  1)
-    echo "Cancel pressed.";;
-  255)
-    echo "ESC pressed.";;
-esac
+. ./report-tempfile
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/menubox-8bit b/Build/source/utils/dialog/dialog-1.1-20100119/samples/menubox-8bit
index 8c876c86aed..91faa5cfea2 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/menubox-8bit
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/menubox-8bit
@@ -1,13 +1,13 @@
 #!/bin/sh
-# $Id: menubox-8bit,v 1.1 2004/12/19 16:55:17 tom Exp $
-: ${DIALOG=dialog}
+# $Id: menubox-8bit,v 1.6 2010/01/13 10:20:03 tom Exp $
 
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
+. ./setup-vars
+
+. ./setup-tempfile
 
 . ./testdata-8bit
 
-$DIALOG --clear --title "MENU BOX" \
+$DIALOG --clear --title "MENU BOX" "$@" \
         --menu "Hi, this is a menu box. You can use this to \n\
 present a list of choices for the user to \n\
 choose. If there are more items than can fit \n\
@@ -26,13 +26,4 @@ Try it now!\n\n\
 
 retval=$?
 
-choice=`cat $tempfile`
-
-case $retval in
-  0)
-    echo "'$choice' chosen.";;
-  1)
-    echo "Cancel pressed.";;
-  255)
-    echo "ESC pressed.";;
-esac
+. ./report-tempfile
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/menubox-utf8 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/menubox-utf8
index bc8294456d6..cd6e429c2c3 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/menubox-utf8
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/menubox-utf8
@@ -1,20 +1,13 @@
 #!/bin/sh
-# $Id: menubox-utf8,v 1.2 2007/10/21 21:46:17 tom Exp $
-: ${DIALOG=dialog}
+# $Id: menubox-utf8,v 1.10 2010/01/13 10:20:03 tom Exp $
 
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
+. ./setup-vars
 
-case none"$LANG$LC_ALL$LC_CTYPE" in
-*UTF-8*)
-	;;
-*)
-	echo "This script must be run in a UTF-8 locale"
-	exit 1
-	;;
-esac
+. ./setup-tempfile
 
-$DIALOG --clear --title "MENU BOX" \
+. ./setup-utf8
+
+$DIALOG --clear --title "MENU BOX" "$@" \
         --menu "Hi, this is a menu box. You can use this to \n\
 present a list of choices for the user to \n\
 choose. If there are more items than can fit \n\
@@ -33,13 +26,4 @@ Try it now!\n\n\
 
 retval=$?
 
-choice=`cat $tempfile`
-
-case $retval in
-  0)
-    echo "'$choice' chosen.";;
-  1)
-    echo "Cancel pressed.";;
-  255)
-    echo "ESC pressed.";;
-esac
+. ./report-tempfile
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/menubox1 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/menubox1
index fc1c9a6c3e0..dc40d027e75 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/menubox1
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/menubox1
@@ -1,11 +1,11 @@
 #!/bin/sh
-# $Id: menubox1,v 1.2 2003/08/15 19:40:37 tom Exp $
-: ${DIALOG=dialog}
+# $Id: menubox1,v 1.7 2010/01/13 10:20:03 tom Exp $
 
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
+. ./setup-vars
 
-$DIALOG --default-item "OS/2" --clear --title "MENU BOX" \
+. ./setup-tempfile
+
+$DIALOG --default-item "OS/2" --clear --title "MENU BOX" "$@" \
         --menu "Hi, this is a menu box. You can use this to \n\
 present a list of choices for the user to \n\
 choose. If there are more items than can fit \n\
@@ -24,16 +24,4 @@ Try it now!\n\n\
 
 retval=$?
 
-case $retval in
-  0)
-    echo "`cat $tempfile` chosen.";;
-  1)
-    echo "Cancel pressed.";;
-  255)
-    if test -s $tempfile ; then
-      cat $tempfile
-    else
-      echo "ESC pressed."
-    fi
-    ;;
-esac
+. ./report-tempfile
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/menubox10 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/menubox10
new file mode 100755
index 00000000000..86069342199
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/menubox10
@@ -0,0 +1,22 @@
+#!/bin/sh
+# $Id: menubox10,v 1.5 2010/01/13 10:34:12 tom Exp $
+# zero-width column
+
+. ./setup-vars
+
+exec 3>&1
+RESULT=`$DIALOG --backtitle "Debian Configuration" \
+	--title "Configuring debconf" \
+	--default-item Dialog "$@" \
+	--menu "Packages that use debconf for co" 19 50 6 \
+	Dialog		"" \
+	Readline	"" \
+	Gnome		"" \
+	Kde		"" \
+	Editor		"" \
+	Noninteractive	"" \
+2>&1 1>&3`
+retval=$?
+exec 3>&-
+
+. ./report-string
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/menubox2 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/menubox2
index f998f00a397..d81ba792a76 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/menubox2
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/menubox2
@@ -1,11 +1,11 @@
 #!/bin/sh
-# $Id: menubox2,v 1.2 2003/08/15 19:40:37 tom Exp $
-: ${DIALOG=dialog}
+# $Id: menubox2,v 1.7 2010/01/13 10:20:03 tom Exp $
 
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
+. ./setup-vars
 
-$DIALOG --default-item "MSDOS" --clear --title "MENU BOX" \
+. ./setup-tempfile
+
+$DIALOG --default-item "MSDOS" --clear --title "MENU BOX" "$@" \
         --menu "Hi, this is a menu box. You can use this to \n\
 present a list of choices for the user to \n\
 choose. If there are more items than can fit \n\
@@ -24,16 +24,4 @@ Try it now!\n\n\
 
 retval=$?
 
-case $retval in
-  0)
-    echo "`cat $tempfile` chosen.";;
-  1)
-    echo "Cancel pressed.";;
-  255)
-    if test -s $tempfile ; then
-      cat $tempfile
-    else
-      echo "ESC pressed."
-    fi
-    ;;
-esac
+. ./report-tempfile
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/menubox3 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/menubox3
index dfdb5a295b6..d33b5d6fdef 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/menubox3
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/menubox3
@@ -1,11 +1,11 @@
 #!/bin/sh
-# $Id: menubox3,v 1.3 2004/12/19 23:18:53 tom Exp $
-: ${DIALOG=dialog}
+# $Id: menubox3,v 1.8 2010/01/13 10:20:03 tom Exp $
 
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
+. ./setup-vars
 
-$DIALOG --clear --item-help --title "MENU BOX" \
+. ./setup-tempfile
+
+$DIALOG --clear --item-help --title "MENU BOX" "$@" \
         --menu "Hi, this is a menu box. You can use this to \n\
 present a list of choices for the user to \n\
 choose. If there are more items than can fit \n\
@@ -24,17 +24,4 @@ Try it now!\n\n\
 
 retval=$?
 
-choice=`cat $tempfile`
-
-case $retval in
-  0)
-    echo "OK '$choice' chosen.";;
-  1)
-    echo "Cancel pressed.";;
-  2)
-    echo "HELP '$choice' chosen.";;
-  255)
-    echo "ESC pressed.";;
-  *)
-    echo "Unexpected code $retval";;
-esac
+. ./report-tempfile
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/menubox4 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/menubox4
index 266f36dc6d5..e95342de9d8 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/menubox4
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/menubox4
@@ -1,11 +1,11 @@
 #!/bin/sh
-# $Id: menubox4,v 1.3 2004/12/19 23:18:53 tom Exp $
-: ${DIALOG=dialog}
+# $Id: menubox4,v 1.8 2010/01/13 10:20:03 tom Exp $
 
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
+. ./setup-vars
 
-$DIALOG --clear --item-help --title "MENU BOX" \
+. ./setup-tempfile
+
+$DIALOG --clear --item-help --title "MENU BOX" "$@" \
         --menu "Hi, this is a menu box. You can use this to \n\
 present a list of choices for the user to \n\
 choose. If there are more items than can fit \n\
@@ -24,17 +24,4 @@ Try it now!\n\n\
 
 retval=$?
 
-choice=`cat $tempfile`
-
-case $retval in
-  0)
-    echo "OK '$choice' chosen.";;
-  1)
-    echo "Cancel pressed.";;
-  2)
-    echo "HELP '$choice' chosen.";;
-  255)
-    echo "ESC pressed.";;
-  *)
-    echo "Unexpected code $retval";;
-esac
+. ./report-tempfile
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/menubox5 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/menubox5
index 044e8578a81..c89be3a0e74 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/menubox5
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/menubox5
@@ -1,11 +1,11 @@
 #!/bin/sh
-# $Id: menubox5,v 1.4 2004/12/19 23:18:53 tom Exp $
-: ${DIALOG=dialog}
+# $Id: menubox5,v 1.9 2010/01/13 10:20:03 tom Exp $
 
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
+. ./setup-vars
 
-$DIALOG --clear --help-button --item-help --title "MENU BOX" \
+. ./setup-tempfile
+
+$DIALOG --clear --help-button --item-help --title "MENU BOX" "$@" \
         --menu "Hi, this is a menu box. You can use this to \n\
 present a list of choices for the user to \n\
 choose. If there are more items than can fit \n\
@@ -27,17 +27,4 @@ Try it now!\n\n\
 
 retval=$?
 
-choice=`cat $tempfile`
-
-case $retval in
-  0)
-    echo "OK '$choice' chosen.";;
-  1)
-    echo "Cancel pressed.";;
-  2)
-    echo "HELP '$choice' chosen.";;
-  255)
-    echo "ESC pressed.";;
-  *)
-    echo "Unexpected code $retval";;
-esac
+. ./report-tempfile
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/menubox6 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/menubox6
index 1d8496b096d..afcc90de2b0 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/menubox6
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/menubox6
@@ -1,12 +1,12 @@
 #!/bin/sh
-# $Id: menubox6,v 1.3 2004/12/19 23:18:53 tom Exp $
+# $Id: menubox6,v 1.8 2010/01/13 10:20:03 tom Exp $
 # example showing the --colors option
-: ${DIALOG=dialog}
 
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
+. ./setup-vars
 
-$DIALOG --clear --item-help --title "MENU BOX" --colors \
+. ./setup-tempfile
+
+$DIALOG --clear --item-help --title "MENU BOX" --colors "$@" \
         --menu "Hi, this is a \Zumenu\Zn box. You can use this to \n\
 present a list of choices for the user to \n\
 choose. If there are more items than can fit \n\
@@ -25,17 +25,4 @@ Try it now!\n\n\
 
 retval=$?
 
-choice=`cat $tempfile`
-
-case $retval in
-  0)
-    echo "OK '$choice' chosen.";;
-  1)
-    echo "Cancel pressed.";;
-  2)
-    echo "HELP '$choice' chosen.";;
-  255)
-    echo "ESC pressed.";;
-  *)
-    echo "Unexpected code $retval";;
-esac
+. ./report-tempfile
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/menubox7 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/menubox7
index 376e97fd42c..2e85b435608 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/menubox7
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/menubox7
@@ -1,13 +1,13 @@
 #!/bin/sh
-# $Id: menubox7,v 1.4 2006/01/18 00:19:03 tom Exp $
+# $Id: menubox7,v 1.9 2010/01/13 10:20:03 tom Exp $
 # example with --extra-button
-: ${DIALOG=dialog}
 
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
+. ./setup-vars
+
+. ./setup-tempfile
 
 $DIALOG --clear --item-help --extra-button --extra-label "Choice" \
-	--title "MENU BOX" \
+	--title "MENU BOX" "$@" \
         --menu "Hi, this is a menu box. You can use this to \n\
 present a list of choices for the user to \n\
 choose. If there are more items than can fit \n\
@@ -26,19 +26,4 @@ Try it now!\n\n\
 
 retval=$?
 
-choice=`cat $tempfile`
-
-case $retval in
-  0)
-    echo "OK '$choice' chosen.";;
-  1)
-    echo "Cancel pressed.";;
-  2)
-    echo "HELP '$choice' chosen.";;
-  3)
-    echo "Extra (Choice) chosen.";;
-  255)
-    echo "ESC pressed.";;
-  *)
-    echo "Unexpected code $retval";;
-esac
+. ./report-tempfile
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/menubox8 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/menubox8
index e4efe71efff..85448d05841 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/menubox8
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/menubox8
@@ -1,12 +1,13 @@
 #!/bin/sh
-# $Id: menubox8,v 1.3 2003/08/15 19:40:37 tom Exp $
-: ${DIALOG=dialog}
+# $Id: menubox8,v 1.7 2010/01/13 10:34:32 tom Exp $
+
+. ./setup-vars
 
 exec 3>&1
-value=`$DIALOG --help-button \
+RESULT=`$DIALOG --help-button \
 	--default-item "MSDOS" \
 	--clear \
-	--title "MENU BOX" \
+	--title "MENU BOX" "$@" \
         --menu "Hi, this is a menu box. You can use this to \n\
 present a list of choices for the user to \n\
 choose. If there are more items than can fit \n\
@@ -26,18 +27,4 @@ Try it now!\n\n\
 retval=$?
 exec 3>&-
 
-case $retval in
-  0)
-    echo "$value chosen.";;
-  1)
-    echo "Cancel pressed.";;
-  2)
-    echo "Help pressed ($value)";;
-  255)
-    if test -n "$value" ; then
-      echo "$value"
-    else
-      echo "ESC pressed."
-    fi
-    ;;
-esac
+. ./report-string
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/menubox9 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/menubox9
index 9f46a16bebb..83739395189 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/menubox9
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/menubox9
@@ -1,11 +1,12 @@
 #!/bin/sh
-# $Id: menubox9,v 1.1 2003/09/23 23:02:08 tom Exp $
-: ${DIALOG=dialog}
+# $Id: menubox9,v 1.6 2010/01/13 10:20:03 tom Exp $
+
+. ./setup-vars
 
 exec 3>&1
-value=`$DIALOG --help-button \
+RESULT=`$DIALOG --help-button \
 	--clear \
-	--title "Select Linux installation partition:" \
+	--title "Select Linux installation partition:" "$@" \
 	--menu \
 "Please select a partition from the following list to use for your \
 root (/) Linux partition." 13 70 5 \
@@ -22,18 +23,4 @@ root (/) Linux partition." 13 70 5 \
 retval=$?
 exec 3>&-
 
-case $retval in
-  0)
-    echo "$value chosen.";;
-  1)
-    echo "Cancel pressed.";;
-  2)
-    echo "Help pressed ($value)";;
-  255)
-    if test -n "$value" ; then
-      echo "$value"
-    else
-      echo "ESC pressed."
-    fi
-    ;;
-esac
+. ./report-string
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/mixedform b/Build/source/utils/dialog/dialog-1.1-20100119/samples/mixedform
index 7ab4594e430..617847682ce 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/mixedform
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/mixedform
@@ -1,6 +1,7 @@
 #! /bin/sh
-# $Id: mixedform,v 1.2 2007/02/17 14:53:43 tom Exp $
-: ${DIALOG=dialog}
+# $Id: mixedform,v 1.6 2010/01/13 10:47:35 tom Exp $
+
+. ./setup-vars
 
 backtitle="An Example for the use of --mixedform:"
 returncode=0
@@ -10,7 +11,7 @@ returncode=$?
 exec 3>&1
 value=`$DIALOG  --title "Mixed form demonstration" --ok-label "Submit" \
            --backtitle "$backtitle" \
-	  --insecure \
+	  --insecure "$@" \
 	  --mixedform "Here is a possible piece of a configuration program." \
 20 50 0 \
 	"Username        :" 1 1	"Kiran" 1 20 10 0 2 \
@@ -23,32 +24,32 @@ exec 3>&-
 show=`echo "$value" |sed -e 's/^/	/'`
 
 	case $returncode in
-	1)
+	$DIALOG_CANCEL)
 		"$DIALOG" \
 		--clear \
 		--backtitle "$backtitle" \
 		--yesno "Really quit?" 10 30
 		case $? in
-		0)
+		$DIALOG_OK)
 			break
 			;;
-		1)
+		$DIALOG_CANCEL)
 			returncode=99
 			;;
 		esac
 		;;
-	0)
+	$DIALOG_OK)
 		"$DIALOG" \
 		--clear \
 		--backtitle "$backtitle" --no-collapse --cr-wrap \
 		--msgbox "Resulting data:\n\
 $show" 10 40
 		;;
-	2)
+	$DIALOG_HELP)
 		echo "Button 2 (Help) pressed."
 		exit
 		;;
-	3)
+	$DIALOG_EXTRA)
 		echo "Button 3 (Extra) pressed."
 		exit
 		;;
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/mixedform2 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/mixedform2
index 8c88d3d8fc2..07f1d664617 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/mixedform2
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/mixedform2
@@ -1,6 +1,7 @@
 #! /bin/sh
-# $Id: mixedform2,v 1.1 2007/02/17 15:48:19 tom Exp $
-: ${DIALOG=dialog}
+# $Id: mixedform2,v 1.5 2010/01/13 10:47:35 tom Exp $
+
+. ./setup-vars
 
 backtitle="An Example for the use of --mixedform:"
 returncode=0
@@ -10,7 +11,7 @@ returncode=$?
 exec 3>&1
 value=`$DIALOG  --title "Mixed form demonstration" --ok-label "Submit" \
            --backtitle "$backtitle" \
-	  --insecure \
+	  --insecure "$@" \
 	  --mixedform "Here is a possible piece of a configuration program." \
 20 50 0 \
 	"Username        :"	 1 1	"Kiran" 1 20 10 0 2 \
@@ -23,32 +24,32 @@ exec 3>&-
 show=`echo "$value" |sed -e 's/^/	/'`
 
 	case $returncode in
-	1)
+	$DIALOG_CANCEL)
 		"$DIALOG" \
 		--clear \
 		--backtitle "$backtitle" \
 		--yesno "Really quit?" 10 30
 		case $? in
-		0)
+		$DIALOG_OK)
 			break
 			;;
-		1)
+		$DIALOG_CANCEL)
 			returncode=99
 			;;
 		esac
 		;;
-	0)
+	$DIALOG_OK)
 		"$DIALOG" \
 		--clear \
 		--backtitle "$backtitle" --no-collapse --cr-wrap \
 		--msgbox "Resulting data:\n\
 $show" 10 40
 		;;
-	2)
+	$DIALOG_HELP)
 		echo "Button 2 (Help) pressed."
 		exit
 		;;
-	3)
+	$DIALOG_EXTRA)
 		echo "Button 3 (Extra) pressed."
 		exit
 		;;
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/mixedgauge b/Build/source/utils/dialog/dialog-1.1-20100119/samples/mixedgauge
index 2f1dadeedfa..517ba1134ce 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/mixedgauge
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/mixedgauge
@@ -1,12 +1,14 @@
 #! /bin/sh
-# $Id: mixedgauge,v 1.4 2007/02/26 23:10:30 tom Exp $
-: ${DIALOG=dialog}
+# $Id: mixedgauge,v 1.7 2010/01/13 10:20:03 tom Exp $
+
+. ./setup-vars
+
 background="An Example of --mixedgauge usage"
 
 for i in 5 10 20 30 40 50 60 70 80 90 100
 do
 $DIALOG --backtitle "$background" \
-	--title "Mixed gauge demonstration" \
+	--title "Mixed gauge demonstration" "$@" \
 	--mixedgauge "This is a prompt message,\nand this is the second line." \
 		0 0 33 \
 		"Process one"	"0" \
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/msgbox b/Build/source/utils/dialog/dialog-1.1-20100119/samples/msgbox
new file mode 100755
index 00000000000..adc204e11f7
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/msgbox
@@ -0,0 +1,13 @@
+#!/bin/sh
+# $Id: msgbox,v 1.7 2010/01/13 10:35:13 tom Exp $
+
+. ./setup-vars
+
+$DIALOG --title "MESSAGE BOX" --clear "$@" \
+        --msgbox "Hi, this is a simple message box. You can use this to \
+                  display any message you like. The box will remain until \
+                  you press the ENTER key." 10 41
+
+retval=$?
+
+. ./report-button
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/msgbox b/Build/source/utils/dialog/dialog-1.1-20100119/samples/msgbox-help
index eba369ffd8e..3825f6b9819 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/msgbox
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/msgbox-help
@@ -1,15 +1,14 @@
 #!/bin/sh
-# $Id: msgbox,v 1.3 2003/08/15 19:40:37 tom Exp $
-: ${DIALOG=dialog}
+# $Id: msgbox-help,v 1.6 2010/01/13 10:53:11 tom Exp $
+
+. ./setup-vars
 
 $DIALOG --title "MESSAGE BOX" --clear \
+	--help-button "$@" \
         --msgbox "Hi, this is a simple message box. You can use this to \
                   display any message you like. The box will remain until \
                   you press the ENTER key." 10 41
 
-case $? in
-  0)
-    echo "OK";;
-  255)
-    echo "ESC pressed.";;
-esac
+retval=$?
+
+. ./report-button
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/msgbox1 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/msgbox1
index c889d19b7ff..b7ef8244bef 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/msgbox1
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/msgbox1
@@ -1,33 +1,34 @@
 #!/bin/sh
-# $Id: msgbox1,v 1.5 2004/06/06 13:40:58 tom Exp $
-: ${DIALOG=dialog}
+# $Id: msgbox1,v 1.9 2010/01/13 10:26:52 tom Exp $
 
-$DIALOG --title "MESSAGE BOX" --clear \
+. ./setup-vars
+
+$DIALOG --title "MESSAGE BOX" --clear "$@" \
         --msgbox "Hi, this is a simple message box. You can use this to 
                   display any message you like. The box will remain until
                   you press the ENTER key.  This box is being displayed 
                   with dialogs default aspect ratio of 9." 0 0
-test $? = 255 && exit
+test $? = $DIALOG_ESC && exit
 
-$DIALOG --aspect 12 --title "MESSAGE BOX  aspect=12" --clear \
+$DIALOG --aspect 12 --title "MESSAGE BOX  aspect=12" --clear "$@" \
         --msgbox "Hi, this is a simple message box. You can use this to 
                   display any message you like. The box will remain until
                   you press the ENTER key.  This box is being displayed 
                   with an aspect ratio of 12." 0 0
-test $? = 255 && exit
+test $? = $DIALOG_ESC && exit
 
-$DIALOG --aspect 6 --title "MESSAGE BOX  aspect=6" --clear \
+$DIALOG --aspect 6 --title "MESSAGE BOX  aspect=6" --clear "$@" \
         --msgbox "Hi, this is a simple message box. You can use this to 
                   display any message you like. The box will remain until
                   you press the ENTER key.  This box is being displayed 
                   with an aspect ratio of 6." 0 0
-test $? = 255 && exit
+test $? = $DIALOG_ESC && exit
 
 $DIALOG --aspect 6 --cr-wrap --title "MESSAGE BOX aspect=6 with --cr-wrap" \
-        --clear --msgbox "\
+        --clear --msgbox " "$@" \
            Hi, this is a simple
            message box. You can
           use this to display any 
              message you like.
 The box will remain until you press the ENTER key.  This box is being displayed with an aspect ratio of 6, and using --cr-wrap.\n" 0 0
-test $? = 255 && exit
+test $? = $DIALOG_ESC && exit
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/msgbox2 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/msgbox2
index 7a656a1fd0e..b39f65a634d 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/msgbox2
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/msgbox2
@@ -1,33 +1,34 @@
 #!/bin/sh
-# $Id: msgbox2,v 1.3 2004/06/06 13:42:26 tom Exp $
-: ${DIALOG=dialog}
+# $Id: msgbox2,v 1.7 2010/01/13 10:26:52 tom Exp $
 
-$DIALOG --title "MESSAGE BOX" --trim \
+. ./setup-vars
+
+$DIALOG --title "MESSAGE BOX" --trim "$@" \
         --msgbox "Hi, this is a simple message box. You can use this to 
                   display any message you like. The box will remain until
                   you press the ENTER key.  This box is being displayed 
                   with dialogs default aspect ratio of 9." 0 0
-test $? = 255 && exit
+test $? = $DIALOG_ESC && exit
 
-$DIALOG --aspect 12 --title "MESSAGE BOX  aspect=12" --trim \
+$DIALOG --aspect 12 --title "MESSAGE BOX  aspect=12" --trim "$@" \
         --msgbox "Hi, this is a simple message box. You can use this to 
                   display any message you like. The box will remain until
                   you press the ENTER key.  This box is being displayed 
                   with an aspect ratio of 12." 0 0
-test $? = 255 && exit
+test $? = $DIALOG_ESC && exit
 
-$DIALOG --aspect 6 --title "MESSAGE BOX  aspect=6" --trim \
+$DIALOG --aspect 6 --title "MESSAGE BOX  aspect=6" --trim "$@" \
         --msgbox "Hi, this is a simple message box. You can use this to 
                   display any message you like. The box will remain until
                   you press the ENTER key.  This box is being displayed 
                   with an aspect ratio of 6." 0 0
-test $? = 255 && exit
+test $? = $DIALOG_ESC && exit
 
 $DIALOG --aspect 6 --cr-wrap --title "MESSAGE BOX aspect=6 with --cr-wrap" \
-        --trim --msgbox "\
+        --trim --msgbox " "$@" \
            Hi, this is a simple
            message box. You can
           use this to display any 
              message you like.
 The box will remain until you press the ENTER key.  This box is being displayed with an aspect ratio of 6, and using --cr-wrap.\n" 0 0
-test $? = 255 && exit
+test $? = $DIALOG_ESC && exit
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/msgbox3 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/msgbox3
index fedc30a5046..d1ea1080f88 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/msgbox3
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/msgbox3
@@ -1,11 +1,12 @@
 #!/bin/sh
-# $Id: msgbox3,v 1.3 2004/06/05 17:19:10 tom Exp $
-: ${DIALOG=dialog}
+# $Id: msgbox3,v 1.7 2010/01/13 10:26:52 tom Exp $
+
+. ./setup-vars
 
 width=35
 while test $width != 61
 do
-$DIALOG --title "MESSAGE BOX (width $width)" --clear --no-collapse \
+$DIALOG --title "MESSAGE BOX (width $width)" --clear --no-collapse "$@" \
         --msgbox "\
 	H   H EEEEE L     L      OOO
 	H   H E     L     L     O   O
@@ -16,6 +17,6 @@ $DIALOG --title "MESSAGE BOX (width $width)" --clear --no-collapse \
 Hi, this is a simple message box.  You can use this to \
 display any message you like.  The box will remain until \
 you press the ENTER key." 15 $width
-test $? = 255 && break
+test $? = $DIALOG_ESC && break
 width=`expr $width + 1`
 done
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/msgbox4-8bit b/Build/source/utils/dialog/dialog-1.1-20100119/samples/msgbox4-8bit
index d3192266847..216ac8eccb5 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/msgbox4-8bit
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/msgbox4-8bit
@@ -1,17 +1,14 @@
 #!/bin/sh
-# $Id: msgbox4-8bit,v 1.1 2004/12/19 17:02:40 tom Exp $
-: ${DIALOG=dialog}
+# $Id: msgbox4-8bit,v 1.4 2010/01/13 10:20:03 tom Exp $
 
-: ${DIALOG_OK=0}
-: ${DIALOG_CANCEL=1}
-: ${DIALOG_ESC=255}
+. ./setup-vars
 
 . ./testdata-8bit
 
 width=30
 while test $width != 61
 do
-$DIALOG --title "MESSAGE BOX (width $width)" --no-collapse --colors \
+$DIALOG --title "MESSAGE BOX (width $width)" --no-collapse --colors "$@" \
         --msgbox "\
 This sample uses characters which are non-printing in POSIX locale.
 
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/msgbox4-eucjp b/Build/source/utils/dialog/dialog-1.1-20100119/samples/msgbox4-eucjp
index 044df41edfe..9969c082453 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/msgbox4-eucjp
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/msgbox4-eucjp
@@ -1,11 +1,12 @@
 #!/bin/sh
-# $Id: msgbox4-eucjp,v 1.2 2003/08/15 19:40:37 tom Exp $
-: ${DIALOG=dialog}
+# $Id: msgbox4-eucjp,v 1.5 2010/01/13 10:20:03 tom Exp $
+
+. ./setup-vars
 
 width=35
 while test $width != 61
 do
-$DIALOG --title "MESSAGE BOX (width $width)" --clear --no-collapse \
+$DIALOG --title "MESSAGE BOX (width $width)" --clear --no-collapse "$@" \
         --msgbox "\
 This sample is written in EUC-JP.
 There are several checking points:
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/msgbox4-utf8 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/msgbox4-utf8
index 7082ac4767d..acbbebe5eab 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/msgbox4-utf8
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/msgbox4-utf8
@@ -1,24 +1,14 @@
 #!/bin/sh
-# $Id: msgbox4-utf8,v 1.6 2004/12/19 16:27:15 tom Exp $
-: ${DIALOG=dialog}
-
-: ${DIALOG_OK=0}
-: ${DIALOG_CANCEL=1}
-: ${DIALOG_ESC=255}
-
-case none"$LANG$LC_ALL$LC_CTYPE" in
-*UTF-8*)
-	;;
-*)
-	echo "This script must be run in a UTF-8 locale"
-	exit 1
-	;;
-esac
+# $Id: msgbox4-utf8,v 1.10 2010/01/13 10:20:03 tom Exp $
+
+. ./setup-vars
+
+. ./setup-utf8
 
 width=30
 while test $width != 61
 do
-$DIALOG --title "MESSAGE BOX (width $width)" --no-collapse \
+$DIALOG --title "MESSAGE BOX (width $width)" --no-collapse "$@" \
         --msgbox "\
 This sample is written in UTF-8.
 There are several checking points:
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/msgbox5 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/msgbox5
index a4aa359ebfd..f5d942725d5 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/msgbox5
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/msgbox5
@@ -1,12 +1,13 @@
 #!/bin/sh
-# $Id: msgbox5,v 1.1 2004/06/05 17:19:43 tom Exp $
+# $Id: msgbox5,v 1.5 2010/01/13 10:26:52 tom Exp $
 # this differs from msgbox3 by making a window small enough to force scrolling.
-: ${DIALOG=dialog}
+
+. ./setup-vars
 
 width=35
 while test $width != 61
 do
-$DIALOG --title "MESSAGE BOX (width $width)" --clear --no-collapse \
+$DIALOG --title "MESSAGE BOX (width $width)" --clear --no-collapse "$@" \
         --msgbox "\
 	H   H EEEEE L     L      OOO
 	H   H E     L     L     O   O
@@ -17,6 +18,6 @@ $DIALOG --title "MESSAGE BOX (width $width)" --clear --no-collapse \
 Hi, this is a simple message box.  You can use this to \
 display any message you like.  The box will remain until \
 you press the ENTER key." 10 $width
-test $? = 255 && break
+test $? = $DIALOG_ESC && break
 width=`expr $width + 1`
 done
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/msgbox6 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/msgbox6
index 5db644d99c9..1d30f021897 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/msgbox6
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/msgbox6
@@ -1,16 +1,17 @@
 #!/bin/sh
-# $Id: msgbox6,v 1.1 2004/11/18 00:57:40 tom Exp $
+# $Id: msgbox6,v 1.5 2010/01/13 10:26:52 tom Exp $
 # this differs from msgbox3 by making a window small enough to force scrolling.
-: ${DIALOG=dialog}
+
+. ./setup-vars
 
 width=35
 while test $width != 61
 do
-$DIALOG --title "MESSAGE BOX (width $width)" --clear \
+$DIALOG --title "MESSAGE BOX (width $width)" --clear "$@" \
         --msgbox "\
 	a b c d e f g h j i j k l m n o p q r s t u v w x y z
 	A B C D E F G H J I J K L M N O P Q R S T U V W X Y Z
 " 10 $width
-test $? = 255 && break
+test $? = $DIALOG_ESC && break
 width=`expr $width + 1`
 done
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/msgbox6a b/Build/source/utils/dialog/dialog-1.1-20100119/samples/msgbox6a
index 1d5238cceae..e84edbf5f75 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/msgbox6a
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/msgbox6a
@@ -1,16 +1,17 @@
 #!/bin/sh
-# $Id: msgbox6a,v 1.1 2004/11/18 00:59:17 tom Exp $
+# $Id: msgbox6a,v 1.5 2010/01/13 10:26:52 tom Exp $
 # this differs from msgbox3 by making a window small enough to force scrolling.
-: ${DIALOG=dialog}
+
+. ./setup-vars
 
 width=35
 while test $width != 61
 do
-$DIALOG --title "MESSAGE BOX (width $width)" --clear \
+$DIALOG --title "MESSAGE BOX (width $width)" --clear "$@" \
         --msgbox "\
 	.a .b .c .d .e .f .g .h .j .i .j .k .l .m .n .o .p .q .r .s .t .u .v .w .x .y .z
 	.A .B .C .D .E .F .G .H .J .I .J .K .L .M .N .O .P .Q .R .S .T .U .V .W .X .Y .Z
 " 10 $width
-test $? = 255 && break
+test $? = $DIALOG_ESC && break
 width=`expr $width + 1`
 done
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/password b/Build/source/utils/dialog/dialog-1.1-20100119/samples/password
new file mode 100755
index 00000000000..4517043ac28
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/password
@@ -0,0 +1,20 @@
+#!/bin/sh
+# $Id: password,v 1.7 2010/01/13 10:20:03 tom Exp $
+
+. ./setup-vars
+
+. ./setup-tempfile
+
+$DIALOG --title "INPUT BOX" --clear "$@" \
+        --passwordbox "Hi, this is an password dialog box. You can use \n
+this to ask questions that require the user \n
+to input a string as the answer. You can \n
+input strings of length longer than the \n
+width of the input box, in that case, the \n
+input field will be automatically scrolled. \n
+You can use BACKSPACE to correct errors. \n\n
+Try entering your name below:" 16 51 2> $tempfile
+
+retval=$?
+
+. ./report-tempfile
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/password b/Build/source/utils/dialog/dialog-1.1-20100119/samples/password1
index 4bc549bcd23..adeabc09b1f 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/password
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/password1
@@ -1,11 +1,12 @@
 #!/bin/sh
-# $Id: password,v 1.2 2003/08/15 19:40:37 tom Exp $
-: ${DIALOG=dialog}
+# $Id: password1,v 1.6 2010/01/13 10:20:03 tom Exp $
 
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
+. ./setup-vars
+
+. ./setup-tempfile
 
 $DIALOG --title "INPUT BOX" --clear \
+	--insecure "$@" \
         --passwordbox "Hi, this is an password dialog box. You can use \n
 this to ask questions that require the user \n
 to input a string as the answer. You can \n
@@ -17,16 +18,4 @@ Try entering your name below:" 16 51 2> $tempfile
 
 retval=$?
 
-case $retval in
-  0)
-    echo "Input string is `cat $tempfile`";;
-  1)
-    echo "Cancel pressed.";;
-  255)
-    if test -s $tempfile ; then
-      cat $tempfile
-    else
-      echo "ESC pressed."
-    fi
-    ;;
-esac
+. ./report-tempfile
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/password2 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/password2
index ef9d9168963..91a7e455fb3 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/password2
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/password2
@@ -1,12 +1,12 @@
 #!/bin/sh
-# $Id: password2,v 1.1 2003/11/26 22:37:29 tom Exp $
-: ${DIALOG=dialog}
+# $Id: password2,v 1.6 2010/01/13 10:20:03 tom Exp $
 
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
+. ./setup-vars
+
+. ./setup-tempfile
 
 $DIALOG --title "INPUT BOX" --clear \
-	--insecure \
+	--insecure "$@" \
         --passwordbox "Hi, this is an password dialog box. You can use \n
 this to ask questions that require the user \n
 to input a string as the answer. You can \n
@@ -18,16 +18,4 @@ Try entering your name below:" 16 51 stupid 2> $tempfile
 
 retval=$?
 
-case $retval in
-  0)
-    echo "Input string is `cat $tempfile`";;
-  1)
-    echo "Cancel pressed.";;
-  255)
-    if test -s $tempfile ; then
-      cat $tempfile
-    else
-      echo "ESC pressed."
-    fi
-    ;;
-esac
+. ./report-tempfile
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/passwordform1 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/passwordform1
index 1c0a8e71c46..7c3c1f03928 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/passwordform1
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/passwordform1
@@ -1,6 +1,7 @@
 #! /bin/sh
-# $Id: passwordform1,v 1.1 2005/12/08 01:03:29 tom Exp $
-: ${DIALOG=dialog}
+# $Id: passwordform1,v 1.5 2010/01/13 10:47:35 tom Exp $
+
+. ./setup-vars
 
 backtitle="An Example for the use of --form:"
 
@@ -17,7 +18,7 @@ do
 exec 3>&1
 value=`$DIALOG --ok-label "Submit" \
 	  --backtitle "$backtitle" \
-	  --insecure \
+	  --insecure "$@" \
 	  --passwordform "Here is a possible piece of a configuration program." \
 20 50 0 \
 	"Username:" 1 1	"$user" 1 10 10 0 \
@@ -31,32 +32,32 @@ exec 3>&-
 show=`echo "$value" |sed -e 's/^/	/'`
 
 	case $returncode in
-	1)
+	$DIALOG_CANCEL)
 		"$DIALOG" \
 		--clear \
 		--backtitle "$backtitle" \
 		--yesno "Really quit?" 10 30
 		case $? in
-		0)
+		$DIALOG_OK)
 			break
 			;;
-		1)
+		$DIALOG_CANCEL)
 			returncode=99
 			;;
 		esac
 		;;
-	0)
+	$DIALOG_OK)
 		"$DIALOG" \
 		--clear \
 		--backtitle "$backtitle" --no-collapse --cr-wrap \
 		--msgbox "Resulting data:\n\
 $show" 10 40
 		;;
-	2)
+	$DIALOG_HELP)
 		echo "Button 2 (Help) pressed."
 		exit
 		;;
-	3)
+	$DIALOG_EXTRA)
 		echo "Button 3 (Extra) pressed."
 		exit
 		;;
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/passwordform1-utf8 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/passwordform1-utf8
index cc45fe47408..3dda34c0e62 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/passwordform1-utf8
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/passwordform1-utf8
@@ -1,15 +1,9 @@
 #! /bin/sh
-# $Id: passwordform1-utf8,v 1.2 2008/08/20 00:32:34 tom Exp $
-: ${DIALOG=dialog}
+# $Id: passwordform1-utf8,v 1.7 2010/01/13 10:47:35 tom Exp $
 
-case none"$LANG$LC_ALL$LC_CTYPE" in
-*UTF-8*)
-	;;
-*)
-	echo "This script must be run in a UTF-8 locale"
-	exit 1
-	;;
-esac
+. ./setup-vars
+
+. ./setup-utf8
 
 backtitle="An Example for the use of --passwordform:"
 
@@ -26,7 +20,7 @@ do
 exec 3>&1
 value=`$DIALOG --ok-label "Submit" \
 	  --backtitle "$backtitle" \
-	  --insecure \
+	  --insecure "$@" \
 	  --passwordform "Here is a possible piece of a configuration program." \
 20 50 0 \
 	"Username:" 1 1	"$user" 1 10 10 0 \
@@ -40,32 +34,32 @@ exec 3>&-
 show=`echo "$value" |sed -e 's/^/	/'`
 
 	case $returncode in
-	1)
+	$DIALOG_CANCEL)
 		"$DIALOG" \
 		--clear \
 		--backtitle "$backtitle" \
 		--yesno "Really quit?" 10 30
 		case $? in
-		0)
+		$DIALOG_OK)
 			break
 			;;
-		1)
+		$DIALOG_CANCEL)
 			returncode=99
 			;;
 		esac
 		;;
-	0)
+	$DIALOG_OK)
 		"$DIALOG" \
 		--clear \
 		--backtitle "$backtitle" --no-collapse --cr-wrap \
 		--msgbox "Resulting data:\n\
 $show" 10 40
 		;;
-	2)
+	$DIALOG_HELP)
 		echo "Button 2 (Help) pressed."
 		exit
 		;;
-	3)
+	$DIALOG_EXTRA)
 		echo "Button 3 (Extra) pressed."
 		exit
 		;;
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/pause b/Build/source/utils/dialog/dialog-1.1-20100119/samples/pause
new file mode 100755
index 00000000000..64e211b7f69
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/pause
@@ -0,0 +1,10 @@
+#!/bin/sh
+# $Id: pause,v 1.5 2010/01/14 00:27:23 tom Exp $
+
+. ./setup-vars
+
+$DIALOG --title "PAUSE" "$@" --pause "Hi, this is a pause widget" 20 70 10
+
+retval=$?
+
+. ./report-button
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/pause-help b/Build/source/utils/dialog/dialog-1.1-20100119/samples/pause-help
new file mode 100755
index 00000000000..2d3656e7196
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/pause-help
@@ -0,0 +1,12 @@
+#!/bin/sh
+# $Id: pause-help,v 1.5 2010/01/13 10:36:00 tom Exp $
+
+. ./setup-vars
+
+$DIALOG --title "PAUSE" \
+	--help-button "$@" \
+	--pause "Hi, this is a pause widget" 20 70 10
+
+retval=$?
+
+. ./report-button
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/progress b/Build/source/utils/dialog/dialog-1.1-20100119/samples/progress
new file mode 100755
index 00000000000..6ad45d8b04c
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/progress
@@ -0,0 +1,19 @@
+#!/bin/sh
+# $Id: progress,v 1.5 2010/01/13 10:20:03 tom Exp $
+
+. ./setup-vars
+
+. ./setup-tempfile
+
+ls -1 >$tempfile
+(
+while true
+do
+read text
+test -z "$text" && break
+ls -ld "$text"
+sleep 1
+done <$tempfile
+) |
+
+$DIALOG --title "PROGRESS" "$@" --progressbox 20 70
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/progress2 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/progress2
new file mode 100755
index 00000000000..564433b1c37
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/progress2
@@ -0,0 +1,19 @@
+#!/bin/sh
+# $Id: progress2,v 1.5 2010/01/13 10:20:03 tom Exp $
+
+. ./setup-vars
+
+. ./setup-tempfile
+
+ls -1 >$tempfile
+(
+while true
+do
+read text
+test -z "$text" && break
+ls -ld "$text"
+sleep 1
+done <$tempfile
+) |
+
+$DIALOG --title "PROGRESS" "$@" --progressbox "This is a detailed description\nof the progress-box." 20 70
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/radiolist b/Build/source/utils/dialog/dialog-1.1-20100119/samples/radiolist
index f11dc5d1b1b..602ad82044a 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/radiolist
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/radiolist
@@ -1,12 +1,12 @@
 #! /bin/sh
-# $Id: radiolist,v 1.8 2004/12/20 00:14:24 tom Exp $
-: ${DIALOG=dialog}
+# $Id: radiolist,v 1.13 2010/01/13 10:20:03 tom Exp $
 
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
+. ./setup-vars
+
+. ./setup-tempfile
 
 $DIALOG --backtitle "No Such Organization" \
-	--title "RADIOLIST BOX" --clear \
+	--title "RADIOLIST BOX" --clear "$@" \
         --radiolist "Hi, this is a radiolist box. You can use this to \n\
 present a list of choices which can be turned on or \n\
 off. If there are more items than can fit on the \n\
@@ -25,12 +25,4 @@ Press SPACE to toggle an option on/off. \n\n\
 
 retval=$?
 
-choice=`cat $tempfile`
-case $retval in
-  0)
-    echo "'$choice' chosen.";;
-  1)
-    echo "Cancel pressed.";;
-  255)
-    echo "ESC pressed.";;
-esac
+. ./report-tempfile
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/radiolist1 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/radiolist1
new file mode 100755
index 00000000000..77defa52ced
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/radiolist1
@@ -0,0 +1,33 @@
+#! /bin/sh
+# $Id: radiolist1,v 1.1 2010/01/17 23:05:14 tom Exp $
+
+. ./setup-vars
+
+. ./setup-tempfile
+
+$DIALOG --backtitle "No Such Organization" \
+	--title "RADIOLIST BOX" --clear "$@" \
+        --radiolist "Hi, this is a radiolist box. You can use this to \n\
+present a list of choices which can be turned on or \n\
+off. If there are more items than can fit on the \n\
+screen, the list will be scrolled. You can use the \n\
+UP/DOWN arrow keys, the first letter of the choice as a \n\
+hot key, or the number keys 1-9 to choose an option. \n\
+Press SPACE to toggle an option on/off. \n\n\
+  Which of the following are fruits?" 20 61 5 \
+        "Apple"  "It's an apple." off \
+        "Dog"    "No, that's not my dog." ON \
+        "Dog2"   "No2, that's not my dog." off \
+        "Dog3"   "No3, that's not my dog." off \
+        "Dog4"   "No4, that's not my dog." off \
+        "Dog5"   "No5, that's not my dog." off \
+        "Dog6"   "No6, that's not my dog." off \
+        "Orange" "Yeah, that's juicy." off \
+        "Chicken"    "Normally not a pet." off \
+        "Cat"    "No, never put a dog and a cat together!" off \
+        "Fish"   "Cats like fish." off \
+        "Lemon"  "You know how it tastes." off 2> $tempfile
+
+retval=$?
+
+. ./report-tempfile
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/radiolist10 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/radiolist10
index 087137dfa8e..2953871c5f8 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/radiolist10
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/radiolist10
@@ -1,14 +1,14 @@
 #! /bin/sh
-# $Id: radiolist10,v 1.1 2004/07/31 11:12:10 tom Exp $
+# $Id: radiolist10,v 1.6 2010/01/13 10:20:03 tom Exp $
 # zero-width column
-: ${DIALOG=dialog}
 
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
+. ./setup-vars
+
+. ./setup-tempfile
 
 $DIALOG \
 	--backtitle "No such organization" \
-	--title "RADIOLIST BOX" \
+	--title "RADIOLIST BOX" "$@" \
         --radiolist "Hi, this is a radiolist box. You can use this to \n\
 present a list of choices which can be turned on or \n\
 off. If there are more items than can fit on the \n\
@@ -27,14 +27,4 @@ Press SPACE to toggle an option on/off. \n\n\
 
 retval=$?
 
-choice=`cat $tempfile`
-case $retval in
-  0)
-    echo "'$choice' chosen.";;
-  1)
-    echo "Cancel pressed.";;
-  255)
-    echo "ESC pressed.";;
-  *)
-    echo "Unexpected code $retval";;
-esac
+. ./report-tempfile
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/radiolist2 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/radiolist2
index 743857186d9..e2965eac1ee 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/radiolist2
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/radiolist2
@@ -1,14 +1,14 @@
 #! /bin/sh
-# $Id: radiolist2,v 1.3 2004/12/20 00:14:24 tom Exp $
-: ${DIALOG=dialog}
+# $Id: radiolist2,v 1.8 2010/01/13 10:20:03 tom Exp $
 
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
+. ./setup-vars
+
+. ./setup-tempfile
 
 $DIALOG --ok-label Okay \
 	--cancel-label 'Give Up' \
 	--backtitle "No Such Organization" \
-	--title "RADIOLIST BOX" --clear \
+	--title "RADIOLIST BOX" --clear "$@" \
         --radiolist "Hi, this is a radiolist box. You can use this to \n\
 present a list of choices which can be turned on or \n\
 off. If there are more items than can fit on the \n\
@@ -27,12 +27,4 @@ Press SPACE to toggle an option on/off. \n\n\
 
 retval=$?
 
-choice=`cat $tempfile`
-case $retval in
-  0)
-    echo "'$choice' chosen.";;
-  1)
-    echo "Cancel pressed.";;
-  255)
-    echo "ESC pressed.";;
-esac
+. ./report-tempfile
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/radiolist3 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/radiolist3
index 0f79ab4eeb0..6c695e7197c 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/radiolist3
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/radiolist3
@@ -1,14 +1,14 @@
 #! /bin/sh
-# $Id: radiolist3,v 1.4 2004/12/20 00:14:24 tom Exp $
-: ${DIALOG=dialog}
+# $Id: radiolist3,v 1.9 2010/01/13 10:20:03 tom Exp $
 
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
+. ./setup-vars
+
+. ./setup-tempfile
 
 $DIALOG --item-help --ok-label Okay \
 	--cancel-label 'Give Up' \
 	--backtitle "No Such Organization" \
-	--title "RADIOLIST BOX" --clear \
+	--title "RADIOLIST BOX" --clear "$@" \
         --radiolist "Hi, this is a radiolist box. You can use this to \n\
 present a list of choices which can be turned on or \n\
 off. If there are more items than can fit on the \n\
@@ -27,16 +27,4 @@ Press SPACE to toggle an option on/off. \n\n\
 
 retval=$?
 
-choice=`cat $tempfile`
-case $retval in
-  0)
-    echo "OK '$choice' chosen.";;
-  1)
-    echo "Cancel pressed.";;
-  2)
-    echo "HELP '$choice' chosen.";;
-  255)
-    echo "ESC pressed.";;
-  *)
-    echo "Unexpected code $retval";;
-esac
+. ./report-tempfile
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/radiolist4 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/radiolist4
index dca07ad9b9d..67d920f3294 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/radiolist4
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/radiolist4
@@ -1,14 +1,14 @@
 #! /bin/sh
-# $Id: radiolist4,v 1.4 2004/12/20 00:14:24 tom Exp $
-: ${DIALOG=dialog}
+# $Id: radiolist4,v 1.9 2010/01/13 10:20:03 tom Exp $
 
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
+. ./setup-vars
+
+. ./setup-tempfile
 
 $DIALOG --help-button --help-label "Hints" --item-help --ok-label Okay \
 	--cancel-label 'Give Up' \
 	--backtitle "No Such Organization" \
-	--title "RADIOLIST BOX" --clear \
+	--title "RADIOLIST BOX" --clear "$@" \
         --radiolist "Hi, this is a radiolist box. You can use this to \n\
 present a list of choices which can be turned on or \n\
 off. If there are more items than can fit on the \n\
@@ -27,16 +27,4 @@ Press SPACE to toggle an option on/off. \n\n\
 
 retval=$?
 
-choice=`cat $tempfile`
-case $retval in
-  0)
-    echo "OK '$choice' chosen.";;
-  1)
-    echo "Cancel pressed.";;
-  2)
-    echo "HELP '$choice' chosen.";;
-  255)
-    echo "ESC pressed.";;
-  *)
-    echo "Unexpected code $retval";;
-esac
+. ./report-tempfile
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/report-button b/Build/source/utils/dialog/dialog-1.1-20100119/samples/report-button
new file mode 100755
index 00000000000..e13b03afb7c
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/report-button
@@ -0,0 +1,20 @@
+# $Id: report-button,v 1.2 2010/01/13 09:59:14 tom Exp $
+# Report button-only, no $RESULT
+# vile:shmode
+
+case $retval in
+  $DIALOG_OK)
+    echo "OK";;
+  $DIALOG_CANCEL)
+    echo "Cancel pressed.";;
+  $DIALOG_HELP)
+    echo "Help pressed.";;
+  $DIALOG_EXTRA)
+    echo "Extra button pressed.";;
+  $DIALOG_ITEM_HELP)
+    echo "Item-help button pressed.";;
+  $DIALOG_ERROR)
+    echo "ERROR!";;
+  $DIALOG_ESC)
+    echo "ESC pressed.";;
+esac
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/report-edit b/Build/source/utils/dialog/dialog-1.1-20100119/samples/report-edit
new file mode 100755
index 00000000000..f17b6d32a98
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/report-edit
@@ -0,0 +1,22 @@
+# $Id: report-edit,v 1.3 2010/01/13 09:59:43 tom Exp $
+# Report results from editing.
+# vile:shmode
+
+case $retval in
+  $DIALOG_OK)
+    diff -c $input $output
+    echo "OK"
+    ;;
+  $DIALOG_CANCEL)
+    echo "Cancel pressed";;
+  $DIALOG_HELP)
+    echo "Help pressed";;
+  $DIALOG_EXTRA)
+    echo "Extra pressed";;
+  $DIALOG_ITEM_HELP)
+    echo "Item-help button pressed.";;
+  $DIALOG_ERROR)
+    echo "ERROR!";;
+  $DIALOG_ESC)
+    echo "ESC pressed.";;
+esac
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/report-string b/Build/source/utils/dialog/dialog-1.1-20100119/samples/report-string
new file mode 100755
index 00000000000..a674517c75e
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/report-string
@@ -0,0 +1,23 @@
+# $Id: report-string,v 1.2 2010/01/13 10:00:11 tom Exp $
+# Report result passed in a string $RESULT
+# vile:shmode
+
+case $retval in
+  $DIALOG_OK)
+    echo "Result is $RESULT";;
+  $DIALOG_CANCEL)
+    echo "Cancel pressed.";;
+  $DIALOG_HELP)
+    echo "Help pressed ($RESULT).";;
+  $DIALOG_EXTRA)
+    echo "Extra button pressed.";;
+  $DIALOG_ITEM_HELP)
+    echo "Item-help button pressed.";;
+  $DIALOG_ESC)
+    if test -n "$RESULT" ; then
+      echo "$RESULT"
+    else
+      echo "ESC pressed."
+    fi
+    ;;
+esac
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/report-tempfile b/Build/source/utils/dialog/dialog-1.1-20100119/samples/report-tempfile
new file mode 100755
index 00000000000..5a88d443cf3
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/report-tempfile
@@ -0,0 +1,23 @@
+# $Id: report-tempfile,v 1.3 2010/01/13 09:59:05 tom Exp $
+# Report results in a temporary-file.
+# vile:shmode
+
+case $retval in
+  $DIALOG_OK)
+    echo "Result: `cat $tempfile`";;
+  $DIALOG_CANCEL)
+    echo "Cancel pressed.";;
+  $DIALOG_HELP)
+    echo "Help pressed.";;
+  $DIALOG_EXTRA)
+    echo "Extra button pressed.";;
+  $DIALOG_ITEM_HELP)
+    echo "Item-help button pressed.";;
+  $DIALOG_ESC)
+    if test -s $tempfile ; then
+      cat $tempfile
+    else
+      echo "ESC pressed."
+    fi
+    ;;
+esac
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/report-yesno b/Build/source/utils/dialog/dialog-1.1-20100119/samples/report-yesno
new file mode 100755
index 00000000000..81da89b525e
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/report-yesno
@@ -0,0 +1,20 @@
+# $Id: report-yesno,v 1.1 2010/01/13 10:40:14 tom Exp $
+# Report button-only, no $RESULT
+# vile:shmode
+
+case $retval in
+  $DIALOG_OK)
+    echo "YES";;
+  $DIALOG_CANCEL)
+    echo "NO";;
+  $DIALOG_HELP)
+    echo "Help pressed.";;
+  $DIALOG_EXTRA)
+    echo "Extra button pressed.";;
+  $DIALOG_ITEM_HELP)
+    echo "Item-help button pressed.";;
+  $DIALOG_ERROR)
+    echo "ERROR!";;
+  $DIALOG_ESC)
+    echo "ESC pressed.";;
+esac
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/rotated-data b/Build/source/utils/dialog/dialog-1.1-20100119/samples/rotated-data
index dc407144e7e..dc407144e7e 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/rotated-data
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/rotated-data
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/setup-edit b/Build/source/utils/dialog/dialog-1.1-20100119/samples/setup-edit
new file mode 100755
index 00000000000..df86297764a
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/setup-edit
@@ -0,0 +1,6 @@
+# $Id: setup-edit,v 1.1 2010/01/13 01:56:07 tom Exp $
+# vile:shmode
+
+input=`tempfile 2>/dev/null` || input=/tmp/input$$
+output=`tempfile 2>/dev/null` || output=/tmp/test$$
+trap "rm -f $input $output" 0 1 2 5 15
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/setup-tempfile b/Build/source/utils/dialog/dialog-1.1-20100119/samples/setup-tempfile
new file mode 100755
index 00000000000..6db551f0342
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/setup-tempfile
@@ -0,0 +1,5 @@
+# $Id: setup-tempfile,v 1.1 2010/01/13 01:41:02 tom Exp $
+# vile:shmode
+
+tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
+trap "rm -f $tempfile" 0 1 2 5 15
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/setup-utf8 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/setup-utf8
new file mode 100755
index 00000000000..2fd70d42a4c
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/setup-utf8
@@ -0,0 +1,11 @@
+# $Id: setup-utf8,v 1.1 2010/01/13 01:51:44 tom Exp $
+# vile:shmode
+
+case none"$LANG$LC_ALL$LC_CTYPE" in
+*UTF-8*)
+	;;
+*)
+	echo "This script must be run in a UTF-8 locale"
+	exit 1
+	;;
+esac
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/setup-vars b/Build/source/utils/dialog/dialog-1.1-20100119/samples/setup-vars
new file mode 100755
index 00000000000..cf79353c553
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/setup-vars
@@ -0,0 +1,11 @@
+# $Id: setup-vars,v 1.1 2010/01/13 00:16:38 tom Exp $
+# vile:shmode
+
+: ${DIALOG=dialog}
+
+: ${DIALOG_OK=0}
+: ${DIALOG_CANCEL=1}
+: ${DIALOG_HELP=2}
+: ${DIALOG_EXTRA=3}
+: ${DIALOG_ITEM_HELP=4}
+: ${DIALOG_ESC=255}
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/slackware.rc b/Build/source/utils/dialog/dialog-1.1-20100119/samples/slackware.rc
index 9942db6e1cf..9942db6e1cf 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/slackware.rc
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/slackware.rc
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/sourcemage.rc b/Build/source/utils/dialog/dialog-1.1-20100119/samples/sourcemage.rc
index bf187ea5e6c..bf187ea5e6c 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/sourcemage.rc
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/sourcemage.rc
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/suse.rc b/Build/source/utils/dialog/dialog-1.1-20100119/samples/suse.rc
index 233157d94ad..233157d94ad 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/suse.rc
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/suse.rc
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/tailbox b/Build/source/utils/dialog/dialog-1.1-20100119/samples/tailbox
new file mode 100755
index 00000000000..227104e2fcf
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/tailbox
@@ -0,0 +1,16 @@
+#!/bin/sh
+# $Id: tailbox,v 1.7 2010/01/13 10:36:18 tom Exp $
+
+. ./setup-vars
+
+./killall listing
+./listing >listing.out &
+
+$DIALOG --title "TAIL BOX" "$@" \
+        --tailbox listing.out 24 70
+
+retval=$?
+
+. ./report-button
+
+./killall listing
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/tailboxbg b/Build/source/utils/dialog/dialog-1.1-20100119/samples/tailboxbg
index 3ce938065de..957d7744655 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/tailboxbg
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/tailboxbg
@@ -1,15 +1,15 @@
 #!/bin/sh
-# $Id: tailboxbg,v 1.5 2003/08/15 19:40:37 tom Exp $
-: ${DIALOG=dialog}
+# $Id: tailboxbg,v 1.9 2010/01/13 10:20:03 tom Exp $
 
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
+. ./setup-vars
+
+. ./setup-tempfile
 
 ./killall listing
 ./listing >listing.out &
 
 $DIALOG --title "TAIL BOX" \
-	--no-kill \
+	--no-kill "$@" \
         --tailboxbg listing.out 24 70 2>$tempfile
 
 # wait a while for the background process to run
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/tailboxbg1 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/tailboxbg1
index 685e4d06d41..2955ad03486 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/tailboxbg1
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/tailboxbg1
@@ -1,19 +1,19 @@
 #!/bin/sh
-# $Id: tailboxbg1,v 1.5 2003/08/15 19:40:37 tom Exp $
-: ${DIALOG=dialog}
+# $Id: tailboxbg1,v 1.9 2010/01/13 10:20:03 tom Exp $
 
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
+. ./setup-vars
+
+. ./setup-tempfile
 
 ./killall listing
 ./listing >listing.out &
 
 $DIALOG --title "TAIL BOXES" \
-	--begin 10 10 --tailboxbg listing.out 8 58 \
+	--begin 10 10 "$@" --tailboxbg listing.out 8 58 \
 	--and-widget \
-	--begin 15 15 --tailboxbg listing.out 8 58 \
+	--begin 15 15 "$@" --tailboxbg listing.out 8 58 \
 	--and-widget \
-	--begin 3 10 --msgbox "Press OK " 5 30 \
+	--begin 3 10 "$@" --msgbox "Press OK " 5 30 \
         2>$tempfile
 
 # The --and-widget causes a tab to be emitted, but our example will only
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/tailboxbg2 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/tailboxbg2
index 820601cbdc2..061770895f1 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/tailboxbg2
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/tailboxbg2
@@ -1,20 +1,20 @@
 #!/bin/sh
-# $Id: tailboxbg2,v 1.5 2003/08/15 19:40:37 tom Exp $
-: ${DIALOG=dialog}
+# $Id: tailboxbg2,v 1.9 2010/01/13 10:20:03 tom Exp $
 
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
+. ./setup-vars
+
+. ./setup-tempfile
 
 ./killall listing
 ./listing >listing.out &
 
 $DIALOG --title "TAIL BOXES" \
 	--no-kill \
-	--begin 10 10 --tailboxbg listing.out 8 58 \
+	--begin 10 10 "$@" --tailboxbg listing.out 8 58 \
 	--and-widget \
-	--begin 15 15 --tailboxbg listing.out 8 58 \
+	--begin 15 15 "$@" --tailboxbg listing.out 8 58 \
 	--and-widget \
-	--begin 3 10 --msgbox "Press OK " 5 30 \
+	--begin 3 10 "$@" --msgbox "Press OK " 5 30 \
         2>$tempfile
 
 # The --and-widget causes a tab to be emitted, but our example will only
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/testdata-8bit b/Build/source/utils/dialog/dialog-1.1-20100119/samples/testdata-8bit
index 7810f9e34f2..7810f9e34f2 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/testdata-8bit
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/testdata-8bit
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/textbox b/Build/source/utils/dialog/dialog-1.1-20100119/samples/textbox
index 0b30ce3d682..d3c7698c85e 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/textbox
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/textbox
@@ -1,9 +1,9 @@
 #!/bin/sh
-# $Id: textbox,v 1.7 2005/12/07 01:02:47 tom Exp $
-: ${DIALOG=dialog}
+# $Id: textbox,v 1.12 2010/01/13 10:36:35 tom Exp $
 
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
+. ./setup-vars
+
+. ./setup-tempfile
 
 cat << EOF > $tempfile
 Hi, this is a text dialog box. It can be used to display text from a file.
@@ -37,17 +37,8 @@ test -f $TEXT || TEXT=../COPYING
 
 cat $TEXT | expand >> $tempfile
 
-$DIALOG --clear --title "TEXT BOX" --textbox "$tempfile" 22 77
-
-case $? in
-  0)
-    echo "OK";;
-  1)
-    echo "Button 1 (Cancel) pressed";;
-  2)
-    echo "Button 2 (Help) pressed";;
-  3)
-    echo "Button 3 (Extra) pressed";;
-  255)
-    echo "ESC pressed.";;
-esac
+$DIALOG --clear --title "TEXT BOX" "$@" --textbox "$tempfile" 22 77
+
+retval=$?
+
+. ./report-button
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/textbox.txt b/Build/source/utils/dialog/dialog-1.1-20100119/samples/textbox.txt
index 3aaec0f8e5c..3aaec0f8e5c 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/textbox.txt
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/textbox.txt
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/textbox2 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/textbox2
index c3098c1d403..7c97de8cb38 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/textbox2
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/textbox2
@@ -1,9 +1,9 @@
 #!/bin/sh
-# $Id: textbox2,v 1.3 2005/12/07 01:03:22 tom Exp $
-: ${DIALOG=dialog}
+# $Id: textbox2,v 1.8 2010/01/13 10:36:49 tom Exp $
 
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
+. ./setup-vars
+
+. ./setup-tempfile
 
 cat << EOF > $tempfile
 Hi, this is a text dialog box. It can be used to display text from a file.
@@ -37,17 +37,8 @@ test -f $TEXT || TEXT=../COPYING
 
 cat $TEXT | expand >> $tempfile
 
-$DIALOG --clear --title "TEXT BOX" --textbox "$tempfile" 0 0
-
-case $? in
-  0)
-    echo "OK";;
-  1)
-    echo "Button 1 (Cancel) pressed";;
-  2)
-    echo "Button 2 (Help) pressed";;
-  3)
-    echo "Button 3 (Extra) pressed";;
-  255)
-    echo "ESC pressed.";;
-esac
+$DIALOG --clear --title "TEXT BOX" "$@" --textbox "$tempfile" 0 0
+
+retval=$?
+
+. ./report-button
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/textbox3 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/textbox3
new file mode 100755
index 00000000000..2c076e95556
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/textbox3
@@ -0,0 +1,20 @@
+#!/bin/sh
+# $Id: textbox3,v 1.6 2010/01/13 10:37:01 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" \
+	--extra-button "$@" \
+	--textbox "$tempfile" 22 77
+
+retval=$?
+
+. ./report-button
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/timebox b/Build/source/utils/dialog/dialog-1.1-20100119/samples/timebox
new file mode 100755
index 00000000000..cb6bf5c6f4f
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/timebox
@@ -0,0 +1,14 @@
+#!/bin/sh
+# $Id: timebox,v 1.9 2010/01/13 10:23:10 tom Exp $
+
+. ./setup-vars
+
+DIALOG_ERROR=254
+export DIALOG_ERROR
+
+exec 3>&1
+RESULT=`$DIALOG --title "TIMEBOX" "$@" --timebox "Please set the time..." 0 0 12 34 56 2>&1 1>&3`
+retval=$?
+exec 3>&-
+
+. ./report-string
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/timebox-stdout b/Build/source/utils/dialog/dialog-1.1-20100119/samples/timebox-stdout
new file mode 100755
index 00000000000..10a00262bbd
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/timebox-stdout
@@ -0,0 +1,10 @@
+#!/bin/sh
+# $Id: timebox-stdout,v 1.5 2010/01/13 10:37:19 tom Exp $
+
+. ./setup-vars
+
+RESULT=`$DIALOG --stdout --title "TIMEBOX" "$@" --timebox "Please set the time..." 0 0 12 34 56`
+
+retval=$?
+
+. ./report-string
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/timebox2 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/timebox2
new file mode 100755
index 00000000000..088acdff39b
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/timebox2
@@ -0,0 +1,11 @@
+#!/bin/sh
+# $Id: timebox2,v 1.7 2010/01/13 10:37:35 tom Exp $
+
+. ./setup-vars
+
+exec 3>&1
+RESULT=`$DIALOG --title "TIMEBOX" "$@" --timebox "Please set the time..." 0 0 2>&1 1>&3`
+retval=$?
+exec 3>&-
+
+. ./report-string
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/timebox2-stdout b/Build/source/utils/dialog/dialog-1.1-20100119/samples/timebox2-stdout
new file mode 100755
index 00000000000..922921fc2e2
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/timebox2-stdout
@@ -0,0 +1,10 @@
+#!/bin/sh
+# $Id: timebox2-stdout,v 1.5 2010/01/13 10:37:55 tom Exp $
+
+. ./setup-vars
+
+RESULT=`$DIALOG --stdout --title "TIMEBOX" "$@" --timebox "Please set the time..." 0 0`
+
+retval=$?
+
+. ./report-string
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/wheel b/Build/source/utils/dialog/dialog-1.1-20100119/samples/wheel
index 720171b74fe..ff75f71d6e0 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/wheel
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/wheel
@@ -1,8 +1,9 @@
 #!/bin/sh
-# $Id: wheel,v 1.4 2003/08/15 19:40:37 tom Exp $
-: ${DIALOG=dialog}
+# $Id: wheel,v 1.7 2010/01/13 01:44:12 tom Exp $
 
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
+. ./setup-vars
+
+. ./setup-tempfile
 
 TITLE="This screen was taken from ComeOn Point Installer! v0.9 by ComeOn Linux!"
 
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/whiptail.rc b/Build/source/utils/dialog/dialog-1.1-20100119/samples/whiptail.rc
index 47d5032a733..47d5032a733 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/whiptail.rc
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/whiptail.rc
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/yesno b/Build/source/utils/dialog/dialog-1.1-20100119/samples/yesno
index 0432acbe837..fa1ea444ce4 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/yesno
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/yesno
@@ -1,8 +1,12 @@
 #!/bin/sh
-# $Id: yesno,v 1.3 2003/08/15 19:40:37 tom Exp $
-: ${DIALOG=dialog}
+# $Id: yesno,v 1.9 2010/01/14 01:11:11 tom Exp $
 
-$DIALOG --title "YES/NO BOX" --clear \
+. ./setup-vars
+
+DIALOG_ERROR=254
+export DIALOG_ERROR
+
+$DIALOG --title "YES/NO BOX" --clear "$@" \
         --yesno "Hi, this is a yes/no dialog box. You can use this to ask \
                  questions that have an answer of either yes or no. \
                  BTW, do you notice that long lines will be automatically \
@@ -12,11 +16,6 @@ $DIALOG --title "YES/NO BOX" --clear \
                  auto wrap around will be disabled and you will have to \
                  control line breaking yourself." 15 61
 
-case $? in
-  0)
-    echo "Yes chosen.";;
-  1)
-    echo "No chosen.";;
-  255)
-    echo "ESC pressed.";;
-esac
+retval=$?
+
+. ./report-yesno
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/yesno-extra b/Build/source/utils/dialog/dialog-1.1-20100119/samples/yesno-both
index 8876ac614f7..a408bdba4b5 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/yesno-extra
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/yesno-both
@@ -1,12 +1,14 @@
 #!/bin/sh
-# $Id: yesno-extra,v 1.1 2005/12/05 21:16:29 tom Exp $
-: ${DIALOG=dialog}
+# $Id: yesno-both,v 1.5 2010/01/13 10:40:39 tom Exp $
+
+. ./setup-vars
 
 $DIALOG --title "YES/NO/MAYBE BOX" \
 	--clear \
 	--ok-label "Next" \
 	--no-label "Cancel" \
 	--extra-label "Previous" --extra-button \
+	--help-button "$@" \
         --yesno "Hi, this is a yes/no dialog box with its labels changed. \
                  You can use this to ask \
                  questions that have an answer of either yes or no (or maybe). \
@@ -17,15 +19,6 @@ $DIALOG --title "YES/NO/MAYBE BOX" \
                  auto wrap around will be disabled and you will have to \
                  control line breaking yourself." 15 61
 
-case $? in
-  0)
-    echo "Next chosen.";;
-  1)
-    echo "Cancel chosen.";;
-  2)
-    echo "Help pressed.";;
-  3)
-    echo "Previous pressed.";;
-  255)
-    echo "ESC pressed.";;
-esac
+retval=$?
+
+. ./report-yesno
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/yesno-both b/Build/source/utils/dialog/dialog-1.1-20100119/samples/yesno-extra
index 68860dc0ecd..ce31b810794 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/yesno-both
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/yesno-extra
@@ -1,13 +1,13 @@
 #!/bin/sh
-# $Id: yesno-both,v 1.1 2005/12/05 21:15:54 tom Exp $
-: ${DIALOG=dialog}
+# $Id: yesno-extra,v 1.5 2010/01/13 10:40:39 tom Exp $
+
+. ./setup-vars
 
 $DIALOG --title "YES/NO/MAYBE BOX" \
 	--clear \
 	--ok-label "Next" \
 	--no-label "Cancel" \
-	--extra-label "Previous" --extra-button \
-	--help-button \
+	--extra-label "Previous" --extra-button "$@" \
         --yesno "Hi, this is a yes/no dialog box with its labels changed. \
                  You can use this to ask \
                  questions that have an answer of either yes or no (or maybe). \
@@ -18,15 +18,6 @@ $DIALOG --title "YES/NO/MAYBE BOX" \
                  auto wrap around will be disabled and you will have to \
                  control line breaking yourself." 15 61
 
-case $? in
-  0)
-    echo "Next chosen.";;
-  1)
-    echo "Cancel chosen.";;
-  2)
-    echo "Help pressed.";;
-  3)
-    echo "Previous pressed.";;
-  255)
-    echo "ESC pressed.";;
-esac
+retval=$?
+
+. ./report-yesno
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/yesno-help b/Build/source/utils/dialog/dialog-1.1-20100119/samples/yesno-help
index e14ecfa57bc..1333f1cbc09 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/yesno-help
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/yesno-help
@@ -1,8 +1,9 @@
 #!/bin/sh
-# $Id: yesno-help,v 1.1 2005/12/05 21:04:27 tom Exp $
-: ${DIALOG=dialog}
+# $Id: yesno-help,v 1.5 2010/01/13 10:40:39 tom Exp $
 
-$DIALOG --title "YES/NO BOX" --clear --help-button \
+. ./setup-vars
+
+$DIALOG --title "YES/NO BOX" --clear --help-button "$@" \
         --yesno "Hi, this is a yes/no dialog box. You can use this to ask \
                  questions that have an answer of either yes or no. \
                  BTW, do you notice that long lines will be automatically \
@@ -12,15 +13,6 @@ $DIALOG --title "YES/NO BOX" --clear --help-button \
                  auto wrap around will be disabled and you will have to \
                  control line breaking yourself." 15 61
 
-case $? in
-  0)
-    echo "Yes chosen.";;
-  1)
-    echo "No chosen.";;
-  2)
-    echo "Help pressed.";;
-  3)
-    echo "Extra pressed.";;
-  255)
-    echo "ESC pressed.";;
-esac
+retval=$?
+
+. ./report-yesno
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/yesno-utf8 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/yesno-utf8
new file mode 100755
index 00000000000..4a6be30eb80
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/yesno-utf8
@@ -0,0 +1,14 @@
+#! /bin/sh
+# $Id: yesno-utf8,v 1.7 2010/01/14 01:11:23 tom Exp $
+
+. ./setup-vars
+
+. ./setup-utf8
+
+DIALOG_ERROR=254
+export DIALOG_ERROR
+
+$DIALOG "$@" --yesno "Are you a ＤＯＧ?" 0 0
+retval=$?
+
+. ./report-yesno
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/yesno2 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/yesno2
index a6553336112..d022352e630 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/yesno2
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/yesno2
@@ -1,8 +1,9 @@
 #!/bin/sh
-# $Id: yesno2,v 1.3 2005/12/05 21:00:00 tom Exp $
-: ${DIALOG=dialog}
+# $Id: yesno2,v 1.7 2010/01/13 10:40:39 tom Exp $
 
-$DIALOG --title "YES/NO BOX" \
+. ./setup-vars
+
+$DIALOG --title "YES/NO BOX" "$@" \
         --yesno "Hi, this is a yes/no dialog box. You can use this to ask \
 questions that have an answer of either yes or no. \
 BTW, do you notice that long lines will be automatically \
@@ -12,11 +13,6 @@ also control line breaking explicitly by inserting \
 auto wrap around will be disabled and you will have to \
 control line breaking yourself." 0 0
 
-case $? in
-  0)
-    echo "Yes chosen.";;
-  1)
-    echo "No chosen.";;
-  255)
-    echo "ESC pressed.";;
-esac
+retval=$?
+
+. ./report-yesno
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/samples/yesno3 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/yesno3
index a16dfe9220a..f67fb85b600 100755
--- a/Build/source/utils/dialog/dialog-1.1-20080819/samples/yesno3
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/yesno3
@@ -1,8 +1,9 @@
 #!/bin/sh
-# $Id: yesno3,v 1.2 2003/08/15 19:40:37 tom Exp $
-: ${DIALOG=dialog}
+# $Id: yesno3,v 1.6 2010/01/13 10:40:39 tom Exp $
 
-$DIALOG --timeout 20 --title "YES/NO BOX" \
+. ./setup-vars
+
+$DIALOG --timeout 20 --title "YES/NO BOX" "$@" \
         --yesno "Hi, this is a yes/no dialog box. You can use this to ask \
 questions that have an answer of either yes or no. \
 BTW, do you notice that long lines will be automatically \
@@ -12,11 +13,6 @@ also control line breaking explicitly by inserting \
 auto wrap around will be disabled and you will have to \
 control line breaking yourself." 0 0
 
-case $? in
-  0)
-    echo "Yes chosen.";;
-  1)
-    echo "No chosen.";;
-  255)
-    echo "Box closed.";;
-esac
+retval=$?
+
+. ./report-yesno
diff --git a/Build/source/utils/dialog/dialog-1.1-20100119/samples/yesno4 b/Build/source/utils/dialog/dialog-1.1-20100119/samples/yesno4
new file mode 100755
index 00000000000..99f65e86125
--- /dev/null
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/samples/yesno4
@@ -0,0 +1,18 @@
+#!/bin/sh
+# $Id: yesno4,v 1.1 2010/01/14 10:26:40 tom Exp $
+
+. ./setup-vars
+
+$DIALOG --title "YES/NO BOX" "$@" \
+        --yesno "Hi, this is a yes/no dialog box. You can use this to ask \
+questions that have an answer of either yes or no. \
+BTW, do you notice that long lines will be automatically \
+wrapped around so that they can fit in the box? You can \
+also control line breaking explicitly by inserting \
+'backslash n' at any place you like, but in this case, \
+auto wrap around will be disabled and you will have to \
+control line breaking yourself." 6 30
+
+retval=$?
+
+. ./report-yesno
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/tailbox.c b/Build/source/utils/dialog/dialog-1.1-20100119/tailbox.c
index 298dbfc5858..ea4457cfa1e 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/tailbox.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/tailbox.c
@@ -1,9 +1,9 @@
 /*
- *  $Id: tailbox.c,v 1.52 2007/05/14 23:07:11 tom Exp $
+ *  $Id: tailbox.c,v 1.54 2010/01/12 11:58:43 tom Exp $
  *
  * tailbox.c -- implements the tail box
  *
- * Copyright 2000-2006,2007 Thomas E. Dickey
+ * Copyright 2000-2007,2009 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
@@ -60,7 +60,7 @@ get_line(MY_OBJ * obj)
 		}
 	    } else {
 		if (col >= 0)
-		    obj->line[col] = ch;
+		    obj->line[col] = (char) ch;
 		++col;
 	    }
 	    if (col >= MAX_LEN)
@@ -278,6 +278,7 @@ dialog_tailbox(const char *title, const char *file, int height, int width, int b
     const char **buttons = 0;
     MY_OBJ *obj;
     FILE *fd;
+    int min_width = 12;
 
     /* Open input file for reading */
     if ((fd = fopen(file, "rb")) == NULL)
@@ -286,7 +287,7 @@ dialog_tailbox(const char *title, const char *file, int height, int width, int b
 #ifdef KEY_RESIZE
   retry:
 #endif
-    dlg_auto_sizefile(title, file, &height, &width, 2, 12);
+    dlg_auto_sizefile(title, file, &height, &width, 2, min_width);
     dlg_print_size(height, width);
     dlg_ctl_size(height, width);
 
@@ -311,6 +312,7 @@ dialog_tailbox(const char *title, const char *file, int height, int width, int b
 
     if (!bg_task) {
 	buttons = dlg_exit_label();
+	dlg_button_layout(buttons, &min_width);
 	dlg_draw_buttons(dialog, height - (2 * MARGIN), 0, buttons, FALSE,
 			 FALSE, width);
     }
@@ -353,6 +355,7 @@ dialog_tailbox(const char *title, const char *file, int height, int width, int b
 		dlg_del_window(dialog);
 		refresh();
 		dlg_mouse_free_regions();
+		dlg_button_layout(buttons, &min_width);
 		goto retry;
 	    }
 #endif
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/textbox.c b/Build/source/utils/dialog/dialog-1.1-20100119/textbox.c
index fa60aa714eb..5a4181b9e21 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/textbox.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/textbox.c
@@ -1,9 +1,9 @@
 /*
- *  $Id: textbox.c,v 1.92 2007/07/04 20:28:07 tom Exp $
+ *  $Id: textbox.c,v 1.96 2010/01/17 18:23:56 tom Exp $
  *
  * textbox.c -- implements the text box
  *
- * Copyright 2000-2006,2007 Thomas E.  Dickey
+ * Copyright 2000-2009,2010 Thomas E.  Dickey
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License, version 2.1
@@ -76,7 +76,7 @@ ftell_obj(MY_OBJ * obj)
 }
 
 static char *
-xalloc(long size)
+xalloc(size_t size)
 {
     char *result = dlg_malloc(char, size);
     assert_ptr(result, "xalloc");
@@ -422,13 +422,9 @@ print_page(MY_OBJ * obj, int height, int width)
 static void
 print_position(MY_OBJ * obj, WINDOW *win, int height, int width)
 {
-    chtype save = getattrs(win);
     long fpos;
     long size;
-    int percent;
-    int len;
     long first = -1;
-    char buffer[80];
 
     fpos = ftell_obj(obj);
     if (dialog_vars.tab_correct)
@@ -436,32 +432,15 @@ print_position(MY_OBJ * obj, WINDOW *win, int height, int width)
     else
 	first = find_first(obj, obj->buf, size = obj->in_buf);
 
-    wattrset(win, position_indicator_attr);
-    percent = (!obj->file_size
-	       ? 100
-	       : (int) (((fpos - obj->fd_bytes_read + size) * 100)
-			/ obj->file_size));
-
-    if (percent < 0)
-	percent = 0;
-    if (percent > 100)
-	percent = 100;
-
-    (void) sprintf(buffer, "%d%%", percent);
-    (void) wmove(win, PAGE_LENGTH + 1, PAGE_WIDTH - 7);
-    (void) waddstr(win, buffer);
-    if ((len = dlg_count_columns(buffer)) < 4) {
-	wattrset(win, border_attr);
-	whline(win, dlg_boxchar(ACS_HLINE), 4 - len);
-    }
-
-    wattrset(win, save);
-    dlg_draw_arrows2(win,
-		     first != 0,
-		     size < obj->fd_bytes_read,
-		     ARROWS_COL, 0, PAGE_LENGTH + 1,
-		     border_attr,
-		     border_attr);
+    dlg_draw_scrollbar(win,
+		       first,
+		       fpos - obj->fd_bytes_read + size,
+		       fpos - obj->fd_bytes_read + size,
+		       obj->file_size,
+		       0, PAGE_WIDTH,
+		       0, PAGE_LENGTH + 1,
+		       border_attr,
+		       border_attr);
 }
 
 /*
@@ -695,6 +674,7 @@ dialog_textbox(const char *title, const char *file, int height, int width)
     bool moved;
     int result = DLG_EXIT_UNKNOWN;
     int button = dialog_vars.extra_button ? dlg_defaultno_button() : 0;
+    int min_width = 12;
 
     search_term[0] = '\0';	/* no search term entered yet */
 
@@ -718,12 +698,14 @@ dialog_textbox(const char *title, const char *file, int height, int width)
 
     read_high(&obj, BUF_SIZE);
 
+    dlg_button_layout(obj.buttons, &min_width);
+
 #ifdef KEY_RESIZE
   retry:
 #endif
     moved = TRUE;
 
-    dlg_auto_sizefile(title, file, &height, &width, 2, 12);
+    dlg_auto_sizefile(title, file, &height, &width, 2, min_width);
     dlg_print_size(height, width);
     dlg_ctl_size(height, width);
 
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/timebox.c b/Build/source/utils/dialog/dialog-1.1-20100119/timebox.c
index 517a14c0244..acea1c2f48d 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/timebox.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/timebox.c
@@ -1,9 +1,9 @@
 /*
- * $Id: timebox.c,v 1.38 2008/06/21 12:34:06 tom Exp $
+ * $Id: timebox.c,v 1.41 2010/01/18 10:33:42 tom Exp $
  *
  *  timebox.c -- implements the timebox dialog
  *
- *  Copyright 2001-2007,2008   Thomas E. Dickey
+ *  Copyright 2001-2009,2010   Thomas E. Dickey
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License, version 2.1
@@ -119,7 +119,7 @@ init_object(BOX * data,
 }
 
 static int
-CleanupResult(int code, WINDOW *dialog, char *prompt, DIALOG_VARS *save_vars)
+CleanupResult(int code, WINDOW *dialog, char *prompt, DIALOG_VARS * save_vars)
 {
     dlg_del_window(dialog);
     dlg_mouse_free_regions();
@@ -158,9 +158,11 @@ dialog_timebox(const char *title,
 	DLG_KEYS_DATA( DLGK_FIELD_PREV, CHR_PREVIOUS ),
 	DLG_KEYS_DATA( DLGK_FIELD_PREV, KEY_BTAB ),
 	DLG_KEYS_DATA( DLGK_FIELD_PREV, KEY_LEFT ),
+	DLG_KEYS_DATA( DLGK_ITEM_NEXT,  '+'),
 	DLG_KEYS_DATA( DLGK_ITEM_NEXT,  KEY_DOWN),
 	DLG_KEYS_DATA( DLGK_ITEM_NEXT,  KEY_NEXT),
 	DLG_KEYS_DATA( DLGK_ITEM_NEXT,  KEY_NPAGE),
+	DLG_KEYS_DATA( DLGK_ITEM_PREV,  '-' ),
 	DLG_KEYS_DATA( DLGK_ITEM_PREV,  KEY_PPAGE ),
 	DLG_KEYS_DATA( DLGK_ITEM_PREV,  KEY_PREVIOUS ),
 	DLG_KEYS_DATA( DLGK_ITEM_PREV,  KEY_UP ),
@@ -379,8 +381,29 @@ dialog_timebox(const char *title,
 	}
     }
 
-    sprintf(buffer, "%02d:%02d:%02d",
-	    hr_box.value, mn_box.value, sc_box.value);
+#define DefaultFormat(dst, src) \
+	sprintf(dst, "%02d:%02d:%02d", \
+		hr_box.value, mn_box.value, sc_box.value)
+
+#if defined(HAVE_STRFTIME)
+    if (dialog_vars.time_format != 0) {
+	size_t used;
+	time_t now = time((time_t *) 0);
+	struct tm *parts = localtime(&now);
+
+	parts->tm_sec = sc_box.value;
+	parts->tm_min = mn_box.value;
+	parts->tm_hour = hr_box.value;
+	used = strftime(buffer,
+			sizeof(buffer) - 1,
+			dialog_vars.time_format,
+			parts);
+	if (used == 0 || *buffer == '\0')
+	    DefaultFormat(buffer, hr_box);
+    } else
+#endif
+	DefaultFormat(buffer, hr_box);
+
     dlg_add_result(buffer);
     dlg_add_separator();
 
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/trace.c b/Build/source/utils/dialog/dialog-1.1-20100119/trace.c
index 69ad13973f2..6148ee8bc67 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/trace.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/trace.c
@@ -1,9 +1,9 @@
 /*
- *  $Id: trace.c,v 1.8 2008/06/20 00:17:45 tom Exp $
+ *  $Id: trace.c,v 1.11 2010/01/17 15:36:26 tom Exp $
  *
  *  trace.c -- implements screen-dump and keystroke-logging
  *
- *  Copyright 2007,2008	Thomas E. Dickey
+ *  Copyright 2007-2008,2010	Thomas E. Dickey
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License, version 2.1
@@ -65,7 +65,7 @@ dlg_trace_win(WINDOW *win)
 		} else if (unctrl(ch) == 0 || strlen(unctrl(ch)) > 1) {
 		    ch = '.';
 		}
-		fputc(ch & 0xff, myFP);
+		fputc((int) (ch & 0xff), myFP);
 	    }
 	    fputc('\n', myFP);
 	}
@@ -116,7 +116,7 @@ dlg_trace_chr(int ch, int fkey)
 		}
 	    }
 	} else {
-	    fkey_name = unctrl(ch);
+	    fkey_name = unctrl((chtype) ch);
 	    if (fkey_name == 0)
 		fkey_name = "UNKNOWN";
 	}
@@ -135,10 +135,12 @@ dlg_trace(const char *fname)
 	    myFP = fopen(fname, "a");
 	    if (myFP != 0) {
 		time_t now = time((time_t *) 0);
-		fprintf(myFP, "** %s", ctime(&now));
+		fprintf(myFP, "** opened at %s", ctime(&now));
 	    }
 	}
     } else if (myFP != 0) {
+	time_t now = time((time_t *) 0);
+	fprintf(myFP, "** closed at %s", ctime(&now));
 	fclose(myFP);
 	myFP = 0;
     }
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/ui_getc.c b/Build/source/utils/dialog/dialog-1.1-20100119/ui_getc.c
index a00c5f70105..bce890c630b 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/ui_getc.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/ui_getc.c
@@ -1,9 +1,9 @@
 /*
- *  $Id: ui_getc.c,v 1.42 2008/03/16 20:02:20 tom Exp $
+ *  $Id: ui_getc.c,v 1.48 2010/01/18 10:24:06 tom Exp $
  *
  * ui_getc.c - user interface glue for getc()
  *
- * Copyright 2001-2007,2008 Thomas E. Dickey
+ * Copyright 2001-2009,2010 Thomas E. Dickey
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License, version 2.1
@@ -71,6 +71,18 @@ dlg_add_callback(DIALOG_CALLBACK * p)
     wtimeout(p->win, WTIMEOUT_VAL);
 }
 
+/*
+ * Like dlg_add_callback(), but providing for cleanup of caller's associated
+ * state.
+ */
+void
+dlg_add_callback_ref(DIALOG_CALLBACK ** p, DIALOG_FREEBACK freeback)
+{
+    (*p)->caller = p;
+    (*p)->freeback = freeback;
+    dlg_add_callback(*p);
+}
+
 void
 dlg_remove_callback(DIALOG_CALLBACK * p)
 {
@@ -78,10 +90,13 @@ dlg_remove_callback(DIALOG_CALLBACK * p)
 
     if (p->input != 0) {
 	fclose(p->input);
+	if (p->input == dialog_state.pipe_input)
+	    dialog_state.pipe_input = 0;
 	p->input = 0;
     }
 
-    dlg_del_window(p->win);
+    if (!(p->keep_win))
+	dlg_del_window(p->win);
     if ((q = dialog_state.getc_callbacks) == p) {
 	dialog_state.getc_callbacks = p->next;
     } else {
@@ -93,6 +108,13 @@ dlg_remove_callback(DIALOG_CALLBACK * p)
 	    q = q->next;
 	}
     }
+
+    /* handle dlg_add_callback_ref cleanup */
+    if (p->freeback != 0)
+	p->freeback(p);
+    if (p->caller != 0)
+	*(p->caller) = 0;
+
     free(p);
 }
 
@@ -110,7 +132,9 @@ dlg_getc_ready(DIALOG_CALLBACK * p)
     FD_SET(fd, &read_fds);
 
     test.tv_sec = 0;		/* Seconds.  */
-    test.tv_usec = WTIMEOUT_VAL * 1000;		/* Microseconds.  */
+    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));
 }
@@ -118,6 +142,7 @@ dlg_getc_ready(DIALOG_CALLBACK * p)
 int
 dlg_getc_callbacks(int ch, int fkey, int *result)
 {
+    int code = FALSE;
     DIALOG_CALLBACK *p, *q;
 
     if ((p = dialog_state.getc_callbacks) != 0) {
@@ -129,9 +154,9 @@ dlg_getc_callbacks(int ch, int fkey, int *result)
 		}
 	    }
 	} while ((p = q) != 0);
-	return TRUE;
+	code = (dialog_state.getc_callbacks != 0);
     }
-    return FALSE;
+    return code;
 }
 
 static void
@@ -236,7 +261,7 @@ dlg_getc(WINDOW *win, int *fkey)
 	    ch = ERR;
 	    *fkey = 0;
 	    code = wget_wch(win, &my_wint);
-	    my_wchar = my_wint;
+	    my_wchar = (wchar_t) my_wint;
 	    switch (code) {
 	    case KEY_CODE_YES:
 		ch = *fkey = my_wchar;
@@ -244,12 +269,12 @@ dlg_getc(WINDOW *win, int *fkey)
 		break;
 	    case OK:
 		memset(&state, 0, sizeof(state));
-		have_last_getc = wcrtomb(last_getc_bytes, my_wchar, &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] = my_wchar;
+		    last_getc_bytes[0] = (char) my_wchar;
 		}
-		ch = CharOf(last_getc_bytes[used_last_getc++]);
+		ch = (int) CharOf(last_getc_bytes[used_last_getc++]);
 		last_getc = my_wchar;
 		break;
 	    case ERR:
@@ -260,7 +285,7 @@ dlg_getc(WINDOW *win, int *fkey)
 		break;
 	    }
 	} else {
-	    ch = CharOf(last_getc_bytes[used_last_getc++]);
+	    ch = (int) CharOf(last_getc_bytes[used_last_getc++]);
 	}
 #else
 	ch = wgetch(win);
@@ -301,7 +326,7 @@ dlg_getc(WINDOW *win, int *fkey)
 		done = (interval <= 0);
 	    }
 	    if (!valid_file(stdin)
-		&& !valid_file(dialog_state.screen_output)) {
+		|| !valid_file(dialog_state.screen_output)) {
 		ch = ESC;
 		done = TRUE;
 	    }
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/util.c b/Build/source/utils/dialog/dialog-1.1-20100119/util.c
index ea743865cbb..e0565de3a8d 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/util.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/util.c
@@ -1,9 +1,9 @@
 /*
- *  $Id: util.c,v 1.196 2008/08/20 00:26:37 tom Exp $
+ *  $Id: util.c,v 1.200 2010/01/15 23:49:38 tom Exp $
  *
  *  util.c -- miscellaneous utilities for dialog
  *
- *  Copyright 2000-2007,2008	Thomas E. Dickey
+ *  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
@@ -756,6 +756,149 @@ dlg_print_autowrap(WINDOW *win, const char *prompt, int height, int width)
 }
 
 /*
+ * Display the message in a scrollable window.  Actually the way it works is
+ * that we create a "tall" window of the proper width, let the text wrap within
+ * that, and copy a slice of the result to the dialog.
+ *
+ * It works for ncurses.  Other curses implementations show only blanks (Tru64)
+ * or garbage (NetBSD).
+ */
+int
+dlg_print_scrolled(WINDOW *win,
+		   const char *prompt,
+		   int offset,
+		   int height,
+		   int width,
+		   int pauseopt)
+{
+    int oldy, oldx;
+    int last = 0;
+
+    getyx(win, oldy, oldx);
+#ifdef NCURSES_VERSION
+    if (pauseopt) {
+	int wide = width - (2 * MARGIN);
+	int high = LINES;
+	int y, x;
+	int len;
+	int percent;
+	WINDOW *dummy;
+	char buffer[5];
+
+#if defined(NCURSES_VERSION_PATCH) && NCURSES_VERSION_PATCH >= 20040417
+	/*
+	 * If we're not limited by the screensize, allow text to possibly be
+	 * one character per line.
+	 */
+	if ((len = dlg_count_columns(prompt)) > high)
+	    high = len;
+#endif
+	dummy = newwin(high, width, 0, 0);
+	wbkgdset(dummy, dialog_attr | ' ');
+	wattrset(dummy, dialog_attr);
+	werase(dummy);
+	dlg_print_autowrap(dummy, prompt, high, width);
+	getyx(dummy, y, x);
+
+	copywin(dummy,		/* srcwin */
+		win,		/* dstwin */
+		offset + MARGIN,	/* sminrow */
+		MARGIN,		/* smincol */
+		MARGIN,		/* dminrow */
+		MARGIN,		/* dmincol */
+		height,		/* dmaxrow */
+		wide,		/* dmaxcol */
+		FALSE);
+
+	delwin(dummy);
+
+	/* if the text is incomplete, or we have scrolled, show the percentage */
+	if (y > 0 && wide > 4) {
+	    percent = (int) ((height + offset) * 100.0 / y);
+	    if (percent < 0)
+		percent = 0;
+	    if (percent > 100)
+		percent = 100;
+	    if (offset != 0 || percent != 100) {
+		(void) wattrset(win, position_indicator_attr);
+		(void) wmove(win, MARGIN + height, wide - 4);
+		(void) sprintf(buffer, "%d%%", percent);
+		(void) waddstr(win, buffer);
+		if ((len = (int) strlen(buffer)) < 4) {
+		    wattrset(win, border_attr);
+		    whline(win, dlg_boxchar(ACS_HLINE), 4 - len);
+		}
+	    }
+	}
+	last = (y - height);
+    } else
+#endif
+    {
+	(void) offset;
+	wattrset(win, dialog_attr);
+	dlg_print_autowrap(win, prompt, height + 1 + (3 * MARGIN), width);
+	last = 0;
+    }
+    wmove(win, oldy, oldx);
+    return last;
+}
+
+int
+dlg_check_scrolled(int key, int last, int page, bool * show, int *offset)
+{
+    int code = 0;
+
+    *show = FALSE;
+
+    switch (key) {
+    case DLGK_PAGE_FIRST:
+	if (*offset > 0) {
+	    *offset = 0;
+	    *show = TRUE;
+	}
+	break;
+    case DLGK_PAGE_LAST:
+	if (*offset < last) {
+	    *offset = last;
+	    *show = TRUE;
+	}
+	break;
+    case DLGK_GRID_UP:
+	if (*offset > 0) {
+	    --(*offset);
+	    *show = TRUE;
+	}
+	break;
+    case DLGK_GRID_DOWN:
+	if (*offset < last) {
+	    ++(*offset);
+	    *show = TRUE;
+	}
+	break;
+    case DLGK_PAGE_PREV:
+	if (*offset > 0) {
+	    *offset -= page;
+	    if (*offset < 0)
+		*offset = 0;
+	    *show = TRUE;
+	}
+	break;
+    case DLGK_PAGE_NEXT:
+	if (*offset < last) {
+	    *offset += page;
+	    if (*offset > last)
+		*offset = last;
+	    *show = TRUE;
+	}
+	break;
+    default:
+	code = -1;
+	break;
+    }
+    return code;
+}
+
+/*
  * Calculate the window size for preformatted text.  This will calculate box
  * dimensions that are at or close to the specified aspect ratio for the prompt
  * string with all spaces and newlines preserved and additional newlines added
@@ -1594,7 +1737,7 @@ dlg_default_listitem(DIALOG_LISTITEM * items)
  * Draw the string for item_help
  */
 void
-dlg_item_help(char *txt)
+dlg_item_help(const char *txt)
 {
     if (USE_ITEM_HELP(txt)) {
 	chtype attr = A_NORMAL;
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/version.c b/Build/source/utils/dialog/dialog-1.1-20100119/version.c
index bb78cd11822..1e72ce4789f 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/version.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/version.c
@@ -1,9 +1,9 @@
 /*
- *  $Id: version.c,v 1.5 2006/12/27 00:50:24 tom Exp $
+ *  $Id: version.c,v 1.6 2010/01/15 23:34:46 tom Exp $
  *
  *  version.c -- dialog's version string
  *
- *  Copyright 2005,2006	Thomas E. Dickey
+ *  Copyright 2005-2006,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
@@ -26,7 +26,7 @@
 #define concat(a,b)	a "-" quoted(b)
 #define DLG_VERSION	concat(DIALOG_VERSION,DIALOG_PATCHDATE)
 
-char *
+const char *
 dialog_version(void)
 {
     return DLG_VERSION;
diff --git a/Build/source/utils/dialog/dialog-1.1-20080819/yesno.c b/Build/source/utils/dialog/dialog-1.1-20100119/yesno.c
index 128ae2b91b4..c666154c6d3 100644
--- a/Build/source/utils/dialog/dialog-1.1-20080819/yesno.c
+++ b/Build/source/utils/dialog/dialog-1.1-20100119/yesno.c
@@ -1,9 +1,9 @@
 /*
- *  $Id: yesno.c,v 1.46 2007/02/23 21:39:34 tom Exp $
+ *  $Id: yesno.c,v 1.49 2010/01/15 10:54:54 tom Exp $
  *
  *  yesno.c -- implements the yes/no box
  *
- *  Copyright 1999-2005,2006	Thomas E. Dickey
+ *  Copyright 1999-2009,2010	Thomas E. Dickey
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License, version 2.1
@@ -43,6 +43,7 @@ dialog_yesno(const char *title, const char *cprompt, int height, int width)
 	DLG_KEYS_DATA( DLGK_FIELD_PREV,	KEY_UP ),
 	DLG_KEYS_DATA( DLGK_FIELD_PREV, KEY_BTAB ),
 	DLG_KEYS_DATA( DLGK_FIELD_PREV, KEY_LEFT ),
+	SCROLLKEY_BINDINGS,
 	END_KEYS_BINDING
     };
     /* *INDENT-ON* */
@@ -55,6 +56,9 @@ dialog_yesno(const char *title, const char *cprompt, int height, int width)
     int result = DLG_EXIT_UNKNOWN;
     char *prompt = dlg_strclone(cprompt);
     const char **buttons = dlg_yes_labels();
+    int min_width = 25;
+    bool show = TRUE;
+    int page, last = 0, offset = 0;
 
 #ifdef KEY_RESIZE
     int req_high = height;
@@ -63,7 +67,8 @@ dialog_yesno(const char *title, const char *cprompt, int height, int width)
 #endif
 
     dlg_tab_correct_str(prompt);
-    dlg_auto_size(title, prompt, &height, &width, 2, 25);
+    dlg_button_layout(buttons, &min_width);
+    dlg_auto_size(title, prompt, &height, &width, 2, min_width);
     dlg_print_size(height, width);
     dlg_ctl_size(height, width);
 
@@ -86,11 +91,18 @@ dialog_yesno(const char *title, const char *cprompt, int height, int width)
     dlg_draw_title(dialog, title);
 
     wattrset(dialog, dialog_attr);
-    dlg_print_autowrap(dialog, prompt, height, width);
 
-    dlg_draw_buttons(dialog, height - 2, 0, buttons, button, FALSE, width);
+    page = height - (1 + 3 * MARGIN);
+    dlg_draw_buttons(dialog,
+		     height - 2 * MARGIN, 0,
+		     buttons, button, FALSE, width);
 
     while (result == DLG_EXIT_UNKNOWN) {
+	if (show) {
+	    last = dlg_print_scrolled(dialog, prompt, offset,
+				      page, width, TRUE);
+	    show = FALSE;
+	}
 	key = dlg_mouse_wgetch(dialog, &fkey);
 	if (dlg_result_key(key, fkey, &result))
 	    break;
@@ -134,7 +146,8 @@ dialog_yesno(const char *title, const char *cprompt, int height, int width)
 		    result = dlg_yes_buttoncode(key - M_EVENT);
 		    if (result < 0)
 			result = DLG_EXIT_OK;
-		} else {
+		} else if (dlg_check_scrolled(key, last, page,
+					      &show, &offset) != 0) {
 		    beep();
 		}
 		break;