From 13f6074d89d16574cb1b8c812454d4957acca760 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Mon, 7 Aug 2017 17:45:32 +1000 Subject: [PATCH 1/8] Update sr.po to the latest version from the Translation Project --- po/sr.po | 162 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 85 insertions(+), 77 deletions(-) diff --git a/po/sr.po b/po/sr.po index 84dd6ed..c87a854 100644 --- a/po/sr.po +++ b/po/sr.po @@ -5,45 +5,69 @@ # * Copyright (C) 2016, Free Software Foundation, Inc. * # * * # ************************************************************************* -# # This file is distributed under the same license as the trader package. -# # Contributors: -# Мирослав Николић , 2016. -# +# Мирослав Николић , 2016—2017. msgid "" msgstr "" -"Project-Id-Version: trader 7.9\n" +"Project-Id-Version: trader 7.10-pre2\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2016-01-05 10:52+1100\n" -"PO-Revision-Date: 2016-03-21 13:17+1100\n" +"POT-Creation-Date: 2017-05-23 09:01+1000\n" +"PO-Revision-Date: 2017-08-06 15:10+0200\n" "Last-Translator: Мирослав Николић \n" "Language-Team: Serbian <(nothing)>\n" "Language: sr\n" -"X-Bugs: Report translation errors to the Language-Team address.\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" + +#. TRANSLATORS: The name of the game. You may choose to translate it into +#. your own language (recommended) or keep it the same as the English +#. version. Feel free to look through other translations to see how +#. others have done this. +#: data/trader.desktop.in:22 src/intf.c:610 +#, c-format +msgid "Star Traders" +msgstr "Звездани трговци" + +#: data/trader.desktop.in:23 +msgid "Play Star Traders, a simple game of interstellar trading" +msgstr "Играјте Звездане трговце, једноставну игру међузвезданог трговања" + +#. TRANSLATORS: A list of keywords describing Star Traders. By all means +#. add your own keywords! +#: data/trader.desktop.in:26 +msgid "game;interstellar;trading;strategy;" +msgstr "игра;међузвездано;трговање;стратегиј;" + +#. TRANSLATORS: This string is the name of the icon to use. The Desktop +#. Entry Specification states it is translatable, but unless you provide a +#. matching icon, please leave it as "trader": this will use trader.svg +#. and the various trader.png files in the data source code directory. +#: data/trader.desktop.in:31 +msgid "trader" +msgstr "трговци" #: src/trader.c:235 #, c-format -msgid "%s: invalid value for --max-turn: `%s'\n" +msgid "%s: invalid value for --max-turn: '%s'\n" msgstr "%s: неисправна вредност за „--max-turn“: „%s“\n" #: src/trader.c:251 #, c-format -msgid "%s: invalid operand `%s'\n" +msgid "%s: invalid operand '%s'\n" msgstr "%s: неисправан операнд „%s“\n" #: src/trader.c:260 #, c-format -msgid "%s: invalid game number `%s'\n" +msgid "%s: invalid game number '%s'\n" msgstr "%s: неисправан број игре „%s“\n" #: src/trader.c:269 #, c-format -msgid "%s: extra operand `%s'\n" +msgid "%s: extra operand '%s'\n" msgstr "%s: додатни операнд „%s“\n" #. TRANSLATORS: "John Zaitseff" [IPA d͡ʒɒn ˈzaɪ̯t͡səf] is the proper @@ -78,7 +102,7 @@ msgstr "" #: src/trader.c:308 #, c-format -msgid "%s: Try `%s --help' for more information.\n" +msgid "%s: Try '%s --help' for more information.\n" msgstr "%s: Пробајте „%s --help“ за више података.\n" #: src/trader.c:311 @@ -439,10 +463,10 @@ msgstr "Нема предузећа на карти" #, c-format msgctxt "subtitle" msgid "" -"\n" +" \n" "Company" msgstr "" -"\n" +" \n" "Предузеће" #. TRANSLATORS: "Ownership" is a two-line column label @@ -1133,12 +1157,12 @@ msgstr "%s: недозвољено поље у %d. реду" #: src/fileio.c:51 #, c-format -msgid "%s: illegal field on line %d: `%s'" +msgid "%s: illegal field on line %d: '%s'" msgstr "%s: недозвољено поље у %d. реду: „%s“" #: src/fileio.c:55 #, c-format -msgid "%s: illegal value on line %d: `%s'" +msgid "%s: illegal value on line %d: '%s'" msgstr "%s: недозвољена вредност у %d. реду: „%s“" #: src/fileio.c:91 src/fileio.c:134 src/fileio.c:402 @@ -1540,19 +1564,18 @@ msgstr "@ Текст помоћи, 10. страница\n" msgid " How to Play " msgstr " Како да играте " -#. TRANSLATORS: The first %d is the current page number, -#. the second is the number of pages your help text takes -#. (6, in English). You can replace the second %d with a -#. fixed word, if you like. -#: src/help.c:286 +#. TRANSLATORS: The parameter %1$d is the current page +#. number, %2$d is the number of pages your help text +#. takes (6, in English). +#: src/help.c:285 #, c-format -msgid "Page %d of %d" -msgstr "%d. страница од %d" +msgid "Page %1$d of %2$d" +msgstr "%1$d. страница од %2$d" #. TRANSLATORS: The reason the user is not asked "Press any #. key to continue" is historical: many, many people used to #. ask "where is the key?" :-) -#: src/help.c:487 src/intf.c:3035 +#: src/help.c:486 src/intf.c:3035 #, c-format msgid "[ Press to continue ] " msgstr "[ Притисните <РАЗМАК> да наставите ] " @@ -1564,19 +1587,19 @@ msgstr "[ Притисните <РАЗМАК> да наставите ] " #. , , , or <\>). #. Note that the maximum label length is 76 characters, #. including the trailing space. -#: src/help.c:495 +#: src/help.c:494 #, c-format msgid "[ Press to continue or for the previous page ] " msgstr "[ Притисните <РАЗМАК> да наставите или <ПОВРАТНИЦУ> за претходну страницу ] " #: src/intf.c:110 #, c-format -msgid "%s: string has incorrect format: `%s'" +msgid "%s: string has incorrect format: '%s'" msgstr "%s: ниска је у погрешном запису: „%s“" #: src/intf.c:126 #, c-format -msgid "%s: character has illegal width: `%lc'" +msgid "%s: character has illegal width: '%lc'" msgstr "%s: знак је недозвољене ширине: „%lc“" #: src/intf.c:434 @@ -1584,11 +1607,6 @@ msgstr "%s: знак је недозвољене ширине: „%lc“" msgid "terminal size is too small (%d x %d required)" msgstr "величина терминала је премала (потребна је %d x %d)" -#: src/intf.c:610 -#, c-format -msgid "Star Traders" -msgstr "Звездани трговци" - #: src/intf.c:1265 #, c-format msgid "mkchstr_conv: NUL" @@ -1596,7 +1614,7 @@ msgstr "mkchstr_conv: НИШТА" #: src/intf.c:1568 #, c-format -msgid "mkchstr: `%s'" +msgid "mkchstr: '%s'" msgstr "mkchstr: „%s“" #. TRANSLATORS: This string specifies the keycodes used to insert the @@ -1611,7 +1629,7 @@ msgstr "=;" #: src/intf.c:2034 src/intf.c:2079 #, c-format -msgid "gettxline: illegal character in string: `%ls'" +msgid "gettxline: illegal character in string: '%ls'" msgstr "gettxline: недозвољени знак у нисци: „%ls“" #. TRANSLATORS: The strings with msgctxt "input|Yes" and @@ -1657,7 +1675,7 @@ msgstr "нема више меморије" #: src/utils.c:1041 #, c-format -msgid "xmbstowcs: `%s'" +msgid "xmbstowcs: '%s'" msgstr "xmbstowcs: „%s“" #: src/utils.c:1081 @@ -1667,65 +1685,55 @@ msgstr "xwcrtomb: НИШТА" #: src/utils.c:1086 #, c-format -msgid "xwcrtomb: `%lc'" +msgid "xwcrtomb: '%lc'" msgstr "xwcrtomb: „%lc“" -#: lib/getopt.c:575 lib/getopt.c:604 +#: lib/getopt.c:278 #, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: опција „%s“ је нејасна; могућности:" +msgid "%s: option '%s%s' is ambiguous\n" +msgstr "%s: опција „%s%s“ је нејасна\n" -#: lib/getopt.c:619 +#: lib/getopt.c:284 #, c-format -msgid "%s: option '%s' is ambiguous\n" -msgstr "%s: опција „%s“ је нејасна\n" +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: опција „%s%s“ је нејасна; могућности:" -#: lib/getopt.c:654 lib/getopt.c:658 +#: lib/getopt.c:319 #, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: опција „--%s“ не дозвољава аргумент\n" +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: непозната опција „%s%s“\n" -#: lib/getopt.c:667 lib/getopt.c:672 +#: lib/getopt.c:345 #, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" -msgstr "%s: опција „%c%s“ не дозвољава аргумент\n" +msgid "%s: option '%s%s' doesn't allow an argument\n" +msgstr "%s: опција „%s%s“ не дозвољава аргумент\n" -#: lib/getopt.c:715 lib/getopt.c:734 +#: lib/getopt.c:360 #, c-format -msgid "%s: option '--%s' requires an argument\n" -msgstr "%s: опција „--%s“ захтева аргумент\n" +msgid "%s: option '%s%s' requires an argument\n" +msgstr "%s: опција „%s%s“ захтева аргумент\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: непозната опција „--%s“\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: непозната опција „%c%s“\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: неисправна опција -- „%c“\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: опција захтева аргумент -- „%c“\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: опција „-W %s“ је нејасна\n" +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s: опција „--%s“ не дозвољава аргумент\n" -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: опција „-W %s“ не дозвољава аргумент\n" +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s: непозната опција „--%s“\n" -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: опција „-W %s“ захтева аргумент\n" +#~ msgid "%s: option '-W %s' is ambiguous\n" +#~ msgstr "%s: опција „-W %s“ је нејасна\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: опција „-W %s“ не дозвољава аргумент\n" + +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: опција „-W %s“ захтева аргумент\n" From 94005770f3f9db82860420be22218d3f1156680a Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Mon, 7 Aug 2017 18:33:29 +1000 Subject: [PATCH 2/8] Start preparing for version 7.12 --- INSTALL | 8 ++++---- configure.ac | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/INSTALL b/INSTALL index 4763328..0a724cd 100644 --- a/INSTALL +++ b/INSTALL @@ -102,12 +102,12 @@ You can also run configure in a separate build-only directory tree. This feature requires GNU Make and allows you to keep the source code tree from being modified by the compilation process. To use this option, create a separate build directory, then run configure. For example, if you placed -the Star Traders source code tree in $HOME/src/trader-7.11, you could run +the Star Traders source code tree in $HOME/src/trader-7.12, you could run something like: - mkdir $HOME/build/trader-build-7.11 - cd $HOME/build/trader-build-7.11 - $HOME/src/trader-7.11/configure + mkdir $HOME/build/trader-build-7.12 + cd $HOME/build/trader-build-7.12 + $HOME/src/trader-7.12/configure Once again, the Autoconf manual describes these options (and many others): diff --git a/configure.ac b/configure.ac index c17ec63..d0c1f73 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ dnl You should have received a copy of the GNU General Public License dnl along with this program. If not, see http://www.gnu.org/licenses/. -AC_INIT([Star Traders], [7.11], [J.Zaitseff@zap.org.au], [trader], +AC_INIT([Star Traders], [7.12], [J.Zaitseff@zap.org.au], [trader], [http://www.zap.org.au/software/trader/]) AC_DEFINE([PACKAGE_AUTHOR], ["John Zaitseff"], [Package author]) From 940a88ed2f48ac54bfe849a9fbb47499d8073e6b Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Mon, 7 Aug 2017 18:33:57 +1000 Subject: [PATCH 3/8] Document the updated Serbian translation --- NEWS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/NEWS b/NEWS index f05880f..a52652a 100644 --- a/NEWS +++ b/NEWS @@ -15,6 +15,12 @@ browse the Git repository on The ZAP Group web server at the following location: http://www.zap.org.au/gitweb/trader.git +Version 7.12 (not yet released) +------------------------------- + +Updated the Serbian translation, with thanks to Мирослав Николић. + + Version 7.11 (18th June, 2017) ------------------------------ From 50ef81e7d7f3da9a244595c648c02d34da0ce990 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Thu, 24 Aug 2017 15:04:59 +1000 Subject: [PATCH 4/8] Update the release date: today! --- NEWS | 4 ++-- doc/trader.6 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index a52652a..068f012 100644 --- a/NEWS +++ b/NEWS @@ -15,8 +15,8 @@ browse the Git repository on The ZAP Group web server at the following location: http://www.zap.org.au/gitweb/trader.git -Version 7.12 (not yet released) -------------------------------- +Version 7.12 (24th August, 2017) +-------------------------------- Updated the Serbian translation, with thanks to Мирослав Николић. diff --git a/doc/trader.6 b/doc/trader.6 index ed6c8f4..06fbb19 100644 --- a/doc/trader.6 +++ b/doc/trader.6 @@ -41,7 +41,7 @@ .if \n[.g] .mso www.tmac .\" .\" ********************************************************************* -.TH TRADER 6 "18th June, 2017" "Unix-like systems" +.TH TRADER 6 "24th August, 2017" "Unix-like systems" .SH NAME trader \- a game of interstellar trading .\" ********************************************************************* From e4925f81006b135ecb459c678671a15e36add71b Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Thu, 24 Aug 2017 15:21:11 +1000 Subject: [PATCH 5/8] Update version number and POT creation date in all PO files --- po/da.po | 6 +++--- po/de.po | 6 +++--- po/en_AU.po | 6 +++--- po/en_CA.po | 6 +++--- po/en_GB.po | 6 +++--- po/en_US.po | 6 +++--- po/eo.po | 6 +++--- po/fi.po | 6 +++--- po/fr.po | 6 +++--- po/hr.po | 6 +++--- po/hu.po | 6 +++--- po/nb.po | 6 +++--- po/ru.po | 6 +++--- po/sr.po | 6 +++--- po/sv.po | 6 +++--- 15 files changed, 45 insertions(+), 45 deletions(-) diff --git a/po/da.po b/po/da.po index 6fc7483..8543660 100644 --- a/po/da.po +++ b/po/da.po @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.11\n" +"Project-Id-Version: trader 7.12\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2017-06-18 06:01+1000\n" -"PO-Revision-Date: 2017-06-18 06:02+1000\n" +"POT-Creation-Date: 2017-08-24 15:17+1000\n" +"PO-Revision-Date: 2017-08-24 15:18+1000\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" "Language: da\n" diff --git a/po/de.po b/po/de.po index aca6671..0ac8760 100644 --- a/po/de.po +++ b/po/de.po @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.11\n" +"Project-Id-Version: trader 7.12\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2017-06-18 06:01+1000\n" -"PO-Revision-Date: 2017-06-18 06:02+1000\n" +"POT-Creation-Date: 2017-08-24 15:17+1000\n" +"PO-Revision-Date: 2017-08-24 15:18+1000\n" "Last-Translator: Philipp Thomas \n" "Language-Team: German \n" "Language: de\n" diff --git a/po/en_AU.po b/po/en_AU.po index f17a515..3c34a15 100644 --- a/po/en_AU.po +++ b/po/en_AU.po @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.11\n" +"Project-Id-Version: trader 7.12\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2017-06-18 06:01+1000\n" -"PO-Revision-Date: 2017-06-18 06:02+1000\n" +"POT-Creation-Date: 2017-08-24 15:17+1000\n" +"PO-Revision-Date: 2017-08-24 15:18+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Australian) <(nothing)>\n" "Language: en_AU\n" diff --git a/po/en_CA.po b/po/en_CA.po index 6e98370..f194096 100644 --- a/po/en_CA.po +++ b/po/en_CA.po @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.11\n" +"Project-Id-Version: trader 7.12\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2017-06-18 06:01+1000\n" -"PO-Revision-Date: 2017-06-18 06:02+1000\n" +"POT-Creation-Date: 2017-08-24 15:17+1000\n" +"PO-Revision-Date: 2017-08-24 15:18+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (Canadian) <(nothing)>\n" "Language: en_CA\n" diff --git a/po/en_GB.po b/po/en_GB.po index a40cb3c..e1b754d 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.11\n" +"Project-Id-Version: trader 7.12\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2017-06-18 06:01+1000\n" -"PO-Revision-Date: 2017-06-18 06:03+1000\n" +"POT-Creation-Date: 2017-08-24 15:17+1000\n" +"PO-Revision-Date: 2017-08-24 15:18+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (British) <(nothing)>\n" "Language: en_GB\n" diff --git a/po/en_US.po b/po/en_US.po index 695bf08..8ca6a1e 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.11\n" +"Project-Id-Version: trader 7.12\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2017-06-18 06:01+1000\n" -"PO-Revision-Date: 2017-06-18 06:03+1000\n" +"POT-Creation-Date: 2017-08-24 15:17+1000\n" +"PO-Revision-Date: 2017-08-24 15:18+1000\n" "Last-Translator: John Zaitseff \n" "Language-Team: English (US) <(nothing)>\n" "Language: en_US\n" diff --git a/po/eo.po b/po/eo.po index 6e90572..2931cc1 100644 --- a/po/eo.po +++ b/po/eo.po @@ -13,10 +13,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.11\n" +"Project-Id-Version: trader 7.12\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2017-06-18 06:01+1000\n" -"PO-Revision-Date: 2017-06-18 06:03+1000\n" +"POT-Creation-Date: 2017-08-24 15:17+1000\n" +"PO-Revision-Date: 2017-08-24 15:18+1000\n" "Last-Translator: Felipe Castro \n" "Language-Team: Esperanto \n" "Language: eo\n" diff --git a/po/fi.po b/po/fi.po index fbbb342..cf58701 100644 --- a/po/fi.po +++ b/po/fi.po @@ -13,10 +13,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.11\n" +"Project-Id-Version: trader 7.12\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2017-06-18 06:01+1000\n" -"PO-Revision-Date: 2017-06-18 06:03+1000\n" +"POT-Creation-Date: 2017-08-24 15:17+1000\n" +"PO-Revision-Date: 2017-08-24 15:19+1000\n" "Last-Translator: Jorma Karvonen \n" "Language-Team: Finnish \n" "Language: fi\n" diff --git a/po/fr.po b/po/fr.po index 67da949..5db36c3 100644 --- a/po/fr.po +++ b/po/fr.po @@ -19,10 +19,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.11\n" +"Project-Id-Version: trader 7.12\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2017-06-18 06:01+1000\n" -"PO-Revision-Date: 2017-06-18 06:03+1000\n" +"POT-Creation-Date: 2017-08-24 15:17+1000\n" +"PO-Revision-Date: 2017-08-24 15:19+1000\n" "Last-Translator: Frédéric Marchal \n" "Language-Team: French \n" "Language: fr\n" diff --git a/po/hr.po b/po/hr.po index bdbdd68..cfc5541 100644 --- a/po/hr.po +++ b/po/hr.po @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.11\n" +"Project-Id-Version: trader 7.12\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2017-06-18 06:01+1000\n" -"PO-Revision-Date: 2017-06-18 06:03+1000\n" +"POT-Creation-Date: 2017-08-24 15:17+1000\n" +"PO-Revision-Date: 2017-08-24 15:19+1000\n" "Last-Translator: Tomislav Krznar \n" "Language-Team: Croatian \n" "Language: hr\n" diff --git a/po/hu.po b/po/hu.po index 54ecf86..cf699a1 100644 --- a/po/hu.po +++ b/po/hu.po @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.11\n" +"Project-Id-Version: trader 7.12\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2017-06-18 06:01+1000\n" -"PO-Revision-Date: 2017-06-18 06:03+1000\n" +"POT-Creation-Date: 2017-08-24 15:17+1000\n" +"PO-Revision-Date: 2017-08-24 15:19+1000\n" "Last-Translator: Balázs Úr \n" "Language-Team: Hungarian \n" "Language: hu\n" diff --git a/po/nb.po b/po/nb.po index 9df7468..36cb396 100644 --- a/po/nb.po +++ b/po/nb.po @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.11\n" +"Project-Id-Version: trader 7.12\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2017-06-18 06:01+1000\n" -"PO-Revision-Date: 2017-06-18 06:03+1000\n" +"POT-Creation-Date: 2017-08-24 15:17+1000\n" +"PO-Revision-Date: 2017-08-24 15:19+1000\n" "Last-Translator: Johnny A. Solbu \n" "Language-Team: Norwegian Bokmaal \n" "Language: nb\n" diff --git a/po/ru.po b/po/ru.po index 24c7dc8..7080ec5 100644 --- a/po/ru.po +++ b/po/ru.po @@ -15,10 +15,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.11\n" +"Project-Id-Version: trader 7.12\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2017-06-18 06:01+1000\n" -"PO-Revision-Date: 2017-06-18 06:03+1000\n" +"POT-Creation-Date: 2017-08-24 15:17+1000\n" +"PO-Revision-Date: 2017-08-24 15:19+1000\n" "Last-Translator: Pavel Maryanov \n" "Language-Team: Russian \n" "Language: ru\n" diff --git a/po/sr.po b/po/sr.po index de899b0..7e1137c 100644 --- a/po/sr.po +++ b/po/sr.po @@ -13,10 +13,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.11\n" +"Project-Id-Version: trader 7.12\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2017-06-18 06:01+1000\n" -"PO-Revision-Date: 2017-08-07 18:03+1000\n" +"POT-Creation-Date: 2017-08-24 15:17+1000\n" +"PO-Revision-Date: 2017-08-24 15:19+1000\n" "Last-Translator: Мирослав Николић \n" "Language-Team: Serbian <(nothing)>\n" "Language: sr\n" diff --git a/po/sv.po b/po/sv.po index b55237c..6ab352a 100644 --- a/po/sv.po +++ b/po/sv.po @@ -12,10 +12,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.11\n" +"Project-Id-Version: trader 7.12\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2017-06-18 06:01+1000\n" -"PO-Revision-Date: 2017-06-18 06:03+1000\n" +"POT-Creation-Date: 2017-08-24 15:17+1000\n" +"PO-Revision-Date: 2017-08-24 15:19+1000\n" "Last-Translator: Anders Jonsson \n" "Language-Team: Swedish \n" "Language: sv\n" From 2dc2bfb9bf25b52938d4504051e826a237c587e6 Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Thu, 24 Aug 2017 15:44:54 +1000 Subject: [PATCH 6/8] Update all auto-generated files These files have been created by running ./build-aux/bootstrap with Gnulib as at commit d93b573ba772a334a83dac971c3004f1fed8a8a5 (with a date stamp of Wed Aug 23 14:45:58 2017 -0700), Autoconf 2.69, Automake 1.15.1, Gettext 0.19.8.1 and pkg-config 0.29. --- Makefile.in | 18 +- aclocal.m4 | 46 +-- config.h.in | 11 + configure | 167 ++++++---- data/Makefile.in | 10 +- doc/Makefile.in | 10 +- lib/Makefile.am | 18 +- lib/Makefile.in | 28 +- lib/stdio.in.h | 4 +- lib/stdlib.in.h | 21 +- lib/string.in.h | 17 ++ m4/.gitignore | 1 + m4/Makefile.in | 10 +- m4/btowc.m4 | 14 +- m4/extensions.m4 | 12 +- m4/fcntl-o.m4 | 11 +- m4/gettimeofday.m4 | 4 +- m4/gnulib-comp.m4 | 746 --------------------------------------------- m4/mbrtowc.m4 | 20 +- m4/memchr.m4 | 25 +- m4/stdint.m4 | 108 ++++--- m4/stdlib_h.m4 | 12 +- m4/string_h.m4 | 2 + m4/strstr.m4 | 4 +- m4/wcrtomb.m4 | 4 +- m4/wctob.m4 | 5 +- m4/wctype_h.m4 | 5 +- po/trader.pot | 4 +- src/Makefile.in | 10 +- 29 files changed, 407 insertions(+), 940 deletions(-) delete mode 100644 m4/gnulib-comp.m4 diff --git a/Makefile.in b/Makefile.in index b105f7e..743cf79 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -329,6 +329,7 @@ GNULIB_DUP3 = @GNULIB_DUP3@ GNULIB_DUPLOCALE = @GNULIB_DUPLOCALE@ GNULIB_ENVIRON = @GNULIB_ENVIRON@ GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@ +GNULIB_EXPLICIT_BZERO = @GNULIB_EXPLICIT_BZERO@ GNULIB_FACCESSAT = @GNULIB_FACCESSAT@ GNULIB_FCHDIR = @GNULIB_FCHDIR@ GNULIB_FCHMODAT = @GNULIB_FCHMODAT@ @@ -455,6 +456,7 @@ GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@ GNULIB_READ = @GNULIB_READ@ GNULIB_READLINK = @GNULIB_READLINK@ GNULIB_READLINKAT = @GNULIB_READLINKAT@ +GNULIB_REALLOCARRAY = @GNULIB_REALLOCARRAY@ GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@ GNULIB_REALPATH = @GNULIB_REALPATH@ GNULIB_REMOVE = @GNULIB_REMOVE@ @@ -583,12 +585,14 @@ HAVE_DECL_GETLOGIN = @HAVE_DECL_GETLOGIN@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ +HAVE_DECL_INITSTATE = @HAVE_DECL_INITSTATE@ HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ HAVE_DECL_SETENV = @HAVE_DECL_SETENV@ HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@ +HAVE_DECL_SETSTATE = @HAVE_DECL_SETSTATE@ HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@ @@ -606,6 +610,7 @@ HAVE_DUP2 = @HAVE_DUP2@ HAVE_DUP3 = @HAVE_DUP3@ HAVE_DUPLOCALE = @HAVE_DUPLOCALE@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ +HAVE_EXPLICIT_BZERO = @HAVE_EXPLICIT_BZERO@ HAVE_FACCESSAT = @HAVE_FACCESSAT@ HAVE_FCHDIR = @HAVE_FCHDIR@ HAVE_FCHMODAT = @HAVE_FCHMODAT@ @@ -676,6 +681,7 @@ HAVE_RANDOM_R = @HAVE_RANDOM_R@ HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@ HAVE_READLINK = @HAVE_READLINK@ HAVE_READLINKAT = @HAVE_READLINKAT@ +HAVE_REALLOCARRAY = @HAVE_REALLOCARRAY@ HAVE_REALPATH = @HAVE_REALPATH@ HAVE_RENAMEAT = @HAVE_RENAMEAT@ HAVE_RPMATCH = @HAVE_RPMATCH@ @@ -1305,7 +1311,7 @@ distdir: $(DISTFILES) ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r "$(distdir)" dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz $(am__post_remove_distdir) dist-bzip2: distdir @@ -1330,7 +1336,7 @@ dist-shar: distdir @echo WARNING: "Support for shar distribution archives is" \ "deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz + shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz $(am__post_remove_distdir) dist-zip: distdir @@ -1348,7 +1354,7 @@ dist dist-all: distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lz*) \ @@ -1358,7 +1364,7 @@ distcheck: dist *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac diff --git a/aclocal.m4 b/aclocal.m4 index 9b84f63..db0d01d 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.15 -*- Autoconf -*- +# generated automatically by aclocal 1.15.1 -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1353,7 +1353,7 @@ fi AC_SUBST([$1])dnl ]) -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1368,7 +1368,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.15' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.15], [], +m4_if([$1], [1.15.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -1384,14 +1384,14 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.15])dnl +[AM_AUTOMAKE_VERSION([1.15.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1443,7 +1443,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd` # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1474,7 +1474,7 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1665,7 +1665,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1741,7 +1741,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1938,7 +1938,7 @@ for _am_header in $config_headers :; do done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1959,7 +1959,7 @@ if test x"${install_sh+set}" != xset; then fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1981,7 +1981,7 @@ AC_SUBST([am__leading_dot])]) # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -2016,7 +2016,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -2066,7 +2066,7 @@ rm -f confinc confmf # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -2105,7 +2105,7 @@ fi # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -2134,7 +2134,7 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -2181,7 +2181,7 @@ AC_LANG_POP([C])]) # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -2200,7 +2200,7 @@ AC_DEFUN([AM_RUN_LOG], # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -2281,7 +2281,7 @@ AC_CONFIG_COMMANDS_PRE( rm -f conftest.file ]) -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -2341,7 +2341,7 @@ AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -2369,7 +2369,7 @@ fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -2388,7 +2388,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# Copyright (C) 2004-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/config.h.in b/config.h.in index c0977be..8ee0c34 100644 --- a/config.h.in +++ b/config.h.in @@ -498,6 +498,9 @@ /* Define to 1 if readlinkat is declared even after undefining macros. */ #undef HAVE_RAW_DECL_READLINKAT +/* Define to 1 if reallocarray is declared even after undefining macros. */ +#undef HAVE_RAW_DECL_REALLOCARRAY + /* Define to 1 if realpath is declared even after undefining macros. */ #undef HAVE_RAW_DECL_REALPATH @@ -945,6 +948,14 @@ #ifndef _GNU_SOURCE # undef _GNU_SOURCE #endif +/* Enable NetBSD extensions on NetBSD. */ +#ifndef _NETBSD_SOURCE +# undef _NETBSD_SOURCE +#endif +/* Enable OpenBSD extensions on NetBSD. */ +#ifndef _OPENBSD_SOURCE +# undef _OPENBSD_SOURCE +#endif /* Enable threading extensions on Solaris. */ #ifndef _POSIX_PTHREAD_SEMANTICS # undef _POSIX_PTHREAD_SEMANTICS diff --git a/configure b/configure index f7f98be..1840ec8 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Star Traders 7.11. +# Generated by GNU Autoconf 2.69 for Star Traders 7.12. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Star Traders' PACKAGE_TARNAME='trader' -PACKAGE_VERSION='7.11' -PACKAGE_STRING='Star Traders 7.11' +PACKAGE_VERSION='7.12' +PACKAGE_STRING='Star Traders 7.12' PACKAGE_BUGREPORT='J.Zaitseff@zap.org.au' PACKAGE_URL='http://www.zap.org.au/software/trader/' @@ -700,11 +700,13 @@ HAVE_STRUCT_RANDOM_DATA HAVE_STRTOULL HAVE_STRTOLL HAVE_STRTOD +HAVE_DECL_SETSTATE HAVE_DECL_SETENV HAVE_SETENV HAVE_SECURE_GETENV HAVE_RPMATCH HAVE_REALPATH +HAVE_REALLOCARRAY HAVE_RANDOM_R HAVE_RANDOM_H HAVE_RANDOM @@ -717,6 +719,7 @@ HAVE_MKSTEMP HAVE_MKOSTEMPS HAVE_MKOSTEMP HAVE_MKDTEMP +HAVE_DECL_INITSTATE HAVE_GRANTPT HAVE_GETSUBOPT HAVE_DECL_GETLOADAVG @@ -735,6 +738,7 @@ GNULIB_SECURE_GETENV GNULIB_RPMATCH GNULIB_REALPATH GNULIB_REALLOC_POSIX +GNULIB_REALLOCARRAY GNULIB_RANDOM_R GNULIB_RANDOM GNULIB_QSORT_R @@ -874,6 +878,7 @@ HAVE_DECL_MEMMEM HAVE_MEMCHR HAVE_FFSLL HAVE_FFSL +HAVE_EXPLICIT_BZERO HAVE_MBSLEN GNULIB_STRVERSCMP GNULIB_STRSIGNAL @@ -912,6 +917,7 @@ GNULIB_MEMMEM GNULIB_MEMCHR GNULIB_FFSLL GNULIB_FFSL +GNULIB_EXPLICIT_BZERO NEXT_AS_FIRST_DIRECTIVE_STDIO_H NEXT_STDIO_H REPLACE_VSPRINTF @@ -2051,7 +2057,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Star Traders 7.11 to adapt to many kinds of systems. +\`configure' configures Star Traders 7.12 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2122,7 +2128,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Star Traders 7.11:";; + short | recursive ) echo "Configuration of Star Traders 7.12:";; esac cat <<\_ACEOF @@ -2239,7 +2245,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Star Traders configure 7.11 +Star Traders configure 7.12 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2891,7 +2897,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Star Traders $as_me 7.11, which was +It was created by Star Traders $as_me 7.12, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3791,7 +3797,7 @@ fi # Define the identity of the package. PACKAGE='trader' - VERSION='7.11' + VERSION='7.12' cat >>confdefs.h <<_ACEOF @@ -5591,6 +5597,10 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; } $as_echo "#define _GNU_SOURCE 1" >>confdefs.h + $as_echo "#define _NETBSD_SOURCE 1" >>confdefs.h + + $as_echo "#define _OPENBSD_SOURCE 1" >>confdefs.h + $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h $as_echo "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h @@ -11794,7 +11804,12 @@ main () _ACEOF if ac_fn_c_try_compile "$LINENO"; then : if test "$cross_compiling" = yes; then : - gl_cv_header_working_stdint_h=yes + case "$host_os" in + # Guess yes on native Windows. + mingw*) gl_cv_header_working_stdint_h="guessing yes" ;; + # In general, assume it works. + *) gl_cv_header_working_stdint_h="guessing yes" ;; + esac else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -11894,15 +11909,16 @@ $as_echo "$gl_cv_header_working_stdint_h" >&6; } HAVE_SYS_BITYPES_H=0 HAVE_SYS_INTTYPES_H=0 STDINT_H=stdint.h - if test "$gl_cv_header_working_stdint_h" = yes; then - HAVE_C99_STDINT_H=1 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stdint.h predates C++11" >&5 + case "$gl_cv_header_working_stdint_h" in + *yes) + HAVE_C99_STDINT_H=1 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stdint.h predates C++11" >&5 $as_echo_n "checking whether stdint.h predates C++11... " >&6; } if ${gl_cv_header_stdint_predates_cxx11_h+:} false; then : $as_echo_n "(cached) " >&6 else gl_cv_header_stdint_predates_cxx11_h=yes - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -11940,29 +11956,29 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_stdint_predates_cxx11_h" >&5 $as_echo "$gl_cv_header_stdint_predates_cxx11_h" >&6; } - if test "$gl_cv_header_stdint_predates_cxx11_h" = yes; then + if test "$gl_cv_header_stdint_predates_cxx11_h" = yes; then $as_echo "#define __STDC_CONSTANT_MACROS 1" >>confdefs.h $as_echo "#define __STDC_LIMIT_MACROS 1" >>confdefs.h - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stdint.h has UINTMAX_WIDTH etc." >&5 + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stdint.h has UINTMAX_WIDTH etc." >&5 $as_echo_n "checking whether stdint.h has UINTMAX_WIDTH etc.... " >&6; } if ${gl_cv_header_stdint_width+:} false; then : $as_echo_n "(cached) " >&6 else gl_cv_header_stdint_width=no - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - /* Work if build is not clean. */ - #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 - #ifndef __STDC_WANT_IEC_60559_BFP_EXT__ - #define __STDC_WANT_IEC_60559_BFP_EXT__ 1 - #endif - #include + /* Work if build is not clean. */ + #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 + #ifndef __STDC_WANT_IEC_60559_BFP_EXT__ + #define __STDC_WANT_IEC_60559_BFP_EXT__ 1 + #endif + #include /* BSD/OS 4.0.1 has a bug: , and must be included before . */ @@ -11974,7 +11990,7 @@ else # include #endif - int iw = UINTMAX_WIDTH; + int iw = UINTMAX_WIDTH; int main () @@ -11991,11 +12007,12 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_stdint_width" >&5 $as_echo "$gl_cv_header_stdint_width" >&6; } - if test "$gl_cv_header_stdint_width" = yes; then - STDINT_H= - fi - else - for ac_header in sys/inttypes.h sys/bitypes.h + if test "$gl_cv_header_stdint_width" = yes; then + STDINT_H= + fi + ;; + *) + for ac_header in sys/inttypes.h sys/bitypes.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" @@ -12008,12 +12025,12 @@ fi done - if test $ac_cv_header_sys_inttypes_h = yes; then - HAVE_SYS_INTTYPES_H=1 - fi - if test $ac_cv_header_sys_bitypes_h = yes; then - HAVE_SYS_BITYPES_H=1 - fi + if test $ac_cv_header_sys_inttypes_h = yes; then + HAVE_SYS_INTTYPES_H=1 + fi + if test $ac_cv_header_sys_bitypes_h = yes; then + HAVE_SYS_BITYPES_H=1 + fi if test $APPLE_UNIVERSAL_BUILD = 0; then @@ -12313,7 +12330,8 @@ _ACEOF BITSIZEOF_WINT_T=32 fi - fi + ;; + esac LIMITS_H=limits.h if test -n "$LIMITS_H"; then @@ -12442,6 +12460,7 @@ fi REPLACE_VSPRINTF=0; + GNULIB_EXPLICIT_BZERO=0; GNULIB_FFSL=0; GNULIB_FFSLL=0; GNULIB_MEMCHR=0; @@ -12480,7 +12499,8 @@ fi GNULIB_STRSIGNAL=0; GNULIB_STRVERSCMP=0; HAVE_MBSLEN=0; - HAVE_FFSL=1; + HAVE_EXPLICIT_BZERO=1; + HAVE_FFSL=1; HAVE_FFSLL=1; HAVE_MEMCHR=1; HAVE_DECL_MEMMEM=1; @@ -12640,6 +12660,7 @@ fi + # Check for mmap(). Don't use AC_FUNC_MMAP, because it checks too much: it # fails on HP-UX 11, because MAP_FIXED mappings do not work. But this is # irrelevant for anonymous mappings. @@ -12719,7 +12740,13 @@ if ${gl_cv_func_memchr_works+:} false; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : - gl_cv_func_memchr_works="guessing no" + case "$host_os" in + # Guess yes on native Windows. + mingw*) gl_cv_func_memchr_works="guessing yes" ;; + # Be pessimistic for now. + *) gl_cv_func_memchr_works="guessing no" ;; + esac + else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12785,18 +12812,20 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi + fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_memchr_works" >&5 $as_echo "$gl_cv_func_memchr_works" >&6; } - if test "$gl_cv_func_memchr_works" != yes; then - REPLACE_MEMCHR=1 - fi + case "$gl_cv_func_memchr_works" in + *yes) ;; + *) REPLACE_MEMCHR=1 ;; + esac fi - if test "$gl_cv_func_memchr_works" != yes; then + if test $HAVE_MEMCHR = 0 || test $REPLACE_MEMCHR = 1; then REPLACE_STRSTR=1 else { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strstr works" >&5 @@ -13365,7 +13394,12 @@ if ${gl_cv_header_working_fcntl_h+:} false; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : - gl_cv_header_working_fcntl_h=cross-compiling + case "$host_os" in + # Guess 'no' on native Windows. + mingw*) gl_cv_header_working_fcntl_h='no' ;; + *) gl_cv_header_working_fcntl_h=cross-compiling ;; + esac + else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -13476,6 +13510,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi + fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_fcntl_h" >&5 $as_echo "$gl_cv_header_working_fcntl_h" >&6; } @@ -13570,6 +13605,7 @@ $as_echo "$ac_cv_gnu_library_2_1" >&6; } GNULIB_QSORT_R=0; GNULIB_RANDOM=0; GNULIB_RANDOM_R=0; + GNULIB_REALLOCARRAY=0; GNULIB_REALLOC_POSIX=0; GNULIB_REALPATH=0; GNULIB_RPMATCH=0; @@ -13588,6 +13624,7 @@ $as_echo "$ac_cv_gnu_library_2_1" >&6; } HAVE_DECL_GETLOADAVG=1; HAVE_GETSUBOPT=1; HAVE_GRANTPT=1; + HAVE_DECL_INITSTATE=1; HAVE_MKDTEMP=1; HAVE_MKOSTEMP=1; HAVE_MKOSTEMPS=1; @@ -13600,11 +13637,13 @@ $as_echo "$ac_cv_gnu_library_2_1" >&6; } HAVE_RANDOM=1; HAVE_RANDOM_H=1; HAVE_RANDOM_R=1; + HAVE_REALLOCARRAY=1; HAVE_REALPATH=1; HAVE_RPMATCH=1; HAVE_SECURE_GETENV=1; HAVE_SETENV=1; HAVE_DECL_SETENV=1; + HAVE_DECL_SETSTATE=1; HAVE_STRTOD=1; HAVE_STRTOLL=1; HAVE_STRTOULL=1; @@ -13697,6 +13736,8 @@ else case "$host_os" in # Guess no on Cygwin. cygwin*) gl_cv_func_btowc_nul="guessing no" ;; + # Guess yes on native Windows. + mingw*) gl_cv_func_btowc_nul="guessing yes" ;; # Guess yes otherwise. *) gl_cv_func_btowc_nul="guessing yes" ;; esac @@ -13742,10 +13783,12 @@ if ${gl_cv_func_btowc_eof+:} false; then : else case "$host_os" in - # Guess no on IRIX. - irix*) gl_cv_func_btowc_eof="guessing no" ;; - # Guess yes otherwise. - *) gl_cv_func_btowc_eof="guessing yes" ;; + # Guess no on IRIX. + irix*) gl_cv_func_btowc_eof="guessing no" ;; + # Guess yes on native Windows. + mingw*) gl_cv_func_btowc_eof="guessing yes" ;; + # Guess yes otherwise. + *) gl_cv_func_btowc_eof="guessing yes" ;; esac if test $LOCALE_FR != none; then if test "$cross_compiling" = yes; then : @@ -13916,6 +13959,8 @@ else case "$host_os" in # Guess all is fine on glibc systems. *-gnu*) gl_cv_func_gettimeofday_clobber="guessing no" ;; + # Guess no on native Windows. + mingw*) gl_cv_func_gettimeofday_clobber="guessing no" ;; # If we don't know, assume the worst. *) gl_cv_func_gettimeofday_clobber="guessing yes" ;; esac @@ -15084,9 +15129,11 @@ if ${gl_cv_func_mbrtowc_empty_input+:} false; then : else case "$host_os" in - # Guess no on AIX and glibc systems. + # Guess no on AIX and glibc systems. aix* | *-gnu*) gl_cv_func_mbrtowc_empty_input="guessing no" ;; + # Guess yes on native Windows. + mingw*) gl_cv_func_mbrtowc_empty_input="guessing yes" ;; *) gl_cv_func_mbrtowc_empty_input="guessing yes" ;; esac if test "$cross_compiling" = yes; then : @@ -15119,7 +15166,7 @@ fi $as_echo "$gl_cv_func_mbrtowc_empty_input" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C locale is free of encoding errors" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C locale is free of encoding errors" >&5 $as_echo_n "checking whether the C locale is free of encoding errors... " >&6; } if ${gl_cv_C_locale_sans_EILSEQ+:} false; then : $as_echo_n "(cached) " >&6 @@ -15128,7 +15175,11 @@ else gl_cv_C_locale_sans_EILSEQ="guessing no" if test "$cross_compiling" = yes; then : - : + case "$host_os" in + # Guess yes on native Windows. + mingw*) gl_cv_C_locale_sans_EILSEQ="guessing yes" ;; + esac + else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -15168,6 +15219,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi + fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_C_locale_sans_EILSEQ" >&5 $as_echo "$gl_cv_C_locale_sans_EILSEQ" >&6; } @@ -16117,7 +16169,7 @@ $as_echo "$gl_cv_func_strstr_linear" >&6; } - if test "$gl_cv_func_memchr_works" != yes; then + if test $HAVE_MEMCHR = 0 || test $REPLACE_MEMCHR = 1; then REPLACE_STRSTR=1 else { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strstr works" >&5 @@ -17001,6 +17053,8 @@ else case "$host_os" in # Guess no on AIX 4, OSF/1 and Solaris. aix4* | osf* | solaris*) gl_cv_func_wcrtomb_retval="guessing no" ;; + # Guess yes on native Windows. + mingw*) gl_cv_func_wcrtomb_retval="guessing yes" ;; # Guess yes otherwise. *) gl_cv_func_wcrtomb_retval="guessing yes" ;; esac @@ -17153,6 +17207,9 @@ else case "$host_os" in # Guess no on Solaris <= 9 and Cygwin. solaris2.[1-9] | solaris2.[1-9].* | cygwin*) + gl_cv_func_wctob_works="guessing no" ;; + # Guess no on native Windows. + mingw*) gl_cv_func_wctob_works="guessing no" ;; # Guess yes otherwise. *) gl_cv_func_wctob_works="guessing yes" ;; @@ -17416,7 +17473,7 @@ if ${gl_cv_func_iswcntrl_works+:} false; then : else if test "$cross_compiling" = yes; then : - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #if __GNU_LIBRARY__ == 1 @@ -18241,7 +18298,7 @@ $as_echo "$gl_cv_next_stdlib_h" >&6; } - for gl_func in _Exit atoll canonicalize_file_name getloadavg getsubopt grantpt initstate initstate_r mkdtemp mkostemp mkostemps mkstemp mkstemps posix_openpt ptsname ptsname_r qsort_r random random_r realpath rpmatch secure_getenv setenv setstate setstate_r srandom srandom_r strtod strtoll strtoull unlockpt unsetenv; do + for gl_func in _Exit atoll canonicalize_file_name getloadavg getsubopt grantpt initstate initstate_r mkdtemp mkostemp mkostemps mkstemp mkstemps posix_openpt ptsname ptsname_r qsort_r random random_r reallocarray realpath rpmatch secure_getenv setenv setstate setstate_r srandom srandom_r strtod strtoll strtoull unlockpt unsetenv; do as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5 $as_echo_n "checking whether $gl_func is declared without a macro... " >&6; } @@ -20494,7 +20551,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Star Traders $as_me 7.11, which was +This file was extended by Star Traders $as_me 7.12, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20561,7 +20618,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Star Traders config.status 7.11 +Star Traders config.status 7.12 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/data/Makefile.in b/data/Makefile.in index 4d6dd3c..bbad90c 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -285,6 +285,7 @@ GNULIB_DUP3 = @GNULIB_DUP3@ GNULIB_DUPLOCALE = @GNULIB_DUPLOCALE@ GNULIB_ENVIRON = @GNULIB_ENVIRON@ GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@ +GNULIB_EXPLICIT_BZERO = @GNULIB_EXPLICIT_BZERO@ GNULIB_FACCESSAT = @GNULIB_FACCESSAT@ GNULIB_FCHDIR = @GNULIB_FCHDIR@ GNULIB_FCHMODAT = @GNULIB_FCHMODAT@ @@ -411,6 +412,7 @@ GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@ GNULIB_READ = @GNULIB_READ@ GNULIB_READLINK = @GNULIB_READLINK@ GNULIB_READLINKAT = @GNULIB_READLINKAT@ +GNULIB_REALLOCARRAY = @GNULIB_REALLOCARRAY@ GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@ GNULIB_REALPATH = @GNULIB_REALPATH@ GNULIB_REMOVE = @GNULIB_REMOVE@ @@ -539,12 +541,14 @@ HAVE_DECL_GETLOGIN = @HAVE_DECL_GETLOGIN@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ +HAVE_DECL_INITSTATE = @HAVE_DECL_INITSTATE@ HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ HAVE_DECL_SETENV = @HAVE_DECL_SETENV@ HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@ +HAVE_DECL_SETSTATE = @HAVE_DECL_SETSTATE@ HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@ @@ -562,6 +566,7 @@ HAVE_DUP2 = @HAVE_DUP2@ HAVE_DUP3 = @HAVE_DUP3@ HAVE_DUPLOCALE = @HAVE_DUPLOCALE@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ +HAVE_EXPLICIT_BZERO = @HAVE_EXPLICIT_BZERO@ HAVE_FACCESSAT = @HAVE_FACCESSAT@ HAVE_FCHDIR = @HAVE_FCHDIR@ HAVE_FCHMODAT = @HAVE_FCHMODAT@ @@ -632,6 +637,7 @@ HAVE_RANDOM_R = @HAVE_RANDOM_R@ HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@ HAVE_READLINK = @HAVE_READLINK@ HAVE_READLINKAT = @HAVE_READLINKAT@ +HAVE_REALLOCARRAY = @HAVE_REALLOCARRAY@ HAVE_REALPATH = @HAVE_REALPATH@ HAVE_RENAMEAT = @HAVE_RENAMEAT@ HAVE_RPMATCH = @HAVE_RPMATCH@ diff --git a/doc/Makefile.in b/doc/Makefile.in index 04738ed..250052b 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -270,6 +270,7 @@ GNULIB_DUP3 = @GNULIB_DUP3@ GNULIB_DUPLOCALE = @GNULIB_DUPLOCALE@ GNULIB_ENVIRON = @GNULIB_ENVIRON@ GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@ +GNULIB_EXPLICIT_BZERO = @GNULIB_EXPLICIT_BZERO@ GNULIB_FACCESSAT = @GNULIB_FACCESSAT@ GNULIB_FCHDIR = @GNULIB_FCHDIR@ GNULIB_FCHMODAT = @GNULIB_FCHMODAT@ @@ -396,6 +397,7 @@ GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@ GNULIB_READ = @GNULIB_READ@ GNULIB_READLINK = @GNULIB_READLINK@ GNULIB_READLINKAT = @GNULIB_READLINKAT@ +GNULIB_REALLOCARRAY = @GNULIB_REALLOCARRAY@ GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@ GNULIB_REALPATH = @GNULIB_REALPATH@ GNULIB_REMOVE = @GNULIB_REMOVE@ @@ -524,12 +526,14 @@ HAVE_DECL_GETLOGIN = @HAVE_DECL_GETLOGIN@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ +HAVE_DECL_INITSTATE = @HAVE_DECL_INITSTATE@ HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ HAVE_DECL_SETENV = @HAVE_DECL_SETENV@ HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@ +HAVE_DECL_SETSTATE = @HAVE_DECL_SETSTATE@ HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@ @@ -547,6 +551,7 @@ HAVE_DUP2 = @HAVE_DUP2@ HAVE_DUP3 = @HAVE_DUP3@ HAVE_DUPLOCALE = @HAVE_DUPLOCALE@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ +HAVE_EXPLICIT_BZERO = @HAVE_EXPLICIT_BZERO@ HAVE_FACCESSAT = @HAVE_FACCESSAT@ HAVE_FCHDIR = @HAVE_FCHDIR@ HAVE_FCHMODAT = @HAVE_FCHMODAT@ @@ -617,6 +622,7 @@ HAVE_RANDOM_R = @HAVE_RANDOM_R@ HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@ HAVE_READLINK = @HAVE_READLINK@ HAVE_READLINKAT = @HAVE_READLINKAT@ +HAVE_REALLOCARRAY = @HAVE_REALLOCARRAY@ HAVE_REALPATH = @HAVE_REALPATH@ HAVE_RENAMEAT = @HAVE_RENAMEAT@ HAVE_RPMATCH = @HAVE_RPMATCH@ diff --git a/lib/Makefile.am b/lib/Makefile.am index b1a0a8b..dd29479 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -249,19 +249,19 @@ EXTRA_DIST += iconv.in.h ## begin gnulib module iconv_open -iconv_open-aix.h: iconv_open-aix.gperf +$(srcdir)/iconv_open-aix.h: $(srcdir)/iconv_open-aix.gperf $(V_GPERF)$(GPERF) -m 10 $(srcdir)/iconv_open-aix.gperf > $(srcdir)/iconv_open-aix.h-t && \ mv $(srcdir)/iconv_open-aix.h-t $(srcdir)/iconv_open-aix.h -iconv_open-hpux.h: iconv_open-hpux.gperf +$(srcdir)/iconv_open-hpux.h: $(srcdir)/iconv_open-hpux.gperf $(V_GPERF)$(GPERF) -m 10 $(srcdir)/iconv_open-hpux.gperf > $(srcdir)/iconv_open-hpux.h-t && \ mv $(srcdir)/iconv_open-hpux.h-t $(srcdir)/iconv_open-hpux.h -iconv_open-irix.h: iconv_open-irix.gperf +$(srcdir)/iconv_open-irix.h: $(srcdir)/iconv_open-irix.gperf $(V_GPERF)$(GPERF) -m 10 $(srcdir)/iconv_open-irix.gperf > $(srcdir)/iconv_open-irix.h-t && \ mv $(srcdir)/iconv_open-irix.h-t $(srcdir)/iconv_open-irix.h -iconv_open-osf.h: iconv_open-osf.gperf +$(srcdir)/iconv_open-osf.h: $(srcdir)/iconv_open-osf.gperf $(V_GPERF)$(GPERF) -m 10 $(srcdir)/iconv_open-osf.gperf > $(srcdir)/iconv_open-osf.h-t && \ mv $(srcdir)/iconv_open-osf.h-t $(srcdir)/iconv_open-osf.h -iconv_open-solaris.h: iconv_open-solaris.gperf +$(srcdir)/iconv_open-solaris.h: $(srcdir)/iconv_open-solaris.gperf $(V_GPERF)$(GPERF) -m 10 $(srcdir)/iconv_open-solaris.gperf > $(srcdir)/iconv_open-solaris.h-t && \ mv $(srcdir)/iconv_open-solaris.h-t $(srcdir)/iconv_open-solaris.h BUILT_SOURCES += iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h iconv_open-osf.h iconv_open-solaris.h @@ -810,6 +810,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -e 's/@''GNULIB_RANDOM''@/$(GNULIB_RANDOM)/g' \ -e 's/@''GNULIB_RANDOM_R''@/$(GNULIB_RANDOM_R)/g' \ -e 's/@''GNULIB_REALLOC_POSIX''@/$(GNULIB_REALLOC_POSIX)/g' \ + -e 's/@''GNULIB_REALLOCARRAY''@/$(GNULIB_REALLOCARRAY)/g' \ -e 's/@''GNULIB_REALPATH''@/$(GNULIB_REALPATH)/g' \ -e 's/@''GNULIB_RPMATCH''@/$(GNULIB_RPMATCH)/g' \ -e 's/@''GNULIB_SECURE_GETENV''@/$(GNULIB_SECURE_GETENV)/g' \ @@ -828,6 +829,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -e 's|@''HAVE_DECL_GETLOADAVG''@|$(HAVE_DECL_GETLOADAVG)|g' \ -e 's|@''HAVE_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \ -e 's|@''HAVE_GRANTPT''@|$(HAVE_GRANTPT)|g' \ + -e 's|@''HAVE_DECL_INITSTATE''@|$(HAVE_DECL_INITSTATE)|g' \ -e 's|@''HAVE_MKDTEMP''@|$(HAVE_MKDTEMP)|g' \ -e 's|@''HAVE_MKOSTEMP''@|$(HAVE_MKOSTEMP)|g' \ -e 's|@''HAVE_MKOSTEMPS''@|$(HAVE_MKOSTEMPS)|g' \ @@ -840,10 +842,12 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -e 's|@''HAVE_RANDOM''@|$(HAVE_RANDOM)|g' \ -e 's|@''HAVE_RANDOM_H''@|$(HAVE_RANDOM_H)|g' \ -e 's|@''HAVE_RANDOM_R''@|$(HAVE_RANDOM_R)|g' \ + -e 's|@''HAVE_REALLOCARRAY''@|$(HAVE_REALLOCARRAY)|g' \ -e 's|@''HAVE_REALPATH''@|$(HAVE_REALPATH)|g' \ -e 's|@''HAVE_RPMATCH''@|$(HAVE_RPMATCH)|g' \ -e 's|@''HAVE_SECURE_GETENV''@|$(HAVE_SECURE_GETENV)|g' \ -e 's|@''HAVE_DECL_SETENV''@|$(HAVE_DECL_SETENV)|g' \ + -e 's|@''HAVE_DECL_SETSTATE''@|$(HAVE_DECL_SETSTATE)|g' \ -e 's|@''HAVE_STRTOD''@|$(HAVE_STRTOD)|g' \ -e 's|@''HAVE_STRTOLL''@|$(HAVE_STRTOLL)|g' \ -e 's|@''HAVE_STRTOULL''@|$(HAVE_STRTOULL)|g' \ @@ -911,6 +915,7 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_STRING_H''@|$(NEXT_STRING_H)|g' \ + -e 's/@''GNULIB_EXPLICIT_BZERO''@/$(GNULIB_EXPLICIT_BZERO)/g' \ -e 's/@''GNULIB_FFSL''@/$(GNULIB_FFSL)/g' \ -e 's/@''GNULIB_FFSLL''@/$(GNULIB_FFSLL)/g' \ -e 's/@''GNULIB_MBSLEN''@/$(GNULIB_MBSLEN)/g' \ @@ -949,7 +954,8 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's/@''GNULIB_STRSIGNAL''@/$(GNULIB_STRSIGNAL)/g' \ -e 's/@''GNULIB_STRVERSCMP''@/$(GNULIB_STRVERSCMP)/g' \ < $(srcdir)/string.in.h | \ - sed -e 's|@''HAVE_FFSL''@|$(HAVE_FFSL)|g' \ + sed -e 's|@''HAVE_EXPLICIT_BZERO''@|$(HAVE_EXPLICIT_BZERO)|g' \ + -e 's|@''HAVE_FFSL''@|$(HAVE_FFSL)|g' \ -e 's|@''HAVE_FFSLL''@|$(HAVE_FFSLL)|g' \ -e 's|@''HAVE_MBSLEN''@|$(HAVE_MBSLEN)|g' \ -e 's|@''HAVE_MEMCHR''@|$(HAVE_MEMCHR)|g' \ diff --git a/lib/Makefile.in b/lib/Makefile.in index 1578216..d927361 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -354,6 +354,7 @@ GNULIB_DUP3 = @GNULIB_DUP3@ GNULIB_DUPLOCALE = @GNULIB_DUPLOCALE@ GNULIB_ENVIRON = @GNULIB_ENVIRON@ GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@ +GNULIB_EXPLICIT_BZERO = @GNULIB_EXPLICIT_BZERO@ GNULIB_FACCESSAT = @GNULIB_FACCESSAT@ GNULIB_FCHDIR = @GNULIB_FCHDIR@ GNULIB_FCHMODAT = @GNULIB_FCHMODAT@ @@ -480,6 +481,7 @@ GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@ GNULIB_READ = @GNULIB_READ@ GNULIB_READLINK = @GNULIB_READLINK@ GNULIB_READLINKAT = @GNULIB_READLINKAT@ +GNULIB_REALLOCARRAY = @GNULIB_REALLOCARRAY@ GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@ GNULIB_REALPATH = @GNULIB_REALPATH@ GNULIB_REMOVE = @GNULIB_REMOVE@ @@ -608,12 +610,14 @@ HAVE_DECL_GETLOGIN = @HAVE_DECL_GETLOGIN@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ +HAVE_DECL_INITSTATE = @HAVE_DECL_INITSTATE@ HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ HAVE_DECL_SETENV = @HAVE_DECL_SETENV@ HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@ +HAVE_DECL_SETSTATE = @HAVE_DECL_SETSTATE@ HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@ @@ -631,6 +635,7 @@ HAVE_DUP2 = @HAVE_DUP2@ HAVE_DUP3 = @HAVE_DUP3@ HAVE_DUPLOCALE = @HAVE_DUPLOCALE@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ +HAVE_EXPLICIT_BZERO = @HAVE_EXPLICIT_BZERO@ HAVE_FACCESSAT = @HAVE_FACCESSAT@ HAVE_FCHDIR = @HAVE_FCHDIR@ HAVE_FCHMODAT = @HAVE_FCHMODAT@ @@ -701,6 +706,7 @@ HAVE_RANDOM_R = @HAVE_RANDOM_R@ HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@ HAVE_READLINK = @HAVE_READLINK@ HAVE_READLINKAT = @HAVE_READLINKAT@ +HAVE_REALLOCARRAY = @HAVE_REALLOCARRAY@ HAVE_REALPATH = @HAVE_REALPATH@ HAVE_RENAMEAT = @HAVE_RENAMEAT@ HAVE_RPMATCH = @HAVE_RPMATCH@ @@ -1696,19 +1702,19 @@ getopt-cdefs.h: getopt-cdefs.in.h $(top_builddir)/config.status @GL_GENERATE_ICONV_H_FALSE@iconv.h: $(top_builddir)/config.status @GL_GENERATE_ICONV_H_FALSE@ rm -f $@ -iconv_open-aix.h: iconv_open-aix.gperf +$(srcdir)/iconv_open-aix.h: $(srcdir)/iconv_open-aix.gperf $(V_GPERF)$(GPERF) -m 10 $(srcdir)/iconv_open-aix.gperf > $(srcdir)/iconv_open-aix.h-t && \ mv $(srcdir)/iconv_open-aix.h-t $(srcdir)/iconv_open-aix.h -iconv_open-hpux.h: iconv_open-hpux.gperf +$(srcdir)/iconv_open-hpux.h: $(srcdir)/iconv_open-hpux.gperf $(V_GPERF)$(GPERF) -m 10 $(srcdir)/iconv_open-hpux.gperf > $(srcdir)/iconv_open-hpux.h-t && \ mv $(srcdir)/iconv_open-hpux.h-t $(srcdir)/iconv_open-hpux.h -iconv_open-irix.h: iconv_open-irix.gperf +$(srcdir)/iconv_open-irix.h: $(srcdir)/iconv_open-irix.gperf $(V_GPERF)$(GPERF) -m 10 $(srcdir)/iconv_open-irix.gperf > $(srcdir)/iconv_open-irix.h-t && \ mv $(srcdir)/iconv_open-irix.h-t $(srcdir)/iconv_open-irix.h -iconv_open-osf.h: iconv_open-osf.gperf +$(srcdir)/iconv_open-osf.h: $(srcdir)/iconv_open-osf.gperf $(V_GPERF)$(GPERF) -m 10 $(srcdir)/iconv_open-osf.gperf > $(srcdir)/iconv_open-osf.h-t && \ mv $(srcdir)/iconv_open-osf.h-t $(srcdir)/iconv_open-osf.h -iconv_open-solaris.h: iconv_open-solaris.gperf +$(srcdir)/iconv_open-solaris.h: $(srcdir)/iconv_open-solaris.gperf $(V_GPERF)$(GPERF) -m 10 $(srcdir)/iconv_open-solaris.gperf > $(srcdir)/iconv_open-solaris.h-t && \ mv $(srcdir)/iconv_open-solaris.h-t $(srcdir)/iconv_open-solaris.h @@ -2035,6 +2041,7 @@ stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) @gl_GNULIB_ENABLED_stdlib_TRUE@ -e 's/@''GNULIB_RANDOM''@/$(GNULIB_RANDOM)/g' \ @gl_GNULIB_ENABLED_stdlib_TRUE@ -e 's/@''GNULIB_RANDOM_R''@/$(GNULIB_RANDOM_R)/g' \ @gl_GNULIB_ENABLED_stdlib_TRUE@ -e 's/@''GNULIB_REALLOC_POSIX''@/$(GNULIB_REALLOC_POSIX)/g' \ +@gl_GNULIB_ENABLED_stdlib_TRUE@ -e 's/@''GNULIB_REALLOCARRAY''@/$(GNULIB_REALLOCARRAY)/g' \ @gl_GNULIB_ENABLED_stdlib_TRUE@ -e 's/@''GNULIB_REALPATH''@/$(GNULIB_REALPATH)/g' \ @gl_GNULIB_ENABLED_stdlib_TRUE@ -e 's/@''GNULIB_RPMATCH''@/$(GNULIB_RPMATCH)/g' \ @gl_GNULIB_ENABLED_stdlib_TRUE@ -e 's/@''GNULIB_SECURE_GETENV''@/$(GNULIB_SECURE_GETENV)/g' \ @@ -2053,6 +2060,7 @@ stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) @gl_GNULIB_ENABLED_stdlib_TRUE@ -e 's|@''HAVE_DECL_GETLOADAVG''@|$(HAVE_DECL_GETLOADAVG)|g' \ @gl_GNULIB_ENABLED_stdlib_TRUE@ -e 's|@''HAVE_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \ @gl_GNULIB_ENABLED_stdlib_TRUE@ -e 's|@''HAVE_GRANTPT''@|$(HAVE_GRANTPT)|g' \ +@gl_GNULIB_ENABLED_stdlib_TRUE@ -e 's|@''HAVE_DECL_INITSTATE''@|$(HAVE_DECL_INITSTATE)|g' \ @gl_GNULIB_ENABLED_stdlib_TRUE@ -e 's|@''HAVE_MKDTEMP''@|$(HAVE_MKDTEMP)|g' \ @gl_GNULIB_ENABLED_stdlib_TRUE@ -e 's|@''HAVE_MKOSTEMP''@|$(HAVE_MKOSTEMP)|g' \ @gl_GNULIB_ENABLED_stdlib_TRUE@ -e 's|@''HAVE_MKOSTEMPS''@|$(HAVE_MKOSTEMPS)|g' \ @@ -2065,10 +2073,12 @@ stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) @gl_GNULIB_ENABLED_stdlib_TRUE@ -e 's|@''HAVE_RANDOM''@|$(HAVE_RANDOM)|g' \ @gl_GNULIB_ENABLED_stdlib_TRUE@ -e 's|@''HAVE_RANDOM_H''@|$(HAVE_RANDOM_H)|g' \ @gl_GNULIB_ENABLED_stdlib_TRUE@ -e 's|@''HAVE_RANDOM_R''@|$(HAVE_RANDOM_R)|g' \ +@gl_GNULIB_ENABLED_stdlib_TRUE@ -e 's|@''HAVE_REALLOCARRAY''@|$(HAVE_REALLOCARRAY)|g' \ @gl_GNULIB_ENABLED_stdlib_TRUE@ -e 's|@''HAVE_REALPATH''@|$(HAVE_REALPATH)|g' \ @gl_GNULIB_ENABLED_stdlib_TRUE@ -e 's|@''HAVE_RPMATCH''@|$(HAVE_RPMATCH)|g' \ @gl_GNULIB_ENABLED_stdlib_TRUE@ -e 's|@''HAVE_SECURE_GETENV''@|$(HAVE_SECURE_GETENV)|g' \ @gl_GNULIB_ENABLED_stdlib_TRUE@ -e 's|@''HAVE_DECL_SETENV''@|$(HAVE_DECL_SETENV)|g' \ +@gl_GNULIB_ENABLED_stdlib_TRUE@ -e 's|@''HAVE_DECL_SETSTATE''@|$(HAVE_DECL_SETSTATE)|g' \ @gl_GNULIB_ENABLED_stdlib_TRUE@ -e 's|@''HAVE_STRTOD''@|$(HAVE_STRTOD)|g' \ @gl_GNULIB_ENABLED_stdlib_TRUE@ -e 's|@''HAVE_STRTOLL''@|$(HAVE_STRTOLL)|g' \ @gl_GNULIB_ENABLED_stdlib_TRUE@ -e 's|@''HAVE_STRTOULL''@|$(HAVE_STRTOULL)|g' \ @@ -2109,6 +2119,7 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_STRING_H''@|$(NEXT_STRING_H)|g' \ + -e 's/@''GNULIB_EXPLICIT_BZERO''@/$(GNULIB_EXPLICIT_BZERO)/g' \ -e 's/@''GNULIB_FFSL''@/$(GNULIB_FFSL)/g' \ -e 's/@''GNULIB_FFSLL''@/$(GNULIB_FFSLL)/g' \ -e 's/@''GNULIB_MBSLEN''@/$(GNULIB_MBSLEN)/g' \ @@ -2147,7 +2158,8 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's/@''GNULIB_STRSIGNAL''@/$(GNULIB_STRSIGNAL)/g' \ -e 's/@''GNULIB_STRVERSCMP''@/$(GNULIB_STRVERSCMP)/g' \ < $(srcdir)/string.in.h | \ - sed -e 's|@''HAVE_FFSL''@|$(HAVE_FFSL)|g' \ + sed -e 's|@''HAVE_EXPLICIT_BZERO''@|$(HAVE_EXPLICIT_BZERO)|g' \ + -e 's|@''HAVE_FFSL''@|$(HAVE_FFSL)|g' \ -e 's|@''HAVE_FFSLL''@|$(HAVE_FFSLL)|g' \ -e 's|@''HAVE_MBSLEN''@|$(HAVE_MBSLEN)|g' \ -e 's|@''HAVE_MEMCHR''@|$(HAVE_MEMCHR)|g' \ diff --git a/lib/stdio.in.h b/lib/stdio.in.h index d706377..b714c54 100644 --- a/lib/stdio.in.h +++ b/lib/stdio.in.h @@ -111,9 +111,9 @@ #define _GL_ATTRIBUTE_FORMAT_SCANF_SYSTEM(formatstring_parameter, first_argument) \ _GL_ATTRIBUTE_FORMAT ((__scanf__, formatstring_parameter, first_argument)) -/* Solaris 10 declares renameat in , not in . */ +/* Solaris 10 and NetBSD 7.0 declare renameat in , not in . */ /* But in any case avoid namespace pollution on glibc systems. */ -#if (@GNULIB_RENAMEAT@ || defined GNULIB_POSIXCHECK) && defined __sun \ +#if (@GNULIB_RENAMEAT@ || defined GNULIB_POSIXCHECK) && (defined __sun || defined __NetBSD__) \ && ! defined __GLIBC__ # include #endif diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h index b5cf9d3..ef41c99 100644 --- a/lib/stdlib.in.h +++ b/lib/stdlib.in.h @@ -597,7 +597,7 @@ _GL_WARN_ON_USE (srandom, "srandom is unportable - " #endif #if @GNULIB_RANDOM@ -# if !@HAVE_RANDOM@ +# if !@HAVE_RANDOM@ || !@HAVE_DECL_INITSTATE@ _GL_FUNCDECL_SYS (initstate, char *, (unsigned int seed, char *buf, size_t buf_size) _GL_ARG_NONNULL ((2))); @@ -614,7 +614,7 @@ _GL_WARN_ON_USE (initstate, "initstate is unportable - " #endif #if @GNULIB_RANDOM@ -# if !@HAVE_RANDOM@ +# if !@HAVE_RANDOM@ || !@HAVE_DECL_SETSTATE@ _GL_FUNCDECL_SYS (setstate, char *, (char *arg_state) _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (setstate, char *, (char *arg_state)); @@ -765,6 +765,23 @@ _GL_WARN_ON_USE (realloc, "realloc is not POSIX compliant everywhere - " "use gnulib module realloc-posix for portability"); #endif + +#if @GNULIB_REALLOCARRAY@ +# if ! @HAVE_REALLOCARRAY@ +_GL_FUNCDECL_SYS (reallocarray, void *, + (void *ptr, size_t nmemb, size_t size)); +# endif +_GL_CXXALIAS_SYS (reallocarray, void *, + (void *ptr, size_t nmemb, size_t size)); +_GL_CXXALIASWARN (reallocarray); +#elif defined GNULIB_POSIXCHECK +# undef reallocarray +# if HAVE_RAW_DECL_REALLOCARRAY +_GL_WARN_ON_USE (reallocarray, "reallocarray is not portable - " + "use gnulib module reallocarray for portability"); +# endif +#endif + #if @GNULIB_REALPATH@ # if @REPLACE_REALPATH@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) diff --git a/lib/string.in.h b/lib/string.in.h index 9a6b311..aaff563 100644 --- a/lib/string.in.h +++ b/lib/string.in.h @@ -74,6 +74,23 @@ /* The definition of _GL_WARN_ON_USE is copied here. */ +/* Clear a block of memory. The compiler will not delete a call to + this function, even if the block is dead after the call. */ +#if @GNULIB_EXPLICIT_BZERO@ +# if ! @HAVE_EXPLICIT_BZERO@ +_GL_FUNCDECL_SYS (explicit_bzero, void, + (void *__dest, size_t __n) _GL_ARG_NONNULL ((1))); +# endif +_GL_CXXALIAS_SYS (explicit_bzero, void, (void *__dest, size_t __n)); +_GL_CXXALIASWARN (explicit_bzero); +#elif defined GNULIB_POSIXCHECK +# undef explicit_bzero +# if HAVE_RAW_DECL_EXPLICIT_BZERO +_GL_WARN_ON_USE (explicit_bzero, "explicit_bzero is unportable - " + "use gnulib module explicit_bzero for portability"); +# endif +#endif + /* Find the index of the least-significant set bit. */ #if @GNULIB_FFSL@ # if !@HAVE_FFSL@ diff --git a/m4/.gitignore b/m4/.gitignore index e45e8d0..5dbe905 100644 --- a/m4/.gitignore +++ b/m4/.gitignore @@ -1 +1,2 @@ +/gnulib-comp.m4 /gnulib-tool.m4 diff --git a/m4/Makefile.in b/m4/Makefile.in index 299bdc6..b99d899 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -239,6 +239,7 @@ GNULIB_DUP3 = @GNULIB_DUP3@ GNULIB_DUPLOCALE = @GNULIB_DUPLOCALE@ GNULIB_ENVIRON = @GNULIB_ENVIRON@ GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@ +GNULIB_EXPLICIT_BZERO = @GNULIB_EXPLICIT_BZERO@ GNULIB_FACCESSAT = @GNULIB_FACCESSAT@ GNULIB_FCHDIR = @GNULIB_FCHDIR@ GNULIB_FCHMODAT = @GNULIB_FCHMODAT@ @@ -365,6 +366,7 @@ GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@ GNULIB_READ = @GNULIB_READ@ GNULIB_READLINK = @GNULIB_READLINK@ GNULIB_READLINKAT = @GNULIB_READLINKAT@ +GNULIB_REALLOCARRAY = @GNULIB_REALLOCARRAY@ GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@ GNULIB_REALPATH = @GNULIB_REALPATH@ GNULIB_REMOVE = @GNULIB_REMOVE@ @@ -493,12 +495,14 @@ HAVE_DECL_GETLOGIN = @HAVE_DECL_GETLOGIN@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ +HAVE_DECL_INITSTATE = @HAVE_DECL_INITSTATE@ HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ HAVE_DECL_SETENV = @HAVE_DECL_SETENV@ HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@ +HAVE_DECL_SETSTATE = @HAVE_DECL_SETSTATE@ HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@ @@ -516,6 +520,7 @@ HAVE_DUP2 = @HAVE_DUP2@ HAVE_DUP3 = @HAVE_DUP3@ HAVE_DUPLOCALE = @HAVE_DUPLOCALE@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ +HAVE_EXPLICIT_BZERO = @HAVE_EXPLICIT_BZERO@ HAVE_FACCESSAT = @HAVE_FACCESSAT@ HAVE_FCHDIR = @HAVE_FCHDIR@ HAVE_FCHMODAT = @HAVE_FCHMODAT@ @@ -586,6 +591,7 @@ HAVE_RANDOM_R = @HAVE_RANDOM_R@ HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@ HAVE_READLINK = @HAVE_READLINK@ HAVE_READLINKAT = @HAVE_READLINKAT@ +HAVE_REALLOCARRAY = @HAVE_REALLOCARRAY@ HAVE_REALPATH = @HAVE_REALPATH@ HAVE_RENAMEAT = @HAVE_RENAMEAT@ HAVE_RPMATCH = @HAVE_RPMATCH@ diff --git a/m4/btowc.m4 b/m4/btowc.m4 index 1021809..5e031e0 100644 --- a/m4/btowc.m4 +++ b/m4/btowc.m4 @@ -1,4 +1,4 @@ -# btowc.m4 serial 10 +# btowc.m4 serial 11 dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -50,6 +50,8 @@ changequote(,)dnl case "$host_os" in # Guess no on Cygwin. cygwin*) gl_cv_func_btowc_nul="guessing no" ;; + # Guess yes on native Windows. + mingw*) gl_cv_func_btowc_nul="guessing yes" ;; # Guess yes otherwise. *) gl_cv_func_btowc_nul="guessing yes" ;; esac @@ -65,10 +67,12 @@ changequote([,])dnl dnl is present. changequote(,)dnl case "$host_os" in - # Guess no on IRIX. - irix*) gl_cv_func_btowc_eof="guessing no" ;; - # Guess yes otherwise. - *) gl_cv_func_btowc_eof="guessing yes" ;; + # Guess no on IRIX. + irix*) gl_cv_func_btowc_eof="guessing no" ;; + # Guess yes on native Windows. + mingw*) gl_cv_func_btowc_eof="guessing yes" ;; + # Guess yes otherwise. + *) gl_cv_func_btowc_eof="guessing yes" ;; esac changequote([,])dnl if test $LOCALE_FR != none; then diff --git a/m4/extensions.m4 b/m4/extensions.m4 index c60f537..f854338 100644 --- a/m4/extensions.m4 +++ b/m4/extensions.m4 @@ -1,4 +1,4 @@ -# serial 15 -*- Autoconf -*- +# serial 17 -*- Autoconf -*- # Enable extensions on systems that normally disable them. # Copyright (C) 2003, 2006-2017 Free Software Foundation, Inc. @@ -68,6 +68,14 @@ dnl configure.ac when using autoheader 2.62. #ifndef _GNU_SOURCE # undef _GNU_SOURCE #endif +/* Enable NetBSD extensions on NetBSD. */ +#ifndef _NETBSD_SOURCE +# undef _NETBSD_SOURCE +#endif +/* Enable OpenBSD extensions on NetBSD. */ +#ifndef _OPENBSD_SOURCE +# undef _OPENBSD_SOURCE +#endif /* Enable threading extensions on Solaris. */ #ifndef _POSIX_PTHREAD_SEMANTICS # undef _POSIX_PTHREAD_SEMANTICS @@ -128,6 +136,8 @@ dnl configure.ac when using autoheader 2.62. AC_DEFINE([_ALL_SOURCE]) AC_DEFINE([_DARWIN_C_SOURCE]) AC_DEFINE([_GNU_SOURCE]) + AC_DEFINE([_NETBSD_SOURCE]) + AC_DEFINE([_OPENBSD_SOURCE]) AC_DEFINE([_POSIX_PTHREAD_SEMANTICS]) AC_DEFINE([__STDC_WANT_IEC_60559_ATTRIBS_EXT__]) AC_DEFINE([__STDC_WANT_IEC_60559_BFP_EXT__]) diff --git a/m4/fcntl-o.m4 b/m4/fcntl-o.m4 index 3c3b63c..b388d89 100644 --- a/m4/fcntl-o.m4 +++ b/m4/fcntl-o.m4 @@ -1,4 +1,4 @@ -# fcntl-o.m4 serial 4 +# fcntl-o.m4 serial 5 dnl Copyright (C) 2006, 2009-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -18,6 +18,7 @@ AC_DEFUN([gl_FCNTL_O_FLAGS], [AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])], [AC_REQUIRE([AC_GNU_SOURCE])]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles AC_CHECK_HEADERS_ONCE([unistd.h]) AC_CHECK_FUNCS_ONCE([symlink]) AC_CACHE_CHECK([for working fcntl.h], [gl_cv_header_working_fcntl_h], @@ -116,7 +117,13 @@ AC_DEFUN([gl_FCNTL_O_FLAGS], 68) gl_cv_header_working_fcntl_h='no (bad O_NOATIME, O_NOFOLLOW)';; #( *) gl_cv_header_working_fcntl_h='no';; esac], - [gl_cv_header_working_fcntl_h=cross-compiling])]) + [case "$host_os" in + # Guess 'no' on native Windows. + mingw*) gl_cv_header_working_fcntl_h='no' ;; + *) gl_cv_header_working_fcntl_h=cross-compiling ;; + esac + ]) + ]) case $gl_cv_header_working_fcntl_h in #( *O_NOATIME* | no | cross-compiling) ac_val=0;; #( diff --git a/m4/gettimeofday.m4 b/m4/gettimeofday.m4 index 8ee206e..efa114d 100644 --- a/m4/gettimeofday.m4 +++ b/m4/gettimeofday.m4 @@ -1,4 +1,4 @@ -# serial 23 +# serial 24 # Copyright (C) 2001-2003, 2005, 2007, 2009-2017 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation @@ -105,6 +105,8 @@ AC_DEFUN([gl_FUNC_GETTIMEOFDAY_CLOBBER], case "$host_os" in # Guess all is fine on glibc systems. *-gnu*) gl_cv_func_gettimeofday_clobber="guessing no" ;; + # Guess no on native Windows. + mingw*) gl_cv_func_gettimeofday_clobber="guessing no" ;; # If we don't know, assume the worst. *) gl_cv_func_gettimeofday_clobber="guessing yes" ;; esac diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 deleted file mode 100644 index d953a24..0000000 --- a/m4/gnulib-comp.m4 +++ /dev/null @@ -1,746 +0,0 @@ -# DO NOT EDIT! GENERATED AUTOMATICALLY! -# Copyright (C) 2002-2017 Free Software Foundation, Inc. -# -# This file is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# This file is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this file. If not, see . -# -# As a special exception to the GNU General Public License, -# this file may be distributed as part of a program that -# contains a configuration script generated by Autoconf, under -# the same distribution terms as the rest of that program. -# -# Generated by gnulib-tool. -# -# This file represents the compiled summary of the specification in -# gnulib-cache.m4. It lists the computed macro invocations that need -# to be invoked from configure.ac. -# In projects that use version control, this file can be treated like -# other built files. - - -# This macro should be invoked from ./configure.ac, in the section -# "Checks for programs", right after AC_PROG_CC, and certainly before -# any checks for libraries, header files, types and library functions. -AC_DEFUN([gl_EARLY], -[ - m4_pattern_forbid([^gl_[A-Z]])dnl the gnulib macro namespace - m4_pattern_allow([^gl_ES$])dnl a valid locale name - m4_pattern_allow([^gl_LIBOBJS$])dnl a variable - m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable - - # Pre-early section. - AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) - AC_REQUIRE([gl_PROG_AR_RANLIB]) - - AC_REQUIRE([AM_PROG_CC_C_O]) - # Code from module absolute-header: - # Code from module assert: - # Code from module btowc: - # Code from module builtin-expect: - # Code from module c-ctype: - # Code from module c-strcase: - # Code from module config-h: - # Code from module configmake: - # Code from module crc: - # Code from module extensions: - # Code from module extern-inline: - # Code from module getopt-gnu: - # Code from module getopt-posix: - # Code from module gettext-h: - # Code from module gettimeofday: - # Code from module gperf: - # Code from module hard-locale: - # Code from module havelib: - # Code from module iconv: - # Code from module iconv-h: - # Code from module iconv_open: - # Code from module include_next: - # Code from module inline: - # Code from module limits-h: - # Code from module localcharset: - # Code from module locale: - # Code from module localtime-buffer: - # Code from module mbrtowc: - # Code from module mbsinit: - # Code from module mbsrtowcs: - # Code from module mbtowc: - # Code from module memchr: - # Code from module multiarch: - # Code from module nocrash: - # Code from module snippet/_Noreturn: - # Code from module snippet/arg-nonnull: - # Code from module snippet/c++defs: - # Code from module snippet/unused-parameter: - # Code from module snippet/warn-on-use: - # Code from module ssize_t: - # Code from module stdbool: - # Code from module stddef: - # Code from module stdint: - # Code from module stdio: - # Code from module stdlib: - # Code from module streq: - # Code from module striconv: - # Code from module string: - # Code from module strnlen1: - # Code from module strstr: - # Code from module strstr-simple: - # Code from module sys_stat: - # Code from module sys_time: - # Code from module sys_types: - # Code from module time: - # Code from module unistd: - # Code from module unistr/base: - # Code from module unistr/u8-mbtoucr: - # Code from module unistr/u8-uctomb: - # Code from module unitypes: - # Code from module verify: - # Code from module wchar: - # Code from module wcrtomb: - # Code from module wcsdup: - # Code from module wctob: - # Code from module wctomb: - # Code from module wctype-h: - # Code from module wmemcpy: -]) - -# This macro should be invoked from ./configure.ac, in the section -# "Check for header files, types and library functions". -AC_DEFUN([gl_INIT], -[ - AM_CONDITIONAL([GL_COND_LIBTOOL], [false]) - gl_cond_libtool=false - gl_libdeps= - gl_ltlibdeps= - gl_m4_base='m4' - m4_pushdef([AC_LIBOBJ], m4_defn([gl_LIBOBJ])) - m4_pushdef([AC_REPLACE_FUNCS], m4_defn([gl_REPLACE_FUNCS])) - m4_pushdef([AC_LIBSOURCES], m4_defn([gl_LIBSOURCES])) - m4_pushdef([gl_LIBSOURCES_LIST], []) - m4_pushdef([gl_LIBSOURCES_DIR], []) - gl_COMMON - gl_source_base='lib' - gl_ASSERT - gl_FUNC_BTOWC - if test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1; then - AC_LIBOBJ([btowc]) - gl_PREREQ_BTOWC - fi - gl_WCHAR_MODULE_INDICATOR([btowc]) - gl_CONFIG_H - AC_REQUIRE([gl_EXTERN_INLINE]) - gl_FUNC_GETOPT_GNU - dnl Because of the way gl_FUNC_GETOPT_GNU is implemented (the gl_getopt_required - dnl mechanism), there is no need to do any AC_LIBOBJ or AC_SUBST here; they are - dnl done in the getopt-posix module. - gl_FUNC_GETOPT_POSIX - if test $REPLACE_GETOPT = 1; then - AC_LIBOBJ([getopt]) - AC_LIBOBJ([getopt1]) - dnl Arrange for unistd.h to include getopt.h. - GNULIB_GL_UNISTD_H_GETOPT=1 - fi - AC_SUBST([GNULIB_GL_UNISTD_H_GETOPT]) - AC_SUBST([LIBINTL]) - AC_SUBST([LTLIBINTL]) - gl_FUNC_GETTIMEOFDAY - if test $HAVE_GETTIMEOFDAY = 0 || test $REPLACE_GETTIMEOFDAY = 1; then - AC_LIBOBJ([gettimeofday]) - gl_PREREQ_GETTIMEOFDAY - fi - gl_SYS_TIME_MODULE_INDICATOR([gettimeofday]) - AM_ICONV - m4_ifdef([gl_ICONV_MODULE_INDICATOR], - [gl_ICONV_MODULE_INDICATOR([iconv])]) - gl_ICONV_H - gl_FUNC_ICONV_OPEN - if test $REPLACE_ICONV_OPEN = 1; then - AC_LIBOBJ([iconv_open]) - fi - if test $REPLACE_ICONV = 1; then - AC_LIBOBJ([iconv]) - AC_LIBOBJ([iconv_close]) - fi - gl_INLINE - gl_LIMITS_H - gl_LOCALE_H - gl_FUNC_MBRTOWC - if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then - AC_LIBOBJ([mbrtowc]) - gl_PREREQ_MBRTOWC - fi - gl_WCHAR_MODULE_INDICATOR([mbrtowc]) - gl_FUNC_MBSRTOWCS - if test $HAVE_MBSRTOWCS = 0 || test $REPLACE_MBSRTOWCS = 1; then - AC_LIBOBJ([mbsrtowcs]) - AC_LIBOBJ([mbsrtowcs-state]) - gl_PREREQ_MBSRTOWCS - fi - gl_WCHAR_MODULE_INDICATOR([mbsrtowcs]) - gl_MULTIARCH - gt_TYPE_SSIZE_T - AM_STDBOOL_H - gl_STDDEF_H - gl_STDINT_H - gl_STDIO_H - if test $gl_cond_libtool = false; then - gl_ltlibdeps="$gl_ltlibdeps $LTLIBICONV" - gl_libdeps="$gl_libdeps $LIBICONV" - fi - gl_HEADER_STRING_H - gl_FUNC_STRSTR - if test $REPLACE_STRSTR = 1; then - AC_LIBOBJ([strstr]) - fi - gl_FUNC_STRSTR_SIMPLE - if test $REPLACE_STRSTR = 1; then - AC_LIBOBJ([strstr]) - fi - gl_STRING_MODULE_INDICATOR([strstr]) - gl_HEADER_SYS_STAT_H - AC_PROG_MKDIR_P - gl_HEADER_SYS_TIME_H - AC_PROG_MKDIR_P - gl_SYS_TYPES_H - AC_PROG_MKDIR_P - gl_HEADER_TIME_H - gl_UNISTD_H - gl_LIBUNISTRING_LIBHEADER([0.9.4], [unistr.h]) - gl_MODULE_INDICATOR([unistr/u8-mbtoucr]) - gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-mbtoucr]) - gl_MODULE_INDICATOR([unistr/u8-uctomb]) - gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-uctomb]) - gl_LIBUNISTRING_LIBHEADER([0.9.4], [unitypes.h]) - gl_WCHAR_H - gl_FUNC_WCRTOMB - if test $HAVE_WCRTOMB = 0 || test $REPLACE_WCRTOMB = 1; then - AC_LIBOBJ([wcrtomb]) - gl_PREREQ_WCRTOMB - fi - gl_WCHAR_MODULE_INDICATOR([wcrtomb]) - gl_FUNC_WCSDUP - if test $HAVE_WCSDUP = 0; then - AC_LIBOBJ([wcsdup]) - fi - gl_WCHAR_MODULE_INDICATOR([wcsdup]) - gl_FUNC_WCTOB - if test $HAVE_WCTOB = 0 || test $REPLACE_WCTOB = 1; then - AC_LIBOBJ([wctob]) - gl_PREREQ_WCTOB - fi - gl_WCHAR_MODULE_INDICATOR([wctob]) - gl_WCTYPE_H - gl_gnulib_enabled_37f71b604aa9c54446783d80f42fe547=false - gl_gnulib_enabled_configmake=false - gl_gnulib_enabled_30838f5439487421042f2225bed3af76=false - gl_gnulib_enabled_localcharset=false - gl_gnulib_enabled_2049e887c7e5308faad27b3f894bb8c9=false - gl_gnulib_enabled_mbsinit=false - gl_gnulib_enabled_mbtowc=false - gl_gnulib_enabled_memchr=false - gl_gnulib_enabled_b3ae4a413a1340415f34a52d1dafb147=false - gl_gnulib_enabled_stdlib=false - gl_gnulib_enabled_streq=false - gl_gnulib_enabled_strnlen1=false - gl_gnulib_enabled_verify=false - gl_gnulib_enabled_wctomb=false - gl_gnulib_enabled_wmemcpy=false - func_gl_gnulib_m4code_37f71b604aa9c54446783d80f42fe547 () - { - if ! $gl_gnulib_enabled_37f71b604aa9c54446783d80f42fe547; then - gl___BUILTIN_EXPECT - gl_gnulib_enabled_37f71b604aa9c54446783d80f42fe547=true - fi - } - func_gl_gnulib_m4code_configmake () - { - if ! $gl_gnulib_enabled_configmake; then - gl_CONFIGMAKE_PREP - gl_gnulib_enabled_configmake=true - fi - } - func_gl_gnulib_m4code_30838f5439487421042f2225bed3af76 () - { - if ! $gl_gnulib_enabled_30838f5439487421042f2225bed3af76; then - gl_HARD_LOCALE - gl_gnulib_enabled_30838f5439487421042f2225bed3af76=true - fi - } - func_gl_gnulib_m4code_localcharset () - { - if ! $gl_gnulib_enabled_localcharset; then - gl_LOCALCHARSET - LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(abs_top_builddir)/$gl_source_base\"" - AC_SUBST([LOCALCHARSET_TESTS_ENVIRONMENT]) - gl_gnulib_enabled_localcharset=true - func_gl_gnulib_m4code_configmake - fi - } - func_gl_gnulib_m4code_2049e887c7e5308faad27b3f894bb8c9 () - { - if ! $gl_gnulib_enabled_2049e887c7e5308faad27b3f894bb8c9; then - AC_REQUIRE([gl_LOCALTIME_BUFFER_DEFAULTS]) - AC_LIBOBJ([localtime-buffer]) - gl_gnulib_enabled_2049e887c7e5308faad27b3f894bb8c9=true - fi - } - func_gl_gnulib_m4code_mbsinit () - { - if ! $gl_gnulib_enabled_mbsinit; then - gl_FUNC_MBSINIT - if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then - AC_LIBOBJ([mbsinit]) - gl_PREREQ_MBSINIT - fi - gl_WCHAR_MODULE_INDICATOR([mbsinit]) - gl_gnulib_enabled_mbsinit=true - if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then - func_gl_gnulib_m4code_verify - fi - fi - } - func_gl_gnulib_m4code_mbtowc () - { - if ! $gl_gnulib_enabled_mbtowc; then - gl_FUNC_MBTOWC - if test $REPLACE_MBTOWC = 1; then - AC_LIBOBJ([mbtowc]) - gl_PREREQ_MBTOWC - fi - gl_STDLIB_MODULE_INDICATOR([mbtowc]) - gl_gnulib_enabled_mbtowc=true - func_gl_gnulib_m4code_stdlib - fi - } - func_gl_gnulib_m4code_memchr () - { - if ! $gl_gnulib_enabled_memchr; then - gl_FUNC_MEMCHR - if test $HAVE_MEMCHR = 0 || test $REPLACE_MEMCHR = 1; then - AC_LIBOBJ([memchr]) - gl_PREREQ_MEMCHR - fi - gl_STRING_MODULE_INDICATOR([memchr]) - gl_gnulib_enabled_memchr=true - fi - } - func_gl_gnulib_m4code_b3ae4a413a1340415f34a52d1dafb147 () - { - if ! $gl_gnulib_enabled_b3ae4a413a1340415f34a52d1dafb147; then - gl_gnulib_enabled_b3ae4a413a1340415f34a52d1dafb147=true - fi - } - func_gl_gnulib_m4code_stdlib () - { - if ! $gl_gnulib_enabled_stdlib; then - gl_STDLIB_H - gl_gnulib_enabled_stdlib=true - func_gl_gnulib_m4code_b3ae4a413a1340415f34a52d1dafb147 - fi - } - func_gl_gnulib_m4code_streq () - { - if ! $gl_gnulib_enabled_streq; then - gl_gnulib_enabled_streq=true - fi - } - func_gl_gnulib_m4code_strnlen1 () - { - if ! $gl_gnulib_enabled_strnlen1; then - gl_gnulib_enabled_strnlen1=true - func_gl_gnulib_m4code_memchr - fi - } - func_gl_gnulib_m4code_verify () - { - if ! $gl_gnulib_enabled_verify; then - gl_gnulib_enabled_verify=true - fi - } - func_gl_gnulib_m4code_wctomb () - { - if ! $gl_gnulib_enabled_wctomb; then - gl_FUNC_WCTOMB - if test $REPLACE_WCTOMB = 1; then - AC_LIBOBJ([wctomb]) - gl_PREREQ_WCTOMB - fi - gl_STDLIB_MODULE_INDICATOR([wctomb]) - gl_gnulib_enabled_wctomb=true - func_gl_gnulib_m4code_stdlib - fi - } - func_gl_gnulib_m4code_wmemcpy () - { - if ! $gl_gnulib_enabled_wmemcpy; then - gl_FUNC_WMEMCPY - if test $HAVE_WMEMCPY = 0; then - AC_LIBOBJ([wmemcpy]) - fi - gl_WCHAR_MODULE_INDICATOR([wmemcpy]) - gl_gnulib_enabled_wmemcpy=true - fi - } - if test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1; then - func_gl_gnulib_m4code_mbtowc - fi - if test $NEED_LOCALTIME_BUFFER = 1; then - func_gl_gnulib_m4code_2049e887c7e5308faad27b3f894bb8c9 - fi - if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then - func_gl_gnulib_m4code_30838f5439487421042f2225bed3af76 - fi - if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then - func_gl_gnulib_m4code_localcharset - fi - if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then - func_gl_gnulib_m4code_mbsinit - fi - if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then - func_gl_gnulib_m4code_streq - fi - if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then - func_gl_gnulib_m4code_verify - fi - if test $HAVE_MBSRTOWCS = 0 || test $REPLACE_MBSRTOWCS = 1; then - func_gl_gnulib_m4code_strnlen1 - fi - if test $REPLACE_STRSTR = 1; then - func_gl_gnulib_m4code_37f71b604aa9c54446783d80f42fe547 - fi - if test $REPLACE_STRSTR = 1; then - func_gl_gnulib_m4code_memchr - fi - if test $HAVE_WCRTOMB = 0 || test $REPLACE_WCRTOMB = 1; then - func_gl_gnulib_m4code_mbsinit - fi - if test $HAVE_WCSDUP = 0; then - func_gl_gnulib_m4code_wmemcpy - fi - if test $HAVE_WCTOB = 0 || test $REPLACE_WCTOB = 1; then - func_gl_gnulib_m4code_wctomb - fi - m4_pattern_allow([^gl_GNULIB_ENABLED_]) - AM_CONDITIONAL([gl_GNULIB_ENABLED_37f71b604aa9c54446783d80f42fe547], [$gl_gnulib_enabled_37f71b604aa9c54446783d80f42fe547]) - AM_CONDITIONAL([gl_GNULIB_ENABLED_configmake], [$gl_gnulib_enabled_configmake]) - AM_CONDITIONAL([gl_GNULIB_ENABLED_30838f5439487421042f2225bed3af76], [$gl_gnulib_enabled_30838f5439487421042f2225bed3af76]) - AM_CONDITIONAL([gl_GNULIB_ENABLED_localcharset], [$gl_gnulib_enabled_localcharset]) - AM_CONDITIONAL([gl_GNULIB_ENABLED_2049e887c7e5308faad27b3f894bb8c9], [$gl_gnulib_enabled_2049e887c7e5308faad27b3f894bb8c9]) - AM_CONDITIONAL([gl_GNULIB_ENABLED_mbsinit], [$gl_gnulib_enabled_mbsinit]) - AM_CONDITIONAL([gl_GNULIB_ENABLED_mbtowc], [$gl_gnulib_enabled_mbtowc]) - AM_CONDITIONAL([gl_GNULIB_ENABLED_memchr], [$gl_gnulib_enabled_memchr]) - AM_CONDITIONAL([gl_GNULIB_ENABLED_b3ae4a413a1340415f34a52d1dafb147], [$gl_gnulib_enabled_b3ae4a413a1340415f34a52d1dafb147]) - AM_CONDITIONAL([gl_GNULIB_ENABLED_stdlib], [$gl_gnulib_enabled_stdlib]) - AM_CONDITIONAL([gl_GNULIB_ENABLED_streq], [$gl_gnulib_enabled_streq]) - AM_CONDITIONAL([gl_GNULIB_ENABLED_strnlen1], [$gl_gnulib_enabled_strnlen1]) - AM_CONDITIONAL([gl_GNULIB_ENABLED_verify], [$gl_gnulib_enabled_verify]) - AM_CONDITIONAL([gl_GNULIB_ENABLED_wctomb], [$gl_gnulib_enabled_wctomb]) - AM_CONDITIONAL([gl_GNULIB_ENABLED_wmemcpy], [$gl_gnulib_enabled_wmemcpy]) - # End of code from modules - m4_ifval(gl_LIBSOURCES_LIST, [ - m4_syscmd([test ! -d ]m4_defn([gl_LIBSOURCES_DIR])[ || - for gl_file in ]gl_LIBSOURCES_LIST[ ; do - if test ! -r ]m4_defn([gl_LIBSOURCES_DIR])[/$gl_file ; then - echo "missing file ]m4_defn([gl_LIBSOURCES_DIR])[/$gl_file" >&2 - exit 1 - fi - done])dnl - m4_if(m4_sysval, [0], [], - [AC_FATAL([expected source file, required through AC_LIBSOURCES, not found])]) - ]) - m4_popdef([gl_LIBSOURCES_DIR]) - m4_popdef([gl_LIBSOURCES_LIST]) - m4_popdef([AC_LIBSOURCES]) - m4_popdef([AC_REPLACE_FUNCS]) - m4_popdef([AC_LIBOBJ]) - AC_CONFIG_COMMANDS_PRE([ - gl_libobjs= - gl_ltlibobjs= - if test -n "$gl_LIBOBJS"; then - # Remove the extension. - sed_drop_objext='s/\.o$//;s/\.obj$//' - for i in `for i in $gl_LIBOBJS; do echo "$i"; done | sed -e "$sed_drop_objext" | sort | uniq`; do - gl_libobjs="$gl_libobjs $i.$ac_objext" - gl_ltlibobjs="$gl_ltlibobjs $i.lo" - done - fi - AC_SUBST([gl_LIBOBJS], [$gl_libobjs]) - AC_SUBST([gl_LTLIBOBJS], [$gl_ltlibobjs]) - ]) - gltests_libdeps= - gltests_ltlibdeps= - m4_pushdef([AC_LIBOBJ], m4_defn([gltests_LIBOBJ])) - m4_pushdef([AC_REPLACE_FUNCS], m4_defn([gltests_REPLACE_FUNCS])) - m4_pushdef([AC_LIBSOURCES], m4_defn([gltests_LIBSOURCES])) - m4_pushdef([gltests_LIBSOURCES_LIST], []) - m4_pushdef([gltests_LIBSOURCES_DIR], []) - gl_COMMON - gl_source_base='tests' -changequote(,)dnl - gltests_WITNESS=IN_`echo "${PACKAGE-$PACKAGE_TARNAME}" | LC_ALL=C tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ | LC_ALL=C sed -e 's/[^A-Z0-9_]/_/g'`_GNULIB_TESTS -changequote([, ])dnl - AC_SUBST([gltests_WITNESS]) - gl_module_indicator_condition=$gltests_WITNESS - m4_pushdef([gl_MODULE_INDICATOR_CONDITION], [$gl_module_indicator_condition]) - m4_pattern_allow([^gl_GNULIB_ENABLED_]) - m4_popdef([gl_MODULE_INDICATOR_CONDITION]) - m4_ifval(gltests_LIBSOURCES_LIST, [ - m4_syscmd([test ! -d ]m4_defn([gltests_LIBSOURCES_DIR])[ || - for gl_file in ]gltests_LIBSOURCES_LIST[ ; do - if test ! -r ]m4_defn([gltests_LIBSOURCES_DIR])[/$gl_file ; then - echo "missing file ]m4_defn([gltests_LIBSOURCES_DIR])[/$gl_file" >&2 - exit 1 - fi - done])dnl - m4_if(m4_sysval, [0], [], - [AC_FATAL([expected source file, required through AC_LIBSOURCES, not found])]) - ]) - m4_popdef([gltests_LIBSOURCES_DIR]) - m4_popdef([gltests_LIBSOURCES_LIST]) - m4_popdef([AC_LIBSOURCES]) - m4_popdef([AC_REPLACE_FUNCS]) - m4_popdef([AC_LIBOBJ]) - AC_CONFIG_COMMANDS_PRE([ - gltests_libobjs= - gltests_ltlibobjs= - if test -n "$gltests_LIBOBJS"; then - # Remove the extension. - sed_drop_objext='s/\.o$//;s/\.obj$//' - for i in `for i in $gltests_LIBOBJS; do echo "$i"; done | sed -e "$sed_drop_objext" | sort | uniq`; do - gltests_libobjs="$gltests_libobjs $i.$ac_objext" - gltests_ltlibobjs="$gltests_ltlibobjs $i.lo" - done - fi - AC_SUBST([gltests_LIBOBJS], [$gltests_libobjs]) - AC_SUBST([gltests_LTLIBOBJS], [$gltests_ltlibobjs]) - ]) - LIBGNU_LIBDEPS="$gl_libdeps" - AC_SUBST([LIBGNU_LIBDEPS]) - LIBGNU_LTLIBDEPS="$gl_ltlibdeps" - AC_SUBST([LIBGNU_LTLIBDEPS]) -]) - -# Like AC_LIBOBJ, except that the module name goes -# into gl_LIBOBJS instead of into LIBOBJS. -AC_DEFUN([gl_LIBOBJ], [ - AS_LITERAL_IF([$1], [gl_LIBSOURCES([$1.c])])dnl - gl_LIBOBJS="$gl_LIBOBJS $1.$ac_objext" -]) - -# Like AC_REPLACE_FUNCS, except that the module name goes -# into gl_LIBOBJS instead of into LIBOBJS. -AC_DEFUN([gl_REPLACE_FUNCS], [ - m4_foreach_w([gl_NAME], [$1], [AC_LIBSOURCES(gl_NAME[.c])])dnl - AC_CHECK_FUNCS([$1], , [gl_LIBOBJ($ac_func)]) -]) - -# Like AC_LIBSOURCES, except the directory where the source file is -# expected is derived from the gnulib-tool parameterization, -# and alloca is special cased (for the alloca-opt module). -# We could also entirely rely on EXTRA_lib..._SOURCES. -AC_DEFUN([gl_LIBSOURCES], [ - m4_foreach([_gl_NAME], [$1], [ - m4_if(_gl_NAME, [alloca.c], [], [ - m4_define([gl_LIBSOURCES_DIR], [lib]) - m4_append([gl_LIBSOURCES_LIST], _gl_NAME, [ ]) - ]) - ]) -]) - -# Like AC_LIBOBJ, except that the module name goes -# into gltests_LIBOBJS instead of into LIBOBJS. -AC_DEFUN([gltests_LIBOBJ], [ - AS_LITERAL_IF([$1], [gltests_LIBSOURCES([$1.c])])dnl - gltests_LIBOBJS="$gltests_LIBOBJS $1.$ac_objext" -]) - -# Like AC_REPLACE_FUNCS, except that the module name goes -# into gltests_LIBOBJS instead of into LIBOBJS. -AC_DEFUN([gltests_REPLACE_FUNCS], [ - m4_foreach_w([gl_NAME], [$1], [AC_LIBSOURCES(gl_NAME[.c])])dnl - AC_CHECK_FUNCS([$1], , [gltests_LIBOBJ($ac_func)]) -]) - -# Like AC_LIBSOURCES, except the directory where the source file is -# expected is derived from the gnulib-tool parameterization, -# and alloca is special cased (for the alloca-opt module). -# We could also entirely rely on EXTRA_lib..._SOURCES. -AC_DEFUN([gltests_LIBSOURCES], [ - m4_foreach([_gl_NAME], [$1], [ - m4_if(_gl_NAME, [alloca.c], [], [ - m4_define([gltests_LIBSOURCES_DIR], [tests]) - m4_append([gltests_LIBSOURCES_LIST], _gl_NAME, [ ]) - ]) - ]) -]) - -# This macro records the list of files which have been installed by -# gnulib-tool and may be removed by future gnulib-tool invocations. -AC_DEFUN([gl_FILE_LIST], [ - build-aux/config.rpath - lib/_Noreturn.h - lib/arg-nonnull.h - lib/btowc.c - lib/c++defs.h - lib/c-ctype.c - lib/c-ctype.h - lib/c-strcase.h - lib/c-strcasecmp.c - lib/c-strncasecmp.c - lib/config.charset - lib/crc.c - lib/crc.h - lib/getopt-cdefs.in.h - lib/getopt-core.h - lib/getopt-ext.h - lib/getopt-pfx-core.h - lib/getopt-pfx-ext.h - lib/getopt.c - lib/getopt.in.h - lib/getopt1.c - lib/getopt_int.h - lib/gettext.h - lib/gettimeofday.c - lib/hard-locale.c - lib/hard-locale.h - lib/iconv.c - lib/iconv.in.h - lib/iconv_close.c - lib/iconv_open-aix.gperf - lib/iconv_open-hpux.gperf - lib/iconv_open-irix.gperf - lib/iconv_open-osf.gperf - lib/iconv_open-solaris.gperf - lib/iconv_open.c - lib/limits.in.h - lib/localcharset.c - lib/localcharset.h - lib/locale.in.h - lib/localtime-buffer.c - lib/localtime-buffer.h - lib/mbrtowc.c - lib/mbsinit.c - lib/mbsrtowcs-impl.h - lib/mbsrtowcs-state.c - lib/mbsrtowcs.c - lib/mbtowc-impl.h - lib/mbtowc.c - lib/memchr.c - lib/memchr.valgrind - lib/ref-add.sin - lib/ref-del.sin - lib/stdbool.in.h - lib/stddef.in.h - lib/stdint.in.h - lib/stdio.in.h - lib/stdlib.in.h - lib/str-two-way.h - lib/streq.h - lib/striconv.c - lib/striconv.h - lib/string.in.h - lib/strnlen1.c - lib/strnlen1.h - lib/strstr.c - lib/sys_stat.in.h - lib/sys_time.in.h - lib/sys_types.in.h - lib/time.in.h - lib/unistd.c - lib/unistd.in.h - lib/unistr.in.h - lib/unistr/u8-mbtoucr.c - lib/unistr/u8-uctomb-aux.c - lib/unistr/u8-uctomb.c - lib/unitypes.in.h - lib/unused-parameter.h - lib/verify.h - lib/warn-on-use.h - lib/wchar.in.h - lib/wcrtomb.c - lib/wcsdup-impl.h - lib/wcsdup.c - lib/wctob.c - lib/wctomb-impl.h - lib/wctomb.c - lib/wctype-h.c - lib/wctype.in.h - lib/wmemcpy-impl.h - lib/wmemcpy.c - m4/00gnulib.m4 - m4/absolute-header.m4 - m4/assert.m4 - m4/btowc.m4 - m4/builtin-expect.m4 - m4/codeset.m4 - m4/config-h.m4 - m4/configmake.m4 - m4/extensions.m4 - m4/extern-inline.m4 - m4/fcntl-o.m4 - m4/getopt.m4 - m4/gettimeofday.m4 - m4/glibc21.m4 - m4/gnulib-common.m4 - m4/hard-locale.m4 - m4/iconv.m4 - m4/iconv_h.m4 - m4/iconv_open.m4 - m4/include_next.m4 - m4/inline.m4 - m4/lib-ld.m4 - m4/lib-link.m4 - m4/lib-prefix.m4 - m4/libunistring-base.m4 - m4/limits-h.m4 - m4/localcharset.m4 - m4/locale-fr.m4 - m4/locale-ja.m4 - m4/locale-zh.m4 - m4/locale_h.m4 - m4/localtime-buffer.m4 - m4/longlong.m4 - m4/mbrtowc.m4 - m4/mbsinit.m4 - m4/mbsrtowcs.m4 - m4/mbstate_t.m4 - m4/mbtowc.m4 - m4/memchr.m4 - m4/mmap-anon.m4 - m4/multiarch.m4 - m4/nocrash.m4 - m4/off_t.m4 - m4/ssize_t.m4 - m4/stdbool.m4 - m4/stddef_h.m4 - m4/stdint.m4 - m4/stdio_h.m4 - m4/stdlib_h.m4 - m4/string_h.m4 - m4/strstr.m4 - m4/sys_socket_h.m4 - m4/sys_stat_h.m4 - m4/sys_time_h.m4 - m4/sys_types_h.m4 - m4/time_h.m4 - m4/unistd_h.m4 - m4/warn-on-use.m4 - m4/wchar_h.m4 - m4/wchar_t.m4 - m4/wcrtomb.m4 - m4/wcsdup.m4 - m4/wctob.m4 - m4/wctomb.m4 - m4/wctype_h.m4 - m4/wint_t.m4 - m4/wmemcpy.m4 -]) diff --git a/m4/mbrtowc.m4 b/m4/mbrtowc.m4 index 536183f..216594e 100644 --- a/m4/mbrtowc.m4 +++ b/m4/mbrtowc.m4 @@ -1,4 +1,4 @@ -# mbrtowc.m4 serial 27 -*- coding: utf-8 -*- +# mbrtowc.m4 serial 29 -*- coding: utf-8 -*- dnl Copyright (C) 2001-2002, 2004-2005, 2008-2017 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation @@ -563,9 +563,11 @@ AC_DEFUN([gl_MBRTOWC_EMPTY_INPUT], dnl is present. changequote(,)dnl case "$host_os" in - # Guess no on AIX and glibc systems. + # Guess no on AIX and glibc systems. aix* | *-gnu*) gl_cv_func_mbrtowc_empty_input="guessing no" ;; + # Guess yes on native Windows. + mingw*) gl_cv_func_mbrtowc_empty_input="guessing yes" ;; *) gl_cv_func_mbrtowc_empty_input="guessing yes" ;; esac changequote([,])dnl @@ -592,6 +594,7 @@ dnl https://sourceware.org/bugzilla/show_bug.cgi?id=19932 AC_DEFUN([gl_MBRTOWC_C_LOCALE], [ + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles AC_CACHE_CHECK([whether the C locale is free of encoding errors], [gl_cv_C_locale_sans_EILSEQ], [ @@ -622,7 +625,12 @@ AC_DEFUN([gl_MBRTOWC_C_LOCALE], ]])], [gl_cv_C_locale_sans_EILSEQ=yes], [gl_cv_C_locale_sans_EILSEQ=no], - [:])]) + [case "$host_os" in + # Guess yes on native Windows. + mingw*) gl_cv_C_locale_sans_EILSEQ="guessing yes" ;; + esac + ]) + ]) ]) # Prerequisites of lib/mbrtowc.c. @@ -639,7 +647,7 @@ AC_DEFUN([AC_FUNC_MBRTOWC], [ dnl Same as AC_FUNC_MBRTOWC in autoconf-2.60. AC_CACHE_CHECK([whether mbrtowc and mbstate_t are properly declared], - gl_cv_func_mbrtowc, + [gl_cv_func_mbrtowc], [AC_LINK_IFELSE( [AC_LANG_PROGRAM( [[/* Tru64 with Desktop Toolkit C has a bug: must be @@ -655,8 +663,8 @@ AC_DEFUN([AC_FUNC_MBRTOWC], size_t n = 1; mbstate_t state; return ! (sizeof state && (mbrtowc) (&wc, s, n, &state));]])], - gl_cv_func_mbrtowc=yes, - gl_cv_func_mbrtowc=no)]) + [gl_cv_func_mbrtowc=yes], + [gl_cv_func_mbrtowc=no])]) if test $gl_cv_func_mbrtowc = yes; then AC_DEFINE([HAVE_MBRTOWC], [1], [Define to 1 if mbrtowc and mbstate_t are properly declared.]) diff --git a/m4/memchr.m4 b/m4/memchr.m4 index b6ec814..62ce770 100644 --- a/m4/memchr.m4 +++ b/m4/memchr.m4 @@ -1,4 +1,4 @@ -# memchr.m4 serial 12 +# memchr.m4 serial 13 dnl Copyright (C) 2002-2004, 2009-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -6,6 +6,8 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN_ONCE([gl_FUNC_MEMCHR], [ + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + dnl Check for prerequisites for memory fence checks. gl_FUNC_MMAP_ANON AC_CHECK_HEADERS_ONCE([sys/mman.h]) @@ -73,12 +75,21 @@ AC_DEFUN_ONCE([gl_FUNC_MEMCHR], result |= 4; } return result; -]])], [gl_cv_func_memchr_works=yes], [gl_cv_func_memchr_works=no], - [dnl Be pessimistic for now. - gl_cv_func_memchr_works="guessing no"])]) - if test "$gl_cv_func_memchr_works" != yes; then - REPLACE_MEMCHR=1 - fi +]])], + [gl_cv_func_memchr_works=yes], + [gl_cv_func_memchr_works=no], + [case "$host_os" in + # Guess yes on native Windows. + mingw*) gl_cv_func_memchr_works="guessing yes" ;; + # Be pessimistic for now. + *) gl_cv_func_memchr_works="guessing no" ;; + esac + ]) + ]) + case "$gl_cv_func_memchr_works" in + *yes) ;; + *) REPLACE_MEMCHR=1 ;; + esac fi ]) diff --git a/m4/stdint.m4 b/m4/stdint.m4 index 4ac854d..4bf3e47 100644 --- a/m4/stdint.m4 +++ b/m4/stdint.m4 @@ -1,4 +1,4 @@ -# stdint.m4 serial 50 +# stdint.m4 serial 51 dnl Copyright (C) 2001-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -10,6 +10,7 @@ dnl Test whether is supported or must be substituted. AC_DEFUN_ONCE([gl_STDINT_H], [ AC_PREREQ([2.59])dnl + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles AC_REQUIRE([gl_LIMITS_H]) AC_REQUIRE([gt_TYPE_WINT_T]) @@ -288,8 +289,12 @@ static const char *macro_values[] = ]])], [gl_cv_header_working_stdint_h=yes], [], - [dnl When cross-compiling, assume it works. - gl_cv_header_working_stdint_h=yes + [case "$host_os" in + # Guess yes on native Windows. + mingw*) gl_cv_header_working_stdint_h="guessing yes" ;; + # In general, assume it works. + *) gl_cv_header_working_stdint_h="guessing yes" ;; + esac ]) ]) ]) @@ -299,15 +304,16 @@ static const char *macro_values[] = HAVE_SYS_BITYPES_H=0 HAVE_SYS_INTTYPES_H=0 STDINT_H=stdint.h - if test "$gl_cv_header_working_stdint_h" = yes; then - HAVE_C99_STDINT_H=1 - dnl Now see whether the system works without - dnl __STDC_CONSTANT_MACROS/__STDC_LIMIT_MACROS defined. - AC_CACHE_CHECK([whether stdint.h predates C++11], - [gl_cv_header_stdint_predates_cxx11_h], - [gl_cv_header_stdint_predates_cxx11_h=yes - AC_COMPILE_IFELSE([ - AC_LANG_PROGRAM([[ + case "$gl_cv_header_working_stdint_h" in + *yes) + HAVE_C99_STDINT_H=1 + dnl Now see whether the system works without + dnl __STDC_CONSTANT_MACROS/__STDC_LIMIT_MACROS defined. + AC_CACHE_CHECK([whether stdint.h predates C++11], + [gl_cv_header_stdint_predates_cxx11_h], + [gl_cv_header_stdint_predates_cxx11_h=yes + AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM([[ #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */ #include ] @@ -315,45 +321,47 @@ gl_STDINT_INCLUDES [ intmax_t im = INTMAX_MAX; int32_t i32 = INT32_C (0x7fffffff); - ]])], - [gl_cv_header_stdint_predates_cxx11_h=no])]) + ]])], + [gl_cv_header_stdint_predates_cxx11_h=no])]) - if test "$gl_cv_header_stdint_predates_cxx11_h" = yes; then - AC_DEFINE([__STDC_CONSTANT_MACROS], [1], - [Define to 1 if the system predates C++11.]) - AC_DEFINE([__STDC_LIMIT_MACROS], [1], - [Define to 1 if the system predates C++11.]) - fi - AC_CACHE_CHECK([whether stdint.h has UINTMAX_WIDTH etc.], - [gl_cv_header_stdint_width], - [gl_cv_header_stdint_width=no - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([[ - /* Work if build is not clean. */ - #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 - #ifndef __STDC_WANT_IEC_60559_BFP_EXT__ - #define __STDC_WANT_IEC_60559_BFP_EXT__ 1 - #endif - #include - ]gl_STDINT_INCLUDES[ - int iw = UINTMAX_WIDTH; - ]])], - [gl_cv_header_stdint_width=yes])]) - if test "$gl_cv_header_stdint_width" = yes; then - STDINT_H= - fi - else - dnl Check for , and for - dnl (used in Linux libc4 >= 4.6.7 and libc5). - AC_CHECK_HEADERS([sys/inttypes.h sys/bitypes.h]) - if test $ac_cv_header_sys_inttypes_h = yes; then - HAVE_SYS_INTTYPES_H=1 - fi - if test $ac_cv_header_sys_bitypes_h = yes; then - HAVE_SYS_BITYPES_H=1 - fi - gl_STDINT_TYPE_PROPERTIES - fi + if test "$gl_cv_header_stdint_predates_cxx11_h" = yes; then + AC_DEFINE([__STDC_CONSTANT_MACROS], [1], + [Define to 1 if the system predates C++11.]) + AC_DEFINE([__STDC_LIMIT_MACROS], [1], + [Define to 1 if the system predates C++11.]) + fi + AC_CACHE_CHECK([whether stdint.h has UINTMAX_WIDTH etc.], + [gl_cv_header_stdint_width], + [gl_cv_header_stdint_width=no + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[ + /* Work if build is not clean. */ + #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 + #ifndef __STDC_WANT_IEC_60559_BFP_EXT__ + #define __STDC_WANT_IEC_60559_BFP_EXT__ 1 + #endif + #include + ]gl_STDINT_INCLUDES[ + int iw = UINTMAX_WIDTH; + ]])], + [gl_cv_header_stdint_width=yes])]) + if test "$gl_cv_header_stdint_width" = yes; then + STDINT_H= + fi + ;; + *) + dnl Check for , and for + dnl (used in Linux libc4 >= 4.6.7 and libc5). + AC_CHECK_HEADERS([sys/inttypes.h sys/bitypes.h]) + if test $ac_cv_header_sys_inttypes_h = yes; then + HAVE_SYS_INTTYPES_H=1 + fi + if test $ac_cv_header_sys_bitypes_h = yes; then + HAVE_SYS_BITYPES_H=1 + fi + gl_STDINT_TYPE_PROPERTIES + ;; + esac dnl The substitute stdint.h needs the substitute limit.h's _GL_INTEGER_WIDTH. LIMITS_H=limits.h diff --git a/m4/stdlib_h.m4 b/m4/stdlib_h.m4 index 110fe2d..3537346 100644 --- a/m4/stdlib_h.m4 +++ b/m4/stdlib_h.m4 @@ -1,4 +1,4 @@ -# stdlib_h.m4 serial 43 +# stdlib_h.m4 serial 44 dnl Copyright (C) 2007-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -21,9 +21,9 @@ AC_DEFUN([gl_STDLIB_H], #endif ]], [_Exit atoll canonicalize_file_name getloadavg getsubopt grantpt initstate initstate_r mkdtemp mkostemp mkostemps mkstemp mkstemps - posix_openpt ptsname ptsname_r qsort_r random random_r realpath rpmatch - secure_getenv setenv setstate setstate_r srandom srandom_r - strtod strtoll strtoull unlockpt unsetenv]) + posix_openpt ptsname ptsname_r qsort_r random random_r reallocarray + realpath rpmatch secure_getenv setenv setstate setstate_r srandom + srandom_r strtod strtoll strtoull unlockpt unsetenv]) ]) AC_DEFUN([gl_STDLIB_MODULE_INDICATOR], @@ -58,6 +58,7 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS], GNULIB_QSORT_R=0; AC_SUBST([GNULIB_QSORT_R]) GNULIB_RANDOM=0; AC_SUBST([GNULIB_RANDOM]) GNULIB_RANDOM_R=0; AC_SUBST([GNULIB_RANDOM_R]) + GNULIB_REALLOCARRAY=0; AC_SUBST([GNULIB_REALLOCARRAY]) GNULIB_REALLOC_POSIX=0; AC_SUBST([GNULIB_REALLOC_POSIX]) GNULIB_REALPATH=0; AC_SUBST([GNULIB_REALPATH]) GNULIB_RPMATCH=0; AC_SUBST([GNULIB_RPMATCH]) @@ -77,6 +78,7 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS], HAVE_DECL_GETLOADAVG=1; AC_SUBST([HAVE_DECL_GETLOADAVG]) HAVE_GETSUBOPT=1; AC_SUBST([HAVE_GETSUBOPT]) HAVE_GRANTPT=1; AC_SUBST([HAVE_GRANTPT]) + HAVE_DECL_INITSTATE=1; AC_SUBST([HAVE_DECL_INITSTATE]) HAVE_MKDTEMP=1; AC_SUBST([HAVE_MKDTEMP]) HAVE_MKOSTEMP=1; AC_SUBST([HAVE_MKOSTEMP]) HAVE_MKOSTEMPS=1; AC_SUBST([HAVE_MKOSTEMPS]) @@ -89,11 +91,13 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS], HAVE_RANDOM=1; AC_SUBST([HAVE_RANDOM]) HAVE_RANDOM_H=1; AC_SUBST([HAVE_RANDOM_H]) HAVE_RANDOM_R=1; AC_SUBST([HAVE_RANDOM_R]) + HAVE_REALLOCARRAY=1; AC_SUBST([HAVE_REALLOCARRAY]) HAVE_REALPATH=1; AC_SUBST([HAVE_REALPATH]) HAVE_RPMATCH=1; AC_SUBST([HAVE_RPMATCH]) HAVE_SECURE_GETENV=1; AC_SUBST([HAVE_SECURE_GETENV]) HAVE_SETENV=1; AC_SUBST([HAVE_SETENV]) HAVE_DECL_SETENV=1; AC_SUBST([HAVE_DECL_SETENV]) + HAVE_DECL_SETSTATE=1; AC_SUBST([HAVE_DECL_SETSTATE]) HAVE_STRTOD=1; AC_SUBST([HAVE_STRTOD]) HAVE_STRTOLL=1; AC_SUBST([HAVE_STRTOLL]) HAVE_STRTOULL=1; AC_SUBST([HAVE_STRTOULL]) diff --git a/m4/string_h.m4 b/m4/string_h.m4 index 3d2ad22..ac6311f 100644 --- a/m4/string_h.m4 +++ b/m4/string_h.m4 @@ -43,6 +43,7 @@ AC_DEFUN([gl_STRING_MODULE_INDICATOR], AC_DEFUN([gl_HEADER_STRING_H_DEFAULTS], [ + GNULIB_EXPLICIT_BZERO=0; AC_SUBST([GNULIB_EXPLICIT_BZERO]) GNULIB_FFSL=0; AC_SUBST([GNULIB_FFSL]) GNULIB_FFSLL=0; AC_SUBST([GNULIB_FFSLL]) GNULIB_MEMCHR=0; AC_SUBST([GNULIB_MEMCHR]) @@ -82,6 +83,7 @@ AC_DEFUN([gl_HEADER_STRING_H_DEFAULTS], GNULIB_STRVERSCMP=0; AC_SUBST([GNULIB_STRVERSCMP]) HAVE_MBSLEN=0; AC_SUBST([HAVE_MBSLEN]) dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_EXPLICIT_BZERO=1; AC_SUBST([HAVE_EXPLICIT_BZERO]) HAVE_FFSL=1; AC_SUBST([HAVE_FFSL]) HAVE_FFSLL=1; AC_SUBST([HAVE_FFSLL]) HAVE_MEMCHR=1; AC_SUBST([HAVE_MEMCHR]) diff --git a/m4/strstr.m4 b/m4/strstr.m4 index 4b472ee..c6b7d64 100644 --- a/m4/strstr.m4 +++ b/m4/strstr.m4 @@ -1,4 +1,4 @@ -# strstr.m4 serial 18 +# strstr.m4 serial 19 dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -9,7 +9,7 @@ AC_DEFUN([gl_FUNC_STRSTR_SIMPLE], [ AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) AC_REQUIRE([gl_FUNC_MEMCHR]) - if test "$gl_cv_func_memchr_works" != yes; then + if test $HAVE_MEMCHR = 0 || test $REPLACE_MEMCHR = 1; then REPLACE_STRSTR=1 else dnl Detect http://sourceware.org/bugzilla/show_bug.cgi?id=12092. diff --git a/m4/wcrtomb.m4 b/m4/wcrtomb.m4 index 0aa040d..fcc3f8c 100644 --- a/m4/wcrtomb.m4 +++ b/m4/wcrtomb.m4 @@ -1,4 +1,4 @@ -# wcrtomb.m4 serial 11 +# wcrtomb.m4 serial 12 dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -51,6 +51,8 @@ changequote(,)dnl case "$host_os" in # Guess no on AIX 4, OSF/1 and Solaris. aix4* | osf* | solaris*) gl_cv_func_wcrtomb_retval="guessing no" ;; + # Guess yes on native Windows. + mingw*) gl_cv_func_wcrtomb_retval="guessing yes" ;; # Guess yes otherwise. *) gl_cv_func_wcrtomb_retval="guessing yes" ;; esac diff --git a/m4/wctob.m4 b/m4/wctob.m4 index 492f4c8..9de4960 100644 --- a/m4/wctob.m4 +++ b/m4/wctob.m4 @@ -1,4 +1,4 @@ -# wctob.m4 serial 10 +# wctob.m4 serial 11 dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -30,6 +30,9 @@ changequote(,)dnl case "$host_os" in # Guess no on Solaris <= 9 and Cygwin. solaris2.[1-9] | solaris2.[1-9].* | cygwin*) + gl_cv_func_wctob_works="guessing no" ;; + # Guess no on native Windows. + mingw*) gl_cv_func_wctob_works="guessing no" ;; # Guess yes otherwise. *) gl_cv_func_wctob_works="guessing yes" ;; diff --git a/m4/wctype_h.m4 b/m4/wctype_h.m4 index 0c8c305..596f26b 100644 --- a/m4/wctype_h.m4 +++ b/m4/wctype_h.m4 @@ -1,4 +1,4 @@ -# wctype_h.m4 serial 20 +# wctype_h.m4 serial 21 dnl A placeholder for ISO C99 , for platforms that lack it. @@ -53,7 +53,8 @@ AC_DEFUN([gl_WCTYPE_H], int main () { return iswprint ('x') == 0; } ]])], [gl_cv_func_iswcntrl_works=yes], [gl_cv_func_iswcntrl_works=no], - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include + [dnl Guess no on Linux libc5, yes otherwise. + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include #if __GNU_LIBRARY__ == 1 Linux libc5 i18n is broken. #endif]], [])], diff --git a/po/trader.pot b/po/trader.pot index bc551e8..4725bbf 100644 --- a/po/trader.pot +++ b/po/trader.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: trader 7.11\n" +"Project-Id-Version: trader 7.12\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2017-06-18 06:01+1000\n" +"POT-Creation-Date: 2017-08-24 15:17+1000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/src/Makefile.in b/src/Makefile.in index 64923e2..ce5f787 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -289,6 +289,7 @@ GNULIB_DUP3 = @GNULIB_DUP3@ GNULIB_DUPLOCALE = @GNULIB_DUPLOCALE@ GNULIB_ENVIRON = @GNULIB_ENVIRON@ GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@ +GNULIB_EXPLICIT_BZERO = @GNULIB_EXPLICIT_BZERO@ GNULIB_FACCESSAT = @GNULIB_FACCESSAT@ GNULIB_FCHDIR = @GNULIB_FCHDIR@ GNULIB_FCHMODAT = @GNULIB_FCHMODAT@ @@ -415,6 +416,7 @@ GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@ GNULIB_READ = @GNULIB_READ@ GNULIB_READLINK = @GNULIB_READLINK@ GNULIB_READLINKAT = @GNULIB_READLINKAT@ +GNULIB_REALLOCARRAY = @GNULIB_REALLOCARRAY@ GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@ GNULIB_REALPATH = @GNULIB_REALPATH@ GNULIB_REMOVE = @GNULIB_REMOVE@ @@ -543,12 +545,14 @@ HAVE_DECL_GETLOGIN = @HAVE_DECL_GETLOGIN@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ +HAVE_DECL_INITSTATE = @HAVE_DECL_INITSTATE@ HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ HAVE_DECL_SETENV = @HAVE_DECL_SETENV@ HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@ +HAVE_DECL_SETSTATE = @HAVE_DECL_SETSTATE@ HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@ @@ -566,6 +570,7 @@ HAVE_DUP2 = @HAVE_DUP2@ HAVE_DUP3 = @HAVE_DUP3@ HAVE_DUPLOCALE = @HAVE_DUPLOCALE@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ +HAVE_EXPLICIT_BZERO = @HAVE_EXPLICIT_BZERO@ HAVE_FACCESSAT = @HAVE_FACCESSAT@ HAVE_FCHDIR = @HAVE_FCHDIR@ HAVE_FCHMODAT = @HAVE_FCHMODAT@ @@ -636,6 +641,7 @@ HAVE_RANDOM_R = @HAVE_RANDOM_R@ HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@ HAVE_READLINK = @HAVE_READLINK@ HAVE_READLINKAT = @HAVE_READLINKAT@ +HAVE_REALLOCARRAY = @HAVE_REALLOCARRAY@ HAVE_REALPATH = @HAVE_REALPATH@ HAVE_RENAMEAT = @HAVE_RENAMEAT@ HAVE_RPMATCH = @HAVE_RPMATCH@ From 409c9bbf09841e928152ef89e0d3591ab5683d7e Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Thu, 24 Aug 2017 15:52:46 +1000 Subject: [PATCH 7/8] The file m4/gnulib-comp.m4 is required in the with-autogenerated branch Without this file, ./configure fails and the ./build-aux/bootstrap script needs to be run again. This latter script has been rerun with the same inputs as commit 2dc2bfb9bf25b52938d4504051e826a237c587e6. --- lib/Makefile.in | 2 +- m4/.gitignore | 1 - m4/gnulib-comp.m4 | 746 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 747 insertions(+), 2 deletions(-) create mode 100644 m4/gnulib-comp.m4 diff --git a/lib/Makefile.in b/lib/Makefile.in index d927361..0a8af2a 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -1522,8 +1522,8 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) -@gl_GNULIB_ENABLED_localcharset_FALSE@install-exec-local: @gl_GNULIB_ENABLED_localcharset_FALSE@uninstall-local: +@gl_GNULIB_ENABLED_localcharset_FALSE@install-exec-local: clean: clean-recursive clean-am: clean-generic clean-noinstLIBRARIES clean-noinstLTLIBRARIES \ diff --git a/m4/.gitignore b/m4/.gitignore index 5dbe905..e45e8d0 100644 --- a/m4/.gitignore +++ b/m4/.gitignore @@ -1,2 +1 @@ -/gnulib-comp.m4 /gnulib-tool.m4 diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 new file mode 100644 index 0000000..d953a24 --- /dev/null +++ b/m4/gnulib-comp.m4 @@ -0,0 +1,746 @@ +# DO NOT EDIT! GENERATED AUTOMATICALLY! +# Copyright (C) 2002-2017 Free Software Foundation, Inc. +# +# This file is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This file is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this file. If not, see . +# +# As a special exception to the GNU General Public License, +# this file may be distributed as part of a program that +# contains a configuration script generated by Autoconf, under +# the same distribution terms as the rest of that program. +# +# Generated by gnulib-tool. +# +# This file represents the compiled summary of the specification in +# gnulib-cache.m4. It lists the computed macro invocations that need +# to be invoked from configure.ac. +# In projects that use version control, this file can be treated like +# other built files. + + +# This macro should be invoked from ./configure.ac, in the section +# "Checks for programs", right after AC_PROG_CC, and certainly before +# any checks for libraries, header files, types and library functions. +AC_DEFUN([gl_EARLY], +[ + m4_pattern_forbid([^gl_[A-Z]])dnl the gnulib macro namespace + m4_pattern_allow([^gl_ES$])dnl a valid locale name + m4_pattern_allow([^gl_LIBOBJS$])dnl a variable + m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable + + # Pre-early section. + AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) + AC_REQUIRE([gl_PROG_AR_RANLIB]) + + AC_REQUIRE([AM_PROG_CC_C_O]) + # Code from module absolute-header: + # Code from module assert: + # Code from module btowc: + # Code from module builtin-expect: + # Code from module c-ctype: + # Code from module c-strcase: + # Code from module config-h: + # Code from module configmake: + # Code from module crc: + # Code from module extensions: + # Code from module extern-inline: + # Code from module getopt-gnu: + # Code from module getopt-posix: + # Code from module gettext-h: + # Code from module gettimeofday: + # Code from module gperf: + # Code from module hard-locale: + # Code from module havelib: + # Code from module iconv: + # Code from module iconv-h: + # Code from module iconv_open: + # Code from module include_next: + # Code from module inline: + # Code from module limits-h: + # Code from module localcharset: + # Code from module locale: + # Code from module localtime-buffer: + # Code from module mbrtowc: + # Code from module mbsinit: + # Code from module mbsrtowcs: + # Code from module mbtowc: + # Code from module memchr: + # Code from module multiarch: + # Code from module nocrash: + # Code from module snippet/_Noreturn: + # Code from module snippet/arg-nonnull: + # Code from module snippet/c++defs: + # Code from module snippet/unused-parameter: + # Code from module snippet/warn-on-use: + # Code from module ssize_t: + # Code from module stdbool: + # Code from module stddef: + # Code from module stdint: + # Code from module stdio: + # Code from module stdlib: + # Code from module streq: + # Code from module striconv: + # Code from module string: + # Code from module strnlen1: + # Code from module strstr: + # Code from module strstr-simple: + # Code from module sys_stat: + # Code from module sys_time: + # Code from module sys_types: + # Code from module time: + # Code from module unistd: + # Code from module unistr/base: + # Code from module unistr/u8-mbtoucr: + # Code from module unistr/u8-uctomb: + # Code from module unitypes: + # Code from module verify: + # Code from module wchar: + # Code from module wcrtomb: + # Code from module wcsdup: + # Code from module wctob: + # Code from module wctomb: + # Code from module wctype-h: + # Code from module wmemcpy: +]) + +# This macro should be invoked from ./configure.ac, in the section +# "Check for header files, types and library functions". +AC_DEFUN([gl_INIT], +[ + AM_CONDITIONAL([GL_COND_LIBTOOL], [false]) + gl_cond_libtool=false + gl_libdeps= + gl_ltlibdeps= + gl_m4_base='m4' + m4_pushdef([AC_LIBOBJ], m4_defn([gl_LIBOBJ])) + m4_pushdef([AC_REPLACE_FUNCS], m4_defn([gl_REPLACE_FUNCS])) + m4_pushdef([AC_LIBSOURCES], m4_defn([gl_LIBSOURCES])) + m4_pushdef([gl_LIBSOURCES_LIST], []) + m4_pushdef([gl_LIBSOURCES_DIR], []) + gl_COMMON + gl_source_base='lib' + gl_ASSERT + gl_FUNC_BTOWC + if test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1; then + AC_LIBOBJ([btowc]) + gl_PREREQ_BTOWC + fi + gl_WCHAR_MODULE_INDICATOR([btowc]) + gl_CONFIG_H + AC_REQUIRE([gl_EXTERN_INLINE]) + gl_FUNC_GETOPT_GNU + dnl Because of the way gl_FUNC_GETOPT_GNU is implemented (the gl_getopt_required + dnl mechanism), there is no need to do any AC_LIBOBJ or AC_SUBST here; they are + dnl done in the getopt-posix module. + gl_FUNC_GETOPT_POSIX + if test $REPLACE_GETOPT = 1; then + AC_LIBOBJ([getopt]) + AC_LIBOBJ([getopt1]) + dnl Arrange for unistd.h to include getopt.h. + GNULIB_GL_UNISTD_H_GETOPT=1 + fi + AC_SUBST([GNULIB_GL_UNISTD_H_GETOPT]) + AC_SUBST([LIBINTL]) + AC_SUBST([LTLIBINTL]) + gl_FUNC_GETTIMEOFDAY + if test $HAVE_GETTIMEOFDAY = 0 || test $REPLACE_GETTIMEOFDAY = 1; then + AC_LIBOBJ([gettimeofday]) + gl_PREREQ_GETTIMEOFDAY + fi + gl_SYS_TIME_MODULE_INDICATOR([gettimeofday]) + AM_ICONV + m4_ifdef([gl_ICONV_MODULE_INDICATOR], + [gl_ICONV_MODULE_INDICATOR([iconv])]) + gl_ICONV_H + gl_FUNC_ICONV_OPEN + if test $REPLACE_ICONV_OPEN = 1; then + AC_LIBOBJ([iconv_open]) + fi + if test $REPLACE_ICONV = 1; then + AC_LIBOBJ([iconv]) + AC_LIBOBJ([iconv_close]) + fi + gl_INLINE + gl_LIMITS_H + gl_LOCALE_H + gl_FUNC_MBRTOWC + if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then + AC_LIBOBJ([mbrtowc]) + gl_PREREQ_MBRTOWC + fi + gl_WCHAR_MODULE_INDICATOR([mbrtowc]) + gl_FUNC_MBSRTOWCS + if test $HAVE_MBSRTOWCS = 0 || test $REPLACE_MBSRTOWCS = 1; then + AC_LIBOBJ([mbsrtowcs]) + AC_LIBOBJ([mbsrtowcs-state]) + gl_PREREQ_MBSRTOWCS + fi + gl_WCHAR_MODULE_INDICATOR([mbsrtowcs]) + gl_MULTIARCH + gt_TYPE_SSIZE_T + AM_STDBOOL_H + gl_STDDEF_H + gl_STDINT_H + gl_STDIO_H + if test $gl_cond_libtool = false; then + gl_ltlibdeps="$gl_ltlibdeps $LTLIBICONV" + gl_libdeps="$gl_libdeps $LIBICONV" + fi + gl_HEADER_STRING_H + gl_FUNC_STRSTR + if test $REPLACE_STRSTR = 1; then + AC_LIBOBJ([strstr]) + fi + gl_FUNC_STRSTR_SIMPLE + if test $REPLACE_STRSTR = 1; then + AC_LIBOBJ([strstr]) + fi + gl_STRING_MODULE_INDICATOR([strstr]) + gl_HEADER_SYS_STAT_H + AC_PROG_MKDIR_P + gl_HEADER_SYS_TIME_H + AC_PROG_MKDIR_P + gl_SYS_TYPES_H + AC_PROG_MKDIR_P + gl_HEADER_TIME_H + gl_UNISTD_H + gl_LIBUNISTRING_LIBHEADER([0.9.4], [unistr.h]) + gl_MODULE_INDICATOR([unistr/u8-mbtoucr]) + gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-mbtoucr]) + gl_MODULE_INDICATOR([unistr/u8-uctomb]) + gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-uctomb]) + gl_LIBUNISTRING_LIBHEADER([0.9.4], [unitypes.h]) + gl_WCHAR_H + gl_FUNC_WCRTOMB + if test $HAVE_WCRTOMB = 0 || test $REPLACE_WCRTOMB = 1; then + AC_LIBOBJ([wcrtomb]) + gl_PREREQ_WCRTOMB + fi + gl_WCHAR_MODULE_INDICATOR([wcrtomb]) + gl_FUNC_WCSDUP + if test $HAVE_WCSDUP = 0; then + AC_LIBOBJ([wcsdup]) + fi + gl_WCHAR_MODULE_INDICATOR([wcsdup]) + gl_FUNC_WCTOB + if test $HAVE_WCTOB = 0 || test $REPLACE_WCTOB = 1; then + AC_LIBOBJ([wctob]) + gl_PREREQ_WCTOB + fi + gl_WCHAR_MODULE_INDICATOR([wctob]) + gl_WCTYPE_H + gl_gnulib_enabled_37f71b604aa9c54446783d80f42fe547=false + gl_gnulib_enabled_configmake=false + gl_gnulib_enabled_30838f5439487421042f2225bed3af76=false + gl_gnulib_enabled_localcharset=false + gl_gnulib_enabled_2049e887c7e5308faad27b3f894bb8c9=false + gl_gnulib_enabled_mbsinit=false + gl_gnulib_enabled_mbtowc=false + gl_gnulib_enabled_memchr=false + gl_gnulib_enabled_b3ae4a413a1340415f34a52d1dafb147=false + gl_gnulib_enabled_stdlib=false + gl_gnulib_enabled_streq=false + gl_gnulib_enabled_strnlen1=false + gl_gnulib_enabled_verify=false + gl_gnulib_enabled_wctomb=false + gl_gnulib_enabled_wmemcpy=false + func_gl_gnulib_m4code_37f71b604aa9c54446783d80f42fe547 () + { + if ! $gl_gnulib_enabled_37f71b604aa9c54446783d80f42fe547; then + gl___BUILTIN_EXPECT + gl_gnulib_enabled_37f71b604aa9c54446783d80f42fe547=true + fi + } + func_gl_gnulib_m4code_configmake () + { + if ! $gl_gnulib_enabled_configmake; then + gl_CONFIGMAKE_PREP + gl_gnulib_enabled_configmake=true + fi + } + func_gl_gnulib_m4code_30838f5439487421042f2225bed3af76 () + { + if ! $gl_gnulib_enabled_30838f5439487421042f2225bed3af76; then + gl_HARD_LOCALE + gl_gnulib_enabled_30838f5439487421042f2225bed3af76=true + fi + } + func_gl_gnulib_m4code_localcharset () + { + if ! $gl_gnulib_enabled_localcharset; then + gl_LOCALCHARSET + LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(abs_top_builddir)/$gl_source_base\"" + AC_SUBST([LOCALCHARSET_TESTS_ENVIRONMENT]) + gl_gnulib_enabled_localcharset=true + func_gl_gnulib_m4code_configmake + fi + } + func_gl_gnulib_m4code_2049e887c7e5308faad27b3f894bb8c9 () + { + if ! $gl_gnulib_enabled_2049e887c7e5308faad27b3f894bb8c9; then + AC_REQUIRE([gl_LOCALTIME_BUFFER_DEFAULTS]) + AC_LIBOBJ([localtime-buffer]) + gl_gnulib_enabled_2049e887c7e5308faad27b3f894bb8c9=true + fi + } + func_gl_gnulib_m4code_mbsinit () + { + if ! $gl_gnulib_enabled_mbsinit; then + gl_FUNC_MBSINIT + if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then + AC_LIBOBJ([mbsinit]) + gl_PREREQ_MBSINIT + fi + gl_WCHAR_MODULE_INDICATOR([mbsinit]) + gl_gnulib_enabled_mbsinit=true + if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then + func_gl_gnulib_m4code_verify + fi + fi + } + func_gl_gnulib_m4code_mbtowc () + { + if ! $gl_gnulib_enabled_mbtowc; then + gl_FUNC_MBTOWC + if test $REPLACE_MBTOWC = 1; then + AC_LIBOBJ([mbtowc]) + gl_PREREQ_MBTOWC + fi + gl_STDLIB_MODULE_INDICATOR([mbtowc]) + gl_gnulib_enabled_mbtowc=true + func_gl_gnulib_m4code_stdlib + fi + } + func_gl_gnulib_m4code_memchr () + { + if ! $gl_gnulib_enabled_memchr; then + gl_FUNC_MEMCHR + if test $HAVE_MEMCHR = 0 || test $REPLACE_MEMCHR = 1; then + AC_LIBOBJ([memchr]) + gl_PREREQ_MEMCHR + fi + gl_STRING_MODULE_INDICATOR([memchr]) + gl_gnulib_enabled_memchr=true + fi + } + func_gl_gnulib_m4code_b3ae4a413a1340415f34a52d1dafb147 () + { + if ! $gl_gnulib_enabled_b3ae4a413a1340415f34a52d1dafb147; then + gl_gnulib_enabled_b3ae4a413a1340415f34a52d1dafb147=true + fi + } + func_gl_gnulib_m4code_stdlib () + { + if ! $gl_gnulib_enabled_stdlib; then + gl_STDLIB_H + gl_gnulib_enabled_stdlib=true + func_gl_gnulib_m4code_b3ae4a413a1340415f34a52d1dafb147 + fi + } + func_gl_gnulib_m4code_streq () + { + if ! $gl_gnulib_enabled_streq; then + gl_gnulib_enabled_streq=true + fi + } + func_gl_gnulib_m4code_strnlen1 () + { + if ! $gl_gnulib_enabled_strnlen1; then + gl_gnulib_enabled_strnlen1=true + func_gl_gnulib_m4code_memchr + fi + } + func_gl_gnulib_m4code_verify () + { + if ! $gl_gnulib_enabled_verify; then + gl_gnulib_enabled_verify=true + fi + } + func_gl_gnulib_m4code_wctomb () + { + if ! $gl_gnulib_enabled_wctomb; then + gl_FUNC_WCTOMB + if test $REPLACE_WCTOMB = 1; then + AC_LIBOBJ([wctomb]) + gl_PREREQ_WCTOMB + fi + gl_STDLIB_MODULE_INDICATOR([wctomb]) + gl_gnulib_enabled_wctomb=true + func_gl_gnulib_m4code_stdlib + fi + } + func_gl_gnulib_m4code_wmemcpy () + { + if ! $gl_gnulib_enabled_wmemcpy; then + gl_FUNC_WMEMCPY + if test $HAVE_WMEMCPY = 0; then + AC_LIBOBJ([wmemcpy]) + fi + gl_WCHAR_MODULE_INDICATOR([wmemcpy]) + gl_gnulib_enabled_wmemcpy=true + fi + } + if test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1; then + func_gl_gnulib_m4code_mbtowc + fi + if test $NEED_LOCALTIME_BUFFER = 1; then + func_gl_gnulib_m4code_2049e887c7e5308faad27b3f894bb8c9 + fi + if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then + func_gl_gnulib_m4code_30838f5439487421042f2225bed3af76 + fi + if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then + func_gl_gnulib_m4code_localcharset + fi + if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then + func_gl_gnulib_m4code_mbsinit + fi + if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then + func_gl_gnulib_m4code_streq + fi + if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then + func_gl_gnulib_m4code_verify + fi + if test $HAVE_MBSRTOWCS = 0 || test $REPLACE_MBSRTOWCS = 1; then + func_gl_gnulib_m4code_strnlen1 + fi + if test $REPLACE_STRSTR = 1; then + func_gl_gnulib_m4code_37f71b604aa9c54446783d80f42fe547 + fi + if test $REPLACE_STRSTR = 1; then + func_gl_gnulib_m4code_memchr + fi + if test $HAVE_WCRTOMB = 0 || test $REPLACE_WCRTOMB = 1; then + func_gl_gnulib_m4code_mbsinit + fi + if test $HAVE_WCSDUP = 0; then + func_gl_gnulib_m4code_wmemcpy + fi + if test $HAVE_WCTOB = 0 || test $REPLACE_WCTOB = 1; then + func_gl_gnulib_m4code_wctomb + fi + m4_pattern_allow([^gl_GNULIB_ENABLED_]) + AM_CONDITIONAL([gl_GNULIB_ENABLED_37f71b604aa9c54446783d80f42fe547], [$gl_gnulib_enabled_37f71b604aa9c54446783d80f42fe547]) + AM_CONDITIONAL([gl_GNULIB_ENABLED_configmake], [$gl_gnulib_enabled_configmake]) + AM_CONDITIONAL([gl_GNULIB_ENABLED_30838f5439487421042f2225bed3af76], [$gl_gnulib_enabled_30838f5439487421042f2225bed3af76]) + AM_CONDITIONAL([gl_GNULIB_ENABLED_localcharset], [$gl_gnulib_enabled_localcharset]) + AM_CONDITIONAL([gl_GNULIB_ENABLED_2049e887c7e5308faad27b3f894bb8c9], [$gl_gnulib_enabled_2049e887c7e5308faad27b3f894bb8c9]) + AM_CONDITIONAL([gl_GNULIB_ENABLED_mbsinit], [$gl_gnulib_enabled_mbsinit]) + AM_CONDITIONAL([gl_GNULIB_ENABLED_mbtowc], [$gl_gnulib_enabled_mbtowc]) + AM_CONDITIONAL([gl_GNULIB_ENABLED_memchr], [$gl_gnulib_enabled_memchr]) + AM_CONDITIONAL([gl_GNULIB_ENABLED_b3ae4a413a1340415f34a52d1dafb147], [$gl_gnulib_enabled_b3ae4a413a1340415f34a52d1dafb147]) + AM_CONDITIONAL([gl_GNULIB_ENABLED_stdlib], [$gl_gnulib_enabled_stdlib]) + AM_CONDITIONAL([gl_GNULIB_ENABLED_streq], [$gl_gnulib_enabled_streq]) + AM_CONDITIONAL([gl_GNULIB_ENABLED_strnlen1], [$gl_gnulib_enabled_strnlen1]) + AM_CONDITIONAL([gl_GNULIB_ENABLED_verify], [$gl_gnulib_enabled_verify]) + AM_CONDITIONAL([gl_GNULIB_ENABLED_wctomb], [$gl_gnulib_enabled_wctomb]) + AM_CONDITIONAL([gl_GNULIB_ENABLED_wmemcpy], [$gl_gnulib_enabled_wmemcpy]) + # End of code from modules + m4_ifval(gl_LIBSOURCES_LIST, [ + m4_syscmd([test ! -d ]m4_defn([gl_LIBSOURCES_DIR])[ || + for gl_file in ]gl_LIBSOURCES_LIST[ ; do + if test ! -r ]m4_defn([gl_LIBSOURCES_DIR])[/$gl_file ; then + echo "missing file ]m4_defn([gl_LIBSOURCES_DIR])[/$gl_file" >&2 + exit 1 + fi + done])dnl + m4_if(m4_sysval, [0], [], + [AC_FATAL([expected source file, required through AC_LIBSOURCES, not found])]) + ]) + m4_popdef([gl_LIBSOURCES_DIR]) + m4_popdef([gl_LIBSOURCES_LIST]) + m4_popdef([AC_LIBSOURCES]) + m4_popdef([AC_REPLACE_FUNCS]) + m4_popdef([AC_LIBOBJ]) + AC_CONFIG_COMMANDS_PRE([ + gl_libobjs= + gl_ltlibobjs= + if test -n "$gl_LIBOBJS"; then + # Remove the extension. + sed_drop_objext='s/\.o$//;s/\.obj$//' + for i in `for i in $gl_LIBOBJS; do echo "$i"; done | sed -e "$sed_drop_objext" | sort | uniq`; do + gl_libobjs="$gl_libobjs $i.$ac_objext" + gl_ltlibobjs="$gl_ltlibobjs $i.lo" + done + fi + AC_SUBST([gl_LIBOBJS], [$gl_libobjs]) + AC_SUBST([gl_LTLIBOBJS], [$gl_ltlibobjs]) + ]) + gltests_libdeps= + gltests_ltlibdeps= + m4_pushdef([AC_LIBOBJ], m4_defn([gltests_LIBOBJ])) + m4_pushdef([AC_REPLACE_FUNCS], m4_defn([gltests_REPLACE_FUNCS])) + m4_pushdef([AC_LIBSOURCES], m4_defn([gltests_LIBSOURCES])) + m4_pushdef([gltests_LIBSOURCES_LIST], []) + m4_pushdef([gltests_LIBSOURCES_DIR], []) + gl_COMMON + gl_source_base='tests' +changequote(,)dnl + gltests_WITNESS=IN_`echo "${PACKAGE-$PACKAGE_TARNAME}" | LC_ALL=C tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ | LC_ALL=C sed -e 's/[^A-Z0-9_]/_/g'`_GNULIB_TESTS +changequote([, ])dnl + AC_SUBST([gltests_WITNESS]) + gl_module_indicator_condition=$gltests_WITNESS + m4_pushdef([gl_MODULE_INDICATOR_CONDITION], [$gl_module_indicator_condition]) + m4_pattern_allow([^gl_GNULIB_ENABLED_]) + m4_popdef([gl_MODULE_INDICATOR_CONDITION]) + m4_ifval(gltests_LIBSOURCES_LIST, [ + m4_syscmd([test ! -d ]m4_defn([gltests_LIBSOURCES_DIR])[ || + for gl_file in ]gltests_LIBSOURCES_LIST[ ; do + if test ! -r ]m4_defn([gltests_LIBSOURCES_DIR])[/$gl_file ; then + echo "missing file ]m4_defn([gltests_LIBSOURCES_DIR])[/$gl_file" >&2 + exit 1 + fi + done])dnl + m4_if(m4_sysval, [0], [], + [AC_FATAL([expected source file, required through AC_LIBSOURCES, not found])]) + ]) + m4_popdef([gltests_LIBSOURCES_DIR]) + m4_popdef([gltests_LIBSOURCES_LIST]) + m4_popdef([AC_LIBSOURCES]) + m4_popdef([AC_REPLACE_FUNCS]) + m4_popdef([AC_LIBOBJ]) + AC_CONFIG_COMMANDS_PRE([ + gltests_libobjs= + gltests_ltlibobjs= + if test -n "$gltests_LIBOBJS"; then + # Remove the extension. + sed_drop_objext='s/\.o$//;s/\.obj$//' + for i in `for i in $gltests_LIBOBJS; do echo "$i"; done | sed -e "$sed_drop_objext" | sort | uniq`; do + gltests_libobjs="$gltests_libobjs $i.$ac_objext" + gltests_ltlibobjs="$gltests_ltlibobjs $i.lo" + done + fi + AC_SUBST([gltests_LIBOBJS], [$gltests_libobjs]) + AC_SUBST([gltests_LTLIBOBJS], [$gltests_ltlibobjs]) + ]) + LIBGNU_LIBDEPS="$gl_libdeps" + AC_SUBST([LIBGNU_LIBDEPS]) + LIBGNU_LTLIBDEPS="$gl_ltlibdeps" + AC_SUBST([LIBGNU_LTLIBDEPS]) +]) + +# Like AC_LIBOBJ, except that the module name goes +# into gl_LIBOBJS instead of into LIBOBJS. +AC_DEFUN([gl_LIBOBJ], [ + AS_LITERAL_IF([$1], [gl_LIBSOURCES([$1.c])])dnl + gl_LIBOBJS="$gl_LIBOBJS $1.$ac_objext" +]) + +# Like AC_REPLACE_FUNCS, except that the module name goes +# into gl_LIBOBJS instead of into LIBOBJS. +AC_DEFUN([gl_REPLACE_FUNCS], [ + m4_foreach_w([gl_NAME], [$1], [AC_LIBSOURCES(gl_NAME[.c])])dnl + AC_CHECK_FUNCS([$1], , [gl_LIBOBJ($ac_func)]) +]) + +# Like AC_LIBSOURCES, except the directory where the source file is +# expected is derived from the gnulib-tool parameterization, +# and alloca is special cased (for the alloca-opt module). +# We could also entirely rely on EXTRA_lib..._SOURCES. +AC_DEFUN([gl_LIBSOURCES], [ + m4_foreach([_gl_NAME], [$1], [ + m4_if(_gl_NAME, [alloca.c], [], [ + m4_define([gl_LIBSOURCES_DIR], [lib]) + m4_append([gl_LIBSOURCES_LIST], _gl_NAME, [ ]) + ]) + ]) +]) + +# Like AC_LIBOBJ, except that the module name goes +# into gltests_LIBOBJS instead of into LIBOBJS. +AC_DEFUN([gltests_LIBOBJ], [ + AS_LITERAL_IF([$1], [gltests_LIBSOURCES([$1.c])])dnl + gltests_LIBOBJS="$gltests_LIBOBJS $1.$ac_objext" +]) + +# Like AC_REPLACE_FUNCS, except that the module name goes +# into gltests_LIBOBJS instead of into LIBOBJS. +AC_DEFUN([gltests_REPLACE_FUNCS], [ + m4_foreach_w([gl_NAME], [$1], [AC_LIBSOURCES(gl_NAME[.c])])dnl + AC_CHECK_FUNCS([$1], , [gltests_LIBOBJ($ac_func)]) +]) + +# Like AC_LIBSOURCES, except the directory where the source file is +# expected is derived from the gnulib-tool parameterization, +# and alloca is special cased (for the alloca-opt module). +# We could also entirely rely on EXTRA_lib..._SOURCES. +AC_DEFUN([gltests_LIBSOURCES], [ + m4_foreach([_gl_NAME], [$1], [ + m4_if(_gl_NAME, [alloca.c], [], [ + m4_define([gltests_LIBSOURCES_DIR], [tests]) + m4_append([gltests_LIBSOURCES_LIST], _gl_NAME, [ ]) + ]) + ]) +]) + +# This macro records the list of files which have been installed by +# gnulib-tool and may be removed by future gnulib-tool invocations. +AC_DEFUN([gl_FILE_LIST], [ + build-aux/config.rpath + lib/_Noreturn.h + lib/arg-nonnull.h + lib/btowc.c + lib/c++defs.h + lib/c-ctype.c + lib/c-ctype.h + lib/c-strcase.h + lib/c-strcasecmp.c + lib/c-strncasecmp.c + lib/config.charset + lib/crc.c + lib/crc.h + lib/getopt-cdefs.in.h + lib/getopt-core.h + lib/getopt-ext.h + lib/getopt-pfx-core.h + lib/getopt-pfx-ext.h + lib/getopt.c + lib/getopt.in.h + lib/getopt1.c + lib/getopt_int.h + lib/gettext.h + lib/gettimeofday.c + lib/hard-locale.c + lib/hard-locale.h + lib/iconv.c + lib/iconv.in.h + lib/iconv_close.c + lib/iconv_open-aix.gperf + lib/iconv_open-hpux.gperf + lib/iconv_open-irix.gperf + lib/iconv_open-osf.gperf + lib/iconv_open-solaris.gperf + lib/iconv_open.c + lib/limits.in.h + lib/localcharset.c + lib/localcharset.h + lib/locale.in.h + lib/localtime-buffer.c + lib/localtime-buffer.h + lib/mbrtowc.c + lib/mbsinit.c + lib/mbsrtowcs-impl.h + lib/mbsrtowcs-state.c + lib/mbsrtowcs.c + lib/mbtowc-impl.h + lib/mbtowc.c + lib/memchr.c + lib/memchr.valgrind + lib/ref-add.sin + lib/ref-del.sin + lib/stdbool.in.h + lib/stddef.in.h + lib/stdint.in.h + lib/stdio.in.h + lib/stdlib.in.h + lib/str-two-way.h + lib/streq.h + lib/striconv.c + lib/striconv.h + lib/string.in.h + lib/strnlen1.c + lib/strnlen1.h + lib/strstr.c + lib/sys_stat.in.h + lib/sys_time.in.h + lib/sys_types.in.h + lib/time.in.h + lib/unistd.c + lib/unistd.in.h + lib/unistr.in.h + lib/unistr/u8-mbtoucr.c + lib/unistr/u8-uctomb-aux.c + lib/unistr/u8-uctomb.c + lib/unitypes.in.h + lib/unused-parameter.h + lib/verify.h + lib/warn-on-use.h + lib/wchar.in.h + lib/wcrtomb.c + lib/wcsdup-impl.h + lib/wcsdup.c + lib/wctob.c + lib/wctomb-impl.h + lib/wctomb.c + lib/wctype-h.c + lib/wctype.in.h + lib/wmemcpy-impl.h + lib/wmemcpy.c + m4/00gnulib.m4 + m4/absolute-header.m4 + m4/assert.m4 + m4/btowc.m4 + m4/builtin-expect.m4 + m4/codeset.m4 + m4/config-h.m4 + m4/configmake.m4 + m4/extensions.m4 + m4/extern-inline.m4 + m4/fcntl-o.m4 + m4/getopt.m4 + m4/gettimeofday.m4 + m4/glibc21.m4 + m4/gnulib-common.m4 + m4/hard-locale.m4 + m4/iconv.m4 + m4/iconv_h.m4 + m4/iconv_open.m4 + m4/include_next.m4 + m4/inline.m4 + m4/lib-ld.m4 + m4/lib-link.m4 + m4/lib-prefix.m4 + m4/libunistring-base.m4 + m4/limits-h.m4 + m4/localcharset.m4 + m4/locale-fr.m4 + m4/locale-ja.m4 + m4/locale-zh.m4 + m4/locale_h.m4 + m4/localtime-buffer.m4 + m4/longlong.m4 + m4/mbrtowc.m4 + m4/mbsinit.m4 + m4/mbsrtowcs.m4 + m4/mbstate_t.m4 + m4/mbtowc.m4 + m4/memchr.m4 + m4/mmap-anon.m4 + m4/multiarch.m4 + m4/nocrash.m4 + m4/off_t.m4 + m4/ssize_t.m4 + m4/stdbool.m4 + m4/stddef_h.m4 + m4/stdint.m4 + m4/stdio_h.m4 + m4/stdlib_h.m4 + m4/string_h.m4 + m4/strstr.m4 + m4/sys_socket_h.m4 + m4/sys_stat_h.m4 + m4/sys_time_h.m4 + m4/sys_types_h.m4 + m4/time_h.m4 + m4/unistd_h.m4 + m4/warn-on-use.m4 + m4/wchar_h.m4 + m4/wchar_t.m4 + m4/wcrtomb.m4 + m4/wcsdup.m4 + m4/wctob.m4 + m4/wctomb.m4 + m4/wctype_h.m4 + m4/wint_t.m4 + m4/wmemcpy.m4 +]) From 36e9bee9a149ee3298d95e3cd875f61cd8391d7f Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Thu, 24 Aug 2017 15:58:02 +1000 Subject: [PATCH 8/8] Update all GMO files (and en@quot.po) as part of "make dist" --- po/da.gmo | Bin 30286 -> 30245 bytes po/de.gmo | Bin 31194 -> 31153 bytes po/en@quot.gmo | Bin 29715 -> 29674 bytes po/en@quot.po | 6 +++--- po/en_AU.gmo | Bin 29767 -> 29726 bytes po/en_CA.gmo | Bin 29765 -> 29724 bytes po/en_GB.gmo | Bin 29764 -> 29723 bytes po/en_US.gmo | Bin 29758 -> 29717 bytes po/eo.gmo | Bin 30168 -> 30127 bytes po/fi.gmo | Bin 30852 -> 30811 bytes po/fr.gmo | Bin 31664 -> 31623 bytes po/hr.gmo | Bin 30354 -> 30313 bytes po/hu.gmo | Bin 32233 -> 32192 bytes po/nb.gmo | Bin 30023 -> 29982 bytes po/ru.gmo | Bin 39007 -> 38966 bytes po/sr.gmo | Bin 37555 -> 37702 bytes po/sv.gmo | Bin 30257 -> 30216 bytes 17 files changed, 3 insertions(+), 3 deletions(-) diff --git a/po/da.gmo b/po/da.gmo index 6a8eb4e3e6f83bfea138052bc85b7f1facf7f141..48477ef40d63265cd622e79c7e90a454a43adff1 100644 GIT binary patch delta 1749 zcmXZce@vBC7{Kud%b$UuQv49(wGffIa_7i$>qa^ZfNW&w0=Lp68tNocHQT z+_90k6Q57|Fx z%)(;y@D-eo2QUGTtrGwK1if_V#FsG%ui>LOgqq0Ir$uI?hsl_a=~#}Mc)i(%8N?k} zf*;{qIEcrwGC9b_8pf=mzR{@)?}Zp|8NliDR2w?YxKn0tQ~7k;#MMCI;b*S6ww% zp>FXm)T%#@5xk5gIQ2ExUxAwVX4Er3gjqO%l{kjASkmmq_n_|Z*UjudH%xw`qlZLt zx40j~#ciyB{+pPNk?rn`>&%^~KcsHdAJLcQCDif1;sU&fy0FX^xAF+;d-XUE_q6!# z!|&6f*RK!tKL3Kc;(t+#E4|fya0!y9Y(Tw6QG5&=Fc&+l|10yf*=L?bP2e0R;&tB| zL#Stc*W&3h3X?bu^@SXZOHp53i?cCm#>@`0$Na+l*8Cau{Xv|C{uqrpG^Vw=Ym1M@dv2$e2gLNN4}RXBQ!LVQFHPR zH$h78vV?<$apA7-O7pxxb>ohv)~2nm2UbR7jYVEK7+MktE)9eWyij3LXlZXzS#tjW D00{7V delta 1770 zcmX}sdu+{T7{Kx8U`RQ7PFt5&Ij7au89Vhmr;3VOPh0A~Zf1<2tW8^W>2W4O;^z`V z@rSr1E)|JukhDp+WMTVb>o!@;Ws_L4ji3@NWhNrgkoZ2{H~#wkp6BDtARfJX|Ev4cl=fK0>X0&{Xq-80vz{Pz&2=ZNfa_?=Tuh`ghY^3{+QePd0W#ezn2EaJc#PmY)Pfq(!Dbweckv_aJws#! z7GV@?Q5QIBy^K2FbL@iNnMT)VA5yLTtm)QFYrvXq%|$($5Pprts6Fx0+Gm#el6k0w zFF+l?3AINKAxGs(GY?)8zo9nGU)U4>$1rwcA%pe~Kf{yw?mg<6hdwrzVGrV^ z=)*dkh#PPMUczzMiTSKAqbo#`NK~T_8*nIY!4RIqAl}3e@da+f!Jp90G|fre-&N$7 zxn=_kzA*E|QFpu*bpuDSigAD7zr&}(rBaZ|PFogdK6W#AJY0=!7A6Pbhsn2!n6 zPkaKk>wm|I_za8DS#I)i)WY|o-kzT^2Rm^Z2I^^GtV5lr4fPA(ujl)7(3h_s`_uX#W)Sy?i{xT9>c+}ZcV2_~yWKblPsd#| z@lPc5`rSjl&u>sG%~@mKm!M9#1gTTDqh6y%%*H)93|nmeZ|fcFJ?jJ10v=*AdfbG0 z@S~n}mW`v>hd74%g9;ljx9`_u3i(EBleNX#X1!&7Y<-QoaPn8?pVJNSkV+zgdTq+E z7tTa2U_R=OYp^@kqZikpj^B)FxD&P6j-meUy!9e}K>RD}I@d9R?Z|u?(s!+?B-5IY zy1=B?BJYkuPh{VZu@QN5!X@#l%0%s|mEqFLMAg_})QOA^JEOvpF+pe4SSK<(;yBK} Qr?K>;_qk}Rza*{TEs(_S6#xJL diff --git a/po/de.gmo b/po/de.gmo index f7f0d1bbbd6c4cc379d710d9ebf201071a1582ad..9a7f2804b346b022ecee3522ca8b2ccaaf13045f 100644 GIT binary patch delta 1749 zcmXZcdrZw?7{Kx8q;lyZS)!6tPAU_X>gc#lIm$gDn_FT`)&&(RIgCGA%r$=y7X86o zrnE7$G_tvD*i2(C8)h@~k2Pa9=KJh@x7O! zp(3(!w#W$Ff-$%c!|@!B#14$aCm4;NFa-bEc(B)ucVQH9H^yQi>igSpG&W%cop|yc~zo-;cWSlgOUr1|G*>*o;kiW@BUW zMT+Qq@_i!dG>#GQ#|Ow*d5mrhn=6um`8XCEFaghFJU+w;_zlxAa-NCLMU9uC3r}Gj z-nGv^;3WD3eDlpoCgV5)g_wo4s4ujmPW%FOVgCi@`FNa2zXbIFN0BT_4^G3tg=SnX z>O6I*DLI1yc+2YRvW*_=W9xHkul23aqG~|R`Dtv$F7&5p)-DyfGC*X* z3bTQst4t9mqh7fOwRV={dB)XZf`bAt=Af)Ev(|AM9e~uGv|uoP#xVSWnnS-5b5a)` zrtigr_!9NATDM+g2JXRgEYyWM&+1KV-cO_yb=;TDrgj2KxqmMMGid0E>&ir^GigPw z`aaCYxN@`bD&(?cH*#oshML>>3R8S}sKwian!0;Pp-UewLwBXQi9?u7zrB+C&!zE( zz+E;HyVVSMUnR1JxTD(q4isY?{d&|BoJCE^9n>p+jq%uT<0EQJe=;T#FTy0;gVA^q z^}szf+`mrzm4Hqdw8NN$x{w#0xB>Nr14zo{GIFDG9rYwPP_O=-jYsb^&tt7|Ru}4q z6EOsHe6~?wU283~)}g-8X!~u}4vZk)ZSA#ww>oy2uPM@+Y@KRdh~d2NE2g10upI|t zGX~)q)Z)8@WJYdVyX^COsNaV^|>=MZVg z7U?G_$Ji&Q5=Q$ zF%dtR|0Cvzq|r~cXy{FrU^3RC56`1cXhB{059-G5x%U61ID!6t)C=53swkZ}71ILt zxOJ%OG@#zR8GGS-qt$L2oyH%=-^OlZSfM>J5__;f3~I^Z@iZo*mf)fBHEISsP&43~ zXTJeIM$lh|BZT^|q7hA?4t0U!s5QQfDR>t%u><+Z@FKE>LDbSbLl;W1$Y4lBeJfK? z*DXdpNEznf37m#+F^T;pp+qE-z;x_~vr$vM2(=^@>Z58zt?dImi|rW3quE<3aRDd@~;cWZLue27>iLi3Ze@SqE5Julw4jR8I?DvH)%sneXp%{JlB|KEHDO84_t&% zxYja_?Z&;vqs9i*2~DQ|+}Mgv;vL3rWB+Y-JOyLO=XrV-Q%6;_W0c1NiL5s%i|sI^>{q> RU$X~C{*R@HVsp;={sF!r^^E`k diff --git a/po/en@quot.gmo b/po/en@quot.gmo index c19aaff1a89c74d41fb21a32be687e0cbc4fdeb2..eee9a802fc0b22b131cfcb980e15bbecce5cd970 100644 GIT binary patch delta 1750 zcmXZbS!|3^6u|K_MJ+X|s%GfHdJQmwrd5hSW&sVXr=MXdQA5EO0DL?X6Y z!hw7Du9J zq>YyU22nR0j-9XoHL-;lgKJR}*n!>fFzQCvP!qj}UGO!I#P7HPv&V?k;w98|GslYX zlT~9KkzO>e5jDpK?2nC@j`8E%1-Y0&T#P+%o%J8UG~z4R8{b%etMP7sFVy)3s5cQt zy@{Qefu|iBn$a^G_=YLOaTDB=WTT&W8m8hV4B|=D4PIbBjGQPk5C@`;mttSskGifN zyJ8bI!)67pPD^VSH4fTm~%&F!g)P&Y!Pdta6@iFR?eL@cI z$ZzZDI>{}vbkw&VhW)S*1GoWm@GSC-@&Wav!O8BGmY7>mi}eJy!^@b3w{Qsl#Y`Mh zs5is=hiSB-V-IR(2T`x?3~FsW#bo@A`gYx?h-|^(m_*Uk<7V#k?R2*|%VvqRWqc!Q z5m#b59>qt@yN^x8wM871?@Q$zDijakP<(<>7*p&fl!%>)edZW*F6tAkK|OI5>IrKx z%!gj0CNg0@#mSq^#O}n-LN}p9==@~h4viEB>Ptm(u@Uvk`!43AI2(20cI1yCr*H&* z!Bq5@iG*-E_Qz_}V!MvI-*e>hBw>kL>`PJi+qQ)J&!cgYj$>r}0d>Rbun5m2b*LLf zl)DQOQJ)|O^Z-r|Nwj++i zNbHGPgc+#oa#8o2WbtflL0pRZ;bo{bGQ8##1Q5W)V9pnk_y)kM) pvTs_+>avQm@~|&|-l~#Na?l^h^7*rU!OY~qpim&IE|mA&{||>7=R*Jh delta 1771 zcmYM!duY{l7{~GFcp2o{P3PR4*>pB-+tJ^#HP^|UZF94{OlpQUO^$S0F50|I5i5TF zv0;CdmnPajAvz2HP*G=1ih(3{Q4%FmBMVeSDJEU0Ka8UHr{4p@;PrjJm*;#h&u>59 zj`iM&9Xp&6u8W!V)tTj++1LiN(O8ZJ_!Q=1i}$B-4Dn`<-@z>6eVBts+(8^m{0%;Y zH}PSN&5PnmsQIWGaAk2 zVhO&9Dcp}gq1J6}GULxaXbR09p>d071ZK`Rn~u3yj}zJXKm zfoG!m2~_`L)clR8o7juGiI1@YzYA&T2V&1g0~2vF@f_4iQW)SHSc->nCSF7(7{0)) z5@+CJxB@l46CcGhsC7d)9`hEm1}oh#@J5weQTk_JnF4q!AjhW3H%Ue;}zr?Eq`%z(pJ=!Zg-EO z@?5}dypFT*S9}7eHJer8YAmJxY%h&bbbN+6_yy|fE~9G0mQYAghWeo$-}+aY)!a)3owOF(!Dz4?2Bz_C0<0(|J-A3gb)=r&Z1FG0}qw*bZ=l<(y zT%@Cq9p}FmB|O!^r$hfWRHBN`Xh9?D3DT%UJ*e>m?x1@Wb)Y{`^9$DU?pTeQzY6s^ zZdn^fiQlI~69-TWulR&}sPDdTT~rHI$c5R9$bM}lmSPGM*n=7$a6fei-P5R=IDIlNccSv`LDkeDWPPz+rZI+&AKl+j z2}XAHC$qLa9!vCoUN@txC0@Tio$6ZC*%5C@b)}OfGlRsecu*Zr)RY9($skdY2!f#Z QZe7u+`+fa+_1_2o0cmgR)&Kwi diff --git a/po/en@quot.po b/po/en@quot.po index a80fd38..183c28d 100644 --- a/po/en@quot.po +++ b/po/en@quot.po @@ -27,10 +27,10 @@ # msgid "" msgstr "" -"Project-Id-Version: trader 7.11\n" +"Project-Id-Version: trader 7.12\n" "Report-Msgid-Bugs-To: J.Zaitseff@zap.org.au\n" -"POT-Creation-Date: 2017-06-18 06:01+1000\n" -"PO-Revision-Date: 2017-06-18 06:01+1000\n" +"POT-Creation-Date: 2017-08-24 15:17+1000\n" +"PO-Revision-Date: 2017-08-24 15:17+1000\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "Language: en@quot\n" diff --git a/po/en_AU.gmo b/po/en_AU.gmo index f32edab1dc2ab67150b12f875ac0dfabeb8d6018..9cb3afd7e8babeb3939a50ee90a2cda688cba697 100644 GIT binary patch delta 1749 zcmXZbdu+{j7{~GFppEH`np@{`IOu8)J!eW=*H(+7oo$Fn-L=|o;h1i0w*0a`m>^VS z%aTcxx+M~~sQ5<{QI<+J#A2Ck*&j-1B9TahSVZ>z?Dr&XUf<_?d4Au^bGmvWtv!+R zr_+N}#OzqP+1ti{g;_2Z;9#7A{qbY(--rW=w|l$~vxr+U2T!{lIEeUH9D&_93av7X zqp10_DlM=K8Z~stm8gXEI0Tzf8{3Zquno0=b{vjfs6-D@8-0$$Fm0aM92|vT<63OP ze^Bd!`DXmtk@iySoJn?Lz|b-NZ$F5AOyv^Z{EK4vfGtgfmemS&K>h3S)T2<2$GXeHNKb#6o-@SE1$~ z!UDXGTK5$5Fn6(8Z;ZP^!W%_yi96FRb1U5{>_viV)Eh5BJyE^8(``X*=md_%KXE9& zK|R@!>i-WOSUwGPRG^A)DeA2^;Y9or6L=D5;63CSZBR{k(puD&9(2#4^4!L3?8a&M z3`?-!1G6c(0b|sk{Yax99UYj1U8t-3163Q5C1z2~M}24k?!pGe6wOoI&7Ed13ybsn z6=s=?pF$P!C7gh_@OS3D!Y9PHYdI+2x67-{it#2+$Mn_Vub~{Zp&A^DtKIEx3+f3@ zp-y}Sb;92;#fLK2gd6#0J)7sv_Tos!FKi4qbO(cf8F)=&3+#Bu#)Pdfh=8sO9y^Ce2`Aw*wN!JhN^|x$c0%QvR`Y!7=DTgY(b58x<9)&++R>NaSL!eOWn$50a| zqfT1pR$?}B6{h0~R1vO0t@|96?^}-#VjA&JsC;dxnrcVZ=h=N41L^2-U!xNAZ!gK( yQxr)a?kt}ijek`4MdP-{Et}&N>zeCIqshX=w0L20JUJzrC@M`9x0lY%O8f_Smgd?3 delta 1770 zcmX}sZD`eH7{~GJ_%LY4(>6<|D|2nlwdvW;e>&%8rETieW}0ZY9u%edaHKisa45>3 zh?RmhZS=wyil#(Fl&~V_i^NCeA% zvDtL2K*h^Y{kJT(*pd{wsgUoZ682&t9z!kcJ1oFUs0G}_r|}*tQEEw8=ro*4T!jm9 zDel9AcoK7(!?-VypIvN@&B`dGmYR*j*;s}1uoAbRCi(=Q!f)_d{Mqa8;0)s2WoG3V zq58L?>UX31A4Bc@JnAHV$C>yjrl0{8%R|EwEFs>E+Q~tz!Bbd@*E}9YB}l(wHVa#E zHhzHWe-10~4r*Lsi&+uQ$Fcaj8^7U&_3kEjvzv9>-A)`sg59V)-h;ZLUiY*+fLhQm z_#BQ|VKxQJQCGGQ*?4TLyy9Kd%%w;Kf?%r#TPK~su|a5FQInYgF4c)?sZh2 zhxj-qSDMvf5!T~soP&q3l=kHL z&^_S}pswHwYRAK<9sY|QOjNreEadY|96NW`kI&G4RKh>o&A2|x-w_gRKn>W7x`LyqL<8P_&AsnV=m;AsNA+Kh&tn#~us+o1_;p7d z5?}U?BUnO1a%bpJh5GJWQ2!HKkpr`jk@eaU)Pg_72nSH@Bko=IzWW#IO+3In%!@li zVY*xGF2E!mR-y*H>G3Xa*SG@ed)a*&^9DEP;2oIpf9Y^K+(&Mu@p7LxP2$a1^FXH(#op%T>h z*QXBDCZfI{8>?rmNjG)2ZS2~%qdmQ7V^>>4aZM(wOK0Y$qj|-dxeb|UW|YZf`tCMP O&HcZwroW&m75xWF?Cxp+ diff --git a/po/en_CA.gmo b/po/en_CA.gmo index 8cac5b3dc85d419e2c23c3fb421c637f6b341ed8..88961c027df18fc7c5fdc554ede288ba17e62e72 100644 GIT binary patch delta 1749 zcmXZbSx8l35Ww-#OiEKTTWnQRv&Cy(GqkIrscEIHR79m=xd&$2O2v6-!6NO!2nwMj zA!vcjUJ@cR4B9AyHhRb;LnsKM5G1VsbO!F__szF2b9x8;S_l1Z-wbqW{Y0+jh)fib z33>c60Vksm$K!gd--!{#`z=0=A;hg1hS$w5oJ9N-XJQ{l;fTevmb?8kmy098G!#*x zZb6-}45wf{>c-AsI9^8GKnKpiUetyAQ8)S%r{bu5k!+laN3jIk@FVKDV+A7oKI@C;-Q-5J|!ioR68P11fPkp1>HqV)Z>ZhxijFVBku(e-dhaA!`46)SEbudJ}hW z0ls!9=mI0wFnyKCY~l>mlaycz9>Q3>Vew1U3H%F15-|xE;WpI%=WrhOppN^F({Owd zw}T5zXQ34qnQ3N*nPujh1?bNNg{W`52K9-`%)@3g>V~dj9KORy{Db;rlUDyfxFhit zv?2#J`8J@wbvY*DLG)rfX5w4q86{$kd(y3_SK4IWLY?OYhGHM4;SXGb32Q}Cu@qy; zKe<35h>9)@!(P;@dxM%Ae=!>4*SQPj<4NKQjY*pCc#1n6x5-V;mMxTNzlNH`cX2*G z$2asF!f(VcwsTO{mwUw`>G%vYFrdW!8nRJ0RD_YZ-P~_Bqdvhk)Dz!FJ>e^?W1*lO z?naL6U>E9V^8vFkrrJ%e zQuGm@#3bxSO|~DX^99w2aEVfcn(VEp^WCfA{&Ok3r=p!5&)Drw_^_75qJ98%qSQU^ zfVCJ!T#GtUGiv({^Rf9E^+116`$yG@%*8C!{#B@-jBVhLQ&1O4J!zJii=o5?7>Juu zldu?dTm$NSj>Szln)o8>e3wyksskB6O+HbGpyI1Jj55&Y6u|LwZP8wBr%b7J?zn1eFZXR}wV0ucQdA`j61!e$5xuw#vE+?dW2S@j zgAc?W@c}_YeIOFj1Tl$Zm}H1Ann;UOVv8lg|KvH5yvgr5&vKsiJ<=9vX$xFD*Udi^ z5II#W^0SDHFBR#DRoEL>;7_>O>i@)E#78Z@j48w|n1=tFt(Zal76)QdnaD3V3^guC z?H?->UxF0ssZh70CTzeyco=nIO_+{%P#5qR2Ve(kqTm#_(Eiw$I0q-;6x@n?@C0@# zcjL|=pWH6@MY1Rar_zWXj>3E#i80iP4q$&gkH6wwtAB|@iMvl@cQ_ig|2)+C1Zw}o zs5`%bdJ<1C8^8Dzbil9**HDUsiK|g}vIleV1cvdU#UD`q$4(?jpx*ID)GKN*PnylB3%ZX(P-co`LKfO^(83-@cxqsf>pvYRs+?l= z(Eb4R5kJL|_#Pk8FSLMbA^xzCjWWMHTO=|L-{E+SEOviGE$V{mF%x&0N6lu`D|mpq zs*H%)c?K$^)0MK4ov<+)+_r_7u<**Hlwz;o3G5*<{Q*E@gCDK#b56V1I>sz5rcG? zi8^3`#p|qn8>Um=U>-9snYXbg?T^eh^9$;@)D2EQL?MNWTuj1As1sLMhd)qvT4Sz3 z{jK8I4Sm!{xEpoc5!8HVExw9fiEp7!dyoxlykm63vfz<3iE=qNtbcMWfNij^e(_Kk9Ou(o2Hg EcR>~Iz5oCK diff --git a/po/en_GB.gmo b/po/en_GB.gmo index 727556fc15964b569d4ea813ffa800c03422cddc..c76c16f1e1d9005ad7d9d8b2590d50807629e179 100644 GIT binary patch delta 1749 zcmXZbdrZw?7{Kx8lv|Qit`Ub4(kbU8>eND16bUoe+$zLUk;}~dHrI^&!ECI}eKwa( z)<4=zST>iIwYkk7V%ThLHe)u7`96NncDB#^yqD+qUY^tT+0*#h({!VkQ{@r4lq)h& zM51PiL}MZj#!MW5CDy+dV~Fc4uEz-CMvTO(W(y7?evEP0g`@C~#c_G={H#22B%FaF zI@Beo3CnN@)}n6g2u9&q)D1M@2y8?B@O#vae#K!Jk}onHN8lbT#S8cbb={r<5q@%} zz!4cs<2_Li>^)l~1^ZzVW}z-vkHc|4j>dD=e;*Tx-{LszImeyvL+vj_onMQ36DLt` z;ucQCPKSnm;ExT&7K)4^4x*l<6a%;u8F!!`FJU&mK%P;ei`|nhL%q^t<_*+5?bsi?a4LSmOiY|FG8xxk zJoP81X!NC{1tYNy_3ECZ*2Z7-VnT`gp*%cDT%j>V(~XC?)9}S^ah_O8{V;w7wTPQB z37_H%=Ka8K;`Wssl<&*!QjrXNf>{{4%KbM?L)}mj4#gE_o!Nl;1XoZ`dhnhvqxf1N}ywKe9$-Jm#Rz-+=me+*jkciO1MV*+8deR&-7yA?E zV=r8cT7)Z6*KI}3x7Xrh*pv7)YQD3mHPwWykCnGHV(9o}{zOd>(VQ7kpY92qe2|;! q^)0N}QMs+MdW&z?+PaFMH!#UR)i)`_7ntnzrw9ER&B2*{{r>>>Q0G_x delta 1770 zcmX}rdq~x17{Kx8WGg#$ayrYhi>78xJ?{LhtgKPX0Zzr|sELBh+(J`vGI1_0#WLKB zhp-dl%H6ng$R~Z}zQ{}p!Q~<&F@pIx4|A{m!(lXVAmnaWTF@u2U9$?smEl^+>Oo1E_gk;&_a& z7MYJJxDcyxE*{2A=9gb71gRLr1bmKqbgxn0#;jE$=~#t2Q4=1-qZ;#Ql2>z0oax*e z_c*Vw7a2$UUDQYX2y^fS4$v=cgUB=Dmz&rq^ULGS+zbAPi!kp?_c!c7T~HJ!;Q{lM z*^7DwcTsoz1a*i1V+#`%Y;gk+XQxsEWrxQ#KTyG7cn1WsE;kB!R0GJ4pXA2kG&r?-{S_(zl4G`ikxM| zrKk!2ZW7`8B-HE@Z9*OJHR=_dL`~Fd?f1+fb4-idP!?+ca-5Czs0;fE^>@6`;=9DR ztz!%`Xo%nCI^?4M_Z6sbp$<7P`4L&K97SF5arCekwLNA&Gl$H7P~XH0Ou%veZdaIU z=9!CeEFCIQ2duZa#oG5`BK2+NX|u=d!z9}OH2*S(QOAW^oqigH5EUMd!6m2@S6GJ{ z)ScFwji|p>GmgS4L>0M4Rzw1sBh{4GCoyCN8N8T-poKvPx$9~BHsLPq%iC)NRJd2MZ8=u5{aA`DxMsC MUpMDUVoA_@2e~rt=>Px# diff --git a/po/en_US.gmo b/po/en_US.gmo index 78a8e9e9b96ba4d26fe8c3b9f2fb34c0fb7f7c4d..1543c28fcfd955771397cf7e7f1277e1d5475974 100644 GIT binary patch delta 1749 zcmXZbdrZw?7{KwTi_GPyBywCTxfC6oD5qpfokYkYYoz2dqE%%0!~AA0@dqxq!9E?*j3X8129Ak*^bG%uj$d4L136Q|(^%*4cE3LBSU z67?sCX!NC{6(g|&_3ECY*2Zs4!1#skALZa4;uRWGG+nrtJB=uHi}OGkUlQYIQH%I0 zj>r4>l6l|oBk_ZB4$A+__2nV~yo=MZ2m4`Wg}b33#u1mAwPqvg6P!Uk@eR}yKEitb zD6G=m$mW$4CvUbBM>2kKwY#B*==@>eJB?8cd|4}!i_z=cD_?{@;ytJfTTnln7dR8W z)oyVu#Vq0-I1$@Wi>(_qU)XvPE>VK0#omOP@A`V~Kaa+9I-1#W>;^aCty&SDOWvU- z^3}Nu3NfB|Eo!1h)bVDs!|X&o&=1u4arJy57(kt0h59*euXo(UC+X0MZKw-h+l0TU z-@SLETMHS;g-JQGU#Y|-T!nsYL>+H4+szL14r)!@!$^GVSmU$VV|q5ZH828oL5jt> zs0-&~G%h#m%$?>D9LV^2^QQS2b=^DD`AWk>M`(jcAB;jRJ}>ITv8X2vnAtdhI0qxJ z7_|tOpsuSy&9}|sz1WNRFlxTzs5Ny7S?`rsG-Bv@Z+=Hj(7PqmvoAd)?Z};3lM;L- nYqnH3RM*w|@~bwl$x29@?4RbF9Pp)0P4K5@`2#IkdEx$lxrOJ$ delta 1770 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 QquW2*F2D0x@x#3T0av8(q5uE@ diff --git a/po/fi.gmo b/po/fi.gmo index 18da6aa32528428bbafb12a3ba0ff9b94c0d6295..912d920b7309def490fb1f6bbe79f0ca8a6a0af9 100644 GIT binary patch delta 1741 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 O_|kAmbLp>j#oqzFyYk}z delta 1770 zcmX}sZ)nw39LMqRHdCB>?arz5>TP$<)Y@*lzq{PsAJlbqw#`3S&d>+`Svhin+qKp# zTl}6B3JMV;K@uNaVUk)%Q=t%&fhkeqAC%BNF!v;k6n!Eih~A%_LvZ1B&iQ@MIp6c| z9(Y!8mfxAl;q?Nu6IrvEnf0wUn~PsyIiAE4yn?gvuJ;ituCT@Id5odrsxXQxunafi zLhQzQco<*AA)JH1wpeJhDU8vefyTYXYs}_TpN|?SgGyi{D$!l2fkV`Uc~t*%xBxHX z27G|WFnFEG@ETU)*R5u4_)}|Wwv@tDYLhUH^_amr%;8IT5|`i&T#Vybfr)mrBxb!i z)C9+|21ii+o}vSj5 z?;(sR4omPnzJ^y({fax>*>Axb=C?crC2$jG;22in6MPxtn$iC? z``=E(ej3I|G`vL0v zF;x7I``CXyk3VS8Kh%_u+)h+@n^9Z40~I%bwzoPwa;4+L*uSQ+!CY*_F{`*#p zQV;h~n5_cpvV4WQe0fyI?@)gf7jY7f`0rP63iVs4mE7~~k5Lo-gPLI4C$4`S6<3KF z%;03Lt(Srl==UB*O`IQYm~n7fK`=Oyty$cWT=jleXJ2=3PjYojEgwFsg1N{Y6YF@*3bf~54JVhayM zBbJxa2to)-f>=Ugc_4@-ttCOMX~O@w_vv@ex%d0-{m#8J)t@37K1S5mM7ozEM9Q;7 zx`>E3N2D_bF#(IP9j-wg-;SN|u+7ie@dp@3{Uvt5Z>aBy3X1eW2le?N_QpA=@7){} zSK1R)Q;5MDjKwq96|bW{_yTo-pQsD89wX8N6R{&^qQ0jP9V|w^Nw(oeyoCpGY_8eZ z8{A6Xl3+p8ur7ln1Tu8%=6>W zAuqLg6$Z#py97N6-e7-ho-Z;GlQ9veqYuNVFRsBS3 zf;4o5^DiLKvnxfN;G*7v{bqukKyB@9)HD5K&75fJn@~GgYrT(pCq83aY%xh>1jb_~ zPPF+hbXZ?*5kxc4hM>qX3GeW{!yG767iHoivPP`|n6XA-~!@+{OZosCm)Jr?3U)P+3r z%ok>0n1w>vhWdwvA|pAoU#NFz=wgupI2YY74D2B2MPXeDMLdLQ*n}zQUt&7302h#N z!D4)e9xPaDE?+r%$&aD_PdviW*ogV)U1sL5Mcu%`W%NIXpq|2AcHFAeY~;yu5jHEo zQSU_23bTPQ>PGjW)-Rwg^bixV!PZ-?G+*jLt>>X$!V=U@R-sPhpe^MdTh`5Q){EGH`zRPwHf!IZoo|=h$6_xXq<}rvzdqbk64Z^ zF@&+W4kNJ=^-HR;HJ(I$?kwsC>QU!CMxFN@Gw{2ud&B=fBu-LIAh{UBgjsb-F^ke8 v0=uiS20Okf#o>}wCFNzlocW>R;Z7jMKg5?Z)E7u|{OQB}!|Eclcc%UW;A!p2 delta 1782 zcmZ|PdrZw?7{Kx8xP)><2f6nvLUcH%$bCprLZoaWiE7KGI9Gmw#dmV;C`)4P)c`?0x_B*XMcO_x=6e_xHTdIqyGu_O*I0oCtH@ctk2v zMS6)yUYbZWmSb<+ijjB}b^ZeO#5*>BVdsBg6yu%JMY>}@)b|8&5N4u2UycKD8|r({ zq>C%v2(B{V#b)e^Pq7bvM18QsbhCkjxgL;EiFKK^)Vji2ZVh1@UQmO21?y2ObI{skeSlhlPpCZ*Gsj$I z8ftG8pu_h`HG$sU0lVN7Y7g8r3*;ecX}_V~>A-AbDeCxX)C#s(f1>t8^jwiH=*I~- z5hvj~n_otU{pBk`1QWh_rnzEJOFs%7%tie*RHHWKUaZANd_ygV=7=1^E(^@Yrxu!K zzJ@;5-9x>q7kHC(;rSwOb-aM}>@Q7AM5f?foQ4sF=0MpPNxles<4V*o-Gb~XCvZOg zK;0;7srkY}tYM>i?96!gVv)(*SuAP~6_s*m+>Y)SCN2`hGH|?%4#(R#3gcIpJIqIi zd>1amvsi+WD@}J-qc&e1CgOe6|A{|16@9BX9Ohvh9z#9AtyR=Nji8l*W=@>6+8jjI ziY#Y54)yoH6&-9qJ?ITP{t9)Y-xz~YA+tUS^-Hr*$3v)1xDU0GS5TYxLC7^H`fMkn zD$NTLQA?eU+TFz%kDHK!$w_M?`pM7P{HgW1^`-SSYVW*7?fy1Z=HPu?8w9NxsCQn7 z`ap%vciQ>G=wtk%^|rOe+KSzn_f#8wsO#fxKF*qjS~<6Xpd&#QMqn-K&t?aKAZyUe#O6y0-r~`o z;Ql?SBQtaT(?TUhRb>_B{2clfab3IY>$JE;E@X)e z5s{J{kr3RDWAHHQ{B;b&R_g~0C+@}J7&b#>1jgY|oP(jb8Y6HQM&b$7b#GxXzMUb? z{}(!$(2aa%niognSmJmbk3~2N_n{_u2EBL-2jf@kU)00`W{KqEBs`8a*oK2#kY*Hv0@NQWaT1(=$AQ?TFi?oN-U?H|(5e5=y1Swrolj*TKbguQKbPTlAOUg|m2QZen4Yg~f!gTd` zoK9GXTEa%0jBhX-`)@PNnTKPD>yaGf3Q`0Kt~8%PGib6a9u-kMJ5ZlLVSQ-*VSgW0YYvoIOa1k(H!`6% zqMrB;>Vh9po6B#P(Tn6MOOOi7a@3O)V=6Wvm6k`=$JVFTHqWm~VAfG0;pZP@Cld z2H;WD7tW%d_y+dFn;3|9aUed!aD0t^*o~TqYmYfd80vFg)B~ks0v4dJo?$-&-KgGr z8a09I&8Yzg6J2qQ53*w2o(1c7lvS0LZ}sGqRIg8S$4&Jnd#0v%;u756#58Yeb6WP* Fw0}z@^ilu- delta 1770 zcmX}sS!_)~7{KxGQVq3KtF3P8;!;{i&sDu$h@|ap6}5|fYbb8)RVhV|lthUq4IzSB zUWg!R2+@c%#P+}gBEbVW9TR5a(egHeeq-jT+!B4B`vyi3wwj15pDDVI@w({n(86F~34&D0Utz zG6VC*dLpA~>|r1Z@8USTk0UXSPBzX&-N|;;365hX-a`%KD~52$cz(DDb8)xrU&TT6 z-{N45B|2TVz@ssMMjh&dLzsov(U0v|h&?BW|*xCkArLFz@CaSFc1*;qhFGq4x6R_<9pqZV!2RFNK-gPe|xMv^JJ zkaCbm=um%>F-@c^1C^*B&O$wkm8eIv54CD9qaUB*ar})Dil%wG$oq~WF+`;q`8LmN zC}F<&K7hH5SKxBq-+}>d-K#1#%K8$s*hH9)9HT5l&Bz6e#~Y}bd5pvG6KYEPFA?d7 zV^C8Y!7w&pag@kS>_)#!L}V3*o`iZ0cdRfqb`rhw9Z4MxP4%`lCXln3L;pK!)ec!} zs(LaO)2~NOVJl{1)H;z;bWw}57ByonNDT4_Ns5fDG1vG2YHeJsA^#kMyky`HfrQqZ zYn4|gvXt@p7{KeO3%x@PG;yQJNGa;h7oc9pI@E=aqQ2i|{a{VqWS*C!Uem}X@~>yz z#DLn0y5m=<6LzaN#Wlh@2Z>X*AsLn(s5{w(g?JIkw0yLFvVO6CM?HdHsQ;Ad-e&U` z8njkmA`cc~JZ?ZgHroCv>`lKFQ}F>NVLPT^^cJHZd(kgKooAx$S799e4OVX_4UOa= zYO$Qf?sx@tg4?J&euka!ImY4}?1Eo09erEPEy_R*Bnx#TVbu5Lpa!x8M_?UB>mJU~ z(1lv8H&Fw4(o)#HG0zulYAeYZG~Fq!sjjMxtXb`Zt7@x@{KMT~zT<|RV1eHa6}iFe VpzFF#A4*bU{*UFh#Fd^a`U|w>^yvTq diff --git a/po/nb.gmo b/po/nb.gmo index 686f8774b7a1f9c7ed2bfa631e15ea30a61543ff..78f34c756e21bb408dc79e680a32398120d1365e 100644 GIT binary patch delta 1749 zcmXZcduYvJ7{Kx8Fch|(V{@CaY80NAI+nSoE@ZVoyA6UNfJdzW2f6c8gN{qpVT=D)daGZ`< zIxeAZITs{V{1a({mreOna!n@djk?C$DkC7?m{d7+x zg+}rWkti&{5H7?axE+Id4ioS(>H?q4s63IO#Dh@B&Agn)?9D`_sCQdu?ll{66#X|)57df!m9ewkl_eur=t%|*ErvqW zVq1=Sm-QIJ-I$KeNY>>$@{`OtE(1GIPk70Eh*~QjFb03)cfU89!(L8^IS~D*&gg@~< z?+sie@{#y+2^(d7d9qk!0=~rvCYFkH$71y3D%4bOM6LRRSb-OD4fbE+7T$#!#3%3q z3q41jXX`Q!#HAm=B;xC3u4rGP7vROeG_+U(JaP=TC78{=!K(ezp4= z>M%@v7)Rg(>;H*-c@kik99oJ{zn&|onQd7^{%6u?r=y;Y8DC=`Os{g) zKMyqn)u?|+`%r795j8{2W((>9Ur;yhuXgcR)cJ}rh&9!o+tCp^w2GU|N2sZKhq`0m zdY7^!WS^3Y9WW0EV?L%}mGvJpPnf67GpNOS7WDvkJQ}+5=ho3?Ms0A#n1H(D6pOP_ z2hK-7t~Be-UFIbRq*8#;wyyyE&3px|eCS^G=wPUz ntgd`Rd1Xat>e8CBtYCOdYI+hw&jWYZ{j^V zqUm^vdXSGe47+hK#^;L+KtJjRIj9S*K>e;3y?6liyOTHt+i)*-;bAPDYYy@QSz5vi zT#*zSMFk?ga1T1TA4lOO^x-ocfp)na# zh-bJobV4bPzx)W3d#+;ZY3Wb<~BsP}hrFz&DtIdVwPB zf#p`W(l)BCwbq^1J=T5JI%^2yS*RZMZJVrDt?igf|9jL6#V#~YnTh&jMaUDnQcOdO zVIOMI96^1{W^}L>Gq3~6z9cLXp(z_sGjJL8hA*w(P-`V(u~|0>(}`0t6HBa(IGX+C z1&uHUeq$8&TVhfgkGjEZ)HmIN`lj`G2rpq0MH4I%3H20NwcK3b%?go7#=oPc+_TbL zBoXg3uMj)wk6FV(*hdTciYG%93$bTV?GYf7klJ`pEhO6PWiD^#Y$<8hY|Swj+Lr8E{aGF$eX; zOKn_c$9H24{l~1$)+^S#=wsqwEG|L4=_c%h zrKr_ifjWOL#$gDx*iNIacfrPOsNdZ|JIpR5 z$(}T3nUhmpQe3mOvckzNt|dlEv F`wPQN?^FN) diff --git a/po/ru.gmo b/po/ru.gmo index 805b4899c3111c4365a34b576279ed6b8e0ce654..0efe5276a0bccc051f69a993f324a75bcbde9aea 100644 GIT binary patch delta 1749 zcmXZde@vBC7{Kud23G|v5D}s|ZU~~uP3}d0Muor?1O+dkfNpN$pwZ%o{3vSXn`uhA zi6|BmCvGlMGrPgY#+GhbsT*!O*XAEJnauTLxyAaU<&S3Hhjae=oacGZ`=0YY&$;iN z4u(zyLxUGx&KDsfXNyE$5|N4$k!9G5OK|{S#IMnfQ<#DetucO)c;al-`zx^!JJ5sQ zU_MS`HYTnUS%U$50S~MbXKsNrB;rVXYrTWIk>61lj4BmLLa#M|ImEkA7e0@A{}iU; zeeA}0Wg>szZk)yD^&$mWS1vM%gXNA$6@$tOkuW@sU3eBLio|a)Z?qLx5)Y%k$&Z+U zPcaug8%4HZGirPl3-Jl+yn;$okyg|V4r4Wb=P=L`EoK*NN~&-Zp2XMiPuz+tNqTWV z@)9zE^(X<6Ezp217{qo=2Q=pOjF?EG2%fi)(CX3uTDBrdY!;!n(l*(2r#Z@=l~&zQ-)kfY`Ul4X4hedI?_ z7rcY|-B>VS&V~nbiCfW+qo~&(qRx*#M*Z~xrN_(y?^`e73i30!93zjLo%_&5{5DcJ z>B181#kF|Z=AR+&BVmJPeuOm!Gs!1lDsFHXq%r8kbUcZ=@O4bUS=3*{f)nPGnT0y9 z3iZ>x+vbN*dp&0T$@&i_kx%%P_F*nQk2M&B&Q1oplOBx1VT{IesQ&?z7=d@~^%;yK z{>$dWKQkMP##r(%qb~Tmbvw={-h*2DgBZXskxC}Ye++adVME3xxR7|oc;3RktPtPv tt3|8bp6aG|TDn@=+dL&Zx|{Odz6@`UCnMM6TjTa-<$LqS^NUkA{}0sB|D6B; delta 1770 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 diff --git a/po/sv.gmo b/po/sv.gmo index 8b0b1d07bc8e600acafa83f237ed4f1e9a30551b..7d9f2c030a8b23c169539a57bb5bb28f174aad1e 100644 GIT binary patch delta 1750 zcmXZcdq~x17{KvIbKTBT^LR4yvQt^J?4+I@o1S4{>bkhfgb@j?Y_rX&P3@#}Z2YoX zHgK>m^iRZ~f}k5Z%YTY$7Y(Ukn*|v}i*mH=k442Uf2@6<-Ur0b`@GlZec#`EdLPH_ zc^ubsYP{DUCvtR&NQ#Kml#8Te6Z-Kh^Dt_Auf;!Ee9Pi74AB0<>H`%b8N@l5g%#!p z7$n|_Q}I}ZcrPdJry_}pA#(&XiT}VEIN@!#z%0~6ick}+M4jkE)Py_mHT)V&@HFnm zF+75;OI-qiWg_noFIwh_%%iZAiUd53`S=~aj`wjU`j)!|L#R7ij+)>{sQq^1d^}_A zBbY<{H|qGAD_s9F)C6mBA$EEcbSFLLH4G9zMBVwMN;h#fW)rW*Fvf5J9>);gzygeC zTUsB%`B;mZXgBJ7CvY4NnBI^TuA9G@H_Z|Aj(HE`nP3#B;X{0R_hw+Fi*s=i?WL%R ze~Q!bFzQwJBZ+x3NFkAm2bhdcQSUfmmAjfWEF>;PzAtG<{^SDxLg-uVCN4IsQNM`> zOvEp+2)oSzj1d2avsqu>s1lh>#af(#n^5np8E4@>)T29xLHrqa;S=;Fh_tN{`I0l; z@vhtX#C0OC(w>F7<6P9MDaY&dYr|(6uP0H~m*V$C-oi>;j9sV`3}P}4n-5U$@;TO_ ze}f1`=|DZPTc|r7!)_MJ-stA(eV+|+XBTlc?Y}WtKhA{BoWGxrAqu%vl-BcBu?aQf zKFq^W)H@7(OdpJ58Gepgco|FZF6zgb+29tcLcOXOuEifw`=>XG%*ALU=dT@VsW?v} zJ*XKrHuJ>r8`Pt}jd~T&QD4jS7WV@aL2X}yY1nA-F4SlFE$X-{s5^dyI^N&vt}?IH za}!ljp$j*m4%myD=~>iYvSFNqeO3(VkK0ib>_R=ML#{quu3E#d z=I^M_@ZW8H(J5VpapC39iT> z3Uwq};$w91IS#<~MIya119ifgs9#ity1+fC?JnS8d}8b4CbApEy;1v5L~UP*y1;52 zif3I4I`C8LR}2#SCYdi!$HBzK*caDgI@aP4e1IYRjbTjVvov3d+OHaQ;wz{-`4C%R zlhyrf3*W3it$(a>#im2NH38!oz>A&GhyTvr8nKpOCiPL&g&)H%co+4k8<2&$@{xj< zMB)^Y4%h?rj6*mG$KeQ!BKJ;?B7gFle<946Y6f0t-GF*0_MsO~VHRGoHem+wfN3JB z%rA2(B#_vMiMRvx%no87yn(uPuP}%|a5HwBF4C^0$PwJao}Qawb|O57dqaI8>KB)w z9?ep`PrD=dMdMNy%KWl$p2#SSVFc?@2l$8`u-Te8-<)L%R*)Z!RLODF9rG+OUmC!j zOjL|I&a-kph%qMrr>=j>&hIFSg>BHEE4`hN){VXD4nO z;R)}(oinU|Nhr6fqAa#}`La-6S*#*EnC^r}hMde$I4kI6W;@}uu;Vy;n{v7){Lc-) J?92V0{ugmh?d1Rf