svn commit: r220747 - in vendor/dialog/dist: . package
package/debian package/debian/source po samples
Nathan Whitehorn
nwhitehorn at FreeBSD.org
Sun Apr 17 17:00:56 UTC 2011
Author: nwhitehorn
Date: Sun Apr 17 17:00:55 2011
New Revision: 220747
URL: http://svn.freebsd.org/changeset/base/220747
Log:
Update dialog to 20110302 version.
Added:
vendor/dialog/dist/argv.c
vendor/dialog/dist/package/
vendor/dialog/dist/package/debian/
vendor/dialog/dist/package/debian/changelog
vendor/dialog/dist/package/debian/compat
vendor/dialog/dist/package/debian/control
vendor/dialog/dist/package/debian/copyright
vendor/dialog/dist/package/debian/docs
vendor/dialog/dist/package/debian/rules (contents, props changed)
vendor/dialog/dist/package/debian/source/
vendor/dialog/dist/package/debian/source/format
vendor/dialog/dist/package/debian/watch
vendor/dialog/dist/package/dialog.spec
vendor/dialog/dist/po/sl.po
vendor/dialog/dist/prgbox.c
vendor/dialog/dist/rename.sh (contents, props changed)
vendor/dialog/dist/samples/msgbox-utf8 (contents, props changed)
vendor/dialog/dist/samples/pause-both (contents, props changed)
vendor/dialog/dist/samples/pause-extra (contents, props changed)
vendor/dialog/dist/samples/prgbox (contents, props changed)
vendor/dialog/dist/samples/prgbox2 (contents, props changed)
vendor/dialog/dist/samples/programbox (contents, props changed)
vendor/dialog/dist/samples/programbox2 (contents, props changed)
vendor/dialog/dist/samples/shortlist (contents, props changed)
vendor/dialog/dist/samples/textbox-both (contents, props changed)
vendor/dialog/dist/samples/textbox-help (contents, props changed)
Modified:
vendor/dialog/dist/CHANGES
vendor/dialog/dist/VERSION
vendor/dialog/dist/aclocal.m4
vendor/dialog/dist/arrows.c
vendor/dialog/dist/buttons.c
vendor/dialog/dist/calendar.c
vendor/dialog/dist/checklist.c
vendor/dialog/dist/columns.c
vendor/dialog/dist/config.guess
vendor/dialog/dist/config.sub
vendor/dialog/dist/configure
vendor/dialog/dist/configure.in
vendor/dialog/dist/dialog-config.in
vendor/dialog/dist/dialog.1
vendor/dialog/dist/dialog.3
vendor/dialog/dist/dialog.c
vendor/dialog/dist/dialog.h
vendor/dialog/dist/dlg_colors.h
vendor/dialog/dist/fselect.c
vendor/dialog/dist/guage.c
vendor/dialog/dist/headers-sh.in
vendor/dialog/dist/inputstr.c
vendor/dialog/dist/makefile.in
vendor/dialog/dist/menubox.c
vendor/dialog/dist/mixedgauge.c
vendor/dialog/dist/pause.c
vendor/dialog/dist/po/ar.po
vendor/dialog/dist/po/bg.po
vendor/dialog/dist/po/ca.po
vendor/dialog/dist/po/cy.po
vendor/dialog/dist/po/da.po
vendor/dialog/dist/po/de.po
vendor/dialog/dist/po/dialog.pot
vendor/dialog/dist/po/eo.po
vendor/dialog/dist/po/es.po
vendor/dialog/dist/po/eu.po
vendor/dialog/dist/po/fi.po
vendor/dialog/dist/po/fr.po
vendor/dialog/dist/po/ga.po
vendor/dialog/dist/po/gl.po
vendor/dialog/dist/po/hr.po
vendor/dialog/dist/po/id.po
vendor/dialog/dist/po/is.po
vendor/dialog/dist/po/it.po
vendor/dialog/dist/po/ja.po
vendor/dialog/dist/po/ku.po
vendor/dialog/dist/po/lt.po
vendor/dialog/dist/po/lv.po
vendor/dialog/dist/po/makefile.inn
vendor/dialog/dist/po/ms.po
vendor/dialog/dist/po/nl.po
vendor/dialog/dist/po/pl.po
vendor/dialog/dist/po/pt_BR.po
vendor/dialog/dist/po/ru.po
vendor/dialog/dist/po/sq.po
vendor/dialog/dist/po/sv.po
vendor/dialog/dist/po/sw.po
vendor/dialog/dist/po/th.po
vendor/dialog/dist/po/zh_CN.po
vendor/dialog/dist/po/zh_TW.po
vendor/dialog/dist/progressbox.c
vendor/dialog/dist/samples/debian.rc
vendor/dialog/dist/samples/infobox5
vendor/dialog/dist/samples/infobox6
vendor/dialog/dist/samples/setup-vars
vendor/dialog/dist/samples/slackware.rc
vendor/dialog/dist/samples/sourcemage.rc
vendor/dialog/dist/samples/suse.rc
vendor/dialog/dist/samples/whiptail.rc
vendor/dialog/dist/tailbox.c
vendor/dialog/dist/textbox.c
vendor/dialog/dist/timebox.c
vendor/dialog/dist/trace.c
vendor/dialog/dist/ui_getc.c
vendor/dialog/dist/util.c
Modified: vendor/dialog/dist/CHANGES
==============================================================================
--- vendor/dialog/dist/CHANGES Sun Apr 17 16:35:16 2011 (r220746)
+++ vendor/dialog/dist/CHANGES Sun Apr 17 17:00:55 2011 (r220747)
@@ -1,9 +1,77 @@
--- $Id: CHANGES,v 1.300 2010/04/28 21:27:22 tom Exp $
+-- $Id: CHANGES,v 1.333 2011/03/02 10:06:37 tom Exp $
-- Thomas E. Dickey <dickey at invisible-island.net>
This version of dialog was originally from a Debian snapshot. I've done this
to it:
+2011/03/02
+ + add --prgbox and --programbox (adapted from patch by David Boyd).
+ + add sl.po from
+ http://translationproject.org/latest/dialog/
+ + fix timeouts from 2011/01/18, which were being interpreted as
+ milliseconds rather than seconds (report by Luis Moreira).
+
+2011/01/18
+ + fix inconsistency in return-codes for textbox when help-button is
+ used by making dlg_exit_buttoncode() a wrapper for
+ dlg_ok_buttoncode().
+ + modify pause widget to use dlg_ok_buttoncode(), so help-button works.
+ + correct two infobox sample scripts, which did not pass extra
+ command-line parameters due to quoting problems.
+ + add a limit-check to the timebox widget (patch by Garrett Cooper).
+ + modify --trace option to also trace the command-line parameters.
+ + account for combining characters when wrapping text (Debian #570634).
+ + correct handling of SIGWINCH in gauge widget (Debian #305705).
+ + add gauge_color, to make guage's progress-bar distinct from
+ title_color (request by Dominic Derdau).
+ + update fi.po from
+ http://translationproject.org/latest/dialog/
+ as well as resync line-numbers in the other po-files.
+ + modify configure script and dialog program to build with NetBSD's
+ wide-character curses functions, including workarounds for its
+ incorrect WACS_xxx definitions. Some of the UTF-8 examples work.
+ + add back-tab for traversal of tailboxbg widgets, for symmetry with
+ tab-traversal.
+ + reduce flicker in tailboxbg by checking if the input file size has
+ changed.
+ + modify internals of callbacks to avoid blocking reads of their
+ associated files by keyboard input.
+ + add command-line option --no-mouse, to suppress use of mouse.
+ + add configure option --enable-header-subdir to allow the header files
+ to be installed into a subdirectory named for the package.
+ + modify dlg_restore_vars() to retain the updated values of
+ input_result and input_length, eliminating the need for a caller to
+ provide their own user buffer (prompted by report by Thiago Bimbatti
+ Felicio).
+ + add a null-pointer check in show_result() for
+ dialog_vars.input_result, and ensure it is set to null after freeing
+ (prompted by report by Thiago Bimbatti Felicio).
+ + change order of -I options in CPPFLAGS (report by Michel Feldheim)
+ + modify pause-widget so that it no longer exits when an unrecognized
+ key is pressed (patch by Creidieki M Crouch).
+ + add --with-package option to configure script to allow renaming
+ of the dialog program and library, to support the package scripts.
+ + add Debian and RPM package scripts for test-builds.
+ + several improvements to configure script:
+ + quote params of ifelse()
+ + change obsolete ${name-value} to standard ${name:-value}
+ + use new macros CF_ADD_LIB/CF_ADD_LIBS to enforce consistency.
+ + AM_GNU_GETTEXT, drop $MKINSTALLDIRS, use "mkdir -p" consistently.
+ + CF_ADD_SUBDIR_PATH, workaround - if $prefix was not mkdir'd yet, no
+ directories were added.
+ + CF_BUNDLED_INTL, add --with-textdomain option, to use with lynx-dev
+ package
+ + CF_FIND_LINKAGE, simplify save/restore of $LIBS
+ + CF_GCC_WARNINGS, fix for Mac OS X (compiler makes conftest.dSYM
+ directory)
+ + CF_HEADER_PATH, don't search for variations of everything in the
+ current include-path
+ + CF_WITH_CURSES_DIR, move the calls to CF_ADD_INCDIR and
+ CF_ADD_LIBDIR for the curses-directory here, from
+ CF_NCURSES_CPPFLAGS and CF_NCURSES_LDFLAGS, so it will work even
+ with the default checking, e.g., no --with-ncurses, etc.
+ + updated config.guess, config.sub
+
2010/04/28
+ several improvements to configure script:
+ modify CF_CURSES_TERM_H to handle cases such as cygwin where
@@ -278,7 +346,7 @@ to it:
+ make --program-prefix, etc., work in configure script, e.g., to make
program install as "cdialog". This does not alter the library name.
+ add install-bin, install-man (and uninstall) rules to makefile.
- + updates for configure script macros (originally vile, lynx, xterm):
+ + updates for configure script macros (originally vile, lynx, xterm):
AM_PATH_PROG_WITH_TEST, AM_WITH_NLS, CF_CURSES_CPPFLAGS,
CF_CURSES_LIBS, CF_INCLUDE_DIRS, CF_LARGEFILE, CF_MAKEFLAGS,
CF_PATH_SYNTAX, CF_SUBDIR_PATH, CF_SUBST, CF_WITH_DBMALLOC,
@@ -407,7 +475,7 @@ to it:
+ fix marker in textbox.c to make it disappear at the top of the file
(report by Patrick J. Volkerding).
+ fix marker shown in arrows.c for checklists, etc., which was "(+)"
- where it should have been "(-)" (report/patch by Patrick J.
+ where it should have been "(-)" (report/patch by Patrick J.
Volkerding).
+ fix --input-fd (changes in glibc since 2003 made dialog hang on exit
due to the way dialog updated stdin).
Modified: vendor/dialog/dist/VERSION
==============================================================================
--- vendor/dialog/dist/VERSION Sun Apr 17 16:35:16 2011 (r220746)
+++ vendor/dialog/dist/VERSION Sun Apr 17 17:00:55 2011 (r220747)
@@ -1 +1 @@
-7:1:0 1.1 20100428
+9:0:0 1.1 20110302
Modified: vendor/dialog/dist/aclocal.m4
==============================================================================
--- vendor/dialog/dist/aclocal.m4 Sun Apr 17 16:35:16 2011 (r220746)
+++ vendor/dialog/dist/aclocal.m4 Sun Apr 17 17:00:55 2011 (r220747)
@@ -1,13 +1,37 @@
dnl macros used for DIALOG configure script
-dnl Copyright 1999-2009,2010 -- Thomas E. Dickey
+dnl $Id: aclocal.m4,v 1.80 2011/01/18 23:17:01 tom Exp $
+dnl ---------------------------------------------------------------------------
+dnl Copyright 1999-2010,2011 -- Thomas E. Dickey
+dnl
+dnl Permission is hereby granted, free of charge, to any person obtaining a
+dnl copy of this software and associated documentation files (the
+dnl "Software"), to deal in the Software without restriction, including
+dnl without limitation the rights to use, copy, modify, merge, publish,
+dnl distribute, distribute with modifications, sublicense, and/or sell
+dnl copies of the Software, and to permit persons to whom the Software is
+dnl furnished to do so, subject to the following conditions:
+dnl
+dnl The above copyright notice and this permission notice shall be included
+dnl in all copies or portions of the Software.
+dnl
+dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+dnl IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+dnl DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+dnl OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+dnl THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+dnl
+dnl Except as contained in this notice, the name(s) of the above copyright
+dnl holders shall not be used in advertising or otherwise to promote the
+dnl sale, use or other dealings in this Software without prior written
+dnl authorization.
dnl
dnl see
dnl http://invisible-island.net/autoconf/
-dnl
-dnl $Id: aclocal.m4,v 1.75 2010/04/28 20:36:28 tom Exp $
dnl ---------------------------------------------------------------------------
dnl ---------------------------------------------------------------------------
-dnl AM_GNU_GETTEXT version: 11 updated: 2004/01/26 20:58:40
+dnl AM_GNU_GETTEXT version: 12 updated: 2010/06/19 07:02:11
dnl --------------
dnl Usage: Just like AM_WITH_NLS, which see.
AC_DEFUN([AM_GNU_GETTEXT],
@@ -68,25 +92,6 @@ strdup strtoul tsearch __argz_count __ar
fi
fi
- dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
- dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
- dnl Try to locate it.
- dnl changed mkinstalldirs to mkdirs.sh for Lynx /je spath 1998-Aug-21
- dnl added check for separate locations of scripts -mirabile 2004-Jan-18
- MKINSTALLDIRS=
- if test -n "$ac_aux_dir"; then
- MKINSTALLDIRS="$ac_aux_dir/mkdirs.sh"
- fi
- if test -z "$MKINSTALLDIRS"; then
- MKINSTALLDIRS="\$(top_srcdir)/mkdirs.sh"
- fi
- if test -n "$GNUSYSTEM_AUX_DIR" ; then
- if test -e "${GNUSYSTEM_AUX_DIR}/mkinstalldirs"; then
- MKINSTALLDIRS="${GNUSYSTEM_AUX_DIR}/mkinstalldirs"
- fi
- fi
- AC_SUBST(MKINSTALLDIRS)
-
dnl Enable libtool support if the surrounding package wishes it.
INTL_LIBTOOL_SUFFIX_PREFIX=ifelse([$1], use-libtool, [l], [])
AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
@@ -277,7 +282,7 @@ fi
AC_SUBST($1)dnl
])dnl
dnl ---------------------------------------------------------------------------
-dnl AM_WITH_NLS version: 23 updated: 2009/01/11 19:52:42
+dnl AM_WITH_NLS version: 24 updated: 2010/06/20 09:24:28
dnl -----------
dnl Inserted as requested by gettext 0.10.40
dnl File from /usr/share/aclocal
@@ -369,7 +374,7 @@ AC_DEFUN([AM_WITH_NLS],
CATOBJEXT=NONE
cf_save_LIBS_1="$LIBS"
- LIBS="$LIBICONV $LIBS"
+ CF_ADD_LIBS($LIBICONV)
AC_CACHE_CHECK([for libintl.h and gettext()], cf_cv_func_gettext,[
CF_FIND_LINKAGE(CF__INTL_HEAD,
CF__INTL_BODY,
@@ -597,7 +602,7 @@ define(CF_AC_PREREQ,
AC_PREREQ_CANON(AC_PREREQ_SPLIT(AC_ACVERSION)),
AC_PREREQ_CANON(AC_PREREQ_SPLIT([$1])), [$1], [$2], [$3])])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_ADD_CFLAGS version: 9 updated: 2010/01/09 11:05:50
+dnl CF_ADD_CFLAGS version: 10 updated: 2010/05/26 05:38:42
dnl -------------
dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS
dnl The second parameter if given makes this macro verbose.
@@ -667,17 +672,17 @@ esac
done
if test -n "$cf_new_cflags" ; then
- ifelse($2,,,[CF_VERBOSE(add to \$CFLAGS $cf_new_cflags)])
+ ifelse([$2],,,[CF_VERBOSE(add to \$CFLAGS $cf_new_cflags)])
CFLAGS="$CFLAGS $cf_new_cflags"
fi
if test -n "$cf_new_cppflags" ; then
- ifelse($2,,,[CF_VERBOSE(add to \$CPPFLAGS $cf_new_cppflags)])
+ ifelse([$2],,,[CF_VERBOSE(add to \$CPPFLAGS $cf_new_cppflags)])
CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
fi
if test -n "$cf_new_extra_cppflags" ; then
- ifelse($2,,,[CF_VERBOSE(add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags)])
+ ifelse([$2],,,[CF_VERBOSE(add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags)])
EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
fi
@@ -685,7 +690,7 @@ AC_SUBST(EXTRA_CPPFLAGS)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_ADD_INCDIR version: 12 updated: 2009/01/18 10:00:47
+dnl CF_ADD_INCDIR version: 13 updated: 2010/05/26 16:44:57
dnl -------------
dnl Add an include-directory to $CPPFLAGS. Don't add /usr/include, since it's
dnl redundant. We don't normally need to add -I/usr/local/include for gcc,
@@ -728,7 +733,7 @@ if test -n "$1" ; then
if test "$cf_have_incdir" = no ; then
CF_VERBOSE(adding $cf_add_incdir to include-path)
- ifelse($2,,CPPFLAGS,$2)="$ifelse($2,,CPPFLAGS,$2) -I$cf_add_incdir"
+ ifelse([$2],,CPPFLAGS,[$2])="$ifelse([$2],,CPPFLAGS,[$2]) -I$cf_add_incdir"
cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
test "$cf_top_incdir" = "$cf_add_incdir" && break
@@ -742,7 +747,15 @@ if test -n "$1" ; then
fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_ADD_LIBDIR version: 8 updated: 2009/01/18 10:01:08
+dnl CF_ADD_LIB version: 2 updated: 2010/06/02 05:03:05
+dnl ----------
+dnl Add a library, used to enforce consistency.
+dnl
+dnl $1 = library to add, without the "-l"
+dnl $2 = variable to update (default $LIBS)
+AC_DEFUN([CF_ADD_LIB],[CF_ADD_LIBS(-l$1,ifelse($2,,LIBS,[$2]))])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_ADD_LIBDIR version: 9 updated: 2010/05/26 16:44:57
dnl -------------
dnl Adds to the library-path
dnl
@@ -771,13 +784,21 @@ if test -n "$1" ; then
fi
if test "$cf_have_libdir" = no ; then
CF_VERBOSE(adding $cf_add_libdir to library-path)
- ifelse($2,,LDFLAGS,$2)="-L$cf_add_libdir $ifelse($2,,LDFLAGS,$2)"
+ ifelse([$2],,LDFLAGS,[$2])="-L$cf_add_libdir $ifelse([$2],,LDFLAGS,[$2])"
fi
fi
done
fi
])dnl
dnl ---------------------------------------------------------------------------
+dnl CF_ADD_LIBS version: 1 updated: 2010/06/02 05:03:05
+dnl -----------
+dnl Add one or more libraries, used to enforce consistency.
+dnl
+dnl $1 = libraries to add, with the "-l", etc.
+dnl $2 = variable to update (default $LIBS)
+AC_DEFUN([CF_ADD_LIBS],[ifelse($2,,LIBS,[$2])="$1 [$]ifelse($2,,LIBS,[$2])"])dnl
+dnl ---------------------------------------------------------------------------
dnl CF_ADD_OPTIONAL_PATH version: 1 updated: 2007/07/29 12:33:33
dnl --------------------
dnl Add an optional search-path to the compile/link variables.
@@ -827,7 +848,7 @@ $2])
done
])
dnl ---------------------------------------------------------------------------
-dnl CF_ADD_SUBDIR_PATH version: 2 updated: 2007/07/29 10:12:59
+dnl CF_ADD_SUBDIR_PATH version: 3 updated: 2010/07/03 20:58:12
dnl ------------------
dnl Append to a search-list for a nonstandard header/lib-file
dnl $1 = the variable to return as result
@@ -839,7 +860,7 @@ AC_DEFUN([CF_ADD_SUBDIR_PATH],
[
test "$4" != "$5" && \
test -d "$4" && \
-ifelse([$5],NONE,,[(test $5 = NONE || test -d $5) &&]) {
+ifelse([$5],NONE,,[(test $5 = NONE || test "$4" != "$5") &&]) {
test -n "$verbose" && echo " ... testing for $3-directories under $4"
test -d $4/$3 && $1="[$]$1 $4/$3"
test -d $4/$3/$2 && $1="[$]$1 $4/$3/$2"
@@ -883,7 +904,7 @@ ifelse($5,,[ :],$5)
fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_ARG_OPTION version: 3 updated: 1997/10/18 14:42:41
+dnl CF_ARG_OPTION version: 4 updated: 2010/05/26 05:38:42
dnl -------------
dnl Restricted form of AC_ARG_ENABLE that ensures user doesn't give bogus
dnl values.
@@ -895,18 +916,18 @@ dnl $3 = action to perform if option is
dnl $4 = action if perform if option is default
dnl $5 = default option value (either 'yes' or 'no')
AC_DEFUN([CF_ARG_OPTION],
-[AC_ARG_ENABLE($1,[$2],[test "$enableval" != ifelse($5,no,yes,no) && enableval=ifelse($5,no,no,yes)
+[AC_ARG_ENABLE([$1],[$2],[test "$enableval" != ifelse([$5],no,yes,no) && enableval=ifelse([$5],no,no,yes)
if test "$enableval" != "$5" ; then
-ifelse($3,,[ :]dnl
-,[ $3]) ifelse($4,,,[
+ifelse([$3],,[ :]dnl
+,[ $3]) ifelse([$4],,,[
else
$4])
- fi],[enableval=$5 ifelse($4,,,[
+ fi],[enableval=$5 ifelse([$4],,,[
$4
])dnl
])])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_BUNDLED_INTL version: 14 updated: 2010/01/17 20:37:27
+dnl CF_BUNDLED_INTL version: 16 updated: 2010/10/23 15:55:05
dnl ---------------
dnl Top-level macro for configuring an application with a bundled copy of
dnl the intl and po directories for gettext.
@@ -920,12 +941,15 @@ dnl GT_NO - "#" comment if buildi
dnl INTLDIR_MAKE - to make ./intl directory
dnl MSG_DIR_MAKE - to make ./po directory
dnl SUB_MAKEFILE - list of makefiles in ./intl, ./po directories
-dnl Defines
+dnl
+dnl Defines:
dnl HAVE_LIBGETTEXT_H if we're using ./intl
+dnl NLS_TEXTDOMAIN
dnl
dnl Environment:
dnl ALL_LINGUAS if set, lists the root names of the ".po" files.
dnl CONFIG_H assumed to be "config.h"
+dnl PACKAGE must be set, used as default for textdomain
dnl VERSION may be set, otherwise extract from "VERSION" file.
dnl
AC_DEFUN([CF_BUNDLED_INTL],[
@@ -937,9 +961,13 @@ dnl rather than $LC_ALL
test -z "$ALL_LINGUAS" && ALL_LINGUAS=`test -d $srcdir/po && cd $srcdir/po && echo *.po|sed -e 's/\.po//g' -e 's/*//'`
# Allow override of "config.h" definition:
-: ${CONFIG_H=config.h}
+: ${CONFIG_H:=config.h}
AC_SUBST(CONFIG_H)
+if test -z "$PACKAGE" ; then
+ AC_MSG_ERROR([[CF_BUNDLED_INTL] used without setting [PACKAGE] variable])
+fi
+
if test -z "$VERSION" ; then
if test -f $srcdir/VERSION ; then
VERSION=`sed -e '2,$d' $srcdir/VERSION|cut -f1`
@@ -951,6 +979,15 @@ AC_SUBST(VERSION)
AM_GNU_GETTEXT(,,,[$2])
+if test "$USE_NLS" = yes ; then
+ AC_ARG_WITH(textdomain,
+ [ --with-textdomain=PKG NLS text-domain (default is package name)],
+ [NLS_TEXTDOMAIN=$withval],
+ [NLS_TEXTDOMAIN=$PACKAGE])
+ AC_DEFINE_UNQUOTED(NLS_TEXTDOMAIN,"$NLS_TEXTDOMAIN")
+ AC_SUBST(NLS_TEXTDOMAIN)
+fi
+
INTLDIR_MAKE=
MSG_DIR_MAKE=
SUB_MAKEFILE=
@@ -1055,21 +1092,21 @@ if test ".$system_name" != ".$cf_cv_syst
fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_CHTYPE version: 6 updated: 2003/11/06 19:59:57
+dnl CF_CURSES_CHTYPE version: 7 updated: 2010/10/23 15:54:49
dnl ----------------
dnl Test if curses defines 'chtype' (usually a 'long' type for SysV curses).
AC_DEFUN([CF_CURSES_CHTYPE],
[
AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl
AC_CACHE_CHECK(for chtype typedef,cf_cv_chtype_decl,[
- AC_TRY_COMPILE([#include <${cf_cv_ncurses_header-curses.h}>],
+ AC_TRY_COMPILE([#include <${cf_cv_ncurses_header:-curses.h}>],
[chtype foo],
[cf_cv_chtype_decl=yes],
[cf_cv_chtype_decl=no])])
if test $cf_cv_chtype_decl = yes ; then
AC_DEFINE(HAVE_TYPE_CHTYPE)
AC_CACHE_CHECK(if chtype is scalar or struct,cf_cv_chtype_type,[
- AC_TRY_COMPILE([#include <${cf_cv_ncurses_header-curses.h}>],
+ AC_TRY_COMPILE([#include <${cf_cv_ncurses_header:-curses.h}>],
[chtype foo; long x = foo],
[cf_cv_chtype_type=scalar],
[cf_cv_chtype_type=struct])])
@@ -1116,7 +1153,7 @@ CF_CURSES_HEADER
CF_TERM_HEADER
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_FUNCS version: 14 updated: 2009/07/16 19:34:55
+dnl CF_CURSES_FUNCS version: 15 updated: 2010/10/23 15:52:32
dnl ---------------
dnl Curses-functions are a little complicated, since a lot of them are macros.
AC_DEFUN([CF_CURSES_FUNCS],
@@ -1136,7 +1173,7 @@ do
[
#ifndef ${cf_func}
long foo = (long)(&${cf_func});
-${cf_cv_main_return-return}(foo == 0);
+${cf_cv_main_return:-return}(foo == 0);
#endif
],
[cf_result=yes],
@@ -1182,7 +1219,7 @@ fi
AC_CHECK_HEADERS($cf_cv_ncurses_header)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_LIBS version: 29 updated: 2009/01/06 19:34:57
+dnl CF_CURSES_LIBS version: 32 updated: 2011/01/16 17:43:15
dnl --------------
dnl Look for the curses libraries. Older curses implementations may require
dnl termcap/termlib to be linked as well. Call CF_CURSES_CPPFLAGS first.
@@ -1190,7 +1227,7 @@ AC_DEFUN([CF_CURSES_LIBS],[
AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl
AC_MSG_CHECKING(if we have identified curses libraries)
-AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>],
+AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
[initscr(); tgoto("?", 0,0)],
cf_result=yes,
cf_result=no)
@@ -1199,27 +1236,39 @@ AC_MSG_RESULT($cf_result)
if test "$cf_result" = no ; then
case $host_os in #(vi
freebsd*) #(vi
- AC_CHECK_LIB(mytinfo,tgoto,[LIBS="-lmytinfo $LIBS"])
+ AC_CHECK_LIB(mytinfo,tgoto,[CF_ADD_LIBS(-lmytinfo)])
;;
hpux10.*) #(vi
AC_CHECK_LIB(cur_colr,initscr,[
- LIBS="-lcur_colr $LIBS"
+ CF_ADD_LIBS(-lcur_colr)
ac_cv_func_initscr=yes
],[
AC_CHECK_LIB(Hcurses,initscr,[
# HP's header uses __HP_CURSES, but user claims _HP_CURSES.
- LIBS="-lHcurses $LIBS"
+ CF_ADD_LIBS(-lHcurses)
CPPFLAGS="$CPPFLAGS -D__HP_CURSES -D_HP_CURSES"
ac_cv_func_initscr=yes
])])
;;
-linux*) # Suse Linux does not follow /usr/lib convention
- CF_ADD_LIBDIR(/lib)
+linux*)
+ case `arch` in
+ x86_64)
+ if test -d /lib64
+ then
+ CF_ADD_LIBDIR(/lib64)
+ else
+ CF_ADD_LIBDIR(/lib)
+ fi
+ ;;
+ *)
+ CF_ADD_LIBDIR(/lib)
+ ;;
+ esac
;;
sunos3*|sunos4*)
if test -d /usr/5lib ; then
CF_ADD_LIBDIR(/usr/5lib)
- LIBS="$LIBS -lcurses -ltermcap"
+ CF_ADD_LIBS(-lcurses -ltermcap)
fi
ac_cv_func_initscr=yes
;;
@@ -1230,7 +1279,7 @@ if test ".$ac_cv_func_initscr" != .yes ;
cf_term_lib=""
cf_curs_lib=""
- if test ".${cf_cv_ncurses_version-no}" != .no
+ if test ".${cf_cv_ncurses_version:-no}" != .no
then
cf_check_list="ncurses curses cursesX"
else
@@ -1257,7 +1306,7 @@ if test ".$ac_cv_func_initscr" != .yes ;
LIBS="-l$cf_curs_lib $cf_save_LIBS"
if test "$cf_term_lib" = unknown ; then
AC_MSG_CHECKING(if we can link with $cf_curs_lib library)
- AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>],
+ AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
[initscr()],
[cf_result=yes],
[cf_result=no])
@@ -1267,12 +1316,12 @@ if test ".$ac_cv_func_initscr" != .yes ;
:
elif test "$cf_term_lib" != predefined ; then
AC_MSG_CHECKING(if we need both $cf_curs_lib and $cf_term_lib libraries)
- AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>],
+ AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
[initscr(); tgoto((char *)0, 0, 0);],
[cf_result=no],
[
LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
- AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>],
+ AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
[initscr()],
[cf_result=yes],
[cf_result=error])
@@ -1284,7 +1333,7 @@ fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_TERM_H version: 7 updated: 2010/01/24 18:40:06
+dnl CF_CURSES_TERM_H version: 8 updated: 2010/10/23 15:54:49
dnl ----------------
dnl SVr4 curses should have term.h as well (where it puts the definitions of
dnl the low-level interface). This may not be true in old/broken implementations,
@@ -1299,11 +1348,11 @@ AC_CACHE_CHECK(for term.h, cf_cv_term_he
# If we found <ncurses/curses.h>, look for <ncurses/term.h>, but always look
# for <term.h> if we do not find the variant.
for cf_header in \
- `echo ${cf_cv_ncurses_header-curses.h} | sed -e 's%/.*%/%'`term.h \
+ `echo ${cf_cv_ncurses_header:-curses.h} | sed -e 's%/.*%/%'`term.h \
term.h
do
AC_TRY_COMPILE([
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
#include <${cf_header}>],
[WINDOW *x],
[cf_cv_term_header=$cf_header
@@ -1318,7 +1367,7 @@ no)
for cf_header in ncurses/term.h ncursesw/term.h
do
AC_TRY_COMPILE([
-#include <${cf_cv_ncurses_header-curses.h}>
+#include <${cf_cv_ncurses_header:-curses.h}>
#ifdef NCURSES_VERSION
#include <${cf_header}>
#else
@@ -1346,6 +1395,63 @@ ncursesw/term.h)
esac
])dnl
dnl ---------------------------------------------------------------------------
+dnl CF_CURSES_WACS_MAP version: 5 updated: 2011/01/15 11:28:59
+dnl ------------------
+dnl Check for likely values of wacs_map[].
+AC_DEFUN([CF_CURSES_WACS_MAP],
+[
+AC_CACHE_CHECK(for wide alternate character set array, cf_cv_curses_wacs_map,[
+ cf_cv_curses_wacs_map=unknown
+ for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
+ do
+ AC_TRY_LINK([
+#ifndef _XOPEN_SOURCE_EXTENDED
+#define _XOPEN_SOURCE_EXTENDED
+#endif
+#include <${cf_cv_ncurses_header:-curses.h}>],
+ [void *foo = &($name['k'])],
+ [cf_cv_curses_wacs_map=$name
+ break])
+ done])
+
+test "$cf_cv_curses_wacs_map" != unknown && AC_DEFINE_UNQUOTED(CURSES_WACS_ARRAY,$cf_cv_curses_wacs_map)
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_CURSES_WACS_SYMBOLS version: 1 updated: 2011/01/15 11:28:59
+dnl ----------------------
+dnl Do a check to see if the WACS_xxx constants are defined compatibly with
+dnl X/Open Curses. In particular, NetBSD's implementation of the WACS_xxx
+dnl constants is broken since those constants do not point to cchar_t's.
+AC_DEFUN([CF_CURSES_WACS_SYMBOLS],
+[
+AC_REQUIRE([CF_CURSES_WACS_MAP])
+
+AC_CACHE_CHECK(for wide alternate character constants, cf_cv_curses_wacs_symbols,[
+cf_cv_curses_wacs_symbols=no
+if test "$cf_cv_curses_wacs_map" != unknown
+then
+ AC_TRY_LINK([
+#ifndef _XOPEN_SOURCE_EXTENDED
+#define _XOPEN_SOURCE_EXTENDED
+#endif
+#include <${cf_cv_ncurses_header:-curses.h}>],
+ [cchar_t *foo = WACS_PLUS;
+ $cf_cv_curses_wacs_map['k'] = *WACS_PLUS],
+ [cf_cv_curses_wacs_symbols=yes])
+else
+ AC_TRY_LINK([
+#ifndef _XOPEN_SOURCE_EXTENDED
+#define _XOPEN_SOURCE_EXTENDED
+#endif
+#include <${cf_cv_ncurses_header:-curses.h}>],
+ [cchar_t *foo = WACS_PLUS],
+ [cf_cv_curses_wacs_symbols=yes])
+fi
+])
+
+test "$cf_cv_curses_wacs_symbols" != no && AC_DEFINE(CURSES_WACS_SYMBOLS)
+])dnl
+dnl ---------------------------------------------------------------------------
dnl CF_DIRNAME version: 4 updated: 2002/12/21 19:25:52
dnl ----------
dnl "dirname" is not portable, so we fake it with a shell script.
@@ -1388,6 +1494,30 @@ AC_SUBST(SHOW_CC)
AC_SUBST(ECHO_CC)
])dnl
dnl ---------------------------------------------------------------------------
+dnl CF_DISABLE_LIBTOOL_VERSION version: 1 updated: 2010/05/15 15:45:59
+dnl --------------------------
+dnl Check if we should use the libtool 1.5 feature "-version-number" instead of
+dnl the older "-version-info" feature. The newer feature allows us to use
+dnl version numbering on shared libraries which make them compatible with
+dnl various systems.
+AC_DEFUN([CF_DISABLE_LIBTOOL_VERSION],
+[
+AC_MSG_CHECKING(if libtool -version-number should be used)
+CF_ARG_DISABLE(libtool-version,
+ [ --disable-libtool-version enable to use libtool's incompatible naming scheme],
+ [cf_libtool_version=no],
+ [cf_libtool_version=yes])
+AC_MSG_RESULT($cf_libtool_version)
+
+if test "$cf_libtool_version" = yes ; then
+ LIBTOOL_VERSION="-version-number"
+else
+ LIBTOOL_VERSION="-version-info"
+fi
+
+AC_SUBST(LIBTOOL_VERSION)
+])dnl
+dnl ---------------------------------------------------------------------------
dnl CF_DISABLE_RPATH_HACK version: 1 updated: 2010/04/11 10:54:00
dnl ---------------------
dnl The rpath-hack makes it simpler to build programs, particularly with the
@@ -1489,7 +1619,7 @@ fi
])
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_FIND_LINKAGE version: 16 updated: 2010/04/21 06:20:50
+dnl CF_FIND_LINKAGE version: 19 updated: 2010/05/29 16:31:02
dnl ---------------
dnl Find a library (specifically the linkage used in the code fragment),
dnl searching for it if it is not already in the library path.
@@ -1518,18 +1648,23 @@ cf_cv_library_path_$3=
CF_MSG_LOG([Starting [FIND_LINKAGE]($3,$6)])
+cf_save_LIBS="$LIBS"
+
AC_TRY_LINK([$1],[$2],[
cf_cv_find_linkage_$3=yes
+ cf_cv_header_path_$3=/usr/include
+ cf_cv_library_path_$3=/usr/lib
],[
-cf_save_LIBS="$LIBS"
LIBS="-l$3 $7 $cf_save_LIBS"
AC_TRY_LINK([$1],[$2],[
cf_cv_find_linkage_$3=yes
+ cf_cv_header_path_$3=/usr/include
+ cf_cv_library_path_$3=/usr/lib
cf_cv_library_file_$3="-l$3"
],[
- cf_cv_find_linkage_$3=no
+ cf_cv_find_linkage_$3=no
LIBS="$cf_save_LIBS"
CF_VERBOSE(find linkage for $3 library)
@@ -1591,7 +1726,6 @@ AC_TRY_LINK([$1],[$2],[
])
fi
done
- LIBS="$cf_save_LIBS"
CPPFLAGS="$cf_save_CPPFLAGS"
LDFLAGS="$cf_save_LDFLAGS"
fi
@@ -1602,11 +1736,13 @@ AC_TRY_LINK([$1],[$2],[
],$7)
])
+LIBS="$cf_save_LIBS"
+
if test "$cf_cv_find_linkage_$3" = yes ; then
ifelse([$4],,[
CF_ADD_INCDIR($cf_cv_header_path_$3)
CF_ADD_LIBDIR($cf_cv_library_path_$3)
- LIBS="-l$3 $LIBS"
+ CF_ADD_LIB($3)
],[$4])
else
ifelse([$5],,AC_MSG_WARN(Cannot find $3 library),[$5])
@@ -1653,7 +1789,7 @@ if test $cf_cv_type_unionwait = yes; the
fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_GCC_ATTRIBUTES version: 13 updated: 2009/08/11 20:19:56
+dnl CF_GCC_ATTRIBUTES version: 14 updated: 2010/10/23 15:52:32
dnl -----------------
dnl Test for availability of useful gcc __attribute__ directives to quiet
dnl compiler warnings. Though useful, not all are supported -- and contrary
@@ -1680,7 +1816,7 @@ if test "$GCC" = yes
then
AC_CHECKING([for $CC __attribute__ directives])
cat > conftest.$ac_ext <<EOF
-#line __oline__ "${as_me-configure}"
+#line __oline__ "${as_me:-configure}"
#include "confdefs.h"
#include "conftest.h"
#include "conftest.i"
@@ -1777,7 +1913,7 @@ if test "$GCC" = yes ; then
fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_GCC_WARNINGS version: 25 updated: 2010/04/24 11:03:31
+dnl CF_GCC_WARNINGS version: 27 updated: 2010/10/23 15:52:32
dnl ---------------
dnl Check if the compiler supports useful warning options. There's a few that
dnl we don't use, simply because they're too noisy:
@@ -1802,7 +1938,7 @@ AC_REQUIRE([CF_GCC_VERSION])
CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS)
cat > conftest.$ac_ext <<EOF
-#line __oline__ "${as_me-configure}"
+#line __oline__ "${as_me:-configure}"
int main(int argc, char *argv[[]]) { return (argv[[argc-1]] == 0) ; }
EOF
@@ -1881,7 +2017,7 @@ then
done
CFLAGS="$cf_save_CFLAGS"
fi
-rm -f conftest*
+rm -rf conftest*
AC_SUBST(EXTRA_CFLAGS)
])dnl
@@ -1927,7 +2063,7 @@ AC_SUBST(PACKAGE_CONFIG)
EXTRA_OUTPUT="$EXTRA_OUTPUT headers-sh:$srcdir/headers-sh.in"
])
dnl ---------------------------------------------------------------------------
-dnl CF_HEADER_PATH version: 11 updated: 2010/04/21 06:20:50
+dnl CF_HEADER_PATH version: 12 updated: 2010/05/05 05:22:40
dnl --------------
dnl Construct a search-list of directories for a nonstandard header-file
dnl
@@ -1946,7 +2082,8 @@ if test -n "${CFLAGS}${CPPFLAGS}" ; then
case $cf_header_path in #(vi
-I*)
cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
- cf_header_path_list="$cf_header_path_list $cf_header_path"
+ CF_ADD_SUBDIR_PATH($1,$2,include,$cf_header_path,NONE)
+ cf_header_path_list="$cf_header_path_list [$]$1"
;;
esac
done
@@ -2043,7 +2180,7 @@ do
done
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_INTEL_COMPILER version: 3 updated: 2005/08/06 18:37:29
+dnl CF_INTEL_COMPILER version: 4 updated: 2010/05/26 05:38:42
dnl -----------------
dnl Check if the given compiler is really the Intel compiler for Linux. It
dnl tries to imitate gcc, but does not return an error when it finds a mismatch
@@ -2057,24 +2194,24 @@ dnl $1 = GCC (default) or GXX
dnl $2 = INTEL_COMPILER (default) or INTEL_CPLUSPLUS
dnl $3 = CFLAGS (default) or CXXFLAGS
AC_DEFUN([CF_INTEL_COMPILER],[
-ifelse($2,,INTEL_COMPILER,[$2])=no
+ifelse([$2],,INTEL_COMPILER,[$2])=no
-if test "$ifelse($1,,[$1],GCC)" = yes ; then
+if test "$ifelse([$1],,[$1],GCC)" = yes ; then
case $host_os in
linux*|gnu*)
- AC_MSG_CHECKING(if this is really Intel ifelse($1,GXX,C++,C) compiler)
- cf_save_CFLAGS="$ifelse($3,,CFLAGS,[$3])"
- ifelse($3,,CFLAGS,[$3])="$ifelse($3,,CFLAGS,[$3]) -no-gcc"
+ AC_MSG_CHECKING(if this is really Intel ifelse([$1],GXX,C++,C) compiler)
+ cf_save_CFLAGS="$ifelse([$3],,CFLAGS,[$3])"
+ ifelse([$3],,CFLAGS,[$3])="$ifelse([$3],,CFLAGS,[$3]) -no-gcc"
AC_TRY_COMPILE([],[
#ifdef __INTEL_COMPILER
#else
make an error
#endif
-],[ifelse($2,,INTEL_COMPILER,[$2])=yes
+],[ifelse([$2],,INTEL_COMPILER,[$2])=yes
cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
],[])
- ifelse($3,,CFLAGS,[$3])="$cf_save_CFLAGS"
- AC_MSG_RESULT($ifelse($2,,INTEL_COMPILER,[$2]))
+ ifelse([$3],,CFLAGS,[$3])="$cf_save_CFLAGS"
+ AC_MSG_RESULT($ifelse([$2],,INTEL_COMPILER,[$2]))
;;
esac
fi
@@ -2119,7 +2256,7 @@ ifdef([AC_FUNC_FSEEKO],[
])
])
dnl ---------------------------------------------------------------------------
-dnl CF_LD_RPATH_OPT version: 2 updated: 2010/03/27 19:27:54
+dnl CF_LD_RPATH_OPT version: 3 updated: 2010/06/02 05:03:05
dnl ---------------
dnl For the given system and compiler, find the compiler flags to pass to the
dnl loader to use the "rpath" feature.
@@ -2164,7 +2301,7 @@ case "x$LD_RPATH_OPT" in #(vi
x-R*)
AC_MSG_CHECKING(if we need a space after rpath option)
cf_save_LIBS="$LIBS"
- LIBS="${LD_RPATH_OPT}$libdir $LIBS"
+ CF_ADD_LIBS(${LD_RPATH_OPT}$libdir)
AC_TRY_LINK(, , cf_rpath_space=no, cf_rpath_space=yes)
LIBS="$cf_save_LIBS"
AC_MSG_RESULT($cf_rpath_space)
@@ -2219,7 +2356,7 @@ ifelse($1,,,[$1=$LIB_PREFIX])
AC_SUBST(LIB_PREFIX)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_MAKEFLAGS version: 12 updated: 2006/10/21 08:27:03
+dnl CF_MAKEFLAGS version: 13 updated: 2010/10/23 15:52:32
dnl ------------
dnl Some 'make' programs support ${MAKEFLAGS}, some ${MFLAGS}, to pass 'make'
dnl options to lower-levels. It's very useful for "make -n" -- if we have it.
@@ -2236,10 +2373,10 @@ SHELL = /bin/sh
all :
@ echo '.$cf_option'
CF_EOF
- cf_result=`${MAKE-make} -k -f cf_makeflags.tmp 2>/dev/null | sed -e 's,[[ ]]*$,,'`
+ cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | sed -e 's,[[ ]]*$,,'`
case "$cf_result" in
.*k)
- cf_result=`${MAKE-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null`
+ cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null`
case "$cf_result" in
.*CC=*) cf_cv_makeflags=
;;
@@ -2259,7 +2396,7 @@ CF_EOF
AC_SUBST(cf_cv_makeflags)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_MAKE_TAGS version: 5 updated: 2010/04/03 20:07:32
+dnl CF_MAKE_TAGS version: 6 updated: 2010/10/23 15:52:32
dnl ------------
dnl Generate tags/TAGS targets for makefiles. Do not generate TAGS if we have
dnl a monocase filesystem.
@@ -2269,10 +2406,10 @@ AC_REQUIRE([CF_MIXEDCASE_FILENAMES])
AC_CHECK_PROGS(CTAGS, exctags ctags)
AC_CHECK_PROGS(ETAGS, exetags etags)
-AC_CHECK_PROG(MAKE_LOWER_TAGS, ${CTAGS-ctags}, yes, no)
+AC_CHECK_PROG(MAKE_LOWER_TAGS, ${CTAGS:-ctags}, yes, no)
if test "$cf_cv_mixedcase" = yes ; then
- AC_CHECK_PROG(MAKE_UPPER_TAGS, ${ETAGS-etags}, yes, no)
+ AC_CHECK_PROG(MAKE_UPPER_TAGS, ${ETAGS:-etags}, yes, no)
else
MAKE_UPPER_TAGS=no
fi
@@ -2296,7 +2433,7 @@ AC_SUBST(MAKE_UPPER_TAGS)
AC_SUBST(MAKE_LOWER_TAGS)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_MATH_LIB version: 6 updated: 2009/12/19 13:46:49
+dnl CF_MATH_LIB version: 8 updated: 2010/05/29 16:31:02
dnl -----------
dnl Checks for libraries. At least one UNIX system, Apple Macintosh
dnl Rhapsody 5.5, does not have -lm. We cannot use the simpler
@@ -2309,13 +2446,13 @@ AC_CACHE_CHECK(if -lm needed for math fu
#include <stdio.h>
#include <math.h>
],
- [double x = rand(); printf("result = %g\n", ]ifelse($2,,sin(x),$2)[)],
+ [double x = rand(); printf("result = %g\n", ]ifelse([$2],,sin(x),$2)[)],
[cf_cv_need_libm=no],
[cf_cv_need_libm=yes])])
if test "$cf_cv_need_libm" = yes
then
ifelse($1,,[
- LIBS="-lm $LIBS"
+ CF_ADD_LIB(m)
],[$1=-lm])
fi
])
@@ -2386,12 +2523,12 @@ fi
test "$cf_cv_mixedcase" = yes && AC_DEFINE(MIXEDCASE_FILENAMES)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_MSG_LOG version: 4 updated: 2007/07/29 09:55:12
+dnl CF_MSG_LOG version: 5 updated: 2010/10/23 15:52:32
dnl ----------
dnl Write a debug message to config.log, along with the line number in the
dnl configure script.
AC_DEFUN([CF_MSG_LOG],[
-echo "${as_me-configure}:__oline__: testing $* ..." 1>&AC_FD_CC
+echo "${as_me:-configure}:__oline__: testing $* ..." 1>&AC_FD_CC
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_NCURSES_CC_CHECK version: 4 updated: 2007/07/29 10:39:05
@@ -2427,10 +2564,10 @@ printf("old\n");
,[$1=no])
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_NCURSES_CONFIG version: 6 updated: 2010/04/28 06:02:16
+dnl CF_NCURSES_CONFIG version: 8 updated: 2010/07/08 05:17:30
dnl -----------------
dnl Tie together the configure-script macros for ncurses.
-dnl Prefer the "-config" script from ncurses 5.6, to simplify analysis.
+dnl Prefer the "-config" script from ncurses 6.x, to simplify analysis.
dnl Allow that to be overridden using the $NCURSES_CONFIG environment variable.
dnl
dnl $1 is the root library name (default: "ncurses")
@@ -2444,7 +2581,7 @@ AC_PATH_PROGS(NCURSES_CONFIG,${cf_ncucon
if test "$NCURSES_CONFIG" != none ; then
CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`"
-LIBS="`$NCURSES_CONFIG --libs` $LIBS"
+CF_ADD_LIBS(`$NCURSES_CONFIG --libs`)
# even with config script, some packages use no-override for curses.h
CF_CURSES_HEADER(ifelse($1,,ncurses,$1))
@@ -2467,7 +2604,7 @@ CF_NCURSES_LIBS(ifelse($1,,ncurses,$1))
fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_NCURSES_CPPFLAGS version: 19 updated: 2007/07/29 13:35:20
+dnl CF_NCURSES_CPPFLAGS version: 20 updated: 2010/11/20 17:02:38
dnl -------------------
dnl Look for the SVr4 curses clone 'ncurses' in the standard places, adjusting
dnl the CPPFLAGS variable so we can include its header.
@@ -2496,7 +2633,7 @@ cf_ncuhdr_root=ifelse($1,,ncurses,$1)
test -n "$cf_cv_curses_dir" && \
test "$cf_cv_curses_dir" != "no" && { \
- CF_ADD_INCDIR($cf_cv_curses_dir/include $cf_cv_curses_dir/include/$cf_ncuhdr_root)
+ CF_ADD_INCDIR($cf_cv_curses_dir/include/$cf_ncuhdr_root)
}
AC_CACHE_CHECK(for $cf_ncuhdr_root header in include-path, cf_cv_ncurses_h,[
@@ -2584,7 +2721,7 @@ esac
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_NCURSES_LIBS version: 13 updated: 2007/07/29 10:29:20
+dnl CF_NCURSES_LIBS version: 16 updated: 2010/11/20 17:02:38
dnl ---------------
dnl Look for the ncurses library. This is a little complicated on Linux,
dnl because it may be linked with the gpm (general purpose mouse) library.
@@ -2620,15 +2757,14 @@ freebsd*)
;;
esac
-LIBS="$cf_ncurses_LIBS $LIBS"
+CF_ADD_LIBS($cf_ncurses_LIBS)
if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
then
- CF_ADD_LIBDIR($cf_cv_curses_dir/lib)
- LIBS="-l$cf_nculib_root $LIBS"
+ CF_ADD_LIBS(-l$cf_nculib_root)
else
CF_FIND_LIBRARY($cf_nculib_root,$cf_nculib_root,
- [#include <${cf_cv_ncurses_header-curses.h}>],
+ [#include <${cf_cv_ncurses_header:-curses.h}>],
[initscr()],
initscr)
fi
@@ -2642,7 +2778,7 @@ if test -n "$cf_ncurses_LIBS" ; then
LIBS="$q"
fi
done
- AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>],
+ AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
[initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);],
[AC_MSG_RESULT(yes)],
[AC_MSG_RESULT(no)
@@ -2653,7 +2789,7 @@ CF_UPPER(cf_nculib_ROOT,HAVE_LIB$cf_ncul
AC_DEFINE_UNQUOTED($cf_nculib_ROOT)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_NCURSES_VERSION version: 12 updated: 2007/04/28 09:15:55
+dnl CF_NCURSES_VERSION version: 13 updated: 2010/10/23 15:54:49
dnl ------------------
dnl Check for the version of ncurses, to aid in reporting bugs, etc.
dnl Call CF_CURSES_CPPFLAGS first, or CF_NCURSES_CPPFLAGS. We don't use
@@ -2666,7 +2802,7 @@ AC_CACHE_CHECK(for ncurses version, cf_c
cf_tempfile=out$$
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-all
mailing list