From owner-dev-commits-src-all@freebsd.org Fri Feb 26 09:07:11 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5191755B0D1 for ; Fri, 26 Feb 2021 09:07:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Dn3gz1r8mz3HBk; Fri, 26 Feb 2021 09:07:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 31DDA27A7A; Fri, 26 Feb 2021 09:07:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 11Q97B7K048079; Fri, 26 Feb 2021 09:07:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 11Q97AwK048078; Fri, 26 Feb 2021 09:07:10 GMT (envelope-from git) Date: Fri, 26 Feb 2021 09:07:10 GMT Message-Id: <202102260907.11Q97AwK048078@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Baptiste Daroussin Subject: git: 01b7bcd408fd - vendor/dialog - dialog: vendor import version 1.3-20210117 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/vendor/dialog X-Git-Reftype: branch X-Git-Commit: 01b7bcd408fd9e9dc9088b1df5761fcc0971d7e1 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Feb 2021 09:07:11 -0000 The branch vendor/dialog has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=01b7bcd408fd9e9dc9088b1df5761fcc0971d7e1 commit 01b7bcd408fd9e9dc9088b1df5761fcc0971d7e1 Author: Baptiste Daroussin AuthorDate: 2021-02-26 09:05:35 +0000 Commit: Baptiste Daroussin CommitDate: 2021-02-26 09:05:35 +0000 dialog: vendor import version 1.3-20210117 --- CHANGES | 217 +- README | 4 +- VERSION | 2 +- aclocal.m4 | 1540 ++- argv.c | 43 +- arrows.c | 16 +- buildlist.c | 45 +- buttons.c | 99 +- calendar.c | 95 +- checklist.c | 28 +- columns.c | 13 +- config.guess | 401 +- config.sub | 1627 +-- configure | 26980 +++++++++++++++++++++------------------ configure.in | 30 +- dialog-config.in | 148 +- dialog.1 | 549 +- dialog.3 | 439 +- dialog.c | 777 +- dialog.h | 80 +- dlg_colors.h | 82 +- dlg_internals.h | 47 + dlg_keys.c | 113 +- dlg_keys.h | 12 +- editbox.c | 55 +- formbox.c | 24 +- fselect.c | 121 +- guage.c | 17 +- inputbox.c | 40 +- inputstr.c | 22 +- makefile.in | 13 +- menubox.c | 59 +- mixedgauge.c | 19 +- mousewget.c | 9 +- msgbox.c | 42 +- package/debian/changelog | 108 + package/debian/compat | 2 +- package/debian/control | 9 + package/debian/copyright | 6 +- package/debian/rules | 36 +- package/dialog.map | 43 +- package/dialog.spec | 57 +- package/dialog.sym | 25 +- package/freebsd/Makefile | 2 +- pause.c | 21 +- po/ast.po | 115 + po/dialog.pot | 44 +- po/hi.po | 47 +- po/ja.po | 48 +- po/pt.po | 53 +- po/ro.po | 1 - po/sq.po | 88 +- prgbox.c | 11 +- progressbox.c | 41 +- rangebox.c | 45 +- rc.c | 305 +- headers.sh => run_test.sh | 107 +- samples/buildlist | 4 +- samples/buildlist2 | 10 +- samples/buildlist4 | 22 + samples/calendar | 6 +- samples/calendar-stdout | 6 +- samples/calendar2 | 6 +- samples/calendar2-stdout | 6 +- samples/calendar3 | 6 +- samples/calendar3-stdout | 6 +- samples/checklist | 4 +- samples/checklist-8bit | 18 +- samples/checklist-utf8 | 4 +- samples/checklist1 | 4 +- samples/checklist10 | 4 +- samples/checklist11 | 4 +- samples/checklist12 | 6 +- samples/checklist2 | 4 +- samples/checklist3 | 4 +- samples/checklist4 | 4 +- samples/checklist5 | 4 +- samples/checklist6 | 4 +- samples/checklist7 | 4 +- samples/checklist8 | 4 +- samples/checklist9 | 4 +- samples/copifuncs/copi.ifmcfg2 | 4 +- samples/copifuncs/copi.ifmcfg4 | 4 +- samples/dialog.py | 6 +- samples/dselect | 6 +- samples/editbox | 4 +- samples/editbox-utf8 | 4 +- samples/editbox2 | 4 +- samples/editbox3 | 4 +- samples/editbox4 | 4 +- samples/form1 | 16 +- samples/form1-both | 16 +- samples/form1-extra | 16 +- samples/form1-help | 16 +- samples/form1-utf8 | 16 +- samples/form2 | 8 +- samples/form3 | 8 +- samples/form4 | 8 +- samples/form5 | 8 +- samples/form6 | 8 +- samples/fselect | 6 +- samples/fselect-stdout | 6 +- samples/fselect0 | 6 +- samples/fselect1 | 8 +- samples/fselect1-stdout | 8 +- samples/fselect2 | 6 +- samples/fselect2-stdout | 6 +- samples/gauge2 | 4 +- samples/infobox | 4 +- samples/infobox1 | 4 +- samples/infobox2 | 4 +- samples/infobox3 | 4 +- samples/infobox4 | 4 +- samples/infobox5 | 4 +- samples/infobox6 | 4 +- samples/inputbox | 4 +- samples/inputbox-both | 4 +- samples/inputbox-extra | 4 +- samples/inputbox-help | 4 +- samples/inputbox1 | 4 +- samples/inputbox2 | 4 +- samples/inputbox3 | 4 +- samples/inputbox4 | 6 +- samples/inputbox5 | 4 +- samples/inputbox6-8bit | 10 +- samples/inputbox6-utf8 | 4 +- samples/inputbox7 | 6 +- samples/inputmenu | 12 +- samples/inputmenu-stdout | 12 +- samples/inputmenu1 | 12 +- samples/inputmenu2 | 12 +- samples/inputmenu3 | 14 +- samples/inputmenu4 | 12 +- samples/install/setup.c | 2 +- samples/install/setup.help | 2 +- samples/killall | 14 +- samples/menubox | 8 +- samples/menubox-8bit | 16 +- samples/menubox-utf8 | 4 +- samples/menubox1 | 8 +- samples/menubox10 | 6 +- samples/menubox11 | 6 +- samples/menubox12 | 10 +- samples/menubox2 | 12 +- samples/menubox3 | 8 +- samples/menubox4 | 8 +- samples/menubox5 | 10 +- samples/menubox6 | 8 +- samples/menubox7 | 8 +- samples/menubox8 | 12 +- samples/menubox9 | 6 +- samples/mixedform | 16 +- samples/mixedform2 | 16 +- samples/msgbox | 4 +- samples/msgbox-help | 4 +- samples/msgbox-utf8 | 4 +- samples/msgbox1 | 12 +- samples/msgbox2 | 12 +- samples/msgbox3 | 4 +- samples/msgbox4-8bit | 20 +- samples/msgbox4-utf8 | 18 +- samples/msgbox5 | 4 +- samples/msgbox6 | 4 +- samples/msgbox6a | 4 +- samples/password | 4 +- samples/password1 | 4 +- samples/password2 | 4 +- samples/passwordform1 | 16 +- samples/passwordform1-utf8 | 16 +- samples/pause | 4 +- samples/pause-both | 6 +- samples/pause-extra | 6 +- samples/pause-help | 4 +- samples/prgbox | 4 +- samples/prgbox2 | 4 +- samples/programbox | 4 +- samples/programbox2 | 4 +- samples/programbox3 | 22 + samples/progress | 4 +- samples/progress2 | 4 +- samples/radiolist | 4 +- samples/radiolist1 | 4 +- samples/radiolist10 | 4 +- samples/radiolist2 | 4 +- samples/radiolist3 | 4 +- samples/radiolist4 | 4 +- samples/rangebox | 6 +- samples/rangebox2 | 6 +- samples/rangebox3 | 6 +- samples/rangebox4 | 6 +- samples/report-button | 10 +- samples/report-edit | 10 +- samples/report-string | 18 +- samples/report-tempfile | 18 +- samples/report-yesno | 10 +- samples/rotated-data | 6 +- samples/run_test.sh | 10 +- samples/setup-vars | 29 +- samples/tailbox | 4 +- samples/tailboxbg | 4 +- samples/tailboxbg1 | 6 +- samples/tailboxbg2 | 6 +- samples/testdata-8bit | 0 samples/textbox | 6 +- samples/textbox-both | 8 +- samples/textbox-help | 8 +- samples/textbox2 | 6 +- samples/textbox3 | 8 +- samples/timebox | 6 +- samples/timebox-stdout | 6 +- samples/timebox2 | 6 +- samples/timebox2-stdout | 6 +- samples/treeview | 4 +- samples/treeview2 | 6 +- samples/treeview4 | 24 + samples/wheel | 81 +- samples/yesno | 4 +- samples/yesno-both | 4 +- samples/yesno-extra | 4 +- samples/yesno-help | 4 +- samples/yesno-utf8 | 4 +- samples/yesno2 | 4 +- samples/yesno3 | 4 +- samples/yesno4 | 4 +- tailbox.c | 40 +- textbox.c | 142 +- timebox.c | 41 +- trace.c | 32 +- treeview.c | 38 +- ttysize.c | 8 +- ui_getc.c | 67 +- util.c | 514 +- yesno.c | 36 +- 233 files changed, 20681 insertions(+), 16543 deletions(-) diff --git a/CHANGES b/CHANGES index 17c5b2735487..8e5d22e400a3 100644 --- a/CHANGES +++ b/CHANGES @@ -1,9 +1,222 @@ --- $Id: CHANGES,v 1.619 2018/06/21 09:19:45 tom Exp $ +-- $Id: CHANGES,v 1.723 2021/01/17 20:21:41 tom Exp $ -- Thomas E. Dickey This version of dialog was originally from a Debian snapshot. I've done this to it: +2021/01/17 + + updated dialog.pot + + add option --no-hot-list, to allow suppressing the hotkey feature + from lists. + + increase minimum height of inputbox to avoid input field overlapping + with the button-box (report by Victor Ananjevsky). + + modify options-parsing to permit a "no" on any boolean option and + deprecating the "no" options without a "-" , e.g., generalizing on + "--nook" equivalence to "--no-ok". + +2021/01/12 + + minor spelling fixes, per codespell + + update configure macros, for quoting/escaping fixes per shellcheck + + update config.guess, config.sub + +2020/11/26 + + modify configure script's compiler check to work around Xcode's + useless aliases for standard C. + + enable keep-tite feature for NetBSD 8 and up; earlier releases would + dump core. + > new features/fixes (Glenn Herteg) + + add option "--cursor-off-label" + + add option "--erase-on-exit" + + fix errata in manpage. + + fix logic: dlg_button_to_char() would return wrong value if no + uppercase was found + +2020/11/25 + + add DIALOG_TIMEOUT to sample scripts, and use report-button more + consistently to handle unexpected exit-status values. + +2020/11/24 + + add dlg_getenv_num() and dlg_getenv_str(). + + add DLG_EXIT_TIMEOUT to allow scripts to exit on an expired timeout + with an exit-status different from DLG_EXIT_ERROR or DLG_EXIT_ESC + (patch by Norbert Koch). + +2020/11/23 + + modify dlg_ok_label() and dlg_ok_labels() to ignore --no-ok if all + buttons would be omitted. + + add/use dlg_der_window() to account for derived windows just like + subwindows, to fix regression in dlg_getc() in fselect/dselect + widget. + + modify several widgets to make their handling of --no-ok consistent + with the majority of the widgets: editbox.c, menubox.c, msgbox.c, + rangebox.c, textbox.c, timebox.c + + add ^D as binding for new virtual key DLGK_LEAVE, which will close + the current dialog by activating the currently-selected button. + + improve manual-page description of --no-ok option (reports by + Hans Mueller, Gil Delescluse). + + modify configure script to make Solaris -R rpath feature work + +2020/11/21 + + fix regression in dlg_getc() caused by not taking into account + subwindows used for input (report by Michael Wihl). + +2020/11/20 + + add validity-checks for window pointer (report/testcase by Michael + Wihl). + + improve configure macros: + CF_CLANG_COMPILER: apply compiler-flags needed for test. + CF_WITH_SCREEN_PDCURSES: use this to reduce X11-checks. + +2020/11/17 + + amend initialization for dlg_getc to fix regression in pause widget + from 2020/03/27 changes (reports by Aidan Tessier, Norbert Koch, + Josmar Pierri). + + improve configure macros: + CF_CLANG_COMPILER: split-out check for -Qunused-arguments to ensure + that clang supports it. IBM xlclang does not. + CF_MIXEDCASE_FILENAMES: when cross-compiling to darwin (macOS), + assume the filesystem doesn't support mixed-case + +2020/09/21 + + modify init_dialog's initialization of tab_len and aspect_ratio to + avoid overwriting initialization done in process_common_options + (report/patch by Rainer Weikusat, Debian #970508). + +2020/09/13 + + fix out-of-order description for --tailbox vs --rangebox in manpage + (report by Glenn Herteg). + + updated configure-macros: compiler-warnings and shared-library + options. Changed configure --with-warnings to --enable-warnings for + consistency. + + update config.guess + +2020/04/01 + + updated sq.po from + http://translationproject.org/latest/dialog/ + +2020/03/27 + + add clarification in manual page to show when the single/double + quotes may be needed (prompted by discussion with Danilo G Baio). + + fix an extra ".exe" in makefile.in which prevented Cygwin build. + + fix most cppcheck warnings + + tailbox/tailboxbg's exit-button now works with mouse-clicks + + fix repainting while resizing for the editbox widget. + + add configure-check for curses_exit() from ncurses 6.2 + + fix a few memory leaks in fselect.c, mixedgauge.c when resizing. + + fix inconsistency in dlg_string_to_argv() which made the checklist9 + example not work. + + add empty-string check in dlg_print_listitem() to avoid indexing past + the end of the array of character-offsets. + + improve handling of KEY_RESIZE by repainting the backtitle after + clearing the screen (integrated patch by Rainer Weikusat, Debian + #954185). + + improve logic for wtimeout() calls which are used to set temporary + non-blocking reads (prompted by patch by Rainer Weikusat, Debian + #954220). + + add "make check" rule. + + updated configure-macros. + +2020/02/28 + + updated configure-macros, to work around ncurses vs xcode's c99 -W + + update config.guess + +2019/12/31 + + updated configure-macros. + + update config.guess + +2019/12/10 + + correct rc-file lookup of "default" color (report by Grady Martin, + cf: 2019/09/24). + + fix several issues in the sample scripts reported by shellcheck. + + fix a few spelling errors reported by codespell (report by Jens + Schleusener). + + correct check for return-value of isblank(), which is not necessarily + 0/1 (report/patch by Paul Cercueil, Peter Korsgaard, cf: 2018/05/31). + +2019/12/09 + + amend change for parsing command-options before calling init_dialog, + to handle --no-shadow, etc., which are initialized in init_dialog + (report by Paul Cercueil, cf: 2018/06/21). + + add dlg_trace_va_msg to manpage, symbol files. + +2019/11/10 + + improve layout of several widgets' data area when maximizing. + + modify dselect/fselect to work with autosizing (Debian #915949). + + add error messages from dlg_exiterr() to trace file. + + improve manual page description of escaping in key-bindings. + + modify inputmenu to recognize the "Cancel" button and keys bound to + that feature while editing a renamed menu item. + + revert one change, in form.c to the --last-key feature (Debian + #942025). + + correct ordering of libraries in configure-script, which appended + in a case where it should have prepended. + + update config.guess, config.sub + +2019/09/26 + + improve dialog-config script's filtering of -L options using the + linker default directories. + + improve dialog-config script, adding a -L option corresponding to + the configure --libdir option if it would be a duplicate (report by + Andrew Kosteltsev). + + build-fix for configure --disable-trace + + updated pt.po from + http://translationproject.org/latest/dialog/ + +2019/09/24 + + allow for underline- and reverse-video flags in the ".rc" file + (integrated patch by Richard Robbins). + +2019/08/08 + + amend change to --last-key feature to eliminate an unnecessary + separator (report by Gabriele Balducci). + +2019/08/06 + + extend --last-key feature to the remaining widgets which have + ok/cancel buttons, and add logic to map keys which happen to be + bound to ok/extra/cancel/help to simulate a button-press on the + corresponding button (report by "sgewrk"). + +2019/08/01 + + further fixes for dialog-config.in (report by Andrew Kosteltsev). + +2019/07/28 + + modify dialog-config.in so that setting prefix or exec-prefix to + a given value with --prefix=VALUE or --exec-prefix=VALUE has the + expected result of changing bindir, etc. + + correct substitution for $LIBS value in dialog-config.in (report by + Andrew Kosteltsev). + +2019/07/24 + + modify dlg_will_resize() and dlg_result_key() functions to reduce + the chance that dialog exits on a SIGWINCH (Debian #930775). + + make test-package for the development headers/library + + add --libs-only-L, etc., to dialog-config script (prompted by + discussion with Andrew Kosteltsev). + + fix a memory leak in gauge widget (Andrew Kosteltsev). + + minor fix for CF_GCC_WARNINGS + + update config.guess, config.sub + +2019/02/11 + + modify to work with ncurses' threaded-library, which does not allow + assignment to LINES/COLS (report by Marcus Roeckrath). + + correct clearing after text in progressbox from 2018/06/21 changes + for resizing (reports by David Boyd, Alan Somers). + + improved configure macros CF_GNU_SOURCE, CF_POSIX_C_SOURCE, + CF_XOPEN_SOURCE + + update config.guess, config.sub + +2018/11/07 + + convert ja.po to UTF-8 for consistency (suggested by Stanislav + Brabec). + + repair mis-encoded hi.po (report/analysis by Stanislav Brabec). + +2018/10/22 + + improved configure macros CF_CC_ENV_FLAGS, CF_LD_RPATH_OPT, + CF_LIBRARY_PATH, CF_SHARED_OPTS, CF_WITH_MAN2HTML, + CF_WITH_VERSIONED_SYMS from ncurses + + add ast.po, from + http://translationproject.org/latest/dialog/ + 2018/06/21 + improve file-offset computation in textbox.c (Werner Fink). + fix an overlooked case with real_auto_size() to maximize when @@ -370,7 +583,7 @@ to it: 2012/12/30 - release 1.2 + improve some older changelog entries to help with HTML'izing content. - + various fixes/improvments for scrollbar appearance. + + various fixes/improvements for scrollbar appearance. + add mappings for some equivalent options provided by whiptail; add configure option --disable-whiptail to allow suppressing these. + add configure option --disable-Xdialog2 to allow suppressing the diff --git a/README b/README index b2c9b8595dbc..1bad4311dd40 100644 --- a/README +++ b/README @@ -38,11 +38,11 @@ For the future, if any volunteer want, the way to evolve cdialog is to multithreading. 2) add an option that could permit to read commands (--options) from a file, like as in a normal programming language, but maintaining - compatiblity with older version of dialog. + compatibility with older version of dialog. I no longer could maintain cdialog... Executable and library name of cdialog are the same of dialog, for -compatiblity. +compatibility. I think that only one directive should be follow: don't use a resource like stdin, stdout when you'll write new options for cdialog; these diff --git a/VERSION b/VERSION index 12fccce09544..fc653b601c01 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15:0:0 1.3 20180621 +15:0:0 1.3 20210117 diff --git a/aclocal.m4 b/aclocal.m4 index c33827fce67b..191ba9c373fe 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,7 +1,7 @@ dnl macros used for DIALOG configure script -dnl $Id: aclocal.m4,v 1.120 2018/06/21 00:30:26 tom Exp $ +dnl $Id: aclocal.m4,v 1.150 2021/01/11 09:03:36 tom Exp $ dnl --------------------------------------------------------------------------- -dnl Copyright 1999-2017,2018 -- Thomas E. Dickey +dnl Copyright 1999-2020,2021 -- 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 @@ -28,10 +28,10 @@ dnl sale, use or other dealings in this Software without prior written dnl authorization. dnl dnl see -dnl http://invisible-island.net/autoconf/ +dnl https://invisible-island.net/autoconf/ dnl --------------------------------------------------------------------------- dnl --------------------------------------------------------------------------- -dnl AM_GNU_GETTEXT version: 14 updated: 2015/04/15 19:08:48 +dnl AM_GNU_GETTEXT version: 15 updated: 2021/01/02 09:31:20 dnl -------------- dnl Usage: Just like AM_WITH_NLS, which see. AC_DEFUN([AM_GNU_GETTEXT], @@ -76,7 +76,7 @@ strdup strtoul tsearch __argz_count __argz_stringify __argz_next]) ("$presentlang"*) useit=yes;; esac done - if test $useit = yes; then + if test "$useit" = yes; then NEW_LINGUAS="$NEW_LINGUAS $presentlang" fi done @@ -167,7 +167,7 @@ size_t iconv(); AC_SUBST(LIBICONV) ])dnl dnl --------------------------------------------------------------------------- -dnl AM_LANGINFO_CODESET version: 4 updated: 2015/04/18 08:56:57 +dnl AM_LANGINFO_CODESET version: 6 updated: 2021/01/01 16:53:59 dnl ------------------- dnl Inserted as requested by gettext 0.10.40 dnl File from /usr/share/aclocal @@ -180,17 +180,17 @@ AC_DEFUN([AM_LANGINFO_CODESET], [ AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset, [AC_TRY_LINK([#include ], - [char* cs = nl_langinfo(CODESET);], + [char* cs = nl_langinfo(CODESET); (void)cs], am_cv_langinfo_codeset=yes, am_cv_langinfo_codeset=no) ]) - if test $am_cv_langinfo_codeset = yes; then + if test "$am_cv_langinfo_codeset" = yes; then AC_DEFINE(HAVE_LANGINFO_CODESET, 1, [Define if you have and nl_langinfo(CODESET).]) fi ])dnl dnl --------------------------------------------------------------------------- -dnl AM_LC_MESSAGES version: 5 updated: 2015/05/10 19:52:14 +dnl AM_LC_MESSAGES version: 6 updated: 2021/01/02 09:31:20 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 +[if test "$ac_cv_header_locale_h" = yes; then AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, [AC_TRY_LINK([#include ], [return LC_MESSAGES], am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) - if test $am_cv_val_LC_MESSAGES = yes; then + if test "$am_cv_val_LC_MESSAGES" = yes; then AC_DEFINE(HAVE_LC_MESSAGES, 1, [Define if your file defines LC_MESSAGES.]) fi fi])dnl dnl --------------------------------------------------------------------------- -dnl AM_PATH_PROG_WITH_TEST version: 9 updated: 2015/04/15 19:08:48 +dnl AM_PATH_PROG_WITH_TEST version: 10 updated: 2021/01/02 09:31:20 dnl ---------------------- dnl Inserted as requested by gettext 0.10.40 dnl File from /usr/share/aclocal @@ -257,7 +257,7 @@ AC_CACHE_VAL(ac_cv_path_$1, IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" for ac_dir in ifelse([$5], , $PATH, [$5]); do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word$ac_exeext; then + if test -f "$ac_dir/$ac_word$ac_exeext" ; then if [$3]; then ac_cv_path_$1="$ac_dir/$ac_word$ac_exeext" break @@ -280,7 +280,7 @@ fi AC_SUBST($1)dnl ])dnl dnl --------------------------------------------------------------------------- -dnl AM_WITH_NLS version: 29 updated: 2018/02/21 21:26:03 +dnl AM_WITH_NLS version: 31 updated: 2021/01/04 17:48:08 dnl ----------- dnl Inserted as requested by gettext 0.10.40 dnl File from /usr/share/aclocal @@ -384,13 +384,13 @@ AC_DEFUN([AM_WITH_NLS], 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_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], :) + ["$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" && \ @@ -466,7 +466,7 @@ AC_DEFUN([AM_WITH_NLS], if test "$nls_cv_use_gnu_gettext" != "no"; then CATOBJEXT=.gmo - if test -f $srcdir/intl/libintl.h ; then + if test -f "$srcdir/intl/libintl.h" ; then dnl Mark actions used to generate GNU NLS library. INTLOBJS="\$(GETTOBJS)" BUILD_INCLUDED_LIBINTL=yes @@ -511,10 +511,10 @@ AC_DEFUN([AM_WITH_NLS], case "$ac_file" in (*/[Mm]akefile.in) # Adjust a relative srcdir. - ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` + 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` + 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" @@ -561,7 +561,7 @@ AC_DEFUN([AM_WITH_NLS], 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 + 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 @@ -570,7 +570,7 @@ changequote([,])dnl esac AC_MSG_RESULT([$ac_prog_version]) fi - if test $ac_verc_fail = yes; then + if test "$ac_verc_fail" = yes; then INTLBISON=: fi fi @@ -638,10 +638,11 @@ define([CF_ACVERSION_COMPARE], [ifelse([$8], , ,[$8])], [ifelse([$9], , ,[$9])])])dnl dnl --------------------------------------------------------------------------- -dnl CF_ADD_CFLAGS version: 13 updated: 2017/02/25 18:57:40 +dnl CF_ADD_CFLAGS version: 15 updated: 2020/12/31 10:54:15 dnl ------------- dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS -dnl The second parameter if given makes this macro verbose. +dnl $1 = flags to add +dnl $2 = if given makes this macro verbose. dnl dnl Put any preprocessor definitions that use quoted strings in $EXTRA_CPPFLAGS, dnl to simplify use of $CPPFLAGS in compiler checks, etc., that are easily @@ -655,19 +656,19 @@ cf_new_extra_cppflags= for cf_add_cflags in $1 do -case $cf_fix_cppflags in +case "$cf_fix_cppflags" in (no) - case $cf_add_cflags in + case "$cf_add_cflags" in (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[[^=]]*='\''\"[[^"]]*//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[[^=]]*='\''\"[[^"]]*//'` 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 + if test "$cf_fix_cppflags" = yes ; then CF_APPEND_TEXT(cf_new_extra_cppflags,$cf_add_cflags) continue elif test "${cf_tst_cflags}" = "\"'" ; then @@ -680,7 +681,7 @@ case $cf_fix_cppflags in (*$cf_add_cflags) ;; (*) - case $cf_add_cflags in + 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) @@ -698,7 +699,7 @@ case $cf_fix_cppflags in (yes) CF_APPEND_TEXT(cf_new_extra_cppflags,$cf_add_cflags) - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[[^"]]*"'\''//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[[^"]]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ @@ -726,7 +727,7 @@ AC_SUBST(EXTRA_CPPFLAGS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_ADD_INCDIR version: 15 updated: 2018/06/20 20:23:13 +dnl CF_ADD_INCDIR version: 16 updated: 2020/12/31 20:19:42 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, @@ -738,9 +739,9 @@ AC_DEFUN([CF_ADD_INCDIR], if test -n "$1" ; then for cf_add_incdir in $1 do - while test $cf_add_incdir != /usr/include + while test "$cf_add_incdir" != /usr/include do - if test -d $cf_add_incdir + if test -d "$cf_add_incdir" then cf_have_incdir=no if test -n "$CFLAGS$CPPFLAGS" ; then @@ -771,7 +772,7 @@ if test -n "$1" ; then CF_VERBOSE(adding $cf_add_incdir to include-path) ifelse([$2],,CPPFLAGS,[$2])="$ifelse([$2],,CPPFLAGS,[$2]) -I$cf_add_incdir" - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` + cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'` test "$cf_top_incdir" = "$cf_add_incdir" && break cf_add_incdir="$cf_top_incdir" else @@ -793,7 +794,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: 10 updated: 2015/04/18 08:56:57 +dnl CF_ADD_LIBDIR version: 11 updated: 2020/12/31 20:19:42 dnl ------------- dnl Adds to the library-path dnl @@ -807,9 +808,9 @@ 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 + if test "$cf_add_libdir" = /usr/lib ; then : - elif test -d $cf_add_libdir + elif test -d "$cf_add_libdir" then cf_have_libdir=no if test -n "$LDFLAGS$LIBS" ; then @@ -829,7 +830,7 @@ if test -n "$1" ; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_ADD_LIBS version: 2 updated: 2014/07/13 14:33:27 +dnl CF_ADD_LIBS version: 3 updated: 2019/11/02 16:47:33 dnl ----------- dnl Add one or more libraries, used to enforce consistency. Libraries are dnl prepended to an existing list, since their dependencies are assumed to @@ -838,19 +839,19 @@ dnl dnl $1 = libraries to add, with the "-l", etc. dnl $2 = variable to update (default $LIBS) AC_DEFUN([CF_ADD_LIBS],[ -cf_add_libs="$1" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in [$]ifelse($2,,LIBS,[$2]) -do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then +cf_add_libs="[$]ifelse($2,,LIBS,[$2])" +# reverse order +cf_add_0lib= +for cf_add_1lib in $1; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done ifelse($2,,LIBS,[$2])="$cf_add_libs" ])dnl @@ -887,7 +888,7 @@ case "$1" in esac ])dnl dnl --------------------------------------------------------------------------- -dnl CF_ADD_SEARCHPATH version: 5 updated: 2009/01/11 20:40:21 +dnl CF_ADD_SEARCHPATH version: 6 updated: 2020/12/31 20:19:42 dnl ----------------- dnl Set $CPPFLAGS and $LDFLAGS with the directories given via the parameter. dnl They can be either the common root of include- and lib-directories, or the @@ -900,16 +901,16 @@ AC_DEFUN([CF_ADD_SEARCHPATH], [ AC_REQUIRE([CF_PATHSEP]) for cf_searchpath in `echo "$1" | tr $PATH_SEPARATOR ' '`; do - if test -d $cf_searchpath/include; then + if test -d "$cf_searchpath/include" ; then CF_ADD_INCDIR($cf_searchpath/include) - elif test -d $cf_searchpath/../include ; then + elif test -d "$cf_searchpath/../include" ; then CF_ADD_INCDIR($cf_searchpath/../include) ifelse([$2],,,[else $2]) fi - if test -d $cf_searchpath/lib; then + if test -d "$cf_searchpath/lib" ; then CF_ADD_LIBDIR($cf_searchpath/lib) - elif test -d $cf_searchpath ; then + elif test -d "$cf_searchpath" ; then CF_ADD_LIBDIR($cf_searchpath) ifelse([$2],,,[else $2]) @@ -917,7 +918,7 @@ $2]) done ]) dnl --------------------------------------------------------------------------- -dnl CF_ADD_SUBDIR_PATH version: 4 updated: 2013/10/08 17:47:05 +dnl CF_ADD_SUBDIR_PATH version: 5 updated: 2020/12/31 20:19:42 dnl ------------------ dnl Append to a search-list for a nonstandard header/lib-file dnl $1 = the variable to return as result @@ -929,13 +930,13 @@ AC_DEFUN([CF_ADD_SUBDIR_PATH], [ test "x$4" != "x$5" && \ test -d "$4" && \ -ifelse([$5],NONE,,[(test -z "$5" || test x$5 = xNONE || test "x$4" != "x$5") &&]) { +ifelse([$5],NONE,,[{ test -z "$5" || test "x$5" = xNONE || test "x$4" != "x$5"; } &&]) { test -n "$verbose" && echo " ... testing for $3-directories under $4" - test -d $4/$3 && $1="[$]$1 $4/$3" - test -d $4/$3/$2 && $1="[$]$1 $4/$3/$2" - test -d $4/$3/$2/$3 && $1="[$]$1 $4/$3/$2/$3" - test -d $4/$2/$3 && $1="[$]$1 $4/$2/$3" - test -d $4/$2/$3/$2 && $1="[$]$1 $4/$2/$3/$2" + test -d "$4/$3" && $1="[$]$1 $4/$3" + test -d "$4/$3/$2" && $1="[$]$1 $4/$3/$2" + test -d "$4/$3/$2/$3" && $1="[$]$1 $4/$3/$2/$3" + test -d "$4/$2/$3" && $1="[$]$1 $4/$2/$3" + test -d "$4/$2/$3/$2" && $1="[$]$1 $4/$2/$3/$2" } ])dnl dnl --------------------------------------------------------------------------- @@ -955,6 +956,12 @@ 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: @@ -1000,7 +1007,7 @@ ifelse([$3],,[ :]dnl ])dnl ])])dnl dnl --------------------------------------------------------------------------- -dnl CF_AR_FLAGS version: 6 updated: 2015/10/10 15:25:05 +dnl CF_AR_FLAGS version: 9 updated: 2021/01/01 13:31:04 dnl ----------- dnl Check for suitable "ar" (archiver) options for updating an archive. dnl @@ -1011,39 +1018,55 @@ AC_DEFUN([CF_AR_FLAGS],[ AC_REQUIRE([CF_PROG_AR]) AC_CACHE_CHECK(for options to update archives, cf_cv_ar_flags,[ - cf_cv_ar_flags=unknown - for cf_ar_flags in -curvU -curv curv -crv crv -cqv cqv -rv rv - do + case "$cf_cv_system_name" in + (*-msvc*) + cf_cv_ar_flags='' + cat >mk_static_lib.sh <<-EOF + #!$SHELL + MSVC_BIN="[$]AR" + out="\[$]1" + shift + exec \[$]MSVC_BIN -out:"\[$]out" \[$]@ + EOF + chmod +x mk_static_lib.sh + AR=`pwd`/mk_static_lib.sh + ;; + (*) + cf_cv_ar_flags=unknown + for cf_ar_flags in -curvU -curv curv -crv crv -cqv cqv -rv rv + do - # check if $ARFLAGS already contains this choice - if test "x$ARFLAGS" != "x" ; then - cf_check_ar_flags=`echo "x$ARFLAGS" | sed -e "s/$cf_ar_flags\$//" -e "s/$cf_ar_flags / /"` - if test "x$ARFLAGS" != "$cf_check_ar_flags" ; then - cf_cv_ar_flags= - break + # check if $ARFLAGS already contains this choice + if test "x$ARFLAGS" != "x" ; then + cf_check_ar_flags=`echo "x$ARFLAGS" | sed -e "s/$cf_ar_flags\$//" -e "s/$cf_ar_flags / /"` + if test "x$ARFLAGS" != "$cf_check_ar_flags" ; then + cf_cv_ar_flags= + break + fi fi - fi - rm -f conftest.$ac_cv_objext - rm -f conftest.a + rm -f "conftest.$ac_cv_objext" + rm -f conftest.a - cat >conftest.$ac_ext <"conftest.$ac_ext" <&AC_FD_CC - $AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&AC_FD_CC 1>/dev/null - if test -f conftest.a ; then - cf_cv_ar_flags=$cf_ar_flags + if AC_TRY_EVAL(ac_compile) ; then + echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&AC_FD_CC + $AR $ARFLAGS "$cf_ar_flags" conftest.a "conftest.$ac_cv_objext" 2>&AC_FD_CC 1>/dev/null + if test -f conftest.a ; then + cf_cv_ar_flags="$cf_ar_flags" + break + fi + else + CF_VERBOSE(cannot compile test-program) break fi - else - CF_VERBOSE(cannot compile test-program) - break - fi - done - rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext + done + rm -f conftest.a "conftest.$ac_ext" "conftest.$ac_cv_objext" + ;; + esac ]) if test -n "$ARFLAGS" ; then @@ -1057,7 +1080,7 @@ fi AC_SUBST(ARFLAGS) ]) dnl --------------------------------------------------------------------------- -dnl CF_BUNDLED_INTL version: 19 updated: 2018/06/20 20:23:13 +dnl CF_BUNDLED_INTL version: 20 updated: 2021/01/02 09:31:20 dnl --------------- dnl Top-level macro for configuring an application with a bundled copy of dnl the intl and po directories for gettext. *** 57273 LINES SKIPPED ***