summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/checksums.ini6
-rw-r--r--recipes/dialog/dialog-1.0-20050306/configure.patch37
-rw-r--r--recipes/dialog/dialog-1.0-20050306/m4.patch6979
-rw-r--r--recipes/dialog/dialog-1.0-20050306/templates.patch25
-rw-r--r--recipes/dialog/dialog-static_1.0-20050306.bb4
-rw-r--r--recipes/dialog/dialog-static_1.1-20080819.bb3
-rw-r--r--recipes/dialog/dialog.inc9
-rw-r--r--recipes/dialog/dialog_1.1-20080819.bb1
8 files changed, 12 insertions, 7052 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini
index a5746bcdec..6321357738 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -4614,9 +4614,9 @@ sha256=902da1b1e9d90dfda8aa1864846db8ad12386e7521fc9f8b18c8ba220dd0123a
md5=7b81b22baa2df55efe4845865dddc7b6
sha256=7bb43d8b0cb287d728ea479fb65d1b57b8530af773018214e7f312dceed34237
-[ftp://ftp.us.debian.org/debian/pool/main/d/dialog/dialog_1.0-20050306.orig.tar.gz]
-md5=8ce5945be0660bd3152bd9eb0827f945
-sha256=e3968765ed916b348fce5e309029d25d068a61e1d422a69a506d0fc80ee6e976
+[ftp://invisible-island.net/dialog/dialog-1.1-20080819.tgz]
+md5=3caebd641a9f337b980becb4444336c5
+sha256=c5d49b39c5998bcecd124c05cc6f096d22ccdc378ad455214611ae41a2f4b7d9
[http://didiwiki.org/sources/didiwiki-0.2.tar.gz]
md5=a8643526ced64ed066df407e013259e3
diff --git a/recipes/dialog/dialog-1.0-20050306/configure.patch b/recipes/dialog/dialog-1.0-20050306/configure.patch
deleted file mode 100644
index 754243ad45..0000000000
--- a/recipes/dialog/dialog-1.0-20050306/configure.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- dialog-0.9b-20031207/configure.in~configure
-+++ dialog-0.9b-20031207/configure.in
-@@ -6,6 +6,8 @@
- AC_CONFIG_HEADER(dlg_config.h:config.hin)
-
- CF_VERSION_INFO(dialog)
-+AH_TEMPLATE([DIALOG_VERSION], [Define to dialog version])
-+AH_TEMPLATE([DIALOG_PATCHDATE], [Define to dialog patchdate])
-
- DESTDIR=
- AC_SUBST(DESTDIR)
-@@ -146,6 +148,20 @@
- wget_wch \
- )
-
-+AH_TEMPLATE([HAVE_COLOR],
-+ [Define if you have the start_color function])
-+AH_TEMPLATE([HAVE_FORMBOX],
-+ [Define if you want the form dialog])
-+AH_TEMPLATE([HAVE_GAUGE],
-+ [Define if you want the gauge dialog])
-+AH_TEMPLATE([HAVE_TAILBOX],
-+ [Define if you want the tailbox dialog])
-+AH_TEMPLATE([HAVE_XDIALOG],
-+ [Define if you want Xdialog-style dialogs])
-+AH_TEMPLATE([HAVE_RC_FILE],
-+ [Define if you want the config-file support])
-+AH_TEMPLATE([USE_WIDE_CURSES], [Define if using wide curses])
-+
- AC_CHECK_FUNC(start_color,[AC_DEFINE(HAVE_COLOR)])
- CF_CURSES_CHTYPE
- CF_FUNC_WAIT
diff --git a/recipes/dialog/dialog-1.0-20050306/m4.patch b/recipes/dialog/dialog-1.0-20050306/m4.patch
deleted file mode 100644
index d7701b1770..0000000000
--- a/recipes/dialog/dialog-1.0-20050306/m4.patch
+++ /dev/null
@@ -1,6979 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
-Index: dialog-1.0-20050306/acinclude.m4
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ dialog-1.0-20050306/acinclude.m4 2005-05-16 01:32:07.000000000 +0200
-@@ -0,0 +1,1953 @@
-+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_INCDIR version: 4 updated: 2002/12/21 14:25:52
-+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 gives error messages if -I/usr/local/include is added to
-+dnl the include-path).
-+AC_DEFUN([CF_ADD_INCDIR],
-+[
-+for cf_add_incdir in $1
-+do
-+ while true
-+ do
-+ case $cf_add_incdir in
-+ /usr/include) # (vi
-+ ;;
-+ /usr/local/include) # (vi
-+ if test "$GCC" = yes
-+ then
-+ cf_save_CPPFLAGS="$CPPFLAGS"
-+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
-+ AC_TRY_COMPILE([#include <stdio.h>],
-+ [printf("Hello")],
-+ [],
-+ [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"
-+ done
-+done
-+])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: 10 updated: 2003/09/14 18:49:13
-+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 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
-+AH_TEMPLATE([HAVE_LIBGETTEXT_H], [Define if we're using ./intl.])
-+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/\.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="-I../intl $CPPFLAGS"
-+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: 7 updated: 2001/12/19 00:50:10
-+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.
-+AC_DEFUN([CF_CHECK_CACHE],
-+[
-+if test -f $srcdir/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
-+AH_TEMPLATE([SYSTEM_NAME], [Set to the system name])
-+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_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).
-+AH_TEMPLATE([HAVE_TYPE_CHTYPE], [Define if curses defines 'chtype'.])
-+AH_TEMPLATE([TYPE_CHTYPE_IS_SCALAR], [Define if chtype is scalar rather than a struct.])
-+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_CPPFLAGS version: 7 updated: 2003/06/06 00:48:41
-+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.*|hpux11.*) #(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="$cf_cv_curses_incdir $CPPFLAGS"
-+
-+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_FUNCS version: 12 updated: 2003/11/06 19:59:57
-+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([
-+#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>
-+#else
-+#if defined(NCURSES_VERSION) && defined(HAVE_NCURSES_TERM_H)
-+#include <ncurses/term.h>
-+#else
-+#ifdef HAVE_TERM_H
-+#include <term.h>
-+#endif
-+#endif
-+#endif
-+#endif],
-+ [
-+#ifndef ${cf_func}
-+long foo = (long)(&${cf_func});
-+exit(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_LIBS version: 23 updated: 2003/11/06 19:59: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.*|hpux11.*) #(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="-D__HP_CURSES -D_HP_CURSES $CPPFLAGS"
-+ ac_cv_func_initscr=yes
-+ ])])
-+ ;;
-+linux*) # Suse Linux does not follow /usr/lib convention
-+ LIBS="$LIBS -L/lib"
-+ ;;
-+sunos3*|sunos4*)
-+ test -d /usr/5lib && \
-+ LIBS="$LIBS -L/usr/5lib -lcurses -ltermcap"
-+ 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 unknown
-+ do
-+ AC_CHECK_LIB($cf_curs_lib,initscr,[break])
-+ done
-+ test $cf_curs_lib = unknown && AC_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_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
-+])
-+
-+AH_TEMPLATE([HAVE_TERM_H], [define if you have term.h])
-+AH_TEMPLATE([HAVE_NCURSES_TERM_H], [define if you have ncurses/term.h])
-+AH_TEMPLATE([HAVE_NCURSESW_TERM_H], [define if you have ncursesw/term.h])
-+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: 10 updated: 2003/04/17 22:27:11
-+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='# compiling'
-+ SHOW_CC='# compiling'
-+ 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_LIBRARY version: 7 updated: 2000/04/13 21:38:04
-+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 causes 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_ERROR(Cannot link $1 library)
-+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
-+AH_TEMPLATE([WAIT_USES_UNION], [Define if wait uses union])
-+AH_TEMPLATE([WAITPID_USES_UNION], [Define if waitpid uses union])
-+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: 9 updated: 2002/12/21 19:25:52
-+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__ "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
-+ 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
-+ scanf|printf)
-+ cat >conftest.h <<EOF
-+#define GCC_$CF_ATTRIBUTE 1
-+EOF
-+ ;;
-+ *)
-+ 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
-+ fi
-+ done
-+else
-+ fgrep define conftest.i >>confdefs.h
-+fi
-+rm -rf conftest*
-+fi
-+])dnl
-+dnl ---------------------------------------------------------------------------
-+dnl CF_GCC_VERSION version: 3 updated: 2003/09/06 19:16:57
-+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/^[[^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: 15 updated: 2003/07/05 18:42:30
-+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
-+AC_DEFUN([CF_GCC_WARNINGS],
-+[
-+AC_REQUIRE([CF_GCC_VERSION])
-+if test "$GCC" = yes
-+then
-+ cat > conftest.$ac_ext <<EOF
-+#line __oline__ "configure"
-+int main(int argc, char *argv[[]]) { return (argv[[argc-1]] == 0) ; }
-+EOF
-+ 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
-+ 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
-+ 3.3*)
-+ CF_VERBOSE(feature is broken in gcc $GCC_VERSION)
-+ continue;;
-+ esac
-+ ;;
-+ esac
-+ EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
-+ fi
-+ done
-+ rm -f conftest*
-+ CFLAGS="$cf_save_CFLAGS"
-+fi
-+AC_SUBST(EXTRA_CFLAGS)
-+])dnl
-+dnl ---------------------------------------------------------------------------
-+dnl CF_GNU_SOURCE version: 3 updated: 2000/10/29 23:30:53
-+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_HEADER_PATH version: 8 updated: 2002/11/10 14:46:59
-+dnl --------------
-+dnl Construct a search-list for a nonstandard header-file
-+AC_DEFUN([CF_HEADER_PATH],
-+[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"
-+}
-+
-+])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: 4 updated: 2002/12/01 00:12:15
-+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="-I. -I../include $CPPFLAGS"
-+if test "$srcdir" != "."; then
-+ CPPFLAGS="-I\$(srcdir)/../include $CPPFLAGS"
-+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: 4 updated: 2001/04/15 21:21:45
-+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],
-+[
-+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_LIBRARY_PATH version: 7 updated: 2002/11/10 14:46:59
-+dnl ---------------
-+dnl Construct a search-list for a nonstandard library-file
-+AC_DEFUN([CF_LIBRARY_PATH],
-+[CF_SUBDIR_PATH($1,$2,lib)])dnl
-+dnl ---------------------------------------------------------------------------
-+dnl CF_LIB_PREFIX version: 7 updated: 2001/01/12 01:23:48
-+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
-+ OS/2*) LIB_PREFIX='' ;;
-+ os2*) LIB_PREFIX='' ;;
-+ *) LIB_PREFIX='lib' ;;
-+ esac
-+ifelse($1,,,[$1=$LIB_PREFIX])
-+ AC_SUBST(LIB_PREFIX)
-+])dnl
-+dnl ---------------------------------------------------------------------------
-+dnl CF_MAKEFLAGS version: 9 updated: 2001/12/30 18:17:27
-+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`
-+ 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 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: 5 updated: 2000/05/28 01:39:10
-+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="$LIBS -lm"
-+],[$1=-lm])
-+fi
-+])
-+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.
-+AH_TEMPLATE([MIXEDCASE_FILENAMES],[Define if the file-system supports mixed-case filenames.])
-+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: 3 updated: 1997/09/07 14:05:52
-+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 "(line __oline__) testing $* ..." 1>&AC_FD_CC
-+])dnl
-+dnl ---------------------------------------------------------------------------
-+dnl CF_NCURSES_CC_CHECK version: 3 updated: 2003/01/12 18:59:28
-+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=$cf_header]
-+ ,[$1=no])
-+])dnl
-+dnl ---------------------------------------------------------------------------
-+dnl CF_NCURSES_CPPFLAGS version: 17 updated: 2003/11/06 19:59:57
-+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" && \
-+CPPFLAGS="-I$cf_cv_curses_dir/include -I$cf_cv_curses_dir/include/$cf_ncuhdr_root $CPPFLAGS"
-+
-+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
-+])
-+
-+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_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
-+
-+
-+AH_TEMPLATE([NCURSES],[Define if you have ncurses])
-+AH_TEMPLATE([HAVE_NCURSES_H],[Define if you have ncurses.h])
-+AH_TEMPLATE([HAVE_NCURSES_NCURSES_H],[Define if you have ncurses/ncurses.h])
-+AH_TEMPLATE([HAVE_NCURSESW_NCURSES_H],[Define if you have ncursesw/ncurses.h])
-+
-+AC_DEFINE(NCURSES)
-+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
-+
-+CF_NCURSES_VERSION
-+])dnl
-+dnl ---------------------------------------------------------------------------
-+dnl CF_NCURSES_LIBS version: 11 updated: 2002/12/22 14:22:25
-+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).
-+ AC_CHECK_LIB(mytinfo,tgoto,[cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"])
-+ ;;
-+esac
-+
-+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"
-+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: 11 updated: 2003/11/06 19:59:57
-+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
-+ exit(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_OUR_MESSAGES version: 5 updated: 2003/06/16 20:33:11
-+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,
-+ [ --enable-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 $srcdir/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: 3 updated: 2001/01/12 01:23:53
-+dnl ----------
-+dnl Provide a value for the $PATH and similar separator
-+AC_DEFUN([CF_PATHSEP],
-+[
-+ case $cf_cv_system_name in
-+ os2*) PATHSEP=';' ;;
-+ *) PATHSEP=':' ;;
-+ esac
-+ifelse($1,,,[$1=$PATHSEP])
-+ AC_SUBST(PATHSEP)
-+])dnl
-+dnl ---------------------------------------------------------------------------
-+dnl CF_PATH_SYNTAX version: 9 updated: 2002/09/17 23:03:38
-+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],[
-+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%$ac_default_prefix%`
-+ ;;
-+ esac
-+ ;; #(vi
-+.NONE/*)
-+ $1=`echo [$]$1 | sed -e s%NONE%$ac_default_prefix%`
-+ ;;
-+*)
-+ ifelse($2,,[AC_ERROR([expected a pathname, not \"[$]$1\"])],$2)
-+ ;;
-+esac
-+])dnl
-+dnl ---------------------------------------------------------------------------
-+dnl CF_PROG_EXT version: 9 updated: 2003/10/18 16:36:22
-+dnl -----------
-+dnl Compute $PROG_EXT, used for non-Unix ports, such as OS/2 EMX.
-+AH_TEMPLATE([PROG_EXT],[Set to prog extension])
-+AC_DEFUN([CF_PROG_EXT],
-+[
-+AC_REQUIRE([CF_CHECK_CACHE])
-+case $cf_cv_system_name in
-+os2*)
-+ # We make sure -Zexe is not used -- it would interfere with @PROG_EXT@
-+ CFLAGS="$CFLAGS -Zmt"
-+ CPPFLAGS="$CPPFLAGS -D__ST_MT_ERRNO__"
-+ CXXFLAGS="$CXXFLAGS -Zmt"
-+ LDFLAGS=`echo "$LDFLAGS -Zmt -Zcrtdll" | sed -e "s%-Zexe%%g"`
-+ ;;
-+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_SUBDIR_PATH version: 3 updated: 2002/12/29 18:30:46
-+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=""
-+
-+test -d [$]HOME && {
-+ test -n "$verbose" && echo " ... testing $3-directories under [$]HOME"
-+ test -d [$]HOME/$3 && $1="[$]$1 [$]HOME/$3"
-+ test -d [$]HOME/$3/$2 && $1="[$]$1 [$]HOME/$3/$2"
-+ test -d [$]HOME/$3/$2/$3 && $1="[$]$1 [$]HOME/$3/$2/$3"
-+}
-+
-+# For other stuff under the home directory, it should be sufficient to put
-+# a symbolic link for $HOME/$2 to the actual package location:
-+test -d [$]HOME/$2 && {
-+ test -n "$verbose" && echo " ... testing $3-directories under [$]HOME/$2"
-+ test -d [$]HOME/$2/$3 && $1="[$]$1 [$]HOME/$2/$3"
-+ test -d [$]HOME/$2/$3/$2 && $1="[$]$1 [$]HOME/$2/$3/$2"
-+}
-+
-+test "$prefix" != /usr/local && \
-+test -d /usr/local && {
-+ test -n "$verbose" && echo " ... testing $3-directories under /usr/local"
-+ test -d /usr/local/$3 && $1="[$]$1 /usr/local/$3"
-+ test -d /usr/local/$3/$2 && $1="[$]$1 /usr/local/$3/$2"
-+ test -d /usr/local/$3/$2/$3 && $1="[$]$1 /usr/local/$3/$2/$3"
-+ test -d /usr/local/$2/$3 && $1="[$]$1 /usr/local/$2/$3"
-+ test -d /usr/local/$2/$3/$2 && $1="[$]$1 /usr/local/$2/$3/$2"
-+}
-+
-+test "$prefix" != NONE && \
-+test -d $prefix && {
-+ test -n "$verbose" && echo " ... testing $3-directories under $prefix"
-+ test -d $prefix/$3 && $1="[$]$1 $prefix/$3"
-+ test -d $prefix/$3/$2 && $1="[$]$1 $prefix/$3/$2"
-+ test -d $prefix/$3/$2/$3 && $1="[$]$1 $prefix/$3/$2/$3"
-+ test -d $prefix/$2/$3 && $1="[$]$1 $prefix/$2/$3"
-+ test -d $prefix/$2/$3/$2 && $1="[$]$1 $prefix/$2/$3/$2"
-+}
-+
-+test "$prefix" != /opt && \
-+test -d /opt && {
-+ test -n "$verbose" && echo " ... testing $3-directories under /opt"
-+ test -d /opt/$3 && $1="[$]$1 /opt/$3"
-+ test -d /opt/$3/$2 && $1="[$]$1 /opt/$3/$2"
-+ test -d /opt/$3/$2/$3 && $1="[$]$1 /opt/$3/$2/$3"
-+ test -d /opt/$2/$3 && $1="[$]$1 /opt/$2/$3"
-+ test -d /opt/$2/$3/$2 && $1="[$]$1 /opt/$2/$3/$2"
-+}
-+
-+test "$prefix" != /usr && \
-+test -d /usr && {
-+ test -n "$verbose" && echo " ... testing $3-directories under /usr"
-+ test -d /usr/$3 && $1="[$]$1 /usr/$3"
-+ test -d /usr/$3/$2 && $1="[$]$1 /usr/$3/$2"
-+ test -d /usr/$3/$2/$3 && $1="[$]$1 /usr/$3/$2/$3"
-+ test -d /usr/$2/$3 && $1="[$]$1 /usr/$2/$3"
-+}
-+])dnl
-+dnl ---------------------------------------------------------------------------
-+dnl CF_SUBST version: 2 updated: 1997/09/06 23:41:28
-+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))
-+test -z "[$]$2" && $2=$3
-+AC_MSG_RESULT([$]$2)
-+AC_SUBST($2)
-+cf_cv_subst_$2=[$]$2])
-+$2=${cf_cv_subst_$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: 2 updated: 1997/08/28 23:57:55
-+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_ERROR("Please remove config.cache and try again.")
-+fi])
-+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
-+AH_TEMPLATE([HAVE_TYPE_UNIONWAIT], [Define if BSD-style union wait is declared.])
-+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: 4 updated: 2003/03/01 18:36:42
-+dnl -----------
-+dnl Check for multibyte support, and if not found, utf8 compatibility library
-+AH_TEMPLATE([HAVE_LIBUTF8_H],[Define if we have libutf8.h])
-+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],
-+ [LIBS="-lutf8 $LIBS"
-+ AC_TRY_LINK([
-+#include <libutf8.h>],[putwc(0,0);],
-+ [cf_cv_utf8_lib=add-on],
-+ [cf_cv_utf8_lib=no])
-+ LIBS="$cf_save_LIBS"
-+])])
-+
-+# 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)
-+ LIBS="-lutf8 $LIBS"
-+fi
-+])dnl
-+dnl ---------------------------------------------------------------------------
-+dnl CF_VERBOSE version: 2 updated: 1997/09/05 10:45:14
-+dnl ----------
-+dnl Use AC_VERBOSE w/o the warnings
-+AC_DEFUN([CF_VERBOSE],
-+[test -n "$verbose" && echo " $1" 1>&AC_FD_MSG
-+])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
-+ AH_TEMPLATE([PACKAGE],[Define to package name])
-+ 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: 2 updated: 2002/12/29 21:11:45
-+dnl ----------------
-+dnl Configure-option for dbmalloc
-+AC_DEFUN([CF_WITH_DBMALLOC],[
-+AC_MSG_CHECKING(if you want to link with dbmalloc for testing)
-+AC_ARG_WITH(dbmalloc,
-+ [ --with-dbmalloc test: use Conor Cahill's dbmalloc library],
-+ [with_dbmalloc=$withval],
-+ [with_dbmalloc=no])
-+AC_MSG_RESULT($with_dbmalloc)
-+if test $with_dbmalloc = yes ; then
-+ AC_CHECK_LIB(dbmalloc,debug_malloc)
-+fi
-+])dnl
-+dnl ---------------------------------------------------------------------------
-+dnl CF_WITH_DMALLOC version: 2 updated: 2002/12/29 21:11:45
-+dnl ---------------
-+dnl Configure-option for dmalloc
-+AC_DEFUN([CF_WITH_DMALLOC],[
-+AC_MSG_CHECKING(if you want to link with dmalloc for testing)
-+AC_ARG_WITH(dmalloc,
-+ [ --with-dmalloc test: use Gray Watson's dmalloc library],
-+ [with_dmalloc=$withval],
-+ [with_dmalloc=no])
-+AC_MSG_RESULT($with_dmalloc)
-+if test $with_dmalloc = yes ; then
-+ AC_CHECK_LIB(dmalloc,dmalloc_debug)
-+fi
-+])dnl
-+dnl ---------------------------------------------------------------------------
-+dnl CF_WITH_LIBTOOL version: 8 updated: 2003/09/06 19:15:56
-+dnl ---------------
-+dnl Provide a configure option to incorporate libtool. Define several useful
-+dnl symbols for the makefile rules.
-+AC_DEFUN([CF_WITH_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=
-+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
-+ 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
-+
-+ LIB_CREATE='$(LIBTOOL) --mode=link $(CC) -rpath $(DESTDIR)$(libdir) -version-info `cut -f1 $(srcdir)/VERSION` -o'
-+ LIB_OBJECT='$(OBJECTS:.o=.lo)'
-+ LIB_SUFFIX=.la
-+ LIB_CLEAN='$(LIBTOOL) --mode=clean'
-+ LIB_COMPILE='$(LIBTOOL) --mode=compile'
-+ LIB_LINK='$(LIBTOOL) --mode=link'
-+ 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 '2,$d' -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 libtool)
-+ fi
-+
-+ # special hack to add --tag option for C++ compiler
-+ case $cf_cv_libtool_version in
-+ 1.[[5-9]]*|[[2-9]]*)
-+ LIBTOOL_CXX="$LIBTOOL --tag=CXX"
-+ ;;
-+ *)
-+ LIBTOOL_CXX="$LIBTOOL"
-+ ;;
-+ esac
-+else
-+ LIBTOOL=""
-+ LIBTOOL_CXX=""
-+fi
-+
-+test -z "$LIBTOOL" && ECHO_LT=
-+
-+AC_SUBST(LIBTOOL)
-+AC_SUBST(LIBTOOL_CXX)
-+
-+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_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: 2 updated: 2003/11/26 19:29:42
-+dnl ---------------
-+dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions.
-+AC_DEFUN([CF_XOPEN_SOURCE],[
-+case $host_os in #(vi
-+hpux*) #(vi
-+ CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE"
-+ ;;
-+linux*) #(vi
-+ CF_GNU_SOURCE
-+ ;;
-+osf[[45]]*) #(vi
-+ CPPFLAGS="$CPPFLAGS -D_OSF_SOURCE"
-+ ;;
-+*)
-+ ;;
-+esac
-+])
-Index: dialog-1.0-20050306/aclocal.m4
-===================================================================
---- dialog-1.0-20050306.orig/aclocal.m4 2005-02-07 00:03:26.000000000 +0100
-+++ dialog-1.0-20050306/aclocal.m4 2005-05-16 01:35:48.000000000 +0200
-@@ -1,720 +1,143 @@
--dnl macros used for DIALOG configure script
--dnl -- Thomas E. Dickey
--dnl $Id: aclocal.m4,v 1.47 2005/02/06 23:03:26 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: 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 iconv.m4
--dnl ====================
--dnl serial AM2
--dnl
--dnl From Bruno Haible.
--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).
-+ # generated automatically by aclocal 1.7.7 -*- Autoconf -*-
-
-- AC_ARG_WITH([libiconv-prefix],
--[ --with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib], [
-- 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
-- ])
-+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
-+ # Free Software Foundation, Inc.
-+ # This file is free software; the Free Software Foundation
-+ # gives unlimited permission to copy and/or distribute it,
-+ # with or without modifications, as long as this notice is preserved.
-+
-+ # This program is distributed in the hope that it will be useful,
-+ # but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+ # PARTICULAR PURPOSE.
-
-- AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
-- am_cv_func_iconv="no, consider installing GNU libiconv"
-- am_cv_lib_iconv=no
-- AC_TRY_LINK([#include <stdlib.h>
--#include <iconv.h>],
-- [iconv_t cd = iconv_open("","");
-- iconv(cd,NULL,NULL,NULL,NULL);
-- iconv_close(cd);],
-- am_cv_func_iconv=yes)
-- if test "$am_cv_func_iconv" != yes; then
-- am_save_LIBS="$LIBS"
-- LIBS="$LIBS -liconv"
-- AC_TRY_LINK([#include <stdlib.h>
--#include <iconv.h>],
-- [iconv_t cd = iconv_open("","");
-- iconv(cd,NULL,NULL,NULL,NULL);
-- iconv_close(cd);],
-- am_cv_lib_iconv=yes
-- am_cv_func_iconv=yes)
-- LIBS="$am_save_LIBS"
-- fi
-- ])
-- if test "$am_cv_func_iconv" = yes; then
-- AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
-- AC_MSG_CHECKING([for iconv declaration])
-- AC_CACHE_VAL(am_cv_proto_iconv, [
-- AC_TRY_COMPILE([
--#include <stdlib.h>
--#include <iconv.h>
--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_arg1="", am_cv_proto_iconv_arg1="const")
-- 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);"])
-- am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
-- AC_MSG_RESULT([$]{ac_t:-
-- }[$]am_cv_proto_iconv)
-- AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
-- [Define as const if the declaration of iconv() needs const.])
-- fi
-- LIBICONV=
-- if test "$am_cv_lib_iconv" = yes; then
-- LIBICONV="-liconv"
-- 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],
-+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_INCDIR version: 4 updated: 2002/12/21 14:25:52
-+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 gives error messages if -I/usr/local/include is added to
-+dnl the include-path).
-+AC_DEFUN([CF_ADD_INCDIR],
- [
-- 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
-+for cf_add_incdir in $1
-+do
-+ while true
-+ do
-+ case $cf_add_incdir in
-+ /usr/include) # (vi
-+ ;;
-+ /usr/local/include) # (vi
-+ if test "$GCC" = yes
-+ then
-+ cf_save_CPPFLAGS="$CPPFLAGS"
-+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
-+ AC_TRY_COMPILE([#include <stdio.h>],
-+ [printf("Hello")],
-+ [],
-+ [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"
-+ done
-+done
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl AM_LC_MESSAGES version: 4 updated: 2002/10/27 23:21:42
-+dnl CF_ARG_DISABLE version: 3 updated: 1999/03/30 17:24:31
- 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 Allow user to disable a normally-on option.
-+AC_DEFUN([CF_ARG_DISABLE],
-+[CF_ARG_OPTION($1,[$2],[$3],[$4],yes)])dnl
- dnl ---------------------------------------------------------------------------
--dnl AM_PATH_PROG_WITH_TEST version: 5 updated: 2002/10/27 23:21:42
--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 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 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}${PATHSEP}"
-- for ac_dir in ifelse([$5], , $PATH, [$5]); do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- if [$3]; then
-- ac_cv_path_$1="$ac_dir/$ac_word"
-- 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)
-+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
-- AC_MSG_RESULT(no)
-+ifelse($5,,[ :],$5)
- fi
--AC_SUBST($1)dnl
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl AM_WITH_NLS version: 17 updated: 2004/01/23 19:52:21
--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 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 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 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: 11 updated: 2004/09/12 19:45:55
-+dnl ---------------
-+dnl Top-level macro for configuring an application with a bundled copy of
-+dnl the intl and po directories for gettext.
- dnl
--dnl serial 10
-+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 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
--
-- dnl Add a version number to the cache macros.
-- define(gt_cv_func_gnugettext_libc, [gt_cv_func_gnugettext]ifelse([$2], need-ngettext, 2, 1)[_libc])
-- define(gt_cv_func_gnugettext_libintl, [gt_cv_func_gnugettext]ifelse([$2], need-ngettext, 2, 1)[_libintl])
--
-- AC_CHECK_HEADER(libintl.h,
-- [AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
-- [AC_TRY_LINK([#include <libintl.h>
--extern int _nl_msg_cat_cntr;],
-- [bindtextdomain ("", "");
--return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr],
-- gt_cv_func_gnugettext_libc=yes,
-- gt_cv_func_gnugettext_libc=no)])
--
-- if test "$gt_cv_func_gnugettext_libc" != "yes"; then
-- AC_CACHE_CHECK([for GNU gettext in libintl],
-- gt_cv_func_gnugettext_libintl,
-- [gt_save_LIBS="$LIBS"
-- LIBS="$LIBS -lintl $LIBICONV"
-- AC_TRY_LINK([#include <libintl.h>
--extern int _nl_msg_cat_cntr;],
-- [bindtextdomain ("", "");
--return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr],
-- gt_cv_func_gnugettext_libintl=yes,
-- gt_cv_func_gnugettext_libintl=no)
-- LIBS="$gt_save_LIBS"])
-- fi
--
-- 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 "$gt_cv_func_gnugettext_libc" = "yes" \
-- || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
-- && test "$PACKAGE" != gettext; }; then
-- AC_DEFINE(HAVE_GETTEXT, 1,
-- [Define if the GNU gettext() function is already present or preinstalled.])
--
-- if test "$gt_cv_func_gnugettext_libintl" = "yes"; 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="-lintl $LIBICONV"
-- 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
-- ])
--
-- 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_INCDIR version: 4 updated: 2002/12/21 14:25:52
--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 gives error messages if -I/usr/local/include is added to
--dnl the include-path).
--AC_DEFUN([CF_ADD_INCDIR],
--[
--for cf_add_incdir in $1
--do
-- while true
-- do
-- case $cf_add_incdir in
-- /usr/include) # (vi
-- ;;
-- /usr/local/include) # (vi
-- if test "$GCC" = yes
-- then
-- cf_save_CPPFLAGS="$CPPFLAGS"
-- CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
-- AC_TRY_COMPILE([#include <stdio.h>],
-- [printf("Hello")],
-- [],
-- [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"
-- done
--done
--])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: 11 updated: 2004/09/12 19:45:55
--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 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 Sets variables which can be used to substitute in makefiles:
-+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
-+AH_TEMPLATE([HAVE_LIBGETTEXT_H], [Define if we're using ./intl.])
- AC_DEFUN([CF_BUNDLED_INTL],[
- cf_makefile=ifelse($1,,Makefile,$1)
-
-@@ -830,6 +253,7 @@
- system_name="`(hostname) 2>/dev/null`"
- fi
- fi
-+AH_TEMPLATE([SYSTEM_NAME], [Set to the system name])
- test -n "$system_name" && AC_DEFINE_UNQUOTED(SYSTEM_NAME,"$system_name")
- AC_CACHE_VAL(cf_cv_system_name,[cf_cv_system_name="$system_name"])
-
-@@ -845,6 +269,8 @@
- 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).
-+AH_TEMPLATE([HAVE_TYPE_CHTYPE], [Define if curses defines 'chtype'.])
-+AH_TEMPLATE([TYPE_CHTYPE_IS_SCALAR], [Define if chtype is scalar rather than a struct.])
- AC_DEFUN([CF_CURSES_CHTYPE],
- [
- AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl
-@@ -1091,6 +517,9 @@
- done
- ])
-
-+AH_TEMPLATE([HAVE_TERM_H], [define if you have term.h])
-+AH_TEMPLATE([HAVE_NCURSES_TERM_H], [define if you have ncurses/term.h])
-+AH_TEMPLATE([HAVE_NCURSESW_TERM_H], [define if you have ncursesw/term.h])
- case $cf_cv_term_header in #(vi
- term.h) #(vi
- AC_DEFINE(HAVE_TERM_H)
-@@ -1208,6 +637,8 @@
- 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
-+AH_TEMPLATE([WAIT_USES_UNION], [Define if wait uses union])
-+AH_TEMPLATE([WAITPID_USES_UNION], [Define if waitpid uses union])
- AC_DEFUN([CF_FUNC_WAIT],
- [
- AC_REQUIRE([CF_UNION_WAIT])
-@@ -1690,6 +1121,7 @@
- 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.
-+AH_TEMPLATE([MIXEDCASE_FILENAMES],[Define if the file-system supports mixed-case filenames.])
- AC_DEFUN([CF_MIXEDCASE_FILENAMES],
- [
- AC_CACHE_CHECK(if filesystem supports mixed-case filenames,cf_cv_mixedcase,[
-@@ -1836,8 +1268,13 @@
-
- fi
-
--AC_DEFINE(NCURSES)
-
-+AH_TEMPLATE([NCURSES],[Define if you have ncurses])
-+AH_TEMPLATE([HAVE_NCURSES_H],[Define if you have ncurses.h])
-+AH_TEMPLATE([HAVE_NCURSES_NCURSES_H],[Define if you have ncurses/ncurses.h])
-+AH_TEMPLATE([HAVE_NCURSESW_NCURSES_H],[Define if you have ncursesw/ncurses.h])
-+
-+AC_DEFINE(NCURSES)
- case $cf_cv_ncurses_header in # (vi
- *ncurses.h)
- AC_DEFINE(HAVE_NCURSES_H)
-@@ -2129,6 +1566,7 @@
- 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.
-+AH_TEMPLATE([PROG_EXT],[Set to prog extension])
- AC_DEFUN([CF_PROG_EXT],
- [
- AC_REQUIRE([CF_CHECK_CACHE])
-@@ -2281,6 +1719,7 @@
- dnl
- dnl Sets: $cf_cv_type_unionwait
- dnl Defines: HAVE_TYPE_UNIONWAIT
-+AH_TEMPLATE([HAVE_TYPE_UNIONWAIT], [Define if BSD-style union wait is declared.])
- AC_DEFUN([CF_UNION_WAIT],
- [
- AC_REQUIRE([CF_WAIT_HEADERS])
-@@ -2325,6 +1764,7 @@
- dnl CF_UTF8_LIB version: 4 updated: 2003/03/01 18:36:42
- dnl -----------
- dnl Check for multibyte support, and if not found, utf8 compatibility library
-+AH_TEMPLATE([HAVE_LIBUTF8_H],[Define if we have libutf8.h])
- AC_DEFUN([CF_UTF8_LIB],
- [
- AC_CACHE_CHECK(for multibyte character support,cf_cv_utf8_lib,[
-@@ -2430,6 +1870,7 @@
- dnl need the package name to ensure that the defined symbols are unique.
- ifelse($1,,,[
- PACKAGE=$1
-+ AH_TEMPLATE([PACKAGE],[Define to package name])
- AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
- AC_SUBST(PACKAGE)
- CF_UPPER(cf_PACKAGE,$PACKAGE)
-@@ -2628,138 +2069,1693 @@
-
- test -z "$LIBTOOL" && ECHO_LT=
-
--AC_SUBST(LIBTOOL)
--AC_SUBST(LIBTOOL_CXX)
-+AC_SUBST(LIBTOOL)
-+AC_SUBST(LIBTOOL_CXX)
-+
-+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_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: 17 updated: 2005/02/06 12:07:45
-+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
-+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)
-+
-+case $host_os in #(vi
-+aix[[45]]*) #(vi
-+ CPPFLAGS="$CPPFLAGS -D_ALL_SOURCE"
-+ ;;
-+freebsd*) #(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"
-+ ;;
-+hpux*) #(vi
-+ CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE"
-+ ;;
-+irix[[56]].*) #(vi
-+ CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE"
-+ ;;
-+linux*|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
-+ CPPFLAGS="$CPPFLAGS -D_OSF_SOURCE"
-+ ;;
-+sco*) #(vi
-+ # setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer
-+ ;;
-+solaris*) #(vi
-+ CPPFLAGS="$CPPFLAGS -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"
-+ ])
-+])
-+test "$cf_cv_xopen_source" != no && CPPFLAGS="$CPPFLAGS -U_XOPEN_SOURCE -D_XOPEN_SOURCE=$cf_cv_xopen_source"
-+ CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE)
-+ ;;
-+esac
-+])
-+
-+# gettext.m4 serial 17 (gettext-0.11.5)
-+dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License. As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+dnl
-+dnl This file can can be used in projects which are not available under
-+dnl the GNU General Public License or the GNU Library General Public
-+dnl License but which still want to provide support for the GNU gettext
-+dnl 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 Authors:
-+dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-+dnl Bruno Haible <haible@clisp.cons.org>, 2000-2002.
-+
-+dnl Macro to add for using GNU gettext.
-+
-+dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
-+dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The
-+dnl default (if it is not specified or empty) is 'no-libtool'.
-+dnl INTLSYMBOL should be 'external' for packages with no intl directory,
-+dnl and 'no-libtool' or 'use-libtool' for packages with an intl directory.
-+dnl If INTLSYMBOL 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). If INTLSYMBOL is 'no-libtool', 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. If NEEDSYMBOL is specified and is
-+dnl 'need-formatstring-macros', then GNU gettext implementations that don't
-+dnl support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
-+dnl INTLDIR is used to find the intl libraries. If empty,
-+dnl the value `$(top_builddir)/intl/' is used.
-+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 If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
-+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_GNU_GETTEXT],
-+[
-+ dnl Argument checking.
-+ ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
-+ [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
-+])])])])])
-+ ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
-+ [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
-+])])])])
-+ define(gt_included_intl, ifelse([$1], [external], [no], [yes]))
-+ define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], []))
-+
-+ AC_REQUIRE([AM_PO_SUBDIRS])dnl
-+ ifelse(gt_included_intl, yes, [
-+ AC_REQUIRE([AM_INTL_SUBDIR])dnl
-+ ])
-+
-+ dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
-+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-+ AC_REQUIRE([AC_LIB_RPATH])
-+
-+ dnl Sometimes libintl requires libiconv, so first search for libiconv.
-+ dnl Ideally we would do this search only after the
-+ dnl if test "$USE_NLS" = "yes"; then
-+ dnl if test "$gt_cv_func_gnugettext_libc" != "yes"; then
-+ dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
-+ dnl the configure script would need to contain the same shell code
-+ dnl again, outside any 'if'. There are two solutions:
-+ dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
-+ dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
-+ dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
-+ dnl documented, we avoid it.
-+ ifelse(gt_included_intl, yes, , [
-+ AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
-+ ])
-+
-+ AC_MSG_CHECKING([whether NLS is requested])
-+ dnl Default is enabled NLS
-+ AC_ARG_ENABLE(nls,
-+ [ --disable-nls do not use Native Language Support],
-+ USE_NLS=$enableval, USE_NLS=yes)
-+ AC_MSG_RESULT($USE_NLS)
-+ AC_SUBST(USE_NLS)
-+
-+ ifelse(gt_included_intl, yes, [
-+ BUILD_INCLUDED_LIBINTL=no
-+ USE_INCLUDED_LIBINTL=no
-+ ])
-+ LIBINTL=
-+ LTLIBINTL=
-+ POSUB=
-+
-+ dnl If we use NLS figure out what method
-+ if test "$USE_NLS" = "yes"; then
-+ gt_use_preinstalled_gnugettext=no
-+ ifelse(gt_included_intl, yes, [
-+ 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.
-+
-+ dnl Add a version number to the cache macros.
-+ define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1)))
-+ define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc])
-+ define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl])
-+
-+ AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
-+ [AC_TRY_LINK([#include <libintl.h>
-+]ifelse([$2], [need-formatstring-macros],
-+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-+#endif
-+changequote(,)dnl
-+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-+changequote([,])dnl
-+], [])[extern int _nl_msg_cat_cntr;
-+extern int *_nl_domain_bindings;],
-+ [bindtextdomain ("", "");
-+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
-+ gt_cv_func_gnugettext_libc=yes,
-+ gt_cv_func_gnugettext_libc=no)])
-+
-+ if test "$gt_cv_func_gnugettext_libc" != "yes"; then
-+ dnl Sometimes libintl requires libiconv, so first search for libiconv.
-+ ifelse(gt_included_intl, yes, , [
-+ AM_ICONV_LINK
-+ ])
-+ dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
-+ dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
-+ dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
-+ dnl even if libiconv doesn't exist.
-+ AC_LIB_LINKFLAGS_BODY([intl])
-+ AC_CACHE_CHECK([for GNU gettext in libintl],
-+ gt_cv_func_gnugettext_libintl,
-+ [gt_save_CPPFLAGS="$CPPFLAGS"
-+ CPPFLAGS="$CPPFLAGS $INCINTL"
-+ gt_save_LIBS="$LIBS"
-+ LIBS="$LIBS $LIBINTL"
-+ dnl Now see whether libintl exists and does not depend on libiconv.
-+ AC_TRY_LINK([#include <libintl.h>
-+]ifelse([$2], [need-formatstring-macros],
-+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-+#endif
-+changequote(,)dnl
-+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-+changequote([,])dnl
-+], [])[extern int _nl_msg_cat_cntr;
-+extern
-+#ifdef __cplusplus
-+"C"
-+#endif
-+const char *_nl_expand_alias ();],
-+ [bindtextdomain ("", "");
-+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
-+ gt_cv_func_gnugettext_libintl=yes,
-+ gt_cv_func_gnugettext_libintl=no)
-+ dnl Now see whether libintl exists and depends on libiconv.
-+ if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then
-+ LIBS="$LIBS $LIBICONV"
-+ AC_TRY_LINK([#include <libintl.h>
-+]ifelse([$2], [need-formatstring-macros],
-+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-+#endif
-+changequote(,)dnl
-+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-+changequote([,])dnl
-+], [])[extern int _nl_msg_cat_cntr;
-+extern
-+#ifdef __cplusplus
-+"C"
-+#endif
-+const char *_nl_expand_alias ();],
-+ [bindtextdomain ("", "");
-+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
-+ [LIBINTL="$LIBINTL $LIBICONV"
-+ LTLIBINTL="$LTLIBINTL $LTLIBICONV"
-+ gt_cv_func_gnugettext_libintl=yes
-+ ])
-+ fi
-+ CPPFLAGS="$gt_save_CPPFLAGS"
-+ LIBS="$gt_save_LIBS"])
-+ fi
-+
-+ 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 "$gt_cv_func_gnugettext_libc" = "yes" \
-+ || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
-+ && test "$PACKAGE" != gettext; }; then
-+ gt_use_preinstalled_gnugettext=yes
-+ else
-+ dnl Reset the values set by searching for libintl.
-+ LIBINTL=
-+ LTLIBINTL=
-+ INCINTL=
-+ fi
-+
-+ ifelse(gt_included_intl, yes, [
-+ if test "$gt_use_preinstalled_gnugettext" != "yes"; then
-+ dnl GNU gettext is not found in the C library.
-+ dnl Fall back on included GNU gettext library.
-+ nls_cv_use_gnu_gettext=yes
-+ fi
-+ fi
-+
-+ if test "$nls_cv_use_gnu_gettext" = "yes"; then
-+ dnl Mark actions used to generate GNU NLS library.
-+ INTLOBJS="\$(GETTOBJS)"
-+ BUILD_INCLUDED_LIBINTL=yes
-+ USE_INCLUDED_LIBINTL=yes
-+ LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV"
-+ LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV"
-+ LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
-+ fi
-+
-+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
-+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
-+ dnl Mark actions to use GNU gettext tools.
-+ CATOBJEXT=.gmo
-+ fi
-+ ])
-+
-+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
-+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
-+ AC_DEFINE(ENABLE_NLS, 1,
-+ [Define to 1 if translation of program messages to the user's native language
-+ is requested.])
-+ else
-+ USE_NLS=no
-+ fi
-+ fi
-+
-+ if test "$USE_NLS" = "yes"; then
-+
-+ if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-+ if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
-+ AC_MSG_CHECKING([how to link with libintl])
-+ AC_MSG_RESULT([$LIBINTL])
-+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
-+ fi
-+
-+ dnl For backward compatibility. Some packages may be using this.
-+ AC_DEFINE(HAVE_GETTEXT, 1,
-+ [Define if the GNU gettext() function is already present or preinstalled.])
-+ AC_DEFINE(HAVE_DCGETTEXT, 1,
-+ [Define if the GNU dcgettext() function is already present or preinstalled.])
-+ fi
-+
-+ dnl We need to process the po/ directory.
-+ POSUB=po
-+ fi
-+
-+ ifelse(gt_included_intl, yes, [
-+ 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 Make all variables we use known to autoconf.
-+ AC_SUBST(BUILD_INCLUDED_LIBINTL)
-+ AC_SUBST(USE_INCLUDED_LIBINTL)
-+ AC_SUBST(CATOBJEXT)
-+ AC_SUBST(INTLOBJS)
-+
-+ 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 Enable libtool support if the surrounding package wishes it.
-+ INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
-+ AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
-+ ])
-+
-+ dnl For backward compatibility. Some Makefiles may be using this.
-+ INTLLIBS="$LIBINTL"
-+ AC_SUBST(INTLLIBS)
-+
-+ dnl Make all documented variables known to autoconf.
-+ AC_SUBST(LIBINTL)
-+ AC_SUBST(LTLIBINTL)
-+ AC_SUBST(POSUB)
-+])
-+
-+
-+dnl Checks for all prerequisites of the po subdirectory,
-+dnl except for USE_NLS.
-+AC_DEFUN([AM_PO_SUBDIRS],
-+[
-+ AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-+ AC_REQUIRE([AC_PROG_INSTALL])dnl
-+ AC_REQUIRE([AM_MKINSTALLDIRS])dnl
-+
-+ dnl Perform the following tests also if --disable-nls has been given,
-+ dnl because they are needed for "make dist" to work.
-+
-+ dnl Search for GNU msgfmt in the PATH.
-+ dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
-+ dnl The second test excludes FreeBSD msgfmt.
-+ AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-+ [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
-+ (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
-+ :)
-+ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-+
-+ dnl Search for GNU xgettext 0.11 or newer in the PATH.
-+ dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
-+ dnl The second test excludes FreeBSD xgettext.
-+ AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-+ [$ac_dir/$ac_word --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
-+ (if $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
-+ :)
-+ dnl Remove leftover from FreeBSD xgettext call.
-+ rm -f messages.po
-+
-+ dnl Search for GNU msgmerge 0.11 or newer in the PATH.
-+ AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
-+ [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :)
-+
-+ 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 &&
-+ (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-+ : ;
-+ else
-+ GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
-+ AC_MSG_RESULT(
-+ [found $GMSGFMT 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 --copyright-holder= /dev/null >/dev/null 2>&1 &&
-+ (if $XGETTEXT --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-+ : ;
-+ else
-+ AC_MSG_RESULT(
-+ [found xgettext program is not GNU xgettext; ignore it])
-+ XGETTEXT=":"
-+ fi
-+ dnl Remove leftover from FreeBSD xgettext call.
-+ rm -f messages.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.in.in.
-+ case "$ac_file" in */Makefile.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'`
-+ # 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"
-+ cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
-+ # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend
-+ # on $ac_dir but don't depend on user-specified configuration
-+ # parameters.
-+ if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
-+ # The LINGUAS file contains the set of available languages.
-+ if test -n "$ALL_LINGUAS"; then
-+ test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
-+ fi
-+ ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-+ # Hide the ALL_LINGUAS assigment from automake.
-+ eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
-+ fi
-+ case "$ac_given_srcdir" in
-+ .) srcdirpre= ;;
-+ *) srcdirpre='$(srcdir)/' ;;
-+ esac
-+ POFILES=
-+ GMOFILES=
-+ UPDATEPOFILES=
-+ DUMMYPOFILES=
-+ for lang in $ALL_LINGUAS; do
-+ POFILES="$POFILES $srcdirpre$lang.po"
-+ GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
-+ UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
-+ DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
-+ done
-+ # CATALOGS depends on both $ac_dir and the user's LINGUAS
-+ # environment variable.
-+ INST_LINGUAS=
-+ if test -n "$ALL_LINGUAS"; then
-+ for presentlang in $ALL_LINGUAS; do
-+ useit=no
-+ if test "%UNSET%" != "$LINGUAS"; then
-+ desiredlanguages="$LINGUAS"
-+ else
-+ desiredlanguages="$ALL_LINGUAS"
-+ fi
-+ for desiredlang in $desiredlanguages; 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
-+ INST_LINGUAS="$INST_LINGUAS $presentlang"
-+ fi
-+ done
-+ fi
-+ CATALOGS=
-+ if test -n "$INST_LINGUAS"; then
-+ for lang in $INST_LINGUAS; do
-+ CATALOGS="$CATALOGS $lang.gmo"
-+ done
-+ fi
-+ test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
-+ sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
-+ for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
-+ if test -f "$f"; then
-+ case "$f" in
-+ *.orig | *.bak | *~) ;;
-+ *) cat "$f" >> "$ac_dir/Makefile" ;;
-+ esac
-+ fi
-+ done
-+ fi
-+ ;;
-+ esac
-+ done],
-+ [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
-+ # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it
-+ # from automake.
-+ eval 'ALL_LINGUAS''="$ALL_LINGUAS"'
-+ # Capture the value of LINGUAS because we need it to compute CATALOGS.
-+ LINGUAS="${LINGUAS-%UNSET%}"
-+ ])
-+])
-+
-+
-+dnl Checks for all prerequisites of the intl subdirectory,
-+dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
-+dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
-+AC_DEFUN([AM_INTL_SUBDIR],
-+[
-+ AC_REQUIRE([AC_PROG_INSTALL])dnl
-+ AC_REQUIRE([AM_MKINSTALLDIRS])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_REQUIRE([gt_INTDIV0])dnl
-+ AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl
-+ AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
-+ AC_REQUIRE([gt_INTTYPES_PRI])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 getc_unlocked getcwd getegid \
-+geteuid getgid getuid mempcpy munmap putenv setenv setlocale stpcpy \
-+strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
-+
-+ AM_ICONV
-+ AM_LANGINFO_CODESET
-+ if test $ac_cv_header_locale_h = yes; then
-+ AM_LC_MESSAGES
-+ 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.
-+ 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
-+])
-+
-+
-+AC_DEFUN([AM_MKINSTALLDIRS],
-+[
-+ 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 is.
-+ MKINSTALLDIRS=
-+ if test -n "$ac_aux_dir"; then
-+ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
-+ fi
-+ if test -z "$MKINSTALLDIRS"; then
-+ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-+ fi
-+ AC_SUBST(MKINSTALLDIRS)
-+])
-+
-+
-+dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
-+AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
-+
-+# lib-prefix.m4 serial 1 (gettext-0.11)
-+dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License. As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl From Bruno Haible.
-+
-+dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
-+dnl to access previously installed libraries. The basic assumption is that
-+dnl a user will want packages to use other packages he previously installed
-+dnl with the same --prefix option.
-+dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
-+dnl libraries, but is otherwise very convenient.
-+AC_DEFUN([AC_LIB_PREFIX],
-+[
-+ AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
-+ AC_REQUIRE([AC_PROG_CC])
-+ AC_REQUIRE([AC_CANONICAL_HOST])
-+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-+ dnl By default, look in $includedir and $libdir.
-+ use_additional=yes
-+ AC_LIB_WITH_FINAL_PREFIX([
-+ eval additional_includedir=\"$includedir\"
-+ eval additional_libdir=\"$libdir\"
-+ ])
-+ AC_ARG_WITH([lib-prefix],
-+[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
-+ --without-lib-prefix don't search for libraries in includedir and libdir],
-+[
-+ if test "X$withval" = "Xno"; then
-+ use_additional=no
-+ else
-+ if test "X$withval" = "X"; then
-+ AC_LIB_WITH_FINAL_PREFIX([
-+ eval additional_includedir=\"$includedir\"
-+ eval additional_libdir=\"$libdir\"
-+ ])
-+ else
-+ additional_includedir="$withval/include"
-+ additional_libdir="$withval/lib"
-+ fi
-+ fi
-+])
-+ if test $use_additional = yes; then
-+ dnl Potentially add $additional_includedir to $CPPFLAGS.
-+ dnl But don't add it
-+ dnl 1. if it's the standard /usr/include,
-+ dnl 2. if it's already present in $CPPFLAGS,
-+ dnl 3. if it's /usr/local/include and we are using GCC on Linux,
-+ dnl 4. if it doesn't exist as a directory.
-+ if test "X$additional_includedir" != "X/usr/include"; then
-+ haveit=
-+ for x in $CPPFLAGS; do
-+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-+ if test "X$x" = "X-I$additional_includedir"; then
-+ haveit=yes
-+ break
-+ fi
-+ done
-+ if test -z "$haveit"; then
-+ if test "X$additional_includedir" = "X/usr/local/include"; then
-+ if test -n "$GCC"; then
-+ case $host_os in
-+ linux*) haveit=yes;;
-+ esac
-+ fi
-+ fi
-+ if test -z "$haveit"; then
-+ if test -d "$additional_includedir"; then
-+ dnl Really add $additional_includedir to $CPPFLAGS.
-+ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
-+ fi
-+ fi
-+ fi
-+ fi
-+ dnl Potentially add $additional_libdir to $LDFLAGS.
-+ dnl But don't add it
-+ dnl 1. if it's the standard /usr/lib,
-+ dnl 2. if it's already present in $LDFLAGS,
-+ dnl 3. if it's /usr/local/lib and we are using GCC on Linux,
-+ dnl 4. if it doesn't exist as a directory.
-+ if test "X$additional_libdir" != "X/usr/lib"; then
-+ haveit=
-+ for x in $LDFLAGS; do
-+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-+ if test "X$x" = "X-L$additional_libdir"; then
-+ haveit=yes
-+ break
-+ fi
-+ done
-+ if test -z "$haveit"; then
-+ if test "X$additional_libdir" = "X/usr/local/lib"; then
-+ if test -n "$GCC"; then
-+ case $host_os in
-+ linux*) haveit=yes;;
-+ esac
-+ fi
-+ fi
-+ if test -z "$haveit"; then
-+ if test -d "$additional_libdir"; then
-+ dnl Really add $additional_libdir to $LDFLAGS.
-+ LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
-+ fi
-+ fi
-+ fi
-+ fi
-+ fi
-+])
-+
-+dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
-+dnl acl_final_exec_prefix, containing the values to which $prefix and
-+dnl $exec_prefix will expand at the end of the configure script.
-+AC_DEFUN([AC_LIB_PREPARE_PREFIX],
-+[
-+ dnl Unfortunately, prefix and exec_prefix get only finally determined
-+ dnl at the end of configure.
-+ if test "X$prefix" = "XNONE"; then
-+ acl_final_prefix="$ac_default_prefix"
-+ else
-+ acl_final_prefix="$prefix"
-+ fi
-+ if test "X$exec_prefix" = "XNONE"; then
-+ acl_final_exec_prefix='${prefix}'
-+ else
-+ acl_final_exec_prefix="$exec_prefix"
-+ fi
-+ acl_save_prefix="$prefix"
-+ prefix="$acl_final_prefix"
-+ eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
-+ prefix="$acl_save_prefix"
-+])
-+
-+dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
-+dnl variables prefix and exec_prefix bound to the values they will have
-+dnl at the end of the configure script.
-+AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
-+[
-+ acl_save_prefix="$prefix"
-+ prefix="$acl_final_prefix"
-+ acl_save_exec_prefix="$exec_prefix"
-+ exec_prefix="$acl_final_exec_prefix"
-+ $1
-+ exec_prefix="$acl_save_exec_prefix"
-+ prefix="$acl_save_prefix"
-+])
-+
-+# lib-link.m4 serial 3 (gettext-0.11.3)
-+dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License. As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl From Bruno Haible.
-+
-+dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
-+dnl the libraries corresponding to explicit and implicit dependencies.
-+dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
-+dnl augments the CPPFLAGS variable.
-+AC_DEFUN([AC_LIB_LINKFLAGS],
-+[
-+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-+ AC_REQUIRE([AC_LIB_RPATH])
-+ define([Name],[translit([$1],[./-], [___])])
-+ define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
-+ AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
-+ AC_LIB_LINKFLAGS_BODY([$1], [$2])
-+ ac_cv_lib[]Name[]_libs="$LIB[]NAME"
-+ ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
-+ ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
-+ ])
-+ LIB[]NAME="$ac_cv_lib[]Name[]_libs"
-+ LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
-+ INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
-+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
-+ AC_SUBST([LIB]NAME)
-+ AC_SUBST([LTLIB]NAME)
-+ dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
-+ dnl results of this search when this library appears as a dependency.
-+ HAVE_LIB[]NAME=yes
-+ undefine([Name])
-+ undefine([NAME])
-+])
-+
-+dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
-+dnl searches for libname and the libraries corresponding to explicit and
-+dnl implicit dependencies, together with the specified include files and
-+dnl the ability to compile and link the specified testcode. If found, it
-+dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
-+dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
-+dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
-+dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
-+AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
-+[
-+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-+ AC_REQUIRE([AC_LIB_RPATH])
-+ define([Name],[translit([$1],[./-], [___])])
-+ define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
-+
-+ dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
-+ dnl accordingly.
-+ AC_LIB_LINKFLAGS_BODY([$1], [$2])
-+
-+ dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
-+ dnl because if the user has installed lib[]Name and not disabled its use
-+ dnl via --without-lib[]Name-prefix, he wants to use it.
-+ ac_save_CPPFLAGS="$CPPFLAGS"
-+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
-+
-+ AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
-+ ac_save_LIBS="$LIBS"
-+ LIBS="$LIBS $LIB[]NAME"
-+ AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
-+ LIBS="$ac_save_LIBS"
-+ ])
-+ if test "$ac_cv_lib[]Name" = yes; then
-+ HAVE_LIB[]NAME=yes
-+ AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
-+ AC_MSG_CHECKING([how to link with lib[]$1])
-+ AC_MSG_RESULT([$LIB[]NAME])
-+ else
-+ HAVE_LIB[]NAME=no
-+ dnl If $LIB[]NAME didn't lead to a usable library, we don't need
-+ dnl $INC[]NAME either.
-+ CPPFLAGS="$ac_save_CPPFLAGS"
-+ LIB[]NAME=
-+ LTLIB[]NAME=
-+ fi
-+ AC_SUBST([HAVE_LIB]NAME)
-+ AC_SUBST([LIB]NAME)
-+ AC_SUBST([LTLIB]NAME)
-+ undefine([Name])
-+ undefine([NAME])
-+])
-+
-+dnl Determine the platform dependent parameters needed to use rpath:
-+dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
-+dnl hardcode_direct, hardcode_minus_L,
-+dnl sys_lib_search_path_spec, sys_lib_dlsearch_path_spec.
-+AC_DEFUN([AC_LIB_RPATH],
-+[
-+ AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS
-+ AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
-+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
-+ AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
-+ AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
-+ CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
-+ ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
-+ . ./conftest.sh
-+ rm -f ./conftest.sh
-+ acl_cv_rpath=done
-+ ])
-+ wl="$acl_cv_wl"
-+ libext="$acl_cv_libext"
-+ shlibext="$acl_cv_shlibext"
-+ hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
-+ hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
-+ hardcode_direct="$acl_cv_hardcode_direct"
-+ hardcode_minus_L="$acl_cv_hardcode_minus_L"
-+ sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec"
-+ sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec"
-+ dnl Determine whether the user wants rpath handling at all.
-+ AC_ARG_ENABLE(rpath,
-+ [ --disable-rpath do not hardcode runtime library paths],
-+ :, enable_rpath=yes)
-+])
-+
-+dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
-+dnl the libraries corresponding to explicit and implicit dependencies.
-+dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
-+AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
-+[
-+ define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
-+ dnl By default, look in $includedir and $libdir.
-+ use_additional=yes
-+ AC_LIB_WITH_FINAL_PREFIX([
-+ eval additional_includedir=\"$includedir\"
-+ eval additional_libdir=\"$libdir\"
-+ ])
-+ AC_ARG_WITH([lib$1-prefix],
-+[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib
-+ --without-lib$1-prefix don't search for lib$1 in includedir and libdir],
-+[
-+ if test "X$withval" = "Xno"; then
-+ use_additional=no
-+ else
-+ if test "X$withval" = "X"; then
-+ AC_LIB_WITH_FINAL_PREFIX([
-+ eval additional_includedir=\"$includedir\"
-+ eval additional_libdir=\"$libdir\"
-+ ])
-+ else
-+ additional_includedir="$withval/include"
-+ additional_libdir="$withval/lib"
-+ fi
-+ fi
-+])
-+ dnl Search the library and its dependencies in $additional_libdir and
-+ dnl $LDFLAGS. Using breadth-first-seach.
-+ LIB[]NAME=
-+ LTLIB[]NAME=
-+ INC[]NAME=
-+ rpathdirs=
-+ ltrpathdirs=
-+ names_already_handled=
-+ names_next_round='$1 $2'
-+ while test -n "$names_next_round"; do
-+ names_this_round="$names_next_round"
-+ names_next_round=
-+ for name in $names_this_round; do
-+ already_handled=
-+ for n in $names_already_handled; do
-+ if test "$n" = "$name"; then
-+ already_handled=yes
-+ break
-+ fi
-+ done
-+ if test -z "$already_handled"; then
-+ names_already_handled="$names_already_handled $name"
-+ dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
-+ dnl or AC_LIB_HAVE_LINKFLAGS call.
-+ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
-+ eval value=\"\$HAVE_LIB$uppername\"
-+ if test -n "$value"; then
-+ if test "$value" = yes; then
-+ eval value=\"\$LIB$uppername\"
-+ test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
-+ eval value=\"\$LTLIB$uppername\"
-+ test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
-+ else
-+ dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
-+ dnl that this library doesn't exist. So just drop it.
-+ :
-+ fi
-+ else
-+ dnl Search the library lib$name in $additional_libdir and $LDFLAGS
-+ dnl and the already constructed $LIBNAME/$LTLIBNAME.
-+ found_dir=
-+ found_la=
-+ found_so=
-+ found_a=
-+ if test $use_additional = yes; then
-+ if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
-+ found_dir="$additional_libdir"
-+ found_so="$additional_libdir/lib$name.$shlibext"
-+ if test -f "$additional_libdir/lib$name.la"; then
-+ found_la="$additional_libdir/lib$name.la"
-+ fi
-+ else
-+ if test -f "$additional_libdir/lib$name.$libext"; then
-+ found_dir="$additional_libdir"
-+ found_a="$additional_libdir/lib$name.$libext"
-+ if test -f "$additional_libdir/lib$name.la"; then
-+ found_la="$additional_libdir/lib$name.la"
-+ fi
-+ fi
-+ fi
-+ fi
-+ if test "X$found_dir" = "X"; then
-+ for x in $LDFLAGS $LTLIB[]NAME; do
-+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-+ case "$x" in
-+ -L*)
-+ dir=`echo "X$x" | sed -e 's/^X-L//'`
-+ if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
-+ found_dir="$dir"
-+ found_so="$dir/lib$name.$shlibext"
-+ if test -f "$dir/lib$name.la"; then
-+ found_la="$dir/lib$name.la"
-+ fi
-+ else
-+ if test -f "$dir/lib$name.$libext"; then
-+ found_dir="$dir"
-+ found_a="$dir/lib$name.$libext"
-+ if test -f "$dir/lib$name.la"; then
-+ found_la="$dir/lib$name.la"
-+ fi
-+ fi
-+ fi
-+ ;;
-+ esac
-+ if test "X$found_dir" != "X"; then
-+ break
-+ fi
-+ done
-+ fi
-+ if test "X$found_dir" != "X"; then
-+ dnl Found the library.
-+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
-+ if test "X$found_so" != "X"; then
-+ dnl Linking with a shared library. We attempt to hardcode its
-+ dnl directory into the executable's runpath, unless it's the
-+ dnl standard /usr/lib.
-+ if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
-+ dnl No hardcoding is needed.
-+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-+ else
-+ dnl Use an explicit option to hardcode DIR into the resulting
-+ dnl binary.
-+ dnl Potentially add DIR to ltrpathdirs.
-+ dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
-+ haveit=
-+ for x in $ltrpathdirs; do
-+ if test "X$x" = "X$found_dir"; then
-+ haveit=yes
-+ break
-+ fi
-+ done
-+ if test -z "$haveit"; then
-+ ltrpathdirs="$ltrpathdirs $found_dir"
-+ fi
-+ dnl The hardcoding into $LIBNAME is system dependent.
-+ if test "$hardcode_direct" = yes; then
-+ dnl Using DIR/libNAME.so during linking hardcodes DIR into the
-+ dnl resulting binary.
-+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-+ else
-+ if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
-+ dnl Use an explicit option to hardcode DIR into the resulting
-+ dnl binary.
-+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-+ dnl Potentially add DIR to rpathdirs.
-+ dnl The rpathdirs will be appended to $LIBNAME at the end.
-+ haveit=
-+ for x in $rpathdirs; do
-+ if test "X$x" = "X$found_dir"; then
-+ haveit=yes
-+ break
-+ fi
-+ done
-+ if test -z "$haveit"; then
-+ rpathdirs="$rpathdirs $found_dir"
-+ fi
-+ else
-+ dnl Rely on "-L$found_dir".
-+ dnl But don't add it if it's already contained in the LDFLAGS
-+ dnl or the already constructed $LIBNAME
-+ haveit=
-+ for x in $LDFLAGS $LIB[]NAME; do
-+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-+ if test "X$x" = "X-L$found_dir"; then
-+ haveit=yes
-+ break
-+ fi
-+ done
-+ if test -z "$haveit"; then
-+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
-+ fi
-+ if test "$hardcode_minus_L" != no; then
-+ dnl FIXME: Not sure whether we should use
-+ dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
-+ dnl here.
-+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-+ else
-+ dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
-+ dnl here, because this doesn't fit in flags passed to the
-+ dnl compiler. So give up. No hardcoding. This affects only
-+ dnl very old systems.
-+ dnl FIXME: Not sure whether we should use
-+ dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
-+ dnl here.
-+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
-+ fi
-+ fi
-+ fi
-+ fi
-+ else
-+ if test "X$found_a" != "X"; then
-+ dnl Linking with a static library.
-+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
-+ else
-+ dnl We shouldn't come here, but anyway it's good to have a
-+ dnl fallback.
-+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
-+ fi
-+ fi
-+ dnl Assume the include files are nearby.
-+ additional_includedir=
-+ case "$found_dir" in
-+ */lib | */lib/)
-+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
-+ additional_includedir="$basedir/include"
-+ ;;
-+ esac
-+ if test "X$additional_includedir" != "X"; then
-+ dnl Potentially add $additional_includedir to $INCNAME.
-+ dnl But don't add it
-+ dnl 1. if it's the standard /usr/include,
-+ dnl 2. if it's /usr/local/include and we are using GCC on Linux,
-+ dnl 3. if it's already present in $CPPFLAGS or the already
-+ dnl constructed $INCNAME,
-+ dnl 4. if it doesn't exist as a directory.
-+ if test "X$additional_includedir" != "X/usr/include"; then
-+ haveit=
-+ if test "X$additional_includedir" = "X/usr/local/include"; then
-+ if test -n "$GCC"; then
-+ case $host_os in
-+ linux*) haveit=yes;;
-+ esac
-+ fi
-+ fi
-+ if test -z "$haveit"; then
-+ for x in $CPPFLAGS $INC[]NAME; do
-+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-+ if test "X$x" = "X-I$additional_includedir"; then
-+ haveit=yes
-+ break
-+ fi
-+ done
-+ if test -z "$haveit"; then
-+ if test -d "$additional_includedir"; then
-+ dnl Really add $additional_includedir to $INCNAME.
-+ INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
-+ fi
-+ fi
-+ fi
-+ fi
-+ fi
-+ dnl Look for dependencies.
-+ if test -n "$found_la"; then
-+ dnl Read the .la file. It defines the variables
-+ dnl dlname, library_names, old_library, dependency_libs, current,
-+ dnl age, revision, installed, dlopen, dlpreopen, libdir.
-+ save_libdir="$libdir"
-+ case "$found_la" in
-+ */* | *\\*) . "$found_la" ;;
-+ *) . "./$found_la" ;;
-+ esac
-+ libdir="$save_libdir"
-+ dnl We use only dependency_libs.
-+ for dep in $dependency_libs; do
-+ case "$dep" in
-+ -L*)
-+ additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
-+ dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
-+ dnl But don't add it
-+ dnl 1. if it's the standard /usr/lib,
-+ dnl 2. if it's /usr/local/lib and we are using GCC on Linux,
-+ dnl 3. if it's already present in $LDFLAGS or the already
-+ dnl constructed $LIBNAME,
-+ dnl 4. if it doesn't exist as a directory.
-+ if test "X$additional_libdir" != "X/usr/lib"; then
-+ haveit=
-+ if test "X$additional_libdir" = "X/usr/local/lib"; then
-+ if test -n "$GCC"; then
-+ case $host_os in
-+ linux*) haveit=yes;;
-+ esac
-+ fi
-+ fi
-+ if test -z "$haveit"; then
-+ haveit=
-+ for x in $LDFLAGS $LIB[]NAME; do
-+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-+ if test "X$x" = "X-L$additional_libdir"; then
-+ haveit=yes
-+ break
-+ fi
-+ done
-+ if test -z "$haveit"; then
-+ if test -d "$additional_libdir"; then
-+ dnl Really add $additional_libdir to $LIBNAME.
-+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
-+ fi
-+ fi
-+ haveit=
-+ for x in $LDFLAGS $LTLIB[]NAME; do
-+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-+ if test "X$x" = "X-L$additional_libdir"; then
-+ haveit=yes
-+ break
-+ fi
-+ done
-+ if test -z "$haveit"; then
-+ if test -d "$additional_libdir"; then
-+ dnl Really add $additional_libdir to $LTLIBNAME.
-+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
-+ fi
-+ fi
-+ fi
-+ fi
-+ ;;
-+ -R*)
-+ dir=`echo "X$dep" | sed -e 's/^X-R//'`
-+ if test "$enable_rpath" != no; then
-+ dnl Potentially add DIR to rpathdirs.
-+ dnl The rpathdirs will be appended to $LIBNAME at the end.
-+ haveit=
-+ for x in $rpathdirs; do
-+ if test "X$x" = "X$dir"; then
-+ haveit=yes
-+ break
-+ fi
-+ done
-+ if test -z "$haveit"; then
-+ rpathdirs="$rpathdirs $dir"
-+ fi
-+ dnl Potentially add DIR to ltrpathdirs.
-+ dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
-+ haveit=
-+ for x in $ltrpathdirs; do
-+ if test "X$x" = "X$dir"; then
-+ haveit=yes
-+ break
-+ fi
-+ done
-+ if test -z "$haveit"; then
-+ ltrpathdirs="$ltrpathdirs $dir"
-+ fi
-+ fi
-+ ;;
-+ -l*)
-+ dnl Handle this in the next round.
-+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
-+ ;;
-+ *.la)
-+ dnl Handle this in the next round. Throw away the .la's
-+ dnl directory; it is already contained in a preceding -L
-+ dnl option.
-+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
-+ ;;
-+ *)
-+ dnl Most likely an immediate library name.
-+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
-+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
-+ ;;
-+ esac
-+ done
-+ fi
-+ else
-+ dnl Didn't find the library; assume it is in the system directories
-+ dnl known to the linker and runtime loader. (All the system
-+ dnl directories known to the linker should also be known to the
-+ dnl runtime loader, otherwise the system is severely misconfigured.)
-+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
-+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
-+ fi
-+ fi
-+ fi
-+ done
-+ done
-+ if test "X$rpathdirs" != "X"; then
-+ if test -n "$hardcode_libdir_separator"; then
-+ dnl Weird platform: only the last -rpath option counts, the user must
-+ dnl pass all path elements in one option. We can arrange that for a
-+ dnl single library, but not when more than one $LIBNAMEs are used.
-+ alldirs=
-+ for found_dir in $rpathdirs; do
-+ alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
-+ done
-+ dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl.
-+ acl_save_libdir="$libdir"
-+ libdir="$alldirs"
-+ eval flag=\"$hardcode_libdir_flag_spec\"
-+ libdir="$acl_save_libdir"
-+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
-+ else
-+ dnl The -rpath options are cumulative.
-+ for found_dir in $rpathdirs; do
-+ acl_save_libdir="$libdir"
-+ libdir="$found_dir"
-+ eval flag=\"$hardcode_libdir_flag_spec\"
-+ libdir="$acl_save_libdir"
-+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
-+ done
-+ fi
-+ fi
-+ if test "X$ltrpathdirs" != "X"; then
-+ dnl When using libtool, the option that works for both libraries and
-+ dnl executables is -R. The -R options are cumulative.
-+ for found_dir in $ltrpathdirs; do
-+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
-+ done
-+ fi
-+])
-+
-+dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
-+dnl unless already present in VAR.
-+dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
-+dnl contains two or three consecutive elements that belong together.
-+AC_DEFUN([AC_LIB_APPENDTOVAR],
-+[
-+ for element in [$2]; do
-+ haveit=
-+ for x in $[$1]; do
-+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-+ if test "X$x" = "X$element"; then
-+ haveit=yes
-+ break
-+ fi
-+ done
-+ if test -z "$haveit"; then
-+ [$1]="${[$1]}${[$1]:+ }$element"
-+ fi
-+ done
-+])
-+
-+# lib-ld.m4 serial 1 (gettext-0.11)
-+dnl Copyright (C) 1996-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License. As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl Subroutines of libtool.m4,
-+dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
-+dnl with libtool.m4.
-+
-+dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
-+AC_DEFUN([AC_LIB_PROG_LD_GNU],
-+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
-+[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-+if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-+ acl_cv_prog_gnu_ld=yes
-+else
-+ acl_cv_prog_gnu_ld=no
-+fi])
-+with_gnu_ld=$acl_cv_prog_gnu_ld
-+])
-+
-+dnl From libtool-1.4. Sets the variable LD.
-+AC_DEFUN([AC_LIB_PROG_LD],
-+[AC_ARG_WITH(gnu-ld,
-+[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
-+test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
-+AC_REQUIRE([AC_PROG_CC])dnl
-+AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+ac_prog=ld
-+if test "$GCC" = yes; then
-+ # Check if gcc -print-prog-name=ld gives a path.
-+ AC_MSG_CHECKING([for ld used by GCC])
-+ case $host in
-+ *-*-mingw*)
-+ # gcc leaves a trailing carriage return which upsets mingw
-+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-+ *)
-+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-+ esac
-+ case $ac_prog in
-+ # Accept absolute paths.
-+ [[\\/]* | [A-Za-z]:[\\/]*)]
-+ [re_direlt='/[^/][^/]*/\.\./']
-+ # Canonicalize the path of ld
-+ ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-+ ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-+ done
-+ test -z "$LD" && LD="$ac_prog"
-+ ;;
-+ "")
-+ # If it fails, then pretend we aren't using GCC.
-+ ac_prog=ld
-+ ;;
-+ *)
-+ # If it is relative, then search for the first ld in PATH.
-+ with_gnu_ld=unknown
-+ ;;
-+ esac
-+elif test "$with_gnu_ld" = yes; then
-+ AC_MSG_CHECKING([for GNU ld])
-+else
-+ AC_MSG_CHECKING([for non-GNU ld])
-+fi
-+AC_CACHE_VAL(acl_cv_path_LD,
-+[if test -z "$LD"; then
-+ 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_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-+ acl_cv_path_LD="$ac_dir/$ac_prog"
-+ # Check to see if the program is GNU ld. I'd rather use --version,
-+ # but apparently some GNU ld's only accept -v.
-+ # Break only if it was the GNU/non-GNU ld that we prefer.
-+ if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-+ test "$with_gnu_ld" != no && break
-+ else
-+ test "$with_gnu_ld" != yes && break
-+ fi
-+ fi
-+ done
-+ IFS="$ac_save_ifs"
-+else
-+ acl_cv_path_LD="$LD" # Let the user override the test with a path.
-+fi])
-+LD="$acl_cv_path_LD"
-+if test -n "$LD"; then
-+ AC_MSG_RESULT($LD)
-+else
-+ AC_MSG_RESULT(no)
-+fi
-+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-+AC_LIB_PROG_LD_GNU
-+])
-+
-+# iconv.m4 serial AM4 (gettext-0.11.3)
-+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License. As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl From Bruno Haible.
-+
-+AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
-+[
-+ dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
-+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-+ AC_REQUIRE([AC_LIB_RPATH])
-+
-+ dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
-+ dnl accordingly.
-+ AC_LIB_LINKFLAGS_BODY([iconv])
-+])
-+
-+AC_DEFUN([AM_ICONV_LINK],
-+[
-+ dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
-+ dnl those with the standalone portable GNU libiconv installed).
-+
-+ dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
-+ dnl accordingly.
-+ AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
-+
-+ dnl Add $INCICONV to CPPFLAGS before performing the following checks,
-+ dnl because if the user has installed libiconv and not disabled its use
-+ dnl via --without-libiconv-prefix, he wants to use it. The first
-+ dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
-+ am_save_CPPFLAGS="$CPPFLAGS"
-+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
-+
-+ AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
-+ am_cv_func_iconv="no, consider installing GNU libiconv"
-+ am_cv_lib_iconv=no
-+ AC_TRY_LINK([#include <stdlib.h>
-+#include <iconv.h>],
-+ [iconv_t cd = iconv_open("","");
-+ iconv(cd,NULL,NULL,NULL,NULL);
-+ iconv_close(cd);],
-+ am_cv_func_iconv=yes)
-+ if test "$am_cv_func_iconv" != yes; then
-+ am_save_LIBS="$LIBS"
-+ LIBS="$LIBS $LIBICONV"
-+ AC_TRY_LINK([#include <stdlib.h>
-+#include <iconv.h>],
-+ [iconv_t cd = iconv_open("","");
-+ iconv(cd,NULL,NULL,NULL,NULL);
-+ iconv_close(cd);],
-+ am_cv_lib_iconv=yes
-+ am_cv_func_iconv=yes)
-+ LIBS="$am_save_LIBS"
-+ fi
-+ ])
-+ if test "$am_cv_func_iconv" = yes; then
-+ AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
-+ fi
-+ if test "$am_cv_lib_iconv" = yes; then
-+ AC_MSG_CHECKING([how to link with libiconv])
-+ AC_MSG_RESULT([$LIBICONV])
-+ else
-+ dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
-+ dnl either.
-+ CPPFLAGS="$am_save_CPPFLAGS"
-+ LIBICONV=
-+ LTLIBICONV=
-+ fi
-+ AC_SUBST(LIBICONV)
-+ AC_SUBST(LTLIBICONV)
-+])
-+
-+AC_DEFUN([AM_ICONV],
-+[
-+ AM_ICONV_LINK
-+ if test "$am_cv_func_iconv" = yes; then
-+ AC_MSG_CHECKING([for iconv declaration])
-+ AC_CACHE_VAL(am_cv_proto_iconv, [
-+ AC_TRY_COMPILE([
-+#include <stdlib.h>
-+#include <iconv.h>
-+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_arg1="", am_cv_proto_iconv_arg1="const")
-+ 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);"])
-+ am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
-+ AC_MSG_RESULT([$]{ac_t:-
-+ }[$]am_cv_proto_iconv)
-+ AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
-+ [Define as const if the declaration of iconv() needs const.])
-+ fi
-+])
-+
-+# progtest.m4 serial 2 (gettext-0.10.40)
-+dnl Copyright (C) 1996-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License. As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+dnl
-+dnl This file can can be used in projects which are not available under
-+dnl the GNU General Public License or the GNU Library General Public
-+dnl License but which still want to provide support for the GNU gettext
-+dnl 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.
-
--AC_SUBST(LIB_CREATE)
--AC_SUBST(LIB_OBJECT)
--AC_SUBST(LIB_SUFFIX)
--AC_SUBST(LIB_PREP)
-+dnl Authors:
-+dnl Ulrich Drepper <drepper@cygnus.com>, 1996.
-
--AC_SUBST(LIB_CLEAN)
--AC_SUBST(LIB_COMPILE)
--AC_SUBST(LIB_LINK)
--AC_SUBST(LIB_INSTALL)
--AC_SUBST(LIB_UNINSTALL)
-+# Search path for a program which passes the given test.
-
-+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.
-+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}:"
-+ for ac_dir in ifelse([$5], , $PATH, [$5]); do
-+ test -z "$ac_dir" && ac_dir=.
-+ if test -f $ac_dir/$ac_word; then
-+ if [$3]; then
-+ ac_cv_path_$1="$ac_dir/$ac_word"
-+ 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
--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: 17 updated: 2005/02/06 12:07:45
--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
--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],[
-+ ;;
-+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
-+])
-
--cf_XOPEN_SOURCE=ifelse($1,,500,$1)
--cf_POSIX_C_SOURCE=ifelse($2,,199506L,$2)
-+# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40)
-+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License. As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+# Test for the GNU C Library, version 2.1 or newer.
-+# From Bruno Haible.
-
--case $host_os in #(vi
--aix[[45]]*) #(vi
-- CPPFLAGS="$CPPFLAGS -D_ALL_SOURCE"
-- ;;
--freebsd*) #(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"
-- ;;
--hpux*) #(vi
-- CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE"
-- ;;
--irix[[56]].*) #(vi
-- CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE"
-- ;;
--linux*|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
-- CPPFLAGS="$CPPFLAGS -D_OSF_SOURCE"
-- ;;
--sco*) #(vi
-- # setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer
-- ;;
--solaris*) #(vi
-- CPPFLAGS="$CPPFLAGS -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"
-- ])
--])
--test "$cf_cv_xopen_source" != no && CPPFLAGS="$CPPFLAGS -U_XOPEN_SOURCE -D_XOPEN_SOURCE=$cf_cv_xopen_source"
-- CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE)
-- ;;
--esac
--])
--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,
-@@ -2781,3 +3777,307 @@
- GLIBC21="$ac_cv_gnu_library_2_1"
- ]
- )
-+
-+# intdiv0.m4 serial 1 (gettext-0.11.3)
-+dnl Copyright (C) 2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License. As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl From Bruno Haible.
-+
-+AC_DEFUN([gt_INTDIV0],
-+[
-+ AC_REQUIRE([AC_PROG_CC])dnl
-+ AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+
-+ AC_CACHE_CHECK([whether integer division by zero raises SIGFPE],
-+ gt_cv_int_divbyzero_sigfpe,
-+ [
-+ AC_TRY_RUN([
-+#include <stdlib.h>
-+#include <signal.h>
-+
-+static void
-+#ifdef __cplusplus
-+sigfpe_handler (int sig)
-+#else
-+sigfpe_handler (sig) int sig;
-+#endif
-+{
-+ /* Exit with code 0 if SIGFPE, with code 1 if any other signal. */
-+ exit (sig != SIGFPE);
-+}
-+
-+int x = 1;
-+int y = 0;
-+int z;
-+int nan;
-+
-+int main ()
-+{
-+ signal (SIGFPE, sigfpe_handler);
-+/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP. */
-+#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP)
-+ signal (SIGTRAP, sigfpe_handler);
-+#endif
-+/* Linux/SPARC yields signal SIGILL. */
-+#if defined (__sparc__) && defined (__linux__)
-+ signal (SIGILL, sigfpe_handler);
-+#endif
-+
-+ z = x / y;
-+ nan = y / y;
-+ exit (1);
-+}
-+], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no,
-+ [
-+ # Guess based on the CPU.
-+ case "$host_cpu" in
-+ alpha* | i[34567]86 | m68k | s390*)
-+ gt_cv_int_divbyzero_sigfpe="guessing yes";;
-+ *)
-+ gt_cv_int_divbyzero_sigfpe="guessing no";;
-+ esac
-+ ])
-+ ])
-+ case "$gt_cv_int_divbyzero_sigfpe" in
-+ *yes) value=1;;
-+ *) value=0;;
-+ esac
-+ AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value,
-+ [Define if integer division by zero raises signal SIGFPE.])
-+])
-+
-+# uintmax_t.m4 serial 6 (gettext-0.11)
-+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License. As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl From Paul Eggert.
-+
-+AC_PREREQ(2.13)
-+
-+# Define uintmax_t to `unsigned long' or `unsigned long long'
-+# if <inttypes.h> does not exist.
-+
-+AC_DEFUN([jm_AC_TYPE_UINTMAX_T],
-+[
-+ AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
-+ AC_REQUIRE([jm_AC_HEADER_STDINT_H])
-+ if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then
-+ AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG])
-+ test $ac_cv_type_unsigned_long_long = yes \
-+ && ac_type='unsigned long long' \
-+ || ac_type='unsigned long'
-+ AC_DEFINE_UNQUOTED(uintmax_t, $ac_type,
-+ [Define to unsigned long or unsigned long long
-+ if <inttypes.h> and <stdint.h> don't define.])
-+ fi
-+])
-+
-+# inttypes_h.m4 serial 4 (gettext-0.11.4)
-+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License. As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl From Paul Eggert.
-+
-+# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists,
-+# doesn't clash with <sys/types.h>, and declares uintmax_t.
-+
-+AC_DEFUN([jm_AC_HEADER_INTTYPES_H],
-+[
-+ AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h,
-+ [AC_TRY_COMPILE(
-+ [#include <sys/types.h>
-+#include <inttypes.h>],
-+ [uintmax_t i = (uintmax_t) -1;],
-+ jm_ac_cv_header_inttypes_h=yes,
-+ jm_ac_cv_header_inttypes_h=no)])
-+ if test $jm_ac_cv_header_inttypes_h = yes; then
-+ AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1,
-+[Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
-+ and declares uintmax_t. ])
-+ fi
-+])
-+
-+# stdint_h.m4 serial 2 (gettext-0.11.4)
-+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License. As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl From Paul Eggert.
-+
-+# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists,
-+# doesn't clash with <sys/types.h>, and declares uintmax_t.
-+
-+AC_DEFUN([jm_AC_HEADER_STDINT_H],
-+[
-+ AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h,
-+ [AC_TRY_COMPILE(
-+ [#include <sys/types.h>
-+#include <stdint.h>],
-+ [uintmax_t i = (uintmax_t) -1;],
-+ jm_ac_cv_header_stdint_h=yes,
-+ jm_ac_cv_header_stdint_h=no)])
-+ if test $jm_ac_cv_header_stdint_h = yes; then
-+ AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1,
-+[Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
-+ and declares uintmax_t. ])
-+ fi
-+])
-+
-+# ulonglong.m4 serial 2 (fileutils-4.0.32, gettext-0.10.40)
-+dnl Copyright (C) 1999-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License. As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl From Paul Eggert.
-+
-+AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG],
-+[
-+ AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long,
-+ [AC_TRY_LINK([unsigned long long ull = 1; int i = 63;],
-+ [unsigned long long ullmax = (unsigned long long) -1;
-+ return ull << i | ull >> i | ullmax / ull | ullmax % ull;],
-+ ac_cv_type_unsigned_long_long=yes,
-+ ac_cv_type_unsigned_long_long=no)])
-+ if test $ac_cv_type_unsigned_long_long = yes; then
-+ AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1,
-+ [Define if you have the unsigned long long type.])
-+ fi
-+])
-+
-+# inttypes.m4 serial 1 (gettext-0.11.4)
-+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License. As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl From Paul Eggert.
-+
-+# Define HAVE_INTTYPES_H if <inttypes.h> exists and doesn't clash with
-+# <sys/types.h>.
-+
-+AC_DEFUN([gt_HEADER_INTTYPES_H],
-+[
-+ AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h,
-+ [
-+ AC_TRY_COMPILE(
-+ [#include <sys/types.h>
-+#include <inttypes.h>],
-+ [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no)
-+ ])
-+ if test $gt_cv_header_inttypes_h = yes; then
-+ AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1,
-+ [Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.])
-+ fi
-+])
-+
-+# inttypes-pri.m4 serial 1 (gettext-0.11.4)
-+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License. As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl From Bruno Haible.
-+
-+# Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
-+# macros to non-string values. This is the case on AIX 4.3.3.
-+
-+AC_DEFUN([gt_INTTYPES_PRI],
-+[
-+ AC_REQUIRE([gt_HEADER_INTTYPES_H])
-+ if test $gt_cv_header_inttypes_h = yes; then
-+ AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
-+ gt_cv_inttypes_pri_broken,
-+ [
-+ AC_TRY_COMPILE([#include <inttypes.h>
-+#ifdef PRId32
-+char *p = PRId32;
-+#endif
-+], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes)
-+ ])
-+ fi
-+ if test "$gt_cv_inttypes_pri_broken" = yes; then
-+ AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1,
-+ [Define if <inttypes.h> exists and defines unusable PRI* macros.])
-+ fi
-+])
-+
-+# codeset.m4 serial AM1 (gettext-0.10.40)
-+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License. As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+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
-+])
-+
-+# lcmessage.m4 serial 3 (gettext-0.11.3)
-+dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License. As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+dnl
-+dnl This file can can be used in projects which are not available under
-+dnl the GNU General Public License or the GNU Library General Public
-+dnl License but which still want to provide support for the GNU gettext
-+dnl 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 Authors:
-+dnl Ulrich Drepper <drepper@cygnus.com>, 1995.
-+
-+# Check whether LC_MESSAGES is available in <locale.h>.
-+
-+AC_DEFUN([AM_LC_MESSAGES],
-+[
-+ 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
-+])
-+
-Index: dialog-1.0-20050306/m4/codeset.m4
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ dialog-1.0-20050306/m4/codeset.m4 2005-05-16 01:32:07.000000000 +0200
-@@ -0,0 +1,23 @@
-+# codeset.m4 serial AM1 (gettext-0.10.40)
-+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License. As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+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
-+])
-Index: dialog-1.0-20050306/m4/gettext.m4
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ dialog-1.0-20050306/m4/gettext.m4 2005-05-16 01:32:07.000000000 +0200
-@@ -0,0 +1,587 @@
-+# gettext.m4 serial 17 (gettext-0.11.5)
-+dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License. As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+dnl
-+dnl This file can can be used in projects which are not available under
-+dnl the GNU General Public License or the GNU Library General Public
-+dnl License but which still want to provide support for the GNU gettext
-+dnl 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 Authors:
-+dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-+dnl Bruno Haible <haible@clisp.cons.org>, 2000-2002.
-+
-+dnl Macro to add for using GNU gettext.
-+
-+dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
-+dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The
-+dnl default (if it is not specified or empty) is 'no-libtool'.
-+dnl INTLSYMBOL should be 'external' for packages with no intl directory,
-+dnl and 'no-libtool' or 'use-libtool' for packages with an intl directory.
-+dnl If INTLSYMBOL 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). If INTLSYMBOL is 'no-libtool', 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. If NEEDSYMBOL is specified and is
-+dnl 'need-formatstring-macros', then GNU gettext implementations that don't
-+dnl support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
-+dnl INTLDIR is used to find the intl libraries. If empty,
-+dnl the value `$(top_builddir)/intl/' is used.
-+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 If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
-+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_GNU_GETTEXT],
-+[
-+ dnl Argument checking.
-+ ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
-+ [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
-+])])])])])
-+ ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
-+ [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
-+])])])])
-+ define(gt_included_intl, ifelse([$1], [external], [no], [yes]))
-+ define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], []))
-+
-+ AC_REQUIRE([AM_PO_SUBDIRS])dnl
-+ ifelse(gt_included_intl, yes, [
-+ AC_REQUIRE([AM_INTL_SUBDIR])dnl
-+ ])
-+
-+ dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
-+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-+ AC_REQUIRE([AC_LIB_RPATH])
-+
-+ dnl Sometimes libintl requires libiconv, so first search for libiconv.
-+ dnl Ideally we would do this search only after the
-+ dnl if test "$USE_NLS" = "yes"; then
-+ dnl if test "$gt_cv_func_gnugettext_libc" != "yes"; then
-+ dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
-+ dnl the configure script would need to contain the same shell code
-+ dnl again, outside any 'if'. There are two solutions:
-+ dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
-+ dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
-+ dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
-+ dnl documented, we avoid it.
-+ ifelse(gt_included_intl, yes, , [
-+ AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
-+ ])
-+
-+ AC_MSG_CHECKING([whether NLS is requested])
-+ dnl Default is enabled NLS
-+ AC_ARG_ENABLE(nls,
-+ [ --disable-nls do not use Native Language Support],
-+ USE_NLS=$enableval, USE_NLS=yes)
-+ AC_MSG_RESULT($USE_NLS)
-+ AC_SUBST(USE_NLS)
-+
-+ ifelse(gt_included_intl, yes, [
-+ BUILD_INCLUDED_LIBINTL=no
-+ USE_INCLUDED_LIBINTL=no
-+ ])
-+ LIBINTL=
-+ LTLIBINTL=
-+ POSUB=
-+
-+ dnl If we use NLS figure out what method
-+ if test "$USE_NLS" = "yes"; then
-+ gt_use_preinstalled_gnugettext=no
-+ ifelse(gt_included_intl, yes, [
-+ 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.
-+
-+ dnl Add a version number to the cache macros.
-+ define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1)))
-+ define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc])
-+ define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl])
-+
-+ AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
-+ [AC_TRY_LINK([#include <libintl.h>
-+]ifelse([$2], [need-formatstring-macros],
-+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-+#endif
-+changequote(,)dnl
-+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-+changequote([,])dnl
-+], [])[extern int _nl_msg_cat_cntr;
-+extern int *_nl_domain_bindings;],
-+ [bindtextdomain ("", "");
-+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
-+ gt_cv_func_gnugettext_libc=yes,
-+ gt_cv_func_gnugettext_libc=no)])
-+
-+ if test "$gt_cv_func_gnugettext_libc" != "yes"; then
-+ dnl Sometimes libintl requires libiconv, so first search for libiconv.
-+ ifelse(gt_included_intl, yes, , [
-+ AM_ICONV_LINK
-+ ])
-+ dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
-+ dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
-+ dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
-+ dnl even if libiconv doesn't exist.
-+ AC_LIB_LINKFLAGS_BODY([intl])
-+ AC_CACHE_CHECK([for GNU gettext in libintl],
-+ gt_cv_func_gnugettext_libintl,
-+ [gt_save_CPPFLAGS="$CPPFLAGS"
-+ CPPFLAGS="$CPPFLAGS $INCINTL"
-+ gt_save_LIBS="$LIBS"
-+ LIBS="$LIBS $LIBINTL"
-+ dnl Now see whether libintl exists and does not depend on libiconv.
-+ AC_TRY_LINK([#include <libintl.h>
-+]ifelse([$2], [need-formatstring-macros],
-+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-+#endif
-+changequote(,)dnl
-+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-+changequote([,])dnl
-+], [])[extern int _nl_msg_cat_cntr;
-+extern
-+#ifdef __cplusplus
-+"C"
-+#endif
-+const char *_nl_expand_alias ();],
-+ [bindtextdomain ("", "");
-+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
-+ gt_cv_func_gnugettext_libintl=yes,
-+ gt_cv_func_gnugettext_libintl=no)
-+ dnl Now see whether libintl exists and depends on libiconv.
-+ if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then
-+ LIBS="$LIBS $LIBICONV"
-+ AC_TRY_LINK([#include <libintl.h>
-+]ifelse([$2], [need-formatstring-macros],
-+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-+#endif
-+changequote(,)dnl
-+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-+changequote([,])dnl
-+], [])[extern int _nl_msg_cat_cntr;
-+extern
-+#ifdef __cplusplus
-+"C"
-+#endif
-+const char *_nl_expand_alias ();],
-+ [bindtextdomain ("", "");
-+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
-+ [LIBINTL="$LIBINTL $LIBICONV"
-+ LTLIBINTL="$LTLIBINTL $LTLIBICONV"
-+ gt_cv_func_gnugettext_libintl=yes
-+ ])
-+ fi
-+ CPPFLAGS="$gt_save_CPPFLAGS"
-+ LIBS="$gt_save_LIBS"])
-+ fi
-+
-+ 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 "$gt_cv_func_gnugettext_libc" = "yes" \
-+ || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
-+ && test "$PACKAGE" != gettext; }; then
-+ gt_use_preinstalled_gnugettext=yes
-+ else
-+ dnl Reset the values set by searching for libintl.
-+ LIBINTL=
-+ LTLIBINTL=
-+ INCINTL=
-+ fi
-+
-+ ifelse(gt_included_intl, yes, [
-+ if test "$gt_use_preinstalled_gnugettext" != "yes"; then
-+ dnl GNU gettext is not found in the C library.
-+ dnl Fall back on included GNU gettext library.
-+ nls_cv_use_gnu_gettext=yes
-+ fi
-+ fi
-+
-+ if test "$nls_cv_use_gnu_gettext" = "yes"; then
-+ dnl Mark actions used to generate GNU NLS library.
-+ INTLOBJS="\$(GETTOBJS)"
-+ BUILD_INCLUDED_LIBINTL=yes
-+ USE_INCLUDED_LIBINTL=yes
-+ LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV"
-+ LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV"
-+ LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
-+ fi
-+
-+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
-+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
-+ dnl Mark actions to use GNU gettext tools.
-+ CATOBJEXT=.gmo
-+ fi
-+ ])
-+
-+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
-+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
-+ AC_DEFINE(ENABLE_NLS, 1,
-+ [Define to 1 if translation of program messages to the user's native language
-+ is requested.])
-+ else
-+ USE_NLS=no
-+ fi
-+ fi
-+
-+ if test "$USE_NLS" = "yes"; then
-+
-+ if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-+ if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
-+ AC_MSG_CHECKING([how to link with libintl])
-+ AC_MSG_RESULT([$LIBINTL])
-+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
-+ fi
-+
-+ dnl For backward compatibility. Some packages may be using this.
-+ AC_DEFINE(HAVE_GETTEXT, 1,
-+ [Define if the GNU gettext() function is already present or preinstalled.])
-+ AC_DEFINE(HAVE_DCGETTEXT, 1,
-+ [Define if the GNU dcgettext() function is already present or preinstalled.])
-+ fi
-+
-+ dnl We need to process the po/ directory.
-+ POSUB=po
-+ fi
-+
-+ ifelse(gt_included_intl, yes, [
-+ 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 Make all variables we use known to autoconf.
-+ AC_SUBST(BUILD_INCLUDED_LIBINTL)
-+ AC_SUBST(USE_INCLUDED_LIBINTL)
-+ AC_SUBST(CATOBJEXT)
-+ AC_SUBST(INTLOBJS)
-+
-+ 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 Enable libtool support if the surrounding package wishes it.
-+ INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
-+ AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
-+ ])
-+
-+ dnl For backward compatibility. Some Makefiles may be using this.
-+ INTLLIBS="$LIBINTL"
-+ AC_SUBST(INTLLIBS)
-+
-+ dnl Make all documented variables known to autoconf.
-+ AC_SUBST(LIBINTL)
-+ AC_SUBST(LTLIBINTL)
-+ AC_SUBST(POSUB)
-+])
-+
-+
-+dnl Checks for all prerequisites of the po subdirectory,
-+dnl except for USE_NLS.
-+AC_DEFUN([AM_PO_SUBDIRS],
-+[
-+ AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-+ AC_REQUIRE([AC_PROG_INSTALL])dnl
-+ AC_REQUIRE([AM_MKINSTALLDIRS])dnl
-+
-+ dnl Perform the following tests also if --disable-nls has been given,
-+ dnl because they are needed for "make dist" to work.
-+
-+ dnl Search for GNU msgfmt in the PATH.
-+ dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
-+ dnl The second test excludes FreeBSD msgfmt.
-+ AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-+ [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
-+ (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
-+ :)
-+ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-+
-+ dnl Search for GNU xgettext 0.11 or newer in the PATH.
-+ dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
-+ dnl The second test excludes FreeBSD xgettext.
-+ AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-+ [$ac_dir/$ac_word --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
-+ (if $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
-+ :)
-+ dnl Remove leftover from FreeBSD xgettext call.
-+ rm -f messages.po
-+
-+ dnl Search for GNU msgmerge 0.11 or newer in the PATH.
-+ AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
-+ [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :)
-+
-+ 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 &&
-+ (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-+ : ;
-+ else
-+ GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
-+ AC_MSG_RESULT(
-+ [found $GMSGFMT 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 --copyright-holder= /dev/null >/dev/null 2>&1 &&
-+ (if $XGETTEXT --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-+ : ;
-+ else
-+ AC_MSG_RESULT(
-+ [found xgettext program is not GNU xgettext; ignore it])
-+ XGETTEXT=":"
-+ fi
-+ dnl Remove leftover from FreeBSD xgettext call.
-+ rm -f messages.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.in.in.
-+ case "$ac_file" in */Makefile.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'`
-+ # 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"
-+ cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
-+ # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend
-+ # on $ac_dir but don't depend on user-specified configuration
-+ # parameters.
-+ if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
-+ # The LINGUAS file contains the set of available languages.
-+ if test -n "$ALL_LINGUAS"; then
-+ test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
-+ fi
-+ ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-+ # Hide the ALL_LINGUAS assigment from automake.
-+ eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
-+ fi
-+ case "$ac_given_srcdir" in
-+ .) srcdirpre= ;;
-+ *) srcdirpre='$(srcdir)/' ;;
-+ esac
-+ POFILES=
-+ GMOFILES=
-+ UPDATEPOFILES=
-+ DUMMYPOFILES=
-+ for lang in $ALL_LINGUAS; do
-+ POFILES="$POFILES $srcdirpre$lang.po"
-+ GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
-+ UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
-+ DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
-+ done
-+ # CATALOGS depends on both $ac_dir and the user's LINGUAS
-+ # environment variable.
-+ INST_LINGUAS=
-+ if test -n "$ALL_LINGUAS"; then
-+ for presentlang in $ALL_LINGUAS; do
-+ useit=no
-+ if test "%UNSET%" != "$LINGUAS"; then
-+ desiredlanguages="$LINGUAS"
-+ else
-+ desiredlanguages="$ALL_LINGUAS"
-+ fi
-+ for desiredlang in $desiredlanguages; 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
-+ INST_LINGUAS="$INST_LINGUAS $presentlang"
-+ fi
-+ done
-+ fi
-+ CATALOGS=
-+ if test -n "$INST_LINGUAS"; then
-+ for lang in $INST_LINGUAS; do
-+ CATALOGS="$CATALOGS $lang.gmo"
-+ done
-+ fi
-+ test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
-+ sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
-+ for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
-+ if test -f "$f"; then
-+ case "$f" in
-+ *.orig | *.bak | *~) ;;
-+ *) cat "$f" >> "$ac_dir/Makefile" ;;
-+ esac
-+ fi
-+ done
-+ fi
-+ ;;
-+ esac
-+ done],
-+ [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
-+ # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it
-+ # from automake.
-+ eval 'ALL_LINGUAS''="$ALL_LINGUAS"'
-+ # Capture the value of LINGUAS because we need it to compute CATALOGS.
-+ LINGUAS="${LINGUAS-%UNSET%}"
-+ ])
-+])
-+
-+
-+dnl Checks for all prerequisites of the intl subdirectory,
-+dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
-+dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
-+AC_DEFUN([AM_INTL_SUBDIR],
-+[
-+ AC_REQUIRE([AC_PROG_INSTALL])dnl
-+ AC_REQUIRE([AM_MKINSTALLDIRS])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_REQUIRE([gt_INTDIV0])dnl
-+ AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl
-+ AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
-+ AC_REQUIRE([gt_INTTYPES_PRI])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 getc_unlocked getcwd getegid \
-+geteuid getgid getuid mempcpy munmap putenv setenv setlocale stpcpy \
-+strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
-+
-+ AM_ICONV
-+ AM_LANGINFO_CODESET
-+ if test $ac_cv_header_locale_h = yes; then
-+ AM_LC_MESSAGES
-+ 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.
-+ 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
-+])
-+
-+
-+AC_DEFUN([AM_MKINSTALLDIRS],
-+[
-+ 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 is.
-+ MKINSTALLDIRS=
-+ if test -n "$ac_aux_dir"; then
-+ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
-+ fi
-+ if test -z "$MKINSTALLDIRS"; then
-+ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-+ fi
-+ AC_SUBST(MKINSTALLDIRS)
-+])
-+
-+
-+dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
-+AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
-Index: dialog-1.0-20050306/m4/glibc21.m4
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ dialog-1.0-20050306/m4/glibc21.m4 2005-05-16 01:32:07.000000000 +0200
-@@ -0,0 +1,32 @@
-+# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40)
-+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License. As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+# Test for the GNU C Library, version 2.1 or newer.
-+# 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"
-+ ]
-+)
-Index: dialog-1.0-20050306/m4/iconv.m4
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ dialog-1.0-20050306/m4/iconv.m4 2005-05-16 01:32:07.000000000 +0200
-@@ -0,0 +1,103 @@
-+# iconv.m4 serial AM4 (gettext-0.11.3)
-+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License. As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl From Bruno Haible.
-+
-+AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
-+[
-+ dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
-+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-+ AC_REQUIRE([AC_LIB_RPATH])
-+
-+ dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
-+ dnl accordingly.
-+ AC_LIB_LINKFLAGS_BODY([iconv])
-+])
-+
-+AC_DEFUN([AM_ICONV_LINK],
-+[
-+ dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
-+ dnl those with the standalone portable GNU libiconv installed).
-+
-+ dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
-+ dnl accordingly.
-+ AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
-+
-+ dnl Add $INCICONV to CPPFLAGS before performing the following checks,
-+ dnl because if the user has installed libiconv and not disabled its use
-+ dnl via --without-libiconv-prefix, he wants to use it. The first
-+ dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
-+ am_save_CPPFLAGS="$CPPFLAGS"
-+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
-+
-+ AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
-+ am_cv_func_iconv="no, consider installing GNU libiconv"
-+ am_cv_lib_iconv=no
-+ AC_TRY_LINK([#include <stdlib.h>
-+#include <iconv.h>],
-+ [iconv_t cd = iconv_open("","");
-+ iconv(cd,NULL,NULL,NULL,NULL);
-+ iconv_close(cd);],
-+ am_cv_func_iconv=yes)
-+ if test "$am_cv_func_iconv" != yes; then
-+ am_save_LIBS="$LIBS"
-+ LIBS="$LIBS $LIBICONV"
-+ AC_TRY_LINK([#include <stdlib.h>
-+#include <iconv.h>],
-+ [iconv_t cd = iconv_open("","");
-+ iconv(cd,NULL,NULL,NULL,NULL);
-+ iconv_close(cd);],
-+ am_cv_lib_iconv=yes
-+ am_cv_func_iconv=yes)
-+ LIBS="$am_save_LIBS"
-+ fi
-+ ])
-+ if test "$am_cv_func_iconv" = yes; then
-+ AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
-+ fi
-+ if test "$am_cv_lib_iconv" = yes; then
-+ AC_MSG_CHECKING([how to link with libiconv])
-+ AC_MSG_RESULT([$LIBICONV])
-+ else
-+ dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
-+ dnl either.
-+ CPPFLAGS="$am_save_CPPFLAGS"
-+ LIBICONV=
-+ LTLIBICONV=
-+ fi
-+ AC_SUBST(LIBICONV)
-+ AC_SUBST(LTLIBICONV)
-+])
-+
-+AC_DEFUN([AM_ICONV],
-+[
-+ AM_ICONV_LINK
-+ if test "$am_cv_func_iconv" = yes; then
-+ AC_MSG_CHECKING([for iconv declaration])
-+ AC_CACHE_VAL(am_cv_proto_iconv, [
-+ AC_TRY_COMPILE([
-+#include <stdlib.h>
-+#include <iconv.h>
-+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_arg1="", am_cv_proto_iconv_arg1="const")
-+ 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);"])
-+ am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
-+ AC_MSG_RESULT([$]{ac_t:-
-+ }[$]am_cv_proto_iconv)
-+ AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
-+ [Define as const if the declaration of iconv() needs const.])
-+ fi
-+])
-Index: dialog-1.0-20050306/m4/intdiv0.m4
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ dialog-1.0-20050306/m4/intdiv0.m4 2005-05-16 01:32:07.000000000 +0200
-@@ -0,0 +1,72 @@
-+# intdiv0.m4 serial 1 (gettext-0.11.3)
-+dnl Copyright (C) 2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License. As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl From Bruno Haible.
-+
-+AC_DEFUN([gt_INTDIV0],
-+[
-+ AC_REQUIRE([AC_PROG_CC])dnl
-+ AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+
-+ AC_CACHE_CHECK([whether integer division by zero raises SIGFPE],
-+ gt_cv_int_divbyzero_sigfpe,
-+ [
-+ AC_TRY_RUN([
-+#include <stdlib.h>
-+#include <signal.h>
-+
-+static void
-+#ifdef __cplusplus
-+sigfpe_handler (int sig)
-+#else
-+sigfpe_handler (sig) int sig;
-+#endif
-+{
-+ /* Exit with code 0 if SIGFPE, with code 1 if any other signal. */
-+ exit (sig != SIGFPE);
-+}
-+
-+int x = 1;
-+int y = 0;
-+int z;
-+int nan;
-+
-+int main ()
-+{
-+ signal (SIGFPE, sigfpe_handler);
-+/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP. */
-+#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP)
-+ signal (SIGTRAP, sigfpe_handler);
-+#endif
-+/* Linux/SPARC yields signal SIGILL. */
-+#if defined (__sparc__) && defined (__linux__)
-+ signal (SIGILL, sigfpe_handler);
-+#endif
-+
-+ z = x / y;
-+ nan = y / y;
-+ exit (1);
-+}
-+], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no,
-+ [
-+ # Guess based on the CPU.
-+ case "$host_cpu" in
-+ alpha* | i[34567]86 | m68k | s390*)
-+ gt_cv_int_divbyzero_sigfpe="guessing yes";;
-+ *)
-+ gt_cv_int_divbyzero_sigfpe="guessing no";;
-+ esac
-+ ])
-+ ])
-+ case "$gt_cv_int_divbyzero_sigfpe" in
-+ *yes) value=1;;
-+ *) value=0;;
-+ esac
-+ AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value,
-+ [Define if integer division by zero raises signal SIGFPE.])
-+])
-Index: dialog-1.0-20050306/m4/inttypes-pri.m4
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ dialog-1.0-20050306/m4/inttypes-pri.m4 2005-05-16 01:32:07.000000000 +0200
-@@ -0,0 +1,32 @@
-+# inttypes-pri.m4 serial 1 (gettext-0.11.4)
-+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License. As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl From Bruno Haible.
-+
-+# Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
-+# macros to non-string values. This is the case on AIX 4.3.3.
-+
-+AC_DEFUN([gt_INTTYPES_PRI],
-+[
-+ AC_REQUIRE([gt_HEADER_INTTYPES_H])
-+ if test $gt_cv_header_inttypes_h = yes; then
-+ AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
-+ gt_cv_inttypes_pri_broken,
-+ [
-+ AC_TRY_COMPILE([#include <inttypes.h>
-+#ifdef PRId32
-+char *p = PRId32;
-+#endif
-+], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes)
-+ ])
-+ fi
-+ if test "$gt_cv_inttypes_pri_broken" = yes; then
-+ AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1,
-+ [Define if <inttypes.h> exists and defines unusable PRI* macros.])
-+ fi
-+])
-Index: dialog-1.0-20050306/m4/inttypes.m4
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ dialog-1.0-20050306/m4/inttypes.m4 2005-05-16 01:32:07.000000000 +0200
-@@ -0,0 +1,27 @@
-+# inttypes.m4 serial 1 (gettext-0.11.4)
-+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License. As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl From Paul Eggert.
-+
-+# Define HAVE_INTTYPES_H if <inttypes.h> exists and doesn't clash with
-+# <sys/types.h>.
-+
-+AC_DEFUN([gt_HEADER_INTTYPES_H],
-+[
-+ AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h,
-+ [
-+ AC_TRY_COMPILE(
-+ [#include <sys/types.h>
-+#include <inttypes.h>],
-+ [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no)
-+ ])
-+ if test $gt_cv_header_inttypes_h = yes; then
-+ AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1,
-+ [Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.])
-+ fi
-+])
-Index: dialog-1.0-20050306/m4/inttypes_h.m4
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ dialog-1.0-20050306/m4/inttypes_h.m4 2005-05-16 01:32:07.000000000 +0200
-@@ -0,0 +1,28 @@
-+# inttypes_h.m4 serial 4 (gettext-0.11.4)
-+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License. As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl From Paul Eggert.
-+
-+# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists,
-+# doesn't clash with <sys/types.h>, and declares uintmax_t.
-+
-+AC_DEFUN([jm_AC_HEADER_INTTYPES_H],
-+[
-+ AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h,
-+ [AC_TRY_COMPILE(
-+ [#include <sys/types.h>
-+#include <inttypes.h>],
-+ [uintmax_t i = (uintmax_t) -1;],
-+ jm_ac_cv_header_inttypes_h=yes,
-+ jm_ac_cv_header_inttypes_h=no)])
-+ if test $jm_ac_cv_header_inttypes_h = yes; then
-+ AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1,
-+[Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
-+ and declares uintmax_t. ])
-+ fi
-+])
-Index: dialog-1.0-20050306/m4/lcmessage.m4
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ dialog-1.0-20050306/m4/lcmessage.m4 2005-05-16 01:32:07.000000000 +0200
-@@ -0,0 +1,32 @@
-+# lcmessage.m4 serial 3 (gettext-0.11.3)
-+dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License. As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+dnl
-+dnl This file can can be used in projects which are not available under
-+dnl the GNU General Public License or the GNU Library General Public
-+dnl License but which still want to provide support for the GNU gettext
-+dnl 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 Authors:
-+dnl Ulrich Drepper <drepper@cygnus.com>, 1995.
-+
-+# Check whether LC_MESSAGES is available in <locale.h>.
-+
-+AC_DEFUN([AM_LC_MESSAGES],
-+[
-+ 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
-+])
-Index: dialog-1.0-20050306/m4/lib-ld.m4
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ dialog-1.0-20050306/m4/lib-ld.m4 2005-05-16 01:32:07.000000000 +0200
-@@ -0,0 +1,97 @@
-+# lib-ld.m4 serial 1 (gettext-0.11)
-+dnl Copyright (C) 1996-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License. As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl Subroutines of libtool.m4,
-+dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
-+dnl with libtool.m4.
-+
-+dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
-+AC_DEFUN([AC_LIB_PROG_LD_GNU],
-+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
-+[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-+if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-+ acl_cv_prog_gnu_ld=yes
-+else
-+ acl_cv_prog_gnu_ld=no
-+fi])
-+with_gnu_ld=$acl_cv_prog_gnu_ld
-+])
-+
-+dnl From libtool-1.4. Sets the variable LD.
-+AC_DEFUN([AC_LIB_PROG_LD],
-+[AC_ARG_WITH(gnu-ld,
-+[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
-+test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
-+AC_REQUIRE([AC_PROG_CC])dnl
-+AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+ac_prog=ld
-+if test "$GCC" = yes; then
-+ # Check if gcc -print-prog-name=ld gives a path.
-+ AC_MSG_CHECKING([for ld used by GCC])
-+ case $host in
-+ *-*-mingw*)
-+ # gcc leaves a trailing carriage return which upsets mingw
-+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-+ *)
-+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-+ esac
-+ case $ac_prog in
-+ # Accept absolute paths.
-+ [[\\/]* | [A-Za-z]:[\\/]*)]
-+ [re_direlt='/[^/][^/]*/\.\./']
-+ # Canonicalize the path of ld
-+ ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-+ ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-+ done
-+ test -z "$LD" && LD="$ac_prog"
-+ ;;
-+ "")
-+ # If it fails, then pretend we aren't using GCC.
-+ ac_prog=ld
-+ ;;
-+ *)
-+ # If it is relative, then search for the first ld in PATH.
-+ with_gnu_ld=unknown
-+ ;;
-+ esac
-+elif test "$with_gnu_ld" = yes; then
-+ AC_MSG_CHECKING([for GNU ld])
-+else
-+ AC_MSG_CHECKING([for non-GNU ld])
-+fi
-+AC_CACHE_VAL(acl_cv_path_LD,
-+[if test -z "$LD"; then
-+ 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_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-+ acl_cv_path_LD="$ac_dir/$ac_prog"
-+ # Check to see if the program is GNU ld. I'd rather use --version,
-+ # but apparently some GNU ld's only accept -v.
-+ # Break only if it was the GNU/non-GNU ld that we prefer.
-+ if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-+ test "$with_gnu_ld" != no && break
-+ else
-+ test "$with_gnu_ld" != yes && break
-+ fi
-+ fi
-+ done
-+ IFS="$ac_save_ifs"
-+else
-+ acl_cv_path_LD="$LD" # Let the user override the test with a path.
-+fi])
-+LD="$acl_cv_path_LD"
-+if test -n "$LD"; then
-+ AC_MSG_RESULT($LD)
-+else
-+ AC_MSG_RESULT(no)
-+fi
-+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-+AC_LIB_PROG_LD_GNU
-+])
-Index: dialog-1.0-20050306/m4/lib-link.m4
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ dialog-1.0-20050306/m4/lib-link.m4 2005-05-16 01:32:07.000000000 +0200
-@@ -0,0 +1,554 @@
-+# lib-link.m4 serial 3 (gettext-0.11.3)
-+dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License. As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl From Bruno Haible.
-+
-+dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
-+dnl the libraries corresponding to explicit and implicit dependencies.
-+dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
-+dnl augments the CPPFLAGS variable.
-+AC_DEFUN([AC_LIB_LINKFLAGS],
-+[
-+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-+ AC_REQUIRE([AC_LIB_RPATH])
-+ define([Name],[translit([$1],[./-], [___])])
-+ define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
-+ AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
-+ AC_LIB_LINKFLAGS_BODY([$1], [$2])
-+ ac_cv_lib[]Name[]_libs="$LIB[]NAME"
-+ ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
-+ ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
-+ ])
-+ LIB[]NAME="$ac_cv_lib[]Name[]_libs"
-+ LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
-+ INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
-+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
-+ AC_SUBST([LIB]NAME)
-+ AC_SUBST([LTLIB]NAME)
-+ dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
-+ dnl results of this search when this library appears as a dependency.
-+ HAVE_LIB[]NAME=yes
-+ undefine([Name])
-+ undefine([NAME])
-+])
-+
-+dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
-+dnl searches for libname and the libraries corresponding to explicit and
-+dnl implicit dependencies, together with the specified include files and
-+dnl the ability to compile and link the specified testcode. If found, it
-+dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
-+dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
-+dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
-+dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
-+AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
-+[
-+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-+ AC_REQUIRE([AC_LIB_RPATH])
-+ define([Name],[translit([$1],[./-], [___])])
-+ define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
-+
-+ dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
-+ dnl accordingly.
-+ AC_LIB_LINKFLAGS_BODY([$1], [$2])
-+
-+ dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
-+ dnl because if the user has installed lib[]Name and not disabled its use
-+ dnl via --without-lib[]Name-prefix, he wants to use it.
-+ ac_save_CPPFLAGS="$CPPFLAGS"
-+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
-+
-+ AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
-+ ac_save_LIBS="$LIBS"
-+ LIBS="$LIBS $LIB[]NAME"
-+ AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
-+ LIBS="$ac_save_LIBS"
-+ ])
-+ if test "$ac_cv_lib[]Name" = yes; then
-+ HAVE_LIB[]NAME=yes
-+ AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
-+ AC_MSG_CHECKING([how to link with lib[]$1])
-+ AC_MSG_RESULT([$LIB[]NAME])
-+ else
-+ HAVE_LIB[]NAME=no
-+ dnl If $LIB[]NAME didn't lead to a usable library, we don't need
-+ dnl $INC[]NAME either.
-+ CPPFLAGS="$ac_save_CPPFLAGS"
-+ LIB[]NAME=
-+ LTLIB[]NAME=
-+ fi
-+ AC_SUBST([HAVE_LIB]NAME)
-+ AC_SUBST([LIB]NAME)
-+ AC_SUBST([LTLIB]NAME)
-+ undefine([Name])
-+ undefine([NAME])
-+])
-+
-+dnl Determine the platform dependent parameters needed to use rpath:
-+dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
-+dnl hardcode_direct, hardcode_minus_L,
-+dnl sys_lib_search_path_spec, sys_lib_dlsearch_path_spec.
-+AC_DEFUN([AC_LIB_RPATH],
-+[
-+ AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS
-+ AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
-+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
-+ AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
-+ AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
-+ CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
-+ ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
-+ . ./conftest.sh
-+ rm -f ./conftest.sh
-+ acl_cv_rpath=done
-+ ])
-+ wl="$acl_cv_wl"
-+ libext="$acl_cv_libext"
-+ shlibext="$acl_cv_shlibext"
-+ hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
-+ hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
-+ hardcode_direct="$acl_cv_hardcode_direct"
-+ hardcode_minus_L="$acl_cv_hardcode_minus_L"
-+ sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec"
-+ sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec"
-+ dnl Determine whether the user wants rpath handling at all.
-+ AC_ARG_ENABLE(rpath,
-+ [ --disable-rpath do not hardcode runtime library paths],
-+ :, enable_rpath=yes)
-+])
-+
-+dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
-+dnl the libraries corresponding to explicit and implicit dependencies.
-+dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
-+AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
-+[
-+ define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
-+ dnl By default, look in $includedir and $libdir.
-+ use_additional=yes
-+ AC_LIB_WITH_FINAL_PREFIX([
-+ eval additional_includedir=\"$includedir\"
-+ eval additional_libdir=\"$libdir\"
-+ ])
-+ AC_ARG_WITH([lib$1-prefix],
-+[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib
-+ --without-lib$1-prefix don't search for lib$1 in includedir and libdir],
-+[
-+ if test "X$withval" = "Xno"; then
-+ use_additional=no
-+ else
-+ if test "X$withval" = "X"; then
-+ AC_LIB_WITH_FINAL_PREFIX([
-+ eval additional_includedir=\"$includedir\"
-+ eval additional_libdir=\"$libdir\"
-+ ])
-+ else
-+ additional_includedir="$withval/include"
-+ additional_libdir="$withval/lib"
-+ fi
-+ fi
-+])
-+ dnl Search the library and its dependencies in $additional_libdir and
-+ dnl $LDFLAGS. Using breadth-first-seach.
-+ LIB[]NAME=
-+ LTLIB[]NAME=
-+ INC[]NAME=
-+ rpathdirs=
-+ ltrpathdirs=
-+ names_already_handled=
-+ names_next_round='$1 $2'
-+ while test -n "$names_next_round"; do
-+ names_this_round="$names_next_round"
-+ names_next_round=
-+ for name in $names_this_round; do
-+ already_handled=
-+ for n in $names_already_handled; do
-+ if test "$n" = "$name"; then
-+ already_handled=yes
-+ break
-+ fi
-+ done
-+ if test -z "$already_handled"; then
-+ names_already_handled="$names_already_handled $name"
-+ dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
-+ dnl or AC_LIB_HAVE_LINKFLAGS call.
-+ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
-+ eval value=\"\$HAVE_LIB$uppername\"
-+ if test -n "$value"; then
-+ if test "$value" = yes; then
-+ eval value=\"\$LIB$uppername\"
-+ test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
-+ eval value=\"\$LTLIB$uppername\"
-+ test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
-+ else
-+ dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
-+ dnl that this library doesn't exist. So just drop it.
-+ :
-+ fi
-+ else
-+ dnl Search the library lib$name in $additional_libdir and $LDFLAGS
-+ dnl and the already constructed $LIBNAME/$LTLIBNAME.
-+ found_dir=
-+ found_la=
-+ found_so=
-+ found_a=
-+ if test $use_additional = yes; then
-+ if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
-+ found_dir="$additional_libdir"
-+ found_so="$additional_libdir/lib$name.$shlibext"
-+ if test -f "$additional_libdir/lib$name.la"; then
-+ found_la="$additional_libdir/lib$name.la"
-+ fi
-+ else
-+ if test -f "$additional_libdir/lib$name.$libext"; then
-+ found_dir="$additional_libdir"
-+ found_a="$additional_libdir/lib$name.$libext"
-+ if test -f "$additional_libdir/lib$name.la"; then
-+ found_la="$additional_libdir/lib$name.la"
-+ fi
-+ fi
-+ fi
-+ fi
-+ if test "X$found_dir" = "X"; then
-+ for x in $LDFLAGS $LTLIB[]NAME; do
-+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-+ case "$x" in
-+ -L*)
-+ dir=`echo "X$x" | sed -e 's/^X-L//'`
-+ if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
-+ found_dir="$dir"
-+ found_so="$dir/lib$name.$shlibext"
-+ if test -f "$dir/lib$name.la"; then
-+ found_la="$dir/lib$name.la"
-+ fi
-+ else
-+ if test -f "$dir/lib$name.$libext"; then
-+ found_dir="$dir"
-+ found_a="$dir/lib$name.$libext"
-+ if test -f "$dir/lib$name.la"; then
-+ found_la="$dir/lib$name.la"
-+ fi
-+ fi
-+ fi
-+ ;;
-+ esac
-+ if test "X$found_dir" != "X"; then
-+ break
-+ fi
-+ done
-+ fi
-+ if test "X$found_dir" != "X"; then
-+ dnl Found the library.
-+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
-+ if test "X$found_so" != "X"; then
-+ dnl Linking with a shared library. We attempt to hardcode its
-+ dnl directory into the executable's runpath, unless it's the
-+ dnl standard /usr/lib.
-+ if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
-+ dnl No hardcoding is needed.
-+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-+ else
-+ dnl Use an explicit option to hardcode DIR into the resulting
-+ dnl binary.
-+ dnl Potentially add DIR to ltrpathdirs.
-+ dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
-+ haveit=
-+ for x in $ltrpathdirs; do
-+ if test "X$x" = "X$found_dir"; then
-+ haveit=yes
-+ break
-+ fi
-+ done
-+ if test -z "$haveit"; then
-+ ltrpathdirs="$ltrpathdirs $found_dir"
-+ fi
-+ dnl The hardcoding into $LIBNAME is system dependent.
-+ if test "$hardcode_direct" = yes; then
-+ dnl Using DIR/libNAME.so during linking hardcodes DIR into the
-+ dnl resulting binary.
-+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-+ else
-+ if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
-+ dnl Use an explicit option to hardcode DIR into the resulting
-+ dnl binary.
-+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-+ dnl Potentially add DIR to rpathdirs.
-+ dnl The rpathdirs will be appended to $LIBNAME at the end.
-+ haveit=
-+ for x in $rpathdirs; do
-+ if test "X$x" = "X$found_dir"; then
-+ haveit=yes
-+ break
-+ fi
-+ done
-+ if test -z "$haveit"; then
-+ rpathdirs="$rpathdirs $found_dir"
-+ fi
-+ else
-+ dnl Rely on "-L$found_dir".
-+ dnl But don't add it if it's already contained in the LDFLAGS
-+ dnl or the already constructed $LIBNAME
-+ haveit=
-+ for x in $LDFLAGS $LIB[]NAME; do
-+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-+ if test "X$x" = "X-L$found_dir"; then
-+ haveit=yes
-+ break
-+ fi
-+ done
-+ if test -z "$haveit"; then
-+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
-+ fi
-+ if test "$hardcode_minus_L" != no; then
-+ dnl FIXME: Not sure whether we should use
-+ dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
-+ dnl here.
-+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-+ else
-+ dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
-+ dnl here, because this doesn't fit in flags passed to the
-+ dnl compiler. So give up. No hardcoding. This affects only
-+ dnl very old systems.
-+ dnl FIXME: Not sure whether we should use
-+ dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
-+ dnl here.
-+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
-+ fi
-+ fi
-+ fi
-+ fi
-+ else
-+ if test "X$found_a" != "X"; then
-+ dnl Linking with a static library.
-+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
-+ else
-+ dnl We shouldn't come here, but anyway it's good to have a
-+ dnl fallback.
-+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
-+ fi
-+ fi
-+ dnl Assume the include files are nearby.
-+ additional_includedir=
-+ case "$found_dir" in
-+ */lib | */lib/)
-+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
-+ additional_includedir="$basedir/include"
-+ ;;
-+ esac
-+ if test "X$additional_includedir" != "X"; then
-+ dnl Potentially add $additional_includedir to $INCNAME.
-+ dnl But don't add it
-+ dnl 1. if it's the standard /usr/include,
-+ dnl 2. if it's /usr/local/include and we are using GCC on Linux,
-+ dnl 3. if it's already present in $CPPFLAGS or the already
-+ dnl constructed $INCNAME,
-+ dnl 4. if it doesn't exist as a directory.
-+ if test "X$additional_includedir" != "X/usr/include"; then
-+ haveit=
-+ if test "X$additional_includedir" = "X/usr/local/include"; then
-+ if test -n "$GCC"; then
-+ case $host_os in
-+ linux*) haveit=yes;;
-+ esac
-+ fi
-+ fi
-+ if test -z "$haveit"; then
-+ for x in $CPPFLAGS $INC[]NAME; do
-+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-+ if test "X$x" = "X-I$additional_includedir"; then
-+ haveit=yes
-+ break
-+ fi
-+ done
-+ if test -z "$haveit"; then
-+ if test -d "$additional_includedir"; then
-+ dnl Really add $additional_includedir to $INCNAME.
-+ INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
-+ fi
-+ fi
-+ fi
-+ fi
-+ fi
-+ dnl Look for dependencies.
-+ if test -n "$found_la"; then
-+ dnl Read the .la file. It defines the variables
-+ dnl dlname, library_names, old_library, dependency_libs, current,
-+ dnl age, revision, installed, dlopen, dlpreopen, libdir.
-+ save_libdir="$libdir"
-+ case "$found_la" in
-+ */* | *\\*) . "$found_la" ;;
-+ *) . "./$found_la" ;;
-+ esac
-+ libdir="$save_libdir"
-+ dnl We use only dependency_libs.
-+ for dep in $dependency_libs; do
-+ case "$dep" in
-+ -L*)
-+ additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
-+ dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
-+ dnl But don't add it
-+ dnl 1. if it's the standard /usr/lib,
-+ dnl 2. if it's /usr/local/lib and we are using GCC on Linux,
-+ dnl 3. if it's already present in $LDFLAGS or the already
-+ dnl constructed $LIBNAME,
-+ dnl 4. if it doesn't exist as a directory.
-+ if test "X$additional_libdir" != "X/usr/lib"; then
-+ haveit=
-+ if test "X$additional_libdir" = "X/usr/local/lib"; then
-+ if test -n "$GCC"; then
-+ case $host_os in
-+ linux*) haveit=yes;;
-+ esac
-+ fi
-+ fi
-+ if test -z "$haveit"; then
-+ haveit=
-+ for x in $LDFLAGS $LIB[]NAME; do
-+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-+ if test "X$x" = "X-L$additional_libdir"; then
-+ haveit=yes
-+ break
-+ fi
-+ done
-+ if test -z "$haveit"; then
-+ if test -d "$additional_libdir"; then
-+ dnl Really add $additional_libdir to $LIBNAME.
-+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
-+ fi
-+ fi
-+ haveit=
-+ for x in $LDFLAGS $LTLIB[]NAME; do
-+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-+ if test "X$x" = "X-L$additional_libdir"; then
-+ haveit=yes
-+ break
-+ fi
-+ done
-+ if test -z "$haveit"; then
-+ if test -d "$additional_libdir"; then
-+ dnl Really add $additional_libdir to $LTLIBNAME.
-+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
-+ fi
-+ fi
-+ fi
-+ fi
-+ ;;
-+ -R*)
-+ dir=`echo "X$dep" | sed -e 's/^X-R//'`
-+ if test "$enable_rpath" != no; then
-+ dnl Potentially add DIR to rpathdirs.
-+ dnl The rpathdirs will be appended to $LIBNAME at the end.
-+ haveit=
-+ for x in $rpathdirs; do
-+ if test "X$x" = "X$dir"; then
-+ haveit=yes
-+ break
-+ fi
-+ done
-+ if test -z "$haveit"; then
-+ rpathdirs="$rpathdirs $dir"
-+ fi
-+ dnl Potentially add DIR to ltrpathdirs.
-+ dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
-+ haveit=
-+ for x in $ltrpathdirs; do
-+ if test "X$x" = "X$dir"; then
-+ haveit=yes
-+ break
-+ fi
-+ done
-+ if test -z "$haveit"; then
-+ ltrpathdirs="$ltrpathdirs $dir"
-+ fi
-+ fi
-+ ;;
-+ -l*)
-+ dnl Handle this in the next round.
-+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
-+ ;;
-+ *.la)
-+ dnl Handle this in the next round. Throw away the .la's
-+ dnl directory; it is already contained in a preceding -L
-+ dnl option.
-+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
-+ ;;
-+ *)
-+ dnl Most likely an immediate library name.
-+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
-+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
-+ ;;
-+ esac
-+ done
-+ fi
-+ else
-+ dnl Didn't find the library; assume it is in the system directories
-+ dnl known to the linker and runtime loader. (All the system
-+ dnl directories known to the linker should also be known to the
-+ dnl runtime loader, otherwise the system is severely misconfigured.)
-+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
-+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
-+ fi
-+ fi
-+ fi
-+ done
-+ done
-+ if test "X$rpathdirs" != "X"; then
-+ if test -n "$hardcode_libdir_separator"; then
-+ dnl Weird platform: only the last -rpath option counts, the user must
-+ dnl pass all path elements in one option. We can arrange that for a
-+ dnl single library, but not when more than one $LIBNAMEs are used.
-+ alldirs=
-+ for found_dir in $rpathdirs; do
-+ alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
-+ done
-+ dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl.
-+ acl_save_libdir="$libdir"
-+ libdir="$alldirs"
-+ eval flag=\"$hardcode_libdir_flag_spec\"
-+ libdir="$acl_save_libdir"
-+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
-+ else
-+ dnl The -rpath options are cumulative.
-+ for found_dir in $rpathdirs; do
-+ acl_save_libdir="$libdir"
-+ libdir="$found_dir"
-+ eval flag=\"$hardcode_libdir_flag_spec\"
-+ libdir="$acl_save_libdir"
-+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
-+ done
-+ fi
-+ fi
-+ if test "X$ltrpathdirs" != "X"; then
-+ dnl When using libtool, the option that works for both libraries and
-+ dnl executables is -R. The -R options are cumulative.
-+ for found_dir in $ltrpathdirs; do
-+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
-+ done
-+ fi
-+])
-+
-+dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
-+dnl unless already present in VAR.
-+dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
-+dnl contains two or three consecutive elements that belong together.
-+AC_DEFUN([AC_LIB_APPENDTOVAR],
-+[
-+ for element in [$2]; do
-+ haveit=
-+ for x in $[$1]; do
-+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-+ if test "X$x" = "X$element"; then
-+ haveit=yes
-+ break
-+ fi
-+ done
-+ if test -z "$haveit"; then
-+ [$1]="${[$1]}${[$1]:+ }$element"
-+ fi
-+ done
-+])
-Index: dialog-1.0-20050306/m4/lib-prefix.m4
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ dialog-1.0-20050306/m4/lib-prefix.m4 2005-05-16 01:32:07.000000000 +0200
-@@ -0,0 +1,148 @@
-+# lib-prefix.m4 serial 1 (gettext-0.11)
-+dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License. As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl From Bruno Haible.
-+
-+dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
-+dnl to access previously installed libraries. The basic assumption is that
-+dnl a user will want packages to use other packages he previously installed
-+dnl with the same --prefix option.
-+dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
-+dnl libraries, but is otherwise very convenient.
-+AC_DEFUN([AC_LIB_PREFIX],
-+[
-+ AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
-+ AC_REQUIRE([AC_PROG_CC])
-+ AC_REQUIRE([AC_CANONICAL_HOST])
-+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-+ dnl By default, look in $includedir and $libdir.
-+ use_additional=yes
-+ AC_LIB_WITH_FINAL_PREFIX([
-+ eval additional_includedir=\"$includedir\"
-+ eval additional_libdir=\"$libdir\"
-+ ])
-+ AC_ARG_WITH([lib-prefix],
-+[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
-+ --without-lib-prefix don't search for libraries in includedir and libdir],
-+[
-+ if test "X$withval" = "Xno"; then
-+ use_additional=no
-+ else
-+ if test "X$withval" = "X"; then
-+ AC_LIB_WITH_FINAL_PREFIX([
-+ eval additional_includedir=\"$includedir\"
-+ eval additional_libdir=\"$libdir\"
-+ ])
-+ else
-+ additional_includedir="$withval/include"
-+ additional_libdir="$withval/lib"
-+ fi
-+ fi
-+])
-+ if test $use_additional = yes; then
-+ dnl Potentially add $additional_includedir to $CPPFLAGS.
-+ dnl But don't add it
-+ dnl 1. if it's the standard /usr/include,
-+ dnl 2. if it's already present in $CPPFLAGS,
-+ dnl 3. if it's /usr/local/include and we are using GCC on Linux,
-+ dnl 4. if it doesn't exist as a directory.
-+ if test "X$additional_includedir" != "X/usr/include"; then
-+ haveit=
-+ for x in $CPPFLAGS; do
-+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-+ if test "X$x" = "X-I$additional_includedir"; then
-+ haveit=yes
-+ break
-+ fi
-+ done
-+ if test -z "$haveit"; then
-+ if test "X$additional_includedir" = "X/usr/local/include"; then
-+ if test -n "$GCC"; then
-+ case $host_os in
-+ linux*) haveit=yes;;
-+ esac
-+ fi
-+ fi
-+ if test -z "$haveit"; then
-+ if test -d "$additional_includedir"; then
-+ dnl Really add $additional_includedir to $CPPFLAGS.
-+ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
-+ fi
-+ fi
-+ fi
-+ fi
-+ dnl Potentially add $additional_libdir to $LDFLAGS.
-+ dnl But don't add it
-+ dnl 1. if it's the standard /usr/lib,
-+ dnl 2. if it's already present in $LDFLAGS,
-+ dnl 3. if it's /usr/local/lib and we are using GCC on Linux,
-+ dnl 4. if it doesn't exist as a directory.
-+ if test "X$additional_libdir" != "X/usr/lib"; then
-+ haveit=
-+ for x in $LDFLAGS; do
-+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-+ if test "X$x" = "X-L$additional_libdir"; then
-+ haveit=yes
-+ break
-+ fi
-+ done
-+ if test -z "$haveit"; then
-+ if test "X$additional_libdir" = "X/usr/local/lib"; then
-+ if test -n "$GCC"; then
-+ case $host_os in
-+ linux*) haveit=yes;;
-+ esac
-+ fi
-+ fi
-+ if test -z "$haveit"; then
-+ if test -d "$additional_libdir"; then
-+ dnl Really add $additional_libdir to $LDFLAGS.
-+ LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
-+ fi
-+ fi
-+ fi
-+ fi
-+ fi
-+])
-+
-+dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
-+dnl acl_final_exec_prefix, containing the values to which $prefix and
-+dnl $exec_prefix will expand at the end of the configure script.
-+AC_DEFUN([AC_LIB_PREPARE_PREFIX],
-+[
-+ dnl Unfortunately, prefix and exec_prefix get only finally determined
-+ dnl at the end of configure.
-+ if test "X$prefix" = "XNONE"; then
-+ acl_final_prefix="$ac_default_prefix"
-+ else
-+ acl_final_prefix="$prefix"
-+ fi
-+ if test "X$exec_prefix" = "XNONE"; then
-+ acl_final_exec_prefix='${prefix}'
-+ else
-+ acl_final_exec_prefix="$exec_prefix"
-+ fi
-+ acl_save_prefix="$prefix"
-+ prefix="$acl_final_prefix"
-+ eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
-+ prefix="$acl_save_prefix"
-+])
-+
-+dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
-+dnl variables prefix and exec_prefix bound to the values they will have
-+dnl at the end of the configure script.
-+AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
-+[
-+ acl_save_prefix="$prefix"
-+ prefix="$acl_final_prefix"
-+ acl_save_exec_prefix="$exec_prefix"
-+ exec_prefix="$acl_final_exec_prefix"
-+ $1
-+ exec_prefix="$acl_save_exec_prefix"
-+ prefix="$acl_save_prefix"
-+])
-Index: dialog-1.0-20050306/m4/progtest.m4
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ dialog-1.0-20050306/m4/progtest.m4 2005-05-16 01:32:07.000000000 +0200
-@@ -0,0 +1,59 @@
-+# progtest.m4 serial 2 (gettext-0.10.40)
-+dnl Copyright (C) 1996-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License. As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+dnl
-+dnl This file can can be used in projects which are not available under
-+dnl the GNU General Public License or the GNU Library General Public
-+dnl License but which still want to provide support for the GNU gettext
-+dnl 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 Authors:
-+dnl Ulrich Drepper <drepper@cygnus.com>, 1996.
-+
-+# Search path for a program which passes the given test.
-+
-+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.
-+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}:"
-+ for ac_dir in ifelse([$5], , $PATH, [$5]); do
-+ test -z "$ac_dir" && ac_dir=.
-+ if test -f $ac_dir/$ac_word; then
-+ if [$3]; then
-+ ac_cv_path_$1="$ac_dir/$ac_word"
-+ 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
-+])
-Index: dialog-1.0-20050306/m4/stdint_h.m4
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ dialog-1.0-20050306/m4/stdint_h.m4 2005-05-16 01:32:07.000000000 +0200
-@@ -0,0 +1,28 @@
-+# stdint_h.m4 serial 2 (gettext-0.11.4)
-+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License. As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl From Paul Eggert.
-+
-+# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists,
-+# doesn't clash with <sys/types.h>, and declares uintmax_t.
-+
-+AC_DEFUN([jm_AC_HEADER_STDINT_H],
-+[
-+ AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h,
-+ [AC_TRY_COMPILE(
-+ [#include <sys/types.h>
-+#include <stdint.h>],
-+ [uintmax_t i = (uintmax_t) -1;],
-+ jm_ac_cv_header_stdint_h=yes,
-+ jm_ac_cv_header_stdint_h=no)])
-+ if test $jm_ac_cv_header_stdint_h = yes; then
-+ AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1,
-+[Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
-+ and declares uintmax_t. ])
-+ fi
-+])
-Index: dialog-1.0-20050306/m4/uintmax_t.m4
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ dialog-1.0-20050306/m4/uintmax_t.m4 2005-05-16 01:32:07.000000000 +0200
-@@ -0,0 +1,29 @@
-+# uintmax_t.m4 serial 6 (gettext-0.11)
-+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License. As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl From Paul Eggert.
-+
-+AC_PREREQ(2.13)
-+
-+# Define uintmax_t to `unsigned long' or `unsigned long long'
-+# if <inttypes.h> does not exist.
-+
-+AC_DEFUN([jm_AC_TYPE_UINTMAX_T],
-+[
-+ AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
-+ AC_REQUIRE([jm_AC_HEADER_STDINT_H])
-+ if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then
-+ AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG])
-+ test $ac_cv_type_unsigned_long_long = yes \
-+ && ac_type='unsigned long long' \
-+ || ac_type='unsigned long'
-+ AC_DEFINE_UNQUOTED(uintmax_t, $ac_type,
-+ [Define to unsigned long or unsigned long long
-+ if <inttypes.h> and <stdint.h> don't define.])
-+ fi
-+])
-Index: dialog-1.0-20050306/m4/ulonglong.m4
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ dialog-1.0-20050306/m4/ulonglong.m4 2005-05-16 01:32:07.000000000 +0200
-@@ -0,0 +1,23 @@
-+# ulonglong.m4 serial 2 (fileutils-4.0.32, gettext-0.10.40)
-+dnl Copyright (C) 1999-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License. As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl From Paul Eggert.
-+
-+AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG],
-+[
-+ AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long,
-+ [AC_TRY_LINK([unsigned long long ull = 1; int i = 63;],
-+ [unsigned long long ullmax = (unsigned long long) -1;
-+ return ull << i | ull >> i | ullmax / ull | ullmax % ull;],
-+ ac_cv_type_unsigned_long_long=yes,
-+ ac_cv_type_unsigned_long_long=no)])
-+ if test $ac_cv_type_unsigned_long_long = yes; then
-+ AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1,
-+ [Define if you have the unsigned long long type.])
-+ fi
-+])
diff --git a/recipes/dialog/dialog-1.0-20050306/templates.patch b/recipes/dialog/dialog-1.0-20050306/templates.patch
deleted file mode 100644
index 07fa384802..0000000000
--- a/recipes/dialog/dialog-1.0-20050306/templates.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: dialog-1.0-20050306/configure.in
-===================================================================
---- dialog-1.0-20050306.orig/configure.in
-+++ dialog-1.0-20050306/configure.in
-@@ -137,6 +137,20 @@ strcasecmp \
- waitpid \
- )
-
-+AH_TEMPLATE([HAVE_FLUSHINP], [Define if you have the flushinp function])
-+AH_TEMPLATE([HAVE_GETBEGX], [Define if you have the getbegx function])
-+AH_TEMPLATE([HAVE_GETBEGY], [Define if you have the getbegy function])
-+AH_TEMPLATE([HAVE_GETBEGYX], [Define if you have the getbegyx function])
-+AH_TEMPLATE([HAVE_GETCURX], [Define if you have the getcurx function])
-+AH_TEMPLATE([HAVE_GETCURY], [Define if you have the getcury function])
-+AH_TEMPLATE([HAVE_GETMAXX], [Define if you have the getcury function])
-+AH_TEMPLATE([HAVE_GETMAXY], [Define if you have the getcury function])
-+AH_TEMPLATE([HAVE_GETMAXYX], [Define if you have the getcury function])
-+AH_TEMPLATE([HAVE_GETPARX], [Define if you have the getcury function])
-+AH_TEMPLATE([HAVE_GETPARY], [Define if you have the getcury function])
-+AH_TEMPLATE([HAVE_GETPARYX], [Define if you have the getcury function])
-+AH_TEMPLATE([HAVE_WGET_WCH], [Define if you have the getcury function])
-+
- CF_CURSES_FUNCS(\
- flushinp \
- getbegx \
diff --git a/recipes/dialog/dialog-static_1.0-20050306.bb b/recipes/dialog/dialog-static_1.0-20050306.bb
deleted file mode 100644
index ce4199c709..0000000000
--- a/recipes/dialog/dialog-static_1.0-20050306.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require dialog.inc
-LDFLAGS += "-static"
-S="${WORKDIR}/dialog-${PV}"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dialog-${PV}"
diff --git a/recipes/dialog/dialog-static_1.1-20080819.bb b/recipes/dialog/dialog-static_1.1-20080819.bb
new file mode 100644
index 0000000000..266999cf5e
--- /dev/null
+++ b/recipes/dialog/dialog-static_1.1-20080819.bb
@@ -0,0 +1,3 @@
+require dialog.inc
+LDFLAGS += "-static"
+S="${WORKDIR}/dialog-${PV}"
diff --git a/recipes/dialog/dialog.inc b/recipes/dialog/dialog.inc
index f2bcaf042a..8fe0d98a2a 100644
--- a/recipes/dialog/dialog.inc
+++ b/recipes/dialog/dialog.inc
@@ -5,9 +5,10 @@ DESCRIPTION = "Dialog lets you to present a variety of questions \
or display messages using dialog boxes from a shell \
script (or any scripting language)."
-SRC_URI = "ftp://ftp.us.debian.org/debian/pool/main/d/dialog/dialog_${PV}.orig.tar.gz \
- file://configure.patch;patch=1 \
- file://m4.patch;patch=1 \
- file://templates.patch;patch=1"
+SRC_URI = "ftp://invisible-island.net/dialog/dialog-${PV}.tgz"
inherit autotools
+
+do_configure() {
+ oe_runconf
+}
diff --git a/recipes/dialog/dialog_1.1-20080819.bb b/recipes/dialog/dialog_1.1-20080819.bb
new file mode 100644
index 0000000000..030b016adf
--- /dev/null
+++ b/recipes/dialog/dialog_1.1-20080819.bb
@@ -0,0 +1 @@
+require dialog.inc