svn commit: r339488 - in head: contrib/dialog contrib/dialog/package contrib/dialog/package/debian contrib/dialog/package/freebsd contrib/dialog/po contrib/dialog/samples contrib/dialog/samples/cop...
Baptiste Daroussin
bapt at FreeBSD.org
Sat Oct 20 20:49:48 UTC 2018
Author: bapt
Date: Sat Oct 20 20:49:46 2018
New Revision: 339488
URL: https://svnweb.freebsd.org/changeset/base/339488
Log:
Update libdialog to 1.3-20180621
Added:
head/contrib/dialog/demo.pl
- copied unchanged from r339484, vendor/dialog/dist/demo.pl
head/contrib/dialog/headers.sh
- copied unchanged from r339484, vendor/dialog/dist/headers.sh
head/contrib/dialog/package/debian/postinst
- copied unchanged from r339484, vendor/dialog/dist/package/debian/postinst
head/contrib/dialog/package/dialog.map
- copied unchanged from r339484, vendor/dialog/dist/package/dialog.map
head/contrib/dialog/package/dialog.sym
- copied unchanged from r339484, vendor/dialog/dist/package/dialog.sym
head/contrib/dialog/po/fur.po
- copied unchanged from r339484, vendor/dialog/dist/po/fur.po
head/contrib/dialog/po/gd.po
- copied unchanged from r339484, vendor/dialog/dist/po/gd.po
head/contrib/dialog/samples/copifuncs/
- copied from r339484, vendor/dialog/dist/samples/copifuncs/
head/contrib/dialog/samples/dselect
- copied unchanged from r339484, vendor/dialog/dist/samples/dselect
head/contrib/dialog/samples/install/
- copied from r339484, vendor/dialog/dist/samples/install/
head/contrib/dialog/samples/menubox11
- copied unchanged from r339484, vendor/dialog/dist/samples/menubox11
head/contrib/dialog/samples/run_test.sh
- copied unchanged from r339484, vendor/dialog/dist/samples/run_test.sh
head/contrib/dialog/ttysize.c
- copied unchanged from r339484, vendor/dialog/dist/ttysize.c
Modified:
head/contrib/dialog/CHANGES
head/contrib/dialog/VERSION
head/contrib/dialog/aclocal.m4
head/contrib/dialog/argv.c
head/contrib/dialog/arrows.c
head/contrib/dialog/buildlist.c
head/contrib/dialog/buttons.c
head/contrib/dialog/calendar.c
head/contrib/dialog/checklist.c
head/contrib/dialog/config.guess
head/contrib/dialog/config.sub
head/contrib/dialog/configure
head/contrib/dialog/configure.in
head/contrib/dialog/dialog.1
head/contrib/dialog/dialog.3
head/contrib/dialog/dialog.c
head/contrib/dialog/dialog.h
head/contrib/dialog/dialog.pl
head/contrib/dialog/dlg_keys.c
head/contrib/dialog/dlg_keys.h
head/contrib/dialog/editbox.c
head/contrib/dialog/formbox.c
head/contrib/dialog/fselect.c
head/contrib/dialog/guage.c
head/contrib/dialog/inputbox.c
head/contrib/dialog/inputstr.c
head/contrib/dialog/makefile.in
head/contrib/dialog/menubox.c
head/contrib/dialog/mixedform.c
head/contrib/dialog/mixedgauge.c
head/contrib/dialog/mouse.c
head/contrib/dialog/mousewget.c
head/contrib/dialog/msgbox.c
head/contrib/dialog/package/debian/changelog
head/contrib/dialog/package/debian/control
head/contrib/dialog/package/debian/copyright
head/contrib/dialog/package/debian/rules
head/contrib/dialog/package/debian/watch
head/contrib/dialog/package/dialog.spec
head/contrib/dialog/package/freebsd/Makefile
head/contrib/dialog/pause.c
head/contrib/dialog/po/de.po
head/contrib/dialog/po/dialog.pot
head/contrib/dialog/po/es.po
head/contrib/dialog/po/hr.po
head/contrib/dialog/po/hu.po
head/contrib/dialog/po/lv.po
head/contrib/dialog/po/ro.po
head/contrib/dialog/po/tr.po
head/contrib/dialog/prgbox.c
head/contrib/dialog/progressbox.c
head/contrib/dialog/rangebox.c
head/contrib/dialog/rc.c
head/contrib/dialog/samples/programbox
head/contrib/dialog/samples/programbox2
head/contrib/dialog/samples/progress
head/contrib/dialog/samples/progress2
head/contrib/dialog/samples/setup-edit
head/contrib/dialog/samples/setup-tempfile
head/contrib/dialog/tailbox.c
head/contrib/dialog/textbox.c
head/contrib/dialog/timebox.c
head/contrib/dialog/trace.c
head/contrib/dialog/treeview.c
head/contrib/dialog/ui_getc.c
head/contrib/dialog/util.c
head/contrib/dialog/yesno.c
head/gnu/lib/libdialog/Makefile
head/gnu/lib/libdialog/dlg_config.h
head/gnu/usr.bin/dialog/Makefile
Directory Properties:
head/contrib/dialog/ (props changed)
Modified: head/contrib/dialog/CHANGES
==============================================================================
--- head/contrib/dialog/CHANGES Sat Oct 20 20:49:37 2018 (r339487)
+++ head/contrib/dialog/CHANGES Sat Oct 20 20:49:46 2018 (r339488)
@@ -1,9 +1,328 @@
--- $Id: CHANGES,v 1.476 2013/09/24 00:06:47 tom Exp $
+-- $Id: CHANGES,v 1.619 2018/06/21 09:19:45 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:
+2018/06/21
+ + improve file-offset computation in textbox.c (Werner Fink).
+ + fix an overlooked case with real_auto_size() to maximize when
+ height or width is given as -1.
+ + build-fixes for configure options "--disable-Xdialog2" and
+ "--disable-form"
+ + add traces for each widget to show its parameters.
+ + modify color scheme for mixedgauge to use the dialog window colors,
+ like the captions.
+ + fix a too-small malloc in the mixedgauge widget.
+ + fix a use-after-free in dlg_remove_callback().
+ + improve handling of SIGWINCH for several widgets (Debian #865840).
+ + menubox, the point of the Debian report was that it would be nice
+ to increase the window size if the terminal size increases. Did
+ that as a special case less problematic than decreasing the
+ terminal size. Added samples/menubox11 to demonstrate by
+ comparison with menubox10 a problem with debconf which puts extra
+ newlines in the caption that interfere with autowrap.
+ + progressbox and derived prgbox, programbox, now handle resizing.
+ + yesno, window was cleared
+ + add dlg_ttysize() to support new options, allowing scripts to obtain
+ some text-formatting details without initializing the terminal.
+ + add options --print-text-only, and --print-text-size for scripts that
+ adjust the widget size according to how the captions are formatted.
+ + improve dialog.pl:
+ + add demo.pl, to demonstrate the functions
+ + quote/escape string parameters passed to dialog.
+ + ensure all "integer" parameters are really integers.
+ + use actual screensize for list captions rather than assuming 24
+ lines.
+ + when trimming blanks, treat unconverted tabs the same as spaces.
+ + correct parameter to test when trimming blanks from the script,
+ e.g., with "--trim" (report by Jarno Suni).
+ + improve documentation of the various whitespace-filtering options,
+ to show which take precedence (Debian #867536, cf: Debian #102942).
+ + modify msgbox.c, yesno.c to bind SCROLLKEY_BINDINGS before
+ TRAVERSE_BINDINGS so that up/down arrow will by default scroll the
+ message up/down rather than be aliases for tab-traversal (report by
+ Fredrik Kers).
+ + modify dump_one_binding() to show when a binding is overridden.
+ + improve format of trace-file, making comment-syntax consistent,
+ as well as showing argv-splitting as a series of comments.
+ + modify dlg_string_to_argv() to change the quoting behavior to be
+ more consistent with shell behavior (patch by Denilson Sa Maia).
+ + modify dlg_getc() to return ESC when a timeout expires, notifying
+ callers that a quit occurred rather than exiting the application
+ (suggested by Rodrigo Freitas).
+ + modify handle_inputs() to ensure cursor-visibility is restored when
+ there is no input character available (report by Guillaume Vareille).
+ + improve comment in manual page regarding which widgets can use the
+ "--help-button" (prompted by discussion with Csanyi Pal).
+ + add a check for valid object pointer in tailbox's main loop since
+ the getc-callback may have been freed within ui_getc.c (report by
+ "David").
+ + improved configure macros for ncurses: CF_GNU_SOURCE, CF_SHARED_OPTS,
+ CF_CURSES_LIBS, CF_CURSES_FUNCS, CF_NCURSES_CONFIG
+ + improved configure script checks for groff vs man2html:
+ CF_PROG_GROFF and CF_WITH_MAN2HTML
+ + build-fix from lynx for AM_WITH_NLS configure macro
+ + update config.guess, config.sub
+
+2017/12/09
+ + update ftp url in test-packages.
+ + modify test-packages to use recommended compiler/linker flags.
+ + improved configure macros AM_WITH_NLS, CF_CC_ENV_FLAGS,
+ CF_CURSES_LIBS, CF_NCURSES_CONFIG, CF_SHARED_OPTS, CF_WITH_LIBTOOL,
+ CF__INTL_BODY.
+ + update config.guess, config.sub
+
+2017/05/09
+ + improved configure macros CF_ADD_CFLAGS, CF_CC_ENV_FLAGS, and
+ CF_SHARED_OPTS.
+ + updated hu.po and tr.po from
+ http://translationproject.org/latest/dialog/
+ + update config.guess, config.sub
+
+2017/01/31
+ + use DLG_TRACE macro consistently to make "--disable-trace" configure
+ option work.
+ + modify buildlist widget to support option "--reorder" for to allow
+ user to reorder the data based on the sequence of selections
+ (discussion with Paraic O'Ceallaigh).
+ + fill background color on unused parts of buildlist.
+ + fix a minor error in buildlist which let pageup switch columns.
+ + change several calls to dlg_trace_msg to prefix with "#" to make
+ the trace logs more consistent for parsing.
+ + add samples/run_test.sh
+ + further improve performance with very long command-lines by changes
+ to howmany_tags().
+ + modify dlg_string_to_argv() to convert escaped double-quotes to
+ plain double-quotes when within a double-quoted string.
+ + modify makefile to apply CFLAGS to linking
+ + modify dlg_string_to_argv() to ignore escaped newlines except when
+ quoted, fixing a problem with samples/checklist9.
+ + interpret $DIALOGOPTS before expanding "--file", etc., to allow
+ the environment variable to turn on tracing in that process.
+ + improve performance when processing very long command lines, e.g.,
+ using "--file" by changing dialog_opts[] to an array of pointers to
+ the expanded argv[] (discussion with Lars Tauber).
+ + modified autoconf macros
+ + CF_CC_ENV_FLAGS amend the last change to move only the
+ preprocessor, optimization and warning flags to CPPFLAGS and
+ CFLAGS, leaving the residue in CC. That happens to work for gcc's
+ various "model" options, but may require tuning for other compilers
+ + CF_LARGEFILE workaround for clang exit-code vs warnings
+ + CF_MATH_LIB quiet strict gcc warning
+ + CF_WITH_LIBTOOL fix a few places in configure/build scripts where
+ DESTDIR and rpath were combined
+ + CF_XOPEN_SOURCE add "uclinux" to list of Linux's
+ + update config.guess, config.sub
+
+2016/11/20
+ + added fur.po (Friulian) from
+ http://translationproject.org/latest/dialog/
+
+2016/08/28
+ + improve parsing and trace for "bindkey", to convert space to/from
+ "\s", as well as handle octal escapes for single byte characters.
+ + change explicit checks for space character used for select or toggle
+ to make this rebindable to "TOGGLE" (prompted by discussion with
+ Paul van Tilburg).
+ + add default bindings for cursor left/right to formbox. The cursor
+ left/right cases were replaced with rebindable symbols in 2005/12/07
+ without providing these keys as default values (report/patch by
+ Miroslav Lichvar).
+ + modified autoconf macros
+ + CF_PROG_LINT add cpplint to programs to use; drop ad hoc tdlint and
+ alint.
+ + CF_CC_ENV_FLAGS don't limit the check to -I, -U and -D options,
+ since the added options can include various compiler options before
+ and after preprocessor options.
+ + CF_GNU_SOURCE recent glibc (Debian 2.23-4 for example) has
+ misordered ifdef/checks for new symbol _DEFAULT_SOURCE, producing
+ warning messages when only _GNU_SOURCE is defined. Add a followup
+ check to define _DEFAULT_SOURCE.
+ + CF_XOPEN_SOURCE use _GNU_SOURCE for cygwin headers, tested with
+ cygwin 2.3, 2.5 (patch by Corinna Vinschen).
+ + mention --no-collapse option in manual page description of
+ --tab-correct option.
+ + update config.guess, config.sub
+
+2016/04/24
+ + fix a special case in drawing shadow on a line-drawing cell where the
+ alternate-character set flag was lost (report by Martin Kravec).
+ + fix a regression from 2015/05/13 changes for escaping; it is
+ necessary to retain backslashes within quotes to make "\Z" escapes
+ work (report by Marcin Krol).
+ + fix test package for RPMs; changes in 2015 omitted symbolic links
+ for the library.
+ + fix typo in help message for "--buildlist" (report by Rihards Olups).
+ + modified autoconf macros
+ + CF_PROG_AR, CF_AR_FLAGS added to improve check for archive tool.
+ + CF_LD_RPATH_OPT, change FreeBSD to use -Wl,-rpath rather than
+ -rpath option. According to FreeBSD #178732, either works since
+ FreeBSD 4.x; however scons does not accept anything except the
+ -Wl,-rpath form.
+ + CF_WITH_NCURSES_ETC, change from ncurses to check for pthreads
+ dependency.
+
+2016/02/09
+ + modify editbox widget to add a trailing newline if the text has none
+ to ensure the last line is not ignored (report by Florent Rougon).
+ + change mouse initialization to look for button-presses rather than
+ button-clicks, for better response.
+ + modify dump_curses_key() to show mouse-coding in readable form.
+ + correct mapping of mouse-clicks on the day-grid in calendar widget
+ when "--week-start" is used to set the start of the week (report by
+ Stefan Vogtner).
+ > integrated changes from Stefan Vogtner:
+ + use Gregorian algorithm for leap year
+ + use mktime if available; calendar was written just as it became
+ standard.
+
+2016/01/26 - release 1.3
+ + correct --infobox documentation, which said it shows an OK button.
+ + fix a couple of place in test-scripts which referred to $SIG_TRAP
+ rather than $SIG_QUIT
+ + reorganize dialog.3, to use subsections for generating navigation
+ pane, using man2html
+ + add "--week-start" option for calendar widget (prompted by discussion
+ with Stefan Vogtner).
+ + add a limit-check in editbox.c to ensure that mouse-clicks outside
+ the filled-in text area do not access past the end of the array
+ (report by Stefan Vogtner).
+ + update configure macros from ncurses changes.
+ + update config.guess, config.sub
+
+2015/09/20
+ + decrease table value for minimum number of arguments for the widgets
+ which use --no-items option (report by Raven Singularity).
+ + update configure macros:
+ + use $SHELL consistently, deprecate non-POSIX shell
+ + PKG_CONFIG may simply be unset - fix
+ + add option to allow changing ABI version, from ncurses6.
+
+2015/05/28
+ + fixes for two autoconf macros, CF_ADD_INCDIR and CF_NCURSES_CONFIG
+ from work on ncurses.
+ + build-fix for NetBSD curses (patch by Matthias Scheler).
+
+2015/05/13
+ + add configure option --with-install-prefix, like ncurses.
+ + add --with-screen and related configure options from ncurses-examples
+ to allow building with ncurses6 test-packages.
+ + update configure macros for improved coding style from lynx changes.
+ + updated ro.po from
+ http://translationproject.org/latest/dialog/
+ + update config.guess, config.sub
+ > patches by Florent Rougon:
+ + fix two bugs in the "--file" option.
+ + When the number of arguments read from the included file is 0, the
+ code used to just skip over '--file' and its argument instead of
+ removing them from the argument list, causing "Error: Unknown
+ option --file" later on.
+ + In the alternative case (at least one argument read from the file),
+ the previous code used to do '--j;' in order to "force rescan" of
+ the inserted arguments. However, control then flowed to outer
+ blocks where a '++j;' counteracted this measure, causing "Error:
+ Unknown option --msgbox" (for instance) later on.
+ + modify escaping in argv.c to be more uniform, whether or not the
+ backslash is found within a parameter.
+
+2015/02/25
+ + modify gauge widget to keep from erasing a second gauge widget, e.g.,
+ via the "--and-widget" option. This is a cosmetic change to match
+ behavior of dialog 1.0 (report by Jason Orendorf).
+ + add configure option "--with-man2html"
+ + add configure options for versioned symbols, from ongoing work on
+ ncurses.
+ + update configure macros, e.g., for shared libraries
+
+2015/01/25
+ + suppress highlighting of character which denotes an abbreviation or
+ shortcut for the OK/Cancel and other buttons for these widgets, which
+ use abbreviations for the list shown on the screen: buildlist,
+ checklist/radiobox, menubox, treeview (Debian #775295).
+ + add grid up/left and down/right bindings in editbox.c as synonyms for
+ field prev and next, respectively when handling the OK/Cancel buttons
+ (Debian #775294).
+
+2014/09/11
+ + correct malloc-size for change to prgbox.
+
+2014/09/10
+ + fixes to make "-c" option work when passing command to shell for the
+ prgbox widget, for example in samples/prgbox2 (report by Korantin
+ Auguste).
+
+2014/09/08
+ + fix an out-of-bounds array index in buildlist widget (report by
+ Cade Foster).
+
+2014/09/01
+ + add configure check for groff, needed for html/ps/pdf output.
+ + update configure-script macros:
+ + CF_ACVERSION_CHECK - work around another gratuitous incompatibility
+ introduced in 2.69
+ + CF_ADD_CFLAGS - workaround for ash-shell, e.g., with Minix
+ + CF_ADD_LIBS - filter out duplicates
+ + CF_CURSES_FUNCS - improve workaround for weak-linkage, seems to fix
+ tests with NetBSD 6.1
+ + CF_INTEL_COMPILER - clean up the -no-gcc option which was leftover
+ from testing.
+ + CF_LIB_SUFFIX - change suffix for AIX shared libraries to ".so".
+ + CF_MAKEFLAGS - workaround for GNU make 4.0 incompatibility with
+ previous releases.
+ + CF_XOPEN_SOURCE - add cases for Minix, UnixWare and improve the
+ workaround for Solaris.
+ + improve comparison in compare_cache() function, in case difference
+ between pointers does not fit in int's.
+ + updated de.po, es.po, hu.po, lv.po from
+ http://translationproject.org/latest/dialog/
+ + update config.guess, config.sub
+
+2014/02/19
+ + cleanup of manpages prompted by Gislason's comments.
+ + several changes to manpages to improve presentation (patches by
+ Bjarni I. Gislason, Debian #739180, Debian #739181)
+ + use "\/" when transitioning from italic to normal font
+ + correct an instance of "e.g,."
+ + use "\e" rather than "\\" to present a literal "\"
+ + improve formatting of table header
+ + remove some excess space-characters
+ + change a reference 0-9 to use "through" as the connector
+ + use "\&" to separate "." from a space to make the space shorter
+ + change a list's TP macro parameters to make the hanging text align
+ better with the adjacent paragraph
+ + add comma in a few places before "and" in a list
+ + separate units from numbers with a nonfillable space
+ + replace "-" with en-dash in a few places
+ + corrected argument indices after "--args" and "--file" to rescan the
+ argument list after removing/substituting those options.
+ + fix loops for "--file" option to handle cases with zero or no tokens at
+ all substituted (Redhat #1066168).
+ + add gd.po from
+ http://translationproject.org/latest/dialog/
+
+2014/01/12
+ + improve calculation for amount to scroll in programbox when an "Ok"
+ button might obscure part of the data (report by Florent Rougon).
+ + modify program to permit --separate-output to be used with buildlist
+ and treeview widgets (report by Florent Rougon).
+ + add list-height parameter to manpage description of --buildlist
+ (report by Florent Rougon).
+ + minor fixes to dialog.1 manpage; the reported problem was actually
+ fixed in 20120703 (Debian #726233, patch by Bjarni Ingi Gislason).
+ + add a "Hello World" example to dialog.3 manpage (prompted by
+ discussions with Dustin Oprea, Kevin Ingwersen).
+ + correct comparison in dlg_lookup_key() so that using "bindkey" with
+ a "*" wildcard parameter works as documented (report by Stewart
+ Benedict).
+ + updated configure macros, fixes for clang and mingw.
+ + update config.guess, config.sub
+
+2013/09/28
+ + fix a regression in gauge widget from 2013/09/28 changes;
+ dlg_reallocate_gauge() failed when no --title option was given
+ (report by Tritonas Insomnia).
+
2013/09/23
+ fix samples/inputbox6-utf8, which had depended unnecessarily on bash.
+ improve memory caching for wide-character manipulation in gauge
@@ -434,7 +753,7 @@ to it:
to display (Debian #579390).
+ add makefile rules for generating html, etc., documentation from
nroff.
- > patches by Samuel Martín Moro
+ > patches by Samuel Martin Moro
+ reset errors in tailbox before reading new character.
+ modify dlg_draw_scrollbar(), omitting hiding percentages in boxes
when no arrows or scrollbar are needed.
Modified: head/contrib/dialog/VERSION
==============================================================================
--- head/contrib/dialog/VERSION Sat Oct 20 20:49:37 2018 (r339487)
+++ head/contrib/dialog/VERSION Sat Oct 20 20:49:46 2018 (r339488)
@@ -1 +1 @@
-11:1:0 1.2 20130923
+15:0:0 1.3 20180621
Modified: head/contrib/dialog/aclocal.m4
==============================================================================
--- head/contrib/dialog/aclocal.m4 Sat Oct 20 20:49:37 2018 (r339487)
+++ head/contrib/dialog/aclocal.m4 Sat Oct 20 20:49:46 2018 (r339488)
@@ -1,7 +1,7 @@
dnl macros used for DIALOG configure script
-dnl $Id: aclocal.m4,v 1.94 2013/09/22 14:26:24 tom Exp $
+dnl $Id: aclocal.m4,v 1.120 2018/06/21 00:30:26 tom Exp $
dnl ---------------------------------------------------------------------------
-dnl Copyright 1999-2012,2013 -- Thomas E. Dickey
+dnl Copyright 1999-2017,2018 -- 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
@@ -31,7 +31,7 @@ dnl see
dnl http://invisible-island.net/autoconf/
dnl ---------------------------------------------------------------------------
dnl ---------------------------------------------------------------------------
-dnl AM_GNU_GETTEXT version: 13 updated: 2012/11/09 05:47:26
+dnl AM_GNU_GETTEXT version: 14 updated: 2015/04/15 19:08:48
dnl --------------
dnl Usage: Just like AM_WITH_NLS, which see.
AC_DEFUN([AM_GNU_GETTEXT],
@@ -73,7 +73,7 @@ strdup strtoul tsearch __argz_count __argz_stringify _
# presentlang can be used as a fallback for messages
# which are not translated in the desiredlang catalog).
case "$desiredlang" in
- "$presentlang"*) useit=yes;;
+ ("$presentlang"*) useit=yes;;
esac
done
if test $useit = yes; then
@@ -167,7 +167,7 @@ size_t iconv();
AC_SUBST(LIBICONV)
])dnl
dnl ---------------------------------------------------------------------------
-dnl AM_LANGINFO_CODESET version: 3 updated: 2002/10/27 23:21:42
+dnl AM_LANGINFO_CODESET version: 4 updated: 2015/04/18 08:56:57
dnl -------------------
dnl Inserted as requested by gettext 0.10.40
dnl File from /usr/share/aclocal
@@ -178,19 +178,19 @@ dnl
dnl From Bruno Haible.
AC_DEFUN([AM_LANGINFO_CODESET],
[
- AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
- [AC_TRY_LINK([#include <langinfo.h>],
- [char* cs = nl_langinfo(CODESET);],
- am_cv_langinfo_codeset=yes,
- am_cv_langinfo_codeset=no)
- ])
- if test $am_cv_langinfo_codeset = yes; then
- AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
- [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
- fi
+AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
+ [AC_TRY_LINK([#include <langinfo.h>],
+ [char* cs = nl_langinfo(CODESET);],
+ am_cv_langinfo_codeset=yes,
+ am_cv_langinfo_codeset=no)
+ ])
+ if test $am_cv_langinfo_codeset = yes; then
+ AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
+ [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
+ fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl AM_LC_MESSAGES version: 4 updated: 2002/10/27 23:21:42
+dnl AM_LC_MESSAGES version: 5 updated: 2015/05/10 19:52:14
dnl --------------
dnl Inserted as requested by gettext 0.10.40
dnl File from /usr/share/aclocal
@@ -211,17 +211,17 @@ 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
+[if test $ac_cv_header_locale_h = yes; then
+ AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
+ [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
+ am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
+ if test $am_cv_val_LC_MESSAGES = yes; then
+ AC_DEFINE(HAVE_LC_MESSAGES, 1,
+ [Define if your <locale.h> file defines LC_MESSAGES.])
+ fi
+fi])dnl
dnl ---------------------------------------------------------------------------
-dnl AM_PATH_PROG_WITH_TEST version: 8 updated: 2009/01/11 20:31:12
+dnl AM_PATH_PROG_WITH_TEST version: 9 updated: 2015/04/15 19:08:48
dnl ----------------------
dnl Inserted as requested by gettext 0.10.40
dnl File from /usr/share/aclocal
@@ -250,10 +250,10 @@ set dummy $2; ac_word=[$]2
AC_MSG_CHECKING([for $ac_word])
AC_CACHE_VAL(ac_cv_path_$1,
[case "[$]$1" in
- [[\\/]*|?:[\\/]]*)
+ ([[\\/]*|?:[\\/]]*)
ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
;;
- *)
+ (*)
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
for ac_dir in ifelse([$5], , $PATH, [$5]); do
test -z "$ac_dir" && ac_dir=.
@@ -280,7 +280,7 @@ fi
AC_SUBST($1)dnl
])dnl
dnl ---------------------------------------------------------------------------
-dnl AM_WITH_NLS version: 25 updated: 2012/10/06 08:57:51
+dnl AM_WITH_NLS version: 29 updated: 2018/02/21 21:26:03
dnl -----------
dnl Inserted as requested by gettext 0.10.40
dnl File from /usr/share/aclocal
@@ -354,6 +354,8 @@ AC_DEFUN([AM_WITH_NLS],
dnl If we use NLS figure out what method
if test "$USE_NLS" = "yes"; then
+ dnl We need to process the po/ directory.
+ POSUB=po
AC_DEFINE(ENABLE_NLS, 1,
[Define to 1 if translation of program messages to the user's native language
is requested.])
@@ -367,20 +369,49 @@ AC_DEFUN([AM_WITH_NLS],
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 use. If GNU gettext is available we use this. Else we may have
dnl to fall back to GNU NLS library.
CATOBJEXT=NONE
+ dnl Save these (possibly-set) variables for reference. If the user
+ dnl overrode these to provide full pathnames, then warn if not actually
+ dnl GNU gettext, but do not override their values. Also, if they were
+ dnl overridden, suppress the part of the library test which prevents it
+ dnl from finding anything other than GNU gettext. Doing this also
+ dnl suppresses a bogus search for the intl library.
+ cf_save_msgfmt_path="$MSGFMT"
+ cf_save_xgettext_path="$XGETTEXT"
+
+ 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)
+ AC_SUBST(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], :)
+
+ cf_save_OPTS_1="$CPPFLAGS"
+ if test "x$cf_save_msgfmt_path" = "x$MSGFMT" && \
+ test "x$cf_save_xgettext_path" = "x$XGETTEXT" ; then
+ CF_ADD_CFLAGS(-DIGNORE_MSGFMT_HACK)
+ fi
+
cf_save_LIBS_1="$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,
+
+ CF_FIND_LINKAGE(CF__INTL_HEAD,
+ CF__INTL_BODY($2),
intl,
cf_cv_func_gettext=yes,
cf_cv_func_gettext=no)
- ])
+
+ AC_MSG_CHECKING([for libintl.h and gettext()])
+ AC_MSG_RESULT($cf_cv_func_gettext)
+
LIBS="$cf_save_LIBS_1"
+ CPPFLAGS="$cf_save_OPTS_1"
if test "$cf_cv_func_gettext" = yes ; then
AC_DEFINE(HAVE_LIBINTL_H,1,[Define to 1 if we have libintl.h])
@@ -408,160 +439,151 @@ AC_DEFUN([AM_WITH_NLS],
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
+ elif test -z "$MSGFMT" || test -z "$XGETTEXT" ; then
+ AC_MSG_WARN(disabling NLS feature)
+ sed -e /ENABLE_NLS/d confdefs.h >confdefs.tmp
+ mv confdefs.tmp confdefs.h
+ ALL_LINGUAS=
+ CATOBJEXT=.ignored
+ MSGFMT=":"
+ GMSGFMT=":"
+ XGETTEXT=":"
+ POSUB=
+ BUILD_INCLUDED_LIBINTL=no
+ USE_INCLUDED_LIBINTL=no
+ USE_NLS=no
+ nls_cv_use_gnu_gettext=no
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
+ nls_cv_use_gnu_gettext=maybe
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
+ if test "$nls_cv_use_gnu_gettext" != "no"; then
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/ $//'`
+ if test -f $srcdir/intl/libintl.h ; then
+ dnl Mark actions used to generate GNU NLS library.
+ INTLOBJS="\$(GETTOBJS)"
+ BUILD_INCLUDED_LIBINTL=yes
+ USE_INCLUDED_LIBINTL=yes
+ 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/ $//'`
+ elif test "$nls_cv_use_gnu_gettext" = "yes"; then
+ nls_cv_use_gnu_gettext=no
+ AC_MSG_WARN(no NLS library is packaged with this application)
+ fi
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=":"
+ AC_MSG_WARN([found msgfmt program is not GNU msgfmt])
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=":"
+ AC_MSG_WARN([found xgettext program is not GNU xgettext])
fi
fi
-
- dnl We need to process the po/ directory.
- POSUB=po
fi
- AC_OUTPUT_COMMANDS(
- [for ac_file in $CONFIG_FILES; do
+ if test "$XGETTEXT" != ":"; then
+ 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
+ # 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"
+ # 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" ;;
+ 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])
- 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 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])
+ 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].*)
+ 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])
+ 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
- if test $ac_verc_fail = yes; then
- INTLBISON=:
- 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
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)
@@ -590,7 +612,7 @@ changequote([,])dnl
AC_SUBST(GENCAT)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_ACVERSION_CHECK version: 4 updated: 2013/03/04 19:52:56
+dnl CF_ACVERSION_CHECK version: 5 updated: 2014/06/04 19:11:49
dnl ------------------
dnl Conditionally generate script according to whether we're using a given autoconf.
dnl
@@ -599,7 +621,7 @@ dnl $2 = code to use if AC_ACVERSION is at least as hi
dnl $3 = code to use if AC_ACVERSION is older than $1.
define([CF_ACVERSION_CHECK],
[
-ifdef([AC_ACVERSION], ,[m4_copy([m4_PACKAGE_VERSION],[AC_ACVERSION])])dnl
+ifdef([AC_ACVERSION], ,[ifdef([AC_AUTOCONF_VERSION],[m4_copy([AC_AUTOCONF_VERSION],[AC_ACVERSION])],[m4_copy([m4_PACKAGE_VERSION],[AC_ACVERSION])])])dnl
ifdef([m4_version_compare],
[m4_if(m4_version_compare(m4_defn([AC_ACVERSION]), [$1]), -1, [$3], [$2])],
[CF_ACVERSION_COMPARE(
@@ -616,7 +638,7 @@ define([CF_ACVERSION_COMPARE],
[ifelse([$8], , ,[$8])],
[ifelse([$9], , ,[$9])])])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_ADD_CFLAGS version: 10 updated: 2010/05/26 05:38:42
+dnl CF_ADD_CFLAGS version: 13 updated: 2017/02/25 18:57:40
dnl -------------
dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS
dnl The second parameter if given makes this macro verbose.
@@ -634,51 +656,51 @@ cf_new_extra_cppflags=
for cf_add_cflags in $1
do
case $cf_fix_cppflags in
-no)
- case $cf_add_cflags in #(vi
- -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
+(no)
+ case $cf_add_cflags in
+ (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
case $cf_add_cflags in
- -D*)
+ (-D*)
cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[[^=]]*='\''\"[[^"]]*//'`
- test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+ test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
&& test -z "${cf_tst_cflags}" \
&& cf_fix_cppflags=yes
if test $cf_fix_cppflags = yes ; then
- cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+ CF_APPEND_TEXT(cf_new_extra_cppflags,$cf_add_cflags)
continue
elif test "${cf_tst_cflags}" = "\"'" ; then
- cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+ CF_APPEND_TEXT(cf_new_extra_cppflags,$cf_add_cflags)
continue
fi
;;
esac
case "$CPPFLAGS" in
- *$cf_add_cflags) #(vi
+ (*$cf_add_cflags)
;;
- *) #(vi
- case $cf_add_cflags in #(vi
- -D*)
+ (*)
+ case $cf_add_cflags in
+ (-D*)
cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,$cf_tst_cppflags)
;;
esac
- cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+ CF_APPEND_TEXT(cf_new_cppflags,$cf_add_cflags)
;;
esac
;;
- *)
- cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+ (*)
+ CF_APPEND_TEXT(cf_new_cflags,$cf_add_cflags)
;;
esac
;;
-yes)
- cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+(yes)
+ CF_APPEND_TEXT(cf_new_extra_cppflags,$cf_add_cflags)
cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[[^"]]*"'\''//'`
- test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+ test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
&& test -z "${cf_tst_cflags}" \
&& cf_fix_cppflags=no
;;
@@ -687,24 +709,24 @@ done
if test -n "$cf_new_cflags" ; then
ifelse([$2],,,[CF_VERBOSE(add to \$CFLAGS $cf_new_cflags)])
- CFLAGS="$CFLAGS $cf_new_cflags"
+ CF_APPEND_TEXT(CFLAGS,$cf_new_cflags)
fi
if test -n "$cf_new_cppflags" ; then
ifelse([$2],,,[CF_VERBOSE(add to \$CPPFLAGS $cf_new_cppflags)])
- CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+ CF_APPEND_TEXT(CPPFLAGS,$cf_new_cppflags)
fi
if test -n "$cf_new_extra_cppflags" ; then
ifelse([$2],,,[CF_VERBOSE(add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags)])
- EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+ CF_APPEND_TEXT(EXTRA_CPPFLAGS,$cf_new_extra_cppflags)
fi
AC_SUBST(EXTRA_CPPFLAGS)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_ADD_INCDIR version: 13 updated: 2010/05/26 16:44:57
+dnl CF_ADD_INCDIR version: 15 updated: 2018/06/20 20:23:13
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,
@@ -735,7 +757,7 @@ if test -n "$1" ; then
if test "$GCC" = yes
then
cf_save_CPPFLAGS=$CPPFLAGS
- CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ CF_APPEND_TEXT(CPPFLAGS,-I$cf_add_incdir)
AC_TRY_COMPILE([#include <stdio.h>],
[printf("Hello")],
[],
@@ -755,6 +777,8 @@ if test -n "$1" ; then
else
break
fi
+ else
+ break
fi
done
done
@@ -769,7 +793,7 @@ 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 CF_ADD_LIBDIR version: 10 updated: 2015/04/18 08:56:57
dnl -------------
dnl Adds to the library-path
dnl
@@ -781,39 +805,70 @@ dnl
AC_DEFUN([CF_ADD_LIBDIR],
[
if test -n "$1" ; then
- for cf_add_libdir in $1
- do
- if test $cf_add_libdir = /usr/lib ; then
- :
- elif test -d $cf_add_libdir
- then
- cf_have_libdir=no
- if test -n "$LDFLAGS$LIBS" ; then
- # a loop is needed to ensure we can add subdirs of existing dirs
- for cf_test_libdir in $LDFLAGS $LIBS ; do
- if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
- cf_have_libdir=yes; break
- fi
- done
- fi
- if test "$cf_have_libdir" = no ; then
- CF_VERBOSE(adding $cf_add_libdir to library-path)
- ifelse([$2],,LDFLAGS,[$2])="-L$cf_add_libdir $ifelse([$2],,LDFLAGS,[$2])"
- fi
- fi
- done
+ for cf_add_libdir in $1
+ do
+ if test $cf_add_libdir = /usr/lib ; then
+ :
+ elif test -d $cf_add_libdir
+ then
+ cf_have_libdir=no
+ if test -n "$LDFLAGS$LIBS" ; then
+ # a loop is needed to ensure we can add subdirs of existing dirs
+ for cf_test_libdir in $LDFLAGS $LIBS ; do
+ if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+ cf_have_libdir=yes; break
+ fi
+ done
+ fi
+ if test "$cf_have_libdir" = no ; then
+ CF_VERBOSE(adding $cf_add_libdir to library-path)
+ ifelse([$2],,LDFLAGS,[$2])="-L$cf_add_libdir $ifelse([$2],,LDFLAGS,[$2])"
+ fi
+ fi
+ done
fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_ADD_LIBS version: 1 updated: 2010/06/02 05:03:05
+dnl CF_ADD_LIBS version: 2 updated: 2014/07/13 14:33:27
dnl -----------
-dnl Add one or more libraries, used to enforce consistency.
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-head
mailing list